diff options
Diffstat (limited to 'src/mame/drivers/coco12.cpp')
-rw-r--r-- | src/mame/drivers/coco12.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index 07ab3150fb1..5b08ad09267 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -361,11 +361,11 @@ void coco_cart(device_slot_interface &device) device.option_add("rs232", COCO_RS232); device.option_add("dcmodem", COCO_DCMODEM); device.option_add("orch90", COCO_ORCH90); - device.option_add("ssc", COCO_SSC).clock(DERIVED_CLOCK(1, 1)); + device.option_add("ssc", COCO_SSC); device.option_add("games_master", COCO_PAK_GMC); device.option_add("banked_16k", COCO_PAK_BANKED); device.option_add("pak", COCO_PAK); - device.option_add("multi", COCO_MULTIPAK).clock(DERIVED_CLOCK(1, 1)); + device.option_add("multi", COCO_MULTIPAK); } //------------------------------------------------- @@ -385,12 +385,12 @@ 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 - MCFG_SOUND_ADD("dac", DAC_6BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) + MCFG_DEVICE_ADD("dac", DAC_6BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) // Single-bit sound: R22 = 10K - MCFG_SOUND_ADD("sbs", DAC_1BIT, 0) + MCFG_DEVICE_ADD("sbs", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") @@ -438,31 +438,31 @@ MACHINE_CONFIG_START(coco12_state::coco) MCFG_DEVICE_CLOCK(XTAL(14'318'181) / 16) // basic machine hardware - MCFG_CPU_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1)) - MCFG_CPU_PROGRAM_MAP(coco_mem) - MCFG_CPU_DISASSEMBLE_OVERRIDE(coco_state, dasm_override) + MCFG_DEVICE_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1)) + MCFG_DEVICE_PROGRAM_MAP(coco_mem) + MCFG_DEVICE_DISASSEMBLE_OVERRIDE(coco_state, dasm_override) // devices MCFG_DEVICE_ADD(PIA0_TAG, PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_state, pia0_pa_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, coco_state, pia0_pb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, coco_state, pia0_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, coco_state, pia0_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia0_irq_a)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia0_irq_b)) MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(coco_state, pia1_pa_r)) - MCFG_PIA_READPB_HANDLER(READ8(coco_state, pia1_pb_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b)) + MCFG_PIA_READPA_HANDLER(READ8(*this, coco_state, pia1_pa_r)) + MCFG_PIA_READPB_HANDLER(READ8(*this, coco_state, pia1_pb_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_state, pia1_pa_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, coco_state, pia1_pb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, coco_state, pia1_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, coco_state, pia1_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia1_firq_a)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia1_firq_b)) MCFG_SAM6883_ADD(SAM_TAG, XTAL(14'318'181), MAINCPU_TAG, AS_PROGRAM) - MCFG_SAM6883_RES_CALLBACK(READ8(coco12_state, sam_read)) + MCFG_SAM6883_RES_CALLBACK(READ8(*this, coco12_state, sam_read)) // Becker Port device MCFG_DEVICE_ADD(DWSOCK_TAG, COCO_DWSOCK, 0) @@ -471,12 +471,12 @@ MACHINE_CONFIG_START(coco12_state::coco) MCFG_CASSETTE_FORMATS(coco_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "printer") - MCFG_RS232_DCD_HANDLER(DEVWRITELINE(PIA1_TAG, pia6821_device, ca1_w)) + MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "printer") + MCFG_RS232_DCD_HANDLER(WRITELINE(PIA1_TAG, pia6821_device, ca1_w)) MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("printer", printer) MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "pak") - MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w)) + MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w)) MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI)) MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT)) @@ -484,9 +484,9 @@ MACHINE_CONFIG_START(coco12_state::coco) MCFG_SCREEN_MC6847_NTSC_ADD(SCREEN_TAG, VDG_TAG) MCFG_DEVICE_ADD(VDG_TAG, MC6847_NTSC, XTAL(14'318'181) / 4) // VClk output from MC6883 - MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync)) - MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(coco12_state, field_sync)) - MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read)) + MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(*this, coco12_state, horizontal_sync)) + MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, coco12_state, field_sync)) + MCFG_MC6847_INPUT_CALLBACK(READ8(SAM_TAG, sam6883_device, display_read)) // sound hardware coco_sound(config); @@ -509,8 +509,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(coco12_state::cocoh) coco(config); - MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) - MCFG_CPU_PROGRAM_MAP(coco_mem) + MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) + MCFG_DEVICE_PROGRAM_MAP(coco_mem) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END @@ -519,7 +519,7 @@ MACHINE_CONFIG_START(coco12_state::cocoe) coco(config); 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)) + MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w)) MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI)) MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT)) MCFG_COCO_VHD_ADD(VHD0_TAG) @@ -528,8 +528,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(coco12_state::cocoeh) cocoe(config); - MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) - MCFG_CPU_PROGRAM_MAP(coco_mem) + MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) + MCFG_DEVICE_PROGRAM_MAP(coco_mem) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END @@ -538,7 +538,7 @@ MACHINE_CONFIG_START(coco12_state::coco2) coco(config); 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)) + MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w)) MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI)) MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT)) MCFG_COCO_VHD_ADD(VHD0_TAG) @@ -547,8 +547,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(coco12_state::coco2h) coco2(config); - MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) - MCFG_CPU_PROGRAM_MAP(coco_mem) + MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) + MCFG_DEVICE_PROGRAM_MAP(coco_mem) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END @@ -557,15 +557,15 @@ MACHINE_CONFIG_START(coco12_state::coco2b) coco2(config); MCFG_DEVICE_REMOVE(VDG_TAG) MCFG_DEVICE_ADD(VDG_TAG, MC6847T1_NTSC, XTAL(14'318'181) / 4) - MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync)) - MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(coco12_state, field_sync)) - MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read)) + MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(*this, coco12_state, horizontal_sync)) + MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, coco12_state, field_sync)) + MCFG_MC6847_INPUT_CALLBACK(READ8(SAM_TAG, sam6883_device, display_read)) MACHINE_CONFIG_END MACHINE_CONFIG_START(coco12_state::coco2bh) coco2b(config); - MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) - MCFG_CPU_PROGRAM_MAP(coco_mem) + MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) + MCFG_DEVICE_PROGRAM_MAP(coco_mem) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END @@ -574,7 +574,7 @@ MACHINE_CONFIG_START(coco12_state::cp400) coco(config); 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)) + MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w)) MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI)) MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT)) MACHINE_CONFIG_END @@ -583,7 +583,7 @@ MACHINE_CONFIG_START(coco12_state::t4426) coco2(config); 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)) + MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w)) MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI)) MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT)) MCFG_SLOT_FIXED(true) // This cart is fixed so no way to change it @@ -593,7 +593,7 @@ MACHINE_CONFIG_START(coco12_state::cd6809) coco(config); 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)) + MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w)) MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI)) MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT)) MACHINE_CONFIG_END |