summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/cgc7900.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cgc7900.cpp')
-rw-r--r--src/mame/drivers/cgc7900.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp
index 5718bf52fb9..745b6cc443e 100644
--- a/src/mame/drivers/cgc7900.cpp
+++ b/src/mame/drivers/cgc7900.cpp
@@ -480,29 +480,29 @@ void cgc7900_state::machine_reset()
MACHINE_CONFIG_START(cgc7900_state::cgc7900)
/* basic machine hardware */
- MCFG_CPU_ADD(M68000_TAG, M68000, XTAL(28'480'000)/4)
- MCFG_CPU_PROGRAM_MAP(cgc7900_mem)
-
- MCFG_CPU_ADD(I8035_TAG, I8035, 1000000)
- MCFG_CPU_PROGRAM_MAP(keyboard_mem)
- //MCFG_MCS48_PORT_P1_IN_CB(READ8())
- //MCFG_MCS48_PORT_P1_OUT_CB(WRITE8())
- //MCFG_MCS48_PORT_P2_IN_CB(READ8())
- //MCFG_MCS48_PORT_P2_OUT_CB(WRITE8())
- //MCFG_MCS48_PORT_T1_IN_CB(READLINE())
- //MCFG_MCS48_PORT_BUS_IN_CB(READ8())
- //MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8())
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, XTAL(28'480'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(cgc7900_mem)
+
+ MCFG_DEVICE_ADD(I8035_TAG, I8035, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(keyboard_mem)
+ //MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, ))
+ //MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, ))
+ //MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, ))
+ //MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ))
+ //MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ))
+ //MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, ))
+ //MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, ))
MCFG_DEVICE_DISABLE()
-/* MCFG_CPU_ADD(AM2910_TAG, AM2910, XTAL(17'360'000))
- MCFG_CPU_PROGRAM_MAP(omti10_mem)*/
+/* MCFG_DEVICE_ADD(AM2910_TAG, AM2910, XTAL(17'360'000))
+ MCFG_DEVICE_PROGRAM_MAP(omti10_mem)*/
/* video hardware */
cgc7900_video(config);
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL(28'480'000)/16)
+ MCFG_DEVICE_ADD(AY8910_TAG, AY8910, XTAL(28'480'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@@ -510,33 +510,33 @@ MACHINE_CONFIG_START(cgc7900_state::cgc7900)
MCFG_GENERIC_KEYBOARD_CB(PUT(cgc7900_state, kbd_put))
MCFG_DEVICE_ADD(MM58167_TAG, MM58167, XTAL(32'768))
- MCFG_MM58167_IRQ_CALLBACK(WRITELINE(cgc7900_state, irq<0x0>))
+ MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, cgc7900_state, irq<0x0>))
MCFG_DEVICE_ADD(K1135A_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(WRITELINE(cgc7900_state, write_rs232_clock))
- MCFG_COM8116_FT_HANDLER(WRITELINE(cgc7900_state, write_rs449_clock))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(*this, cgc7900_state, write_rs232_clock))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(*this, cgc7900_state, write_rs449_clock))
MCFG_DEVICE_ADD(INS8251_0_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(cgc7900_state, irq<0xf>))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(cgc7900_state, irq<0x3>))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, cgc7900_state, irq<0xf>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, cgc7900_state, irq<0x3>))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8251_0_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8251_0_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8251_0_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8251_0_TAG, i8251_device, write_dsr))
MCFG_DEVICE_ADD(INS8251_1_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs449", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs449", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs449", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(cgc7900_state, irq<0x8>))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(cgc7900_state, irq<0x1>))
-
- MCFG_RS232_PORT_ADD("rs449", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8251_1_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8251_1_TAG, i8251_device, write_dsr))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs449", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs449", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs449", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, cgc7900_state, irq<0x8>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, cgc7900_state, irq<0x1>))
+
+ MCFG_DEVICE_ADD("rs449", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8251_1_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8251_1_TAG, i8251_device, write_dsr))
MACHINE_CONFIG_END
/***************************************************************************