diff options
Diffstat (limited to 'src/mame/drivers/calomega.cpp')
-rw-r--r-- | src/mame/drivers/calomega.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp index 5d821c71f50..179aaf8cff0 100644 --- a/src/mame/drivers/calomega.cpp +++ b/src/mame/drivers/calomega.cpp @@ -2573,20 +2573,20 @@ WRITE_LINE_MEMBER(calomega_state::write_acia_clock) MACHINE_CONFIG_START(calomega_state::sys903) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */ - MCFG_CPU_PROGRAM_MAP(sys903_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", calomega_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */ + MCFG_DEVICE_PROGRAM_MAP(sys903_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", calomega_state, irq0_line_hold) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_DEVICE_ADD("pia0", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(calomega_state,s903_mux_port_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state,lamps_903a_w)) + MCFG_PIA_READPA_HANDLER(READ8(*this, calomega_state,s903_mux_port_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state,lamps_903a_w)) MCFG_DEVICE_ADD("pia1", PIA6821, 0) MCFG_PIA_READPA_HANDLER(IOPORT("SW1")) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, lamps_903b_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, s903_mux_w)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, calomega_state, lamps_903b_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, s903_mux_w)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2607,16 +2607,16 @@ MACHINE_CONFIG_START(calomega_state::sys903) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ay8912", AY8912, SND_CLOCK) /* confirmed */ + MCFG_DEVICE_ADD("ay8912", AY8912, SND_CLOCK) /* confirmed */ MCFG_AY8910_PORT_A_READ_CB(IOPORT("SW3")) /* from schematics */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) /* acia */ MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0) - MCFG_ACIA6850_TXD_HANDLER(WRITELINE(calomega_state, write_acia_tx)) + MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, calomega_state, write_acia_tx)) MCFG_DEVICE_ADD("aciabaud", CLOCK, UART_CLOCK) - MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(calomega_state, write_acia_clock)) + MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, calomega_state, write_acia_clock)) MACHINE_CONFIG_END @@ -2625,11 +2625,11 @@ MACHINE_CONFIG_START(calomega_state::s903mod) /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(s903mod_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(s903mod_map) /* sound hardware */ - MCFG_SOUND_MODIFY("ay8912") + MCFG_DEVICE_MODIFY("ay8912") MCFG_AY8910_PORT_A_READ_CB(NOOP) MCFG_DEVICE_REMOVE("acia6850_0") @@ -2643,18 +2643,18 @@ MACHINE_CONFIG_START(calomega_state::sys905) /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(sys905_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(sys905_map) MCFG_DEVICE_MODIFY("pia0") - MCFG_PIA_READPA_HANDLER(READ8(calomega_state,s905_mux_port_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state,lamps_905_w)) + MCFG_PIA_READPA_HANDLER(READ8(*this, calomega_state,s905_mux_port_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state,lamps_905_w)) MCFG_DEVICE_MODIFY("pia1") - MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, s905_mux_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, s905_mux_w)) /* sound hardware */ - MCFG_SOUND_MODIFY("ay8912") + MCFG_DEVICE_MODIFY("ay8912") MCFG_AY8910_PORT_A_READ_CB(NOOP) MCFG_DEVICE_REMOVE("acia6850_0") @@ -2668,26 +2668,26 @@ MACHINE_CONFIG_START(calomega_state::sys906) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", M65C02, CPU_CLOCK) /* guess */ - MCFG_CPU_PROGRAM_MAP(sys906_map) + MCFG_DEVICE_REPLACE("maincpu", M65C02, CPU_CLOCK) /* guess */ + MCFG_DEVICE_PROGRAM_MAP(sys906_map) MCFG_DEVICE_MODIFY("pia0") - MCFG_PIA_READPA_HANDLER(READ8(calomega_state, pia0_ain_r)) - MCFG_PIA_READPB_HANDLER(READ8(calomega_state, pia0_bin_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, pia0_aout_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, pia0_bout_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(calomega_state, pia0_ca2_w)) + MCFG_PIA_READPA_HANDLER(READ8(*this, calomega_state, pia0_ain_r)) + MCFG_PIA_READPB_HANDLER(READ8(*this, calomega_state, pia0_bin_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, calomega_state, pia0_aout_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, pia0_bout_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, calomega_state, pia0_ca2_w)) MCFG_DEVICE_MODIFY("pia1") - MCFG_PIA_READPA_HANDLER(READ8(calomega_state, pia1_ain_r)) - MCFG_PIA_READPB_HANDLER(READ8(calomega_state, pia1_bin_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, pia1_aout_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, pia1_bout_w)) + MCFG_PIA_READPA_HANDLER(READ8(*this, calomega_state, pia1_ain_r)) + MCFG_PIA_READPB_HANDLER(READ8(*this, calomega_state, pia1_bin_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, calomega_state, pia1_aout_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, pia1_bout_w)) MCFG_GFXDECODE_MODIFY("gfxdecode", sys906) /* sound hardware */ - MCFG_SOUND_MODIFY("ay8912") + MCFG_DEVICE_MODIFY("ay8912") MCFG_AY8910_PORT_A_READ_CB(IOPORT("SW2")) /* From PCB pic. Value is stored at $0539 */ MCFG_DEVICE_REMOVE("acia6850_0") |