diff options
Diffstat (limited to 'src/mame/drivers/djboy.cpp')
-rw-r--r-- | src/mame/drivers/djboy.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp index fa061217d6e..c4be26e9f22 100644 --- a/src/mame/drivers/djboy.cpp +++ b/src/mame/drivers/djboy.cpp @@ -481,30 +481,30 @@ void djboy_state::machine_reset() MACHINE_CONFIG_START(djboy_state::djboy) - MCFG_CPU_ADD("mastercpu", Z80, 6000000) - MCFG_CPU_PROGRAM_MAP(mastercpu_am) - MCFG_CPU_IO_MAP(mastercpu_port_am) + MCFG_DEVICE_ADD("mastercpu", Z80, 6000000) + MCFG_DEVICE_PROGRAM_MAP(mastercpu_am) + MCFG_DEVICE_IO_MAP(mastercpu_port_am) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", djboy_state, djboy_scanline, "screen", 0, 1) - MCFG_CPU_ADD("slavecpu", Z80, 6000000) - MCFG_CPU_PROGRAM_MAP(slavecpu_am) - MCFG_CPU_IO_MAP(slavecpu_port_am) - MCFG_CPU_VBLANK_INT_DRIVER("screen", djboy_state, irq0_line_hold) - - MCFG_CPU_ADD("soundcpu", Z80, 6000000) - MCFG_CPU_PROGRAM_MAP(soundcpu_am) - MCFG_CPU_IO_MAP(soundcpu_port_am) - MCFG_CPU_VBLANK_INT_DRIVER("screen", djboy_state, irq0_line_hold) - - MCFG_CPU_ADD("beast", I80C51, 6000000) - MCFG_MCS51_PORT_P0_IN_CB(READ8(djboy_state, beast_p0_r)) - MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(djboy_state, beast_p0_w)) - MCFG_MCS51_PORT_P1_IN_CB(READ8(djboy_state, beast_p1_r)) - MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(djboy_state, beast_p1_w)) - MCFG_MCS51_PORT_P2_IN_CB(READ8(djboy_state, beast_p2_r)) - MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(djboy_state, beast_p2_w)) - MCFG_MCS51_PORT_P3_IN_CB(READ8(djboy_state, beast_p3_r)) - MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(djboy_state, beast_p3_w)) + MCFG_DEVICE_ADD("slavecpu", Z80, 6000000) + MCFG_DEVICE_PROGRAM_MAP(slavecpu_am) + MCFG_DEVICE_IO_MAP(slavecpu_port_am) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", djboy_state, irq0_line_hold) + + MCFG_DEVICE_ADD("soundcpu", Z80, 6000000) + MCFG_DEVICE_PROGRAM_MAP(soundcpu_am) + MCFG_DEVICE_IO_MAP(soundcpu_port_am) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", djboy_state, irq0_line_hold) + + MCFG_DEVICE_ADD("beast", I80C51, 6000000) + MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, djboy_state, beast_p0_r)) + MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, djboy_state, beast_p0_w)) + MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, djboy_state, beast_p1_r)) + MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, djboy_state, beast_p1_w)) + MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, djboy_state, beast_p2_r)) + MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, djboy_state, beast_p2_w)) + MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, djboy_state, beast_p3_r)) + MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, djboy_state, beast_p3_w)) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -520,7 +520,7 @@ MACHINE_CONFIG_START(djboy_state::djboy) MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1) MCFG_SCREEN_UPDATE_DRIVER(djboy_state, screen_update_djboy) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(djboy_state, screen_vblank_djboy)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, djboy_state, screen_vblank_djboy)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", djboy) @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(djboy_state::djboy) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI)) - MCFG_SOUND_ADD("ymsnd", YM2203, 3000000) + MCFG_DEVICE_ADD("ymsnd", YM2203, 3000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) |