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

All devices now have the bus marked in their name;

Browse Source 
The Settings dialog now correctly filters devices by bus;
Split the dual VLB/PCI graphics cards into VLB and PCI versions;
Device filtering is now done using the new device_is_valid() call that compares device flags to machine flags;
Moved the NCR-based SCSI controllers to the main branch;
Moved the NE1000 to the dev branch until it's finished.
This commit is contained in:
OBattler
2017-10-10 00:14:15 +02:00
parent efc129eb22
commit 253ad40376
55 changed files with 852 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/network.c
View File

@@ -31,11 +31,15 @@
static netcard_t net_cards[] = {
{ "None", "none", NULL,
NULL, NULL },
{ "Novell NE1000", "ne1k", &ne1000_device,
#ifdef DEV_BRANCH
#ifdef USE_NE1000
{ "[ISA] Novell NE1000", "ne1k", &ne1000_device,
NULL, NULL },
{ "Novell NE2000", "ne2k", &ne2000_device,
#endif
#endif
{ "[ISA] Novell NE2000", "ne2k", &ne2000_device,
NULL, NULL },
{ "Realtek RTL8029AS", "ne2kpci", &rtl8029as_device,
{ "[PCI] Realtek RTL8029AS","ne2kpci", &rtl8029as_device,
NULL, NULL },
{ "", "", NULL,
NULL, NULL }