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

Large changes to configuration files again (the old ones might break, be careful);

Browse Source 
Applied the mainline PCem slight CPU emulation speedup commit;
Added emulation of removable SCSI hard disks;
CD-ROM image handler now uses C FILE's (with the 64-bit size calls) instead of C++ iostreams, ISO images bigger than 2 GB should work properly again;
Split RLL/ESDI and XT IDE disks to their own bus types;
Turned status bar pane meaning and hard disks and CD-ROM BUS numbers to #define's;
Other miscellaneous cleanups.
This commit is contained in:
OBattler
2017-05-27 03:53:32 +02:00
parent 94680da416
commit a36720f174
56 changed files with 4736 additions and 2682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/net_ne2000.c
View File

@@ -1906,13 +1906,13 @@ nic_init(int board)
if (dev->is_pci) {
dev->base_address = 0x340;
} else {
dev->base_address = device_get_config_int("addr");
dev->bios_addr = device_get_config_int("bios_addr");
dev->base_address = device_get_config_hex16("base");
dev->bios_addr = device_get_config_hex20("bios_addr");
}
dev->base_irq = device_get_config_int("irq");
/* See if we have a local MAC address configured. */
mac = device_get_config_int_ex("mac", -1);
mac = device_get_config_mac("mac", -1);
/* Make this device known to the I/O system. */
nic_ioset(dev, dev->base_address);
@@ -1984,7 +1984,7 @@ nic_init(int board)
mac = (((int) dev->maclocal[3]) << 16);
mac |= (((int) dev->maclocal[4]) << 8);
mac |= ((int) dev->maclocal[5]);
device_set_config_int("mac", mac);
device_set_config_mac("mac", mac);
} else {
dev->maclocal[3] = (mac>>16) & 0xff;
dev->maclocal[4] = (mac>>8) & 0xff;
@@ -2065,7 +2065,7 @@ rtl8029as_init(void)
static device_config_t ne1000_config[] =
{
{
"addr", "Address", CONFIG_SELECTION, "", 0x300,
"base", "Address", CONFIG_HEX16, "", 0x300,
{
{
"0x280", 0x280
@@ -2111,7 +2111,7 @@ static device_config_t ne1000_config[] =
"mac", "MAC Address", CONFIG_MAC, "", -1
},
{
"bios_addr", "BIOS address", CONFIG_SELECTION, "", 0,
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0,
{
{
"Disabled", 0x00000
@@ -2135,7 +2135,7 @@ static device_config_t ne1000_config[] =
static device_config_t ne2000_config[] =
{
{
"addr", "Address", CONFIG_SELECTION, "", 0x300,
"base", "Address", CONFIG_HEX16, "", 0x300,
{
{
"0x280", 0x280
@@ -2187,7 +2187,7 @@ static device_config_t ne2000_config[] =
"mac", "MAC Address", CONFIG_MAC, "", -1
},
{
"bios_addr", "BIOS address", CONFIG_SELECTION, "", 0,
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0,
{
{
"Disabled", 0x00000
@@ -2236,23 +2236,6 @@ static device_config_t rtl8029as_config[] =
{
"mac", "MAC Address", CONFIG_MAC, "", -1
},
{
"bios_addr", "BIOS address", CONFIG_SELECTION, "", 0,
{
{
"Disabled", 0x00000
},
{
"D000", 0xD0000
},
{
"C000", 0xC0000
},
{
""
}
},
},
{
"", "", -1
}