summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/coco12.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/coco12.cpp')
-rw-r--r--src/mame/drivers/coco12.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index 1837eef2d1d..a0363845812 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -377,7 +377,7 @@ SLOT_INTERFACE_END
// MACHINE_CONFIG_START( coco_sound )
//-------------------------------------------------
-MACHINE_CONFIG_START( coco_sound )
+MACHINE_CONFIG_START(coco_state::coco_sound)
MCFG_SPEAKER_STANDARD_MONO("speaker")
// 6-bit D/A: R10-15 = 10K, 20K, 40.2K, 80.6K, 162K, 324K (according to parts list); output also controls joysticks
@@ -403,7 +403,7 @@ static ADDRESS_MAP_START(coco_floating_map, AS_PROGRAM, 8, coco_state)
ADDRESS_MAP_END
-MACHINE_CONFIG_START( coco_floating )
+MACHINE_CONFIG_START(coco_state::coco_floating)
MCFG_DEVICE_ADD(FLOATING_TAG, ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(coco_floating_map)
MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_BIG)
@@ -428,7 +428,7 @@ DEVICE_INPUT_DEFAULTS_END
// MACHINE_CONFIG
//-------------------------------------------------
-static MACHINE_CONFIG_START( coco )
+MACHINE_CONFIG_START(coco12_state::coco)
MCFG_DEVICE_MODIFY(":")
MCFG_DEVICE_CLOCK(XTAL_14_31818MHz / 16)
@@ -500,7 +500,7 @@ static MACHINE_CONFIG_START( coco )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("dragon_cart_list", "dragon_cart")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( cocoe, coco )
+MACHINE_CONFIG_DERIVED(coco12_state::cocoe, coco)
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "fdc")
MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
@@ -510,7 +510,7 @@ static MACHINE_CONFIG_DERIVED( cocoe, coco )
MCFG_COCO_VHD_ADD(VHD1_TAG)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( coco2, coco )
+MACHINE_CONFIG_DERIVED(coco12_state::coco2, coco)
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "fdcv11")
MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
@@ -520,7 +520,7 @@ static MACHINE_CONFIG_DERIVED( coco2, coco )
MCFG_COCO_VHD_ADD(VHD1_TAG)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( coco2b, coco2 )
+MACHINE_CONFIG_DERIVED(coco12_state::coco2b, coco2)
MCFG_DEVICE_REMOVE(VDG_TAG)
MCFG_DEVICE_ADD(VDG_TAG, MC6847T1_NTSC, XTAL_14_31818MHz / 4)
MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync))
@@ -528,7 +528,7 @@ static MACHINE_CONFIG_DERIVED( coco2b, coco2 )
MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( cp400, coco )
+MACHINE_CONFIG_DERIVED(coco12_state::cp400, coco)
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "cp450_fdc")
MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
@@ -536,7 +536,7 @@ static MACHINE_CONFIG_DERIVED( cp400, coco )
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( t4426, coco2 )
+MACHINE_CONFIG_DERIVED(coco12_state::t4426, coco2)
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, t4426_cart, "t4426")
MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
@@ -545,7 +545,7 @@ static MACHINE_CONFIG_DERIVED( t4426, coco2 )
MCFG_SLOT_FIXED(true) // This cart is fixed so no way to change it
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( cd6809, coco )
+MACHINE_CONFIG_DERIVED(coco12_state::cd6809, coco)
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "cd6809_fdc")
MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))