diff options
Diffstat (limited to 'src/mame/drivers/concept.cpp')
-rw-r--r-- | src/mame/drivers/concept.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp index ad7b471ff3e..9f089ac633a 100644 --- a/src/mame/drivers/concept.cpp +++ b/src/mame/drivers/concept.cpp @@ -212,8 +212,8 @@ void concept_a2_cards(device_slot_interface &device) MACHINE_CONFIG_START(concept_state::concept) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 8182000) /* 16.364 MHz / 2 */ - MCFG_CPU_PROGRAM_MAP(concept_memmap) + MCFG_DEVICE_ADD("maincpu", M68000, 8182000) /* 16.364 MHz / 2 */ + MCFG_DEVICE_PROGRAM_MAP(concept_memmap) MCFG_QUANTUM_TIME(attotime::from_hz(60)) @@ -231,7 +231,7 @@ MACHINE_CONFIG_START(concept_state::concept) /* sound */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD(SPEAKER_TAG, SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* rtc */ @@ -241,21 +241,21 @@ MACHINE_CONFIG_START(concept_state::concept) /* via */ MCFG_DEVICE_ADD("via6522_0", VIA6522, 1022750) - MCFG_VIA6522_READPA_HANDLER(READ8(concept_state, via_in_a)) - MCFG_VIA6522_READPB_HANDLER(READ8(concept_state, via_in_b)) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(concept_state, via_out_a)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(concept_state, via_out_b)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(concept_state, via_out_cb2)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(concept_state, via_irq_func)) + MCFG_VIA6522_READPA_HANDLER(READ8(*this, concept_state, via_in_a)) + MCFG_VIA6522_READPB_HANDLER(READ8(*this, concept_state, via_in_b)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, concept_state, via_out_a)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, concept_state, via_out_b)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, concept_state, via_out_cb2)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, concept_state, via_irq_func)) /* ACIAs */ MCFG_DEVICE_ADD(ACIA_0_TAG, MOS6551, 0) MCFG_MOS6551_XTAL(XTAL(1'843'200)) - MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd)) + MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd)) MCFG_DEVICE_ADD(ACIA_1_TAG, MOS6551, 0) MCFG_MOS6551_XTAL(XTAL(1'843'200)) - MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd)) + MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd)) MCFG_DEVICE_ADD(KBD_ACIA_TAG, MOS6551, 0) MCFG_MOS6551_XTAL(XTAL(1'843'200)) @@ -269,17 +269,17 @@ MACHINE_CONFIG_START(concept_state::concept) MCFG_A2BUS_SLOT_ADD(A2BUS_TAG, "sl4", concept_a2_cards, "fdc01") /* 2x RS232 ports */ - MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA_0_TAG, mos6551_device, write_rxd)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA_0_TAG, mos6551_device, write_dcd)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE(ACIA_0_TAG, mos6551_device, write_dsr)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA_0_TAG, mos6551_device, write_cts)) - - MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA_1_TAG, mos6551_device, write_rxd)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA_1_TAG, mos6551_device, write_dcd)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE(ACIA_1_TAG, mos6551_device, write_dsr)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA_1_TAG, mos6551_device, write_cts)) + MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA_0_TAG, mos6551_device, write_rxd)) + MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA_0_TAG, mos6551_device, write_dcd)) + MCFG_RS232_DSR_HANDLER(WRITELINE(ACIA_0_TAG, mos6551_device, write_dsr)) + MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA_0_TAG, mos6551_device, write_cts)) + + MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA_1_TAG, mos6551_device, write_rxd)) + MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA_1_TAG, mos6551_device, write_dcd)) + MCFG_RS232_DSR_HANDLER(WRITELINE(ACIA_1_TAG, mos6551_device, write_dsr)) + MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA_1_TAG, mos6551_device, write_cts)) MACHINE_CONFIG_END |