claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WARNING: CONFIGS MIGHT PARTIALLY BREAK WHERE DEVICE NAMES HAVE CHANGED.

Browse Source 
Changes to device_t struct to accomodate the upcoming PCI IRQ arbitration rewrite;
Added device.c/h API to obtain name from the device_t struct;
Significant changes to win/win_settings.c to clean up the code a bit and fix bugs;
Ported all the CPU and AudioPCI commits from PCem;
Added an API call to allow ACPI soft power off to gracefully stop the emulator;
Removed the Siemens PCD-2L from the Dev branch because it now works;
Removed the Socket 5 HP Vectra from the Dev branch because it now works;
Fixed the Compaq Presario and the Micronics Spitfire;
Give the IBM PC330 its own list of 486 CPU so it can have DX2's with CPUID 0x470;
SMM fixes;
Rewrote the SYSENTER, SYSEXIT, SYSCALL, and SYSRET instructions;
Changed IDE reset period to match the specification, fixes #929;
The keyboard input and output ports are now forced in front of the queue when read, fixes a number of bugs, including the AMI Apollo hanging on soft reset;
Added the Intel AN430TX but Dev branched because it does not work;
The network code no longer drops packets if the emulated network card has failed to receive them (eg. when the buffer is full);
Changes to PCI card adding and renamed some PCI slot types, also added proper AGP bridge slot types;
USB UHCI emulation is no longer a stub (still doesn't fully work, but at least Windows XP chk with Debug no longer ASSERT's on it);
Fixed NVR on the the SMC FDC37C932QF and APM variants;
A number of fixes to Intel 4x0 chipsets, including fixing every register of the 440LX and 440EX;
Some ACPI changes.
This commit is contained in:
OBattler
2020-11-16 00:01:21 +01:00
parent 745460f64b
commit 0faf6692c9
260 changed files with 5122 additions and 4471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/net_ne2000.c
View File

@@ -1492,7 +1492,7 @@ nic_close(void *priv)
static const device_config_t ne1000_config[] =
{
{
"base", "Address", CONFIG_HEX16, "", 0x300,
"base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 },
{
{
"0x280", 0x280
@@ -1518,7 +1518,7 @@ static const device_config_t ne1000_config[] =
},
},
{
"irq", "IRQ", CONFIG_SELECTION, "", 3,
"irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 },
{
{
"IRQ 2", 2
@@ -1554,7 +1554,7 @@ static const device_config_t ne1000_config[] =
static const device_config_t ne2000_config[] =
{
{
"base", "Address", CONFIG_HEX16, "", 0x300,
"base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 },
{
{
"0x280", 0x280
@@ -1580,7 +1580,7 @@ static const device_config_t ne2000_config[] =
},
},
{
"irq", "IRQ", CONFIG_SELECTION, "", 10,
"irq", "IRQ", CONFIG_SELECTION, "", 10, "", { 0 },
{
{
"IRQ 2", 2
@@ -1609,7 +1609,7 @@ static const device_config_t ne2000_config[] =
"mac", "MAC Address", CONFIG_MAC, "", -1
},
{
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0,
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0, "", { 0 },
{
{
"Disabled", 0x00000
@@ -1673,7 +1673,7 @@ const device_t ne1000_device = {
DEVICE_ISA,
NE2K_NE1000,
nic_init, nic_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
ne1000_config
};
@@ -1682,7 +1682,7 @@ const device_t ne2000_device = {
DEVICE_ISA | DEVICE_AT,
NE2K_NE2000,
nic_init, nic_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
ne2000_config
};
@@ -1691,7 +1691,7 @@ const device_t ethernext_mc_device = {
DEVICE_MCA,
NE2K_ETHERNEXT_MC,
nic_init, nic_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
mca_mac_config
};
@@ -1700,7 +1700,7 @@ const device_t rtl8019as_device = {
DEVICE_ISA | DEVICE_AT,
NE2K_RTL8019AS,
nic_init, nic_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
rtl8019as_config
};
@@ -1709,6 +1709,6 @@ const device_t rtl8029as_device = {
DEVICE_PCI,
NE2K_RTL8029AS,
nic_init, nic_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
rtl8029as_config
};