diff options
Diffstat (limited to 'src/devices/bus/isa/isa_cards.cpp')
| -rw-r--r-- | src/devices/bus/isa/isa_cards.cpp | 69 |
1 files changed, 16 insertions, 53 deletions
diff --git a/src/devices/bus/isa/isa_cards.cpp b/src/devices/bus/isa/isa_cards.cpp index 944ef92bb81..91031bc3a35 100644 --- a/src/devices/bus/isa/isa_cards.cpp +++ b/src/devices/bus/isa/isa_cards.cpp @@ -111,17 +111,19 @@ void pc_isa8_cards(device_slot_interface &device) device.option_add("cga_cportiii", ISA8_CGA_CPORTIII); device.option_add("aga", ISA8_AGA); device.option_add("aga_pc200", ISA8_AGA_PC200); + device.option_add("wyse700", ISA8_WYSE700); device.option_add("ega", ISA8_EGA); device.option_add("pgc", ISA8_PGC); device.option_add("vga", ISA8_VGA); device.option_add("wd90c90_jk", ISA8_WD90C90_JK); device.option_add("num9rev",ISA8_NUM_9_REV); device.option_add("com", ISA8_COM); - device.option_add("fdc", ISA8_FDC_SUPERIO); + device.option_add("comat", ISA8_COM_AT); device.option_add("fdc_xt", ISA8_FDC_XT); device.option_add("fdc_at", ISA8_FDC_AT); device.option_add("fdc_smc", ISA8_FDC_SMC); device.option_add("fdc_ps2", ISA8_FDC_PS2); + device.option_add("fdc_superio", ISA8_FDC_SUPERIO); device.option_add("fdc344", ISA8_FDC344); device.option_add("fdcmag", ISA8_FDCMAG); device.option_add("wdxt_gen", ISA8_WDXT_GEN); @@ -156,55 +158,13 @@ void pc_isa8_cards(device_slot_interface &device) device.option_add("acb2072", ACB2072); device.option_add("3xtwin", ISA8_3XTWIN); device.option_add("opus108pm", ISA8_OPUS108PM); + device.option_add("ibm_speech", ISA8_IBM_SPEECH); } void pc_isa16_cards(device_slot_interface &device) { - // 8-bit - device.option_add("mda", ISA8_MDA); - device.option_add("cga", ISA8_CGA); - device.option_add("cga_cportiii", ISA8_CGA_CPORTIII); - device.option_add("wyse700", ISA8_WYSE700); - device.option_add("ega", ISA8_EGA); - device.option_add("pgc", ISA8_PGC); - device.option_add("vga", ISA8_VGA); - device.option_add("wd90c90_jk", ISA8_WD90C90_JK); - device.option_add("num9rev",ISA8_NUM_9_REV); - device.option_add("com", ISA8_COM); - device.option_add("comat", ISA8_COM_AT); - device.option_add("fdc", ISA8_FDC_AT); - device.option_add("fdc344", ISA8_FDC344); - device.option_add("fdcmag", ISA8_FDCMAG); - device.option_add("hdc", ISA8_HDC); - device.option_add("side116", ISA8_SIDE116); - device.option_add("adlib", ISA8_ADLIB); - device.option_add("hercules", ISA8_HERCULES); - device.option_add("gblaster", ISA8_GAME_BLASTER); - device.option_add("sblaster1_0", ISA8_SOUND_BLASTER_1_0); - device.option_add("sblaster1_5", ISA8_SOUND_BLASTER_1_5); - device.option_add("stereo_fx", ISA8_STEREO_FX); - device.option_add("ssi2001", ISA8_SSI2001); - device.option_add("ne1000", NE1000); - device.option_add("3c503", EL2_3C503); - device.option_add("mpu401", ISA8_MPU401); - device.option_add("pcmidi", ISA8_PCMIDI); - device.option_add("lpt", ISA8_LPT); - device.option_add("ibm_mfc", ISA8_IBM_MFC); - device.option_add("fdcsmc", ISA8_FDC_SMC); - device.option_add("dectalk", ISA8_DECTALK); - device.option_add("prose4k1", ISA8_PROSE4001); - device.option_add("pds", ISA8_PDS); - device.option_add("lba_enhancer", ISA8_LBA_ENHANCER); - device.option_add("chessmdr", ISA8_CHESSMDR); - device.option_add("chessmsr", ISA8_CHESSMSR); - device.option_add("finalchs", ISA8_FINALCHS); - device.option_add("epc_mda", ISA8_EPC_MDA); - device.option_add("epc_twib", ISA8_EIS_TWIB); - device.option_add("babyblue2", ISA8_BABYBLUE2); - device.option_add("acb2072", ACB2072); - device.option_add("3xtwin", ISA8_3XTWIN); - device.option_add("opus108pm", ISA8_OPUS108PM); - device.option_add("ibm_speech", ISA8_IBM_SPEECH); + // any 8-bit card also works in a 16-bit slot + pc_isa8_cards(device); // 16-bit device.option_add("ide", ISA16_IDE); device.option_add("ne2000", NE2000); @@ -213,8 +173,6 @@ void pc_isa16_cards(device_slot_interface &device) 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("gus", ISA16_GUS); device.option_add("sblaster_16", ISA16_SOUND_BLASTER_16); device.option_add("svga_s3", ISA16_SVGA_S3); @@ -253,12 +211,17 @@ void pc_isa16_cards(device_slot_interface &device) device.option_add("ultra12f", ULTRA12F); device.option_add("ultra12f32", ULTRA12F32); device.option_add("ultra14f", ULTRA14F); - device.option_add("ultra24f", ULTRA24F); // actually an EISA card - device.option_add("dc320b", TEKRAM_DC320B); // actually an EISA card - device.option_add("dc320e", TEKRAM_DC320E); // actually an EISA card - device.option_add("dc820", TEKRAM_DC820); // actually an EISA card - device.option_add("dc820b", TEKRAM_DC820B); // actually an EISA card device.option_add("omti8621", ISA16_OMTI8621); device.option_add("lrk331", LRK331); device.option_add("hpblp", HPBLP); + + // EISA cards + // TODO: move to own block + device.option_add("aha1740", AHA1740); + device.option_add("aha1742a", AHA1742A); + device.option_add("ultra24f", ULTRA24F); + device.option_add("dc320b", TEKRAM_DC320B); + device.option_add("dc320e", TEKRAM_DC320E); + device.option_add("dc820", TEKRAM_DC820); + device.option_add("dc820b", TEKRAM_DC820B); } |
