diff options
Diffstat (limited to 'src/mame/machine/megadriv.cpp')
-rw-r--r-- | src/mame/machine/megadriv.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index 9eb0ea259c4..4091f2ef70e 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -883,15 +883,15 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(md_base_state::md_ntsc) - MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */ - MCFG_CPU_PROGRAM_MAP(megadriv_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) + MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */ + MCFG_DEVICE_PROGRAM_MAP(megadriv_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) /* IRQs are handled via the timers */ - MCFG_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */ - MCFG_CPU_PROGRAM_MAP(megadriv_z80_map) - MCFG_CPU_IO_MAP(megadriv_z80_io_map) + MCFG_DEVICE_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */ + MCFG_DEVICE_PROGRAM_MAP(megadriv_z80_map) + MCFG_DEVICE_IO_MAP(megadriv_z80_io_map) /* IRQ handled via the timers */ MCFG_MACHINE_START_OVERRIDE(md_base_state,megadriv) @@ -901,9 +901,9 @@ MACHINE_CONFIG_START(md_base_state::md_ntsc) MCFG_DEVICE_ADD("gen_vdp", SEGA315_5313, 0) MCFG_SEGA315_5313_IS_PAL(false) - MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_sndirqline_callback_genesis_z80)); - MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_lv6irqline_callback_genesis_68k)); - MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_lv4irqline_callback_genesis_68k)); + MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_sndirqline_callback_genesis_z80)); + MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_lv6irqline_callback_genesis_68k)); + MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_lv4irqline_callback_genesis_68k)); MCFG_VIDEO_SET_SCREEN("megadriv") MCFG_SCREEN_ADD("megadriv", RASTER) @@ -912,19 +912,19 @@ MACHINE_CONFIG_START(md_base_state::md_ntsc) MCFG_SCREEN_SIZE(64*8, 620) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(md_base_state, screen_update_megadriv) /* Copies a bitmap */ - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_base_state, screen_vblank_megadriv)) /* Used to Sync the timing */ + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_base_state, screen_vblank_megadriv)) /* Used to Sync the timing */ MCFG_VIDEO_START_OVERRIDE(md_base_state, megadriv) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) /* sound hardware */ - MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15) + MCFG_DEVICE_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ MACHINE_CONFIG_END @@ -932,22 +932,22 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(md_cons_state::dcat16_megadriv_base) md_ntsc(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(dcat16_megadriv_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(dcat16_megadriv_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) MACHINE_CONFIG_END /************ PAL hardware has a different master clock *************/ MACHINE_CONFIG_START(md_base_state::md_pal) - MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */ - MCFG_CPU_PROGRAM_MAP(megadriv_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) + MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */ + MCFG_DEVICE_PROGRAM_MAP(megadriv_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) /* IRQs are handled via the timers */ - MCFG_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_PAL / 15) /* 3.58 MHz */ - MCFG_CPU_PROGRAM_MAP(megadriv_z80_map) - MCFG_CPU_IO_MAP(megadriv_z80_io_map) + MCFG_DEVICE_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_PAL / 15) /* 3.58 MHz */ + MCFG_DEVICE_PROGRAM_MAP(megadriv_z80_map) + MCFG_DEVICE_IO_MAP(megadriv_z80_io_map) /* IRQ handled via the timers */ MCFG_MACHINE_START_OVERRIDE(md_base_state,megadriv) @@ -957,9 +957,9 @@ MACHINE_CONFIG_START(md_base_state::md_pal) MCFG_DEVICE_ADD("gen_vdp", SEGA315_5313, 0) MCFG_SEGA315_5313_IS_PAL(true) - MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_sndirqline_callback_genesis_z80)); - MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_lv6irqline_callback_genesis_68k)); - MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_lv4irqline_callback_genesis_68k)); + MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_sndirqline_callback_genesis_z80)); + MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_lv6irqline_callback_genesis_68k)); + MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_lv4irqline_callback_genesis_68k)); MCFG_VIDEO_SET_SCREEN("megadriv") MCFG_SCREEN_ADD("megadriv", RASTER) @@ -968,19 +968,19 @@ MACHINE_CONFIG_START(md_base_state::md_pal) MCFG_SCREEN_SIZE(64*8, 620) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(md_base_state, screen_update_megadriv) /* Copies a bitmap */ - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_base_state, screen_vblank_megadriv)) /* Used to Sync the timing */ + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_base_state, screen_vblank_megadriv)) /* Used to Sync the timing */ MCFG_VIDEO_START_OVERRIDE(md_base_state, megadriv) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) /* sound hardware */ - MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_PAL/15) + MCFG_DEVICE_ADD("snsnd", SEGAPSG, MASTER_CLOCK_PAL/15) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ MACHINE_CONFIG_END |