summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/guab.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/guab.cpp')
-rw-r--r--src/mame/drivers/guab.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp
index a0a88b316e6..91dcad6ba8d 100644
--- a/src/mame/drivers/guab.cpp
+++ b/src/mame/drivers/guab.cpp
@@ -470,8 +470,8 @@ static void guab_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(guab_state::guab)
/* TODO: Verify clock */
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(guab_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(guab_map)
/* TODO: Use real video timings */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(guab_state::guab)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* TODO: Verify clock */
- MCFG_SOUND_ADD("snsnd", SN76489, 2000000)
+ MCFG_DEVICE_ADD("snsnd", SN76489, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("6840ptm", PTM6840, 1000000)
@@ -509,35 +509,35 @@ MACHINE_CONFIG_START(guab_state::guab)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("i8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(guab_state, output1_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(guab_state, output2_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(guab_state, output3_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, guab_state, output1_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, guab_state, output2_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, guab_state, output3_w))
MCFG_DEVICE_ADD("i8255_3", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(guab_state, output4_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(guab_state, output5_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(guab_state, output6_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, guab_state, output4_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, guab_state, output5_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, guab_state, output6_w))
MCFG_DEVICE_ADD("i8255_4", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(guab_state, sn76489_ready_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(guab_state, sn76489_buffer_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(guab_state, system_w))
- MCFG_I8255_IN_PORTC_CB(READ8(guab_state, watchdog_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(guab_state, watchdog_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, guab_state, sn76489_ready_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, guab_state, sn76489_buffer_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, guab_state, system_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, guab_state, watchdog_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, guab_state, watchdog_w))
MCFG_DEVICE_ADD("acia6850_1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232_1", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232_1", rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", 4))
- MCFG_RS232_PORT_ADD("rs232_1", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232_1", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", acia_1_rs232_defaults)
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) // source? the ptm doesn't seem to output any common baud values
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_1", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_1", acia6850_device, write_rxc))
MCFG_DEVICE_ADD("acia6850_2", ACIA6850, 0)