From 9649617fb03c8120aaa11ef749c47c6f8ea5f8c7 Mon Sep 17 00:00:00 2001 From: npwoods Date: Sun, 22 Nov 2020 20:30:10 -0500 Subject: Cleanups and corrections for CoCo cartridge slot configuration (#7502) Consolidated CoCo cartridge slot device configuration, to remove duplicate code that was specific to slots on the Multi-Pak interface. Marked "pak" and "banked_16k" as internal, as they are not standalone --- src/mame/drivers/coco12.cpp | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) (limited to 'src/mame') diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index 98c312fb371..5233d3e6948 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -26,19 +26,7 @@ #include "emu.h" #include "includes/coco12.h" -#include "bus/coco/coco_dcmodem.h" -#include "bus/coco/coco_dwsock.h" -#include "bus/coco/coco_fdc.h" -#include "bus/coco/coco_gmc.h" -#include "bus/coco/coco_multi.h" -#include "bus/coco/coco_orch90.h" -#include "bus/coco/coco_pak.h" -#include "bus/coco/coco_psg.h" -#include "bus/coco/coco_ram.h" -#include "bus/coco/coco_rs232.h" -#include "bus/coco/coco_ssc.h" -#include "bus/coco/coco_stecomp.h" -#include "bus/coco/coco_sym12.h" +#include "bus/coco/cococart.h" #include "bus/coco/coco_t4426.h" #include "cpu/m6809/m6809.h" @@ -402,31 +390,17 @@ INPUT_PORTS_END //************************************************************************** //------------------------------------------------- -// SLOT_INTERFACE_START(coco_cart) +// coco_cart //------------------------------------------------- void coco_cart(device_slot_interface &device) { - device.option_add("banked_16k", COCO_PAK_BANKED); - device.option_add("cc2hdb1", COCO2_HDB1); - device.option_add("cc3hdb1", COCO3_HDB1); - device.option_add("ccpsg", COCO_PSG); - device.option_add("cd6809_fdc", CD6809_FDC); - device.option_add("cp450_fdc", CP450_FDC); - device.option_add("dcmodem", COCO_DCMODEM); - device.option_add("fdc", COCO_FDC); - device.option_add("fdcv11", COCO_FDC_V11); - device.option_add("games_master", COCO_PAK_GMC); - device.option_add("multi", COCO_MULTIPAK); - device.option_add("orch90", COCO_ORCH90); - device.option_add("pak", COCO_PAK); - device.option_add("ram", COCO_PAK_RAM); - device.option_add("rs232", COCO_RS232); - device.option_add("ssc", COCO_SSC); - device.option_add("stecomp", COCO_STEREO_COMPOSER); - device.option_add("sym12", COCO_SYM12); + coco_cart_add_basic_devices(device); + coco_cart_add_fdcs(device); + coco_cart_add_multi_pak(device); } + //------------------------------------------------- // SLOT_INTERFACE_START(t4426_cart) //------------------------------------------------- -- cgit v1.2.3