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

The RTL8029AS and BT-958D are now only available on PCI boards, and the Setting dialogs now filters PCI network and SCSI cards depending on the machine selected;

Browse Source 
Added DEVICE_VLB and DEVICE_AGP flags.
This commit is contained in:
OBattler
2017-10-08 05:38:45 +02:00
parent 64b7d58cae
commit d72a2cc924
4 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/network/net_ne2000.c
View File

@@ -1919,17 +1919,15 @@ nic_init(device_t *info)
if (dev->is_pci) {
dev->base_address = 0x340;
dev->base_irq = 10;
dev->bios_addr = 0xD0000;
dev->has_bios = device_get_config_int("bios");
} else {
dev->base_address = device_get_config_hex16("base");
dev->base_irq = device_get_config_int("irq");
dev->bios_addr = device_get_config_hex20("bios_addr");
dev->has_bios = !!dev->bios_addr;
}
dev->bios_addr = device_get_config_hex20("bios_addr");
if (dev->bios_addr)
dev->has_bios = 1;
else
dev->has_bios = 0;
/* See if we have a local MAC address configured. */
mac = device_get_config_mac("mac", -1);
@@ -2219,31 +2217,8 @@ static device_config_t ne2000_config[] =
static device_config_t rtl8029as_config[] =
{
/*
* WTF.
* Even though it is PCI, the user should still have control
* over whether or not it's Option ROM BIOS will be enabled
* or not.
*/
{
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0,
{
{
"Disabled", 0x00000
},
{
"D000", 0xD0000
},
{
"D800", 0xD8000
},
{
"C800", 0xC8000
},
{
""
}
},
"bios", "Enable BIOS", CONFIG_BINARY, "", 0
},
{
"mac", "MAC Address", CONFIG_MAC, "", -1
@@ -2275,7 +2250,7 @@ device_t ne2000_device = {
device_t rtl8029as_device = {
"Realtek RTL8029AS",
0,
DEVICE_PCI,
NE2K_RTL8029AS,
nic_init, nic_close, NULL,
NULL, NULL, NULL, NULL,