diff options
author | Vas Crabb <vas@vastheman.com> | 2022-06-25 10:25:22 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2022-06-25 10:27:36 +1000 |
commit | 38fed2ff786018664868b0d8ec260e944e4ddad6 (patch) | |
tree | 4f84729013a1551ccf2dc91c61cc06c7c46ced04 /src/mame | |
parent | a8b6bdfcacdc349bf0d6498540e83a99f79eeb48 (diff) |
bus/nubus: Got rid of CRTC hacks in Macintosh Display Card emulation.
* Changed name of cards for slot selection to "mdc48" and "mdc824" as
they're unrelated to the later 8*24 GC card.
* Also cleaned up code substantially and got rid of artificial
differences between Display Card 4*8 and 8*24.
* Moved lists of NuBus and SE/30 PDS cards to a common place.
* Got some class declarations out of headers to reduce recompiles.
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/mac.cpp | 52 | ||||
-rw-r--r-- | src/mame/drivers/macquadra700.cpp | 58 |
2 files changed, 13 insertions, 97 deletions
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index e22f94a3105..18d6a0198fa 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -17,6 +17,7 @@ #include "machine/macadb.h" #include "bus/nscsi/devices.h" +#include "bus/nubus/cards.h" #include "cpu/m68000/m68000.h" #include "cpu/m6805/m6805.h" #include "machine/applepic.h" @@ -24,27 +25,6 @@ #include "machine/swim1.h" #include "machine/swim2.h" -// NuBus and 030/040 PDS cards -#include "bus/nubus/nubus_48gc.h" -#include "bus/nubus/nubus_cb264.h" -#include "bus/nubus/nubus_vikbw.h" -#include "bus/nubus/nubus_specpdq.h" -#include "bus/nubus/nubus_m2hires.h" -#include "bus/nubus/nubus_spec8.h" -#include "bus/nubus/nubus_radiustpd.h" -#include "bus/nubus/nubus_wsportrait.h" -#include "bus/nubus/nubus_asntmc3b.h" -#include "bus/nubus/nubus_image.h" -#include "bus/nubus/nubus_m2video.h" -#include "bus/nubus/bootbug.h" -#include "bus/nubus/quadralink.h" -#include "bus/nubus/laserview.h" -#include "bus/nubus/pds30_cb264.h" -#include "bus/nubus/pds30_procolor816.h" -#include "bus/nubus/pds30_sigmalview.h" -#include "bus/nubus/pds30_30hr.h" -#include "bus/nubus/pds30_mc30.h" - #include "layout/generic.h" #include "softlist_dev.h" #include "speaker.h" @@ -596,36 +576,6 @@ void mac_state::maciifx_map(address_map &map) DEVICE CONFIG ***************************************************************************/ -static void mac_nubus_cards(device_slot_interface &device) -{ - device.option_add("m2video", NUBUS_M2VIDEO); /* Apple Macintosh II Video Card */ - device.option_add("48gc", NUBUS_48GC); /* Apple 4*8 Graphics Card */ - device.option_add("824gc", NUBUS_824GC); /* Apple 8*24 Graphics Card */ - device.option_add("cb264", NUBUS_CB264); /* RasterOps ColorBoard 264 */ - device.option_add("vikbw", NUBUS_VIKBW); /* Moniterm Viking board */ - device.option_add("image", NUBUS_IMAGE); /* Disk Image Pseudo-Card */ - device.option_add("specpdq", NUBUS_SPECPDQ); /* SuperMac Spectrum PDQ */ - device.option_add("m2hires", NUBUS_M2HIRES); /* Apple Macintosh II Hi-Resolution Card */ - device.option_add("spec8s3", NUBUS_SPEC8S3); /* SuperMac Spectrum/8 Series III */ -// device.option_add("thundergx", NUBUS_THUNDERGX); /* Radius Thunder GX (not yet) */ - device.option_add("radiustpd", NUBUS_RADIUSTPD); /* Radius Two Page Display */ - device.option_add("asmc3nb", NUBUS_ASNTMC3NB); /* Asante MC3NB Ethernet card */ - device.option_add("portrait", NUBUS_WSPORTRAIT); /* Apple Macintosh II Portrait video card */ - device.option_add("enetnb", NUBUS_APPLEENET); /* Apple NuBus Ethernet */ - device.option_add("bootbug", NUBUS_BOOTBUG); /* Brigent BootBug debugger card */ - device.option_add("quadralink", NUBUS_QUADRALINK); /* AE Quadralink serial card */ - device.option_add("laserview", NUBUS_LASERVIEW); /* Sigma Designs LaserView monochrome video card */ -} - -static void mac_pds030_cards(device_slot_interface &device) -{ - device.option_add("cb264", PDS030_CB264SE30); // RasterOps Colorboard 264/SE30 - device.option_add("pc816", PDS030_PROCOLOR816); // Lapis ProColor Server 8*16 PDS - device.option_add("lview", PDS030_LVIEW); // Sigma Designs L-View - device.option_add("30hr", PDS030_XCEED30HR); // Micron/XCEED Technology Color 30HR - device.option_add("mc30", PDS030_XCEEDMC30); // Micron/XCEED Technology MacroColor 30 -} - static void mac_lcpds_cards(device_slot_interface &device) { } diff --git a/src/mame/drivers/macquadra700.cpp b/src/mame/drivers/macquadra700.cpp index 84d2c23e2d2..41a2185aaa7 100644 --- a/src/mame/drivers/macquadra700.cpp +++ b/src/mame/drivers/macquadra700.cpp @@ -12,43 +12,30 @@ #include "emu.h" #include "machine/macrtc.h" + +#include "bus/nscsi/devices.h" +#include "bus/nubus/cards.h" +#include "bus/nubus/nubus.h" #include "cpu/m68000/m68000.h" #include "machine/6522via.h" -#include "machine/ram.h" -#include "machine/timer.h" -#include "machine/z80scc.h" -#include "machine/macadb.h" #include "machine/applefdintf.h" -#include "machine/swim1.h" #include "machine/dp83932c.h" -#include "machine/nscsi_bus.h" +#include "machine/macadb.h" #include "machine/ncr5390.h" +#include "machine/nscsi_bus.h" +#include "machine/ram.h" +#include "machine/swim1.h" +#include "machine/timer.h" +#include "machine/z80scc.h" #include "sound/asc.h" -#include "formats/ap_dsk35.h" - -#include "bus/nscsi/devices.h" - -#include "bus/nubus/nubus.h" -#include "bus/nubus/nubus_48gc.h" -#include "bus/nubus/nubus_cb264.h" -#include "bus/nubus/nubus_vikbw.h" -#include "bus/nubus/nubus_specpdq.h" -#include "bus/nubus/nubus_m2hires.h" -#include "bus/nubus/nubus_spec8.h" -#include "bus/nubus/nubus_radiustpd.h" -#include "bus/nubus/nubus_wsportrait.h" -#include "bus/nubus/nubus_asntmc3b.h" -#include "bus/nubus/nubus_image.h" -#include "bus/nubus/nubus_m2video.h" -#include "bus/nubus/bootbug.h" -#include "bus/nubus/quadralink.h" -#include "bus/nubus/laserview.h" #include "emupal.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" +#include "formats/ap_dsk35.h" + #define C7M (7833600) #define C15M (C7M*2) #define C32M (C15M*2) @@ -934,27 +921,6 @@ INPUT_PORTS_END MACHINE DRIVERS ***************************************************************************/ -static void mac_nubus_cards(device_slot_interface &device) -{ - device.option_add("m2video", NUBUS_M2VIDEO); /* Apple Macintosh II Video Card */ - device.option_add("48gc", NUBUS_48GC); /* Apple 4*8 Graphics Card */ - device.option_add("824gc", NUBUS_824GC); /* Apple 8*24 Graphics Card */ - device.option_add("cb264", NUBUS_CB264); /* RasterOps ColorBoard 264 */ - device.option_add("vikbw", NUBUS_VIKBW); /* Moniterm Viking board */ - device.option_add("image", NUBUS_IMAGE); /* Disk Image Pseudo-Card */ - device.option_add("specpdq", NUBUS_SPECPDQ); /* SuperMac Spectrum PDQ */ - device.option_add("m2hires", NUBUS_M2HIRES); /* Apple Macintosh II Hi-Resolution Card */ - device.option_add("spec8s3", NUBUS_SPEC8S3); /* SuperMac Spectrum/8 Series III */ -// device.option_add("thundergx", NUBUS_THUNDERGX); /* Radius Thunder GX (not yet) */ - device.option_add("radiustpd", NUBUS_RADIUSTPD); /* Radius Two Page Display */ - device.option_add("asmc3nb", NUBUS_ASNTMC3NB); /* Asante MC3NB Ethernet card */ - device.option_add("portrait", NUBUS_WSPORTRAIT); /* Apple Macintosh II Portrait video card */ - device.option_add("enetnb", NUBUS_APPLEENET); /* Apple NuBus Ethernet */ - device.option_add("bootbug", NUBUS_BOOTBUG); /* Brigent BootBug debugger card */ - device.option_add("quadralink", NUBUS_QUADRALINK); /* AE Quadralink serial card */ - device.option_add("laserview", NUBUS_LASERVIEW); /* Sigma Designs LaserView monochrome video card */ -} - void macquadra_state::macqd700(machine_config &config) { /* basic machine hardware */ |