diff options
Diffstat (limited to 'src/mame/drivers/raiden.cpp')
-rw-r--r-- | src/mame/drivers/raiden.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index 2a5e21b468d..104a548f7ac 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -337,14 +337,14 @@ WRITE_LINE_MEMBER(raiden_state::vblank_irq) MACHINE_CONFIG_START(raiden_state::raiden) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */ - MCFG_CPU_PROGRAM_MAP(main_map) + MCFG_DEVICE_ADD("maincpu", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(main_map) - MCFG_CPU_ADD("sub", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */ - MCFG_CPU_PROGRAM_MAP(sub_map) + MCFG_DEVICE_ADD("sub", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(sub_map) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(seibu_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) @@ -357,8 +357,8 @@ MACHINE_CONFIG_START(raiden_state::raiden) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(raiden_state, screen_update_raiden) - MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) - MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(raiden_state, vblank_irq)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, raiden_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden) @@ -368,8 +368,8 @@ MACHINE_CONFIG_START(raiden_state::raiden) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) - MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) + MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) + MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) // frequency and pin 7 verified @@ -378,15 +378,15 @@ MACHINE_CONFIG_START(raiden_state::raiden) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") - MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) - MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) + MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read)) + MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END MACHINE_CONFIG_START(raiden_state::raidene) raiden(config); MCFG_DEVICE_MODIFY("audiocpu") - MCFG_CPU_PROGRAM_MAP(raiden_sound_map) - MCFG_CPU_OPCODES_MAP(raiden_sound_decrypted_opcodes_map) + MCFG_DEVICE_PROGRAM_MAP(raiden_sound_map) + MCFG_DEVICE_OPCODES_MAP(raiden_sound_decrypted_opcodes_map) MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0) MCFG_DEVICE_PROGRAM_MAP(sei80bu_encrypted_full_map) @@ -396,11 +396,11 @@ MACHINE_CONFIG_START(raiden_state::raidenu) raidene(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(raidenu_main_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(raidenu_main_map) - MCFG_CPU_MODIFY("sub") - MCFG_CPU_PROGRAM_MAP(raidenu_sub_map) + MCFG_DEVICE_MODIFY("sub") + MCFG_DEVICE_PROGRAM_MAP(raidenu_sub_map) MACHINE_CONFIG_END WRITE16_MEMBER( raiden_state::raidenb_layer_scroll_w ) @@ -412,26 +412,26 @@ MACHINE_CONFIG_START(raiden_state::raidenkb) raiden(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_CLOCK(XTAL(32'000'000) / 4) // Xtal and clock verified + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_CLOCK(XTAL(32'000'000) / 4) // Xtal and clock verified - MCFG_CPU_MODIFY("sub") - MCFG_CPU_CLOCK(XTAL(32'000'000) / 4) // Xtal and clock verified + MCFG_DEVICE_MODIFY("sub") + MCFG_DEVICE_CLOCK(XTAL(32'000'000) / 4) // Xtal and clock verified MACHINE_CONFIG_END MACHINE_CONFIG_START(raiden_state::raidenb) raiden(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(raidenb_main_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(raidenb_main_map) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(raiden_state,raidenb) MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0) - MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(raiden_state, raidenb_layer_enable_w)) - MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(raiden_state, raidenb_layer_scroll_w)) + MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden_state, raidenb_layer_enable_w)) + MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, raiden_state, raidenb_layer_scroll_w)) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(raiden_state, screen_update_raidenb) |