diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/isa/isa_cards.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/isa/isa_cards.cpp')
-rw-r--r-- | src/devices/bus/isa/isa_cards.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/devices/bus/isa/isa_cards.cpp b/src/devices/bus/isa/isa_cards.cpp index 8ab0832c03d..fbbafc0bc69 100644 --- a/src/devices/bus/isa/isa_cards.cpp +++ b/src/devices/bus/isa/isa_cards.cpp @@ -31,16 +31,11 @@ #include "ide.h" #include "xtide.h" #include "side116.h" -#include "aha1542b.h" -#include "aha1542c.h" -#include "aha174x.h" +#include "aha1542.h" #include "wd1002a_wx1.h" #include "wd1007a.h" #include "mcd.h" #include "lbaenhancer.h" -#include "cl_sh260.h" -#include "bt54x.h" -#include "dcb.h" // sound #include "adlib.h" @@ -60,7 +55,6 @@ #include "ne2000.h" #include "3c505.h" #include "eis_sad8852.h" -#include "np600.h" // communication ports #include "lpt.h" @@ -156,13 +150,7 @@ void pc_isa16_cards(device_slot_interface &device) // 16-bit device.option_add("ide", ISA16_IDE); device.option_add("ne2000", NE2000); - device.option_add("aha1542a", AHA1542A); - device.option_add("aha1542b", AHA1542B); - device.option_add("aha1542c", AHA1542C); - device.option_add("aha1542cf", AHA1542CF); - device.option_add("aha1542cp", AHA1542CP); - device.option_add("aha1740", AHA1740); // actually an EISA card - device.option_add("aha1742a", AHA1742A); // actually an EISA card + device.option_add("aha1542", AHA1542); device.option_add("gus",ISA16_GUS); device.option_add("sblaster_16", ISA16_SOUND_BLASTER_16); device.option_add("svga_s3", ISA16_SVGA_S3); @@ -179,12 +167,5 @@ void pc_isa16_cards(device_slot_interface &device) device.option_add("sb16_lle", ISA16_SB16); device.option_add("mcd", ISA16_MCD); device.option_add("sad8852", ISA16_SAD8852); - device.option_add("np600a3", NP600A3); device.option_add("wd1007a", WD1007A); - device.option_add("ev346", EV346); - device.option_add("jc1310", JC1310); - device.option_add("bt542b", BT542B); - device.option_add("bt542bh", BT542BH); - device.option_add("bt545s", BT545S); - device.option_add("dcb", NOVELL_DCB); } |