diff options
author | MooglyGuy <therealmogminer@gmail.com> | 2018-05-16 09:37:54 +0200 |
---|---|---|
committer | mooglyguy <therealmogminer@gmail.com> | 2018-05-16 11:58:08 +0200 |
commit | c83e2a853d4e1643fcc85b68ada3c6f7f33adea4 (patch) | |
tree | 39b249e1a0a9b2056e9815d0a284fd483338362c /src | |
parent | 2242ff00893a83a113150609bd525f098d632e8d (diff) |
- Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
uglier, but this is intended to discourage ongoing use, and will be gradually eliminated.
Diffstat (limited to 'src')
1014 files changed, 6114 insertions, 6222 deletions
diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp index 7ea66ddac90..453aec12aa4 100644 --- a/src/devices/video/stvvdp2.cpp +++ b/src/devices/video/stvvdp2.cpp @@ -2251,7 +2251,7 @@ uint8_t saturn_state::stv_vdp2_is_rotation_applied(void) RP.dx == _FIXED_1 && RP.dy == _FIXED_0 && RP.kx == _FIXED_1 && - RP.ky == _FIXED_1 && + RP.ky == _FIXED_1 && STV_VDP2_RPMD < 2) // disable optimizations if roz mode is 2 or 3 { return 0; @@ -4449,7 +4449,7 @@ void saturn_state::stv_vdp2_check_tilemap(bitmap_rgb32 &bitmap, const rectangle if ( stv2_current_tilemap.linescroll_enable || stv2_current_tilemap.vertical_linescroll_enable || - stv2_current_tilemap.linezoom_enable || + stv2_current_tilemap.linezoom_enable || stv2_current_tilemap.vertical_cell_scroll_enable) { // check for vertical cell scroll enable (Sonic Jam) @@ -4462,11 +4462,11 @@ void saturn_state::stv_vdp2_check_tilemap(bitmap_rgb32 &bitmap, const rectangle int16_t base_scrollx, base_scrolly; //uint32_t base_incx, base_incy; int cur_char = 0; - + base_mask = STV_VDP2_VRAMSZ ? 0x7ffff : 0x3ffff; vcsc_address = (((STV_VDP2_VCSTAU << 16) | STV_VDP2_VCSTAL) & base_mask) * 2; vcsc_address >>= 2; - + base_offset = 0; base_multiplier = 1; // offset for both enabled @@ -4475,26 +4475,26 @@ void saturn_state::stv_vdp2_check_tilemap(bitmap_rgb32 &bitmap, const rectangle // NBG1 if(stv2_current_tilemap.layer_name & 1) base_offset = 1; - + base_multiplier = 2; } - + base_scrollx = stv2_current_tilemap.scrollx; base_scrolly = stv2_current_tilemap.scrolly; //base_incx = stv2_current_tilemap.incx; //base_incy = stv2_current_tilemap.incy; - + while(cur_char <= cliprect.max_x) { mycliprect.min_x = cur_char; mycliprect.max_x = cur_char + 8 - 1; - + uint32_t cur_address; int16_t char_scroll; - + cur_address = vcsc_address; cur_address += ((cur_char >> 3) * base_multiplier) + base_offset; - + char_scroll = m_vdp2_vram[ cur_address ] >> 16; char_scroll &= 0x07ff; if ( char_scroll & 0x0400 ) char_scroll |= 0xf800; @@ -4504,7 +4504,7 @@ void saturn_state::stv_vdp2_check_tilemap(bitmap_rgb32 &bitmap, const rectangle //stv2_current_tilemap.incy = base_incy; stv_vdp2_check_tilemap_with_linescroll(bitmap, mycliprect); - + // TODO: + 16 for tilemap and char size = 16? cur_char += 8; @@ -4512,10 +4512,10 @@ void saturn_state::stv_vdp2_check_tilemap(bitmap_rgb32 &bitmap, const rectangle } else stv_vdp2_check_tilemap_with_linescroll(bitmap, cliprect); - + return; } - + if (stv2_current_tilemap.bitmap_enable) // this layer is a bitmap { stv_vdp2_draw_basic_bitmap(bitmap, mycliprect); @@ -5047,7 +5047,7 @@ inline bool saturn_state::stv_vdp2_roz_mode3_window(int x, int y, int rot_parame uint8_t w1_enable = STV_VDP2_RPW1E; uint8_t w0_area = STV_VDP2_RPW0A; uint8_t w1_area = STV_VDP2_RPW1A; - + if (w0_enable == 0 && w1_enable == 0) return rot_parameter ^ 1; @@ -6359,7 +6359,7 @@ int saturn_state::stv_vdp2_start ( void ) } /* maybe we should move this to video/stv.c */ -VIDEO_START_MEMBER(saturn_state,stv_vdp2) +void saturn_state::video_start_stv_vdp2() { int i; m_screen->register_screen_bitmap(m_tmpbitmap); @@ -6508,7 +6508,7 @@ void saturn_state::stv_vdp2_get_window0_coordinates(int *s_x, int *e_x, int *s_y // double density makes the line window to fetch data every two lines uint8_t interlace = (STV_VDP2_LSMD == 3); uint32_t vram_data = m_vdp2_vram[(address >> 2)+(y >> interlace)]; - + *s_x = (vram_data >> 16) & 0x3ff; *e_x = (vram_data & 0x3ff); } @@ -6568,7 +6568,7 @@ void saturn_state::stv_vdp2_get_window1_coordinates(int *s_x, int *e_x, int *s_y // double density makes the line window to fetch data every two lines uint8_t interlace = (STV_VDP2_LSMD == 3); uint32_t vram_data = m_vdp2_vram[(address >> 2)+(y >> interlace)]; - + *s_x = (vram_data >> 16) & 0x3ff; *e_x = (vram_data & 0x3ff); } @@ -6865,7 +6865,7 @@ void saturn_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect, pix &= 0x7ff; pix += color_offset_pal; bitmap_line[x] = m_palette->pen( pix ); - + } } diff --git a/src/emu/driver.h b/src/emu/driver.h index 5711012188e..ce23c486e6c 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -22,67 +22,11 @@ // CONFIGURATION MACROS //************************************************************************** -// core machine callbacks -#define MCFG_MACHINE_START_OVERRIDE(_class, _func) \ - driver_device::static_set_callback(config.root_device(), driver_device::CB_MACHINE_START, driver_callback_delegate(&_class::MACHINE_START_NAME(_func), this)); - -#define MCFG_MACHINE_RESET_OVERRIDE(_class, _func) \ - driver_device::static_set_callback(config.root_device(), driver_device::CB_MACHINE_RESET, driver_callback_delegate(&_class::MACHINE_RESET_NAME(_func), this)); - -#define MCFG_MACHINE_RESET_REMOVE() \ - driver_device::static_set_callback(config.root_device(), driver_device::CB_MACHINE_RESET, driver_callback_delegate()); - -// core sound callbacks -#define MCFG_SOUND_START_OVERRIDE(_class, _func) \ - driver_device::static_set_callback(config.root_device(), driver_device::CB_SOUND_START, driver_callback_delegate(&_class::SOUND_START_NAME(_func), this)); - -#define MCFG_SOUND_RESET_OVERRIDE(_class, _func) \ - driver_device::static_set_callback(config.root_device(), driver_device::CB_SOUND_RESET, driver_callback_delegate(&_class::SOUND_RESET_NAME(_func), this)); - - -// core video callbacks -#define MCFG_VIDEO_START_OVERRIDE(_class, _func) \ - driver_device::static_set_callback(config.root_device(), driver_device::CB_VIDEO_START, driver_callback_delegate(&_class::VIDEO_START_NAME(_func), this)); - -#define MCFG_VIDEO_RESET_OVERRIDE(_class, _func) \ - driver_device::static_set_callback(config.root_device(), driver_device::CB_VIDEO_RESET, driver_callback_delegate(&_class::VIDEO_RESET_NAME(_func), this)); - - //************************************************************************** // OTHER MACROS //************************************************************************** -#define MACHINE_START_NAME(name) machine_start_##name -#define MACHINE_START_CALL_MEMBER(name) MACHINE_START_NAME(name)() -#define DECLARE_MACHINE_START(name) void MACHINE_START_NAME(name)() ATTR_COLD -#define MACHINE_START_MEMBER(cls,name) void cls::MACHINE_START_NAME(name)() - -#define MACHINE_RESET_NAME(name) machine_reset_##name -#define MACHINE_RESET_CALL_MEMBER(name) MACHINE_RESET_NAME(name)() -#define DECLARE_MACHINE_RESET(name) void MACHINE_RESET_NAME(name)() -#define MACHINE_RESET_MEMBER(cls,name) void cls::MACHINE_RESET_NAME(name)() - -#define SOUND_START_NAME(name) sound_start_##name -#define DECLARE_SOUND_START(name) void SOUND_START_NAME(name)() ATTR_COLD -#define SOUND_START_MEMBER(cls,name) void cls::SOUND_START_NAME(name)() - -#define SOUND_RESET_NAME(name) sound_reset_##name -#define SOUND_RESET_CALL_MEMBER(name) SOUND_RESET_NAME(name)() -#define DECLARE_SOUND_RESET(name) void SOUND_RESET_NAME(name)() -#define SOUND_RESET_MEMBER(cls,name) void cls::SOUND_RESET_NAME(name)() - -#define VIDEO_START_NAME(name) video_start_##name -#define VIDEO_START_CALL_MEMBER(name) VIDEO_START_NAME(name)() -#define DECLARE_VIDEO_START(name) void VIDEO_START_NAME(name)() ATTR_COLD -#define VIDEO_START_MEMBER(cls,name) void cls::VIDEO_START_NAME(name)() - -#define VIDEO_RESET_NAME(name) video_reset_##name -#define VIDEO_RESET_CALL_MEMBER(name) VIDEO_RESET_NAME(name)() -#define DECLARE_VIDEO_RESET(name) void VIDEO_RESET_NAME(name)() -#define VIDEO_RESET_MEMBER(cls,name) void cls::VIDEO_RESET_NAME(name)() - - //************************************************************************** // TYPE DEFINITIONS @@ -120,6 +64,13 @@ public: // inline configuration helpers void set_game_driver(const game_driver &game); static void static_set_callback(device_t &device, callback_type type, driver_callback_delegate callback); + static void set_machine_start_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_MACHINE_START, callback); } + static void set_machine_reset_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_MACHINE_RESET, callback); } + static void set_sound_start_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_SOUND_START, callback); } + static void set_sound_reset_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_SOUND_RESET, callback); } + static void set_video_start_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_VIDEO_START, callback); } + static void set_video_reset_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_VIDEO_RESET, callback); } + static void remove_machine_reset_cb(machine_config &config) { static_set_callback(config.root_device(), CB_MACHINE_RESET, driver_callback_delegate()); } // dummy driver_init callback void empty_init(); diff --git a/src/mame/audio/8080bw.cpp b/src/mame/audio/8080bw.cpp index 518d1db7a0b..6add055dafb 100644 --- a/src/mame/audio/8080bw.cpp +++ b/src/mame/audio/8080bw.cpp @@ -15,7 +15,7 @@ /* */ /*******************************************************/ -MACHINE_START_MEMBER(_8080bw_state,extra_8080bw_sh) +void _8080bw_state::machine_start_extra_8080bw_sh() { save_item(NAME(m_port_1_last_extra)); save_item(NAME(m_port_2_last_extra)); @@ -970,7 +970,7 @@ void _8080bw_state::schaser_reinit_555_time_remain() } -MACHINE_START_MEMBER(_8080bw_state,schaser_sh) +void _8080bw_state::machine_start_schaser_sh() { save_item(NAME(m_schaser_explosion)); save_item(NAME(m_schaser_effect_555_is_low)); @@ -980,7 +980,7 @@ MACHINE_START_MEMBER(_8080bw_state,schaser_sh) } -MACHINE_RESET_MEMBER(_8080bw_state,schaser_sh) +void _8080bw_state::machine_reset_schaser_sh() { address_space &space = m_maincpu->space(AS_PROGRAM); diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp index 171de55408f..18c49e95f85 100644 --- a/src/mame/audio/cinemat.cpp +++ b/src/mame/audio/cinemat.cpp @@ -1354,7 +1354,7 @@ WRITE8_MEMBER(cinemat_state::sound_output_w) logerror("sound_output = %02X\n", data); } -SOUND_RESET_MEMBER( cinemat_state, demon ) +void cinemat_state::sound_reset_demon() { /* generic init */ sound_reset(); @@ -1408,7 +1408,7 @@ MACHINE_CONFIG_START(cinemat_state::demon_sound) MCFG_DEVICE_ADD("ctc", Z80CTC, 3579545 /* same as "audiocpu" */) MCFG_Z80CTC_INTR_CB(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) - MCFG_SOUND_RESET_OVERRIDE(cinemat_state, demon) + set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_demon, this)); MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, demon_sound4_w)) @@ -1447,9 +1447,9 @@ WRITE8_MEMBER(cinemat_state::qb3_sound_fifo_w) } -SOUND_RESET_MEMBER( cinemat_state, qb3 ) +void cinemat_state::sound_reset_qb3() { - SOUND_RESET_CALL_MEMBER(demon); + sound_reset_demon(); /* this patch prevents the sound ROM from eating itself when command $0A is sent */ /* on a cube rotate */ @@ -1459,7 +1459,7 @@ SOUND_RESET_MEMBER( cinemat_state, qb3 ) MACHINE_CONFIG_START(cinemat_state::qb3_sound) demon_sound(config); - MCFG_SOUND_RESET_OVERRIDE(cinemat_state, qb3) + set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_qb3, this)); MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // not mapped through LS259 diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index f4d9781f174..82676f0f53d 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -18,7 +18,7 @@ * *************************************/ -SOUND_START_MEMBER( mw8080bw_state, samples ) +void mw8080bw_state::sound_start_samples() { /* setup for save states */ save_item(NAME(m_port_1_last)); @@ -145,7 +145,7 @@ static const char *const seawolf_sample_names[] = }; MACHINE_CONFIG_START(mw8080bw_state::seawolf_audio) - MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this)); SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) @@ -199,7 +199,7 @@ static const char *const gunfight_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::gunfight_audio) - MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1544,7 +1544,7 @@ static const char *const gmissile_sample_names[] = }; MACHINE_CONFIG_START(mw8080bw_state::gmissile_audio) - MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1638,7 +1638,7 @@ static const char *const m4_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::m4_audio) - MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1894,7 +1894,7 @@ static const char *const clowns_sample_names[] = }; MACHINE_CONFIG_START(mw8080bw_state::clowns_audio) - MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this)); SPEAKER(config, "mono").front_center(); @@ -3263,7 +3263,7 @@ static const char *const phantom2_sample_names[] = }; MACHINE_CONFIG_START(mw8080bw_state::phantom2_audio) - MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this)); SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) @@ -3507,7 +3507,7 @@ static const char *const invaders_sample_names[] = /* left in for all games that hack into invaders samples for audio */ MACHINE_CONFIG_START(mw8080bw_state::invaders_samples_audio) - MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this)); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp index d311fe1e21d..7720c28deb7 100644 --- a/src/mame/audio/n8080.cpp +++ b/src/mame/audio/n8080.cpp @@ -377,7 +377,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(n8080_state::helifire_dac_volume_timer) } -SOUND_START_MEMBER(n8080_state,spacefev) +void n8080_state::sound_start_spacefev() { m_sound_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this)); m_sound_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this)); @@ -390,7 +390,7 @@ SOUND_START_MEMBER(n8080_state,spacefev) save_item(NAME(m_mono_flop)); } -SOUND_RESET_MEMBER(n8080_state,spacefev) +void n8080_state::sound_reset_spacefev() { m_n8080_hardware = 1; @@ -406,7 +406,7 @@ SOUND_RESET_MEMBER(n8080_state,spacefev) } -SOUND_START_MEMBER(n8080_state,sheriff) +void n8080_state::sound_start_sheriff() { m_sound_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this)); m_sound_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this)); @@ -418,7 +418,7 @@ SOUND_START_MEMBER(n8080_state,sheriff) save_item(NAME(m_mono_flop)); } -SOUND_RESET_MEMBER(n8080_state,sheriff) +void n8080_state::sound_reset_sheriff() { m_n8080_hardware = 2; @@ -433,7 +433,7 @@ SOUND_RESET_MEMBER(n8080_state,sheriff) } -SOUND_START_MEMBER(n8080_state,helifire) +void n8080_state::sound_start_helifire() { save_item(NAME(m_prev_snd_data)); save_item(NAME(m_prev_sound_pins)); @@ -444,7 +444,7 @@ SOUND_START_MEMBER(n8080_state,helifire) save_item(NAME(m_helifire_dac_phase)); } -SOUND_RESET_MEMBER(n8080_state,helifire) +void n8080_state::sound_reset_helifire() { m_n8080_hardware = 3; @@ -475,8 +475,8 @@ void n8080_state::helifire_sound_io_map(address_map &map) MACHINE_CONFIG_START(n8080_state::spacefev_sound) - MCFG_SOUND_START_OVERRIDE(n8080_state,spacefev) - MCFG_SOUND_RESET_OVERRIDE(n8080_state,spacefev) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_spacefev, this)); + set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_spacefev, this)); /* basic machine hardware */ MCFG_DEVICE_ADD("audiocpu", I8035, 6000000) @@ -515,8 +515,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(n8080_state::sheriff_sound) - MCFG_SOUND_START_OVERRIDE(n8080_state,sheriff) - MCFG_SOUND_RESET_OVERRIDE(n8080_state,sheriff) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_sheriff, this)); + set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_sheriff, this)); /* basic machine hardware */ MCFG_DEVICE_ADD("audiocpu", I8035, 6000000) @@ -553,8 +553,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(n8080_state::helifire_sound) - MCFG_SOUND_START_OVERRIDE(n8080_state,helifire) - MCFG_SOUND_RESET_OVERRIDE(n8080_state,helifire) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_helifire, this)); + set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_helifire, this)); /* basic machine hardware */ MCFG_DEVICE_ADD("audiocpu", I8035, 6000000) diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp index db7e75138cd..6ceb5de3a47 100644 --- a/src/mame/audio/redalert.cpp +++ b/src/mame/audio/redalert.cpp @@ -130,7 +130,7 @@ void redalert_state::redalert_audio_map(address_map &map) * *************************************/ -SOUND_START_MEMBER(redalert_state,redalert) +void redalert_state::sound_start_redalert() { save_item(NAME(m_ay8910_latch_1)); save_item(NAME(m_ay8910_latch_2)); @@ -227,7 +227,7 @@ MACHINE_CONFIG_START(redalert_state::redalert_audio) redalert_audio_m37b(config); redalert_audio_voice(config); - MCFG_SOUND_START_OVERRIDE( redalert_state, redalert ) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_redalert, this)); MACHINE_CONFIG_END @@ -243,7 +243,7 @@ MACHINE_CONFIG_START(redalert_state::ww3_audio) redalert_audio_m37b(config); - MCFG_SOUND_START_OVERRIDE( redalert_state, redalert ) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_redalert, this)); MACHINE_CONFIG_END @@ -330,7 +330,7 @@ void redalert_state::demoneye_audio_map(address_map &map) * *************************************/ -SOUND_START_MEMBER( redalert_state, demoneye ) +void redalert_state::sound_start_demoneye() { save_item(NAME(m_ay8910_latch_1)); save_item(NAME(m_ay8910_latch_2)); @@ -355,7 +355,7 @@ MACHINE_CONFIG_START(redalert_state::demoneye_audio) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_data_w)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_latch_1_w)) - MCFG_SOUND_START_OVERRIDE( redalert_state, demoneye ) + set_sound_start_cb(config, driver_callback_delegate(&sound_start_demoneye, this)); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index 1b2f6af170b..f059f472f34 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -128,7 +128,7 @@ TIMER_CALLBACK_MEMBER( vicdual_state::frogs_croak_callback ) } -MACHINE_START_MEMBER(vicdual_state,frogs_audio) +void vicdual_state::machine_start_frogs_audio() { m_frogs_croak_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vicdual_state::frogs_croak_callback), this)); diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp index c9726cb027d..fe3edbc5338 100644 --- a/src/mame/drivers/1942.cpp +++ b/src/mame/drivers/1942.cpp @@ -646,7 +646,7 @@ MACHINE_CONFIG_START(_1942_state::_1942p) MCFG_PALETTE_INDIRECT_ENTRIES(0x400) MCFG_PALETTE_INIT_OWNER(_1942_state, 1942p) - MCFG_VIDEO_START_OVERRIDE(_1942_state,c1942p) + set_video_start_cb(config, driver_callback_delegate(&video_start_c1942p, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index a5496117458..ccc91b13666 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -64,8 +64,8 @@ public: DECLARE_READ16_MEMBER(drill_irq_r); DECLARE_WRITE16_MEMBER(drill_irq_w); void init_drill(); - DECLARE_MACHINE_START(drill); - DECLARE_MACHINE_RESET(drill); + void machine_start_drill() ATTR_COLD; + void machine_reset_drill(); INTERRUPT_GEN_MEMBER(drill_vblank_irq); //INTERRUPT_GEN_MEMBER(drill_device_irq); void tile_decode(); @@ -339,14 +339,14 @@ WRITE_LINE_MEMBER(_2mindril_state::irqhandler) } -MACHINE_START_MEMBER(_2mindril_state,drill) +void _2mindril_state::machine_start_drill() { save_item(NAME(m_defender_sensor)); save_item(NAME(m_shutter_sensor)); save_item(NAME(m_irq_reg)); } -MACHINE_RESET_MEMBER(_2mindril_state,drill) +void _2mindril_state::machine_reset_drill() { m_defender_sensor = 0; m_shutter_sensor = 0; @@ -368,8 +368,8 @@ MACHINE_CONFIG_START(_2mindril_state::drill) MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, _2mindril_state, coins_w)) MCFG_TC0510NIO_READ_7_CB(IOPORT("COINS")) - MCFG_MACHINE_START_OVERRIDE(_2mindril_state,drill) - MCFG_MACHINE_RESET_OVERRIDE(_2mindril_state,drill) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_drill, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_drill, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(_2mindril_state::drill) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(_2mindril_state,f3) + set_video_start_cb(config, driver_callback_delegate(&video_start_f3, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp index 15ba7da8921..9e9bffd0032 100644 --- a/src/mame/drivers/39in1.cpp +++ b/src/mame/drivers/39in1.cpp @@ -85,7 +85,7 @@ private: DECLARE_READ32_MEMBER(cpld_r); DECLARE_WRITE32_MEMBER(cpld_w); DECLARE_READ32_MEMBER(prot_cheater_r); - DECLARE_MACHINE_START(60in1); + void machine_start_60in1() ATTR_COLD; virtual void machine_start() override; uint32_t screen_update_39in1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(pxa255_vblank_start); @@ -1567,7 +1567,7 @@ void _39in1_state::machine_start() pxa255_start(); } -MACHINE_START_MEMBER(_39in1_state,60in1) +void _39in1_state::machine_start_60in1() { uint8_t *ROM = memregion("maincpu")->base(); int i; @@ -1611,7 +1611,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(_39in1_state::_60in1) _39in1(config); - MCFG_MACHINE_START_OVERRIDE(_39in1_state,60in1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_60in1, this)); MACHINE_CONFIG_END ROM_START( 39in1 ) diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp index 74e15f4bf0e..e3fde1a371f 100644 --- a/src/mame/drivers/3do.cpp +++ b/src/mame/drivers/3do.cpp @@ -165,7 +165,7 @@ MACHINE_CONFIG_START(_3do_state::_3do) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_x16", _3do_state, timer_x16_cb, attotime::from_hz(12000)) // TODO: timing - MCFG_VIDEO_START_OVERRIDE(_3do_state, _3do ) + set_video_start_cb(config, driver_callback_delegate(&video_start__3do, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS( X2_CLOCK_NTSC / 2, 1592, 254, 1534, 263, 22, 262 ) diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp index f59a4b1edc9..966bd480a03 100644 --- a/src/mame/drivers/40love.cpp +++ b/src/mame/drivers/40love.cpp @@ -664,7 +664,7 @@ GFXDECODE_END /*******************************************************************************/ -MACHINE_START_MEMBER(fortyl_state,40love) +void fortyl_state::machine_start_40love() { /* video */ save_item(NAME(m_pix1)); @@ -680,9 +680,9 @@ MACHINE_START_MEMBER(fortyl_state,40love) } -MACHINE_RESET_MEMBER(fortyl_state,common) +void fortyl_state::machine_reset_common() { - //MACHINE_RESET_CALL_MEMBER(ta7630); + //machine_reset_ta7630(); /* video */ m_pix1 = 0; @@ -697,9 +697,9 @@ MACHINE_RESET_MEMBER(fortyl_state,common) m_snd_ctrl3 = 0; } -MACHINE_RESET_MEMBER(fortyl_state,40love) +void fortyl_state::machine_reset_40love() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); } MACHINE_CONFIG_START(fortyl_state::_40love) @@ -724,8 +724,8 @@ MACHINE_CONFIG_START(fortyl_state::_40love) MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, 18432000/6) /* OK */ MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* high interleave to ensure proper synchronization of CPUs */ - MCFG_MACHINE_START_OVERRIDE(fortyl_state,40love) - MCFG_MACHINE_RESET_OVERRIDE(fortyl_state,40love) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_40love, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_40love, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -790,8 +790,8 @@ MACHINE_CONFIG_START(fortyl_state::undoukai) MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, 18432000/6) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_START_OVERRIDE(fortyl_state,40love) - MCFG_MACHINE_RESET_OVERRIDE(fortyl_state,40love) /* init machine */ + set_machine_start_cb(config, driver_callback_delegate(&machine_start_40love, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_40love, this)); /* init machine */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp index 98feee3d6f3..eb1befaa9a3 100644 --- a/src/mame/drivers/4roses.cpp +++ b/src/mame/drivers/4roses.cpp @@ -462,7 +462,7 @@ MACHINE_CONFIG_START(_4roses_state::_4roses) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_INIT_OWNER(_4roses_state,funworld) - MCFG_VIDEO_START_OVERRIDE(_4roses_state,funworld) + set_video_start_cb(config, driver_callback_delegate(&video_start_funworld, this)); MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/8) /* 2MHz, guess */ MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index 72174600ad8..083a7a9b8ee 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -215,11 +215,11 @@ /* */ /*******************************************************/ -MACHINE_START_MEMBER(_8080bw_state,extra_8080bw) +void _8080bw_state::machine_start_extra_8080bw() { - MACHINE_START_CALL_MEMBER(extra_8080bw_sh); - MACHINE_START_CALL_MEMBER(extra_8080bw_vh); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_extra_8080bw_sh(); + machine_start_extra_8080bw_vh(); + machine_start_mw8080bw(); } /*******************************************************/ @@ -412,7 +412,7 @@ MACHINE_CONFIG_START(_8080bw_state::invadpt2) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(invadpt2_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* 60 Hz signal clocks two LS161. Ripple carry will */ /* reset circuit, if LS161 not cleared before. */ @@ -500,7 +500,7 @@ MACHINE_CONFIG_START(_8080bw_state::spcewars) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(spcewars_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -668,7 +668,7 @@ MACHINE_CONFIG_START(_8080bw_state::cosmo) MCFG_DEVICE_PROGRAM_MAP(cosmo_map) MCFG_DEVICE_IO_MAP(cosmo_io_map) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -828,8 +828,8 @@ MACHINE_CONFIG_START(_8080bw_state::spacecom) MCFG_DEVICE_PROGRAM_MAP(spacecom_map) MCFG_DEVICE_IO_MAP(spacecom_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state, mw8080bw) - MCFG_MACHINE_RESET_OVERRIDE(mw8080bw_state, mw8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mw8080bw, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -949,7 +949,7 @@ MACHINE_CONFIG_START(_8080bw_state::invrvnge) /* add shifter */ MCFG_MB14241_ADD("mb14241") - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1122,7 +1122,7 @@ MACHINE_CONFIG_START(_8080bw_state::lrescue) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(lrescue_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -1153,8 +1153,8 @@ MACHINE_CONFIG_START(_8080bw_state::escmars) MCFG_DEVICE_PROGRAM_MAP(escmars_map) MCFG_DEVICE_IO_MAP(lrescue_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state, extra_8080bw) - MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -1253,7 +1253,7 @@ MACHINE_CONFIG_START(_8080bw_state::cosmicmo) MCFG_DEVICE_IO_MAP(cosmicmo_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_VBLANK_INIT("screen", 255) @@ -1388,14 +1388,14 @@ static INPUT_PORTS_START( rollingc ) PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x00, "SW1:4" ) INPUT_PORTS_END -MACHINE_START_MEMBER(_8080bw_state,rollingc) +void _8080bw_state::machine_start_rollingc() { m_scattered_colorram = std::make_unique<uint8_t []>(0x400); m_scattered_colorram2 = std::make_unique<uint8_t []>(0x400); save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x400); save_pointer(&m_scattered_colorram2[0], "m_scattered_colorram2", 0x400); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } MACHINE_CONFIG_START(_8080bw_state::rollingc) @@ -1419,7 +1419,7 @@ MACHINE_CONFIG_START(_8080bw_state::rollingc) /* sound hardware */ invaders_samples_audio(config); - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,rollingc) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_rollingc, this)); MACHINE_CONFIG_END @@ -1526,19 +1526,19 @@ static INPUT_PORTS_START( schaserm ) PORT_DIPSETTING( 0x03, "4" ) INPUT_PORTS_END -MACHINE_START_MEMBER(_8080bw_state,schaser) +void _8080bw_state::machine_start_schaser() { m_scattered_colorram = std::make_unique<uint8_t []>(0x800); save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x800); - MACHINE_START_CALL_MEMBER(schaser_sh); - MACHINE_START_CALL_MEMBER(extra_8080bw_vh); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_schaser_sh(); + machine_start_extra_8080bw_vh(); + machine_start_mw8080bw(); } -MACHINE_RESET_MEMBER(_8080bw_state,schaser) +void _8080bw_state::machine_reset_schaser() { - MACHINE_RESET_CALL_MEMBER(schaser_sh); - MACHINE_RESET_CALL_MEMBER(mw8080bw); + machine_reset_schaser_sh(); + machine_reset_mw8080bw(); } MACHINE_CONFIG_START(_8080bw_state::schaser) @@ -1551,8 +1551,8 @@ MACHINE_CONFIG_START(_8080bw_state::schaser) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_VBLANK_INIT("screen", 255) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,schaser) - MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state,schaser) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_schaser, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_schaser, this)); MCFG_TIMER_DRIVER_ADD("schaser_sh_555", _8080bw_state, schaser_effect_555_cb) @@ -1667,14 +1667,14 @@ static INPUT_PORTS_START( schasercv ) INVADERS_CAB_TYPE_PORT INPUT_PORTS_END -MACHINE_START_MEMBER(_8080bw_state,schasercv) +void _8080bw_state::machine_start_schasercv() { m_scattered_colorram = std::make_unique<uint8_t []>(0x800); save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x800); - MACHINE_START_CALL_MEMBER(extra_8080bw_sh); - MACHINE_START_CALL_MEMBER(extra_8080bw_vh); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_extra_8080bw_sh(); + machine_start_extra_8080bw_vh(); + machine_start_mw8080bw(); } MACHINE_CONFIG_START(_8080bw_state::schasercv) @@ -1684,7 +1684,7 @@ MACHINE_CONFIG_START(_8080bw_state::schasercv) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(schaser_map) MCFG_DEVICE_IO_MAP(schasercv_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state, schasercv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_schasercv, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -1768,12 +1768,12 @@ static INPUT_PORTS_START( sflush ) INPUT_PORTS_END -MACHINE_START_MEMBER(_8080bw_state,sflush) +void _8080bw_state::machine_start_sflush() { m_scattered_colorram = std::make_unique<uint8_t []>(0x800); save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x800); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } MACHINE_CONFIG_START(_8080bw_state::sflush) @@ -1783,7 +1783,7 @@ MACHINE_CONFIG_START(_8080bw_state::sflush) MCFG_DEVICE_REPLACE("maincpu",M6800,1500000) // ? MCFG_DEVICE_PROGRAM_MAP(sflush_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,sflush) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sflush, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -1888,7 +1888,7 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(lupin3_io_map) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -1931,7 +1931,7 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3a) lupin3(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(schaser_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,sflush) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sflush, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(_8080bw_state, screen_update_lupin3) @@ -1958,14 +1958,14 @@ INTERRUPT_GEN_MEMBER(_8080bw_state::polaris_interrupt) } } -MACHINE_START_MEMBER(_8080bw_state,polaris) +void _8080bw_state::machine_start_polaris() { m_scattered_colorram = std::make_unique<uint8_t []>(0x800); save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x800); save_item(NAME(m_polaris_cloud_speed)); save_item(NAME(m_polaris_cloud_pos)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } READ8_MEMBER(_8080bw_state::polaris_port00_r) @@ -2059,7 +2059,7 @@ MACHINE_CONFIG_START(_8080bw_state::polaris) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_VBLANK_INIT("screen", 255) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,polaris) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_polaris, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -2186,7 +2186,7 @@ MACHINE_CONFIG_START(_8080bw_state::ballbomb) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(ballbomb_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -2269,7 +2269,7 @@ MACHINE_CONFIG_START(_8080bw_state::yosakdon) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(yosakdon_map) MCFG_DEVICE_IO_MAP(yosakdon_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* sound hardware */ invaders_samples_audio(config); @@ -2435,7 +2435,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbt) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(indianbt_io_map) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -2461,7 +2461,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbtbr) MCFG_DEVICE_PROGRAM_MAP(schaser_map) MCFG_DEVICE_IO_MAP(indianbtbr_io_map) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -2536,7 +2536,7 @@ MACHINE_CONFIG_START(_8080bw_state::steelwkr) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(steelwkr_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); /* add shifter */ MCFG_MB14241_ADD("mb14241") @@ -2758,8 +2758,8 @@ MACHINE_CONFIG_START(_8080bw_state::shuttlei) MCFG_DEVICE_PROGRAM_MAP(shuttlei_map) MCFG_DEVICE_IO_MAP(shuttlei_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state, extra_8080bw) - MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2800,14 +2800,14 @@ Another (same checksums) dump came from board labeled SI-7811M-2 */ -MACHINE_START_MEMBER(_8080bw_state,darthvdr) +void _8080bw_state::machine_start_darthvdr() { /* do nothing for now - different interrupt system */ m_fleet_step = 3; } -MACHINE_RESET_MEMBER(_8080bw_state,darthvdr) +void _8080bw_state::machine_reset_darthvdr() { /* do nothing for now - different interrupt system */ } @@ -2885,8 +2885,8 @@ MACHINE_CONFIG_START(_8080bw_state::darthvdr) MCFG_DEVICE_IO_MAP(darthvdr_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,darthvdr) - MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state,darthvdr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_darthvdr, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_darthvdr, this)); /* sound hardware */ invaders_samples_audio(config); @@ -2957,7 +2957,7 @@ MACHINE_CONFIG_START(_8080bw_state::vortex) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(vortex_io_map) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_usec(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL))) @@ -3252,12 +3252,12 @@ static INPUT_PORTS_START( gunchamp ) INPUT_PORTS_END -MACHINE_START_MEMBER(_8080bw_state, claybust) +void _8080bw_state::machine_start_claybust() { m_claybust_gun_pos = 0; save_item(NAME(m_claybust_gun_pos)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } MACHINE_CONFIG_START(_8080bw_state::claybust) @@ -3269,7 +3269,7 @@ MACHINE_CONFIG_START(_8080bw_state::claybust) MCFG_TIMER_DRIVER_ADD("claybust_gun", _8080bw_state, claybust_gun_callback) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state, claybust) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_claybust, this)); /* sound hardware */ // TODO: discrete sound @@ -3526,7 +3526,7 @@ MACHINE_CONFIG_START(_8080bw_state::invmulti) MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") - MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this)); MACHINE_CONFIG_END void _8080bw_state::init_invmulti() diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp index 430f2dbdca4..ce2648b4d16 100644 --- a/src/mame/drivers/a51xx.cpp +++ b/src/mame/drivers/a51xx.cpp @@ -26,8 +26,8 @@ public: virtual void machine_reset() override; virtual void video_start() override; - DECLARE_MACHINE_RESET(a5130); - DECLARE_VIDEO_START(a5130); + void machine_reset_a5130(); + void video_start_a5130() ATTR_COLD; uint32_t screen_update_a5120(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_a5130(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; @@ -91,11 +91,11 @@ static INPUT_PORTS_START( a5130 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(a51xx_state,a5130) +void a51xx_state::machine_reset_a5130() { } -VIDEO_START_MEMBER(a51xx_state,a5130) +void a51xx_state::video_start_a5130() { } @@ -151,13 +151,13 @@ MACHINE_CONFIG_START(a51xx_state::a5130) MCFG_DEVICE_PROGRAM_MAP(a5130_mem) MCFG_DEVICE_IO_MAP(a5130_io) - MCFG_MACHINE_RESET_OVERRIDE(a51xx_state,a5130) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_a5130, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(a51xx_state, screen_update_a5130) - MCFG_VIDEO_START_OVERRIDE(a51xx_state,a5130) + set_video_start_cb(config, driver_callback_delegate(&video_start_a5130, this)); MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp index 253b41cf41b..2e285d62181 100644 --- a/src/mame/drivers/a6809.cpp +++ b/src/mame/drivers/a6809.cpp @@ -82,7 +82,7 @@ protected: DECLARE_WRITE8_MEMBER(a6809_address_w); DECLARE_WRITE8_MEMBER(a6809_register_w); DECLARE_WRITE_LINE_MEMBER(cass_w); - DECLARE_MACHINE_RESET(a6809); + void machine_reset_a6809(); TIMER_DEVICE_CALLBACK_MEMBER(a6809_c); TIMER_DEVICE_CALLBACK_MEMBER(a6809_p); @@ -120,7 +120,7 @@ static INPUT_PORTS_START( a6809 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( a6809_state, a6809) +void a6809_state::machine_reset_a6809() { m_via->write_pb0(0); m_via->write_pb1(0); @@ -227,7 +227,7 @@ MACHINE_CONFIG_START(a6809_state::a6809) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(a6809_mem) - MCFG_MACHINE_RESET_OVERRIDE(a6809_state, a6809) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_a6809, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp index 08e9c50d3f5..8ddbdff2a48 100644 --- a/src/mame/drivers/actfancr.cpp +++ b/src/mame/drivers/actfancr.cpp @@ -274,12 +274,12 @@ GFXDECODE_END /******************************************************************************/ -MACHINE_START_MEMBER(actfancr_state,triothep) +void actfancr_state::machine_start_triothep() { save_item(NAME(m_trio_control_select)); } -MACHINE_RESET_MEMBER(actfancr_state,triothep) +void actfancr_state::machine_reset_triothep() { m_trio_control_select = 0; } @@ -351,8 +351,8 @@ MACHINE_CONFIG_START(actfancr_state::triothep) MCFG_DEVICE_ADD("audiocpu",M6502, XTAL(12'000'000)/8) /* verified on pcb */ MCFG_DEVICE_PROGRAM_MAP(dec0_s_map) - MCFG_MACHINE_START_OVERRIDE(actfancr_state,triothep) - MCFG_MACHINE_RESET_OVERRIDE(actfancr_state,triothep) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_triothep, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_triothep, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp index 757e3969d95..69670dc19a4 100644 --- a/src/mame/drivers/adp.cpp +++ b/src/mame/drivers/adp.cpp @@ -192,8 +192,8 @@ public: /* devices */ DECLARE_READ16_MEMBER(input_r); DECLARE_WRITE16_MEMBER(input_w); - DECLARE_MACHINE_START(skattv); - DECLARE_MACHINE_RESET(skattv); + void machine_start_skattv() ATTR_COLD; + void machine_reset_skattv(); DECLARE_PALETTE_INIT(adp); DECLARE_PALETTE_INIT(fstation); IRQ_CALLBACK_MEMBER(duart_iack_handler); @@ -245,12 +245,12 @@ IRQ_CALLBACK_MEMBER(adp_state::duart_iack_handler) return m_duart->get_irq_vector(); } -MACHINE_START_MEMBER(adp_state,skattv) +void adp_state::machine_start_skattv() { save_item(NAME(m_mux_data)); } -MACHINE_RESET_MEMBER(adp_state,skattv) +void adp_state::machine_reset_skattv() { m_mux_data = 0; } @@ -554,8 +554,8 @@ MACHINE_CONFIG_START(adp_state::quickjac) MCFG_DEVICE_PROGRAM_MAP(quickjac_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(adp_state, duart_iack_handler) - MCFG_MACHINE_START_OVERRIDE(adp_state,skattv) - MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_skattv, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_skattv, this)); MCFG_DEVICE_ADD( "duart", MC68681, XTAL(8'664'000) / 2 ) MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 47045783352..9acee77a333 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -1432,31 +1432,31 @@ static GFXDECODE_START( gfx_wbbc97 ) GFXDECODE_END -MACHINE_START_MEMBER(aerofgt_state,common) +void aerofgt_state::machine_start_common() { } -MACHINE_START_MEMBER(aerofgt_state,aerofgt) +void aerofgt_state::machine_start_aerofgt() { m_soundbank->configure_entries(0, 4, memregion("audiocpu")->base(), 0x8000); - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); } -MACHINE_START_MEMBER(aerofgt_state,spinlbrk) +void aerofgt_state::machine_start_spinlbrk() { m_soundbank->configure_entries(0, 2, memregion("audiocpu")->base()+0x8000, 0x8000); - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); } -MACHINE_RESET_MEMBER(aerofgt_state,common) +void aerofgt_state::machine_reset_common() { } -MACHINE_RESET_MEMBER(aerofgt_state,aerofgt) +void aerofgt_state::machine_reset_aerofgt() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); m_soundbank->set_entry(0); /* needed by spinlbrk */ } @@ -1473,8 +1473,8 @@ MACHINE_CONFIG_START(aerofgt_state::pspikes) MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap) /* IRQs are triggered by the YM2610 */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1496,7 +1496,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikes) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes) + set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1523,8 +1523,8 @@ MACHINE_CONFIG_START(aerofgt_state::spikes91) /* + Z80 for sound */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1541,7 +1541,7 @@ MACHINE_CONFIG_START(aerofgt_state::spikes91) //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes) + set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this)); /* sound hardware */ /* the sound hardware is completely different on this: @@ -1559,8 +1559,8 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesb) MCFG_DEVICE_PROGRAM_MAP(pspikesb_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1577,7 +1577,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesb) //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes) + set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1604,8 +1604,8 @@ MACHINE_CONFIG_START(aerofgt_state::kickball) MCFG_DEVICE_PROGRAM_MAP(kickball_sound_map) MCFG_DEVICE_IO_MAP(kickball_sound_portmap) - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1627,7 +1627,7 @@ MACHINE_CONFIG_START(aerofgt_state::kickball) //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) // still accessed as if it exists, in clone hardware? - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes) + set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1651,8 +1651,8 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesc) MCFG_DEVICE_PROGRAM_MAP(pspikesc_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1674,7 +1674,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesc) MCFG_VSYSTEM_SPR2_SET_GFXREGION(1) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes) + set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1695,8 +1695,8 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz) MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap) /* IRQs are triggered by the YM2610 */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1723,7 +1723,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz) MCFG_VSYSTEM_SPR2_SET_GFXREGION(3) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,karatblz) + set_video_start_cb(config, driver_callback_delegate(&video_start_karatblz, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1752,8 +1752,8 @@ MACHINE_CONFIG_START(aerofgt_state::karatblzbl) MCFG_DEVICE_PROGRAM_MAP(karatblzbl_sound_map) MCFG_DEVICE_IO_MAP(karatblzbl_sound_portmap) - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1780,7 +1780,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblzbl) //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,karatblz) + set_video_start_cb(config, driver_callback_delegate(&video_start_karatblz, this)); MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") @@ -1809,8 +1809,8 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk) MCFG_DEVICE_IO_MAP(spinlbrk_sound_portmap) /* IRQs are triggered by the YM2610 */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,spinlbrk) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_spinlbrk, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1838,7 +1838,7 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk) MCFG_VSYSTEM_SPR2_SET_GFXREGION(3) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,spinlbrk) + set_video_start_cb(config, driver_callback_delegate(&video_start_spinlbrk, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1868,8 +1868,8 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc) MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap) /* IRQs are triggered by the YM2610 */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1896,7 +1896,7 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc) MCFG_VSYSTEM_SPR2_SET_GFXREGION(3) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc) + set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1926,8 +1926,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgtb) MCFG_DEVICE_IO_MAP(aerofgt_sound_portmap) /* IRQs are triggered by the YM2610 */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1955,7 +1955,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgtb) MCFG_VSYSTEM_SPR2_SET_GFXREGION(3) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc) + set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1985,8 +1985,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt) MCFG_DEVICE_IO_MAP(aerofgt_sound_portmap) /* IRQs are triggered by the YM2610 */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this)); MCFG_DEVICE_ADD("io", VS9209, 0) MCFG_VS9209_IN_PORTA_CB(IOPORT("P1")) @@ -2019,7 +2019,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt) MCFG_VSYSTEM_SPR_SET_GFXREGION(2) MCFG_VSYSTEM_SPR_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc) + set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2047,8 +2047,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboot) MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */ MCFG_DEVICE_PROGRAM_MAP(aerfboot_sound_map) - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2066,7 +2066,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboot) //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc) + set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2087,8 +2087,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboo2) MCFG_DEVICE_PROGRAM_MAP(aerfboo2_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq2_line_hold) - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2106,7 +2106,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboo2) //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc) + set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2125,8 +2125,8 @@ MACHINE_CONFIG_START(aerofgt_state::wbbc97) MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */ MCFG_DEVICE_PROGRAM_MAP(wbbc97_sound_map) /* IRQs are triggered by the YM3812 */ - MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2147,7 +2147,7 @@ MACHINE_CONFIG_START(aerofgt_state::wbbc97) MCFG_VSYSTEM_SPR2_SET_GFXREGION(1) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(aerofgt_state,wbbc97) + set_video_start_cb(config, driver_callback_delegate(&video_start_wbbc97, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp index a42e8a4fcae..8be2c16197e 100644 --- a/src/mame/drivers/airraid.cpp +++ b/src/mame/drivers/airraid.cpp @@ -186,7 +186,7 @@ public: DECLARE_WRITE8_MEMBER(bank_w); void init_cshootere(); void init_cshooter(); - DECLARE_MACHINE_RESET(cshooter); + void machine_reset_cshooter(); TIMER_DEVICE_CALLBACK_MEMBER(cshooter_scanline); void airraid(machine_config &config); void airraid_crypt(machine_config &config); @@ -212,7 +212,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(airraid_state::cshooter_scanline) } -MACHINE_RESET_MEMBER(airraid_state,cshooter) +void airraid_state::machine_reset_cshooter() { } diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index b7b5346ee81..c551ca8294b 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -56,7 +56,7 @@ public: void init_ntsc(); void init_pal(); - DECLARE_VIDEO_START(alg); + void video_start_alg() ATTR_COLD; void alg_r2(machine_config &config); void picmatic(machine_config &config); @@ -116,10 +116,10 @@ int alg_state::get_lightgun_pos(int player, int *x, int *y) * *************************************/ -VIDEO_START_MEMBER(alg_state,alg) +void alg_state::video_start_alg() { /* standard video start */ - VIDEO_START_CALL_MEMBER(amiga); + video_start_amiga(); /* configure pen 4096 as transparent in the renderer and use it for the genlock color */ m_palette->set_pen_color(4096, rgb_t(0,0,0,0)); @@ -329,7 +329,7 @@ MACHINE_CONFIG_START(alg_state::alg_r1) MCFG_PALETTE_ADD("palette", 4097) MCFG_PALETTE_INIT_OWNER(alg_state,amiga) - MCFG_VIDEO_START_OVERRIDE(alg_state,alg) + set_video_start_cb(config, driver_callback_delegate(&video_start_alg, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 0bc0bff7e8d..62f5c1f1ec7 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -1821,7 +1821,7 @@ WRITE8_MEMBER(alpha68k_state::porta_w) /******************************************************************************/ -MACHINE_START_MEMBER(alpha68k_state,common) +void alpha68k_state::machine_start_common() { save_item(NAME(m_trigstate)); save_item(NAME(m_deposits1)); @@ -1833,7 +1833,7 @@ MACHINE_START_MEMBER(alpha68k_state,common) save_item(NAME(m_flipscreen)); } -MACHINE_RESET_MEMBER(alpha68k_state,common) +void alpha68k_state::machine_reset_common() { m_trigstate = 0; m_deposits1 = 0; @@ -1845,13 +1845,13 @@ MACHINE_RESET_MEMBER(alpha68k_state,common) m_flipscreen = 0; } -MACHINE_START_MEMBER(alpha68k_state,alpha68k_V) +void alpha68k_state::machine_start_alpha68k_V() { uint8_t *ROM = memregion("audiocpu")->base(); membank("bank7")->configure_entries(0, 32, &ROM[0x10000], 0x4000); - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); save_item(NAME(m_bank_base)); save_item(NAME(m_last_bank)); @@ -1859,17 +1859,17 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_V) save_item(NAME(m_sound_pa_latch)); } -MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_V) +void alpha68k_state::machine_reset_alpha68k_V() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); m_bank_base = 0; m_last_bank = 0; } -MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_II) +void alpha68k_state::machine_reset_alpha68k_II() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); m_bank_base = 0; m_last_bank = 0; @@ -1878,13 +1878,13 @@ MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_II) m_buffer_68 = 0; } -MACHINE_START_MEMBER(alpha68k_state,alpha68k_II) +void alpha68k_state::machine_start_alpha68k_II() { uint8_t *ROM = memregion("audiocpu")->base(); membank("bank7")->configure_entries(0, 28, &ROM[0x10000], 0x4000); - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); save_item(NAME(m_bank_base)); save_item(NAME(m_last_bank)); @@ -1928,8 +1928,8 @@ MACHINE_CONFIG_START(alpha68k_state::sstingry) // MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, alpha68k_state, saiyugoub1_adpcm_control_w)) MCFG_DEVICE_DISABLE() - MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) - MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1980,8 +1980,8 @@ MACHINE_CONFIG_START(alpha68k_state::kyros) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold) MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000) - MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) - MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2031,8 +2031,8 @@ MACHINE_CONFIG_START(alpha68k_state::jongbou) MCFG_DEVICE_IO_MAP(jongbou_sound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq0_line_hold, 160*60) - MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) - MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2070,8 +2070,8 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_I) MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone MCFG_DEVICE_PROGRAM_MAP(alpha68k_I_s_map) - MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) - MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2117,8 +2117,8 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II) MCFG_DEVICE_IO_MAP(sound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7614) - MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_II) - MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_II) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_alpha68k_II, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_alpha68k_II, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2134,7 +2134,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB_bit0) - MCFG_VIDEO_START_OVERRIDE(alpha68k_state,alpha68k) + set_video_start_cb(config, driver_callback_delegate(&video_start_alpha68k, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2179,8 +2179,8 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V) MCFG_DEVICE_IO_MAP(sound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, ALPHA68K_PIXEL_CLOCK / ALPHA68K_HTOTAL / 2) - MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_V) - MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_V) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_alpha68k_V, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_alpha68k_V, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2196,7 +2196,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB_bit0) - MCFG_VIDEO_START_OVERRIDE(alpha68k_state,alpha68k) + set_video_start_cb(config, driver_callback_delegate(&video_start_alpha68k, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2234,8 +2234,8 @@ MACHINE_CONFIG_START(alpha68k_state::tnextspc) MCFG_DEVICE_PROGRAM_MAP(tnextspc_sound_map) MCFG_DEVICE_IO_MAP(tnextspc_sound_portmap) - MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) - MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp index 770ad0e0995..deb7ec0d1bf 100644 --- a/src/mame/drivers/alto2.cpp +++ b/src/mame/drivers/alto2.cpp @@ -31,7 +31,7 @@ public: { } void init_alto2(); - DECLARE_MACHINE_RESET(alto2); + void machine_reset_alto2(); void alto2(machine_config &config); void alto2_const_map(address_map &map); diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp index 051fd5bf2d6..700fa96ef28 100644 --- a/src/mame/drivers/ambush.cpp +++ b/src/mame/drivers/ambush.cpp @@ -87,9 +87,9 @@ public: DECLARE_WRITE_LINE_MEMBER(color_bank_1_w); DECLARE_WRITE_LINE_MEMBER(color_bank_2_w); - DECLARE_MACHINE_START(ambush); - DECLARE_MACHINE_START(mariobl); - DECLARE_MACHINE_START(dkong3abl); + void machine_start_ambush() ATTR_COLD; + void machine_start_mariobl() ATTR_COLD; + void machine_start_dkong3abl() ATTR_COLD; DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); @@ -637,7 +637,7 @@ void ambush_state::register_save_states() save_item(NAME(m_color_bank)); } -MACHINE_START_MEMBER( ambush_state, ambush ) +void ambush_state::machine_start_ambush() { register_save_states(); @@ -647,7 +647,7 @@ MACHINE_START_MEMBER( ambush_state, ambush ) m_char_tilemap->set_scroll_cols(32); } -MACHINE_START_MEMBER( ambush_state, mariobl ) +void ambush_state::machine_start_mariobl() { register_save_states(); @@ -657,7 +657,7 @@ MACHINE_START_MEMBER( ambush_state, mariobl ) m_gfxdecode->gfx(0)->set_granularity(8); } -MACHINE_START_MEMBER( ambush_state, dkong3abl ) +void ambush_state::machine_start_dkong3abl() { register_save_states(); @@ -704,7 +704,7 @@ MACHINE_CONFIG_START(ambush_state::ambush) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(ambush_state, ambush) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ambush, this)); // video hardware MCFG_SCREEN_ADD("screen", RASTER) @@ -740,7 +740,7 @@ MACHINE_CONFIG_START(ambush_state::mariobl) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_1_w)) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ambush_state, color_bank_1_w)) - MCFG_MACHINE_START_OVERRIDE(ambush_state, mariobl) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mariobl, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(ambush_state, screen_update_bootleg) @@ -761,7 +761,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(ambush_state::dkong3abl) mariobl(config); - MCFG_MACHINE_START_OVERRIDE(ambush_state, dkong3abl) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dkong3abl, this)); MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_dkong3abl) diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index 26144756786..a6abf696a67 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -1378,7 +1378,7 @@ MACHINE_CONFIG_START(amiga_state::amiga_base) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INIT_OWNER(amiga_state, amiga) - MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga) + set_video_start_cb(config, driver_callback_delegate(&video_start_amiga, this)); // cia MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_PAL) @@ -1788,7 +1788,7 @@ MACHINE_CONFIG_START(a1200_state::a1200) MCFG_DEVICE_REMOVE("palette") - MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga) + set_video_start_cb(config, driver_callback_delegate(&video_start_amiga_aga, this)); MCFG_GAYLE_ADD("gayle", amiga_state::CLK_28M_PAL / 2, a1200_state::GAYLE_ID) MCFG_GAYLE_INT2_HANDLER(WRITELINE(*this, a1200_state, gayle_int2_w)) @@ -1853,7 +1853,7 @@ MACHINE_CONFIG_START(a4000_state::a4000) MCFG_DEVICE_REMOVE("palette") - MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga) + set_video_start_cb(config, driver_callback_delegate(&video_start_amiga_aga, this)); // real-time clock MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768)) @@ -1944,7 +1944,7 @@ MACHINE_CONFIG_START(cd32_state::cd32) MCFG_DEVICE_REMOVE("palette") - MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga) + set_video_start_cb(config, driver_callback_delegate(&video_start_amiga_aga, this)); MCFG_DEVICE_ADD("cdda", CDDA) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp index e9ae00f0d29..f8bd39da667 100644 --- a/src/mame/drivers/ampoker2.cpp +++ b/src/mame/drivers/ampoker2.cpp @@ -1185,8 +1185,7 @@ MACHINE_CONFIG_START(ampoker2_state::sigma2k) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_sigma2k) - MCFG_VIDEO_START_OVERRIDE(ampoker2_state, sigma2k) -MACHINE_CONFIG_END + set_video_start_cb(config, driver_callback_delegate(&video_start_sigma2k, this)); /************************* diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp index 8aa098b91b2..0239e7a9590 100644 --- a/src/mame/drivers/ampro.cpp +++ b/src/mame/drivers/ampro.cpp @@ -45,7 +45,7 @@ public: { } void init_ampro(); - DECLARE_MACHINE_RESET(ampro); + void machine_reset_ampro(); TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); DECLARE_WRITE8_MEMBER(port00_w); DECLARE_READ8_MEMBER(io_r); @@ -134,7 +134,7 @@ static void ampro_floppies(device_slot_interface &device) static INPUT_PORTS_START( ampro ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( ampro_state, ampro ) +void ampro_state::machine_reset_ampro() { membank("bankr0")->set_entry(0); // point at rom membank("bankw0")->set_entry(0); // always write to ram @@ -155,7 +155,7 @@ MACHINE_CONFIG_START(ampro_state::ampro) MCFG_DEVICE_PROGRAM_MAP(ampro_mem) MCFG_DEVICE_IO_MAP(ampro_io) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) - MCFG_MACHINE_RESET_OVERRIDE(ampro_state, ampro) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ampro, this)); MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(16'000'000) / 8) // 2MHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0)) diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index 11058588fc4..fc24ebc11f1 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -916,8 +916,8 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(amstrad_state, amstrad ) - MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, amstrad ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_amstrad, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_amstrad, this)); MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r)) @@ -944,7 +944,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_vsync_changed)) MCFG_MC6845_OUT_CUR_CB(WRITELINE("exp", cpc_expansion_slot_device, cursor_w)) - MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad) + set_video_start_cb(config, driver_callback_delegate(&video_start_amstrad, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1027,8 +1027,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(amstrad_state::kccomp) cpc6128(config); - MCFG_MACHINE_START_OVERRIDE(amstrad_state,kccomp) - MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,kccomp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_kccomp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_kccomp, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(amstrad_state,kccomp) @@ -1044,8 +1044,8 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(amstrad_state, plus ) - MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, plus ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_plus, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_plus, this)); MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r)) @@ -1071,7 +1071,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_hsync_changed)) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_vsync_changed)) - MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad) + set_video_start_cb(config, driver_callback_delegate(&video_start_amstrad, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1122,8 +1122,8 @@ MACHINE_CONFIG_START(amstrad_state::gx4000) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(amstrad_state, gx4000 ) - MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, gx4000 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gx4000, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gx4000, this)); MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r)) @@ -1149,7 +1149,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_hsync_changed)) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_vsync_changed)) - MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad) + set_video_start_cb(config, driver_callback_delegate(&video_start_amstrad, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1167,8 +1167,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(amstrad_state::aleste) cpc6128(config); - MCFG_MACHINE_START_OVERRIDE(amstrad_state,aleste) - MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,aleste) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_aleste, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aleste, this)); MCFG_DEVICE_REPLACE("ay", AY8912, XTAL(16'000'000) / 16) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, amstrad_state, amstrad_psg_porta_read)) /* portA read */ diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index 0301b5ba7f6..e47ab9ff141 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -115,7 +115,7 @@ public: { } void init_amust(); - DECLARE_MACHINE_RESET(amust); + void machine_reset_amust(); DECLARE_READ8_MEMBER(port04_r); DECLARE_WRITE8_MEMBER(port04_w); DECLARE_READ8_MEMBER(port05_r); @@ -353,7 +353,7 @@ MC6845_UPDATE_ROW( amust_state::crtc_update_row ) } } -MACHINE_RESET_MEMBER( amust_state, amust ) +void amust_state::machine_reset_amust() { membank("bankr0")->set_entry(0); // point at rom membank("bankw0")->set_entry(0); // always write to ram @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(amust_state::amust) MCFG_DEVICE_PROGRAM_MAP(mem_map) MCFG_DEVICE_IO_MAP(io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", amust_state, irq_vs) - MCFG_MACHINE_RESET_OVERRIDE(amust_state, amust) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_amust, this)); /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp index 44b8bd4b2fb..a99042b5025 100644 --- a/src/mame/drivers/apogee.cpp +++ b/src/mame/drivers/apogee.cpp @@ -219,7 +219,7 @@ MACHINE_CONFIG_START(apogee_state::apogee) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(16'000'000) / 9) MCFG_DEVICE_PROGRAM_MAP(apogee_mem) - MCFG_MACHINE_RESET_OVERRIDE(apogee_state, radio86 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_radio86, this)); MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_PIT8253_CLK0(XTAL(16'000'000)/9) diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp index 5945699ebd7..9529344e570 100644 --- a/src/mame/drivers/apollo.cpp +++ b/src/mame/drivers/apollo.cpp @@ -910,7 +910,7 @@ void apollo_state::machine_reset() { MLOG1(("machine_reset")); - MACHINE_RESET_CALL_MEMBER(apollo); + machine_reset_apollo(); #ifdef APOLLO_XXL // set configuration @@ -934,7 +934,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_reset_instr_callback) MLOG1(("apollo_reset_instr_callback")); // reset the CPU board devices - MACHINE_RESET_CALL_MEMBER(apollo); + machine_reset_apollo(); // reset the ISA bus devices m_isa->reset(); @@ -960,7 +960,7 @@ void apollo_state::machine_start(){ // clear ram memset(messram->ptr(), 0x55, messram->bytes()); - MACHINE_START_CALL_MEMBER(apollo); + machine_start_apollo(); // install nop handlers for unmapped ISA bus addresses m_isa->install16_device((ATBUS_IO_BASE - 0x40000) >> 7, (ATBUS_IO_END - 0x40000) >> 7, read16_delegate(FUNC(apollo_state::apollo_atbus_unmap_io_r), this), write16_delegate(FUNC(apollo_state::apollo_atbus_unmap_io_w), this)); diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index b29ca760a8e..b27767ea127 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -1486,7 +1486,7 @@ MACHINE_CONFIG_END #if 0 static MACHINE_CONFIG_START( laba2p ) apple2p(config); - MCFG_MACHINE_START_OVERRIDE(napple2_state,laba2p) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_laba2p, this)); MCFG_DEVICE_REMOVE("sl0") MCFG_DEVICE_REMOVE("sl3") diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index de0a78d1d38..81a06b4bb5f 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -342,10 +342,10 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gs) MCFG_PALETTE_INIT_OWNER(apple2gs_state, apple2gs) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_apple2gs ) - MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gs ) - MCFG_MACHINE_RESET_OVERRIDE(apple2gs_state, apple2gs ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_apple2gs, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_apple2gs, this)); - MCFG_VIDEO_START_OVERRIDE(apple2gs_state, apple2gs ) + set_video_start_cb(config, driver_callback_delegate(&video_start_apple2gs, this)); /* keyboard controller */ MCFG_DEVICE_ADD("ay3600", AY3600, 0) @@ -425,7 +425,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(apple2gs_state::apple2gsr1) apple2gs(config); - MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gsr1 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_apple2gsr1, this)); #if RUN_ADB_MICRO MCFG_DEVICE_REPLACE(ADBMICRO_TAG, M50740, XTAL(3'579'545)) diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp index a36170413c6..a5a63613f6a 100644 --- a/src/mame/drivers/apple3.cpp +++ b/src/mame/drivers/apple3.cpp @@ -60,7 +60,7 @@ MACHINE_CONFIG_START(apple3_state::apple3) MCFG_DEVICE_PROGRAM_MAP(apple3_map) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_RESET_OVERRIDE(apple3_state, apple3 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_apple3, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -74,7 +74,7 @@ MACHINE_CONFIG_START(apple3_state::apple3) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(apple3_state, apple3 ) - MCFG_VIDEO_START_OVERRIDE(apple3_state, apple3 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_apple3, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", apple3_state, apple3_interrupt, "screen", 0, 1) diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp index 5e1501ba75c..7c9c3c3922c 100644 --- a/src/mame/drivers/argus.cpp +++ b/src/mame/drivers/argus.cpp @@ -508,8 +508,8 @@ MACHINE_CONFIG_START(argus_state::argus) MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0) - MCFG_VIDEO_START_OVERRIDE(argus_state,argus) - MCFG_VIDEO_RESET_OVERRIDE(argus_state,argus) + set_video_start_cb(config, driver_callback_delegate(&video_start_argus, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_argus, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -550,8 +550,8 @@ MACHINE_CONFIG_START(argus_state::valtric) MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0) - MCFG_VIDEO_START_OVERRIDE(argus_state,valtric) - MCFG_VIDEO_RESET_OVERRIDE(argus_state,valtric) + set_video_start_cb(config, driver_callback_delegate(&video_start_valtric, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_valtric, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -598,8 +598,8 @@ MACHINE_CONFIG_START(argus_state::butasan) MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0) - MCFG_VIDEO_START_OVERRIDE(argus_state,butasan) - MCFG_VIDEO_RESET_OVERRIDE(argus_state,butasan) + set_video_start_cb(config, driver_callback_delegate(&video_start_butasan, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_butasan, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 8dcaaf19346..f1b7c88b34d 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -1225,7 +1225,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(armedf_state,armedf) +void armedf_state::machine_start_armedf() { save_item(NAME(m_old_mcu_mode)); save_item(NAME(m_scroll_msb)); @@ -1237,7 +1237,7 @@ MACHINE_START_MEMBER(armedf_state,armedf) save_item(NAME(m_bg_scrolly)); } -MACHINE_RESET_MEMBER(armedf_state,armedf) +void armedf_state::machine_reset_armedf() { m_old_mcu_mode = 0; m_scroll_msb = 0; @@ -1277,8 +1277,8 @@ MACHINE_CONFIG_START(armedf_state::terraf) MCFG_DEVICE_PROGRAM_MAP(terraf_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert) - MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) - MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this)); MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0) @@ -1290,7 +1290,7 @@ MACHINE_CONFIG_START(armedf_state::terraf) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf) + set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this)); MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) @@ -1321,8 +1321,8 @@ MACHINE_CONFIG_START(armedf_state::terrafjb) MCFG_DEVICE_PROGRAM_MAP(terrafjb_extraz80_map) MCFG_DEVICE_IO_MAP(terrafjb_extraz80_portmap) - MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) - MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1332,7 +1332,7 @@ MACHINE_CONFIG_START(armedf_state::terrafjb) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf) + set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this)); MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) @@ -1369,8 +1369,8 @@ MACHINE_CONFIG_START(armedf_state::kozure) MCFG_DEVICE_PROGRAM_MAP(kozure_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert) - MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) - MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this)); MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0) @@ -1382,7 +1382,7 @@ MACHINE_CONFIG_START(armedf_state::kozure) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) // 320 x 240, trusted MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf) + set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this)); MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) @@ -1408,8 +1408,8 @@ MACHINE_CONFIG_START(armedf_state::armedf) MCFG_DEVICE_IO_MAP(sound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ? - MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) - MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1419,7 +1419,7 @@ MACHINE_CONFIG_START(armedf_state::armedf) MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(armedf_state,armedf) + set_video_start_cb(config, driver_callback_delegate(&video_start_armedf, this)); MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) @@ -1456,8 +1456,8 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2) MCFG_DEVICE_IO_MAP(sound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ? - MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) - MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this)); MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0) @@ -1469,7 +1469,7 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf) + set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this)); MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) @@ -1506,8 +1506,8 @@ MACHINE_CONFIG_START(armedf_state::legion) MCFG_DEVICE_IO_MAP(sound_3526_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ? - MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) - MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this)); MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0) @@ -1519,7 +1519,7 @@ MACHINE_CONFIG_START(armedf_state::legion) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf) + set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this)); MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) @@ -1556,8 +1556,8 @@ MACHINE_CONFIG_START(armedf_state::legionjb) MCFG_DEVICE_IO_MAP(sound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ? - MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) - MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1567,7 +1567,7 @@ MACHINE_CONFIG_START(armedf_state::legionjb) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf) + set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this)); MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) @@ -1603,15 +1603,15 @@ MACHINE_CONFIG_START(bigfghtr_state::bigfghtr) MCFG_DEVICE_IO_MAP(bigfghtr_mcu_io_map) MCFG_MCS51_PORT_P1_IN_CB(CONSTANT(0xdf)) // bit 5: bus contention related? - MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf) - MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000)/2,531,12*8,(64-12)*8, 254, 1*8, 31*8) // guess, matches 59.3 Hz from reference - measured at 59.1358Hz MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(armedf_state,armedf) + set_video_start_cb(config, driver_callback_delegate(&video_start_armedf, this)); MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp index df591d2cad7..a68bb956881 100644 --- a/src/mame/drivers/arsystems.cpp +++ b/src/mame/drivers/arsystems.cpp @@ -319,7 +319,7 @@ MACHINE_CONFIG_START(arcadia_amiga_state::arcadia) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INIT_OWNER(arcadia_amiga_state,amiga) - MCFG_VIDEO_START_OVERRIDE(arcadia_amiga_state,amiga) + set_video_start_cb(config, driver_callback_delegate(&video_start_amiga, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index 332ae0377b0..df2c07e515f 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -81,11 +81,11 @@ public: DECLARE_WRITE8_MEMBER(spcking2_sound3_w); void init_kamikaze(); void init_spcking2(); - DECLARE_MACHINE_START(kamikaze); - DECLARE_MACHINE_RESET(kamikaze); - DECLARE_MACHINE_START(spaceint); - DECLARE_MACHINE_RESET(spaceint); - DECLARE_VIDEO_START(spaceint); + void machine_start_kamikaze() ATTR_COLD; + void machine_reset_kamikaze(); + void machine_start_spaceint() ATTR_COLD; + void machine_reset_spaceint(); + void video_start_spaceint() ATTR_COLD; uint32_t screen_update_astinvad(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_spcking2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_spaceint(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -130,7 +130,7 @@ private: * *************************************/ -VIDEO_START_MEMBER(astinvad_state,spaceint) +void astinvad_state::video_start_spaceint() { m_colorram = std::make_unique<uint8_t[]>(m_videoram.bytes()); @@ -280,7 +280,7 @@ TIMER_CALLBACK_MEMBER(astinvad_state::kamizake_int_gen) } -MACHINE_START_MEMBER(astinvad_state,kamikaze) +void astinvad_state::machine_start_kamikaze() { m_int_timer = timer_alloc(TIMER_INT_GEN); m_int_timer->adjust(m_screen->time_until_pos(128), 128); @@ -291,7 +291,7 @@ MACHINE_START_MEMBER(astinvad_state,kamikaze) save_item(NAME(m_sound_state)); } -MACHINE_RESET_MEMBER(astinvad_state,kamikaze) +void astinvad_state::machine_reset_kamikaze() { m_screen_flip = 0; m_screen_red = 0; @@ -300,13 +300,13 @@ MACHINE_RESET_MEMBER(astinvad_state,kamikaze) } -MACHINE_START_MEMBER(astinvad_state,spaceint) +void astinvad_state::machine_start_spaceint() { save_item(NAME(m_screen_flip)); save_item(NAME(m_sound_state)); } -MACHINE_RESET_MEMBER(astinvad_state,spaceint) +void astinvad_state::machine_reset_spaceint() { m_screen_flip = 0; m_sound_state[0] = 0; @@ -670,8 +670,8 @@ MACHINE_CONFIG_START(astinvad_state::kamikaze) MCFG_DEVICE_PROGRAM_MAP(kamikaze_map) MCFG_DEVICE_IO_MAP(kamikaze_portmap) - MCFG_MACHINE_START_OVERRIDE(astinvad_state, kamikaze) - MCFG_MACHINE_RESET_OVERRIDE(astinvad_state, kamikaze) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_kamikaze, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_kamikaze, this)); MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -723,11 +723,11 @@ MACHINE_CONFIG_START(astinvad_state::spaceint) MCFG_DEVICE_IO_MAP(spaceint_portmap) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", astinvad_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(astinvad_state, spaceint) - MCFG_MACHINE_RESET_OVERRIDE(astinvad_state, spaceint) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_spaceint, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_spaceint, this)); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(astinvad_state, spaceint) + set_video_start_cb(config, driver_callback_delegate(&video_start_spaceint, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE(32*8, 32*8) diff --git a/src/mame/drivers/astrafr.cpp b/src/mame/drivers/astrafr.cpp index e45938f61f6..df82d4db552 100644 --- a/src/mame/drivers/astrafr.cpp +++ b/src/mame/drivers/astrafr.cpp @@ -114,10 +114,10 @@ public: void init_astradec(); void init_astradec_dual(); void init_astradec_sml_dual(); - DECLARE_MACHINE_START(astra_common); - DECLARE_MACHINE_START(astra_2e); - DECLARE_MACHINE_START(astra_37); - DECLARE_MACHINE_START(astra_57); + void machine_start_astra_common() ATTR_COLD; + void machine_start_astra_2e() ATTR_COLD; + void machine_start_astra_37() ATTR_COLD; + void machine_start_astra_57() ATTR_COLD; void astra_single(machine_config &config); void astra_single_alt(machine_config &config); void astrafr_dual(machine_config &config); @@ -273,7 +273,7 @@ void astrafr_state::astrafr_slave_map(address_map &map) static INPUT_PORTS_START( astrafr ) INPUT_PORTS_END -MACHINE_START_MEMBER(astrafr_state,astra_common) +void astrafr_state::machine_start_astra_common() { m_cpuregion = (uint32_t*)memregion( "maincpu" )->base(); m_cpuregion_size = memregion( "maincpu" )->bytes()/4; @@ -290,20 +290,20 @@ MACHINE_START_MEMBER(astrafr_state,astra_common) } /* the FPGA area read/write addresses move around ... */ -MACHINE_START_MEMBER(astrafr_state,astra_37) +void astrafr_state::machine_start_astra_37() { fgpa_after_rom_write_addr = 0x30; fgpa_first_read_addr = 0x33; fgpa_rom_write_addr = 0x37; - MACHINE_START_CALL_MEMBER(astra_common); + machine_start_astra_common(); } -MACHINE_START_MEMBER(astrafr_state,astra_2e) +void astrafr_state::machine_start_astra_2e() { fgpa_after_rom_write_addr = 0x20; fgpa_first_read_addr = 0x23; fgpa_rom_write_addr = 0x2e; - MACHINE_START_CALL_MEMBER(astra_common); + machine_start_astra_common(); } @@ -314,17 +314,17 @@ MACHINE_CONFIG_START(astrafr_state::astrafr_dual) MCFG_DEVICE_ADD("slavecpu", M68340, 16000000) MCFG_DEVICE_PROGRAM_MAP(astrafr_slave_map) - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_common, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astrafr_dual_2e) astrafr_dual(config); - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_2e ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_2e, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astrafr_dual_37) astrafr_dual(config); - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_37, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astrafr_dual_alt) @@ -337,7 +337,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astrafr_dual_alt_37) astrafr_dual_alt(config); - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_37, this)); MACHINE_CONFIG_END @@ -345,42 +345,42 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astra_single) MCFG_DEVICE_ADD("maincpu", M68340, 16000000) MCFG_DEVICE_PROGRAM_MAP(astra_map) - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_common, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astra_single_37) astra_single(config); - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_37, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astra_single_2e) astra_single(config); - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_2e ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_2e, this)); MACHINE_CONFIG_END -MACHINE_START_MEMBER(astrafr_state,astra_57) +void astrafr_state::machine_start_astra_57() { // fgpa_after_rom_write_addr = 0x20; // fgpa_first_read_addr = 0x23; fgpa_rom_write_addr = 0x57; - MACHINE_START_CALL_MEMBER(astra_common); + machine_start_astra_common(); } MACHINE_CONFIG_START(astrafr_state::astra_single_alt) MCFG_DEVICE_ADD("maincpu", M68340, 16000000) MCFG_DEVICE_PROGRAM_MAP(astra_map) - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_common, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astra_single_alt_57) astra_single_alt(config); - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_57 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_57, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(astrafr_state::astra_single_alt_37) astra_single_alt(config); - MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_37, this)); MACHINE_CONFIG_END /* are the ptM roms Master and ptS roms Slave? diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp index 87baae01025..75dfa3647dd 100644 --- a/src/mame/drivers/astrcorp.cpp +++ b/src/mame/drivers/astrcorp.cpp @@ -89,7 +89,7 @@ public: void init_astoneag(); void init_showhanc(); void init_showhand(); - DECLARE_VIDEO_START(astrocorp); + void video_start_astrocorp() ATTR_COLD; uint32_t screen_update_astrocorp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(skilldrp_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -107,7 +107,7 @@ public: Video ***************************************************************************/ -VIDEO_START_MEMBER(astrocorp_state,astrocorp) +void astrocorp_state::video_start_astrocorp() { m_screen->register_screen_bitmap(m_bitmap); @@ -532,7 +532,7 @@ MACHINE_CONFIG_START(astrocorp_state::showhand) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_FORMAT(BBBBBGGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(astrocorp_state,astrocorp) + set_video_start_cb(config, driver_callback_delegate(&video_start_astrocorp, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -587,7 +587,7 @@ MACHINE_CONFIG_START(astrocorp_state::skilldrp) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_FORMAT(BBBBBGGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(astrocorp_state,astrocorp) + set_video_start_cb(config, driver_callback_delegate(&video_start_astrocorp, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index d4d882d6d91..9c1d8b6a167 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -1214,7 +1214,7 @@ MACHINE_CONFIG_START(astrocde_state::astrocade_16color_base) MCFG_PALETTE_ENTRIES(4096) MCFG_PALETTE_INIT_OWNER(astrocde_state,profpac) - MCFG_VIDEO_START_OVERRIDE(astrocde_state,profpac) + set_video_start_cb(config, driver_callback_delegate(&video_start_profpac, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(astrocde_state, screen_update_profpac) diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp index 2b106afcd4c..94444fdf8e8 100644 --- a/src/mame/drivers/astrof.cpp +++ b/src/mame/drivers/astrof.cpp @@ -464,7 +464,7 @@ READ8_MEMBER(astrof_state::tomahawk_protection_r) * *************************************/ -MACHINE_START_MEMBER(astrof_state,astrof) +void astrof_state::machine_start_astrof() { /* the 74175 outputs all HI's if not otherwise set */ astrof_set_video_control_2(0xff); @@ -482,16 +482,16 @@ MACHINE_START_MEMBER(astrof_state,astrof) } -MACHINE_START_MEMBER(astrof_state,abattle) +void astrof_state::machine_start_abattle() { /* register for state saving */ save_item(NAME(m_abattle_count)); - MACHINE_START_CALL_MEMBER(astrof); + machine_start_astrof(); } -MACHINE_START_MEMBER(astrof_state,spfghmk2) +void astrof_state::machine_start_spfghmk2() { /* the 74175 outputs all HI's if not otherwise set */ spfghmk2_set_video_control_2(0xff); @@ -507,7 +507,7 @@ MACHINE_START_MEMBER(astrof_state,spfghmk2) } -MACHINE_START_MEMBER(astrof_state,tomahawk) +void astrof_state::machine_start_tomahawk() { /* the 74175 outputs all HI's if not otherwise set */ tomahawk_set_video_control_2(0xff); @@ -526,7 +526,7 @@ MACHINE_START_MEMBER(astrof_state,tomahawk) * *************************************/ -MACHINE_RESET_MEMBER(astrof_state,abattle) +void astrof_state::machine_reset_abattle() { m_abattle_count = 0; } @@ -933,7 +933,7 @@ MACHINE_CONFIG_START(astrof_state::astrof) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(astrof_map) - MCFG_MACHINE_START_OVERRIDE(astrof_state,astrof) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astrof, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -949,8 +949,8 @@ MACHINE_CONFIG_START(astrof_state::abattle) /* basic machine hardware */ - MCFG_MACHINE_START_OVERRIDE(astrof_state,abattle) - MCFG_MACHINE_RESET_OVERRIDE(astrof_state,abattle) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_abattle, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_abattle, this)); MACHINE_CONFIG_END @@ -961,7 +961,7 @@ MACHINE_CONFIG_START(astrof_state::spfghmk2) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(spfghmk2_map) - MCFG_MACHINE_START_OVERRIDE(astrof_state,spfghmk2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_spfghmk2, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -979,7 +979,7 @@ MACHINE_CONFIG_START(astrof_state::tomahawk) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(tomahawk_map) - MCFG_MACHINE_START_OVERRIDE(astrof_state,tomahawk) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tomahawk, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp index 36b5b254edc..2ca3838a757 100644 --- a/src/mame/drivers/astrohome.cpp +++ b/src/mame/drivers/astrohome.cpp @@ -35,7 +35,7 @@ public: void astrocde(machine_config &config); private: DECLARE_READ8_MEMBER(inputs_r); - DECLARE_MACHINE_START(astrocde); + void machine_start_astrocde() ATTR_COLD; void astrocade_io(address_map &map); void astrocade_mem(address_map &map); @@ -220,7 +220,7 @@ MACHINE_CONFIG_START(astrocde_mess_state::astrocde) MCFG_DEVICE_PROGRAM_MAP(astrocade_mem) MCFG_DEVICE_IO_MAP(astrocade_io) - MCFG_MACHINE_START_OVERRIDE(astrocde_mess_state, astrocde) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_astrocde, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -284,7 +284,7 @@ void astrocde_state::init_astrocde() m_video_config = AC_SOUND_PRESENT | AC_LIGHTPEN_INTS; } -MACHINE_START_MEMBER(astrocde_mess_state, astrocde) +void astrocde_mess_state::machine_start_astrocde() { if (m_cart->exists()) m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x3fff, read8_delegate(FUNC(astrocade_cart_slot_device::read_rom),(astrocade_cart_slot_device*)m_cart)); diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index a3cb7974616..275e71feb45 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -117,7 +117,7 @@ public: DECLARE_READ16_MEMBER(ps1_unk_r); DECLARE_WRITE16_MEMBER(ps1_unk_w); DECLARE_READ8_MEMBER(ps1_portb_r); - DECLARE_MACHINE_START(vrom_fix); + void machine_start_vrom_fix() ATTR_COLD; void init_at_common(int xmsbase); uint16_t m_ps1_reg[2]; @@ -397,7 +397,7 @@ void at_state::init_atpci() init_at_common(0x100000); } -MACHINE_START_MEMBER(at_state,vrom_fix) +void at_state::machine_start_vrom_fix() { address_space& space = m_maincpu->space(AS_PROGRAM); space.install_read_bank(0xc0000, 0xcffff, "vrom_bank"); @@ -482,7 +482,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(at_state::ibmps1) ibm5170(config); - MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_vrom_fix, this)); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL(10'000'000)) MCFG_DEVICE_PROGRAM_MAP(at16l_map) @@ -704,7 +704,7 @@ MACHINE_CONFIG_START(at_state::megapcpla) MCFG_DEVICE_PROGRAM_MAP(at32l_map) MCFG_DEVICE_IO_MAP(at32_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb) - MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_vrom_fix, this)); MCFG_DEVICE_ADD("mb", AT_MB, 0) MCFG_QUANTUM_TIME(attotime::from_hz(60)) diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp index 29c770ac580..f572118d944 100644 --- a/src/mame/drivers/atari400.cpp +++ b/src/mame/drivers/atari400.cpp @@ -261,13 +261,13 @@ public: m_cart(*this, "cartleft"), m_cart2(*this, "cartright") { } - DECLARE_MACHINE_START(a400); - DECLARE_MACHINE_START(a800); - DECLARE_MACHINE_START(a800xl); - DECLARE_MACHINE_START(a5200); + void machine_start_a400() ATTR_COLD; + void machine_start_a800() ATTR_COLD; + void machine_start_a800xl() ATTR_COLD; + void machine_start_a5200() ATTR_COLD; DECLARE_PALETTE_INIT(a400); - DECLARE_MACHINE_RESET(a400); + void machine_reset_a400(); DECLARE_WRITE8_MEMBER(gtia_cb); @@ -2010,14 +2010,14 @@ TIMER_DEVICE_CALLBACK_MEMBER( a400_state::a5200_interrupt ) m_antic->generic_interrupt(4); } -MACHINE_RESET_MEMBER( a400_state, a400 ) +void a400_state::machine_reset_a400() { pokey_device *pokey = machine().device<pokey_device>("pokey"); pokey->write(15,0); } -MACHINE_START_MEMBER( a400_state, a400 ) +void a400_state::machine_start_a400() { setup_ram(0, m_ram->size()); setup_ram(1, m_ram->size()); @@ -2030,7 +2030,7 @@ MACHINE_START_MEMBER( a400_state, a400 ) } -MACHINE_START_MEMBER( a400_state, a800 ) +void a400_state::machine_start_a800() { setup_ram(0, m_ram->size()); setup_ram(1, m_ram->size()); @@ -2043,7 +2043,7 @@ MACHINE_START_MEMBER( a400_state, a800 ) save_item(NAME(m_last_offs)); } -MACHINE_START_MEMBER( a400_state, a800xl ) +void a400_state::machine_start_a800xl() { m_mmu = 0xfd; m_ext_bank = 0x03; // only used by a130xe @@ -2057,7 +2057,7 @@ MACHINE_START_MEMBER( a400_state, a800xl ) } -MACHINE_START_MEMBER( a400_state, a5200 ) +void a400_state::machine_start_a5200() { setup_cart(m_cart); @@ -2109,7 +2109,7 @@ MACHINE_CONFIG_START(a400_state::atari_common_nodac) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT) - MCFG_MACHINE_RESET_OVERRIDE( a400_state, a400 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_a400, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2187,7 +2187,7 @@ MACHINE_CONFIG_START(a400_state::a400) MCFG_DEVICE_PROGRAM_MAP(a400_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE( a400_state, a400 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_a400, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ() @@ -2206,7 +2206,7 @@ MACHINE_CONFIG_START(a400_state::a400pal) MCFG_DEVICE_PROGRAM_MAP(a400_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE( a400_state, a400 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_a400, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ() @@ -2225,7 +2225,7 @@ MACHINE_CONFIG_START(a400_state::a800) MCFG_DEVICE_PROGRAM_MAP(a400_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE( a400_state, a800 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_a800, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ() @@ -2246,7 +2246,7 @@ MACHINE_CONFIG_START(a400_state::a800pal) MCFG_DEVICE_PROGRAM_MAP(a400_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE( a400_state, a800 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_a800, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ() @@ -2270,7 +2270,7 @@ MACHINE_CONFIG_START(a400_state::a600xl) MCFG_DEVICE_MODIFY("pia") MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a400_state, a600xl_pia_pb_w)) - MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_a800xl, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ() @@ -2295,7 +2295,7 @@ MACHINE_CONFIG_START(a400_state::a800xl) MCFG_DEVICE_MODIFY("pia") MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a400_state, a800xl_pia_pb_w)) - MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_a800xl, this)); MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") @@ -2394,7 +2394,7 @@ MACHINE_CONFIG_START(a400_state::a5200) MCFG_PIA_READPB_HANDLER(NOOP) // FIXME: is there anything connected here MCFG_PIA_CB2_HANDLER(NOOP) // FIXME: is there anything connected here - MCFG_MACHINE_START_OVERRIDE( a400_state, a5200 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_a5200, this)); MCFG_SCREEN_MODIFY( "screen" ) MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ() diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp index b0ee6e59eff..e0270dda626 100644 --- a/src/mame/drivers/atarig1.cpp +++ b/src/mame/drivers/atarig1.cpp @@ -40,13 +40,13 @@ void atarig1_state::update_interrupts() } -MACHINE_START_MEMBER(atarig1_state,atarig1) +void atarig1_state::machine_start_atarig1() { atarigen_state::machine_start(); } -MACHINE_RESET_MEMBER(atarig1_state,atarig1) +void atarig1_state::machine_reset_atarig1() { atarigen_state::machine_reset(); scanline_timer_reset(*m_screen, 8); @@ -401,8 +401,8 @@ MACHINE_CONFIG_START(atarig1_state::atarig1) MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz) MCFG_DEVICE_PROGRAM_MAP(main_map) - MCFG_MACHINE_START_OVERRIDE(atarig1_state,atarig1) - MCFG_MACHINE_RESET_OVERRIDE(atarig1_state,atarig1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_atarig1, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarig1, this)); MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz/16) MCFG_ADC0808_IN0_CB(IOPORT("ADC0")) @@ -431,7 +431,7 @@ MACHINE_CONFIG_START(atarig1_state::atarig1) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarig1_state, video_int_write_line)) - MCFG_VIDEO_START_OVERRIDE(atarig1_state,atarig1) + set_video_start_cb(config, driver_callback_delegate(&video_start_atarig1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp index 2e38b4f05eb..91223b32952 100644 --- a/src/mame/drivers/atarig42.cpp +++ b/src/mame/drivers/atarig42.cpp @@ -545,7 +545,7 @@ MACHINE_CONFIG_START(atarig42_state::atarig42) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarig42_state, video_int_write_line)) - MCFG_VIDEO_START_OVERRIDE(atarig42_state,atarig42) + set_video_start_cb(config, driver_callback_delegate(&video_start_atarig42, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp index 4347b158579..ad25cec4bc4 100644 --- a/src/mame/drivers/atarigt.cpp +++ b/src/mame/drivers/atarigt.cpp @@ -76,7 +76,7 @@ void atarigt_state::update_interrupts() } -MACHINE_RESET_MEMBER(atarigt_state,atarigt) +void atarigt_state::machine_reset_atarigt() { atarigen_state::machine_reset(); scanline_timer_reset(*m_screen, 8); @@ -798,7 +798,7 @@ MACHINE_CONFIG_START(atarigt_state::atarigt) MCFG_DEVICE_PROGRAM_MAP(main_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(atarigt_state, scanline_int_gen, 250) - MCFG_MACHINE_RESET_OVERRIDE(atarigt_state,atarigt) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarigt, this)); MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz/16) // should be 447 kHz according to schematics, but that fails the self-test MCFG_ADC0808_IN2_CB(IOPORT("AN4")) @@ -824,7 +824,7 @@ MACHINE_CONFIG_START(atarigt_state::atarigt) MCFG_SCREEN_UPDATE_DRIVER(atarigt_state, screen_update_atarigt) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarigt_state, video_int_write_line)) - MCFG_VIDEO_START_OVERRIDE(atarigt_state,atarigt) + set_video_start_cb(config, driver_callback_delegate(&video_start_atarigt, this)); MCFG_ATARIRLE_ADD("rle", modesc) diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index eb622a3fc6f..2c721739029 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -218,7 +218,7 @@ void atarisy1_state::update_interrupts() } -MACHINE_START_MEMBER(atarisy1_state,atarisy1) +void atarisy1_state::machine_start_atarisy1() { atarigen_state::machine_start(); @@ -227,7 +227,7 @@ MACHINE_START_MEMBER(atarisy1_state,atarisy1) } -MACHINE_RESET_MEMBER(atarisy1_state,atarisy1) +void atarisy1_state::machine_reset_atarisy1() { atarigen_state::machine_reset(); @@ -716,8 +716,8 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1) MCFG_DEVICE_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8) MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_MACHINE_START_OVERRIDE(atarisy1_state,atarisy1) - MCFG_MACHINE_RESET_OVERRIDE(atarisy1_state,atarisy1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_atarisy1, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarisy1, this)); MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz/16) MCFG_ADC0808_EOC_CB(WRITELINE("ajsint", input_merger_device, in_w<1>)) @@ -770,7 +770,7 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarisy1_state, video_int_write_line)) - MCFG_VIDEO_START_OVERRIDE(atarisy1_state,atarisy1) + set_video_start_cb(config, driver_callback_delegate(&video_start_atarisy1, this)); /* sound hardware */ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_6)) diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp index 9a44eb4852b..dd445647a8c 100644 --- a/src/mame/drivers/atarisy2.cpp +++ b/src/mame/drivers/atarisy2.cpp @@ -195,7 +195,7 @@ void atarisy2_state::scanline_update(screen_device &screen, int scanline) * *************************************/ -MACHINE_START_MEMBER(atarisy2_state,atarisy2) +void atarisy2_state::machine_start_atarisy2() { atarigen_state::machine_start(); @@ -209,7 +209,7 @@ MACHINE_START_MEMBER(atarisy2_state,atarisy2) } -MACHINE_RESET_MEMBER(atarisy2_state,atarisy2) +void atarisy2_state::machine_reset_atarisy2() { atarigen_state::machine_reset(); m_slapstic->slapstic_reset(); @@ -1191,8 +1191,8 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2) MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, MASTER_CLOCK/2/16/16/16/10) - MCFG_MACHINE_START_OVERRIDE(atarisy2_state,atarisy2) - MCFG_MACHINE_RESET_OVERRIDE(atarisy2_state,atarisy2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_atarisy2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarisy2, this)); MCFG_DEVICE_ADD("adc", ADC0809, MASTER_CLOCK/32) // 625 kHz MCFG_ADC0808_IN0_CB(IOPORT("ADC0")) // J102 pin 5 (POT1) @@ -1233,7 +1233,7 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2) MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000) - MCFG_VIDEO_START_OVERRIDE(atarisy2_state,atarisy2) + set_video_start_cb(config, driver_callback_delegate(&video_start_atarisy2, this)); /* sound hardware */ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", NOOP) diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp index a0858707630..03aa43d9d0d 100644 --- a/src/mame/drivers/atarisy4.cpp +++ b/src/mame/drivers/atarisy4.cpp @@ -99,7 +99,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; virtual void video_reset() override; - DECLARE_MACHINE_RESET(airrace); + void machine_reset_airrace(); uint32_t screen_update_atarisy4(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_int); void image_mem_to_screen( bool clip); @@ -796,7 +796,7 @@ MACHINE_CONFIG_START(atarisy4_state::airrace) MCFG_DEVICE_IO_MAP(dsp1_io_map) MCFG_TMS32010_BIO_IN_CB(READLINE(*this, atarisy4_state, dsp1_bio_r)) - MCFG_MACHINE_RESET_OVERRIDE(atarisy4_state,airrace) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_airrace, this)); MACHINE_CONFIG_END @@ -1053,7 +1053,7 @@ void atarisy4_state::machine_reset() m_dsp0->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -MACHINE_RESET_MEMBER(atarisy4_state,airrace) +void atarisy4_state::machine_reset_airrace() { m_dsp0->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); m_dsp1->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp index ac537320afc..a354f5e2aaa 100644 --- a/src/mame/drivers/atm.cpp +++ b/src/mame/drivers/atm.cpp @@ -33,7 +33,7 @@ public: DECLARE_READ8_MEMBER(beta_neutral_r); DECLARE_READ8_MEMBER(beta_enable_r); DECLARE_READ8_MEMBER(beta_disable_r); - DECLARE_MACHINE_RESET(atm); + void machine_reset_atm(); void atm(machine_config &config); void atmtb2(machine_config &config); @@ -140,7 +140,7 @@ void atm_state::atm_switch(address_map &map) map(0x4000, 0xffff).r(this, FUNC(atm_state::beta_disable_r)); } -MACHINE_RESET_MEMBER(atm_state,atm) +void atm_state::machine_reset_atm() { uint8_t *messram = m_ram->pointer(); m_program = &m_maincpu->space(AS_PROGRAM); @@ -192,7 +192,7 @@ MACHINE_CONFIG_START(atm_state::atm) MCFG_DEVICE_PROGRAM_MAP(atm_mem) MCFG_DEVICE_IO_MAP(atm_io) MCFG_DEVICE_OPCODES_MAP(atm_switch) - MCFG_MACHINE_RESET_OVERRIDE(atm_state, atm ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atm, this)); MCFG_BETA_DISK_ADD(BETA_DISK_TAG) diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp index 0671f81c1ba..4b586f42ee4 100644 --- a/src/mame/drivers/badlands.cpp +++ b/src/mame/drivers/badlands.cpp @@ -185,13 +185,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(badlands_state::sound_scanline) } -MACHINE_START_MEMBER(badlands_state,badlands) +void badlands_state::machine_start_badlands() { save_item(NAME(m_pedal_value)); } -MACHINE_RESET_MEMBER(badlands_state,badlands) +void badlands_state::machine_reset_badlands() { m_pedal_value[0] = m_pedal_value[1] = 0x80; @@ -451,8 +451,8 @@ MACHINE_CONFIG_START(badlands_state::badlands) MCFG_DEVICE_PROGRAM_MAP(audio_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", badlands_state, sound_scanline, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE(badlands_state,badlands) - MCFG_MACHINE_RESET_OVERRIDE(badlands_state,badlands) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_badlands, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_badlands, this)); MCFG_EEPROM_2816_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -477,7 +477,7 @@ MACHINE_CONFIG_START(badlands_state::badlands) MCFG_SCREEN_UPDATE_DRIVER(badlands_state, screen_update_badlands) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(badlands_state,badlands) + set_video_start_cb(config, driver_callback_delegate(&video_start_badlands, this)); /* sound hardware */ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_2)) diff --git a/src/mame/drivers/badlandsbl.cpp b/src/mame/drivers/badlandsbl.cpp index 785dee352a2..3983ee52a12 100644 --- a/src/mame/drivers/badlandsbl.cpp +++ b/src/mame/drivers/badlandsbl.cpp @@ -230,7 +230,7 @@ MACHINE_CONFIG_START(badlandsbl_state::badlandsb) // MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_MACHINE_START_OVERRIDE(badlands_state,badlands) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_badlands, this)); MCFG_EEPROM_2816_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -253,7 +253,7 @@ MACHINE_CONFIG_START(badlandsbl_state::badlandsb) MCFG_SCREEN_UPDATE_DRIVER(badlandsbl_state, screen_update_badlandsbl) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(badlands_state,badlands) + set_video_start_cb(config, driver_callback_delegate(&video_start_badlands, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp index 51e3b0e6fbe..297212ede6e 100644 --- a/src/mame/drivers/battlex.cpp +++ b/src/mame/drivers/battlex.cpp @@ -324,7 +324,7 @@ MACHINE_CONFIG_START(battlex_state::dodgeman) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(dodgeman_io_map) - MCFG_VIDEO_START_OVERRIDE(battlex_state, dodgeman) + set_video_start_cb(config, driver_callback_delegate(&video_start_dodgeman, this)); MCFG_DEVICE_ADD("ay2", AY8910, XTAL(10'000'000)/8) // ? MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 7fa1a5642b7..8713050baac 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -845,8 +845,8 @@ MACHINE_CONFIG_START(bbc_state::bbca) MCFG_RAM_EXTRA_OPTIONS("32K") MCFG_RAM_DEFAULT_VALUE(0x00) - MCFG_MACHINE_START_OVERRIDE(bbc_state, bbca) - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbca) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbca, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbca, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -868,7 +868,7 @@ MACHINE_CONFIG_START(bbc_state::bbca) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, bbc_state, bbc_hsync_changed)) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, bbc_state, bbc_vsync_changed)) - MCFG_VIDEO_START_OVERRIDE(bbc_state, bbc) + set_video_start_cb(config, driver_callback_delegate(&video_start_bbc, this)); MCFG_DEFAULT_LAYOUT(layout_bbc) @@ -925,8 +925,8 @@ MACHINE_CONFIG_START(bbc_state::bbcb) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(bbcb_nofdc_mem) - MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcb) - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcb, this)); /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) @@ -1053,8 +1053,8 @@ MACHINE_CONFIG_START(bbc_state::bbcbp) MCFG_DEVICE_PROGRAM_MAP(bbcbp_mem) MCFG_DEVICE_OPCODES_MAP(bbcbp_fetch) - MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcbp) - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcbp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcbp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcbp, this)); /* fdc */ MCFG_DEVICE_REMOVE("fdc") @@ -1076,8 +1076,8 @@ MACHINE_CONFIG_START(bbc_state::bbcbp128) MCFG_DEVICE_PROGRAM_MAP(bbcbp128_mem) MCFG_DEVICE_OPCODES_MAP(bbcbp_fetch) - MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcbp) - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcbp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcbp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcbp, this)); MACHINE_CONFIG_END @@ -1094,7 +1094,7 @@ MACHINE_CONFIG_START(torch_state::torchf) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(bbcb_mem) - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, torch) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_torch, this)); /* fdc */ MCFG_DEVICE_REMOVE("fdc") @@ -1310,8 +1310,8 @@ MACHINE_CONFIG_START(bbc_state::bbcm) MCFG_RAM_DEFAULT_SIZE("32K") MCFG_RAM_DEFAULT_VALUE(0x00) - MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcm) - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcm) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcm, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcm, this)); MCFG_DEFAULT_LAYOUT(layout_bbcm) @@ -1335,7 +1335,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, bbc_state, bbc_hsync_changed)) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, bbc_state, bbc_vsync_changed)) - MCFG_VIDEO_START_OVERRIDE(bbc_state, bbc) + set_video_start_cb(config, driver_callback_delegate(&video_start_bbc, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1568,7 +1568,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_state::cfa3000) bbcm(config); - MCFG_MACHINE_START_OVERRIDE(bbc_state, cfa3000) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cfa3000, this)); /* fdc */ MCFG_DEVICE_MODIFY("wd1770:0") @@ -1625,8 +1625,8 @@ MACHINE_CONFIG_START(bbc_state::bbcmc) /* eeprom pcd8572 */ //MCFG_DEVICE_REMOVE("rtc") - MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcmc) - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcmc) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcmc, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcmc, this)); /* user via */ MCFG_DEVICE_MODIFY("via6522_1") @@ -1681,14 +1681,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_state::ltmpbp) bbcbp(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, ltmpbp) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ltmpbp, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_state::ltmpm) bbcm(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(bbc_state, ltmpm) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ltmpm, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp index 68dd8354f95..cde616ec37c 100644 --- a/src/mame/drivers/bbusters.cpp +++ b/src/mame/drivers/bbusters.cpp @@ -679,7 +679,7 @@ MACHINE_CONFIG_START(bbusters_state::bbusters) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(bbusters_state,bbuster) + set_video_start_cb(config, driver_callback_delegate(&video_start_bbuster, this)); MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) @@ -722,7 +722,7 @@ MACHINE_CONFIG_START(bbusters_state::mechatt) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(bbusters_state,mechatt) + set_video_start_cb(config, driver_callback_delegate(&video_start_mechatt, this)); MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp index 4116cb337a8..02bf1396ca9 100644 --- a/src/mame/drivers/bking.cpp +++ b/src/mame/drivers/bking.cpp @@ -345,7 +345,7 @@ void bking_state::machine_start() save_item(NAME(m_hit)); } -MACHINE_START_MEMBER(bking_state,bking3) +void bking_state::machine_start_bking3() { bking_state::machine_start(); @@ -380,7 +380,7 @@ void bking_state::machine_reset() m_soundnmi->in_w<1>(0); } -MACHINE_RESET_MEMBER(bking_state,bking3) +void bking_state::machine_reset_bking3() { bking_state::machine_reset(); @@ -452,8 +452,8 @@ MACHINE_CONFIG_START(bking_state::bking3) MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(3'000'000)) /* xtal is 3MHz, divided by 4 internally */ - MCFG_MACHINE_START_OVERRIDE(bking_state,bking3) - MCFG_MACHINE_RESET_OVERRIDE(bking_state,bking3) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bking3, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bking3, this)); MCFG_QUANTUM_TIME(attotime::from_hz(6000)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp index 892a1eb07d3..dd4accd68ce 100644 --- a/src/mame/drivers/blitz68k.cpp +++ b/src/mame/drivers/blitz68k.cpp @@ -176,8 +176,8 @@ public: void init_megadblj(); void init_hermit(); void init_dualgame(); - DECLARE_VIDEO_START(blitz68k); - DECLARE_VIDEO_START(blitz68k_addr_factor1); + void video_start_blitz68k() ATTR_COLD; + void video_start_blitz68k_addr_factor1() ATTR_COLD; uint32_t screen_update_blitz68k(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_blitz68k_noblit(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(steaser_mcu_sim); @@ -224,15 +224,15 @@ struct blit_t int addr_factor; } blit; -VIDEO_START_MEMBER(blitz68k_state,blitz68k) +void blitz68k_state::video_start_blitz68k() { m_blit_buffer = std::make_unique<uint8_t[]>(512*256); blit.addr_factor = 2; } -VIDEO_START_MEMBER(blitz68k_state,blitz68k_addr_factor1) +void blitz68k_state::video_start_blitz68k_addr_factor1() { - VIDEO_START_CALL_MEMBER(blitz68k); + video_start_blitz68k(); blit.addr_factor = 1; } @@ -1719,7 +1719,7 @@ MACHINE_CONFIG_START(blitz68k_state::ilpag) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) + set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this)); MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1794,7 +1794,7 @@ MACHINE_CONFIG_START(blitz68k_state::cjffruit) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) + set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this)); MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1826,7 +1826,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankrob) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) + set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this)); MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1856,7 +1856,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankroba) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k_addr_factor1) + set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k_addr_factor1, this)); MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1885,7 +1885,7 @@ MACHINE_CONFIG_START(blitz68k_state::deucesw2) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) + set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this)); MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1916,7 +1916,7 @@ MACHINE_CONFIG_START(blitz68k_state::dualgame) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) + set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this)); MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END @@ -1945,7 +1945,7 @@ MACHINE_CONFIG_START(blitz68k_state::hermit) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k) + set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this)); MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp index ee4483b7333..ff1144c177c 100644 --- a/src/mame/drivers/blmbycar.cpp +++ b/src/mame/drivers/blmbycar.cpp @@ -18,7 +18,7 @@ To Do: Blomby Car is said to be a bootleg of Gaelco's World Rally and uses many of the same fonts -(Update: it actually is a bootleg of World Rally by looking how much +(Update: it actually is a bootleg of World Rally by looking how much similar the two HWs are, down to the dipswitches!) Waterball @@ -213,10 +213,10 @@ static INPUT_PORTS_START( blmbycar ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_START("P1_P2") /* $700002.w */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_CONDITION("DSW", 0x18, NOTEQUALS, 0x18) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Gear Shift") PORT_TOGGLE PORT_CONDITION("DSW", 0x18, NOTEQUALS, 0x18) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_CONDITION("DSW", 0x18, EQUALS, 0x18) @@ -235,7 +235,7 @@ static INPUT_PORTS_START( blmbycar ) PORT_START("OPT_WHEEL") /* $700004.w */ PORT_BIT ( 0x00ff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1) PORT_REVERSE PORT_CONDITION("DSW", 0x18, EQUALS, 0x08) PORT_NAME("P1 Opt Wheel") - + PORT_START("POT_WHEEL") PORT_BIT ( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1) PORT_REVERSE PORT_CONDITION("DSW", 0x18, EQUALS, 0x10) PORT_NAME("P1 Pot Wheel") @@ -333,13 +333,11 @@ GFXDECODE_END /*************************************************************************** - Machine Drivers - ***************************************************************************/ -MACHINE_START_MEMBER(blmbycar_state,blmbycar) +void blmbycar_state::machine_start_blmbycar() { save_item(NAME(m_pot_wheel)); save_item(NAME(m_old_val)); @@ -347,13 +345,12 @@ MACHINE_START_MEMBER(blmbycar_state,blmbycar) membank("okibank")->configure_entries(0, 16, memregion("oki")->base(), 0x10000); } -MACHINE_RESET_MEMBER(blmbycar_state,blmbycar) +void blmbycar_state::machine_reset_blmbycar() { m_pot_wheel = 0; m_old_val = 0; } - MACHINE_CONFIG_START(blmbycar_state::blmbycar) /* basic machine hardware */ @@ -361,8 +358,8 @@ MACHINE_CONFIG_START(blmbycar_state::blmbycar) MCFG_DEVICE_PROGRAM_MAP(blmbycar_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blmbycar_state, irq1_line_hold) - MCFG_MACHINE_START_OVERRIDE(blmbycar_state,blmbycar) - MCFG_MACHINE_RESET_OVERRIDE(blmbycar_state,blmbycar) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_blmbycar, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_blmbycar, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -389,14 +386,14 @@ MACHINE_CONFIG_START(blmbycar_state::blmbycar) MACHINE_CONFIG_END -MACHINE_START_MEMBER(blmbycar_state,watrball) +void blmbycar_state::machine_start_watrball() { save_item(NAME(m_retvalue)); membank("okibank")->configure_entries(0, 16, memregion("oki")->base(), 0x10000); } -MACHINE_RESET_MEMBER(blmbycar_state,watrball) +void blmbycar_state::machine_reset_watrball() { m_retvalue = 0; } @@ -408,8 +405,8 @@ MACHINE_CONFIG_START(blmbycar_state::watrball) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(watrball_map) - MCFG_MACHINE_START_OVERRIDE(blmbycar_state,watrball) - MCFG_MACHINE_RESET_OVERRIDE(blmbycar_state,watrball) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_watrball, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_watrball, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp index 14e87bdefa2..5e8f375f85a 100644 --- a/src/mame/drivers/blstroid.cpp +++ b/src/mame/drivers/blstroid.cpp @@ -204,7 +204,7 @@ MACHINE_CONFIG_START(blstroid_state::blstroid) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, blstroid_state, video_int_write_line)) - MCFG_VIDEO_START_OVERRIDE(blstroid_state,blstroid) + set_video_start_cb(config, driver_callback_delegate(&video_start_blstroid, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp index e0d9debbdfd..a58b52a6d66 100644 --- a/src/mame/drivers/blueprnt.cpp +++ b/src/mame/drivers/blueprnt.cpp @@ -369,7 +369,7 @@ MACHINE_CONFIG_START(blueprnt_state::blueprnt) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) - MCFG_VIDEO_START_OVERRIDE(blueprnt_state, blueprnt) + set_video_start_cb(config, driver_callback_delegate(&video_start_blueprnt, this)); MCFG_SCREEN_UPDATE_DRIVER(blueprnt_state, screen_update_blueprnt) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp index fa9708e5b6c..4c95d527fec 100644 --- a/src/mame/drivers/bml3.cpp +++ b/src/mame/drivers/bml3.cpp @@ -974,7 +974,7 @@ MACHINE_CONFIG_START(bml3_state::bml3_common) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bml3_state, bml3_timer_firq) // MCFG_DEVICE_PERIODIC_INT_DRIVER(bml3_state, bml3_firq, 45) -// MCFG_MACHINE_RESET_OVERRIDE(bml3_state,bml3) +// set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bml3, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp index c6986a67c8f..edd84857528 100644 --- a/src/mame/drivers/btime.cpp +++ b/src/mame/drivers/btime.cpp @@ -1227,7 +1227,7 @@ static DISCRETE_SOUND_START( btime_sound_discrete ) DISCRETE_SOUND_END -MACHINE_START_MEMBER(btime_state,btime) +void btime_state::machine_start_btime() { save_item(NAME(m_btime_palette)); save_item(NAME(m_bnj_scroll1)); @@ -1235,9 +1235,9 @@ MACHINE_START_MEMBER(btime_state,btime) save_item(NAME(m_btime_tilemap)); } -MACHINE_START_MEMBER(btime_state,mmonkey) +void btime_state::machine_start_mmonkey() { - MACHINE_START_CALL_MEMBER(btime); + machine_start_btime(); save_item(NAME(m_protection_command)); save_item(NAME(m_protection_status)); @@ -1245,7 +1245,7 @@ MACHINE_START_MEMBER(btime_state,mmonkey) save_item(NAME(m_protection_ret)); } -MACHINE_RESET_MEMBER(btime_state,btime) +void btime_state::machine_reset_btime() { /* by default, the audio NMI is disabled, except for bootlegs which don't use the enable */ if (m_audionmi.found()) @@ -1260,16 +1260,16 @@ MACHINE_RESET_MEMBER(btime_state,btime) m_btime_tilemap[3] = 0; } -MACHINE_RESET_MEMBER(btime_state,lnc) +void btime_state::machine_reset_lnc() { *m_lnc_charbank = 1; - MACHINE_RESET_CALL_MEMBER(btime); + machine_reset_btime(); } -MACHINE_RESET_MEMBER(btime_state,mmonkey) +void btime_state::machine_reset_mmonkey() { - MACHINE_RESET_CALL_MEMBER(lnc); + machine_reset_lnc(); m_protection_command = 0; m_protection_status = 0; @@ -1296,8 +1296,8 @@ MACHINE_CONFIG_START(btime_state::btime) MCFG_SCREEN_UPDATE_DRIVER(btime_state, screen_update_btime) MCFG_SCREEN_PALETTE("palette") - MCFG_MACHINE_START_OVERRIDE(btime_state,btime) - MCFG_MACHINE_RESET_OVERRIDE(btime_state,btime) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_btime, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_btime, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_btime) @@ -1356,7 +1356,7 @@ MACHINE_CONFIG_START(btime_state::lnc) MCFG_DEVICE_REPLACE("maincpu", DECO_C10707, HCLK2) MCFG_DEVICE_PROGRAM_MAP(lnc_map) - MCFG_MACHINE_RESET_OVERRIDE(btime_state,lnc) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lnc, this)); /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_lnc) @@ -1388,8 +1388,8 @@ MACHINE_CONFIG_START(btime_state::mmonkey) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(mmonkey_map) - MCFG_MACHINE_START_OVERRIDE(btime_state,mmonkey) - MCFG_MACHINE_RESET_OVERRIDE(btime_state,mmonkey) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mmonkey, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mmonkey, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(btime_state::bnj) @@ -1403,7 +1403,7 @@ MACHINE_CONFIG_START(btime_state::bnj) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_bnj) - MCFG_VIDEO_START_OVERRIDE(btime_state,bnj) + set_video_start_cb(config, driver_callback_delegate(&video_start_bnj, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(btime_state, screen_update_bnj) @@ -1469,7 +1469,7 @@ MACHINE_CONFIG_START(btime_state::disco) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32) - MCFG_VIDEO_START_OVERRIDE(btime_state,disco) + set_video_start_cb(config, driver_callback_delegate(&video_start_disco, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(btime_state, screen_update_disco) diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp index e0ef4a62a20..e4ac45625f0 100644 --- a/src/mame/drivers/bublbobl.cpp +++ b/src/mame/drivers/bublbobl.cpp @@ -814,14 +814,14 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(bublbobl_state,common) +void bublbobl_state::machine_start_common() { m_sreset_old = CLEAR_LINE; save_item(NAME(m_video_enable)); save_item(NAME(m_sreset_old)); } -MACHINE_RESET_MEMBER(bublbobl_state,common) // things common on both tokio and bubble bobble hw +void bublbobl_state::machine_reset_common() // things common on both tokio and bubble bobble hw { m_soundnmi->in_w<0>(0); // clear sound NMI stuff m_soundnmi->in_w<1>(0); @@ -835,14 +835,14 @@ MACHINE_RESET_MEMBER(bublbobl_state,common) // things common on both tokio and b } -MACHINE_START_MEMBER(bublbobl_state,tokio) +void bublbobl_state::machine_start_tokio() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); } -MACHINE_RESET_MEMBER(bublbobl_state,tokio) +void bublbobl_state::machine_reset_tokio() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); tokio_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xFF); // force a bankswitch write of all zeroes, as /RESET clears the latch tokio_videoctrl_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xFF); // TODO: does /RESET clear this the same as above? probably yes, needs tracing... } @@ -868,8 +868,8 @@ MACHINE_CONFIG_START(bublbobl_state::tokio) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393, counts 128 vblanks before firing watchdog; same circuit as taitosj uses - MCFG_MACHINE_START_OVERRIDE(bublbobl_state, tokio) - MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, tokio) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tokio, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tokio, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -926,9 +926,9 @@ MACHINE_CONFIG_START(bublbobl_state::tokiob) MACHINE_CONFIG_END -MACHINE_START_MEMBER(bublbobl_state,bublbobl) +void bublbobl_state::machine_start_bublbobl() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); save_item(NAME(m_ddr1)); save_item(NAME(m_ddr2)); @@ -944,9 +944,9 @@ MACHINE_START_MEMBER(bublbobl_state,bublbobl) save_item(NAME(m_port4_out)); } -MACHINE_RESET_MEMBER(bublbobl_state,bublbobl) +void bublbobl_state::machine_reset_bublbobl() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); bublbobl_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xFF); // force a bankswitch write of all zeroes, as /RESET clears the latch m_ddr1 = 0; @@ -981,8 +981,8 @@ MACHINE_CONFIG_START(bublbobl_state::bublbobl_nomcu) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393, counts 128 vblanks before firing watchdog; same circuit as taitosj uses - MCFG_MACHINE_START_OVERRIDE(bublbobl_state, bublbobl) - MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, bublbobl) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bublbobl, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bublbobl, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1027,17 +1027,17 @@ MACHINE_CONFIG_START(bublbobl_state::bublbobl) MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("mcu", M6801_IRQ_LINE)) // same clock latches the INT pin on the second Z80 MACHINE_CONFIG_END -MACHINE_START_MEMBER(bublbobl_state,boblbobl) +void bublbobl_state::machine_start_boblbobl() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); save_item(NAME(m_ic43_a)); save_item(NAME(m_ic43_b)); } -MACHINE_RESET_MEMBER(bublbobl_state,boblbobl) +void bublbobl_state::machine_reset_boblbobl() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); bublbobl_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xff); // force a bankswitch write of all zeroes, as /RESET clears the latch m_ic43_a = 0; @@ -1052,14 +1052,14 @@ MACHINE_CONFIG_START(bublbobl_state::boblbobl) MCFG_DEVICE_PROGRAM_MAP(bootleg_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold) // interrupt mode 1, unlike Bubble Bobble - MCFG_MACHINE_START_OVERRIDE(bublbobl_state, boblbobl) - MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, boblbobl) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_boblbobl, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_boblbobl, this)); MACHINE_CONFIG_END -MACHINE_START_MEMBER(bub68705_state, bub68705) +void bub68705_state::machine_start_bub68705() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); save_item(NAME(m_port_a_out)); save_item(NAME(m_port_b_out)); @@ -1070,9 +1070,9 @@ MACHINE_START_MEMBER(bub68705_state, bub68705) m_port_b_out = 0xff; } -MACHINE_RESET_MEMBER(bub68705_state, bub68705) +void bub68705_state::machine_reset_bub68705() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); bublbobl_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xff); // force a bankswitch write of all zeroes, as /RESET clears the latch m_address = 0; @@ -1089,8 +1089,8 @@ MACHINE_CONFIG_START(bub68705_state::bub68705) MCFG_M68705_PORTB_W_CB(WRITE8(*this, bub68705_state, port_b_w)) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bub68705_state, bublbobl_m68705_interrupt) // ??? should come from the same clock which latches the INT pin on the second Z80 - MCFG_MACHINE_START_OVERRIDE(bub68705_state, bub68705) - MCFG_MACHINE_RESET_OVERRIDE(bub68705_state, bub68705) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bub68705, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bub68705, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp index 54627c02063..a8503dba9af 100644 --- a/src/mame/drivers/cabal.cpp +++ b/src/mame/drivers/cabal.cpp @@ -56,13 +56,13 @@ Dip locations verified with Fabtek manual for the trackball version #include "speaker.h" -MACHINE_START_MEMBER(cabal_state,cabalbl) +void cabal_state::machine_start_cabalbl() { save_item(NAME(m_sound_command1)); save_item(NAME(m_sound_command2)); } -MACHINE_RESET_MEMBER(cabal_state,cabalbl) +void cabal_state::machine_reset_cabalbl() { m_sound_command1 = m_sound_command2 = 0xff; } @@ -595,8 +595,8 @@ MACHINE_CONFIG_START(cabal_state::cabalbl) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_START_OVERRIDE(cabal_state,cabalbl) - MCFG_MACHINE_RESET_OVERRIDE(cabal_state,cabalbl) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cabalbl, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cabalbl, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/calcune.cpp b/src/mame/drivers/calcune.cpp index c84e53cd43b..e9fb1f8bfb4 100644 --- a/src/mame/drivers/calcune.cpp +++ b/src/mame/drivers/calcune.cpp @@ -41,8 +41,8 @@ public: WRITE_LINE_MEMBER(vdp_lv6irqline_callback_genesis_68k); WRITE_LINE_MEMBER(vdp_lv4irqline_callback_genesis_68k); - DECLARE_MACHINE_START(calcune); - DECLARE_MACHINE_RESET(calcune); + void machine_start_calcune() ATTR_COLD; + void machine_reset_calcune(); IRQ_CALLBACK_MEMBER(genesis_int_callback); @@ -198,7 +198,7 @@ uint32_t calcune_state::screen_update_calcune(screen_device &screen, bitmap_rgb3 return 0; } -MACHINE_RESET_MEMBER(calcune_state,calcune) +void calcune_state::machine_reset_calcune() { m_vdp->device_reset_old(); m_vdp2->device_reset_old(); @@ -242,7 +242,7 @@ WRITE_LINE_MEMBER(calcune_state::vdp_lv4irqline_callback_genesis_68k) m_maincpu->set_input_line(4, CLEAR_LINE); } -MACHINE_START_MEMBER(calcune_state,calcune) +void calcune_state::machine_start_calcune() { m_vdp->stop_timers(); m_vdp2->stop_timers(); @@ -256,8 +256,8 @@ MACHINE_CONFIG_START(calcune_state::calcune) MCFG_DEVICE_ADD("z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */ MCFG_DEVICE_DISABLE() /* no code is ever uploaded for the Z80, so it's unused here even if it is present on the PCB */ - MCFG_MACHINE_START_OVERRIDE(calcune_state,calcune) - MCFG_MACHINE_RESET_OVERRIDE(calcune_state,calcune) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_calcune, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_calcune, this)); MCFG_SCREEN_ADD("megadriv", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index bda51ce5ebe..fa9781f093a 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -196,8 +196,8 @@ public: DECLARE_WRITE8_MEMBER(port82_w); // banking 128k DECLARE_WRITE8_MEMBER(port84_w); // dac port 48k DECLARE_INPUT_CHANGED_MEMBER(brk_key); - DECLARE_MACHINE_RESET(lynx48k); - DECLARE_MACHINE_RESET(lynx128k); + void machine_reset_lynx48k(); + void machine_reset_lynx128k(); void init_lynx48k(); void init_lynx128k(); DECLARE_FLOPPY_FORMATS(camplynx_floppy_formats); @@ -724,7 +724,7 @@ READ8_MEMBER( camplynx_state::port82_r ) return data; } -MACHINE_RESET_MEMBER(camplynx_state, lynx48k) +void camplynx_state::machine_reset_lynx48k() { address_space &mem = m_maincpu->space(AS_PROGRAM); m_port58 = 0; @@ -733,7 +733,7 @@ MACHINE_RESET_MEMBER(camplynx_state, lynx48k) m_maincpu->reset(); } -MACHINE_RESET_MEMBER(camplynx_state, lynx128k) +void camplynx_state::machine_reset_lynx128k() { address_space &mem = m_maincpu->space(AS_PROGRAM); m_port58 = 0; @@ -869,7 +869,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx48k) MCFG_DEVICE_PROGRAM_MAP(lynx48k_mem) MCFG_DEVICE_IO_MAP(lynx48k_io) - MCFG_MACHINE_RESET_OVERRIDE(camplynx_state, lynx48k) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lynx48k, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -914,7 +914,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx128k) MCFG_DEVICE_PROGRAM_MAP(lynx128k_mem) MCFG_DEVICE_IO_MAP(lynx128k_io) - MCFG_MACHINE_RESET_OVERRIDE(camplynx_state, lynx128k) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lynx128k, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp index 01091f23767..91f10b34c4e 100644 --- a/src/mame/drivers/cat.cpp +++ b/src/mame/drivers/cat.cpp @@ -287,9 +287,10 @@ public: emu_timer *m_keyboard_timer; emu_timer *m_6ms_timer; - DECLARE_MACHINE_START(cat); - DECLARE_MACHINE_RESET(cat); - DECLARE_VIDEO_START(cat); + void machine_start_cat() ATTR_COLD; + void machine_reset_cat(); + void video_start_cat() ATTR_COLD; + void init_cat(); uint32_t screen_update_cat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -921,7 +922,7 @@ IRQ_CALLBACK_MEMBER(cat_state::cat_int_ack) return M68K_INT_ACK_AUTOVECTOR; } -MACHINE_START_MEMBER(cat_state,cat) +void cat_state::machine_start_cat() { m_duart_ktobf_ff = 0; // reset doesn't touch this m_duart_prn_ack_prev_state = 1; // technically uninitialized @@ -934,7 +935,7 @@ MACHINE_START_MEMBER(cat_state,cat) machine().device<nvram_device>("nvram")->set_base(m_svram, 0x4000); } -MACHINE_RESET_MEMBER(cat_state,cat) +void cat_state::machine_reset_cat() { m_6ms_counter = 0; m_wdt_counter = 0; @@ -942,7 +943,7 @@ MACHINE_RESET_MEMBER(cat_state,cat) m_6ms_timer->adjust(attotime::zero, 0, attotime::from_hz((XTAL(19'968'000)/2)/65536)); } -VIDEO_START_MEMBER(cat_state,cat) +void cat_state::video_start_cat() { } @@ -1061,8 +1062,8 @@ MACHINE_CONFIG_START(cat_state::cat) MCFG_DEVICE_PROGRAM_MAP(cat_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cat_state,cat_int_ack) - MCFG_MACHINE_START_OVERRIDE(cat_state,cat) - MCFG_MACHINE_RESET_OVERRIDE(cat_state,cat) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cat, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cat, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1075,7 +1076,7 @@ MACHINE_CONFIG_START(cat_state::cat) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_VIDEO_START_OVERRIDE(cat_state,cat) + set_video_start_cb(config, driver_callback_delegate(&video_start_cat, this)); MCFG_DEVICE_ADD( "duartn68681", MC68681, (XTAL(19'968'000)*2)/11 ) // duart is normally clocked by 3.6864mhz xtal, but cat seemingly uses a divider from the main xtal instead which probably yields 3.63054545Mhz. There is a trace to cut and a mounting area to allow using an actual 3.6864mhz xtal if you so desire MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, cat_state, cat_duart_irq_handler)) diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 0fd48df444a..c1777ce8237 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -2062,7 +2062,7 @@ GFXDECODE_END ***************************************************************************/ -MACHINE_START_MEMBER(cave_state,cave) +void cave_state::machine_start_cave() { m_vblank_end_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cave_state::cave_vblank_end), this)); @@ -2077,7 +2077,7 @@ MACHINE_START_MEMBER(cave_state,cave) save_item(NAME(m_agallet_vblank_irq)); } -MACHINE_RESET_MEMBER(cave_state,cave) +void cave_state::machine_reset_cave() { std::fill(std::begin(m_soundbuf_data), std::end(m_soundbuf_data), 0); m_soundbuf_wptr = 0; @@ -2101,8 +2101,8 @@ MACHINE_CONFIG_START(cave_state::dfeveron) MCFG_DEVICE_PROGRAM_MAP(dfeveron_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2119,7 +2119,7 @@ MACHINE_CONFIG_START(cave_state::dfeveron) MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2142,8 +2142,8 @@ MACHINE_CONFIG_START(cave_state::ddonpach) MCFG_DEVICE_PROGRAM_MAP(ddonpach_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2160,7 +2160,7 @@ MACHINE_CONFIG_START(cave_state::ddonpach) MCFG_PALETTE_ADD("palette", 0x8000 + 0x40*16) // $400 extra entries for layers 1&2 MCFG_PALETTE_INIT_OWNER(cave_state,ddonpach) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2182,8 +2182,8 @@ MACHINE_CONFIG_START(cave_state::donpachi) MCFG_DEVICE_PROGRAM_MAP(donpachi_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2200,7 +2200,7 @@ MACHINE_CONFIG_START(cave_state::donpachi) MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2229,8 +2229,8 @@ MACHINE_CONFIG_START(cave_state::esprade) MCFG_DEVICE_PROGRAM_MAP(esprade_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2247,7 +2247,7 @@ MACHINE_CONFIG_START(cave_state::esprade) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(cave_state,cave) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2269,8 +2269,8 @@ MACHINE_CONFIG_START(cave_state::gaia) MCFG_DEVICE_PROGRAM_MAP(gaia_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2288,7 +2288,7 @@ MACHINE_CONFIG_START(cave_state::gaia) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(cave_state,cave) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2310,8 +2310,8 @@ MACHINE_CONFIG_START(cave_state::guwange) MCFG_DEVICE_PROGRAM_MAP(guwange_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2328,7 +2328,7 @@ MACHINE_CONFIG_START(cave_state::guwange) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(cave_state,cave) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2353,8 +2353,8 @@ MACHINE_CONFIG_START(cave_state::hotdogst) MCFG_DEVICE_PROGRAM_MAP(hotdogst_sound_map) MCFG_DEVICE_IO_MAP(hotdogst_sound_portmap) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2371,7 +2371,7 @@ MACHINE_CONFIG_START(cave_state::hotdogst) MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2403,8 +2403,8 @@ MACHINE_CONFIG_START(cave_state::korokoro) MCFG_DEVICE_PROGRAM_MAP(korokoro_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2421,7 +2421,7 @@ MACHINE_CONFIG_START(cave_state::korokoro) MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT_OWNER(cave_state,korokoro) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2456,8 +2456,8 @@ MACHINE_CONFIG_START(cave_state::mazinger) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */ - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2474,7 +2474,7 @@ MACHINE_CONFIG_START(cave_state::mazinger) MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT_OWNER(cave_state,mazinger) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2513,8 +2513,8 @@ MACHINE_CONFIG_START(cave_state::metmqstr) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */ - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) /* start with the watchdog armed */ + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); /* start with the watchdog armed */ MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2531,7 +2531,7 @@ MACHINE_CONFIG_START(cave_state::metmqstr) MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2569,8 +2569,8 @@ MACHINE_CONFIG_START(cave_state::pacslot) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */ - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_ENABLE_STREAMING() @@ -2589,7 +2589,7 @@ MACHINE_CONFIG_START(cave_state::pacslot) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(cave_state,cave) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2629,8 +2629,8 @@ MACHINE_CONFIG_START(cave_state::ppsatan) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(1)) /* a guess, and certainly wrong */ - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_lev2", cave_state, timer_lev2_cb, attotime::from_hz(60)) @@ -2665,7 +2665,7 @@ MACHINE_CONFIG_START(cave_state::ppsatan) MCFG_PALETTE_INIT_OWNER(cave_state,ppsatan) MCFG_DEFAULT_LAYOUT(layout_ppsatan) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2694,8 +2694,8 @@ MACHINE_CONFIG_START(cave_state::pwrinst2) MCFG_DEVICE_PROGRAM_MAP(pwrinst2_sound_map) MCFG_DEVICE_IO_MAP(pwrinst2_sound_portmap) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2712,7 +2712,7 @@ MACHINE_CONFIG_START(cave_state::pwrinst2) MCFG_PALETTE_ADD("palette", 0x8000+0x2800) MCFG_PALETTE_INIT_OWNER(cave_state,pwrinst2) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_4_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_4_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2748,11 +2748,11 @@ TIMER_DEVICE_CALLBACK_MEMBER( cave_state::sailormn_startup ) m_maincpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE); } -MACHINE_RESET_MEMBER(cave_state,sailormn) +void cave_state::machine_reset_sailormn() { timer_device *startup = machine().device<timer_device>("startup"); startup->adjust(attotime::from_usec(1000), 0, attotime::zero); - MACHINE_RESET_CALL_MEMBER(cave); + machine_reset_cave(); } MACHINE_CONFIG_START(cave_state::sailormn) @@ -2771,8 +2771,8 @@ MACHINE_CONFIG_START(cave_state::sailormn) // MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,sailormn) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sailormn, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2789,7 +2789,7 @@ MACHINE_CONFIG_START(cave_state::sailormn) MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */ MCFG_PALETTE_INIT_OWNER(cave_state,sailormn) // 4 bit sprites, 6 bit tiles - MCFG_VIDEO_START_OVERRIDE(cave_state,sailormn_3_layers) /* Layer 2 has 1 banked ROM */ + set_video_start_cb(config, driver_callback_delegate(&video_start_sailormn_3_layers, this)); /* Layer 2 has 1 banked ROM */ /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2829,8 +2829,8 @@ MACHINE_CONFIG_START(cave_state::tekkencw) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */ - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_ENABLE_STREAMING() @@ -2849,7 +2849,7 @@ MACHINE_CONFIG_START(cave_state::tekkencw) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(cave_state,cave) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2885,8 +2885,8 @@ MACHINE_CONFIG_START(cave_state::tjumpman) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */ - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) - MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_ENABLE_STREAMING() @@ -2905,7 +2905,7 @@ MACHINE_CONFIG_START(cave_state::tjumpman) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(cave_state,cave) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2930,7 +2930,7 @@ MACHINE_CONFIG_START(cave_state::uopoko) MCFG_DEVICE_PROGRAM_MAP(uopoko_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_MACHINE_START_OVERRIDE(cave_state,cave) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) @@ -2947,7 +2947,7 @@ MACHINE_CONFIG_START(cave_state::uopoko) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(cave_state,cave) - MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index cf9bb04a9ef..cc47159f03e 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -140,12 +140,12 @@ public: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - DECLARE_MACHINE_START( cbm2 ); - DECLARE_MACHINE_START( cbm2_ntsc ); - DECLARE_MACHINE_START( cbm2_pal ); - DECLARE_MACHINE_START( cbm2x_ntsc ); - DECLARE_MACHINE_START( cbm2x_pal ); - DECLARE_MACHINE_RESET( cbm2 ); + void machine_start_cbm2() ATTR_COLD; + void machine_start_cbm2_ntsc() ATTR_COLD; + void machine_start_cbm2_pal() ATTR_COLD; + void machine_start_cbm2x_ntsc() ATTR_COLD; + void machine_start_cbm2x_pal() ATTR_COLD; + void machine_reset_cbm2(); virtual void read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *rasseg1, int *rasseg2, int *rasseg3, int *rasseg4); @@ -275,10 +275,10 @@ public: required_device<mos6566_device> m_vic; optional_shared_ptr<uint8_t> m_color_ram; - DECLARE_MACHINE_START( p500 ); - DECLARE_MACHINE_START( p500_ntsc ); - DECLARE_MACHINE_START( p500_pal ); - DECLARE_MACHINE_RESET( p500 ); + void machine_start_p500() ATTR_COLD; + void machine_start_p500_ntsc() ATTR_COLD; + void machine_start_p500_pal() ATTR_COLD; + void machine_reset_p500(); void read_pla1(offs_t offset, int busy2, int clrnibcsb, int procvid, int refen, int ba, int aec, int srw, int *datxen, int *dramxen, int *clrniben, int *segf, int *_64kcasen, int *casenb, int *viddaten, int *viddat_tr); @@ -2117,10 +2117,10 @@ void cbm2_state::device_timer(emu_timer &timer, device_timer_id id, int param, v //------------------------------------------------- -// MACHINE_START( cbm2 ) +// machine_start_cbm2() //------------------------------------------------- -MACHINE_START_MEMBER( cbm2_state, cbm2 ) +void cbm2_state::machine_start_cbm2() { // allocate memory m_video_ram.allocate(m_video_ram_size); @@ -2147,64 +2147,64 @@ MACHINE_START_MEMBER( cbm2_state, cbm2 ) //------------------------------------------------- -// MACHINE_START( cbm2_ntsc ) +// machine_start_cbm2_ntsc() //------------------------------------------------- -MACHINE_START_MEMBER( cbm2_state, cbm2_ntsc ) +void cbm2_state::machine_start_cbm2_ntsc() { m_ntsc = 1; - MACHINE_START_CALL_MEMBER(cbm2); + machine_start_cbm2(); } //------------------------------------------------- -// MACHINE_START( cbm2_pal ) +// machine_start_cbm2_pal() //------------------------------------------------- -MACHINE_START_MEMBER( cbm2_state, cbm2_pal ) +void cbm2_state::machine_start_cbm2_pal() { m_ntsc = 0; - MACHINE_START_CALL_MEMBER(cbm2); + machine_start_cbm2(); } //------------------------------------------------- -// MACHINE_START( cbm2x_ntsc ) +// machine_start_cbm2x_ntsc() //------------------------------------------------- -MACHINE_START_MEMBER( cbm2_state, cbm2x_ntsc ) +void cbm2_state::machine_start_cbm2x_ntsc() { // allocate memory m_extbuf_ram.allocate(0x800); - MACHINE_START_CALL_MEMBER(cbm2_ntsc); + machine_start_cbm2_ntsc(); } //------------------------------------------------- -// MACHINE_START( cbm2x_pal ) +// machine_start_cbm2x_pal() //------------------------------------------------- -MACHINE_START_MEMBER( cbm2_state, cbm2x_pal ) +void cbm2_state::machine_start_cbm2x_pal() { // allocate memory m_extbuf_ram.allocate(0x800); - MACHINE_START_CALL_MEMBER(cbm2_pal); + machine_start_cbm2_pal(); } //------------------------------------------------- -// MACHINE_START( p500 ) +// machine_start_p500() //------------------------------------------------- -MACHINE_START_MEMBER( p500_state, p500 ) +void p500_state::machine_start_p500() { m_video_ram_size = 0x400; - MACHINE_START_CALL_MEMBER(cbm2); + machine_start_cbm2(); // allocate memory m_color_ram.allocate(0x400); @@ -2218,14 +2218,14 @@ MACHINE_START_MEMBER( p500_state, p500 ) //------------------------------------------------- -// MACHINE_START( p500_ntsc ) +// machine_start_p500_ntsc() //------------------------------------------------- -MACHINE_START_MEMBER( p500_state, p500_ntsc ) +void p500_state::machine_start_p500_ntsc() { m_ntsc = 1; - MACHINE_START_CALL_MEMBER(p500); + machine_start_p500(); } @@ -2233,15 +2233,15 @@ MACHINE_START_MEMBER( p500_state, p500_ntsc ) // MACHINE_START( p500_pal ) //------------------------------------------------- -MACHINE_START_MEMBER( p500_state, p500_pal ) +void p500_state::machine_start_p500_pal() { m_ntsc = 0; - MACHINE_START_CALL_MEMBER(p500); + machine_start_p500(); } -MACHINE_RESET_MEMBER( cbm2_state, cbm2 ) +void cbm2_state::machine_reset_cbm2() { m_dramon = 1; m_busen1 = 1; @@ -2250,8 +2250,8 @@ MACHINE_RESET_MEMBER( cbm2_state, cbm2 ) m_tpi1_irq = CLEAR_LINE; m_user_irq = CLEAR_LINE; -m_ext_tpi_pb = 0xff; -m_ext_cia_pb = 0xff; + m_ext_tpi_pb = 0xff; + m_ext_cia_pb = 0xff; m_maincpu->reset(); @@ -2266,9 +2266,9 @@ m_ext_cia_pb = 0xff; } -MACHINE_RESET_MEMBER( p500_state, p500 ) +void p500_state::machine_reset_p500() { - MACHINE_RESET_CALL_MEMBER(cbm2); + machine_reset_cbm2(); m_vic->reset(); @@ -2310,8 +2310,8 @@ MACHINE_CONFIG_END //------------------------------------------------- MACHINE_CONFIG_START(p500_state::p500_ntsc) - MCFG_MACHINE_START_OVERRIDE(p500_state, p500_ntsc) - MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_p500_ntsc, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_p500, this)); // basic hardware MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(14'318'181)/14) @@ -2426,8 +2426,8 @@ MACHINE_CONFIG_END //------------------------------------------------- MACHINE_CONFIG_START(p500_state::p500_pal) - MCFG_MACHINE_START_OVERRIDE(p500_state, p500_pal) - MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_p500_pal, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_p500, this)); // basic hardware MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(17'734'472)/18) @@ -2539,8 +2539,8 @@ MACHINE_CONFIG_END //------------------------------------------------- MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc) - MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_ntsc) - MCFG_MACHINE_RESET_OVERRIDE(cbm2_state, cbm2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2_ntsc, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cbm2, this)); // basic hardware MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(18'000'000)/9) @@ -2669,7 +2669,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cbm2_state::cbm2lp_pal) cbm2lp_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_pal) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2_pal, this)); MCFG_DEVICE_MODIFY(MOS6526_TAG) MCFG_MOS6526_TOD(50) @@ -2733,7 +2733,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cbm2hp_state::bx256hp) b256hp(config); - MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_ntsc) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2x_ntsc, this)); MCFG_DEVICE_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000)) MCFG_DEVICE_PROGRAM_MAP(ext_mem) @@ -2766,7 +2766,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cbm2_state::cbm2hp_pal) cbm2hp_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_pal) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2_pal, this)); // devices MCFG_DEVICE_MODIFY(MOS6525_2_TAG) @@ -2803,7 +2803,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cbm2hp_state::cbm730) cbm720(config); - MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_pal) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2x_pal, this)); MCFG_DEVICE_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000)) MCFG_DEVICE_PROGRAM_MAP(ext_mem) diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 7482e77bbb8..3119a1eeaba 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -296,7 +296,7 @@ WRITE_LINE_MEMBER(cclimber_state::toprollr_rombank_w) } #ifdef UNUSED_FUNCTION -MACHINE_RESET_MEMBER(cclimber_state,cclimber) +void cclimber_state::machine_reset_cclimber() { /* Disable interrupts, River Patrol / Silver Land needs this otherwise returns bad RAM on POST */ m_nmi_mask = 0; @@ -1135,7 +1135,7 @@ MACHINE_CONFIG_START(cclimber_state::root) MCFG_PALETTE_ADD("palette", 16*4+8*4) MCFG_PALETTE_INIT_OWNER(cclimber_state,cclimber) - MCFG_VIDEO_START_OVERRIDE(cclimber_state,cclimber) + set_video_start_cb(config, driver_callback_delegate(&video_start_cclimber, this)); MACHINE_CONFIG_END @@ -1244,7 +1244,7 @@ MACHINE_CONFIG_START(cclimber_state::toprollr) MCFG_PALETTE_ENTRIES(32*5) MCFG_PALETTE_INIT_OWNER(cclimber_state,toprollr) - MCFG_VIDEO_START_OVERRIDE(cclimber_state,toprollr) + set_video_start_cb(config, driver_callback_delegate(&video_start_toprollr, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_toprollr) MACHINE_CONFIG_END @@ -1282,7 +1282,7 @@ MACHINE_CONFIG_START(cclimber_state::swimmer) MCFG_PALETTE_ADD("palette", 32*8+4*8+1) MCFG_PALETTE_INIT_OWNER(cclimber_state,swimmer) - MCFG_VIDEO_START_OVERRIDE(cclimber_state,swimmer) + set_video_start_cb(config, driver_callback_delegate(&video_start_swimmer, this)); /* audio hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp index 753e9e26f0d..3132727fa58 100644 --- a/src/mame/drivers/ccs300.cpp +++ b/src/mame/drivers/ccs300.cpp @@ -37,7 +37,7 @@ public: { } void init_ccs300(); - DECLARE_MACHINE_RESET(ccs300); + void machine_reset_ccs300(); DECLARE_WRITE8_MEMBER(port40_w); void ccs300(machine_config &config); @@ -90,7 +90,7 @@ WRITE8_MEMBER( ccs300_state::port40_w ) membank("bankr0")->set_entry( (data) ? 1 : 0); } -MACHINE_RESET_MEMBER( ccs300_state, ccs300 ) +void ccs300_state::machine_reset_ccs300() { membank("bankr0")->set_entry(0); // point at rom membank("bankw0")->set_entry(0); // always write to ram @@ -122,7 +122,7 @@ MACHINE_CONFIG_START(ccs300_state::ccs300) MCFG_DEVICE_IO_MAP(ccs300_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_MACHINE_RESET_OVERRIDE(ccs300_state, ccs300) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ccs300, this)); /* video hardware */ MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600) diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp index feb1091c8ec..cdfc96e278b 100644 --- a/src/mame/drivers/cdi.cpp +++ b/src/mame/drivers/cdi.cpp @@ -302,7 +302,7 @@ INTERRUPT_GEN_MEMBER( cdi_state::mcu_frame ) m_scc->mcu_frame(); } -MACHINE_RESET_MEMBER( cdi_state, cdimono1 ) +void cdi_state::machine_reset_cdimono1() { uint16_t *src = (uint16_t*)memregion("maincpu")->base(); uint16_t *dst = m_planea; @@ -316,7 +316,7 @@ MACHINE_RESET_MEMBER( cdi_state, cdimono1 ) m_dmadac[1] = machine().device<dmadac_sound_device>("dac2"); } -MACHINE_RESET_MEMBER( cdi_state, cdimono2 ) +void cdi_state::machine_reset_cdimono2() { uint16_t *src = (uint16_t*)memregion("maincpu")->base(); uint16_t *dst = m_planea; @@ -328,17 +328,17 @@ MACHINE_RESET_MEMBER( cdi_state, cdimono2 ) m_dmadac[1] = machine().device<dmadac_sound_device>("dac2"); } -MACHINE_RESET_MEMBER( cdi_state, quizard1 ) +void cdi_state::machine_reset_quizard1() { - MACHINE_RESET_CALL_MEMBER( cdimono1 ); + machine_reset_cdimono1(); m_scc->set_quizard_mcu_value(0x021f); m_scc->set_quizard_mcu_ack(0x5a); } -MACHINE_RESET_MEMBER( cdi_state, quizard2 ) +void cdi_state::machine_reset_quizard2() { - MACHINE_RESET_CALL_MEMBER( cdimono1 ); + machine_reset_cdimono1(); // 0x2b1: Italian // 0x001: French @@ -350,17 +350,17 @@ MACHINE_RESET_MEMBER( cdi_state, quizard2 ) -MACHINE_RESET_MEMBER( cdi_state, quizard3 ) +void cdi_state::machine_reset_quizard3() { - MACHINE_RESET_CALL_MEMBER( cdimono1 ); + machine_reset_cdimono1(); m_scc->set_quizard_mcu_value(0x00ae); m_scc->set_quizard_mcu_ack(0x58); } -MACHINE_RESET_MEMBER( cdi_state, quizard4 ) +void cdi_state::machine_reset_quizard4() { - MACHINE_RESET_CALL_MEMBER( cdimono1 ); + machine_reset_cdimono1(); //m_scc->set_quizard_mcu_value(0x0139); m_scc->set_quizard_mcu_value(0x011f); @@ -847,7 +847,7 @@ MACHINE_CONFIG_START(cdi_state::cdimono2) MCFG_DEFAULT_LAYOUT(layout_cdi) - MCFG_MACHINE_RESET_OVERRIDE( cdi_state, cdimono2 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cdimono2, this)); MCFG_CDI68070_ADD("scc68070") MCFG_DEVICE_ADD("servo", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */ @@ -902,7 +902,7 @@ MACHINE_CONFIG_START(cdi_state::cdi910) MCFG_DEFAULT_LAYOUT(layout_cdi) - MCFG_MACHINE_RESET_OVERRIDE( cdi_state, cdimono2 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cdimono2, this)); MCFG_CDI68070_ADD("scc68070") MCFG_DEVICE_ADD("servo", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */ @@ -935,7 +935,7 @@ MACHINE_CONFIG_END // CD-i Mono-I, with CD-ROM image device (MESS) and Software List (MESS) MACHINE_CONFIG_START(cdi_state::cdimono1) cdimono1_base(config); - MCFG_MACHINE_RESET_OVERRIDE(cdi_state, cdimono1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cdimono1, this)); MCFG_CDROM_ADD( "cdrom" ) MCFG_CDROM_INTERFACE("cdi_cdrom") @@ -958,7 +958,7 @@ READ8_MEMBER( cdi_state::quizard_mcu_p1_r ) MACHINE_CONFIG_START(cdi_state::quizard1) quizard(config); - MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard1 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quizard1, this)); MCFG_DEVICE_ADD("mcu", I8751, 8000000) MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, cdi_state, quizard_mcu_p1_r)) @@ -968,17 +968,17 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cdi_state::quizard2) quizard(config); - MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard2 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quizard2, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(cdi_state::quizard3) quizard(config); - MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard3 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quizard3, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(cdi_state::quizard4) quizard(config); - MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard4 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quizard4, this)); MCFG_DEVICE_ADD("mcu", I8751, 8000000) MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, cdi_state, quizard_mcu_p1_r)) diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp index 4320ccc5e10..82f2988f23e 100644 --- a/src/mame/drivers/centiped.cpp +++ b/src/mame/drivers/centiped.cpp @@ -444,7 +444,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(centiped_state::generate_interrupt) m_screen->update_partial(scanline); } -MACHINE_START_MEMBER(centiped_state,centiped) +void centiped_state::machine_start_centiped() { save_item(NAME(m_oldpos)); save_item(NAME(m_sign)); @@ -453,16 +453,16 @@ MACHINE_START_MEMBER(centiped_state,centiped) } -MACHINE_RESET_MEMBER(centiped_state,centiped) +void centiped_state::machine_reset_centiped() { m_maincpu->set_input_line(0, CLEAR_LINE); m_prg_bank = 0; } -MACHINE_RESET_MEMBER(centiped_state,magworm) +void centiped_state::machine_reset_magworm() { - MACHINE_RESET_CALL_MEMBER(centiped); + machine_reset_centiped(); /* kludge: clear RAM so that magworm can be reset cleanly */ memset(m_rambase, 0, 0x400); @@ -1716,8 +1716,8 @@ MACHINE_CONFIG_START(centiped_state::centiped_base) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */ - MCFG_MACHINE_START_OVERRIDE(centiped_state,centiped) - MCFG_MACHINE_RESET_OVERRIDE(centiped_state,centiped) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_centiped, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_centiped, this)); MCFG_ATARIVGEAROM_ADD("earom") @@ -1744,7 +1744,7 @@ MACHINE_CONFIG_START(centiped_state::centiped_base) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_centiped) MCFG_PALETTE_ADD("palette", 4+4*4*4*4) - MCFG_VIDEO_START_OVERRIDE(centiped_state,centiped) + set_video_start_cb(config, driver_callback_delegate(&video_start_centiped, this)); MACHINE_CONFIG_END @@ -1817,7 +1817,7 @@ MACHINE_CONFIG_START(centiped_state::magworm) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(magworm_map) - MCFG_MACHINE_RESET_OVERRIDE(centiped_state,magworm) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_magworm, this)); MCFG_DEVICE_MODIFY("outlatch") // 12A MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, flip_screen_w)) @@ -1848,7 +1848,7 @@ MACHINE_CONFIG_START(centiped_state::milliped) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4*4+4*4*4*4*4) - MCFG_VIDEO_START_OVERRIDE(centiped_state,milliped) + set_video_start_cb(config, driver_callback_delegate(&video_start_milliped, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(centiped_state, screen_update_milliped) @@ -1895,7 +1895,7 @@ MACHINE_CONFIG_START(centiped_state::warlords) MCFG_PALETTE_ENTRIES(8*4+8*4) MCFG_PALETTE_INIT_OWNER(centiped_state,warlords) - MCFG_VIDEO_START_OVERRIDE(centiped_state,warlords) + set_video_start_cb(config, driver_callback_delegate(&video_start_warlords, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(centiped_state, screen_update_warlords) @@ -1955,7 +1955,7 @@ MACHINE_CONFIG_START(centiped_state::bullsdrt) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_centiped) MCFG_PALETTE_ADD("palette", 4+4*4*4*4) - MCFG_VIDEO_START_OVERRIDE(centiped_state,bullsdrt) + set_video_start_cb(config, driver_callback_delegate(&video_start_bullsdrt, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp index 7cf0c104dc3..62e3d6b052a 100644 --- a/src/mame/drivers/champbas.cpp +++ b/src/mame/drivers/champbas.cpp @@ -555,7 +555,7 @@ MACHINE_CONFIG_START(champbas_state::talbot) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(champbas_state,champbas) - MCFG_VIDEO_START_OVERRIDE(champbas_state,champbas) + set_video_start_cb(config, driver_callback_delegate(&video_start_champbas, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -602,7 +602,7 @@ MACHINE_CONFIG_START(champbas_state::champbas) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(champbas_state,champbas) - MCFG_VIDEO_START_OVERRIDE(champbas_state,champbas) + set_video_start_cb(config, driver_callback_delegate(&video_start_champbas, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -713,7 +713,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccr) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(champbas_state,exctsccr) - MCFG_VIDEO_START_OVERRIDE(champbas_state,exctsccr) + set_video_start_cb(config, driver_callback_delegate(&video_start_exctsccr, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -779,7 +779,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccrb) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(champbas_state,exctsccr) - MCFG_VIDEO_START_OVERRIDE(champbas_state,exctsccr) + set_video_start_cb(config, driver_callback_delegate(&video_start_exctsccr, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp index 369d0fdb1b6..ecdac4bf3df 100644 --- a/src/mame/drivers/champbwl.cpp +++ b/src/mame/drivers/champbwl.cpp @@ -190,9 +190,9 @@ public: DECLARE_READ8_MEMBER(trackball_reset_r); DECLARE_WRITE8_MEMBER(champbwl_misc_w); DECLARE_WRITE8_MEMBER(doraemon_outputs_w); - DECLARE_MACHINE_START(champbwl); - DECLARE_MACHINE_RESET(champbwl); - DECLARE_MACHINE_START(doraemon); + void machine_start_champbwl() ATTR_COLD; + void machine_reset_champbwl(); + void machine_start_doraemon() ATTR_COLD; DECLARE_PALETTE_INIT(champbwl); uint32_t screen_update_champbwl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_doraemon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -450,7 +450,7 @@ static GFXDECODE_START( gfx_champbwl ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_END -MACHINE_START_MEMBER(champbwl_state,champbwl) +void champbwl_state::machine_start_champbwl() { uint8_t *ROM = memregion("maincpu")->base(); @@ -460,7 +460,7 @@ MACHINE_START_MEMBER(champbwl_state,champbwl) save_item(NAME(m_last_trackball_val)); } -MACHINE_RESET_MEMBER(champbwl_state,champbwl) +void champbwl_state::machine_reset_champbwl() { m_screenflip = 0; m_last_trackball_val[0] = 0; @@ -496,8 +496,8 @@ MACHINE_CONFIG_START(champbwl_state::champbwl) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_MACHINE_START_OVERRIDE(champbwl_state,champbwl) - MCFG_MACHINE_RESET_OVERRIDE(champbwl_state,champbwl) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_champbwl, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_champbwl, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -547,7 +547,7 @@ WRITE_LINE_MEMBER(champbwl_state::screen_vblank_doraemon) m_seta001->setac_eof(); } -MACHINE_START_MEMBER(champbwl_state,doraemon) +void champbwl_state::machine_start_doraemon() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000); @@ -565,7 +565,7 @@ MACHINE_CONFIG_START(champbwl_state::doraemon) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(2000), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ) - MCFG_MACHINE_START_OVERRIDE(champbwl_state,doraemon) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_doraemon, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index 4e2fbd52297..e5811af8791 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -95,9 +95,9 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(chinagat_scanline); void init_chinagat(); - DECLARE_MACHINE_START(chinagat); - DECLARE_MACHINE_RESET(chinagat); - DECLARE_VIDEO_START(chinagat); + void machine_start_chinagat() ATTR_COLD; + void machine_reset_chinagat(); + void video_start_chinagat() ATTR_COLD; DECLARE_WRITE8_MEMBER(interrupt_w); DECLARE_WRITE8_MEMBER(video_ctrl_w); DECLARE_WRITE8_MEMBER(bankswitch_w); @@ -123,7 +123,7 @@ public: }; -VIDEO_START_MEMBER(chinagat_state,chinagat) +void chinagat_state::video_start_chinagat() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(chinagat_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(chinagat_state::background_scan),this), 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(chinagat_state::get_fg_16color_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -519,7 +519,7 @@ static GFXDECODE_START( gfx_chinagat ) GFXDECODE_END -MACHINE_START_MEMBER(chinagat_state,chinagat) +void chinagat_state::machine_start_chinagat() { /* configure banks */ membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000); @@ -540,7 +540,7 @@ MACHINE_START_MEMBER(chinagat_state,chinagat) } -MACHINE_RESET_MEMBER(chinagat_state,chinagat) +void chinagat_state::machine_reset_chinagat() { m_scrollx_hi = 0; m_scrolly_hi = 0; @@ -572,8 +572,8 @@ MACHINE_CONFIG_START(chinagat_state::chinagat) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */ - MCFG_MACHINE_START_OVERRIDE(chinagat_state,chinagat) - MCFG_MACHINE_RESET_OVERRIDE(chinagat_state,chinagat) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_chinagat, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_chinagat, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -585,7 +585,7 @@ MACHINE_CONFIG_START(chinagat_state::chinagat) MCFG_PALETTE_ADD("palette", 384) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(chinagat_state,chinagat) + set_video_start_cb(config, driver_callback_delegate(&video_start_chinagat, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -626,8 +626,8 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub1) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */ - MCFG_MACHINE_START_OVERRIDE(chinagat_state,chinagat) - MCFG_MACHINE_RESET_OVERRIDE(chinagat_state,chinagat) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_chinagat, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_chinagat, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -639,7 +639,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub1) MCFG_PALETTE_ADD("palette", 384) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(chinagat_state,chinagat) + set_video_start_cb(config, driver_callback_delegate(&video_start_chinagat, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -673,8 +673,8 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub2) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */ - MCFG_MACHINE_START_OVERRIDE(chinagat_state,chinagat) - MCFG_MACHINE_RESET_OVERRIDE(chinagat_state,chinagat) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_chinagat, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_chinagat, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -686,7 +686,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub2) MCFG_PALETTE_ADD("palette", 384) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(chinagat_state,chinagat) + set_video_start_cb(config, driver_callback_delegate(&video_start_chinagat, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp index 6cf23778adb..325141ded9b 100644 --- a/src/mame/drivers/cinemat.cpp +++ b/src/mame/drivers/cinemat.cpp @@ -1070,7 +1070,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cinemat_state::sundance) cinemat_jmi_8k(config); sundance_sound(config); - MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_16level) + set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_16level, this)); MACHINE_CONFIG_END @@ -1110,7 +1110,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cinemat_state::solarq) cinemat_jmi_16k(config); solarq_sound(config); - MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_64level) + set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_64level, this)); MACHINE_CONFIG_END @@ -1119,7 +1119,7 @@ MACHINE_CONFIG_START(cinemat_state::boxingb) boxingb_sound(config); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 1024, 0, 788) - MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_color) + set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_color, this)); MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, mux_select_w)) @@ -1137,7 +1137,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cinemat_state::wotwc) cinemat_jmi_16k(config); wotw_sound(config); - MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_color) + set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_color, this)); MACHINE_CONFIG_END @@ -1157,7 +1157,7 @@ MACHINE_CONFIG_START(cinemat_state::qb3) MCFG_DEVICE_IO_MAP(io_map_qb3) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 1120, 0, 780) - MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_qb3color) + set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_qb3color, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp index e34d040de8d..843120a3bad 100644 --- a/src/mame/drivers/clshroad.cpp +++ b/src/mame/drivers/clshroad.cpp @@ -303,7 +303,7 @@ MACHINE_CONFIG_START(clshroad_state::firebatl) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(clshroad_state,firebatl) - MCFG_VIDEO_START_OVERRIDE(clshroad_state,firebatl) + set_video_start_cb(config, driver_callback_delegate(&video_start_firebatl, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -343,7 +343,7 @@ MACHINE_CONFIG_START(clshroad_state::clshroad) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(clshroad_state,clshroad) - MCFG_VIDEO_START_OVERRIDE(clshroad_state,clshroad) + set_video_start_cb(config, driver_callback_delegate(&video_start_clshroad, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp index 9705aa3d1ee..eaffca19700 100644 --- a/src/mame/drivers/cninja.cpp +++ b/src/mame/drivers/cninja.cpp @@ -785,12 +785,12 @@ DECOSPR_PRIORITY_CB_MEMBER(cninja_state::pri_callback) return 0; } -MACHINE_START_MEMBER(cninja_state,robocop2) +void cninja_state::machine_start_robocop2() { save_item(NAME(m_priority)); } -MACHINE_RESET_MEMBER(cninja_state,robocop2) +void cninja_state::machine_reset_robocop2() { m_priority = 0; } @@ -907,7 +907,7 @@ MACHINE_CONFIG_START(cninja_state::stoneage) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(XBGR) - MCFG_VIDEO_START_OVERRIDE(cninja_state,stoneage) + set_video_start_cb(config, driver_callback_delegate(&video_start_stoneage, this)); MCFG_DEVICE_ADD("spriteram1", BUFFERED_SPRITERAM16) @@ -1162,8 +1162,8 @@ MACHINE_CONFIG_START(cninja_state::robocop2) MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_robocop2) MCFG_SCREEN_PALETTE("palette") - MCFG_MACHINE_START_OVERRIDE(cninja_state,robocop2) - MCFG_MACHINE_RESET_OVERRIDE(cninja_state,robocop2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_robocop2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_robocop2, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_robocop2) MCFG_PALETTE_ADD("palette", 2048) @@ -1254,9 +1254,9 @@ MACHINE_CONFIG_START(cninja_state::mutantf) MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248) // same as robocop2? verify this from real pcb MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_mutantf) - MCFG_MACHINE_START_OVERRIDE(cninja_state,robocop2) - MCFG_MACHINE_RESET_OVERRIDE(cninja_state,robocop2) - MCFG_VIDEO_START_OVERRIDE(cninja_state,mutantf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_robocop2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_robocop2, this)); + set_video_start_cb(config, driver_callback_delegate(&video_start_mutantf, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mutantf) MCFG_PALETTE_ADD("palette", 2048) diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp index 91b0b5f2be1..41f4de96a12 100644 --- a/src/mame/drivers/cntsteer.cpp +++ b/src/mame/drivers/cntsteer.cpp @@ -106,12 +106,12 @@ public: void init_zerotrgt(); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_MACHINE_START(cntsteer); - DECLARE_MACHINE_RESET(cntsteer); - DECLARE_VIDEO_START(cntsteer); - DECLARE_MACHINE_START(zerotrgt); - DECLARE_MACHINE_RESET(zerotrgt); - DECLARE_VIDEO_START(zerotrgt); + void machine_start_cntsteer() ATTR_COLD; + void machine_reset_cntsteer(); + void video_start_cntsteer() ATTR_COLD; + void machine_start_zerotrgt() ATTR_COLD; + void machine_reset_zerotrgt(); + void video_start_zerotrgt() ATTR_COLD; DECLARE_PALETTE_INIT(zerotrgt); uint32_t screen_update_cntsteer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_zerotrgt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -175,7 +175,7 @@ TILE_GET_INFO_MEMBER(cntsteer_state::get_fg_tile_info) SET_TILE_INFO_MEMBER(0, code, 0x30 + ((attr & 0x78) >> 3), 0); } -VIDEO_START_MEMBER(cntsteer_state,cntsteer) +void cntsteer_state::video_start_cntsteer() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32); @@ -185,7 +185,7 @@ VIDEO_START_MEMBER(cntsteer_state,cntsteer) //m_bg_tilemap->set_flip(TILEMAP_FLIPX | TILEMAP_FLIPY); } -VIDEO_START_MEMBER(cntsteer_state,zerotrgt) +void cntsteer_state::video_start_zerotrgt() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32); @@ -873,7 +873,7 @@ GFXDECODE_END /***************************************************************************/ -MACHINE_START_MEMBER(cntsteer_state,cntsteer) +void cntsteer_state::machine_start_cntsteer() { save_item(NAME(m_flipscreen)); save_item(NAME(m_bg_bank)); @@ -888,14 +888,14 @@ MACHINE_START_MEMBER(cntsteer_state,cntsteer) save_item(NAME(m_disable_roz)); } -MACHINE_START_MEMBER(cntsteer_state,zerotrgt) +void cntsteer_state::machine_start_zerotrgt() { save_item(NAME(m_nmimask)); - MACHINE_START_CALL_MEMBER(cntsteer); + machine_start_cntsteer(); } -MACHINE_RESET_MEMBER(cntsteer_state,zerotrgt) +void cntsteer_state::machine_reset_zerotrgt() { m_flipscreen = 0; m_bg_bank = 0; @@ -912,10 +912,10 @@ MACHINE_RESET_MEMBER(cntsteer_state,zerotrgt) } -MACHINE_RESET_MEMBER(cntsteer_state,cntsteer) +void cntsteer_state::machine_reset_cntsteer() { m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - MACHINE_RESET_CALL_MEMBER(zerotrgt); + machine_reset_zerotrgt(); } MACHINE_CONFIG_START(cntsteer_state::cntsteer) @@ -932,8 +932,8 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer) MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(cntsteer_state, sound_interrupt, 480) - MCFG_MACHINE_START_OVERRIDE(cntsteer_state,cntsteer) - MCFG_MACHINE_RESET_OVERRIDE(cntsteer_state,cntsteer) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cntsteer, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cntsteer, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -953,7 +953,7 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer) MCFG_PALETTE_ADD("palette", 256) // MCFG_PALETTE_INIT_OWNER(cntsteer_state,zerotrgt) - MCFG_VIDEO_START_OVERRIDE(cntsteer_state,cntsteer) + set_video_start_cb(config, driver_callback_delegate(&video_start_cntsteer, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -989,8 +989,8 @@ MACHINE_CONFIG_START(cntsteer_state::zerotrgt) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_START_OVERRIDE(cntsteer_state,zerotrgt) - MCFG_MACHINE_RESET_OVERRIDE(cntsteer_state,zerotrgt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_zerotrgt, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_zerotrgt, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1005,7 +1005,7 @@ MACHINE_CONFIG_START(cntsteer_state::zerotrgt) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(cntsteer_state,zerotrgt) - MCFG_VIDEO_START_OVERRIDE(cntsteer_state,zerotrgt) + set_video_start_cb(config, driver_callback_delegate(&video_start_zerotrgt, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index 542fc5599f0..5f8c4b754b3 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -643,7 +643,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(combatsc_state,combatsc) +void combatsc_state::machine_start_combatsc() { uint8_t *MEM = memregion("maincpu")->base() + 0x38000; @@ -665,9 +665,9 @@ MACHINE_START_MEMBER(combatsc_state,combatsc) save_item(NAME(m_sign)); } -MACHINE_START_MEMBER(combatsc_state,combatscb) +void combatsc_state::machine_start_combatscb() { - MACHINE_START_CALL_MEMBER( combatsc ); + machine_start_combatsc(); membank("bl_abank")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x8000, 0x4000); } @@ -708,7 +708,7 @@ MACHINE_CONFIG_START(combatsc_state::combatsc) MCFG_QUANTUM_TIME(attotime::from_hz(1200)) - MCFG_MACHINE_START_OVERRIDE(combatsc_state,combatsc) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_combatsc, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -728,7 +728,7 @@ MACHINE_CONFIG_START(combatsc_state::combatsc) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_LITTLE) MCFG_PALETTE_INIT_OWNER(combatsc_state,combatsc) - MCFG_VIDEO_START_OVERRIDE(combatsc_state,combatsc) + set_video_start_cb(config, driver_callback_delegate(&video_start_combatsc, this)); MCFG_K007121_ADD("k007121_1") MCFG_K007121_PALETTE("palette") @@ -762,7 +762,7 @@ MACHINE_CONFIG_START(combatsc_state::combatscb) MCFG_QUANTUM_TIME(attotime::from_hz(1200)) - MCFG_MACHINE_START_OVERRIDE(combatsc_state,combatscb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_combatscb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -779,7 +779,7 @@ MACHINE_CONFIG_START(combatsc_state::combatscb) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_LITTLE) MCFG_PALETTE_INIT_OWNER(combatsc_state,combatscb) - MCFG_VIDEO_START_OVERRIDE(combatsc_state,combatscb) + set_video_start_cb(config, driver_callback_delegate(&video_start_combatscb, this)); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp index e9c41c99753..16d02b7bd62 100644 --- a/src/mame/drivers/coolpool.cpp +++ b/src/mame/drivers/coolpool.cpp @@ -129,13 +129,13 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(coolpool_state::from_shiftreg) * *************************************/ -MACHINE_RESET_MEMBER(coolpool_state,amerdart) +void coolpool_state::machine_reset_amerdart() { m_nvram_write_enable = 0; } -MACHINE_RESET_MEMBER(coolpool_state,coolpool) +void coolpool_state::machine_reset_coolpool() { m_nvram_write_enable = 0; } @@ -735,7 +735,7 @@ MACHINE_CONFIG_START(coolpool_state::amerdart) MCFG_GENERIC_LATCH_16_ADD("dsp2main") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("maincpu", 1)) - MCFG_MACHINE_RESET_OVERRIDE(coolpool_state,amerdart) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_amerdart, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_TIMER_DRIVER_ADD("nvram_timer", coolpool_state, nvram_write_timeout) @@ -780,7 +780,7 @@ MACHINE_CONFIG_START(coolpool_state::coolpool) MCFG_GENERIC_LATCH_16_ADD("dsp2main") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("maincpu", 1)) - MCFG_MACHINE_RESET_OVERRIDE(coolpool_state,coolpool) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coolpool, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_TIMER_DRIVER_ADD("nvram_timer", coolpool_state, nvram_write_timeout) diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp index 1c098288a54..cc683d69cb8 100644 --- a/src/mame/drivers/cosmic.cpp +++ b/src/mame/drivers/cosmic.cpp @@ -973,7 +973,7 @@ static const char *const cosmicg_sample_names[] = }; -MACHINE_START_MEMBER(cosmic_state,cosmic) +void cosmic_state::machine_start_cosmic() { save_item(NAME(m_sound_enabled)); save_item(NAME(m_march_select)); @@ -985,7 +985,7 @@ MACHINE_START_MEMBER(cosmic_state,cosmic) save_item(NAME(m_color_registers)); } -MACHINE_RESET_MEMBER(cosmic_state,cosmic) +void cosmic_state::machine_reset_cosmic() { m_pixel_clock = 0; m_background_enable = 0; @@ -994,7 +994,7 @@ MACHINE_RESET_MEMBER(cosmic_state,cosmic) m_color_registers[2] = 0; } -MACHINE_RESET_MEMBER(cosmic_state,cosmicg) +void cosmic_state::machine_reset_cosmicg() { m_pixel_clock = 0; m_background_enable = 0; @@ -1010,8 +1010,8 @@ MACHINE_CONFIG_START(cosmic_state::cosmic) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", Z80,Z80_MASTER_CLOCK/6) /* 1.8026 MHz */ - MCFG_MACHINE_START_OVERRIDE(cosmic_state,cosmic) - MCFG_MACHINE_RESET_OVERRIDE(cosmic_state,cosmic) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cosmic, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cosmic, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1098,8 +1098,8 @@ MACHINE_CONFIG_START(cosmic_state::cosmicg) fed to the tms9904 or tms9980. Also, I have never heard of a tms9900/9980 operating under 1.5MHz. So, if someone can check this... */ - MCFG_MACHINE_START_OVERRIDE(cosmic_state,cosmic) - MCFG_MACHINE_RESET_OVERRIDE(cosmic_state,cosmicg) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cosmic, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cosmicg, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 78c7d59bb0d..5363a5b3bb8 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -3360,19 +3360,19 @@ GFXDECODE_END * ********************************************************************/ -MACHINE_START_MEMBER(cps_state,common) +void cps_state::machine_start_common() { } -MACHINE_START_MEMBER(cps_state,cps1) +void cps_state::machine_start_cps1() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); membank("bank1")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x10000, 0x4000); } -MACHINE_START_MEMBER(cps_state,qsound) +void cps_state::machine_start_qsound() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); membank("bank1")->configure_entries(0, 6, memregion("audiocpu")->base() + 0x10000, 0x4000); } @@ -3387,7 +3387,7 @@ MACHINE_CONFIG_START(cps_state::cps1_10MHz) MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */ MCFG_DEVICE_PROGRAM_MAP(sub_map) - MCFG_MACHINE_START_OVERRIDE(cps_state,cps1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cps1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -3399,7 +3399,7 @@ MACHINE_CONFIG_START(cps_state::cps1_10MHz) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state, cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3466,7 +3466,7 @@ MACHINE_CONFIG_START(cps_state::qsound) MCFG_DEVICE_OPCODES_MAP(qsound_decrypted_opcodes_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured (cps2.c) - MCFG_MACHINE_START_OVERRIDE(cps_state, qsound) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_qsound, this)); MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp index 13f3547fa81..acdf491f9f4 100644 --- a/src/mame/drivers/cps2.cpp +++ b/src/mame/drivers/cps2.cpp @@ -1297,7 +1297,7 @@ INPUT_PORTS_END * *************************************/ -MACHINE_START_MEMBER(cps_state,cps2) +void cps_state::machine_start_cps2() { if (m_audiocpu != nullptr) // gigaman2 has an AT89C4051 (8051) MCU as an audio cpu, no qsound. membank("bank1")->configure_entries(0, (QSOUND_SIZE - 0x10000) / 0x4000, memregion("audiocpu")->base() + 0x10000, 0x4000); @@ -1316,7 +1316,7 @@ MACHINE_CONFIG_START(cps_state::cps2) MCFG_DEVICE_PROGRAM_MAP(qsound_sub_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured - MCFG_MACHINE_START_OVERRIDE(cps_state, cps2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cps2, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -1331,7 +1331,7 @@ MACHINE_CONFIG_START(cps_state::cps2) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state, cps2) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps2, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp index cef4569df80..911f0bb69ee 100644 --- a/src/mame/drivers/cubo.cpp +++ b/src/mame/drivers/cubo.cpp @@ -1061,7 +1061,7 @@ MACHINE_CONFIG_START(cubo_state::cubo) MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) MCFG_SCREEN_NO_PALETTE - MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga) + set_video_start_cb(config, driver_callback_delegate(&video_start_amiga_aga, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp index 6e9c16f84ed..f6d97a93f0d 100644 --- a/src/mame/drivers/cvs.cpp +++ b/src/mame/drivers/cvs.cpp @@ -925,7 +925,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(cvs_state,cvs) +void cvs_state::machine_start_cvs() { /* allocate memory */ if (m_gfxdecode->gfx(1) != nullptr) @@ -949,7 +949,7 @@ MACHINE_START_MEMBER(cvs_state,cvs) save_item(NAME(m_stars_scroll)); } -MACHINE_RESET_MEMBER(cvs_state,cvs) +void cvs_state::machine_reset_cvs() { m_character_banking_mode = 0; m_character_ram_page_start = 0; @@ -984,11 +984,11 @@ MACHINE_CONFIG_START(cvs_state::cvs) //MCFG_S2650_SENSE_INPUT(READLINE(*this, cvs_state, cvs_393hz_clock_r)) MCFG_S2650_SENSE_INPUT(READLINE("tms", tms5110_device, romclk_hack_r)) - MCFG_MACHINE_START_OVERRIDE(cvs_state,cvs) - MCFG_MACHINE_RESET_OVERRIDE(cvs_state,cvs) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cvs, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cvs, this)); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(cvs_state,cvs) + set_video_start_cb(config, driver_callback_delegate(&video_start_cvs, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cvs) diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp index 0227b4aa6a7..780311985d9 100644 --- a/src/mame/drivers/czk80.cpp +++ b/src/mame/drivers/czk80.cpp @@ -62,7 +62,7 @@ public: { } void init_czk80(); - DECLARE_MACHINE_RESET(czk80); + void machine_reset_czk80(); TIMER_CALLBACK_MEMBER(czk80_reset); DECLARE_READ8_MEMBER(port80_r); DECLARE_READ8_MEMBER(port81_r); @@ -161,7 +161,7 @@ TIMER_CALLBACK_MEMBER( czk80_state::czk80_reset) membank("bankr0")->set_entry(1); } -MACHINE_RESET_MEMBER( czk80_state, czk80 ) +void czk80_state::machine_reset_czk80() { machine().scheduler().timer_set(attotime::from_usec(3), timer_expired_delegate(FUNC(czk80_state::czk80_reset),this)); membank("bankr0")->set_entry(0); // point at rom @@ -199,7 +199,7 @@ MACHINE_CONFIG_START(czk80_state::czk80) MCFG_DEVICE_PROGRAM_MAP(czk80_mem) MCFG_DEVICE_IO_MAP(czk80_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_MACHINE_RESET_OVERRIDE(czk80_state, czk80) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_czk80, this)); MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(czk80_state, kbd_put)) diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp index e22f17b6d99..0090b98862c 100644 --- a/src/mame/drivers/dambustr.cpp +++ b/src/mame/drivers/dambustr.cpp @@ -262,7 +262,7 @@ MACHINE_CONFIG_START(dambustr_state::dambustr) MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ MCFG_DEVICE_PROGRAM_MAP(dambustr_map) - MCFG_MACHINE_RESET_OVERRIDE(dambustr_state,galaxold) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaxold, this)); MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0) MCFG_7474_OUTPUT_CB(WRITELINE(*this, dambustr_state,galaxold_7474_9m_1_callback)) @@ -286,7 +286,7 @@ MACHINE_CONFIG_START(dambustr_state::dambustr) MCFG_PALETTE_ADD("palette", 32+2+64+8) /* 32 for the characters, 2 for the bullets, 64 for the stars, 8 for the background */ MCFG_PALETTE_INIT_OWNER(dambustr_state,dambustr) - MCFG_VIDEO_START_OVERRIDE(dambustr_state,dambustr) + set_video_start_cb(config, driver_callback_delegate(&video_start_dambustr, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index 56fa955c71e..428b4b48260 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -601,7 +601,7 @@ MACHINE_CONFIG_START(dc_cons_state::dc) MCFG_DEVICE_ADD("soundcpu", ARM7, ((XTAL(33'868'800)*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8. MCFG_DEVICE_PROGRAM_MAP(dc_audio_map) - MCFG_MACHINE_RESET_OVERRIDE(dc_cons_state,dc_console ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dc_console, this)); // MCFG_MACRONIX_29LV160TMC_ADD("dcflash") diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index a161e905b00..62eb04bb008 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -235,21 +235,21 @@ public: uint8_t m_mjflove_irq_cause; uint8_t m_daimyojn_palette_sel; - DECLARE_MACHINE_START(ddenlovr); - DECLARE_MACHINE_RESET(ddenlovr); - DECLARE_VIDEO_START(ddenlovr); - DECLARE_MACHINE_START(rongrong); - DECLARE_MACHINE_START(mmpanic); - DECLARE_VIDEO_START(mmpanic); - DECLARE_MACHINE_START(hanakanz); - DECLARE_VIDEO_START(hanakanz); - DECLARE_MACHINE_START(sryudens); - DECLARE_VIDEO_START(mjflove); - DECLARE_MACHINE_START(seljan2); - DECLARE_MACHINE_START(mjflove); - DECLARE_MACHINE_START(funkyfig); - DECLARE_MACHINE_START(mjmyster); - DECLARE_MACHINE_START(hparadis); + void machine_start_ddenlovr(); + void machine_reset_ddenlovr(); + void video_start_ddenlovr(); + void machine_start_rongrong(); + void machine_start_mmpanic(); + void video_start_mmpanic(); + void machine_start_hanakanz(); + void video_start_hanakanz(); + void machine_start_sryudens(); + void video_start_mjflove(); + void machine_start_seljan2(); + void machine_start_mjflove(); + void machine_start_funkyfig(); + void machine_start_mjmyster(); + void machine_start_hparadis(); uint32_t screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_htengoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -414,7 +414,7 @@ public: DECLARE_READ8_MEMBER(htengoku_coin_r); DECLARE_WRITE8_MEMBER(htengoku_rombank_w); DECLARE_WRITE8_MEMBER(htengoku_blit_romregion_w); - DECLARE_VIDEO_START(htengoku); + void video_start_htengoku() ATTR_COLD; DECLARE_WRITE8_MEMBER(htengoku_dsw_w); DECLARE_READ8_MEMBER(htengoku_dsw_r); DECLARE_WRITE8_MEMBER(quizchq_oki_bank_w); @@ -534,7 +534,7 @@ public: void ultrchmp_map(address_map &map); }; -VIDEO_START_MEMBER(ddenlovr_state,ddenlovr) +void ddenlovr_state::video_start_ddenlovr() { m_blitter_irq_handler.bind_relative_to(*this); @@ -631,24 +631,24 @@ VIDEO_START_MEMBER(ddenlovr_state,ddenlovr) save_pointer(NAME(m_ddenlovr_pixmap[7].get()), 512 * 512); } -VIDEO_START_MEMBER(ddenlovr_state,mmpanic) +void ddenlovr_state::video_start_mmpanic() { - VIDEO_START_CALL_MEMBER(ddenlovr); + video_start_ddenlovr(); m_extra_layers = 1; } -VIDEO_START_MEMBER(ddenlovr_state,hanakanz) +void ddenlovr_state::video_start_hanakanz() { - VIDEO_START_CALL_MEMBER(ddenlovr); + video_start_ddenlovr(); m_ddenlovr_blit_rom_bits = 16; m_ddenlovr_blit_commands = hanakanz_commands; } -VIDEO_START_MEMBER(ddenlovr_state,mjflove) +void ddenlovr_state::video_start_mjflove() { - VIDEO_START_CALL_MEMBER(ddenlovr); + video_start_ddenlovr(); m_ddenlovr_blit_commands = mjflove_commands; } @@ -4182,10 +4182,10 @@ void ddenlovr_state::seljan2_portmap(address_map &map) ***************************************************************************/ // htengoku uses the mixer chip from ddenlovr -VIDEO_START_MEMBER(ddenlovr_state,htengoku) +void ddenlovr_state::video_start_htengoku() { - VIDEO_START_CALL_MEMBER(ddenlovr); - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_ddenlovr(); + video_start_hnoridur(); } uint32_t ddenlovr_state::screen_update_htengoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -4361,8 +4361,8 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(20) MCFG_ADDRESS_MAP_BANK_STRIDE(0x8000) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,dynax) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dynax, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_NVRAM_ADD_0FILL("nvram") @@ -4388,7 +4388,7 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku) MCFG_PALETTE_ADD("palette", 16*256) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,htengoku) + set_video_start_cb(config, driver_callback_delegate(&video_start_htengoku, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9571,7 +9571,7 @@ INPUT_PORTS_END ***************************************************************************/ -MACHINE_START_MEMBER(ddenlovr_state,ddenlovr) +void ddenlovr_state::machine_start_ddenlovr() { save_item(NAME(m_input_sel)); save_item(NAME(m_dsw_sel)); @@ -9595,7 +9595,7 @@ MACHINE_START_MEMBER(ddenlovr_state,ddenlovr) save_item(NAME(m_palram)); } -MACHINE_RESET_MEMBER(ddenlovr_state,ddenlovr) +void ddenlovr_state::machine_reset_ddenlovr() { m_input_sel = 0; m_dsw_sel = 0; @@ -9621,75 +9621,75 @@ MACHINE_RESET_MEMBER(ddenlovr_state,ddenlovr) memset(m_palram, 0, ARRAY_LENGTH(m_palram)); } -MACHINE_START_MEMBER(ddenlovr_state,rongrong) +void ddenlovr_state::machine_start_rongrong() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x20, &ROM[0x010000], 0x8000); membank("bank2")->configure_entries(0, 8, &ROM[0x110000], 0x1000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } -MACHINE_START_MEMBER(ddenlovr_state,mmpanic) +void ddenlovr_state::machine_start_mmpanic() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x8000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } -MACHINE_START_MEMBER(ddenlovr_state,funkyfig) +void ddenlovr_state::machine_start_funkyfig() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000); membank("bank2")->configure_entries(0, 8, &ROM[0x90000], 0x1000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } -MACHINE_START_MEMBER(ddenlovr_state,hanakanz) +void ddenlovr_state::machine_start_hanakanz() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000); membank("bank2")->configure_entries(0, 0x10, &ROM[0x90000], 0x1000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } -MACHINE_START_MEMBER(ddenlovr_state,mjmyster) +void ddenlovr_state::machine_start_mjmyster() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x8000); membank("bank2")->configure_entries(0, 8, &ROM[0x90000], 0x1000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } -MACHINE_START_MEMBER(ddenlovr_state,hparadis) +void ddenlovr_state::machine_start_hparadis() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x8000); membank("bank2")->configure_entries(0, 8, &ROM[0x50000], 0x1000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } -MACHINE_START_MEMBER(ddenlovr_state,mjflove) +void ddenlovr_state::machine_start_mjflove() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000); membank("bank2")->configure_entries(0, 8, &ROM[0x90000], 0x1000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } -MACHINE_START_MEMBER(ddenlovr_state,sryudens) +void ddenlovr_state::machine_start_sryudens() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000); membank("bank2")->configure_entries(0, 0x10, &ROM[0x90000], 0x1000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } /*************************************************************************** @@ -9713,8 +9713,8 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovr) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ddenlovr_state, ddenlovr_coincounter_0_w)) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ddenlovr_state, ddenlovr_coincounter_1_w)) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,ddenlovr) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ddenlovr, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -9731,7 +9731,7 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovr) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, ddenlovr_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr) + set_video_start_cb(config, driver_callback_delegate(&video_start_ddenlovr, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9816,7 +9816,7 @@ MACHINE_CONFIG_START(ddenlovr_state::ultrchmp) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) + set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this)); MACHINE_CONFIG_END /*************************************************************************** @@ -9841,8 +9841,8 @@ MACHINE_CONFIG_START(ddenlovr_state::quizchq) MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, rongrong_select_w)) // bit 5 of 0x1b (SIO CTSB?) = blitter busy - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,rongrong) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_rongrong, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -9859,7 +9859,7 @@ MACHINE_CONFIG_START(ddenlovr_state::quizchq) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, rongrong_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr) + set_video_start_cb(config, driver_callback_delegate(&video_start_ddenlovr, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9930,8 +9930,8 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic) MCFG_DEVICE_PROGRAM_MAP(mmpanic_sound_map) MCFG_DEVICE_IO_MAP(mmpanic_sound_portmap) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mmpanic) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mmpanic, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -9948,7 +9948,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mmpanic_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mmpanic) // extra layers + set_video_start_cb(config, driver_callback_delegate(&video_start_mmpanic, this)); // extra layers /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -10018,8 +10018,8 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz) MCFG_DEVICE_PROGRAM_MAP(hanakanz_map) MCFG_DEVICE_IO_MAP(hanakanz_portmap) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -10034,7 +10034,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz) MCFG_PALETTE_ADD("palette", 0x200) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,hanakanz) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_hanakanz, this)); // blitter commands in the roms are shuffled around /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -10065,8 +10065,8 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo) MCFG_DEVICE_PROGRAM_MAP(hanakanz_map) MCFG_DEVICE_IO_MAP(kotbinyo_portmap) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -10081,7 +10081,7 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo) MCFG_PALETTE_ADD("palette", 0x200) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,hanakanz) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_hanakanz, this)); // blitter commands in the roms are shuffled around /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -10159,7 +10159,7 @@ MACHINE_CONFIG_START(ddenlovr_state::funkyfig) MCFG_TMPZ84C015_IN_PA_CB(READ8(*this, ddenlovr_state, funkyfig_dsw_r)) MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, funkyfig_rombank_w)) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,funkyfig) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_funkyfig, this)); MCFG_DEVICE_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) @@ -10173,7 +10173,7 @@ MACHINE_CONFIG_START(ddenlovr_state::funkyfig) MCFG_DEVICE_MODIFY("soundcpu") MCFG_DEVICE_IO_MAP(funkyfig_sound_portmap) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr) // no extra layers? + set_video_start_cb(config, driver_callback_delegate(&video_start_ddenlovr, this)); // no extra layers? MACHINE_CONFIG_END @@ -10190,8 +10190,8 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka) MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w)) MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w)) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -10208,7 +10208,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this)); // blitter commands in the roms are shuffled around /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -10258,7 +10258,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyster) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this)); MCFG_DEVICE_ADD("aysnd", AY8910, 3579545) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w)) @@ -10296,7 +10296,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hginga) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this)); MCFG_DEVICE_ADD("aysnd", AY8910, 3579545) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, hginga_dsw_r)) @@ -10323,7 +10323,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hgokou) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this)); MCFG_DEVICE_ADD("aysnd", AY8910, 3579545) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, hginga_dsw_r)) @@ -10364,7 +10364,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyuniv) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this)); MCFG_DEVICE_MODIFY("rtc") MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI)) @@ -10393,7 +10393,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyornt) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 4, 256-16+4-1) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this)); MCFG_DEVICE_MODIFY("rtc") MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI)) @@ -10441,7 +10441,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjflove) MCFG_TMPZ84C015_IN_PA_CB(IOPORT("DSW2")) MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hanakanz_keyb_w)) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjflove) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjflove, this)); MCFG_DEVICE_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, mjflove_irq)) @@ -10452,7 +10452,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjflove) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this)); // blitter commands in the roms are shuffled around MCFG_DEVICE_ADD("aysnd", AY8910, 28636363/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) @@ -10471,7 +10471,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hparadis) // the RTC seems unused MCFG_DEVICE_REMOVE("rtc") - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hparadis) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hparadis, this)); MACHINE_CONFIG_END @@ -10483,8 +10483,8 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei) MCFG_DEVICE_PROGRAM_MAP(hanakanz_map) MCFG_DEVICE_IO_MAP(jongtei_portmap) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -10501,7 +10501,7 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,hanakanz) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_hanakanz, this)); // blitter commands in the roms are shuffled around /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -10540,8 +10540,8 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens) MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w)) MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w)) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,sryudens) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sryudens, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -10558,7 +10558,7 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this)); // blitter commands in the roms are shuffled around /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -10591,8 +10591,8 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp) MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w)) MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w)) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -10609,7 +10609,7 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr) + set_video_start_cb(config, driver_callback_delegate(&video_start_ddenlovr, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -10632,7 +10632,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(ddenlovr_state::dtoyoken) janshinp(config); - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this)); // blitter commands in the roms are shuffled around MACHINE_CONFIG_END @@ -10640,7 +10640,7 @@ MACHINE_CONFIG_END Return Of Sel Jan II ***************************************************************************/ -MACHINE_START_MEMBER(ddenlovr_state,seljan2) +void ddenlovr_state::machine_start_seljan2() { uint8_t *ROM = memregion("maincpu")->base(); @@ -10651,7 +10651,7 @@ MACHINE_START_MEMBER(ddenlovr_state,seljan2) membank("bank2")->configure_entries(0, 0x10, &ROM[0x98000], 0x1000); - MACHINE_START_CALL_MEMBER(ddenlovr); + machine_start_ddenlovr(); } MACHINE_CONFIG_START(ddenlovr_state::seljan2) @@ -10663,8 +10663,8 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2) MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, hanakanz_keyb_w)) MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, sryudens_coincounter_w)) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,seljan2) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_seljan2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -10681,7 +10681,7 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2) MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, seljan2_blitter_irq) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this)); // blitter commands in the roms are shuffled around /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -10715,8 +10715,8 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn) MCFG_DEVICE_PROGRAM_MAP(hanakanz_map) MCFG_DEVICE_IO_MAP(daimyojn_portmap) - MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjflove) - MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjflove, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -10731,7 +10731,7 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn) MCFG_PALETTE_ADD("palette", 0x200) - MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,hanakanz) // blitter commands in the roms are shuffled around + set_video_start_cb(config, driver_callback_delegate(&video_start_hanakanz, this)); // blitter commands in the roms are shuffled around /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index b65d279e222..1ec15cdf8b1 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -129,7 +129,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddragon_state::ddragon_scanline) * *************************************/ -MACHINE_START_MEMBER(ddragon_state,ddragon) +void ddragon_state::machine_start_ddragon() { /* configure banks */ membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000); @@ -145,7 +145,7 @@ MACHINE_START_MEMBER(ddragon_state,ddragon) } -MACHINE_RESET_MEMBER(ddragon_state,ddragon) +void ddragon_state::machine_reset_ddragon() { m_scrollx_hi = 0; m_scrolly_hi = 0; @@ -959,8 +959,8 @@ MACHINE_CONFIG_START(ddragon_state::ddragon) MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */ - MCFG_MACHINE_START_OVERRIDE(ddragon_state,ddragon) - MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ddragon, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddragon, this)); /* video hardware */ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon) @@ -972,7 +972,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon) MCFG_SCREEN_UPDATE_DRIVER(ddragon_state, screen_update_ddragon) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(ddragon_state,ddragon) + set_video_start_cb(config, driver_callback_delegate(&video_start_ddragon, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1031,8 +1031,8 @@ MACHINE_CONFIG_START(ddragon_state::ddragon6809) MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */ - MCFG_MACHINE_START_OVERRIDE(ddragon_state,ddragon) - MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ddragon, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddragon, this)); /* video hardware */ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon) @@ -1044,7 +1044,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon6809) MCFG_SCREEN_UPDATE_DRIVER(ddragon_state, screen_update_ddragon) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(ddragon_state,ddragon) + set_video_start_cb(config, driver_callback_delegate(&video_start_ddragon, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1084,8 +1084,8 @@ MACHINE_CONFIG_START(ddragon_state::ddragon2) MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */ - MCFG_MACHINE_START_OVERRIDE(ddragon_state,ddragon) - MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ddragon, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddragon, this)); /* video hardware */ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon) @@ -1097,7 +1097,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon2) MCFG_SCREEN_UPDATE_DRIVER(ddragon_state, screen_update_ddragon) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(ddragon_state,ddragon) + set_video_start_cb(config, driver_callback_delegate(&video_start_ddragon, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index 37c44b4fbf8..65a6adf8b1b 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -938,7 +938,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(wwfwfest_state::wwfwfstb) wwfwfest(config); - MCFG_VIDEO_START_OVERRIDE(wwfwfest_state,wwfwfstb) + set_video_start_cb(config, driver_callback_delegate(&video_start_wwfwfstb, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp index 1b78d1df538..70e3c88d441 100644 --- a/src/mame/drivers/dec0.cpp +++ b/src/mame/drivers/dec0.cpp @@ -1651,7 +1651,7 @@ MACHINE_CONFIG_START(dec0_state::dec0) MCFG_DEVICE_PROGRAM_MAP(dec0_s_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0) + set_video_start_cb(config, driver_callback_delegate(&video_start_dec0, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(XBGR) @@ -1680,7 +1680,7 @@ MACHINE_CONFIG_START(dec0_state::dec1) /* maincpu and audiocpu clocks and address maps differ per game */ /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma) + set_video_start_cb(config, driver_callback_delegate(&video_start_dec0_nodma, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -1742,7 +1742,7 @@ MACHINE_CONFIG_START(dec0_automat_state::automat) MCFG_DEVICE_PROGRAM_MAP(automat_s_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma) + set_video_start_cb(config, driver_callback_delegate(&video_start_dec0_nodma, this)); MCFG_SCREEN_ADD("screen", RASTER) // MCFG_SCREEN_REFRESH_RATE(57.41) @@ -1817,7 +1817,7 @@ MACHINE_CONFIG_START(dec0_automat_state::secretab) MCFG_DEVICE_PROGRAM_MAP(secretab_s_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma) + set_video_start_cb(config, driver_callback_delegate(&video_start_dec0_nodma, this)); MCFG_SCREEN_ADD("screen", RASTER) // MCFG_SCREEN_REFRESH_RATE(57.41) @@ -1971,7 +1971,7 @@ MACHINE_CONFIG_START(dec0_state::ffantasybl) MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_hippodrm) MACHINE_CONFIG_END -MACHINE_RESET_MEMBER(dec0_state,slyspy) +void dec0_state::machine_reset_slyspy() { // set initial memory map m_slyspy_state = 0; @@ -2011,7 +2011,7 @@ MACHINE_CONFIG_START(dec0_state::slyspy) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_slyspy) - MCFG_MACHINE_RESET_OVERRIDE(dec0_state,slyspy) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_slyspy, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(dec0_state::midres) diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index f1ad0dc02f1..8b927de1ae2 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -1982,7 +1982,7 @@ MACHINE_CONFIG_START(dec8_state::lastmisn) MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024) - MCFG_VIDEO_START_OVERRIDE(dec8_state,lastmisn) + set_video_start_cb(config, driver_callback_delegate(&video_start_lastmisn, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2047,7 +2047,7 @@ MACHINE_CONFIG_START(dec8_state::shackled) MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024) - MCFG_VIDEO_START_OVERRIDE(dec8_state,shackled) + set_video_start_cb(config, driver_callback_delegate(&video_start_shackled, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2108,7 +2108,7 @@ MACHINE_CONFIG_START(dec8_state::gondo) MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024) - MCFG_VIDEO_START_OVERRIDE(dec8_state,gondo) + set_video_start_cb(config, driver_callback_delegate(&video_start_gondo, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2169,7 +2169,7 @@ MACHINE_CONFIG_START(dec8_state::garyoret) MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024) - MCFG_VIDEO_START_OVERRIDE(dec8_state,garyoret) + set_video_start_cb(config, driver_callback_delegate(&video_start_garyoret, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2229,7 +2229,7 @@ MACHINE_CONFIG_START(dec8_state::ghostb) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ghostb) MCFG_DECO_RMC3_ADD_PROMS("palette","proms",1024) // xxxxBBBBGGGGRRRR with custom weighting - MCFG_VIDEO_START_OVERRIDE(dec8_state,ghostb) + set_video_start_cb(config, driver_callback_delegate(&video_start_ghostb, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2289,7 +2289,7 @@ MACHINE_CONFIG_START(dec8_state::csilver) MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024) - MCFG_VIDEO_START_OVERRIDE(dec8_state,lastmisn) + set_video_start_cb(config, driver_callback_delegate(&video_start_lastmisn, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2353,7 +2353,7 @@ MACHINE_CONFIG_START(dec8_state::oscar) MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024) - MCFG_VIDEO_START_OVERRIDE(dec8_state,oscar) + set_video_start_cb(config, driver_callback_delegate(&video_start_oscar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2407,7 +2407,7 @@ MACHINE_CONFIG_START(dec8_state::srdarwin) MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DECO_RMC3_SET_PALETTE_SIZE(144) - MCFG_VIDEO_START_OVERRIDE(dec8_state,srdarwin) + set_video_start_cb(config, driver_callback_delegate(&video_start_srdarwin, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2464,7 +2464,7 @@ MACHINE_CONFIG_START(dec8_state::cobracom) MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DECO_RMC3_SET_PALETTE_SIZE(256) - MCFG_VIDEO_START_OVERRIDE(dec8_state,cobracom) + set_video_start_cb(config, driver_callback_delegate(&video_start_cobracom, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index 0c431730688..095d9d353aa 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -1929,7 +1929,7 @@ MACHINE_CONFIG_START(captaven_state::captaven) MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1")) MCFG_DECO146_SOUNDLATCH_IRQ_CB(INPUTLINE("audiocpu", 0)) - MCFG_VIDEO_START_OVERRIDE(captaven_state, captaven) + set_video_start_cb(config, driver_callback_delegate(&video_start_captaven, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2011,7 +2011,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE MCFG_DECO146_SET_USE_MAGIC_ADDRESS_XOR - MCFG_VIDEO_START_OVERRIDE(fghthist_state, fghthist) + set_video_start_cb(config, driver_callback_delegate(&video_start_fghthist, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2137,7 +2137,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dragngun) MCFG_PALETTE_ADD("palette", 2048) - MCFG_VIDEO_START_OVERRIDE(dragngun_state,dragngun) + set_video_start_cb(config, driver_callback_delegate(&video_start_dragngun, this)); MCFG_DECO146_ADD("ioprot") MCFG_DECO146_IN_PORTA_CB(IOPORT("INPUTS")) @@ -2235,7 +2235,7 @@ MACHINE_CONFIG_START(dragngun_state::lockload) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dragngun) MCFG_PALETTE_ADD("palette", 2048) - MCFG_VIDEO_START_OVERRIDE(dragngun_state, dragngun) + set_video_start_cb(config, driver_callback_delegate(&video_start_dragngun, this)); MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -2366,7 +2366,7 @@ MACHINE_CONFIG_START(nslasher_state::tattass) MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE(*this, nslasher_state, tattass_sound_irq_w)) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE - MCFG_VIDEO_START_OVERRIDE(nslasher_state,nslasher) + set_video_start_cb(config, driver_callback_delegate(&video_start_nslasher, this)); /* sound hardware */ MCFG_DECOBSMT_ADD(DECOBSMT_TAG) @@ -2438,7 +2438,7 @@ MACHINE_CONFIG_START(nslasher_state::nslasher) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "deco_ace", gfx_nslasher) - MCFG_VIDEO_START_OVERRIDE(nslasher_state, nslasher) + set_video_start_cb(config, driver_callback_delegate(&video_start_nslasher, this)); MCFG_DECO104_ADD("ioprot") MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0")) diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp index 97bcb17c059..51e7cf1bfb2 100644 --- a/src/mame/drivers/deco_mlc.cpp +++ b/src/mame/drivers/deco_mlc.cpp @@ -503,7 +503,7 @@ GFXDECODE_END /******************************************************************************/ -MACHINE_RESET_MEMBER(deco_mlc_state,mlc) +void deco_mlc_state::machine_reset_mlc() { m_vbl_i = 0xffffffff; m_raster_irq_timer = machine().device<timer_device>("int_timer"); @@ -515,7 +515,7 @@ MACHINE_CONFIG_START(deco_mlc_state::avengrgs) MCFG_DEVICE_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */ MCFG_DEVICE_PROGRAM_MAP(avengrgs_map) - MCFG_MACHINE_RESET_OVERRIDE(deco_mlc_state,mlc) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mlc, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* Actually 93c45 */ MCFG_TIMER_DRIVER_ADD("int_timer", deco_mlc_state, interrupt_gen) @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(deco_mlc_state::avengrgs) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_MEMBITS(16) - MCFG_VIDEO_START_OVERRIDE(deco_mlc_state,mlc) + set_video_start_cb(config, driver_callback_delegate(&video_start_mlc, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -551,7 +551,7 @@ MACHINE_CONFIG_START(deco_mlc_state::mlc) MCFG_DEVICE_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */ MCFG_DEVICE_PROGRAM_MAP(decomlc_map) - MCFG_MACHINE_RESET_OVERRIDE(deco_mlc_state,mlc) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mlc, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* Actually 93c45 */ MCFG_TIMER_DRIVER_ADD("int_timer", deco_mlc_state, interrupt_gen) @@ -570,7 +570,7 @@ MACHINE_CONFIG_START(deco_mlc_state::mlc) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_MEMBITS(16) - MCFG_VIDEO_START_OVERRIDE(deco_mlc_state,mlc) + set_video_start_cb(config, driver_callback_delegate(&video_start_mlc, this)); MCFG_DECO146_ADD("ioprot") MCFG_DECO146_SET_USE_MAGIC_ADDRESS_XOR diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp index 77c4e200b5a..d391c81f6fe 100644 --- a/src/mame/drivers/decocass.cpp +++ b/src/mame/drivers/decocass.cpp @@ -1003,35 +1003,35 @@ MACHINE_CONFIG_START(decocass_type1_state::ctsttape) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,ctsttape) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ctsttape, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(decocass_type1_state::cprogolfj) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cprogolfj) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cprogolfj, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(decocass_type1_state::cdsteljn) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cdsteljn) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cdsteljn, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(decocass_type1_state::cmanhat) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cmanhat) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cmanhat, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(decocass_type3_state::cfishing) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cfishing) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cfishing, this)); MACHINE_CONFIG_END @@ -1039,7 +1039,7 @@ MACHINE_CONFIG_START(decocass_type1_state::chwy) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,chwy) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_chwy, this)); MACHINE_CONFIG_END @@ -1047,7 +1047,7 @@ MACHINE_CONFIG_START(decocass_type1_state::cterrani) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cterrani) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cterrani, this)); MACHINE_CONFIG_END @@ -1055,7 +1055,7 @@ MACHINE_CONFIG_START(decocass_type1_state::castfant) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,castfant) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_castfant, this)); MACHINE_CONFIG_END @@ -1063,7 +1063,7 @@ MACHINE_CONFIG_START(decocass_type1_state::csuperas) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,csuperas) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_csuperas, this)); MACHINE_CONFIG_END @@ -1071,7 +1071,7 @@ MACHINE_CONFIG_START(decocass_type1_state::cocean1a) /* 10 */ decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cocean1a) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cocean1a, this)); MACHINE_CONFIG_END @@ -1079,21 +1079,21 @@ MACHINE_CONFIG_START(decocass_type1_state::clocknch) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,clocknch) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_clocknch, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(decocass_type1_state::clocknchj) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,clocknchj) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_clocknchj, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(decocass_type1_state::cfboy0a1) /* 12 */ decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cfboy0a1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cfboy0a1, this)); MACHINE_CONFIG_END @@ -1101,7 +1101,7 @@ MACHINE_CONFIG_START(decocass_type1_state::cprogolf) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cprogolf) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cprogolf, this)); MACHINE_CONFIG_END @@ -1109,7 +1109,7 @@ MACHINE_CONFIG_START(decocass_type1_state::cluckypo) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cluckypo) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cluckypo, this)); MACHINE_CONFIG_END @@ -1117,21 +1117,21 @@ MACHINE_CONFIG_START(decocass_type1_state::ctisland) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,ctisland) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ctisland, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(decocass_type1_state::ctisland3) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,ctisland3) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ctisland3, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(decocass_type1_state::cexplore) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cexplore) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cexplore, this)); MACHINE_CONFIG_END @@ -1141,7 +1141,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cbtime) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cbtime) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cbtime, this)); MACHINE_CONFIG_END @@ -1149,7 +1149,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cburnrub) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cburnrub) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cburnrub, this)); MACHINE_CONFIG_END @@ -1157,7 +1157,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cgraplop) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cgraplop) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cgraplop, this)); MACHINE_CONFIG_END @@ -1165,7 +1165,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cgraplop2) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cgraplop2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cgraplop2, this)); MACHINE_CONFIG_END @@ -1173,7 +1173,7 @@ MACHINE_CONFIG_START(decocass_type3_state::clapapa) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,clapapa) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_clapapa, this)); MACHINE_CONFIG_END @@ -1181,7 +1181,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cskater) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cskater) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cskater, this)); MACHINE_CONFIG_END @@ -1189,7 +1189,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cprobowl) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cprobowl) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cprobowl, this)); MACHINE_CONFIG_END @@ -1197,7 +1197,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cnightst) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cnightst) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cnightst, this)); MACHINE_CONFIG_END @@ -1205,7 +1205,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cpsoccer) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cpsoccer) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cpsoccer, this)); MACHINE_CONFIG_END @@ -1213,7 +1213,7 @@ MACHINE_CONFIG_START(decocass_type3_state::csdtenis) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,csdtenis) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_csdtenis, this)); MACHINE_CONFIG_END @@ -1221,7 +1221,7 @@ MACHINE_CONFIG_START(decocass_type3_state::czeroize) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,czeroize) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_czeroize, this)); MACHINE_CONFIG_END @@ -1229,7 +1229,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cppicf) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cppicf) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cppicf, this)); MACHINE_CONFIG_END @@ -1237,7 +1237,7 @@ MACHINE_CONFIG_START(decocass_type3_state::cfghtice) decocass(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cfghtice) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cfghtice, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp index fd27b603c56..570f11b3507 100644 --- a/src/mame/drivers/dfruit.cpp +++ b/src/mame/drivers/dfruit.cpp @@ -377,8 +377,8 @@ MACHINE_CONFIG_START(dfruit_state::dfruit) MCFG_DEVICE_PROGRAM_MAP(dfruit_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dfruit_state, dfruit_irq_scanline, "screen", 0, 1) - //MCFG_MACHINE_START_OVERRIDE(dfruit_state,4enraya) - //MCFG_MACHINE_RESET_OVERRIDE(dfruit_state,4enraya) + //set_machine_start_cb(config, driver_callback_delegate(&machine_start_4enraya, this)); + //set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_4enraya, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp index 0421442f998..1419c4e725c 100644 --- a/src/mame/drivers/divebomb.cpp +++ b/src/mame/drivers/divebomb.cpp @@ -431,10 +431,10 @@ MACHINE_CONFIG_START(divebomb_state::divebomb) MCFG_K051316_OFFSETS(-88, -16) MCFG_K051316_CB(divebomb_state, zoom_callback_2) - MCFG_MACHINE_START_OVERRIDE(divebomb_state, divebomb) - MCFG_MACHINE_RESET_OVERRIDE(divebomb_state, divebomb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_divebomb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_divebomb, this)); - MCFG_VIDEO_START_OVERRIDE(divebomb_state, divebomb) + set_video_start_cb(config, driver_callback_delegate(&video_start_divebomb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -549,7 +549,7 @@ ROM_END * *************************************/ -MACHINE_START_MEMBER(divebomb_state, divebomb) +void divebomb_state::machine_start_divebomb() { m_rozbank->configure_entries(0, 16, memregion("rozcpudata")->base(), 0x4000); @@ -558,7 +558,7 @@ MACHINE_START_MEMBER(divebomb_state, divebomb) } -MACHINE_RESET_MEMBER(divebomb_state, divebomb) +void divebomb_state::machine_reset_divebomb() { for (int chip = 0; chip < 2; chip++) { diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index 20e9e79b10c..de4f0bf76ab 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -463,7 +463,7 @@ WRITE_LINE_MEMBER(dkong_state::s2650_interrupt) * *************************************/ -MACHINE_START_MEMBER(dkong_state,dkong2b) +void dkong_state::machine_start_dkong2b() { m_hardware_type = HARDWARE_TKG04; @@ -471,17 +471,16 @@ MACHINE_START_MEMBER(dkong_state,dkong2b) save_item(NAME(m_dma_latch)); } -MACHINE_START_MEMBER(dkong_state,s2650) +void dkong_state::machine_start_s2650() { uint8_t *p = memregion("user1")->base(); const char *game_name = machine().system().name; - int i; - MACHINE_START_CALL_MEMBER(dkong2b); + machine_start_dkong2b(); - for (i = 0; i < 0x200; i++) + for (int i = 0; i < 0x200; i++) m_rev_map[i] = -1; - for (i = 0; i < 0x200; i++) + for (int i = 0; i < 0x200; i++) m_rev_map[p[0x0000 + i]] = i; m_hunchloopback = 0; @@ -504,40 +503,40 @@ MACHINE_START_MEMBER(dkong_state,s2650) fatalerror("Unknown game <%s> in S2650 start.\n", game_name); } -MACHINE_START_MEMBER(dkong_state,radarscp) +void dkong_state::machine_start_radarscp() { - MACHINE_START_CALL_MEMBER(dkong2b); + machine_start_dkong2b(); m_hardware_type = HARDWARE_TRS02; m_vidhw = DKONG_BOARD; } -MACHINE_START_MEMBER(dkong_state,radarscp1) +void dkong_state::machine_start_radarscp1() { - MACHINE_START_CALL_MEMBER(dkong2b); + machine_start_dkong2b(); m_hardware_type = HARDWARE_TRS01; m_vidhw = DKONG_BOARD; } -MACHINE_START_MEMBER(dkong_state,dkong3) +void dkong_state::machine_start_dkong3() { m_hardware_type = HARDWARE_TKG04; } -MACHINE_RESET_MEMBER(dkong_state,dkong) +void dkong_state::machine_reset_dkong() { /* nothing */ } -MACHINE_RESET_MEMBER(dkong_state,ddk) +void dkong_state::machine_reset_ddk() { dk_braze_a15(!membank("bank1")->entry()); } -MACHINE_RESET_MEMBER(dkong_state,strtheat) +void dkong_state::machine_reset_strtheat() { uint8_t *ROM = memregion("maincpu")->base(); - MACHINE_RESET_CALL_MEMBER(dkong); + machine_reset_dkong(); /* The initial state of the counter is 0x08 */ membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000); @@ -545,11 +544,11 @@ MACHINE_RESET_MEMBER(dkong_state,strtheat) membank("bank1")->set_entry(0); } -MACHINE_RESET_MEMBER(dkong_state,drakton) +void dkong_state::machine_reset_drakton() { uint8_t *ROM = memregion("maincpu")->base(); - MACHINE_RESET_CALL_MEMBER(dkong); + machine_reset_dkong(); /* The initial state of the counter is 0x09 */ membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000); @@ -1698,8 +1697,8 @@ MACHINE_CONFIG_START(dkong_state::dkong_base) MCFG_DEVICE_ADD("maincpu", Z80, CLOCK_1H) MCFG_DEVICE_PROGRAM_MAP(dkong_map) - MCFG_MACHINE_START_OVERRIDE(dkong_state,dkong2b) - MCFG_MACHINE_RESET_OVERRIDE(dkong_state,dkong) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dkong2b, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dkong, this)); MCFG_DEVICE_ADD("dma8257", I8257, CLOCK_1H) MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, dkong_state, busreq_w)) @@ -1720,14 +1719,14 @@ MACHINE_CONFIG_START(dkong_state::dkong_base) MCFG_PALETTE_ADD("palette", DK2B_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(dkong_state,dkong2b) - MCFG_VIDEO_START_OVERRIDE(dkong_state,dkong) + set_video_start_cb(config, driver_callback_delegate(&video_start_dkong, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::radarscp) dkong_base(config); /* basic machine hardware */ - MCFG_MACHINE_START_OVERRIDE(dkong_state,radarscp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_radarscp, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(RS_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(dkong_state,radarscp) @@ -1740,7 +1739,7 @@ MACHINE_CONFIG_START(dkong_state::radarscp1) dkong_base(config); /* basic machine hardware */ - MCFG_MACHINE_START_OVERRIDE(dkong_state,radarscp1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_radarscp1, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(RS_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(dkong_state,radarscp1) @@ -1754,7 +1753,7 @@ MACHINE_CONFIG_START(dkong_state::dkong2b) dkong_base(config); /* basic machine hardware */ - MCFG_MACHINE_START_OVERRIDE(dkong_state,dkong2b) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dkong2b, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(DK2B_PALETTE_LENGTH) @@ -1779,7 +1778,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::ddk_braze) dkj_braze(config); - MCFG_MACHINE_RESET_OVERRIDE(dkong_state,ddk) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddk, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::dk3_braze) @@ -1795,7 +1794,7 @@ MACHINE_CONFIG_START(dkong_state::dkong3) MCFG_DEVICE_PROGRAM_MAP(dkong3_map) MCFG_DEVICE_IO_MAP(dkong3_io_map) - MCFG_MACHINE_START_OVERRIDE(dkong_state, dkong3) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dkong3, this)); MCFG_DEVICE_ADD("z80dma", Z80DMA, CLOCK_1H) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE("maincpu", INPUT_LINE_HALT)) @@ -1815,7 +1814,7 @@ MACHINE_CONFIG_START(dkong_state::dkong3) MCFG_PALETTE_ADD("palette", DK3_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(dkong_state,dkong3) - MCFG_VIDEO_START_OVERRIDE(dkong_state,dkong) + set_video_start_cb(config, driver_callback_delegate(&video_start_dkong, this)); /* sound hardware */ dkong3_audio(config); @@ -1875,7 +1874,7 @@ MACHINE_CONFIG_START(dkong_state::s2650) MCFG_I8257_IN_MEMR_CB(READ8(*this, dkong_state, hb_dma_read_byte)) MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, dkong_state, hb_dma_write_byte)) - MCFG_MACHINE_START_OVERRIDE(dkong_state,s2650) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_s2650, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::herbiedk) @@ -1908,7 +1907,7 @@ MACHINE_CONFIG_START(dkong_state::strtheat) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(epos_readport) - MCFG_MACHINE_RESET_OVERRIDE(dkong_state,strtheat) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_strtheat, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::drakton) @@ -1918,7 +1917,7 @@ MACHINE_CONFIG_START(dkong_state::drakton) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(epos_readport) - MCFG_MACHINE_RESET_OVERRIDE(dkong_state,drakton) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_drakton, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::drktnjr) @@ -1928,7 +1927,7 @@ MACHINE_CONFIG_START(dkong_state::drktnjr) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(epos_readport) - MCFG_MACHINE_RESET_OVERRIDE(dkong_state,drakton) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_drakton, this)); MACHINE_CONFIG_END /************************************* diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp index cbd6aac265a..7e27a29b657 100644 --- a/src/mame/drivers/dmax8000.cpp +++ b/src/mame/drivers/dmax8000.cpp @@ -47,7 +47,7 @@ public: { } void init_dmax8000(); - DECLARE_MACHINE_RESET(dmax8000); + void machine_reset_dmax8000(); DECLARE_WRITE8_MEMBER(port0c_w); DECLARE_WRITE8_MEMBER(port0d_w); DECLARE_WRITE8_MEMBER(port14_w); @@ -126,7 +126,7 @@ void dmax8000_state::dmax8000_io(address_map &map) static INPUT_PORTS_START( dmax8000 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( dmax8000_state, dmax8000 ) +void dmax8000_state::machine_reset_dmax8000() { membank("bankr0")->set_entry(0); // point at rom membank("bankw0")->set_entry(0); // always write to ram @@ -154,7 +154,7 @@ MACHINE_CONFIG_START(dmax8000_state::dmax8000) MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000) ) // no idea what crystal is used, but 4MHz clock is confirmed MCFG_DEVICE_PROGRAM_MAP(dmax8000_mem) MCFG_DEVICE_IO_MAP(dmax8000_io) - MCFG_MACHINE_RESET_OVERRIDE(dmax8000_state, dmax8000) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dmax8000, this)); MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'000'000) / 2) // 2MHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0)) diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp index d83e8582a90..30bad06f7cf 100644 --- a/src/mame/drivers/docastle.cpp +++ b/src/mame/drivers/docastle.cpp @@ -676,7 +676,7 @@ MACHINE_CONFIG_START(docastle_state::dorunrun) MCFG_DEVICE_PROGRAM_MAP(dorunrun_map2) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(docastle_state,dorunrun) + set_video_start_cb(config, driver_callback_delegate(&video_start_dorunrun, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(docastle_state::idsoccer) @@ -693,7 +693,7 @@ MACHINE_CONFIG_START(docastle_state::idsoccer) MCFG_TMS1025_READ_PORT_CB(PORT4, IOPORT("JOYS_RIGHT")) MCFG_DEVCB_RSHIFT(4) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(docastle_state,dorunrun) + set_video_start_cb(config, driver_callback_delegate(&video_start_dorunrun, this)); /* sound hardware */ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000)) /* Crystal verified on American Soccer board. */ diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index 1ea9272763a..4450ac20e33 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -194,16 +194,16 @@ protected: uint32_t screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_MACHINE_START(cpu_z80) + void machine_start_cpu_z80() ATTR_COLD { m_mainbank->configure_entries(0, 8, memregion("maincpu")->base(), 0x4000); } - DECLARE_VIDEO_START(bluehawk) + void video_start_bluehawk() ATTR_COLD { } - DECLARE_VIDEO_START(flytiger) + void video_start_flytiger() ATTR_COLD { m_paletteram_flytiger = make_unique_clear<uint8_t[]>(0x1000); save_pointer(NAME(m_paletteram_flytiger.get()), 0x1000); @@ -215,7 +215,7 @@ protected: save_item(NAME(m_flytiger_pri)); } - DECLARE_VIDEO_START(primella) + void video_start_primella() ATTR_COLD { /* Register for save/restore */ save_item(NAME(m_tx_pri)); @@ -261,13 +261,13 @@ protected: uint32_t screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_VIDEO_START(lastday) + void video_start_lastday() ATTR_COLD { /* Register for save/restore */ save_item(NAME(m_sprites_disabled)); } - DECLARE_VIDEO_START(gulfstrm) + void video_start_gulfstrm() ATTR_COLD { m_palette_bank = 0; @@ -275,7 +275,7 @@ protected: save_item(NAME(m_palette_bank)); } - DECLARE_VIDEO_START(pollux) + void video_start_pollux() ATTR_COLD { m_paletteram_flytiger = make_unique_clear<uint8_t[]>(0x1000); save_pointer(NAME(m_paletteram_flytiger.get()), 0x1000); @@ -1484,7 +1484,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ MCFG_DEVICE_PROGRAM_MAP(lastday_sound_map) - MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cpu_z80, this)); /* video hardware */ MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) @@ -1506,7 +1506,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) MCFG_DOOYONG_ROM_TILEMAP_TRANSPARENT_PEN(15) MCFG_DOOYONG_RAM_TILEMAP_ADD("tx", "gfxdecode", 0) - MCFG_VIDEO_START_OVERRIDE(dooyong_z80_ym2203_state, lastday) + set_video_start_cb(config, driver_callback_delegate(&video_start_lastday, this)); /* sound hardware */ MCFG_INPUT_MERGER_ANY_HIGH("soundirq") @@ -1537,7 +1537,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm) MCFG_DEVICE_ADD("audiocpu", Z80, 8000000) /* ??? */ MCFG_DEVICE_PROGRAM_MAP(lastday_sound_map) - MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cpu_z80, this)); /* video hardware */ MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) @@ -1559,7 +1559,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm) MCFG_DOOYONG_ROM_TILEMAP_TRANSPARENT_PEN(15) MCFG_DOOYONG_RAM_TILEMAP_ADD("tx", "gfxdecode", 0) - MCFG_VIDEO_START_OVERRIDE(dooyong_z80_ym2203_state, gulfstrm) + set_video_start_cb(config, driver_callback_delegate(&video_start_gulfstrm, this)); /* sound hardware */ sound_2203(config); /* 3.579545MHz */ @@ -1575,7 +1575,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux) MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */ MCFG_DEVICE_PROGRAM_MAP(pollux_sound_map) - MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cpu_z80, this)); /* video hardware */ MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) @@ -1597,7 +1597,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux) MCFG_DOOYONG_ROM_TILEMAP_TRANSPARENT_PEN(15) MCFG_DOOYONG_RAM_TILEMAP_ADD("tx", "gfxdecode", 0) - MCFG_VIDEO_START_OVERRIDE(dooyong_z80_ym2203_state, pollux) + set_video_start_cb(config, driver_callback_delegate(&video_start_pollux, this)); /* sound hardware */ sound_2203(config); /* 3.579545MHz or 4Mhz ??? */ @@ -1613,7 +1613,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::bluehawk) MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* ??? */ MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) - MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cpu_z80, this)); /* video hardware */ MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) @@ -1637,7 +1637,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::bluehawk) MCFG_DOOYONG_ROM_TILEMAP_TRANSPARENT_PEN(15) MCFG_DOOYONG_RAM_TILEMAP_ADD("tx", "gfxdecode", 0) - MCFG_VIDEO_START_OVERRIDE(dooyong_z80_state, bluehawk) + set_video_start_cb(config, driver_callback_delegate(&video_start_bluehawk, this)); /* sound hardware */ sound_2151(config); /* 3.579545MHz or 4Mhz ??? */ @@ -1653,7 +1653,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::flytiger) MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */ MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) - MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cpu_z80, this)); /* video hardware */ MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) @@ -1676,7 +1676,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::flytiger) MCFG_DOOYONG_ROM_TILEMAP_TRANSPARENT_PEN(15) MCFG_DOOYONG_RAM_TILEMAP_ADD("tx", "gfxdecode", 0) - MCFG_VIDEO_START_OVERRIDE(dooyong_z80_state, flytiger) + set_video_start_cb(config, driver_callback_delegate(&video_start_flytiger, this)); /* sound hardware */ sound_2151(config); @@ -1692,7 +1692,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::primella) MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz */ MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) - MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cpu_z80, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1713,7 +1713,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::primella) MCFG_DOOYONG_ROM_TILEMAP_PRIMELLA_CODE_BITS(10) MCFG_DOOYONG_RAM_TILEMAP_ADD("tx", "gfxdecode", 0) - MCFG_VIDEO_START_OVERRIDE(dooyong_z80_state, primella) + set_video_start_cb(config, driver_callback_delegate(&video_start_primella, this)); /* sound hardware */ sound_2151_4mhz(config); /* PCB has only 1 OSC at 16Mhz */ diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp index 3ad63634a11..7db5268f97b 100644 --- a/src/mame/drivers/dps1.cpp +++ b/src/mame/drivers/dps1.cpp @@ -44,7 +44,7 @@ public: DECLARE_WRITE8_MEMBER(portff_w); DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); void init_dps1(); - DECLARE_MACHINE_RESET(dps1); + void machine_reset_dps1(); void dps1(machine_config &config); void io_map(address_map &map); @@ -164,7 +164,7 @@ WRITE_LINE_MEMBER( dps1_state::fdc_drq_w ) // else take /dack high (unsupported) } -MACHINE_RESET_MEMBER( dps1_state, dps1 ) +void dps1_state::machine_reset_dps1() { membank("bankr0")->set_entry(1); // point at rom membank("bankw0")->set_entry(0); // always write to ram @@ -198,7 +198,7 @@ MACHINE_CONFIG_START(dps1_state::dps1) MCFG_DEVICE_ADD("maincpu", Z80, 4000000) MCFG_DEVICE_PROGRAM_MAP(mem_map) MCFG_DEVICE_IO_MAP(io_map) - MCFG_MACHINE_RESET_OVERRIDE(dps1_state, dps1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dps1, this)); /* video hardware */ MCFG_DEVICE_ADD("uart", MC2661, XTAL(5'068'800)) diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp index cb2fdfab783..f3bfc9e88c1 100644 --- a/src/mame/drivers/dsb46.cpp +++ b/src/mame/drivers/dsb46.cpp @@ -47,7 +47,7 @@ public: DECLARE_WRITE8_MEMBER(port1a_w); void init_dsb46(); - DECLARE_MACHINE_RESET(dsb46); + void machine_reset_dsb46(); void dsb46(machine_config &config); void dsb46_io(address_map &map); @@ -87,7 +87,7 @@ void dsb46_state::init_dsb46() membank("write")->configure_entry(0, &RAM[0x00000]); } -MACHINE_RESET_MEMBER( dsb46_state,dsb46 ) +void dsb46_state::machine_reset_dsb46() { membank("read")->set_entry(0); membank("write")->set_entry(0); @@ -114,7 +114,7 @@ MACHINE_CONFIG_START(dsb46_state::dsb46) MCFG_DEVICE_IO_MAP(dsb46_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_MACHINE_RESET_OVERRIDE(dsb46_state, dsb46) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dsb46, this)); /* video hardware */ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(1'843'200)) diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index 047c731126f..8c5d843d3ca 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -359,7 +359,7 @@ WRITE_LINE_MEMBER(dynax_state::adpcm_reset_kludge_w) m_resetkludge = state; } -MACHINE_RESET_MEMBER(dynax_state,adpcm) +void dynax_state::machine_reset_adpcm() { /* start with the MSM5205 reset */ m_resetkludge = 0; @@ -4121,7 +4121,7 @@ INPUT_PORTS_END ***************************************************************************/ -MACHINE_START_MEMBER(dynax_state,dynax) +void dynax_state::machine_start_dynax() { m_blitter_irq_mask = 1; m_blitter2_irq_mask = 1; @@ -4149,10 +4149,10 @@ MACHINE_START_MEMBER(dynax_state,dynax) save_item(NAME(m_palette_ram)); } -MACHINE_RESET_MEMBER(dynax_state,dynax) +void dynax_state::machine_reset_dynax() { if (m_msm != nullptr) - MACHINE_RESET_CALL_MEMBER(adpcm); + machine_reset_adpcm(); m_blitter_irq = 0; m_blitter2_irq = 0; @@ -4177,20 +4177,20 @@ MACHINE_RESET_MEMBER(dynax_state,dynax) memset(m_palette_ram, 0, ARRAY_LENGTH(m_palette_ram)); } -MACHINE_START_MEMBER(dynax_state,hjingi) +void dynax_state::machine_start_hjingi() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x10, &ROM[0x0000], 0x8000); - MACHINE_START_CALL_MEMBER(dynax); + machine_start_dynax(); } -MACHINE_START_MEMBER(dynax_state,hanamai) +void dynax_state::machine_start_hanamai() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x10, &ROM[0x8000], 0x8000); - MACHINE_START_CALL_MEMBER(dynax); + machine_start_dynax(); } /*************************************************************************** @@ -4205,8 +4205,8 @@ MACHINE_CONFIG_START(dynax_state::cdracula) MCFG_DEVICE_IO_MAP(cdracula_io_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus - MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dynax, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); // MCFG_NVRAM_ADD_0FILL("nvram") // no battery @@ -4231,7 +4231,7 @@ MACHINE_CONFIG_START(dynax_state::cdracula) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(dynax_state,sprtmtch) // static palette - MCFG_VIDEO_START_OVERRIDE(dynax_state,hanamai) + set_video_start_cb(config, driver_callback_delegate(&video_start_hanamai, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4253,8 +4253,8 @@ MACHINE_CONFIG_START(dynax_state::hanamai) MCFG_DEVICE_IO_MAP(hanamai_io_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus - MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanamai, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_NVRAM_ADD_0FILL("nvram") @@ -4284,7 +4284,7 @@ MACHINE_CONFIG_START(dynax_state::hanamai) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(dynax_state,sprtmtch) // static palette - MCFG_VIDEO_START_OVERRIDE(dynax_state,hanamai) + set_video_start_cb(config, driver_callback_delegate(&video_start_hanamai, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4321,8 +4321,8 @@ MACHINE_CONFIG_START(dynax_state::hnoridur) MCFG_DEVICE_IO_MAP(hnoridur_io_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus - MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dynax, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(hnoridur_banked_map) @@ -4357,7 +4357,7 @@ MACHINE_CONFIG_START(dynax_state::hnoridur) MCFG_PALETTE_ADD("palette", 16*256) - MCFG_VIDEO_START_OVERRIDE(dynax_state,hnoridur) + set_video_start_cb(config, driver_callback_delegate(&video_start_hnoridur, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4388,8 +4388,8 @@ MACHINE_CONFIG_START(dynax_state::hjingi) MCFG_DEVICE_IO_MAP(hjingi_io_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus - MCFG_MACHINE_START_OVERRIDE(dynax_state,hjingi) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hjingi, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(hjingi_banked_map) @@ -4426,7 +4426,7 @@ MACHINE_CONFIG_START(dynax_state::hjingi) MCFG_PALETTE_ADD("palette", 16*256) - MCFG_VIDEO_START_OVERRIDE(dynax_state,hnoridur) + set_video_start_cb(config, driver_callback_delegate(&video_start_hnoridur, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4457,8 +4457,8 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch) MCFG_DEVICE_IO_MAP(sprtmtch_io_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus - MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanamai, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_NVRAM_ADD_0FILL("nvram") @@ -4485,7 +4485,7 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(dynax_state,sprtmtch) // static palette - MCFG_VIDEO_START_OVERRIDE(dynax_state,sprtmtch) + set_video_start_cb(config, driver_callback_delegate(&video_start_sprtmtch, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4518,8 +4518,8 @@ MACHINE_CONFIG_START(dynax_state::mjfriday) MCFG_DEVICE_PROGRAM_MAP(sprtmtch_mem_map) MCFG_DEVICE_IO_MAP(mjfriday_io_map) - MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanamai, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_NVRAM_ADD_0FILL("nvram") @@ -4546,7 +4546,7 @@ MACHINE_CONFIG_START(dynax_state::mjfriday) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(dynax_state,sprtmtch) // static palette - MCFG_VIDEO_START_OVERRIDE(dynax_state,mjdialq2) + set_video_start_cb(config, driver_callback_delegate(&video_start_mjdialq2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4622,7 +4622,7 @@ MACHINE_CONFIG_START(dynax_state::mcnpshnt) MCFG_DEVICE_PROGRAM_MAP(mcnpshnt_mem_map) MCFG_DEVICE_IO_MAP(mcnpshnt_io_map) - MCFG_VIDEO_START_OVERRIDE(dynax_state,mcnpshnt) // different priorities + set_video_start_cb(config, driver_callback_delegate(&video_start_mcnpshnt, this)); // different priorities MACHINE_CONFIG_END @@ -4647,7 +4647,7 @@ MACHINE_CONFIG_END // dual monitor, 2 CPU's, 2 blitters -MACHINE_START_MEMBER(dynax_state,jantouki) +void dynax_state::machine_start_jantouki() { uint8_t *MAIN = memregion("maincpu")->base(); uint8_t *SOUND = memregion("soundcpu")->base(); @@ -4655,7 +4655,7 @@ MACHINE_START_MEMBER(dynax_state,jantouki) membank("bank1")->configure_entries(0, 0x10, &MAIN[0x8000], 0x8000); membank("bank2")->configure_entries(0, 12, &SOUND[0x8000], 0x8000); - MACHINE_START_CALL_MEMBER(dynax); + machine_start_dynax(); } @@ -4672,8 +4672,8 @@ MACHINE_CONFIG_START(dynax_state::jantouki) MCFG_DEVICE_IO_MAP(jantouki_sound_io_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus - MCFG_MACHINE_START_OVERRIDE(dynax_state,jantouki) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_jantouki, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_NVRAM_ADD_0FILL("nvram") @@ -4716,7 +4716,7 @@ MACHINE_CONFIG_START(dynax_state::jantouki) MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_jantouki_bottom) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(dynax_state,jantouki) + set_video_start_cb(config, driver_callback_delegate(&video_start_jantouki, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4784,7 +4784,7 @@ MACHINE_CONFIG_START(dynax_state::mjelctrn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT - MCFG_VIDEO_START_OVERRIDE(dynax_state,mjelctrn) + set_video_start_cb(config, driver_callback_delegate(&video_start_mjelctrn, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(dynax_state::mjembase) @@ -4800,7 +4800,7 @@ MACHINE_CONFIG_START(dynax_state::mjembase) MCFG_DEVICE_REMOVE("outlatch") - MCFG_VIDEO_START_OVERRIDE(dynax_state,mjembase) + set_video_start_cb(config, driver_callback_delegate(&video_start_mjembase, this)); MACHINE_CONFIG_END /*************************************************************************** @@ -4814,7 +4814,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dynax_state::neruton) mjelctrn(config); - MCFG_VIDEO_START_OVERRIDE(dynax_state,neruton) + set_video_start_cb(config, driver_callback_delegate(&video_start_neruton, this)); MACHINE_CONFIG_END @@ -4863,8 +4863,8 @@ MACHINE_CONFIG_START(dynax_state::tenkai) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(20) MCFG_ADDRESS_MAP_BANK_STRIDE(0x8000) - MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dynax, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_NVRAM_ADD_0FILL("nvram") @@ -4888,7 +4888,7 @@ MACHINE_CONFIG_START(dynax_state::tenkai) MCFG_PALETTE_ADD("palette", 16*256) - MCFG_VIDEO_START_OVERRIDE(dynax_state,tenkai) + set_video_start_cb(config, driver_callback_delegate(&video_start_tenkai, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4936,8 +4936,8 @@ MACHINE_CONFIG_START(dynax_state::gekisha) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(17) MCFG_ADDRESS_MAP_BANK_STRIDE(0x8000) - MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax) - MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dynax, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this)); MCFG_NVRAM_ADD_0FILL("nvram") @@ -4963,7 +4963,7 @@ MACHINE_CONFIG_START(dynax_state::gekisha) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(dynax_state,sprtmtch) // static palette - MCFG_VIDEO_START_OVERRIDE(dynax_state,mjdialq2) + set_video_start_cb(config, driver_callback_delegate(&video_start_mjdialq2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/ec184x.cpp b/src/mame/drivers/ec184x.cpp index 4937b18b71a..fe1ffdd8ced 100644 --- a/src/mame/drivers/ec184x.cpp +++ b/src/mame/drivers/ec184x.cpp @@ -43,7 +43,7 @@ public: required_device<cpu_device> m_maincpu; - DECLARE_MACHINE_RESET(ec1841); + void machine_reset_ec1841(); void init_ec1841(); struct @@ -175,7 +175,7 @@ void ec184x_state::init_ec1841() } } -MACHINE_RESET_MEMBER(ec184x_state, ec1841) +void ec184x_state::machine_reset_ec1841() { memset(m_memory.enable, 0, sizeof(m_memory.enable)); // mark 1st board enabled @@ -253,7 +253,7 @@ MACHINE_CONFIG_START(ec184x_state::ec1841) MCFG_DEVICE_IO_MAP(ec1841_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb) - MCFG_MACHINE_RESET_OVERRIDE(ec184x_state, ec1841) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ec1841, this)); MCFG_EC1841_MOTHERBOARD_ADD("mb", "maincpu") diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp index bc3343b41b2..cd382eec593 100644 --- a/src/mame/drivers/elwro800.cpp +++ b/src/mame/drivers/elwro800.cpp @@ -61,7 +61,7 @@ public: DECLARE_WRITE8_MEMBER(elwro800jr_fdc_control_w); DECLARE_READ8_MEMBER(elwro800jr_io_r); DECLARE_WRITE8_MEMBER(elwro800jr_io_w); - DECLARE_MACHINE_RESET(elwro800); + void machine_reset_elwro800(); INTERRUPT_GEN_MEMBER(elwro800jr_interrupt); DECLARE_READ8_MEMBER(i8255_port_c_r); DECLARE_WRITE8_MEMBER(i8255_port_c_w); @@ -520,7 +520,7 @@ INPUT_PORTS_END * *************************************/ -MACHINE_RESET_MEMBER(elwro800_state,elwro800) +void elwro800_state::machine_reset_elwro800() { uint8_t *messram = m_ram->pointer(); @@ -575,7 +575,7 @@ MACHINE_CONFIG_START(elwro800_state::elwro800) MCFG_DEVICE_OPCODES_MAP(elwro800_m1) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", elwro800_state, elwro800jr_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(elwro800_state,elwro800) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_elwro800, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -591,7 +591,7 @@ MACHINE_CONFIG_START(elwro800_state::elwro800) MCFG_PALETTE_INIT_OWNER(elwro800_state, spectrum ) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_elwro800) - MCFG_VIDEO_START_OVERRIDE(elwro800_state, spectrum ) + set_video_start_cb(config, driver_callback_delegate(&video_start_spectrum, this)); MCFG_UPD765A_ADD("upd765", true, true) diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp index 7219f3c7f14..5ecd44ba8b6 100644 --- a/src/mame/drivers/eolith.cpp +++ b/src/mame/drivers/eolith.cpp @@ -545,7 +545,7 @@ MACHINE_CONFIG_START(eolith_state::eolith45) MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, eolith_state, sound_p1_w)) MCFG_MCS51_SERIAL_TX_CB(WRITE8(*this, eolith_state, soundcpu_to_qs1000)) // Sound CPU -> QS1000 CPU serial link - MCFG_MACHINE_RESET_OVERRIDE(eolith_state,eolith) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_eolith, this)); MCFG_EEPROM_SERIAL_93C66_8BIT_ADD("eeprom") MCFG_EEPROM_ERASE_TIME(attotime::from_usec(250)) @@ -566,7 +566,7 @@ MACHINE_CONFIG_START(eolith_state::eolith45) MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") - MCFG_VIDEO_START_OVERRIDE(eolith_state,eolith) + set_video_start_cb(config, driver_callback_delegate(&video_start_eolith, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1521,7 +1521,7 @@ ROM_START( hidctch3 ) ROM_END -MACHINE_RESET_MEMBER(eolith_state,eolith) +void eolith_state::machine_reset_eolith() { m_soundcpu->set_input_line(MCS51_INT1_LINE, ASSERT_LINE); } diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp index 052245213e5..a05d0876ce8 100644 --- a/src/mame/drivers/epos.cpp +++ b/src/mame/drivers/epos.cpp @@ -428,7 +428,7 @@ INPUT_PORTS_END * *************************************/ -MACHINE_START_MEMBER(epos_state,epos) +void epos_state::machine_start_epos() { save_item(NAME(m_palette_bank)); save_item(NAME(m_counter)); @@ -445,7 +445,7 @@ void epos_state::machine_reset() } -MACHINE_START_MEMBER(epos_state,dealer) +void epos_state::machine_start_dealer() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 4, &ROM[0x0000], 0x10000); @@ -454,7 +454,7 @@ MACHINE_START_MEMBER(epos_state,dealer) membank("bank1")->set_entry(0); membank("bank2")->set_entry(0); - MACHINE_START_CALL_MEMBER(epos); + machine_start_epos(); } MACHINE_CONFIG_START(epos_state::epos) /* EPOS TRISTAR 8000 PCB */ @@ -499,7 +499,7 @@ MACHINE_CONFIG_START(epos_state::dealer) /* EPOS TRISTAR 9000 PCB */ MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_MACHINE_START_OVERRIDE(epos_state,dealer) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dealer, this)); // RAM-based palette instead of prom MCFG_PALETTE_ADD_INIT_BLACK("palette", 32) diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp index 90221777d4c..8f7761fa499 100644 --- a/src/mame/drivers/eprom.cpp +++ b/src/mame/drivers/eprom.cpp @@ -420,7 +420,7 @@ MACHINE_CONFIG_START(eprom_state::eprom) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, eprom_state, video_int_write_line)) - MCFG_VIDEO_START_OVERRIDE(eprom_state,eprom) + set_video_start_cb(config, driver_callback_delegate(&video_start_eprom, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -463,7 +463,7 @@ MACHINE_CONFIG_START(eprom_state::klaxp) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, eprom_state, video_int_write_line)) - MCFG_VIDEO_START_OVERRIDE(eprom_state,eprom) + set_video_start_cb(config, driver_callback_delegate(&video_start_eprom, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -511,7 +511,7 @@ MACHINE_CONFIG_START(eprom_state::guts) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, eprom_state, video_int_write_line)) - MCFG_VIDEO_START_OVERRIDE(eprom_state,guts) + set_video_start_cb(config, driver_callback_delegate(&video_start_guts, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index 8687f60caac..d2ac45bbab3 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -1185,7 +1185,7 @@ MACHINE_CONFIG_START(equites_state::equites) MCFG_PALETTE_INDIRECT_ENTRIES(0x100) MCFG_PALETTE_INIT_OWNER(equites_state,equites) - MCFG_VIDEO_START_OVERRIDE(equites_state,equites) + set_video_start_cb(config, driver_callback_delegate(&video_start_equites, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(gekisou_state::gekisou) @@ -1235,7 +1235,7 @@ MACHINE_CONFIG_START(splndrbt_state::splndrbt) MCFG_PALETTE_INDIRECT_ENTRIES(0x100) MCFG_PALETTE_INIT_OWNER(splndrbt_state,splndrbt) - MCFG_VIDEO_START_OVERRIDE(splndrbt_state,splndrbt) + set_video_start_cb(config, driver_callback_delegate(&video_start_splndrbt, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(splndrbt_state::hvoltage) diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp index 6ad84cbc12a..d37063a601f 100644 --- a/src/mame/drivers/espial.cpp +++ b/src/mame/drivers/espial.cpp @@ -368,7 +368,7 @@ MACHINE_CONFIG_START(espial_state::netwars) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(32*8, 64*8) - MCFG_VIDEO_START_OVERRIDE(espial_state,netwars) + set_video_start_cb(config, driver_callback_delegate(&video_start_netwars, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index 1d0aee2ebd0..9b7bec26995 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -92,7 +92,7 @@ public: DECLARE_WRITE_LINE_MEMBER(crtc_hs); DECLARE_WRITE_LINE_MEMBER(crtc_vs); DECLARE_WRITE_LINE_MEMBER(motor_w); - DECLARE_MACHINE_RESET(excali64); + void machine_reset_excali64(); required_device<palette_device> m_palette; void excali64(machine_config &config); @@ -410,7 +410,7 @@ WRITE8_MEMBER( excali64_state::port70_w ) membank("bankr1")->set_entry(2); } -MACHINE_RESET_MEMBER( excali64_state, excali64 ) +void excali64_state::machine_reset_excali64() { membank("bankr1")->set_entry(1); // read from ROM membank("bankr2")->set_entry(1); // read from ROM @@ -555,7 +555,7 @@ MACHINE_CONFIG_START(excali64_state::excali64) MCFG_DEVICE_PROGRAM_MAP(mem_map) MCFG_DEVICE_IO_MAP(io_map) - MCFG_MACHINE_RESET_OVERRIDE(excali64_state, excali64) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_excali64, this)); MCFG_DEVICE_ADD("uart", I8251, 0) //MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd)) diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp index 75475068e17..249523ae1f6 100644 --- a/src/mame/drivers/exelv.cpp +++ b/src/mame/drivers/exelv.cpp @@ -97,8 +97,8 @@ public: DECLARE_WRITE8_MEMBER( tms7041_portd_w ); DECLARE_READ8_MEMBER( rom_r ); - DECLARE_MACHINE_START(exl100); - DECLARE_MACHINE_START(exeltel); + void machine_start_exl100() ATTR_COLD; + void machine_start_exeltel() ATTR_COLD; /* tms7020 i/o ports */ uint8_t m_tms7020_portb; @@ -452,7 +452,7 @@ INPUT_PORTS_END /* Machine Initialization */ -MACHINE_START_MEMBER( exelv_state, exl100) +void exelv_state::machine_start_exl100() { /* register for state saving */ save_item(NAME(m_tms7020_portb)); @@ -463,7 +463,7 @@ MACHINE_START_MEMBER( exelv_state, exl100) save_item(NAME(m_wx319)); } -MACHINE_START_MEMBER( exelv_state, exeltel) +void exelv_state::machine_start_exeltel() { uint8_t *rom = memregion("user1")->base() + 0x0200; membank("bank1")->configure_entry(0, rom); @@ -488,7 +488,7 @@ MACHINE_CONFIG_START(exelv_state::exl100) MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, exelv_state, tms7020_portb_w)) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", exelv_state, exelv_hblank_interrupt, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE(exelv_state, exl100) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_exl100, this)); MCFG_DEVICE_ADD("tms7041", TMS7041, XTAL(4'915'200)) MCFG_TMS7000_IN_PORTA_CB(READ8(*this, exelv_state, tms7041_porta_r)) @@ -544,7 +544,7 @@ MACHINE_CONFIG_START(exelv_state::exeltel) MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, exelv_state, tms7020_portb_w)) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", exelv_state, exelv_hblank_interrupt, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE(exelv_state, exeltel) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_exeltel, this)); MCFG_DEVICE_ADD("tms7042", TMS7042, XTAL(4'915'200)) MCFG_TMS7000_IN_PORTA_CB(READ8(*this, exelv_state, tms7041_porta_r)) diff --git a/src/mame/drivers/exidy.cpp b/src/mame/drivers/exidy.cpp index 68a9560461d..899a5aa71fb 100644 --- a/src/mame/drivers/exidy.cpp +++ b/src/mame/drivers/exidy.cpp @@ -810,7 +810,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(exidy_state,teetert) +void exidy_state::machine_start_teetert() { save_item(NAME(m_last_dial)); } @@ -906,7 +906,7 @@ MACHINE_CONFIG_START(exidy_state::teetert) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PERIODIC_INT_DRIVER(exidy_state, nmi_line_pulse, 10*60) - MCFG_MACHINE_START_OVERRIDE(exidy_state, teetert ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_teetert, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp index 9b35edb9c1e..afea5ac7121 100644 --- a/src/mame/drivers/f1gp.cpp +++ b/src/mame/drivers/f1gp.cpp @@ -386,7 +386,7 @@ static GFXDECODE_START( gfx_f1gp2 ) GFXDECODE_END -MACHINE_START_MEMBER(f1gp_state,f1gpb) +void f1gp_state::machine_start_f1gpb() { m_acia->write_cts(0); m_acia->write_dcd(0); @@ -397,14 +397,14 @@ MACHINE_START_MEMBER(f1gp_state,f1gpb) save_item(NAME(m_scroll)); } -MACHINE_START_MEMBER(f1gp_state,f1gp) +void f1gp_state::machine_start_f1gp() { membank("bank1")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x10000, 0x8000); - MACHINE_START_CALL_MEMBER(f1gpb); + machine_start_f1gpb(); } -MACHINE_RESET_MEMBER(f1gp_state,f1gp) +void f1gp_state::machine_reset_f1gp() { m_roz_bank = 0; m_flipscreen = 0; @@ -430,8 +430,8 @@ MACHINE_CONFIG_START(f1gp_state::f1gp) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(f1gp_state,f1gp) - MCFG_MACHINE_RESET_OVERRIDE(f1gp_state,f1gp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_f1gp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_f1gp, this)); MCFG_DEVICE_ADD("acia", ACIA6850, 0) MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("sub", M68K_IRQ_3)) @@ -467,7 +467,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gp) MCFG_VSYSTEM_SPR2_SET_PRITYPE(2) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(f1gp_state,f1gp) + set_video_start_cb(config, driver_callback_delegate(&video_start_f1gp, this)); MCFG_DEVICE_ADD("k053936", K053936, 0) MCFG_K053936_WRAP(1) @@ -504,8 +504,8 @@ MACHINE_CONFIG_START(f1gp_state::f1gpb) /* NO sound CPU */ MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(f1gp_state,f1gpb) - MCFG_MACHINE_RESET_OVERRIDE(f1gp_state,f1gp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_f1gpb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_f1gp, this)); MCFG_DEVICE_ADD("acia", ACIA6850, 0) MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("sub", M68K_IRQ_3)) @@ -529,7 +529,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gpb) //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) - MCFG_VIDEO_START_OVERRIDE(f1gp_state,f1gpb) + set_video_start_cb(config, driver_callback_delegate(&video_start_f1gpb, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -565,7 +565,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gp2) MCFG_DEVICE_MODIFY("k053936") MCFG_K053936_OFFSETS(-48, -21) - MCFG_VIDEO_START_OVERRIDE(f1gp_state,f1gp2) + set_video_start_cb(config, driver_callback_delegate(&video_start_f1gp2, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp index 07ebcc37039..a5a3abf8322 100644 --- a/src/mame/drivers/fantland.cpp +++ b/src/mame/drivers/fantland.cpp @@ -827,12 +827,12 @@ GFXDECODE_END ***************************************************************************/ -MACHINE_START_MEMBER(fantland_state,fantland) +void fantland_state::machine_start_fantland() { save_item(NAME(m_nmi_enable)); } -MACHINE_RESET_MEMBER(fantland_state,fantland) +void fantland_state::machine_reset_fantland() { m_nmi_enable = 0; } @@ -860,8 +860,8 @@ MACHINE_CONFIG_START(fantland_state::fantland) MCFG_DEVICE_PERIODIC_INT_DRIVER(fantland_state, fantland_sound_irq, 8000) // NMI when soundlatch is written - MCFG_MACHINE_START_OVERRIDE(fantland_state,fantland) - MCFG_MACHINE_RESET_OVERRIDE(fantland_state,fantland) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fantland, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fantland, this)); MCFG_QUANTUM_TIME(attotime::from_hz(8000)) // sound irq must feed the DAC at 8kHz @@ -910,8 +910,8 @@ MACHINE_CONFIG_START(fantland_state::galaxygn) MCFG_DEVICE_IO_MAP(galaxygn_sound_iomap) // IRQ by YM2151, NMI when soundlatch is written - MCFG_MACHINE_START_OVERRIDE(fantland_state,fantland) - MCFG_MACHINE_RESET_OVERRIDE(fantland_state,fantland) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fantland, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fantland, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -939,9 +939,9 @@ MACHINE_CONFIG_START(fantland_state::galaxygn) MACHINE_CONFIG_END -MACHINE_START_MEMBER(fantland_state,borntofi) +void fantland_state::machine_start_borntofi() { - MACHINE_START_CALL_MEMBER(fantland); + machine_start_fantland(); save_item(NAME(m_old_x)); save_item(NAME(m_old_y)); @@ -953,13 +953,11 @@ MACHINE_START_MEMBER(fantland_state,borntofi) save_item(NAME(m_adpcm_nibble)); } -MACHINE_RESET_MEMBER(fantland_state,borntofi) +void fantland_state::machine_reset_borntofi() { - int i; + machine_reset_fantland(); - MACHINE_RESET_CALL_MEMBER(fantland); - - for (i = 0; i < 2; i++) + for (int i = 0; i < 2; i++) { m_old_x[i] = 0; m_old_y[i] = 0; @@ -967,7 +965,7 @@ MACHINE_RESET_MEMBER(fantland_state,borntofi) m_input_ret[i] = 0; } - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { m_adpcm_playing[i] = 1; m_adpcm_addr[0][i] = 0; @@ -990,8 +988,8 @@ MACHINE_CONFIG_START(fantland_state::borntofi) MCFG_DEVICE_ADD("audiocpu", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] MCFG_DEVICE_PROGRAM_MAP(borntofi_sound_map) - MCFG_MACHINE_START_OVERRIDE(fantland_state,borntofi) - MCFG_MACHINE_RESET_OVERRIDE(fantland_state,borntofi) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_borntofi, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_borntofi, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1045,8 +1043,8 @@ MACHINE_CONFIG_START(fantland_state::wheelrun) MCFG_DEVICE_PROGRAM_MAP(wheelrun_sound_map) // IRQ by YM3526, NMI when soundlatch is written - MCFG_MACHINE_START_OVERRIDE(fantland_state,fantland) - MCFG_MACHINE_RESET_OVERRIDE(fantland_state,fantland) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fantland, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fantland, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp index 8b0c2f545b2..cff9bfe68a6 100644 --- a/src/mame/drivers/fastfred.cpp +++ b/src/mame/drivers/fastfred.cpp @@ -138,7 +138,7 @@ READ8_MEMBER(fastfred_state::boggy84_custom_io_r) */ -MACHINE_START_MEMBER(fastfred_state,imago) +void fastfred_state::machine_start_imago() { machine_start(); m_gfxdecode->gfx(1)->set_source(m_imago_sprites); @@ -668,7 +668,7 @@ MACHINE_CONFIG_START(fastfred_state::fastfred) MCFG_PALETTE_ADD("palette", 32*8) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(fastfred_state,fastfred) - MCFG_VIDEO_START_OVERRIDE(fastfred_state,fastfred) + set_video_start_cb(config, driver_callback_delegate(&video_start_fastfred, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -711,14 +711,14 @@ MACHINE_CONFIG_START(fastfred_state::imago) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, fastfred_state, imago_dma_irq_w)) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, fastfred_state, imago_charbank_w)) - MCFG_MACHINE_START_OVERRIDE(fastfred_state,imago) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_imago, this)); /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(256+64+2) /* 256 for characters, 64 for the stars and 2 for the web */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_imago) - MCFG_VIDEO_START_OVERRIDE(fastfred_state,imago) + set_video_start_cb(config, driver_callback_delegate(&video_start_imago, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(fastfred_state, screen_update_imago) MACHINE_CONFIG_END diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index cad66bbc9a8..0a21d59f6b5 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -1482,7 +1482,7 @@ static INPUT_PORTS_START( wofabl ) PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW(B):8" ) INPUT_PORTS_END -MACHINE_START_MEMBER(cps_state,fcrash) +void cps_state::machine_start_fcrash() { uint8_t *ROM = memregion("audiocpu")->base(); @@ -1506,16 +1506,16 @@ MACHINE_START_MEMBER(cps_state,fcrash) save_item(NAME(m_sample_select2)); } -MACHINE_START_MEMBER(cps_state,sgyxz) +void cps_state::machine_start_sgyxz() { - MACHINE_START_CALL_MEMBER(kodb); + machine_start_kodb(); m_layer_scroll1x_offset = 0x40; m_layer_scroll2x_offset = 0x40; m_layer_scroll3x_offset = 0x40; membank("bank1")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x10000, 0x4000); } -MACHINE_START_MEMBER(cps_state,kodb) +void cps_state::machine_start_kodb() { m_layer_enable_reg = 0x20; m_layer_mask_reg[0] = 0x2e; @@ -1530,9 +1530,9 @@ MACHINE_START_MEMBER(cps_state,kodb) m_sprite_x_offset = 0; } -MACHINE_START_MEMBER(cps_state, cawingbl) +void cps_state::machine_start_cawingbl() { - MACHINE_START_CALL_MEMBER(fcrash); + machine_start_fcrash(); m_layer_enable_reg = 0x0c; m_layer_mask_reg[0] = 0x0a; @@ -1545,7 +1545,7 @@ MACHINE_START_MEMBER(cps_state, cawingbl) m_sprite_base = 0x1000; } -MACHINE_START_MEMBER(cps_state, sf2mdt) +void cps_state::machine_start_sf2mdt() { uint8_t *ROM = memregion("audiocpu")->base(); @@ -1569,7 +1569,7 @@ MACHINE_START_MEMBER(cps_state, sf2mdt) save_item(NAME(m_sample_select2)); } -MACHINE_START_MEMBER(cps_state, knightsb) +void cps_state::machine_start_knightsb() { uint8_t *ROM = memregion("audiocpu")->base(); @@ -1588,7 +1588,7 @@ MACHINE_START_MEMBER(cps_state, knightsb) m_sprite_x_offset = 0; } -MACHINE_START_MEMBER(cps_state, sf2m1) +void cps_state::machine_start_sf2m1() { uint8_t *ROM = memregion("audiocpu")->base(); @@ -1607,7 +1607,7 @@ MACHINE_START_MEMBER(cps_state, sf2m1) m_sprite_x_offset = 0; } -MACHINE_RESET_MEMBER(cps_state,fcrash) +void cps_state::machine_reset_fcrash() { m_sample_buffer1 = 0; m_sample_buffer2 = 0; @@ -1626,8 +1626,8 @@ MACHINE_CONFIG_START(cps_state::fcrash) MCFG_DEVICE_ADD("audiocpu", Z80, 24000000/6) /* ? */ MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_MACHINE_START_OVERRIDE(cps_state,fcrash) - MCFG_MACHINE_RESET_OVERRIDE(cps_state,fcrash) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fcrash, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fcrash, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1642,7 +1642,7 @@ MACHINE_CONFIG_START(cps_state::fcrash) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 4096) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); // sound hardware SPEAKER(config, "mono").front_center(); @@ -1678,7 +1678,7 @@ MACHINE_CONFIG_START(cps_state::cawingbl) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, irq6_line_hold) /* needed to write to scroll values */ - MCFG_MACHINE_START_OVERRIDE(cps_state, cawingbl) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cawingbl, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(cps_state::kodb) @@ -1692,7 +1692,7 @@ MACHINE_CONFIG_START(cps_state::kodb) MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) MCFG_DEVICE_PROGRAM_MAP(kodb_sound_map) - MCFG_MACHINE_START_OVERRIDE(cps_state,kodb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_kodb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1707,7 +1707,7 @@ MACHINE_CONFIG_START(cps_state::kodb) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1734,8 +1734,8 @@ MACHINE_CONFIG_START(cps_state::sf2mdt) MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) MCFG_DEVICE_PROGRAM_MAP(sf2mdt_z80map) - MCFG_MACHINE_START_OVERRIDE(cps_state, sf2mdt) - MCFG_MACHINE_RESET_OVERRIDE(cps_state,fcrash) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sf2mdt, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fcrash, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1750,7 +1750,7 @@ MACHINE_CONFIG_START(cps_state::sf2mdt) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 4096) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1790,7 +1790,7 @@ MACHINE_CONFIG_START(cps_state::knightsb) MCFG_DEVICE_ADD("audiocpu", Z80, 29821000 / 8) MCFG_DEVICE_PROGRAM_MAP(knightsb_z80map) - MCFG_MACHINE_START_OVERRIDE(cps_state, knightsb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_knightsb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1805,7 +1805,7 @@ MACHINE_CONFIG_START(cps_state::knightsb) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2147,7 +2147,7 @@ void cps_state::init_cawingbl() // ************************************************************************* DINOPIC, DINOPIC2 -MACHINE_START_MEMBER(cps_state, dinopic) +void cps_state::machine_start_dinopic() { m_layer_enable_reg = 0x0a; m_layer_mask_reg[0] = 0x0c; @@ -2173,7 +2173,7 @@ MACHINE_CONFIG_START(cps_state::dinopic) //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000) //MCFG_DEVICE_DISABLE() /* no valid dumps .. */ - MCFG_MACHINE_START_OVERRIDE(cps_state, dinopic) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_dinopic, this)); MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") @@ -2190,7 +2190,7 @@ MACHINE_CONFIG_START(cps_state::dinopic) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2333,7 +2333,7 @@ MACHINE_CONFIG_START(cps_state::sgyxz) MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map) - MCFG_MACHINE_START_OVERRIDE(cps_state,sgyxz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sgyxz, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2346,7 +2346,7 @@ MACHINE_CONFIG_START(cps_state::sgyxz) MCFG_SCREEN_PALETTE("palette") MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") @@ -2433,7 +2433,7 @@ ROM_END // ************************************************************************* PUNIPIC, PUNIPIC2, PUNIPIC3 -MACHINE_START_MEMBER(cps_state, punipic) +void cps_state::machine_start_punipic() { m_layer_enable_reg = 0x12; m_layer_mask_reg[0] = 0x14; @@ -2458,7 +2458,7 @@ MACHINE_CONFIG_START(cps_state::punipic) //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000) //MCFG_DEVICE_DISABLE() /* no valid dumps .. */ - MCFG_MACHINE_START_OVERRIDE(cps_state, punipic) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_punipic, this)); MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") @@ -2475,7 +2475,7 @@ MACHINE_CONFIG_START(cps_state::punipic) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2654,7 +2654,7 @@ MACHINE_CONFIG_START(cps_state::sf2m1) MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map) - MCFG_MACHINE_START_OVERRIDE(cps_state,sf2m1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sf2m1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2665,7 +2665,7 @@ MACHINE_CONFIG_START(cps_state::sf2m1) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3005,7 +3005,7 @@ void cps_state::init_wofabl() // ************************************************************************* SLAMPIC -MACHINE_START_MEMBER(cps_state, slampic) +void cps_state::machine_start_slampic() { m_layer_enable_reg = 0x16; m_layer_mask_reg[0] = 0x00; @@ -3031,7 +3031,7 @@ MACHINE_CONFIG_START(cps_state::slampic) //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000) //MCFG_DEVICE_DISABLE() /* no valid dumps .. */ - MCFG_MACHINE_START_OVERRIDE(cps_state, slampic) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_slampic, this)); MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") @@ -3048,7 +3048,7 @@ MACHINE_CONFIG_START(cps_state::slampic) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3134,7 +3134,7 @@ MACHINE_CONFIG_START(cps_state::varthb) MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map) - MCFG_MACHINE_START_OVERRIDE(cps_state,cps1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cps1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -3149,7 +3149,7 @@ MACHINE_CONFIG_START(cps_state::varthb) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) + set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index 11be19ff7a7..a393c418566 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -498,7 +498,7 @@ public: DECLARE_WRITE_LINE_MEMBER(csc_pia1_cb2_w); DECLARE_READ_LINE_MEMBER(csc_pia1_ca1_r); DECLARE_READ_LINE_MEMBER(csc_pia1_cb1_r); - DECLARE_MACHINE_RESET(su9); + void machine_reset_su9(); DECLARE_INPUT_CHANGED_MEMBER(su9_cpu_freq); void su9_set_cpu_freq(); void csc_map(address_map &map); @@ -529,7 +529,7 @@ public: DECLARE_WRITE8_MEMBER(sc9_led_w); DECLARE_READ8_MEMBER(sc9_input_r); DECLARE_READ8_MEMBER(sc9d_input_r); - DECLARE_MACHINE_RESET(sc9c); + void machine_reset_sc9c(); DECLARE_INPUT_CHANGED_MEMBER(sc9c_cpu_freq); void sc9c_set_cpu_freq(); void sc9_map(address_map &map); @@ -579,7 +579,7 @@ public: void fdes2100d(machine_config &config); // Phantom - DECLARE_MACHINE_RESET(fphantom); + void machine_reset_fphantom(); void init_fphantom(); void fphantom_map(address_map &map); void fphantom(machine_config &config); @@ -628,7 +628,7 @@ void fidel6502_state::su9_set_cpu_freq() m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? (5_MHz_XTAL/2) : (3.9_MHz_XTAL/2)); } -MACHINE_RESET_MEMBER(fidel6502_state, su9) +void fidel6502_state::machine_reset_su9() { fidelbase_state::machine_reset(); su9_set_cpu_freq(); @@ -873,7 +873,7 @@ void fidel6502_state::sc9c_set_cpu_freq() m_maincpu->set_unscaled_clock((inp & 2) ? 1900000 : ((inp & 1) ? 1600000 : 1500000)); } -MACHINE_RESET_MEMBER(fidel6502_state, sc9c) +void fidel6502_state::machine_reset_sc9c() { fidelbase_state::machine_reset(); sc9c_set_cpu_freq(); @@ -1098,7 +1098,7 @@ void fidel6502_state::init_fdesdis() // TTL/generic -MACHINE_RESET_MEMBER(fidel6502_state, fphantom) +void fidel6502_state::machine_reset_fphantom() { fidelbase_state::machine_reset(); membank("bank1")->set_entry(0); @@ -1758,7 +1758,7 @@ MACHINE_CONFIG_START(fidel6502_state::su9) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(su9_map) - MCFG_MACHINE_RESET_OVERRIDE(fidel6502_state, su9) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_su9, this)); MCFG_DEFAULT_LAYOUT(layout_fidel_su9) MACHINE_CONFIG_END @@ -1873,7 +1873,7 @@ MACHINE_CONFIG_START(fidel6502_state::sc9c) sc9b(config); /* basic machine hardware */ - MCFG_MACHINE_RESET_OVERRIDE(fidel6502_state, sc9c) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sc9c, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::playmatic) @@ -2063,7 +2063,7 @@ MACHINE_CONFIG_START(fidel6502_state::fphantom) MCFG_DEVICE_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed MCFG_DEVICE_PROGRAM_MAP(fphantom_map) - MCFG_MACHINE_RESET_OVERRIDE(fidel6502_state, fphantom) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fphantom, this)); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) //MCFG_DEFAULT_LAYOUT(layout_fidel_phantom) diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index fe3a14dc346..7dcb230547e 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -546,7 +546,7 @@ public: DECLARE_WRITE8_MEMBER(vcc_ppi_portc_w); DECLARE_WRITE8_MEMBER(cc10_ppi_porta_w); TIMER_DEVICE_CALLBACK_MEMBER(beeper_off_callback); - DECLARE_MACHINE_START(vcc); + void machine_start_vcc() ATTR_COLD; void cc10_map(address_map &map); void vcc_io(address_map &map); void vcc_map(address_map &map); @@ -801,7 +801,7 @@ READ8_MEMBER(fidelz80_state::vcc_speech_r) return m_speech_rom[m_speech_bank << 12 | offset]; } -MACHINE_START_MEMBER(fidelz80_state,vcc) +void fidelz80_state::machine_start_vcc() { machine_start(); @@ -1731,7 +1731,7 @@ MACHINE_CONFIG_START(fidelz80_state::vcc) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) MCFG_DEFAULT_LAYOUT(layout_fidel_vcc) - MCFG_MACHINE_START_OVERRIDE(fidelz80_state,vcc) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_vcc, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index 4b6326d799f..50ffb9a1e88 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -216,9 +216,9 @@ public: void init_ppd(); void init_kbm(); void init_ppp(); - DECLARE_MACHINE_START(firebeat); - DECLARE_MACHINE_RESET(firebeat); - DECLARE_VIDEO_START(firebeat); + void machine_start_firebeat() ATTR_COLD; + void machine_reset_firebeat(); + void video_start_firebeat() ATTR_COLD; uint32_t screen_update_firebeat_0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_firebeat_1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(firebeat_interrupt); @@ -281,7 +281,7 @@ public: -VIDEO_START_MEMBER(firebeat_state,firebeat) +void firebeat_state::video_start_firebeat() { } @@ -924,7 +924,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(firebeat_state::spu_timer_callback) /*****************************************************************************/ -MACHINE_START_MEMBER(firebeat_state,firebeat) +void firebeat_state::machine_start_firebeat() { /* set conservative DRC options */ m_maincpu->ppcdrc_set_options(PPCDRC_COMPATIBLE_OPTIONS); @@ -1150,7 +1150,7 @@ WRITE_LINE_MEMBER(firebeat_state::gcu1_interrupt) m_maincpu->set_input_line(INPUT_LINE_IRQ0, state); } -MACHINE_RESET_MEMBER(firebeat_state,firebeat) +void firebeat_state::machine_reset_firebeat() { m_layer = 0; } @@ -1179,8 +1179,8 @@ MACHINE_CONFIG_START(firebeat_state::firebeat) MCFG_DEVICE_PROGRAM_MAP(firebeat_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", firebeat_state, firebeat_interrupt) - MCFG_MACHINE_START_OVERRIDE(firebeat_state,firebeat) - MCFG_MACHINE_RESET_OVERRIDE(firebeat_state,firebeat) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_firebeat, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_firebeat, this)); MCFG_DEVICE_ADD("rtc", RTC65271, 0) @@ -1208,7 +1208,7 @@ MACHINE_CONFIG_START(firebeat_state::firebeat) MCFG_SCREEN_UPDATE_DRIVER(firebeat_state, screen_update_firebeat_0) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(firebeat_state,firebeat) + set_video_start_cb(config, driver_callback_delegate(&video_start_firebeat, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1237,8 +1237,8 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2) MCFG_DEVICE_PROGRAM_MAP(firebeat2_map) MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", firebeat_state, firebeat_interrupt) - MCFG_MACHINE_START_OVERRIDE(firebeat_state,firebeat) - MCFG_MACHINE_RESET_OVERRIDE(firebeat_state,firebeat) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_firebeat, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_firebeat, this)); MCFG_DEVICE_ADD("rtc", RTC65271, 0) @@ -1277,7 +1277,7 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2) MCFG_SCREEN_UPDATE_DRIVER(firebeat_state, screen_update_firebeat_1) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(firebeat_state,firebeat) + set_video_start_cb(config, driver_callback_delegate(&video_start_firebeat, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp index e36460d565c..b7be676e561 100644 --- a/src/mame/drivers/firetrk.cpp +++ b/src/mame/drivers/firetrk.cpp @@ -894,7 +894,7 @@ MACHINE_CONFIG_START(firetrk_state::superbug) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(firetrk_state, screen_update_superbug) - MCFG_VIDEO_START_OVERRIDE(firetrk_state,superbug) + set_video_start_cb(config, driver_callback_delegate(&video_start_superbug, this)); MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_superbug) MCFG_PALETTE_MODIFY("palette") @@ -918,8 +918,13 @@ MACHINE_CONFIG_START(firetrk_state::montecar) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(firetrk_state, screen_update_montecar) +<<<<<<< HEAD MCFG_VIDEO_START_OVERRIDE(firetrk_state,montecar) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_montecar) +======= + set_video_start_cb(config, driver_callback_delegate(&video_start_montecar, this)); + MCFG_GFXDECODE_MODIFY("gfxdecode", montecar) +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(46) diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp index d071134e2dd..4bb78409b21 100644 --- a/src/mame/drivers/flstory.cpp +++ b/src/mame/drivers/flstory.cpp @@ -713,9 +713,9 @@ void flstory_state::machine_start() -MACHINE_RESET_MEMBER(flstory_state,flstory) +void flstory_state::machine_reset_flstory() { -// MACHINE_RESET_CALL_MEMBER(ta7630); +// machine_reset_ta7630(); /* video */ m_gfxctrl = 0; @@ -749,7 +749,7 @@ MACHINE_CONFIG_START(flstory_state::flstory) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ - MCFG_MACHINE_RESET_OVERRIDE(flstory_state,flstory) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_flstory, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -766,7 +766,7 @@ MACHINE_CONFIG_START(flstory_state::flstory) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(flstory_state,flstory) + set_video_start_cb(config, driver_callback_delegate(&video_start_flstory, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -818,7 +818,7 @@ MACHINE_CONFIG_START(flstory_state::onna34ro) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ - MCFG_MACHINE_RESET_OVERRIDE(flstory_state,flstory) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_flstory, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -835,7 +835,7 @@ MACHINE_CONFIG_START(flstory_state::onna34ro) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(flstory_state,flstory) + set_video_start_cb(config, driver_callback_delegate(&video_start_flstory, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -898,7 +898,7 @@ MACHINE_CONFIG_START(flstory_state::victnine) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ - MCFG_MACHINE_RESET_OVERRIDE(flstory_state,flstory) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_flstory, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -915,7 +915,7 @@ MACHINE_CONFIG_START(flstory_state::victnine) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(flstory_state,victnine) + set_video_start_cb(config, driver_callback_delegate(&video_start_victnine, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -971,7 +971,7 @@ MACHINE_CONFIG_START(flstory_state::rumba) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ - MCFG_MACHINE_RESET_OVERRIDE(flstory_state,flstory) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_flstory, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -988,7 +988,7 @@ MACHINE_CONFIG_START(flstory_state::rumba) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(flstory_state,rumba) + set_video_start_cb(config, driver_callback_delegate(&video_start_rumba, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index d0690be9bb7..362d3820e35 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -1915,7 +1915,7 @@ void fm7_state::init_fm7() m_fm77av_vsync_timer = timer_alloc(TIMER_FM77AV_VSYNC); } -MACHINE_START_MEMBER(fm7_state,fm7) +void fm7_state::machine_start_fm7() { // The FM-7 has no initialisation ROM, and no other obvious // way to set the reset vector, so for now this will have to do. @@ -1930,7 +1930,7 @@ MACHINE_START_MEMBER(fm7_state,fm7) m_beeper->set_state(0); } -MACHINE_START_MEMBER(fm7_state,fm77av) +void fm7_state::machine_start_fm77av() { uint8_t* RAM = memregion("maincpu")->base(); uint8_t* ROM = memregion("init")->base(); @@ -1950,7 +1950,7 @@ MACHINE_START_MEMBER(fm7_state,fm77av) m_beeper->set_state(0); } -MACHINE_START_MEMBER(fm7_state,fm11) +void fm7_state::machine_start_fm11() { uint8_t* RAM = memregion("maincpu")->base(); uint8_t* ROM = memregion("init")->base(); @@ -1962,7 +1962,7 @@ MACHINE_START_MEMBER(fm7_state,fm11) memcpy(RAM+0x3fff0,ROM+0x0ff0,16); } -MACHINE_START_MEMBER(fm7_state,fm16) +void fm7_state::machine_start_fm16() { m_type = SYS_FM16; m_beeper->set_state(0); @@ -2084,7 +2084,7 @@ MACHINE_CONFIG_START(fm7_state::fm7) BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_MACHINE_START_OVERRIDE(fm7_state,fm7) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fm7, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2135,7 +2135,7 @@ MACHINE_CONFIG_START(fm7_state::fm8) BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_MACHINE_START_OVERRIDE(fm7_state,fm7) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fm7, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2186,7 +2186,7 @@ MACHINE_CONFIG_START(fm7_state::fm77av) BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_MACHINE_START_OVERRIDE(fm7_state,fm77av) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fm77av, this)); MCFG_ADDRESS_BANK("av_bank1") MCFG_ADDRESS_BANK("av_bank2") @@ -2259,7 +2259,7 @@ MACHINE_CONFIG_START(fm7_state::fm11) BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_MACHINE_START_OVERRIDE(fm7_state,fm11) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fm11, this)); MCFG_ADDRESS_BANK("av_bank1") MCFG_ADDRESS_BANK("av_bank2") @@ -2322,7 +2322,7 @@ MACHINE_CONFIG_START(fm7_state::fm16beta) BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_MACHINE_START_OVERRIDE(fm7_state,fm16) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fm16, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index b02b1919ed6..c2e679a8f4d 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -2767,7 +2767,7 @@ MACHINE_CONFIG_START(towns_state::towns_base) MCFG_DEVICE_IO_MAP(towns_io) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb) - //MCFG_MACHINE_RESET_OVERRIDE(towns_state,towns) + //set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_towns, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2865,7 +2865,7 @@ MACHINE_CONFIG_START(towns_state::towns_base) MCFG_UPD71071_DMA_WRITE_0_CB(WRITE16(*this, towns_state, towns_fdc_dma_w)) MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(*this, towns_state, towns_scsi_dma_w)) - //MCFG_VIDEO_START_OVERRIDE(towns_state,towns) + //set_video_start_cb(config, driver_callback_delegate(&video_start_towns, this)); MCFG_DEVICE_ADD("i8251", I8251, 0) MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, towns_state, towns_rxrdy_irq)) diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp index 1362efb700c..662aebbc418 100644 --- a/src/mame/drivers/fp1100.cpp +++ b/src/mame/drivers/fp1100.cpp @@ -87,7 +87,7 @@ public: DECLARE_WRITE_LINE_MEMBER(cass_w); INTERRUPT_GEN_MEMBER(vblank_irq); void init_fp1100(); - DECLARE_MACHINE_RESET(fp1100); + void machine_reset_fp1100(); MC6845_UPDATE_ROW(crtc_update_row); TIMER_DEVICE_CALLBACK_MEMBER(timer_c); required_device<palette_device> m_palette; @@ -593,7 +593,7 @@ INTERRUPT_GEN_MEMBER( fp1100_state::vblank_irq ) // m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xf8); } -MACHINE_RESET_MEMBER( fp1100_state, fp1100 ) +void fp1100_state::machine_reset_fp1100() { int i; uint8_t slot_type; @@ -648,7 +648,7 @@ MACHINE_CONFIG_START(fp1100_state::fp1100) MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, fp1100_state, portc_w)) MCFG_UPD7810_TXD(WRITELINE(*this, fp1100_state, cass_w)) - MCFG_MACHINE_RESET_OVERRIDE(fp1100_state, fp1100) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fp1100, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index 506aeef3242..4f360b45ce6 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -688,7 +688,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(freekick_state,freekick) +void freekick_state::machine_start_freekick() { save_item(NAME(m_romaddr)); save_item(NAME(m_spinner)); @@ -696,7 +696,7 @@ MACHINE_START_MEMBER(freekick_state,freekick) save_item(NAME(m_ff_data)); } -MACHINE_RESET_MEMBER(freekick_state,freekick) +void freekick_state::machine_reset_freekick() { m_romaddr = 0; m_spinner = 0; @@ -706,25 +706,25 @@ MACHINE_RESET_MEMBER(freekick_state,freekick) machine().bookkeeping().coin_counter_w(1, 0); } -MACHINE_START_MEMBER(freekick_state,pbillrd) +void freekick_state::machine_start_pbillrd() { m_bank1->configure_entries(0, 2, memregion("maincpu")->base() + 0x8000, 0x4000); - MACHINE_START_CALL_MEMBER(freekick); + machine_start_freekick(); } -MACHINE_START_MEMBER(freekick_state,oigas) +void freekick_state::machine_start_oigas() { save_item(NAME(m_inval)); save_item(NAME(m_outval)); save_item(NAME(m_cnt)); - MACHINE_START_CALL_MEMBER(freekick); + machine_start_freekick(); } -MACHINE_RESET_MEMBER(freekick_state,oigas) +void freekick_state::machine_reset_oigas() { - MACHINE_RESET_CALL_MEMBER(freekick); + machine_reset_freekick(); m_inval = 0; m_outval = 0; @@ -816,8 +816,8 @@ MACHINE_CONFIG_START(freekick_state::pbillrd) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_y_w)) /* flip Y/X could be the other way round... */ - MCFG_MACHINE_START_OVERRIDE(freekick_state,pbillrd) - MCFG_MACHINE_RESET_OVERRIDE(freekick_state,freekick) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pbillrd, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_freekick, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(freekick_state::pbillrdm) @@ -840,8 +840,8 @@ MACHINE_CONFIG_START(freekick_state::freekick) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_w)) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, freekick_state, spinner_select_w)) - MCFG_MACHINE_START_OVERRIDE(freekick_state,freekick) - MCFG_MACHINE_RESET_OVERRIDE(freekick_state,freekick) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_freekick, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_freekick, this)); MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, freekick_state, snd_rom_addr_l_w)) @@ -871,8 +871,8 @@ MACHINE_CONFIG_START(freekick_state::gigas) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_w)) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // ??? - MCFG_MACHINE_START_OVERRIDE(freekick_state,freekick) - MCFG_MACHINE_RESET_OVERRIDE(freekick_state,freekick) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_freekick, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_freekick, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -893,8 +893,8 @@ MACHINE_CONFIG_START(freekick_state::gigasm) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_w)) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // ??? - MCFG_MACHINE_START_OVERRIDE(freekick_state,freekick) - MCFG_MACHINE_RESET_OVERRIDE(freekick_state,freekick) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_freekick, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_freekick, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -908,8 +908,8 @@ MACHINE_CONFIG_START(freekick_state::oigas) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(oigas_io_map) - MCFG_MACHINE_START_OVERRIDE(freekick_state,oigas) - MCFG_MACHINE_RESET_OVERRIDE(freekick_state,oigas) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_oigas, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_oigas, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp index dbc11f96a48..09f5beeb64d 100644 --- a/src/mame/drivers/fromanc2.cpp +++ b/src/mame/drivers/fromanc2.cpp @@ -467,7 +467,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(fromanc2_state,fromanc4) +void fromanc2_state::machine_start_fromanc4() { save_item(NAME(m_portselect)); save_item(NAME(m_sndcpu_nmi_flag)); @@ -478,7 +478,7 @@ MACHINE_START_MEMBER(fromanc2_state,fromanc4) /* video-related elements are saved in video_start */ } -MACHINE_START_MEMBER(fromanc2_state,fromanc2) +void fromanc2_state::machine_start_fromanc2() { m_bankedram = std::make_unique<uint8_t[]>(0x4000 * 3); @@ -486,7 +486,7 @@ MACHINE_START_MEMBER(fromanc2_state,fromanc2) membank("bank2")->configure_entry(0, memregion("sub")->base() + 0x08000); membank("bank2")->configure_entries(1, 3, m_bankedram.get(), 0x4000); - MACHINE_START_CALL_MEMBER(fromanc4); + machine_start_fromanc4(); save_item(NAME(m_subcpu_int_flag)); save_item(NAME(m_subcpu_nmi_flag)); @@ -516,7 +516,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc2) MCFG_DEVICE_PROGRAM_MAP(fromanc2_sub_map) MCFG_DEVICE_IO_MAP(fromanc2_sub_io_map) - MCFG_MACHINE_START_OVERRIDE(fromanc2_state,fromanc2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fromanc2, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -546,7 +546,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc2) MCFG_SCREEN_UPDATE_DRIVER(fromanc2_state, screen_update_right) MCFG_SCREEN_PALETTE("rpalette") - MCFG_VIDEO_START_OVERRIDE(fromanc2_state,fromanc2) + set_video_start_cb(config, driver_callback_delegate(&video_start_fromanc2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -576,7 +576,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromancr) MCFG_DEVICE_PROGRAM_MAP(fromanc2_sub_map) MCFG_DEVICE_IO_MAP(fromanc2_sub_io_map) - MCFG_MACHINE_START_OVERRIDE(fromanc2_state,fromanc2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fromanc2, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -606,7 +606,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromancr) MCFG_SCREEN_UPDATE_DRIVER(fromanc2_state, screen_update_right) MCFG_SCREEN_PALETTE("rpalette") - MCFG_VIDEO_START_OVERRIDE(fromanc2_state,fromancr) + set_video_start_cb(config, driver_callback_delegate(&video_start_fromancr, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -632,7 +632,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc4) MCFG_DEVICE_PROGRAM_MAP(fromanc2_sound_map) MCFG_DEVICE_IO_MAP(fromanc2_sound_io_map) - MCFG_MACHINE_START_OVERRIDE(fromanc2_state,fromanc4) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fromanc4, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -667,7 +667,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc4) MCFG_SCREEN_UPDATE_DRIVER(fromanc2_state, screen_update_right) MCFG_SCREEN_PALETTE("rpalette") - MCFG_VIDEO_START_OVERRIDE(fromanc2_state,fromanc4) + set_video_start_cb(config, driver_callback_delegate(&video_start_fromanc4, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp index 5303b683ad3..0f3c6f83805 100644 --- a/src/mame/drivers/fromance.cpp +++ b/src/mame/drivers/fromance.cpp @@ -864,7 +864,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(fromance_state,fromance) +void fromance_state::machine_start_fromance() { uint8_t *ROM = memregion("sub")->base(); @@ -879,7 +879,7 @@ MACHINE_START_MEMBER(fromance_state,fromance) /* video-related elements are saved in video_start */ } -MACHINE_RESET_MEMBER(fromance_state,fromance) +void fromance_state::machine_reset_fromance() { m_portselect = 0; @@ -914,8 +914,8 @@ MACHINE_CONFIG_START(fromance_state::nekkyoku) MCFG_GENERIC_LATCH_8_ADD("sublatch") MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) - MCFG_MACHINE_START_OVERRIDE(fromance_state,fromance) - MCFG_MACHINE_RESET_OVERRIDE(fromance_state,fromance) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fromance, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fromance, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -931,7 +931,7 @@ MACHINE_CONFIG_START(fromance_state::nekkyoku) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 14318180 / 2) // clock not verified MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w)) - MCFG_VIDEO_START_OVERRIDE(fromance_state,nekkyoku) + set_video_start_cb(config, driver_callback_delegate(&video_start_nekkyoku, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -960,8 +960,8 @@ MACHINE_CONFIG_START(fromance_state::idolmj) MCFG_GENERIC_LATCH_8_ADD("sublatch") MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) - MCFG_MACHINE_START_OVERRIDE(fromance_state,fromance) - MCFG_MACHINE_RESET_OVERRIDE(fromance_state,fromance) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fromance, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fromance, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -977,7 +977,7 @@ MACHINE_CONFIG_START(fromance_state::idolmj) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w)) - MCFG_VIDEO_START_OVERRIDE(fromance_state,fromance) + set_video_start_cb(config, driver_callback_delegate(&video_start_fromance, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1006,8 +1006,8 @@ MACHINE_CONFIG_START(fromance_state::fromance) MCFG_GENERIC_LATCH_8_ADD("sublatch") MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) - MCFG_MACHINE_START_OVERRIDE(fromance_state,fromance) - MCFG_MACHINE_RESET_OVERRIDE(fromance_state,fromance) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fromance, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fromance, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1023,7 +1023,7 @@ MACHINE_CONFIG_START(fromance_state::fromance) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w)) - MCFG_VIDEO_START_OVERRIDE(fromance_state,fromance) + set_video_start_cb(config, driver_callback_delegate(&video_start_fromance, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index 438764a7fd1..94ccdfd9b52 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -3046,13 +3046,13 @@ READ8_MEMBER(funworld_state::funquiz_ay8910_b_r) * Machine Start & Reset * ********************************/ -MACHINE_START_MEMBER(funworld_state, lunapark) +void funworld_state::machine_start_lunapark() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 2, &ROM[0], 0x8000); } -MACHINE_RESET_MEMBER(funworld_state, lunapark) +void funworld_state::machine_reset_lunapark() { uint8_t seldsw = (ioport("SELDSW")->read() ); popmessage("ROM Bank: %02X", seldsw); @@ -3094,7 +3094,7 @@ MACHINE_CONFIG_START(funworld_state::fw1stpal) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(funworld_state, funworld) - MCFG_VIDEO_START_OVERRIDE(funworld_state, funworld) + set_video_start_cb(config, driver_callback_delegate(&video_start_funworld, this)); MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK) /* 2MHz, veryfied on jollycrd & royalcrd */ MCFG_MC6845_SHOW_BORDER_AREA(false) @@ -3138,7 +3138,7 @@ MACHINE_CONFIG_START(funworld_state::magicrd2) fw1stpal(config); MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_DEVICE_PROGRAM_MAP(magicrd2_map) - MCFG_VIDEO_START_OVERRIDE(funworld_state, magicrd2) + set_video_start_cb(config, driver_callback_delegate(&video_start_magicrd2, this)); MCFG_DEVICE_REMOVE("crtc") MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK) @@ -3193,8 +3193,8 @@ MACHINE_CONFIG_START(funworld_state::lunapark) fw1stpal(config); MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_DEVICE_PROGRAM_MAP(lunapark_map) // mirrored video RAM (4000/5000 to 6000/7000). - MCFG_MACHINE_START_OVERRIDE(funworld_state, lunapark) - MCFG_MACHINE_RESET_OVERRIDE(funworld_state, lunapark) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_lunapark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lunapark, this)); MACHINE_CONFIG_END @@ -3202,14 +3202,14 @@ MACHINE_CONFIG_START(funworld_state::chinatow) fw2ndpal(config); MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_DEVICE_PROGRAM_MAP(chinatow_map) - MCFG_VIDEO_START_OVERRIDE(funworld_state, chinatow) + set_video_start_cb(config, driver_callback_delegate(&video_start_chinatow, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(funworld_state::rcdino4) fw1stpal(config); MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_DEVICE_PROGRAM_MAP(chinatow_map) - MCFG_VIDEO_START_OVERRIDE(funworld_state, chinatow) + set_video_start_cb(config, driver_callback_delegate(&video_start_chinatow, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp index 431de80378e..fc4b887a7ef 100644 --- a/src/mame/drivers/gaelco.cpp +++ b/src/mame/drivers/gaelco.cpp @@ -655,7 +655,7 @@ MACHINE_CONFIG_START(gaelco_state::bigkarnk) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(gaelco_state,bigkarnk) + set_video_start_cb(config, driver_callback_delegate(&video_start_bigkarnk, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -690,7 +690,7 @@ MACHINE_CONFIG_START(gaelco_state::maniacsq) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(gaelco_state,maniacsq) + set_video_start_cb(config, driver_callback_delegate(&video_start_maniacsq, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -729,7 +729,7 @@ MACHINE_CONFIG_START(gaelco_state::squash) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(gaelco_state,maniacsq) + set_video_start_cb(config, driver_callback_delegate(&video_start_maniacsq, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -768,7 +768,7 @@ MACHINE_CONFIG_START(gaelco_state::thoop) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(gaelco_state,maniacsq) + set_video_start_cb(config, driver_callback_delegate(&video_start_maniacsq, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index 9c00406019f..25653e9bcc6 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -198,7 +198,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsq) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0080000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ - MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaelco2, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -629,7 +629,7 @@ MACHINE_CONFIG_START(gaelco2_state::play2000) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0200000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ - MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaelco2, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -734,7 +734,7 @@ MACHINE_CONFIG_START(bang_state::bang) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0200000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ - MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaelco2, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -972,7 +972,7 @@ MACHINE_CONFIG_START(gaelco2_state::alighunt) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0400000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ - MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaelco2, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1285,7 +1285,7 @@ MACHINE_CONFIG_START(gaelco2_state::touchgo) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2_dual) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaelco2_dual, this)); /* sound hardware */ /* the chip is stereo, but the game sound is mono because the right channel @@ -1584,7 +1584,7 @@ MACHINE_CONFIG_START(gaelco2_state::snowboar) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0400000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ - MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaelco2, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1627,7 +1627,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsqs) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0080000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ - MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaelco2, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1882,7 +1882,7 @@ MACHINE_CONFIG_START(wrally2_state::wrally2) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2_dual) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaelco2_dual, this)); /* sound hardware */ /* the chip is stereo, but the game sound is mono because the right channel diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp index b8bb7535756..c8a0f243453 100644 --- a/src/mame/drivers/gaelco3d.cpp +++ b/src/mame/drivers/gaelco3d.cpp @@ -190,16 +190,13 @@ void gaelco3d_state::machine_start() } -MACHINE_RESET_MEMBER(gaelco3d_state,common) +void gaelco3d_state::machine_reset_common() { - uint16_t *src; - int i; - m_framenum = 0; /* boot the ADSP chip */ - src = (uint16_t *)memregion("user1")->base(); - for (i = 0; i < (src[3] & 0xff) * 8; i++) + uint16_t *src = (uint16_t *)memregion("user1")->base(); + for (int i = 0; i < (src[3] & 0xff) * 8; i++) { uint32_t opcode = ((src[i*4+0] & 0xff) << 16) | ((src[i*4+1] & 0xff) << 8) | (src[i*4+2] & 0xff); m_adsp_ram_base[i] = opcode; @@ -214,7 +211,7 @@ MACHINE_RESET_MEMBER(gaelco3d_state,common) /* keep the TMS32031 halted until the code is ready to go */ m_tms->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - for (i = 0; i < SOUND_CHANNELS; i++) + for (int i = 0; i < SOUND_CHANNELS; i++) { char buffer[10]; sprintf(buffer, "dac%d", i + 1); @@ -225,15 +222,15 @@ MACHINE_RESET_MEMBER(gaelco3d_state,common) void gaelco3d_state::machine_reset() { - MACHINE_RESET_CALL_MEMBER( common ); + machine_reset_common(); m_tms_offset_xor = 0; m_soundlatch->acknowledge_w(machine().dummy_space(), 0, 0); } -MACHINE_RESET_MEMBER(gaelco3d_state,gaelco3d2) +void gaelco3d_state::machine_reset_gaelco3d2() { - MACHINE_RESET_CALL_MEMBER( common ); + machine_reset_common(); m_tms_offset_xor = BYTE_XOR_BE(0); m_fp_clock = 27; m_fp_state = 0; @@ -1012,7 +1009,7 @@ MACHINE_CONFIG_START(gaelco3d_state::gaelco3d2) MCFG_DEVICE_MODIFY("tms") MCFG_DEVICE_CLOCK(50000000) - MCFG_MACHINE_RESET_OVERRIDE(gaelco3d_state,gaelco3d2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gaelco3d2, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(gaelco3d_state::footbpow) diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp index 29a077de85c..a34618d67cb 100644 --- a/src/mame/drivers/gaiden.cpp +++ b/src/mame/drivers/gaiden.cpp @@ -305,7 +305,7 @@ void gaiden_state::machine_reset() m_spr_offset_y = 0; } -MACHINE_RESET_MEMBER(gaiden_state,raiga) +void gaiden_state::machine_reset_raiga() { gaiden_state::machine_reset(); m_jumppoints = raiga_jumppoints_00; @@ -793,7 +793,7 @@ MACHINE_CONFIG_START(gaiden_state::shadoww) MCFG_TECMO_MIXER_REVSPRITETILE MCFG_TECMO_MIXER_BGPEN(0x000 + 0x200) - MCFG_VIDEO_START_OVERRIDE(gaiden_state,gaiden) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaiden, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -829,9 +829,9 @@ MACHINE_CONFIG_START(gaiden_state::raiga) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(raiga_map) - MCFG_MACHINE_RESET_OVERRIDE(gaiden_state,raiga) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_raiga, this)); - MCFG_VIDEO_START_OVERRIDE(gaiden_state,raiga) + set_video_start_cb(config, driver_callback_delegate(&video_start_raiga, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(gaiden_state::drgnbowl) @@ -860,7 +860,7 @@ MACHINE_CONFIG_START(gaiden_state::drgnbowl) /* NOT using Tecmo Sprite device - significant changes, maybe a clone of something else */ - MCFG_VIDEO_START_OVERRIDE(gaiden_state,drgnbowl) + set_video_start_cb(config, driver_callback_delegate(&video_start_drgnbowl, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -952,7 +952,7 @@ WRITE8_MEMBER(gaiden_state::adpcm_bankswitch_w) m_adpcm_bank->set_entry(data & 7); } -MACHINE_START_MEMBER(gaiden_state,mastninj) +void gaiden_state::machine_start_mastninj() { gaiden_state::machine_start(); @@ -999,7 +999,7 @@ MACHINE_CONFIG_START(gaiden_state::mastninj) MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* ?? MHz */ MCFG_DEVICE_PROGRAM_MAP(mastninj_sound_map) - MCFG_MACHINE_START_OVERRIDE(gaiden_state,mastninj) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mastninj, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -1018,7 +1018,7 @@ MACHINE_CONFIG_START(gaiden_state::mastninj) /* NOT using Tecmo Sprite device - significant changes, maybe a clone of something else */ - MCFG_VIDEO_START_OVERRIDE(gaiden_state,drgnbowl) + set_video_start_cb(config, driver_callback_delegate(&video_start_drgnbowl, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp index 59e852f0029..3e255abfb5b 100644 --- a/src/mame/drivers/gal3.cpp +++ b/src/mame/drivers/gal3.cpp @@ -163,7 +163,7 @@ public: DECLARE_WRITE32_MEMBER(namcos21_video_enable_w); DECLARE_READ32_MEMBER(rso_r); DECLARE_WRITE32_MEMBER(rso_w); - DECLARE_VIDEO_START(gal3); + void video_start_gal3() ATTR_COLD; uint32_t screen_update_gal3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void update_palette( ); void gal3(machine_config &config); @@ -175,7 +175,7 @@ public: }; -VIDEO_START_MEMBER(gal3_state,gal3) +void gal3_state::video_start_gal3() { m_generic_paletteram_16.allocate(0x10000); @@ -650,7 +650,7 @@ MACHINE_CONFIG_START(gal3_state::gal3) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos21) MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS) - MCFG_VIDEO_START_OVERRIDE(gal3_state,gal3) + set_video_start_cb(config, driver_callback_delegate(&video_start_gal3, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index 114e4c24642..b38a8facca2 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -810,7 +810,7 @@ TIMER_CALLBACK_MEMBER(galaga_state::cpu3_interrupt_callback) } -MACHINE_START_MEMBER(galaga_state,galaga) +void galaga_state::machine_start_galaga() { /* create the interrupt timer */ m_cpu3_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(galaga_state::cpu3_interrupt_callback),this)); @@ -819,14 +819,14 @@ MACHINE_START_MEMBER(galaga_state,galaga) save_item(NAME(m_sub2_nmi_mask)); } -MACHINE_RESET_MEMBER(galaga_state,galaga) +void galaga_state::machine_reset_galaga() { m_cpu3_interrupt_timer->adjust(m_screen->time_until_pos(64), 64); } -MACHINE_RESET_MEMBER(xevious_state,battles) +void xevious_state::machine_reset_battles() { - MACHINE_RESET_CALL_MEMBER(galaga); + machine_reset_galaga(); battles_customio_init(); } @@ -1631,8 +1631,8 @@ MACHINE_CONFIG_START(bosco_state::bosco) MCFG_WATCHDOG_VBLANK_INIT("screen", 8) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ - MCFG_MACHINE_START_OVERRIDE(bosco_state,galaga) - MCFG_MACHINE_RESET_OVERRIDE(bosco_state,galaga) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_galaga, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaga, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1646,7 +1646,7 @@ MACHINE_CONFIG_START(bosco_state::bosco) MCFG_PALETTE_ADD("palette", 64*4+64*4+4+64) MCFG_PALETTE_INDIRECT_ENTRIES(32+64) MCFG_PALETTE_INIT_OWNER(bosco_state,bosco) - MCFG_VIDEO_START_OVERRIDE(bosco_state,bosco) + set_video_start_cb(config, driver_callback_delegate(&video_start_bosco, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1706,8 +1706,8 @@ MACHINE_CONFIG_START(galaga_state::galaga) MCFG_WATCHDOG_VBLANK_INIT("screen", 8) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ - MCFG_MACHINE_START_OVERRIDE(galaga_state,galaga) - MCFG_MACHINE_RESET_OVERRIDE(galaga_state,galaga) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_galaga, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaga, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1721,7 +1721,7 @@ MACHINE_CONFIG_START(galaga_state::galaga) MCFG_PALETTE_ADD("palette", 64*4+64*4+64) MCFG_PALETTE_INDIRECT_ENTRIES(32+64) MCFG_PALETTE_INIT_OWNER(galaga_state,galaga) - MCFG_VIDEO_START_OVERRIDE(galaga_state,galaga) + set_video_start_cb(config, driver_callback_delegate(&video_start_galaga, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1812,8 +1812,8 @@ MACHINE_CONFIG_START(xevious_state::xevious) MCFG_WATCHDOG_VBLANK_INIT("screen", 8) MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* 1000 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ - MCFG_MACHINE_START_OVERRIDE(galaga_state,galaga) - MCFG_MACHINE_RESET_OVERRIDE(galaga_state,galaga) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_galaga, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaga, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1826,7 +1826,7 @@ MACHINE_CONFIG_START(xevious_state::xevious) MCFG_PALETTE_ADD("palette", 128*4+64*8+64*2) MCFG_PALETTE_INDIRECT_ENTRIES(128+1) MCFG_PALETTE_INIT_OWNER(xevious_state,xevious) - MCFG_VIDEO_START_OVERRIDE(xevious_state,xevious) + set_video_start_cb(config, driver_callback_delegate(&video_start_xevious, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1864,7 +1864,7 @@ MACHINE_CONFIG_START(xevious_state::battles) MCFG_TIMER_DRIVER_ADD("battles_nmi", xevious_state, battles_nmi_generate) - MCFG_MACHINE_RESET_OVERRIDE(xevious_state,battles) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_battles, this)); /* sound hardware */ MCFG_DEVICE_REMOVE("discrete") @@ -1929,8 +1929,8 @@ MACHINE_CONFIG_START(digdug_state::digdug) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ - MCFG_MACHINE_START_OVERRIDE(galaga_state,galaga) - MCFG_MACHINE_RESET_OVERRIDE(galaga_state,galaga) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_galaga, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaga, this)); MCFG_ATARIVGEAROM_ADD("earom") @@ -1947,7 +1947,7 @@ MACHINE_CONFIG_START(digdug_state::digdug) MCFG_PALETTE_ADD("palette", 16*2+64*4+64*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(digdug_state,digdug) - MCFG_VIDEO_START_OVERRIDE(digdug_state,digdug) + set_video_start_cb(config, driver_callback_delegate(&video_start_digdug, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp index 9ac5db7e13a..4939fde0380 100644 --- a/src/mame/drivers/galaxia.cpp +++ b/src/mame/drivers/galaxia.cpp @@ -316,7 +316,7 @@ MACHINE_CONFIG_START(galaxia_state::galaxia) MCFG_PALETTE_ADD("palette", 0x18+2) MCFG_PALETTE_INIT_OWNER(galaxia_state,galaxia) - MCFG_VIDEO_START_OVERRIDE(galaxia_state,galaxia) + set_video_start_cb(config, driver_callback_delegate(&video_start_galaxia, this)); MCFG_DEVICE_ADD("s2636_0", S2636, 0) MCFG_S2636_OFFSETS(-13, -26) @@ -360,7 +360,7 @@ MACHINE_CONFIG_START(galaxia_state::astrowar) MCFG_PALETTE_ADD("palette", 0x18+2) MCFG_PALETTE_INIT_OWNER(galaxia_state,astrowar) - MCFG_VIDEO_START_OVERRIDE(galaxia_state,astrowar) + set_video_start_cb(config, driver_callback_delegate(&video_start_astrowar, this)); MCFG_DEVICE_ADD("s2636_0", S2636, 0) MCFG_S2636_OFFSETS(-13, -8) diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp index fd2391d38f4..7668dca3fe7 100644 --- a/src/mame/drivers/galaxold.cpp +++ b/src/mame/drivers/galaxold.cpp @@ -2248,7 +2248,7 @@ MACHINE_CONFIG_START(galaxold_state::galaxold_base) MCFG_DEVICE_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */ MCFG_DEVICE_PROGRAM_MAP(galaxold_map) - MCFG_MACHINE_RESET_OVERRIDE(galaxold_state,galaxold) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaxold, this)); MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0) MCFG_7474_OUTPUT_CB(WRITELINE(*this, galaxold_state,galaxold_7474_9m_1_callback)) @@ -2270,7 +2270,7 @@ MACHINE_CONFIG_START(galaxold_state::galaxold_base) MCFG_SCREEN_UPDATE_DRIVER(galaxold_state, screen_update_galaxold) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(galaxold_state,galaxold) + set_video_start_cb(config, driver_callback_delegate(&video_start_galaxold, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2295,7 +2295,7 @@ MACHINE_CONFIG_START(galaxold_state::mooncrst) MCFG_DEVICE_PROGRAM_MAP(mooncrst_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(galaxold_state,mooncrst) + set_video_start_cb(config, driver_callback_delegate(&video_start_mooncrst, this)); /* sound hardware */ mooncrst_audio(config); @@ -2315,7 +2315,7 @@ MACHINE_CONFIG_START(galaxold_state::videotron) MCFG_DEVICE_PROGRAM_MAP(hustlerb3_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(galaxold_state,mooncrst) + set_video_start_cb(config, driver_callback_delegate(&video_start_mooncrst, this)); MACHINE_CONFIG_END @@ -2323,7 +2323,7 @@ MACHINE_CONFIG_START(galaxold_state::porter) mooncrst(config); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(galaxold_state, pisces) + set_video_start_cb(config, driver_callback_delegate(&video_start_pisces, this)); MACHINE_CONFIG_END @@ -2339,7 +2339,7 @@ MACHINE_CONFIG_START(galaxold_state::scramblb) MCFG_PALETTE_ENTRIES(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */ MCFG_PALETTE_INIT_OWNER(galaxold_state,scrambold) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,scrambold) + set_video_start_cb(config, driver_callback_delegate(&video_start_scrambold, this)); MACHINE_CONFIG_END @@ -2355,7 +2355,7 @@ MACHINE_CONFIG_START(galaxold_state::scramb2) MCFG_PALETTE_ENTRIES(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */ MCFG_PALETTE_INIT_OWNER(galaxold_state,scrambold) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,scrambold) + set_video_start_cb(config, driver_callback_delegate(&video_start_scrambold, this)); MACHINE_CONFIG_END @@ -2371,7 +2371,7 @@ MACHINE_CONFIG_START(galaxold_state::scrambler) MCFG_PALETTE_ENTRIES(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */ MCFG_PALETTE_INIT_OWNER(galaxold_state,scrambold) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,scrambold) + set_video_start_cb(config, driver_callback_delegate(&video_start_scrambold, this)); MACHINE_CONFIG_END @@ -2388,7 +2388,7 @@ MACHINE_CONFIG_START(galaxold_state::guttang) MCFG_PALETTE_INIT_OWNER(galaxold_state,galaxold) // MCFG_PALETTE_INIT_OWNER(galaxold_state,scrambold) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,mooncrst) + set_video_start_cb(config, driver_callback_delegate(&video_start_mooncrst, this)); MACHINE_CONFIG_END @@ -2402,7 +2402,7 @@ MACHINE_CONFIG_START(galaxold_state::_4in1) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_4in1) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,pisces) + set_video_start_cb(config, driver_callback_delegate(&video_start_pisces, this)); MACHINE_CONFIG_END @@ -2413,10 +2413,10 @@ MACHINE_CONFIG_START(galaxold_state::bagmanmc) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(bagmanmc_map) - MCFG_MACHINE_RESET_OVERRIDE(galaxold_state, devilfsg ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_devilfsg, this)); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(galaxold_state, bagmanmc) + set_video_start_cb(config, driver_callback_delegate(&video_start_bagmanmc, this)); MACHINE_CONFIG_END @@ -2428,7 +2428,7 @@ MACHINE_CONFIG_START(galaxold_state::dkongjrm) MCFG_DEVICE_PROGRAM_MAP(dkongjrm_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(galaxold_state,dkongjrm) + set_video_start_cb(config, driver_callback_delegate(&video_start_dkongjrm, this)); MACHINE_CONFIG_END @@ -2437,7 +2437,7 @@ MACHINE_CONFIG_START(galaxold_state::dkongjrmc) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(dkongjrmc_map) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,dkongjrmc) + set_video_start_cb(config, driver_callback_delegate(&video_start_dkongjrmc, this)); MACHINE_CONFIG_END @@ -2450,7 +2450,7 @@ MACHINE_CONFIG_START(galaxold_state::rockclim) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_rockclim) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(galaxold_state,rockclim) + set_video_start_cb(config, driver_callback_delegate(&video_start_rockclim, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(64+64+2) /* 64 colors only, but still uses bullets so we need to keep the palette big */ MCFG_PALETTE_INIT_OWNER(galaxold_state,rockclim) @@ -2469,14 +2469,14 @@ MACHINE_CONFIG_START(galaxold_state::ozon1) MCFG_DEVICE_IO_MAP(ozon1_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxold_state, nmi_line_pulse) - MCFG_MACHINE_RESET_REMOVE() + remove_machine_reset_cb(config); /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(galaxold_state,rockclim) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,ozon1) + set_video_start_cb(config, driver_callback_delegate(&video_start_ozon1, this)); MCFG_DEVICE_ADD("aysnd", AY8910, PIXEL_CLOCK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) MACHINE_CONFIG_END @@ -2505,7 +2505,7 @@ MACHINE_CONFIG_START(galaxold_state::drivfrcg) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gmgalax) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,drivfrcg) + set_video_start_cb(config, driver_callback_delegate(&video_start_drivfrcg, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2523,7 +2523,7 @@ MACHINE_CONFIG_START(galaxold_state::bongo) MCFG_DEVICE_IO_MAP(bongo_io) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(galaxold_state,bongo) + set_video_start_cb(config, driver_callback_delegate(&video_start_bongo, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(galaxold_state, screen_update_galaxold) @@ -2548,7 +2548,7 @@ MACHINE_CONFIG_START(galaxold_state::hunchbkg) /* the nmi line seems to be inverted on the cpu plugin board */ MCFG_7474_COMP_OUTPUT_CB(INPUTLINE("maincpu", S2650_SENSE_LINE)) - MCFG_MACHINE_RESET_OVERRIDE(galaxold_state,hunchbkg) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hunchbkg, this)); galaxian_audio(config); MACHINE_CONFIG_END @@ -2591,7 +2591,7 @@ MACHINE_CONFIG_START(galaxold_state::racknrol) MCFG_SCREEN_UPDATE_DRIVER(galaxold_state, screen_update_galaxold) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(galaxold_state,racknrol) + set_video_start_cb(config, driver_callback_delegate(&video_start_racknrol, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2619,7 +2619,7 @@ MACHINE_CONFIG_START(galaxold_state::hexpoola) MCFG_SCREEN_UPDATE_DRIVER(galaxold_state, screen_update_galaxold) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(galaxold_state,racknrol) + set_video_start_cb(config, driver_callback_delegate(&video_start_racknrol, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2637,7 +2637,7 @@ MACHINE_CONFIG_START(galaxold_state::ckongg) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gmgalax) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,ckongs) + set_video_start_cb(config, driver_callback_delegate(&video_start_ckongs, this)); MACHINE_CONFIG_END @@ -2650,7 +2650,7 @@ MACHINE_CONFIG_START(galaxold_state::ckongmc) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gmgalax) - MCFG_VIDEO_START_OVERRIDE(galaxold_state,ckongs) + set_video_start_cb(config, driver_callback_delegate(&video_start_ckongs, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp index 0d5600fa09e..7945e01d5ed 100644 --- a/src/mame/drivers/galaxy.cpp +++ b/src/mame/drivers/galaxy.cpp @@ -186,7 +186,7 @@ MACHINE_CONFIG_START(galaxy_state::galaxy) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_PALETTE("palette") - MCFG_MACHINE_RESET_OVERRIDE(galaxy_state, galaxy ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaxy, this)); /* video hardware */ MCFG_SCREEN_SIZE(384, 212) @@ -228,7 +228,7 @@ MACHINE_CONFIG_START(galaxy_state::galaxyp) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_PALETTE("palette") - MCFG_MACHINE_RESET_OVERRIDE(galaxy_state, galaxyp ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaxyp, this)); /* video hardware */ MCFG_SCREEN_SIZE(384, 208) diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp index 2c44f41f01e..caceb534ab4 100644 --- a/src/mame/drivers/galivan.cpp +++ b/src/mame/drivers/galivan.cpp @@ -382,7 +382,7 @@ GFXDECODE_END -MACHINE_START_MEMBER(galivan_state,galivan) +void galivan_state::machine_start_galivan() { /* configure ROM banking */ uint8_t *rombase = memregion("maincpu")->base(); @@ -396,7 +396,7 @@ MACHINE_START_MEMBER(galivan_state,galivan) save_item(NAME(m_layers)); } -MACHINE_START_MEMBER(galivan_state,ninjemak) +void galivan_state::machine_start_ninjemak() { /* configure ROM banking */ uint8_t *rombase = memregion("maincpu")->base(); @@ -409,7 +409,7 @@ MACHINE_START_MEMBER(galivan_state,ninjemak) save_item(NAME(m_ninjemak_dispdisable)); } -MACHINE_RESET_MEMBER(galivan_state,galivan) +void galivan_state::machine_reset_galivan() { m_maincpu->reset(); @@ -420,7 +420,7 @@ MACHINE_RESET_MEMBER(galivan_state,galivan) m_galivan_scrolly[0] = m_galivan_scrolly[1] = 0; } -MACHINE_RESET_MEMBER(galivan_state,ninjemak) +void galivan_state::machine_reset_ninjemak() { m_maincpu->reset(); @@ -442,8 +442,8 @@ MACHINE_CONFIG_START(galivan_state::galivan) MCFG_DEVICE_IO_MAP(sound_io_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ? - MCFG_MACHINE_START_OVERRIDE(galivan_state,galivan) - MCFG_MACHINE_RESET_OVERRIDE(galivan_state,galivan) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_galivan, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galivan, this)); /* video hardware */ MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) @@ -462,7 +462,7 @@ MACHINE_CONFIG_START(galivan_state::galivan) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(galivan_state, galivan) - MCFG_VIDEO_START_OVERRIDE(galivan_state,galivan) + set_video_start_cb(config, driver_callback_delegate(&video_start_galivan, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -500,8 +500,8 @@ MACHINE_CONFIG_START(galivan_state::ninjemak) MCFG_DEVICE_IO_MAP(sound_io_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ? - MCFG_MACHINE_START_OVERRIDE(galivan_state,ninjemak) - MCFG_MACHINE_RESET_OVERRIDE(galivan_state,ninjemak) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ninjemak, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ninjemak, this)); MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0) @@ -522,7 +522,7 @@ MACHINE_CONFIG_START(galivan_state::ninjemak) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(galivan_state, galivan) - MCFG_VIDEO_START_OVERRIDE(galivan_state,ninjemak) + set_video_start_cb(config, driver_callback_delegate(&video_start_ninjemak, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp index 1fbaf92515f..f1104485d3a 100644 --- a/src/mame/drivers/galspnbl.cpp +++ b/src/mame/drivers/galspnbl.cpp @@ -235,7 +235,7 @@ MACHINE_CONFIG_START(galspnbl_state::galspnbl) MCFG_SCREEN_UPDATE_DRIVER(galspnbl_state, screen_update_galspnbl) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(galspnbl_state,galspnbl) + set_video_start_cb(config, driver_callback_delegate(&video_start_galspnbl, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galspnbl) diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp index 49a96999e17..a2a08563914 100644 --- a/src/mame/drivers/gameplan.cpp +++ b/src/mame/drivers/gameplan.cpp @@ -936,7 +936,7 @@ INPUT_PORTS_END * *************************************/ -MACHINE_START_MEMBER(gameplan_state,gameplan) +void gameplan_state::machine_start_gameplan() { /* register for save states */ save_item(NAME(m_current_port)); @@ -949,8 +949,7 @@ MACHINE_START_MEMBER(gameplan_state,gameplan) m_via_0->write_pb5(1); } - -MACHINE_RESET_MEMBER(gameplan_state,gameplan) +void gameplan_state::machine_reset_gameplan() { m_current_port = 0; m_video_x = 0; @@ -972,8 +971,8 @@ MACHINE_CONFIG_START(gameplan_state::gameplan) MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gameplan_state, r6532_soundlatch_w)) MCFG_RIOT6532_IRQ_CB(WRITELINE(*this, gameplan_state, r6532_irq)) - MCFG_MACHINE_START_OVERRIDE(gameplan_state,gameplan) - MCFG_MACHINE_RESET_OVERRIDE(gameplan_state,gameplan) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gameplan, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gameplan, this)); /* video hardware */ gameplan_video(config); diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp index 5c75be8fe39..14802e06e81 100644 --- a/src/mame/drivers/gb.cpp +++ b/src/mame/drivers/gb.cpp @@ -656,8 +656,8 @@ MACHINE_CONFIG_START(gb_state::supergb) MCFG_LR35902_TIMER_CB( WRITE8(*this, gb_state, gb_timer_callback ) ) MCFG_LR35902_HALT_BUG - MCFG_MACHINE_START_OVERRIDE(gb_state, sgb) - MCFG_MACHINE_RESET_OVERRIDE(gb_state, sgb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sgb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sgb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", LCD) @@ -697,8 +697,8 @@ MACHINE_CONFIG_START(gb_state::supergb2) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(sgb_map) - MCFG_MACHINE_START_OVERRIDE(gb_state, sgb) - MCFG_MACHINE_RESET_OVERRIDE(gb_state, sgb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sgb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sgb, this)); /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_horizont) /* runs on a TV, not an LCD */ @@ -734,8 +734,8 @@ MACHINE_CONFIG_START(gb_state::gbcolor) MCFG_DEVICE_PROGRAM_MAP(gbc_map) MCFG_LR35902_TIMER_CB( WRITE8(*this, gb_state, gb_timer_callback ) ) - MCFG_MACHINE_START_OVERRIDE(gb_state,gbc) - MCFG_MACHINE_RESET_OVERRIDE(gb_state,gbc) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gbc, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gbc, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", LCD) @@ -788,8 +788,8 @@ MACHINE_CONFIG_START(megaduck_state::megaduck) MCFG_SCREEN_VBLANK_TIME(0) MCFG_SCREEN_PALETTE("palette") - MCFG_MACHINE_START_OVERRIDE(megaduck_state, megaduck) - MCFG_MACHINE_RESET_OVERRIDE(megaduck_state, megaduck) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_megaduck, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megaduck, this)); MCFG_SCREEN_UPDATE_DEVICE("ppu", dmg_ppu_device, screen_update) MCFG_SCREEN_SIZE(20*8, 18*8) diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp index e1fe2860c34..71fd1109d30 100644 --- a/src/mame/drivers/gberet.cpp +++ b/src/mame/drivers/gberet.cpp @@ -394,14 +394,14 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(gberet_state,gberet) +void gberet_state::machine_start_gberet() { save_item(NAME(m_interrupt_mask)); save_item(NAME(m_interrupt_ticks)); save_item(NAME(m_spritebank)); } -MACHINE_RESET_MEMBER(gberet_state,gberet) +void gberet_state::machine_reset_gberet() { m_interrupt_mask = 0; m_interrupt_ticks = 0; @@ -416,8 +416,8 @@ MACHINE_CONFIG_START(gberet_state::gberet) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gberet_state, gberet_interrupt_tick, "screen", 0, 16) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(gberet_state,gberet) - MCFG_MACHINE_RESET_OVERRIDE(gberet_state,gberet) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gberet, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gberet, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(gberet_state::gberet) MCFG_PALETTE_ADD("palette", 2*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(gberet_state,gberet) - MCFG_VIDEO_START_OVERRIDE(gberet_state,gberet) + set_video_start_cb(config, driver_callback_delegate(&video_start_gberet, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -457,8 +457,8 @@ MACHINE_CONFIG_START(gberet_state::gberetb) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gberet_state, irq0_line_assert) MCFG_DEVICE_PERIODIC_INT_DRIVER(gberet_state, nmi_line_assert, XTAL(20'000'000)/0x8000) // divider guessed - MCFG_MACHINE_START_OVERRIDE(gberet_state,gberet) - MCFG_MACHINE_RESET_OVERRIDE(gberet_state,gberet) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gberet, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gberet, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -473,7 +473,7 @@ MACHINE_CONFIG_START(gberet_state::gberetb) MCFG_PALETTE_ADD("palette", 2*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(gberet_state,gberet) - MCFG_VIDEO_START_OVERRIDE(gberet_state,gberet) + set_video_start_cb(config, driver_callback_delegate(&video_start_gberet, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index fe1c88384ce..e3701ee923c 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -202,7 +202,7 @@ TODO: #include "speaker.h" -MACHINE_RESET_MEMBER(gladiatr_state,gladiator) +void gladiatr_state::machine_reset_gladiator() { // 6809 bank memory set membank("bank2")->set_entry(0); @@ -607,7 +607,7 @@ WRITE8_MEMBER(ppking_state::ppking_qxcomu_w) // ... } -MACHINE_RESET_MEMBER(ppking_state, ppking) +void ppking_state::machine_reset_ppking() { // yes, it expects to read DSW1 without sending commands first ... m_mcu[0].rxd = (ioport("DSW1")->read() & 0x1f) << 2;; @@ -956,7 +956,7 @@ MACHINE_CONFIG_START(ppking_state::ppking) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_RESET_OVERRIDE(ppking_state, ppking) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ppking, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 5L on main board @@ -981,7 +981,7 @@ MACHINE_CONFIG_START(ppking_state::ppking) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ppking) MCFG_PALETTE_ADD("palette", 1024) - MCFG_VIDEO_START_OVERRIDE(ppking_state, ppking) + set_video_start_cb(config, driver_callback_delegate(&video_start_ppking, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1018,7 +1018,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr) MCFG_DEVICE_ADD("audiocpu", MC6809, 12_MHz_XTAL/4) /* verified on pcb */ MCFG_DEVICE_PROGRAM_MAP(gladiatr_cpu3_map) - MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,gladiator) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gladiator, this)); MCFG_NVRAM_ADD_0FILL("nvram") // NEC uPD449 CMOS SRAM MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 5L on main board @@ -1073,7 +1073,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gladiatr) MCFG_PALETTE_ADD("palette", 1024) - MCFG_VIDEO_START_OVERRIDE(gladiatr_state,gladiatr) + set_video_start_cb(config, driver_callback_delegate(&video_start_gladiatr, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index 69abf63ccc9..2deac3006ff 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1347,10 +1347,10 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(goldnpkr); DECLARE_PALETTE_INIT(witchcrd); - DECLARE_VIDEO_START(wcrdxtnd); + void video_start_wcrdxtnd() ATTR_COLD; DECLARE_PALETTE_INIT(wcrdxtnd); - DECLARE_MACHINE_START(mondial); - DECLARE_MACHINE_RESET(mondial); + void machine_start_mondial() ATTR_COLD; + void machine_reset_mondial(); uint32_t screen_update_goldnpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void goldnpkr_base(machine_config &config); @@ -1479,7 +1479,7 @@ void goldnpkr_state::video_start() m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldnpkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } -VIDEO_START_MEMBER(goldnpkr_state,wcrdxtnd) +void goldnpkr_state::video_start_wcrdxtnd() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldnpkr_state::wcrdxtnd_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -4274,13 +4274,13 @@ DISCRETE_SOUND_END * Machine Start & Reset * ******************************************/ -MACHINE_START_MEMBER(goldnpkr_state, mondial) +void goldnpkr_state::machine_start_mondial() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 2, &ROM[0], 0x4000); } -MACHINE_RESET_MEMBER(goldnpkr_state, mondial) +void goldnpkr_state::machine_reset_mondial() { uint8_t seldsw = (ioport("SELDSW")->read() ); popmessage("ROM Bank: %02X", seldsw); @@ -4418,7 +4418,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wildcard) // MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wildcard) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(goldnpkr_state, witchcrd) -// MCFG_VIDEO_START_OVERRIDE(goldnpkr_state,wildcard) +// set_video_start_cb(config, driver_callback_delegate(&video_start_wildcard, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4442,7 +4442,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wcrdxtnd) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wcrdxtnd) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(goldnpkr_state, wcrdxtnd) - MCFG_VIDEO_START_OVERRIDE(goldnpkr_state, wcrdxtnd) + set_video_start_cb(config, driver_callback_delegate(&video_start_wcrdxtnd, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4472,7 +4472,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wildcrdb) // MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wildcard) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(goldnpkr_state, witchcrd) -// MCFG_VIDEO_START_OVERRIDE(goldnpkr_state,wildcard) +// set_video_start_cb(config, driver_callback_delegate(&video_start_wildcard, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4532,8 +4532,8 @@ MACHINE_CONFIG_START(goldnpkr_state::mondial) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(mondial_map) - MCFG_MACHINE_START_OVERRIDE(goldnpkr_state, mondial) - MCFG_MACHINE_RESET_OVERRIDE(goldnpkr_state, mondial) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mondial, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mondial, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 8b004ea6d12..811c5ac1e0b 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -8118,7 +8118,7 @@ MACHINE_CONFIG_START(goldstar_state::goldstar) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8155,7 +8155,7 @@ MACHINE_CONFIG_START(goldstar_state::goldstbl) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8203,7 +8203,7 @@ MACHINE_CONFIG_START(sanghopm_state::star100) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(sanghopm_state, sangho) + set_video_start_cb(config, driver_callback_delegate(&video_start_sangho, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8242,7 +8242,7 @@ MACHINE_CONFIG_START(goldstar_state::super9) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8351,7 +8351,7 @@ MACHINE_CONFIG_START(cb3_state::ncb3) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8425,7 +8425,7 @@ MACHINE_CONFIG_START(goldstar_state::wcherry) MCFG_PALETTE_INIT_OWNER(goldstar_state, cm) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8472,7 +8472,7 @@ MACHINE_CONFIG_START(cmaster_state::cm) MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, cherrym) + set_video_start_cb(config, driver_callback_delegate(&video_start_cherrym, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8520,7 +8520,7 @@ MACHINE_CONFIG_START(goldstar_state::cmast91) MCFG_PALETTE_INIT_OWNER(goldstar_state, cmast91) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, cherrym) + set_video_start_cb(config, driver_callback_delegate(&video_start_cherrym, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8577,7 +8577,7 @@ MACHINE_CONFIG_START(wingco_state::lucky8) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8631,7 +8631,7 @@ MACHINE_CONFIG_START(wingco_state::bingowng) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(wingco_state, bingowng) + set_video_start_cb(config, driver_callback_delegate(&video_start_bingowng, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8758,7 +8758,7 @@ MACHINE_CONFIG_START(wingco_state::magodds) MCFG_PALETTE_INIT_OWNER(wingco_state, magodds) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(wingco_state, magical) + set_video_start_cb(config, driver_callback_delegate(&video_start_magical, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8808,7 +8808,7 @@ MACHINE_CONFIG_START(goldstar_state::kkotnoli) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8849,7 +8849,7 @@ MACHINE_CONFIG_START(goldstar_state::ladylinr) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8900,7 +8900,7 @@ MACHINE_CONFIG_START(wingco_state::wcat3) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8951,7 +8951,7 @@ MACHINE_CONFIG_START(cmaster_state::amcoe1) MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, cherrym) + set_video_start_cb(config, driver_callback_delegate(&video_start_cherrym, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9008,7 +9008,7 @@ MACHINE_CONFIG_START(cmaster_state::amcoe2) MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, cherrym) + set_video_start_cb(config, driver_callback_delegate(&video_start_cherrym, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9058,7 +9058,7 @@ MACHINE_CONFIG_START(unkch_state::unkch) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(unkch_state, unkch) + set_video_start_cb(config, driver_callback_delegate(&video_start_unkch, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9096,7 +9096,7 @@ MACHINE_CONFIG_START(goldstar_state::pkrmast) MCFG_PALETTE_INIT_OWNER(goldstar_state, cm) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state, cherrym) + set_video_start_cb(config, driver_callback_delegate(&video_start_cherrym, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9133,7 +9133,7 @@ MACHINE_CONFIG_START(unkch_state::megaline) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) // MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9180,7 +9180,7 @@ MACHINE_CONFIG_START(unkch_state::bonusch) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) - MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) + set_video_start_cb(config, driver_callback_delegate(&video_start_goldstar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index 59922784dce..e6daee4e6bd 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -1865,7 +1865,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(gottlieb_state::screwloo) gottlieb2(config); - MCFG_VIDEO_START_OVERRIDE(gottlieb_state,screwloo) + set_video_start_cb(config, driver_callback_delegate(&video_start_screwloo, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(gottlieb_state::cobram3) diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp index 00230896c85..17fe5b5cf12 100644 --- a/src/mame/drivers/gridcomp.cpp +++ b/src/mame/drivers/gridcomp.cpp @@ -118,8 +118,8 @@ public: required_device<ram_device> m_ram; void init_gridcomp(); - DECLARE_MACHINE_START(gridcomp); - DECLARE_MACHINE_RESET(gridcomp); + void machine_start_gridcomp() ATTR_COLD; + void machine_reset_gridcomp(); IRQ_CALLBACK_MEMBER(irq_callback); @@ -292,7 +292,7 @@ void gridcomp_state::init_gridcomp() DBG_LOG(0, "init", ("driver_init()\n")); } -MACHINE_START_MEMBER(gridcomp_state, gridcomp) +void gridcomp_state::machine_start_gridcomp() { address_space &program = m_maincpu->space(AS_PROGRAM); @@ -304,7 +304,7 @@ MACHINE_START_MEMBER(gridcomp_state, gridcomp) m_videoram = (uint16_t *)m_maincpu->space(AS_PROGRAM).get_write_ptr(0x400); } -MACHINE_RESET_MEMBER(gridcomp_state, gridcomp) +void gridcomp_state::machine_reset_gridcomp() { DBG_LOG(0, "init", ("machine_reset()\n")); @@ -370,8 +370,8 @@ MACHINE_CONFIG_START(gridcomp_state::grid1101) MCFG_DEVICE_IO_MAP(grid1101_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(gridcomp_state, irq_callback) - MCFG_MACHINE_START_OVERRIDE(gridcomp_state, gridcomp) - MCFG_MACHINE_RESET_OVERRIDE(gridcomp_state, gridcomp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gridcomp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gridcomp, this)); MCFG_DEVICE_ADD(I80130_TAG, I80130, XTAL(15'000'000)/3) MCFG_I80130_IRQ_CALLBACK(INPUTLINE("maincpu", 0)) diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp index 73693e9a718..50ee7dcf48e 100644 --- a/src/mame/drivers/gticlub.cpp +++ b/src/mame/drivers/gticlub.cpp @@ -317,10 +317,10 @@ public: void init_hangplt(); void init_hangpltu(); void init_gticlub(); - DECLARE_MACHINE_START(gticlub); - DECLARE_MACHINE_RESET(gticlub); - DECLARE_MACHINE_RESET(hangplt); - DECLARE_VIDEO_START(gticlub); + void machine_start_gticlub() ATTR_COLD; + void machine_reset_gticlub(); + void machine_reset_hangplt(); + void video_start_gticlub() ATTR_COLD; INTERRUPT_GEN_MEMBER(gticlub_vblank); TIMER_CALLBACK_MEMBER(sound_irq); @@ -500,7 +500,7 @@ WRITE16_MEMBER(gticlub_state::soundtimer_count_w) /******************************************************************/ -MACHINE_START_MEMBER(gticlub_state,gticlub) +void gticlub_state::machine_start_gticlub() { /* set conservative DRC options */ m_maincpu->ppcdrc_set_options(PPCDRC_COMPATIBLE_OPTIONS); @@ -833,7 +833,7 @@ ADC1038_INPUT_CB(gticlub_state::adc1038_input_callback) return value; } -MACHINE_RESET_MEMBER(gticlub_state,gticlub) +void gticlub_state::machine_reset_gticlub() { m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } @@ -844,7 +844,7 @@ void gticlub_state::gticlub_led_setreg(int offset, uint8_t data) } -VIDEO_START_MEMBER(gticlub_state,gticlub) +void gticlub_state::video_start_gticlub() { m_gticlub_led_reg[0] = m_gticlub_led_reg[1] = 0x7f; /* @@ -968,8 +968,8 @@ MACHINE_CONFIG_START(gticlub_state::gticlub) MCFG_EEPROM_SERIAL_93C56_ADD("eeprom") - MCFG_MACHINE_START_OVERRIDE(gticlub_state,gticlub) - MCFG_MACHINE_RESET_OVERRIDE(gticlub_state,gticlub) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gticlub, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gticlub, this)); MCFG_DEVICE_ADD("adc1038", ADC1038, 0) MCFG_ADC1038_INPUT_CB(gticlub_state, adc1038_input_callback) @@ -987,7 +987,7 @@ MACHINE_CONFIG_START(gticlub_state::gticlub) MCFG_PALETTE_ADD("palette", 65536) - MCFG_VIDEO_START_OVERRIDE(gticlub_state,gticlub) + set_video_start_cb(config, driver_callback_delegate(&video_start_gticlub, this)); MCFG_DEVICE_ADD("k001604_1", K001604, 0) MCFG_K001604_LAYER_SIZE(1) @@ -1054,7 +1054,7 @@ MACHINE_CONFIG_START(gticlub_state::slrasslt) MACHINE_CONFIG_END -MACHINE_RESET_MEMBER(gticlub_state,hangplt) +void gticlub_state::machine_reset_hangplt() { m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); m_dsp2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -1081,8 +1081,8 @@ MACHINE_CONFIG_START(gticlub_state::hangplt) MCFG_EEPROM_SERIAL_93C56_ADD("eeprom") - MCFG_MACHINE_START_OVERRIDE(gticlub_state,gticlub) - MCFG_MACHINE_RESET_OVERRIDE(gticlub_state,hangplt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gticlub, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hangplt, this)); MCFG_DEVICE_ADD("adc1038", ADC1038, 0) MCFG_ADC1038_INPUT_CB(gticlub_state, adc1038_input_callback) diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp index 1d92b4396a1..520d5b35120 100644 --- a/src/mame/drivers/hec2hrp.cpp +++ b/src/mame/drivers/hec2hrp.cpp @@ -303,21 +303,18 @@ static INPUT_PORTS_START( hec2hrp ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED) INPUT_PORTS_END -/*****************************************************************************/ -MACHINE_START_MEMBER(hec2hrp_state,hec2hrp) -/*****************************************************************************/ +void hec2hrp_state::machine_start_hec2hrp() { hector_init(); } -MACHINE_RESET_MEMBER(hec2hrp_state,hec2hrp) +void hec2hrp_state::machine_reset_hec2hrp() { // Machines init hector_reset(1, 0); } -/*****************************************************************************/ -MACHINE_START_MEMBER(hec2hrp_state,hec2hrx) -/*****************************************************************************/ + +void hec2hrp_state::machine_start_hec2hrx() { uint8_t *RAM = memregion("maincpu" )->base(); // pointer to mess ram //Patch rom possible ! @@ -348,9 +345,8 @@ MACHINE_START_MEMBER(hec2hrp_state,hec2hrx) hector_init(); } -/*****************************************************************************/ -MACHINE_START_MEMBER(hec2hrp_state,hec2mdhrx) -/*****************************************************************************/ + +void hec2hrp_state::machine_start_hec2mdhrx() //minidisc { uint8_t *RAM = memregion("maincpu" )->base(); // pointer to mess ram @@ -373,7 +369,8 @@ MACHINE_START_MEMBER(hec2hrp_state,hec2mdhrx) hector_init(); } -MACHINE_RESET_MEMBER(hec2hrp_state,hec2hrx) + +void hec2hrp_state::machine_reset_hec2hrx() { //Hector Memory membank("bank1")->set_entry(HECTOR_BANK_PROG); @@ -385,8 +382,9 @@ MACHINE_RESET_MEMBER(hec2hrp_state,hec2hrx) hector_reset(1, 1); hector_disc2_reset(); } + //minidisc -MACHINE_RESET_MEMBER(hec2hrp_state,hec2mdhrx) +void hec2hrp_state::machine_reset_hec2mdhrx() { //Hector Memory membank("bank1")->set_entry(HECTOR_BANK_PROG); @@ -418,8 +416,8 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2hr) MCFG_DEVICE_PROGRAM_MAP(hec2hrp_mem) MCFG_DEVICE_IO_MAP(hec2hrp_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/ - MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrp) - MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hec2hrp, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hec2hrp, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -431,7 +429,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2hr) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16) - MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); hector_audio(config); @@ -453,8 +451,8 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2hrp) MCFG_DEVICE_PROGRAM_MAP(hec2hrp_mem) MCFG_DEVICE_IO_MAP(hec2hrp_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/ - MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrp) - MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hec2hrp, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hec2hrp, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -466,7 +464,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2hrp) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16) - MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); hector_audio(config); @@ -503,8 +501,8 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mx40) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, hec2hrp_state, disc2_fdc_dma_irq)) MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", floppy_image_device::default_floppy_formats) - MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx) - MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hec2hrx, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hec2hrx, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -516,7 +514,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mx40) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16) - MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); hector_audio(config); @@ -537,8 +535,8 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2hrx) MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem) MCFG_DEVICE_IO_MAP(hec2hrx_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz - MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx) - MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hec2hrx, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hec2hrx, this)); /* Disc II unit */ MCFG_DEVICE_ADD("disc2cpu",Z80, XTAL(4'000'000)) @@ -560,7 +558,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2hrx) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16) - MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); hector_audio(config); @@ -582,8 +580,8 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mdhrx) MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem) MCFG_DEVICE_IO_MAP(hec2mdhrx_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz - MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2mdhrx) - MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2mdhrx) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hec2mdhrx, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hec2mdhrx, this)); /* Mini Disc */ MCFG_FD1793_ADD("wd179x", XTAL(1'000'000)) @@ -599,9 +597,9 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mdhrx) MCFG_SCREEN_UPDATE_DRIVER(hec2hrp_state, screen_update_hec2hrp) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); MCFG_PALETTE_ADD("palette", 16) - MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); // TODO: Perhaps this should be video_reset? hector_audio(config); @@ -623,8 +621,8 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mx80) MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem) MCFG_DEVICE_IO_MAP(hec2mx80_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz - MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx) - MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hec2hrx, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hec2hrx, this)); /* Disc II unit */ MCFG_DEVICE_ADD("disc2cpu",Z80, XTAL(4'000'000)) @@ -646,7 +644,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mx80) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16) - MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); hector_audio(config); diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index 16c27e48d06..5940ab4770f 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/src/mame/drivers/hikaru.cpp @@ -509,8 +509,8 @@ MACHINE_CONFIG_START(hikaru_state::hikaru) MCFG_CPU_FORCE_NO_DRC() -// MCFG_MACHINE_START_OVERRIDE(hikaru_state, hikaru ) -// MCFG_MACHINE_RESET_OVERRIDE(hikaru_state, hikaru ) +// set_machine_start_cb(config, driver_callback_delegate(&machine_start_hikaru, this)); +// set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hikaru, this)); // MCFG_NVRAM_HANDLER(hikaru_eeproms) diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp index 7acef4835e5..b16be8ff95b 100644 --- a/src/mame/drivers/hitme.cpp +++ b/src/mame/drivers/hitme.cpp @@ -63,7 +63,7 @@ void hitme_state::video_start() } -VIDEO_START_MEMBER(hitme_state,barricad) +void hitme_state::video_start_barricad() { m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(hitme_state::get_hitme_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 24); } @@ -360,7 +360,7 @@ MACHINE_CONFIG_START(hitme_state::barricad) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_barricad) - MCFG_VIDEO_START_OVERRIDE(hitme_state,barricad) + set_video_start_cb(config, driver_callback_delegate(&video_start_barricad, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp index 0a0df6d5b72..f56a6765961 100644 --- a/src/mame/drivers/hnayayoi.cpp +++ b/src/mame/drivers/hnayayoi.cpp @@ -617,7 +617,7 @@ MACHINE_CONFIG_START(hnayayoi_state::untoucha) MCFG_DEVICE_MODIFY("crtc") MCFG_MC6845_UPDATE_ROW_CB(hnayayoi_state, untoucha_update_row) - MCFG_VIDEO_START_OVERRIDE(hnayayoi_state,untoucha) + set_video_start_cb(config, driver_callback_delegate(&video_start_untoucha, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp index f15efd7987e..747ddfa9c60 100644 --- a/src/mame/drivers/holeland.cpp +++ b/src/mame/drivers/holeland.cpp @@ -301,7 +301,7 @@ MACHINE_CONFIG_START(holeland_state::holeland) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_holeland) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(holeland_state,holeland) + set_video_start_cb(config, driver_callback_delegate(&video_start_holeland, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(holeland_state::crzrally) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crzrally) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(holeland_state,crzrally) + set_video_start_cb(config, driver_callback_delegate(&video_start_crzrally, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index efc1c99a5c2..0fdb0651caf 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -1125,7 +1125,7 @@ static GFXDECODE_START( gfx_lemnangl ) GFXDECODE_END -MACHINE_START_MEMBER(homedata_state,homedata) +void homedata_state::machine_start_homedata() { save_item(NAME(m_visible_page)); save_item(NAME(m_flipscreen)); @@ -1138,14 +1138,14 @@ MACHINE_START_MEMBER(homedata_state,homedata) save_item(NAME(m_snd_command)); } -MACHINE_START_MEMBER(homedata_state,reikaids) +void homedata_state::machine_start_reikaids() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 8, &ROM[0xc000], 0x4000); membank("bank2")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x10000); - MACHINE_START_CALL_MEMBER(homedata); + machine_start_homedata(); save_item(NAME(m_upd7807_porta)); save_item(NAME(m_upd7807_portc)); @@ -1154,14 +1154,14 @@ MACHINE_START_MEMBER(homedata_state,reikaids) save_item(NAME(m_gfx_bank)); } -MACHINE_START_MEMBER(homedata_state,pteacher) +void homedata_state::machine_start_pteacher() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 4, &ROM[0xc000], 0x4000); membank("bank2")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x10000); - MACHINE_START_CALL_MEMBER(homedata); + machine_start_homedata(); save_item(NAME(m_upd7807_porta)); save_item(NAME(m_upd7807_portc)); @@ -1171,7 +1171,7 @@ MACHINE_START_MEMBER(homedata_state,pteacher) save_item(NAME(m_from_cpu)); } -MACHINE_RESET_MEMBER(homedata_state,homedata) +void homedata_state::machine_reset_homedata() { m_visible_page = 0; m_flipscreen = 0; @@ -1187,14 +1187,14 @@ MACHINE_RESET_MEMBER(homedata_state,homedata) m_snd_command = 0; } -MACHINE_RESET_MEMBER(homedata_state,pteacher) +void homedata_state::machine_reset_pteacher() { address_space &space = m_maincpu->space(AS_PROGRAM); /* on reset, ports are set as input (high impedance), therefore 0xff output */ pteacher_upd7807_portc_w(space, 0, 0xff); - MACHINE_RESET_CALL_MEMBER(homedata); + machine_reset_homedata(); m_upd7807_porta = 0; m_gfx_bank[0] = 0; @@ -1203,14 +1203,14 @@ MACHINE_RESET_MEMBER(homedata_state,pteacher) m_from_cpu = 0; } -MACHINE_RESET_MEMBER(homedata_state,reikaids) +void homedata_state::machine_reset_reikaids() { address_space &space = m_maincpu->space(AS_PROGRAM); /* on reset, ports are set as input (high impedance), therefore 0xff output */ reikaids_upd7807_portc_w(space, 0, 0xff); - MACHINE_RESET_CALL_MEMBER(homedata); + machine_reset_homedata(); m_reikaids_which = m_priority; // m_priority is set in DRIVER_INIT m_upd7807_porta = 0; @@ -1229,8 +1229,8 @@ MACHINE_CONFIG_START(homedata_state::mrokumei) MCFG_DEVICE_PROGRAM_MAP(mrokumei_sound_map) MCFG_DEVICE_IO_MAP(mrokumei_sound_io_map) - MCFG_MACHINE_START_OVERRIDE(homedata_state,homedata) - MCFG_MACHINE_RESET_OVERRIDE(homedata_state,homedata) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_homedata, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_homedata, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1247,7 +1247,7 @@ MACHINE_CONFIG_START(homedata_state::mrokumei) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,mrokumei) - MCFG_VIDEO_START_OVERRIDE(homedata_state,mrokumei) + set_video_start_cb(config, driver_callback_delegate(&video_start_mrokumei, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1283,8 +1283,8 @@ MACHINE_CONFIG_START(homedata_state::reikaids) MCFG_QUANTUM_TIME(attotime::from_hz(30000)) // very high interleave required to sync for startup tests - MCFG_MACHINE_START_OVERRIDE(homedata_state,reikaids) - MCFG_MACHINE_RESET_OVERRIDE(homedata_state,reikaids) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_reikaids, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_reikaids, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1300,7 +1300,7 @@ MACHINE_CONFIG_START(homedata_state::reikaids) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,reikaids) - MCFG_VIDEO_START_OVERRIDE(homedata_state,reikaids) + set_video_start_cb(config, driver_callback_delegate(&video_start_reikaids, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1340,8 +1340,8 @@ MACHINE_CONFIG_START(homedata_state::pteacher) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // should be enough - MCFG_MACHINE_START_OVERRIDE(homedata_state,pteacher) - MCFG_MACHINE_RESET_OVERRIDE(homedata_state,pteacher) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pteacher, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pteacher, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1358,7 +1358,7 @@ MACHINE_CONFIG_START(homedata_state::pteacher) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,pteacher) - MCFG_VIDEO_START_OVERRIDE(homedata_state,pteacher) + set_video_start_cb(config, driver_callback_delegate(&video_start_pteacher, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1384,7 +1384,7 @@ MACHINE_CONFIG_START(homedata_state::lemnangl) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_lemnangl) - MCFG_VIDEO_START_OVERRIDE(homedata_state,lemnangl) + set_video_start_cb(config, driver_callback_delegate(&video_start_lemnangl, this)); MACHINE_CONFIG_END static INPUT_PORTS_START( mirderby ) @@ -1527,7 +1527,7 @@ MACHINE_CONFIG_START(homedata_state::mirderby) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,mirderby) - MCFG_VIDEO_START_OVERRIDE(homedata_state,mirderby) + set_video_start_cb(config, driver_callback_delegate(&video_start_mirderby, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index f2cafed0095..683e598e820 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -66,11 +66,11 @@ public: DECLARE_WRITE8_MEMBER(brailab4_portff_w); DECLARE_CUSTOM_INPUT_MEMBER(cass3_r); void init_brailab4(); - DECLARE_VIDEO_START(homelab2); - DECLARE_MACHINE_RESET(homelab3); - DECLARE_VIDEO_START(homelab3); - DECLARE_MACHINE_RESET(brailab4); - DECLARE_VIDEO_START(brailab4); + void video_start_homelab2() ATTR_COLD; + void machine_reset_homelab3(); + void video_start_homelab3() ATTR_COLD; + void machine_reset_brailab4(); + void video_start_brailab4() ATTR_COLD; INTERRUPT_GEN_MEMBER(homelab_frame); DECLARE_QUICKLOAD_LOAD_MEMBER(homelab); uint32_t screen_update_homelab2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -139,11 +139,11 @@ WRITE8_MEMBER( homelab_state::cass_w ) m_cass->output(BIT(data, 0) ? -1.0 : +1.0); // FIXME } -MACHINE_RESET_MEMBER(homelab_state,homelab3) +void homelab_state::machine_reset_homelab3() { } -MACHINE_RESET_MEMBER(homelab_state,brailab4) +void homelab_state::machine_reset_brailab4() { membank("bank1")->set_entry(0); } @@ -561,17 +561,17 @@ static INPUT_PORTS_START( brailab4 ) // F4 to F8 are foreign characters PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED) INPUT_PORTS_END -VIDEO_START_MEMBER(homelab_state,homelab2) +void homelab_state::video_start_homelab2() { m_p_videoram = memregion("maincpu")->base()+0xc000; } -VIDEO_START_MEMBER(homelab_state,homelab3) +void homelab_state::video_start_homelab3() { m_p_videoram = memregion("maincpu")->base()+0xf800; } -VIDEO_START_MEMBER(homelab_state,brailab4) +void homelab_state::video_start_brailab4() { m_p_videoram = memregion("maincpu")->base()+0x17800; } @@ -757,7 +757,7 @@ MACHINE_CONFIG_START(homelab_state::homelab) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(40*8, 25*8) MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 25*8-1) - MCFG_VIDEO_START_OVERRIDE(homelab_state,homelab2) + set_video_start_cb(config, driver_callback_delegate(&video_start_homelab2, this)); MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab2) MCFG_SCREEN_PALETTE("palette") @@ -781,7 +781,7 @@ MACHINE_CONFIG_START(homelab_state::homelab3) MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 4) MCFG_DEVICE_PROGRAM_MAP(homelab3_mem) MCFG_DEVICE_IO_MAP(homelab3_io) - MCFG_MACHINE_RESET_OVERRIDE(homelab_state,homelab3) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_homelab3, this)); /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) @@ -789,7 +789,7 @@ MACHINE_CONFIG_START(homelab_state::homelab3) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1) - MCFG_VIDEO_START_OVERRIDE(homelab_state,homelab3) + set_video_start_cb(config, driver_callback_delegate(&video_start_homelab3, this)); MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab3) MCFG_SCREEN_PALETTE("palette") @@ -813,7 +813,7 @@ MACHINE_CONFIG_START(homelab_state::brailab4) MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 4) MCFG_DEVICE_PROGRAM_MAP(brailab4_mem) MCFG_DEVICE_IO_MAP(brailab4_io) - MCFG_MACHINE_RESET_OVERRIDE(homelab_state,brailab4) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_brailab4, this)); /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) @@ -821,7 +821,7 @@ MACHINE_CONFIG_START(homelab_state::brailab4) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1) - MCFG_VIDEO_START_OVERRIDE(homelab_state,brailab4) + set_video_start_cb(config, driver_callback_delegate(&video_start_brailab4, this)); MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab3) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index 1cf07b8ddc6..0fe6c36b158 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -430,7 +430,7 @@ public: void init_terabrst(); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_MACHINE_RESET(hornet_2board); + void machine_reset_hornet_2board(); uint32_t screen_update_hornet(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_hornet_2board(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(sound_irq); diff --git a/src/mame/drivers/hp48.cpp b/src/mame/drivers/hp48.cpp index aac7fb37c4a..ef6821ba574 100644 --- a/src/mame/drivers/hp48.cpp +++ b/src/mame/drivers/hp48.cpp @@ -1292,7 +1292,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(hp48_state::hp48gx) hp48_common(config); - MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48gx ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hp48gx, this)); /* expansion ports */ MCFG_HP48_PORT_ADD ( "port1", HP48_CE2, 128*1024 ) @@ -1305,7 +1305,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(hp48_state::hp48g) hp48_common(config); - MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48g ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hp48g, this)); /* serial I/O */ //MCFG_XMODEM_ADD( "rs232_x", hp48_xmodem_rs232_conf ) @@ -1315,7 +1315,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(hp48_state::hp48gp) hp48_common(config); - MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48gp ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hp48gp, this)); /* serial I/O */ //MCFG_XMODEM_ADD( "rs232_x", hp48_xmodem_rs232_conf ) @@ -1327,7 +1327,7 @@ MACHINE_CONFIG_START(hp48_state::hp48sx) hp48_common(config); MCFG_DEVICE_MODIFY ( "maincpu" ) MCFG_DEVICE_CLOCK ( 2000000 ) - MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48sx ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hp48sx, this)); /* expansion ports */ MCFG_HP48_PORT_ADD ( "port1", HP48_CE1, 128*1024) @@ -1341,7 +1341,7 @@ MACHINE_CONFIG_START(hp48_state::hp48s) hp48_common(config); MCFG_DEVICE_MODIFY ( "maincpu" ) MCFG_DEVICE_CLOCK ( 2000000 ) - MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48s ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hp48s, this)); /* serial I/O */ //MCFG_KERMIT_ADD( "rs232_k", hp48_kermit_rs232_conf ) @@ -1350,7 +1350,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(hp48_state::hp49g) hp48_common(config); MCFG_DEVICE_MODIFY ( "maincpu" ) - MCFG_MACHINE_START_OVERRIDE (hp48_state, hp49g ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hp49g, this)); /* serial I/O */ //MCFG_XMODEM_ADD( "rs232_x", hp48_xmodem_rs232_conf ) diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp index b8773269f13..6871acd624b 100644 --- a/src/mame/drivers/hyperspt.cpp +++ b/src/mame/drivers/hyperspt.cpp @@ -401,7 +401,7 @@ MACHINE_CONFIG_START(hyperspt_state::roadf) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(roadf_map) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_roadf) - MCFG_VIDEO_START_OVERRIDE(hyperspt_state,roadf) + set_video_start_cb(config, driver_callback_delegate(&video_start_roadf, this)); MCFG_DEVICE_MODIFY("audiocpu") MCFG_DEVICE_PROGRAM_MAP(roadf_sound_map) diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp index ca7d3f92d79..c3b8f168f42 100644 --- a/src/mame/drivers/hyprduel.cpp +++ b/src/mame/drivers/hyprduel.cpp @@ -74,8 +74,8 @@ public: DECLARE_WRITE16_MEMBER(hyprduel_cpusync_trigger2_w); void init_magerror(); void init_hyprduel(); - DECLARE_MACHINE_START(hyprduel); - DECLARE_MACHINE_START(magerror); + void machine_start_hyprduel() ATTR_COLD; + void machine_start_magerror() ATTR_COLD; TIMER_CALLBACK_MEMBER(vblank_end_callback); DECLARE_WRITE_LINE_MEMBER(vdp_blit_end_w); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); @@ -463,7 +463,7 @@ void hyprduel_state::machine_reset() *m_irq_enable = 0xff; } -MACHINE_START_MEMBER(hyprduel_state,hyprduel) +void hyprduel_state::machine_start_hyprduel() { save_item(NAME(m_blitter_bit)); save_item(NAME(m_requested_int)); @@ -500,7 +500,7 @@ MACHINE_CONFIG_START(hyprduel_state::hyprduel) MCFG_DEVICE_ADD("sub", M68000,20000000/2) /* 10MHz */ MCFG_DEVICE_PROGRAM_MAP(hyprduel_map2) - MCFG_MACHINE_START_OVERRIDE(hyprduel_state,hyprduel) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hyprduel, this)); /* video hardware */ i4220_config(config); @@ -528,7 +528,7 @@ MACHINE_CONFIG_START(hyprduel_state::magerror) MCFG_DEVICE_PROGRAM_MAP(magerror_map2) MCFG_DEVICE_PERIODIC_INT_DRIVER(hyprduel_state, irq1_line_hold, 968) /* tempo? */ - MCFG_MACHINE_START_OVERRIDE(hyprduel_state,hyprduel) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hyprduel, this)); /* video hardware */ i4220_config(config); diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp index be63e0fdac0..5d024c9a83b 100644 --- a/src/mame/drivers/if800.cpp +++ b/src/mame/drivers/if800.cpp @@ -110,7 +110,7 @@ MACHINE_CONFIG_START(if800_state::if800) MCFG_PALETTE_ADD("palette", 8) // MCFG_PALETTE_INIT(black_and_white) -// MCFG_VIDEO_START_OVERRIDE(if800_state,if800) +// set_video_start_cb(config, driver_callback_delegate(&video_start_if800, this)); MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index e3e5d7a036e..0ca3d6dfe20 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -115,7 +115,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(gp98); + void video_start_gp98() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void gp98(machine_config &config); @@ -286,7 +286,7 @@ void igs009_state::video_start() } -VIDEO_START_MEMBER(igs009_state,gp98) +void igs009_state::video_start_gp98() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(igs009_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80,0x20); m_fg_tilemap->set_transparent_pen(0); @@ -866,7 +866,7 @@ MACHINE_CONFIG_START(igs009_state::gp98) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gp98) - MCFG_VIDEO_START_OVERRIDE(igs009_state,gp98) + set_video_start_cb(config, driver_callback_delegate(&video_start_gp98, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index 90dddeddb60..06eae35fdc7 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -603,9 +603,9 @@ private: DECLARE_READ16_MEMBER(slqz2_magic_r); DECLARE_READ8_MEMBER(mgcs_keys_r); - DECLARE_MACHINE_RESET(iqblocka); - DECLARE_MACHINE_RESET(mgcs); - DECLARE_MACHINE_RESET(lhzb2a); + void machine_reset_iqblocka(); + void machine_reset_mgcs(); + void machine_reset_lhzb2a(); uint32_t screen_update_igs017(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(iqblocka_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(mgcs_interrupt); @@ -3547,7 +3547,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(igs017_state::iqblocka_interrupt) m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -MACHINE_RESET_MEMBER(igs017_state,iqblocka) +void igs017_state::machine_reset_iqblocka() { m_input_select = 0; } @@ -3558,7 +3558,7 @@ MACHINE_CONFIG_START(igs017_state::iqblocka) MCFG_DEVICE_IO_MAP(iqblocka_io) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_iqblocka, this)); // i/o MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -3642,9 +3642,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(igs017_state::mgcs_interrupt) m_maincpu->set_input_line(2, HOLD_LINE); } -MACHINE_RESET_MEMBER(igs017_state,mgcs) +void igs017_state::machine_reset_mgcs() { - MACHINE_RESET_CALL_MEMBER( iqblocka ); + machine_reset_iqblocka(); m_scramble_data = 0; memset(m_igs_magic, 0, sizeof(m_igs_magic)); @@ -3655,7 +3655,7 @@ MACHINE_CONFIG_START(igs017_state::mgcs) MCFG_DEVICE_PROGRAM_MAP(mgcs) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mgcs, this)); // i/o MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -3694,7 +3694,7 @@ MACHINE_CONFIG_START(igs017_state::lhzb2) MCFG_DEVICE_PROGRAM_MAP(lhzb2) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mgcs, this)); // i/o MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -3733,9 +3733,9 @@ MACHINE_CONFIG_END // lhzb2a -MACHINE_RESET_MEMBER(igs017_state,lhzb2a) +void igs017_state::machine_reset_lhzb2a() { - MACHINE_RESET_CALL_MEMBER( mgcs ); + machine_reset_mgcs(); lhzb2a_remap_addr_w(m_maincpu->space(AS_PROGRAM), 0, 0xf0); } @@ -3744,7 +3744,7 @@ MACHINE_CONFIG_START(igs017_state::lhzb2a) MCFG_DEVICE_PROGRAM_MAP(lhzb2a) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,lhzb2a) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lhzb2a, this)); // i/o // MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -3790,7 +3790,7 @@ MACHINE_CONFIG_START(igs017_state::slqz2) MCFG_DEVICE_PROGRAM_MAP(slqz2) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mgcs, this)); // i/o MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -3834,7 +3834,7 @@ MACHINE_CONFIG_START(igs017_state::sdmg2) MCFG_DEVICE_PROGRAM_MAP(sdmg2) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mgcs, this)); // i/o MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -3881,7 +3881,7 @@ MACHINE_CONFIG_START(igs017_state::mgdha) MCFG_DEVICE_PROGRAM_MAP(mgdha_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgdh_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mgcs, this)); // i/o MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -3917,7 +3917,7 @@ MACHINE_CONFIG_START(igs017_state::tjsb) MCFG_DEVICE_IO_MAP(tjsb_io) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_iqblocka, this)); // i/o MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -3959,7 +3959,7 @@ MACHINE_CONFIG_START(igs017_state::spkrform) MCFG_DEVICE_IO_MAP(spkrform_io) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_iqblocka, this)); // i/o MCFG_DEVICE_ADD("ppi8255", I8255A, 0) diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp index 4b44ea36d8c..368b47a7e27 100644 --- a/src/mame/drivers/igs_fear.cpp +++ b/src/mame/drivers/igs_fear.cpp @@ -88,7 +88,7 @@ MACHINE_CONFIG_START(igs_fear_state::igs_fear) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) - MCFG_VIDEO_START_OVERRIDE(igs_fear_state, igs_fear) + set_video_start_cb(config, driver_callback_delegate(&video_start_igs_fear, this)); MCFG_SCREEN_UPDATE_DRIVER(igs_fear_state, screen_update_igs_fear) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index ee4b8732a24..f7d56426cb0 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -134,7 +134,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(cpokerpk); + void video_start_cpokerpk() ATTR_COLD; uint32_t screen_update_igs_video(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cpokerpk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(igs_interrupt); @@ -238,7 +238,7 @@ uint32_t igspoker_state::screen_update_igs_video(screen_device &screen, bitmap_i return 0; } -VIDEO_START_MEMBER(igspoker_state,cpokerpk) +void igspoker_state::video_start_cpokerpk() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(igspoker_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } @@ -1964,7 +1964,7 @@ MACHINE_CONFIG_START(igspoker_state::number10) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(igspoker_state, screen_update_cpokerpk) - MCFG_VIDEO_START_OVERRIDE(igspoker_state,cpokerpk) + set_video_start_cb(config, driver_callback_delegate(&video_start_cpokerpk, this)); MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(12'000'000) / 12, okim6295_device::PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp index 4070d5ed292..b1c1d50a7b8 100644 --- a/src/mame/drivers/interact.cpp +++ b/src/mame/drivers/interact.cpp @@ -73,8 +73,8 @@ public: m_videoram(*this, "videoram") { } required_shared_ptr<uint8_t> m_videoram; - DECLARE_MACHINE_START(interact); - DECLARE_MACHINE_RESET(interact); + void machine_start_interact() ATTR_COLD; + void machine_reset_interact() ATTR_COLD; uint32_t screen_update_interact(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void hector1(machine_config &config); void interact(machine_config &config); @@ -106,12 +106,12 @@ void interact_state::interact_mem(address_map &map) } -MACHINE_RESET_MEMBER(interact_state,interact) +void interact_state::machine_reset_interact() { hector_reset(0, 0); } -MACHINE_START_MEMBER(interact_state,interact) +void interact_state::machine_start_interact() { hector_init(); } @@ -131,8 +131,8 @@ MACHINE_CONFIG_START(interact_state::interact) MCFG_DEVICE_PROGRAM_MAP(interact_mem) MCFG_DEVICE_PERIODIC_INT_DRIVER(interact_state, irq0_line_hold, 50) /* put on the I8080 irq in Hz*/ - MCFG_MACHINE_RESET_OVERRIDE(interact_state,interact) - MCFG_MACHINE_START_OVERRIDE(interact_state,interact) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_interact, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_interact, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -145,7 +145,7 @@ MACHINE_CONFIG_START(interact_state::interact) MCFG_PALETTE_ADD("palette", 16) /* 8 colours, but only 4 at a time*/ - MCFG_VIDEO_START_OVERRIDE(interact_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); hector_audio(config); @@ -168,8 +168,8 @@ MACHINE_CONFIG_START(interact_state::hector1) MCFG_DEVICE_PROGRAM_MAP(interact_mem) MCFG_DEVICE_PERIODIC_INT_DRIVER(interact_state, irq0_line_hold, 50) /* put on the I8080 irq in Hz*/ - MCFG_MACHINE_RESET_OVERRIDE(interact_state,interact) - MCFG_MACHINE_START_OVERRIDE(interact_state,interact) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_interact, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_interact, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -182,7 +182,7 @@ MACHINE_CONFIG_START(interact_state::hector1) MCFG_PALETTE_ADD("palette", 16) /* 8 colours, but only 4 at a time*/ - MCFG_VIDEO_START_OVERRIDE(interact_state,hec2hrp) + set_video_start_cb(config, driver_callback_delegate(&video_start_hec2hrp, this)); hector_audio(config); diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp index 624a97dde3e..05b7ceea5e9 100644 --- a/src/mame/drivers/ironhors.cpp +++ b/src/mame/drivers/ironhors.cpp @@ -457,7 +457,7 @@ MACHINE_CONFIG_START(ironhors_state::farwest) MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_farwest) - MCFG_VIDEO_START_OVERRIDE(ironhors_state,farwest) + set_video_start_cb(config, driver_callback_delegate(&video_start_farwest, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(ironhors_state, screen_update_farwest) diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp index d6b2b620300..718280536b8 100644 --- a/src/mame/drivers/itech32.cpp +++ b/src/mame/drivers/itech32.cpp @@ -477,7 +477,7 @@ void itech32_state::machine_reset() } -MACHINE_RESET_MEMBER(itech32_state,drivedge) +void itech32_state::machine_reset_drivedge() { itech32_state::machine_reset(); @@ -1769,7 +1769,7 @@ MACHINE_CONFIG_START(itech32_state::drivedge) // MCFG_DEVICE_ADD("comm", M6803, 8000000/4) -- network CPU - MCFG_MACHINE_RESET_OVERRIDE(itech32_state,drivedge) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_drivedge, this)); MCFG_QUANTUM_TIME(attotime::from_hz(6000)) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index c74dd664527..38a8be4d395 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -603,7 +603,7 @@ WRITE8_MEMBER(itech8_state::nmi_ack_w) -MACHINE_START_MEMBER(itech8_state,sstrike) +void itech8_state::machine_start_sstrike() { /* we need to update behind the beam as well */ m_behind_beam_update_timer = timer_alloc(TIMER_BEHIND_BEAM_UPDATE); @@ -1874,7 +1874,7 @@ MACHINE_CONFIG_START(itech8_state::slikshot_hi) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(itech8_state, screen_update_slikshot) - MCFG_VIDEO_START_OVERRIDE(itech8_state,slikshot) + set_video_start_cb(config, driver_callback_delegate(&video_start_slikshot, this)); MACHINE_CONFIG_END @@ -1892,7 +1892,7 @@ MACHINE_CONFIG_START(itech8_state::slikshot_lo) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(itech8_state, screen_update_slikshot) - MCFG_VIDEO_START_OVERRIDE(itech8_state,slikshot) + set_video_start_cb(config, driver_callback_delegate(&video_start_slikshot, this)); MACHINE_CONFIG_END @@ -1913,7 +1913,7 @@ MACHINE_CONFIG_START(itech8_state::sstrike) slikshot_lo(config); /* basic machine hardware */ - MCFG_MACHINE_START_OVERRIDE(itech8_state,sstrike) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sstrike, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp index 4b2fcd553fb..c01265341bd 100644 --- a/src/mame/drivers/jack.cpp +++ b/src/mame/drivers/jack.cpp @@ -877,14 +877,14 @@ void jack_state::machine_reset() } -MACHINE_START_MEMBER(jack_state,striv) +void jack_state::machine_start_striv() { save_item(NAME(m_question_address)); save_item(NAME(m_question_rom)); save_item(NAME(m_remap_address)); } -MACHINE_RESET_MEMBER(jack_state,striv) +void jack_state::machine_reset_striv() { m_question_address = 0; m_question_rom = 0; @@ -894,7 +894,7 @@ MACHINE_RESET_MEMBER(jack_state,striv) } -MACHINE_START_MEMBER(jack_state,joinem) +void jack_state::machine_start_joinem() { m_joinem_palette_bank = 0; @@ -902,7 +902,7 @@ MACHINE_START_MEMBER(jack_state,joinem) save_item(NAME(m_joinem_palette_bank)); } -MACHINE_RESET_MEMBER(jack_state,joinem) +void jack_state::machine_reset_joinem() { joinem_control_w(m_maincpu->space(AS_PROGRAM), 0, 0, 0xff); } @@ -962,8 +962,8 @@ MACHINE_CONFIG_START(jack_state::striv) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(striv_map) - MCFG_MACHINE_START_OVERRIDE(jack_state,striv) - MCFG_MACHINE_RESET_OVERRIDE(jack_state,striv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_striv, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_striv, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -988,8 +988,8 @@ MACHINE_CONFIG_START(jack_state::joinem) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jack_state, joinem_vblank_irq) MCFG_DEVICE_PERIODIC_INT_DRIVER(jack_state, irq0_line_hold, 250) // ??? controls game speed - MCFG_MACHINE_START_OVERRIDE(jack_state,joinem) - MCFG_MACHINE_RESET_OVERRIDE(jack_state,joinem) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_joinem, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_joinem, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1001,7 +1001,7 @@ MACHINE_CONFIG_START(jack_state::joinem) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(jack_state, joinem) - MCFG_VIDEO_START_OVERRIDE(jack_state,joinem) + set_video_start_cb(config, driver_callback_delegate(&video_start_joinem, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp index 5c578686ae7..fbf17f8c5f3 100644 --- a/src/mame/drivers/jalmah.cpp +++ b/src/mame/drivers/jalmah.cpp @@ -215,7 +215,7 @@ public: TILE_GET_INFO_MEMBER(get_sc3_tile_info); virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(urashima); + void video_start_urashima() ATTR_COLD; uint32_t screen_update_jalmah(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_urashima(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(jalmah_mcu_sim); @@ -369,7 +369,7 @@ void jalmah_state::video_start() m_sc3_tilemap_3->set_transparent_pen(15); } -VIDEO_START_MEMBER(jalmah_state,urashima) +void jalmah_state::video_start_urashima() { m_sc0_tilemap_0 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc0_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range0_16x16),this),16,16,256,32); m_sc3_tilemap_0 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(jalmah_state::get_sc3_tile_info),this),tilemap_mapper_delegate(FUNC(jalmah_state::range2_8x8),this),8,8,128,64); @@ -1459,7 +1459,7 @@ MACHINE_CONFIG_START(jalmah_state::urashima) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_urashima) - MCFG_VIDEO_START_OVERRIDE(jalmah_state,urashima) + set_video_start_cb(config, driver_callback_delegate(&video_start_urashima, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(jalmah_state, screen_update_urashima) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index ac4aa792ad6..19c82ca1b7f 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -100,10 +100,10 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(jangou); - DECLARE_MACHINE_START(jngolady); - DECLARE_MACHINE_RESET(jngolady); - DECLARE_MACHINE_START(common); - DECLARE_MACHINE_RESET(common); + void machine_start_jngolady() ATTR_COLD; + void machine_reset_jngolady(); + void machine_start_common() ATTR_COLD; + void machine_reset_common(); uint32_t screen_update_jangou(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(cvsd_bit_timer_callback); DECLARE_WRITE_LINE_MEMBER(jngolady_vclk_cb); @@ -815,14 +815,14 @@ INPUT_PORTS_END * *************************************/ -MACHINE_START_MEMBER(jangou_state,common) +void jangou_state::machine_start_common() { save_item(NAME(m_mux_data)); } void jangou_state::machine_start() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); save_item(NAME(m_cvsd_shiftreg)); save_item(NAME(m_cvsd_shift_cnt)); @@ -832,9 +832,9 @@ void jangou_state::machine_start() m_cvsd_bit_timer->adjust(attotime::from_hz(MASTER_CLOCK / 1024), 0, attotime::from_hz(MASTER_CLOCK / 1024)); } -MACHINE_START_MEMBER(jangou_state,jngolady) +void jangou_state::machine_start_jngolady() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); save_item(NAME(m_adpcm_byte)); save_item(NAME(m_msm5205_vclk_toggle)); @@ -842,22 +842,22 @@ MACHINE_START_MEMBER(jangou_state,jngolady) save_item(NAME(m_z80_latch)); } -MACHINE_RESET_MEMBER(jangou_state,common) +void jangou_state::machine_reset_common() { m_mux_data = 0; } void jangou_state::machine_reset() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); m_cvsd_shiftreg = 0; m_cvsd_shift_cnt = 0; } -MACHINE_RESET_MEMBER(jangou_state,jngolady) +void jangou_state::machine_reset_jngolady() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); m_adpcm_byte = 0; m_msm5205_vclk_toggle = 0; @@ -918,8 +918,8 @@ MACHINE_CONFIG_START(jangou_state::jngolady) MCFG_DEVICE_ADD("nsc", NSC8105, MASTER_CLOCK / 8) MCFG_DEVICE_PROGRAM_MAP(nsc_map) - MCFG_MACHINE_START_OVERRIDE(jangou_state,jngolady) - MCFG_MACHINE_RESET_OVERRIDE(jangou_state,jngolady) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_jngolady, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_jngolady, this)); /* sound hardware */ MCFG_DEVICE_REMOVE("cvsd") @@ -941,8 +941,8 @@ MACHINE_CONFIG_START(jangou_state::cntrygrl) MCFG_DEVICE_REMOVE("cpu1") - MCFG_MACHINE_START_OVERRIDE(jangou_state,common) - MCFG_MACHINE_RESET_OVERRIDE(jangou_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* sound hardware */ MCFG_DEVICE_REMOVE("cvsd") @@ -962,8 +962,8 @@ MACHINE_CONFIG_START(jangou_state::roylcrdn) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_MACHINE_START_OVERRIDE(jangou_state,common) - MCFG_MACHINE_RESET_OVERRIDE(jangou_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); /* sound hardware */ MCFG_DEVICE_REMOVE("cvsd") diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index b849f97ba1b..ee1c5466171 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -246,7 +246,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void init_darkhors(); - DECLARE_VIDEO_START(darkhors); + void video_start_darkhors() ATTR_COLD; void darkhors(machine_config &config); void darkhors_map(address_map &map); @@ -388,7 +388,7 @@ void darkhors_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec } } -VIDEO_START_MEMBER(darkhors_state,darkhors) +void darkhors_state::video_start_darkhors() { m_tmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40); m_tmap2= &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40); @@ -1229,7 +1229,7 @@ MACHINE_CONFIG_START(darkhors_state::darkhors) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_darkhors) - MCFG_VIDEO_START_OVERRIDE(darkhors_state, darkhors) + set_video_start_cb(config, driver_callback_delegate(&video_start_darkhors, this)); // layout MCFG_DEFAULT_LAYOUT(layout_jclub2) diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp index c88b3a3a831..d4fef263350 100644 --- a/src/mame/drivers/jpmimpct.cpp +++ b/src/mame/drivers/jpmimpct.cpp @@ -144,7 +144,7 @@ void jpmimpct_state::update_irqs() * *************************************/ -MACHINE_START_MEMBER(jpmimpct_state,jpmimpct) +void jpmimpct_state::machine_start_jpmimpct() { m_digits.resolve(); @@ -160,7 +160,7 @@ MACHINE_START_MEMBER(jpmimpct_state,jpmimpct) } -MACHINE_RESET_MEMBER(jpmimpct_state,jpmimpct) +void jpmimpct_state::machine_reset_jpmimpct() { memset(&m_duart_1, 0, sizeof(m_duart_1)); @@ -855,8 +855,8 @@ MACHINE_CONFIG_START(jpmimpct_state::jpmimpct) MCFG_TMS340X0_FROM_SHIFTREG_CB(jpmimpct_state, from_shiftreg) /* read from shiftreg function */ MCFG_QUANTUM_TIME(attotime::from_hz(30000)) - MCFG_MACHINE_START_OVERRIDE(jpmimpct_state,jpmimpct) - MCFG_MACHINE_RESET_OVERRIDE(jpmimpct_state,jpmimpct) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_jpmimpct, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_jpmimpct, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_TIMER_DRIVER_ADD("duart_1_timer", jpmimpct_state, duart_1_timer_event) @@ -870,7 +870,7 @@ MACHINE_CONFIG_START(jpmimpct_state::jpmimpct) MCFG_DEVICE_ADD("upd", UPD7759) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_VIDEO_START_OVERRIDE(jpmimpct_state,jpmimpct) + set_video_start_cb(config, driver_callback_delegate(&video_start_jpmimpct, this)); MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(5) @@ -965,7 +965,7 @@ WRITE8_MEMBER(jpmimpct_state::display_c_w) m_vfd->sclk(data & 0x01); } -MACHINE_START_MEMBER(jpmimpct_state,impctawp) +void jpmimpct_state::machine_start_impctawp() { save_item(NAME(m_duart_1_irq)); save_item(NAME(m_touch_cnt)); @@ -977,7 +977,7 @@ MACHINE_START_MEMBER(jpmimpct_state,impctawp) save_item(NAME(m_duart_1.CT)); } -MACHINE_RESET_MEMBER(jpmimpct_state,impctawp) +void jpmimpct_state::machine_reset_impctawp() { memset(&m_duart_1, 0, sizeof(m_duart_1)); @@ -1319,8 +1319,8 @@ MACHINE_CONFIG_START(jpmimpct_state::impctawp) MCFG_QUANTUM_TIME(attotime::from_hz(30000)) MCFG_S16LF01_ADD("vfd",0) - MCFG_MACHINE_START_OVERRIDE(jpmimpct_state,impctawp) - MCFG_MACHINE_RESET_OVERRIDE(jpmimpct_state,impctawp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_impctawp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_impctawp, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_DEVICE_ADD("ppi8255", I8255, 0) diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp index 948b257c874..32deb4b813a 100644 --- a/src/mame/drivers/jrpacman.cpp +++ b/src/mame/drivers/jrpacman.cpp @@ -311,7 +311,7 @@ MACHINE_CONFIG_START(jrpacman_state::jrpacman) MCFG_PALETTE_ADD("palette", 128*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(jrpacman_state,pacman) - MCFG_VIDEO_START_OVERRIDE(jrpacman_state,jrpacman) + set_video_start_cb(config, driver_callback_delegate(&video_start_jrpacman, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index cda66326665..32671e7030d 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -118,12 +118,12 @@ Non-Bugs (happen on real PCB) -MACHINE_RESET_MEMBER(kaneko16_state,gtmr) +void kaneko16_state::machine_reset_gtmr() { m_VIEW2_2_pri = 1; } -MACHINE_RESET_MEMBER(kaneko16_state,mgcrystl) +void kaneko16_state::machine_reset_mgcrystl() { m_VIEW2_2_pri = 0; } @@ -1810,7 +1810,7 @@ MACHINE_CONFIG_START(kaneko16_berlwall_state::berlwall) MCFG_KANEKO16_SPRITE_OFFSETS(0, -1*64) MCFG_KANEKO16_SPRITE_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(kaneko16_berlwall_state,berlwall) + set_video_start_cb(config, driver_callback_delegate(&video_start_berlwall, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1847,7 +1847,7 @@ MACHINE_CONFIG_START(kaneko16_state::bakubrkr) MCFG_DEVICE_PROGRAM_MAP(bakubrkr) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(kaneko16_state,gtmr) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gtmr, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_WATCHDOG_ADD("watchdog") @@ -1883,7 +1883,7 @@ MACHINE_CONFIG_START(kaneko16_state::bakubrkr) - MCFG_VIDEO_START_OVERRIDE(kaneko16_state,kaneko16) + set_video_start_cb(config, driver_callback_delegate(&video_start_kaneko16, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1953,7 +1953,7 @@ MACHINE_CONFIG_START(kaneko16_state::blazeon) // there is actually a 2nd sprite chip! looks like our device emulation handles both at once - MCFG_VIDEO_START_OVERRIDE(kaneko16_state,kaneko16) + set_video_start_cb(config, driver_callback_delegate(&video_start_kaneko16, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2009,7 +2009,7 @@ MACHINE_CONFIG_START(kaneko16_state::wingforc) // there is actually a 2nd sprite chip! looks like our device emulation handles both at once - MCFG_VIDEO_START_OVERRIDE(kaneko16_state,kaneko16) + set_video_start_cb(config, driver_callback_delegate(&video_start_kaneko16, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2058,7 +2058,7 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr) MCFG_DEVICE_PROGRAM_MAP(gtmr_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(kaneko16_gtmr_state,gtmr) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gtmr, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -2097,7 +2097,7 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr) MCFG_KANEKO_HIT_TYPE(1) - MCFG_VIDEO_START_OVERRIDE(kaneko16_gtmr_state,kaneko16) + set_video_start_cb(config, driver_callback_delegate(&video_start_kaneko16, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2140,7 +2140,7 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::bloodwar) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(bloodwar) - MCFG_MACHINE_RESET_OVERRIDE(kaneko16_gtmr_state, gtmr ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gtmr, this)); MCFG_DEVICE_MODIFY("kan_spr") MCFG_KANEKO16_SPRITE_PRIORITIES(2 /* never used? */ ,3 /* character selection / vs. portraits */ ,5 /* winning portrait*/ ,7 /* ? */) @@ -2162,7 +2162,7 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::bonkadv) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(bonkadv) - MCFG_MACHINE_RESET_OVERRIDE(kaneko16_gtmr_state, gtmr ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gtmr, this)); MCFG_DEVICE_MODIFY("kan_spr") MCFG_KANEKO16_SPRITE_PRIORITIES(2 /* never used? */ ,3 /* volcano lava on level 2 */ ,5 /* in-game player */ ,7 /* demostration text */) @@ -2187,7 +2187,7 @@ MACHINE_CONFIG_START(kaneko16_state::mgcrystl) MCFG_DEVICE_PROGRAM_MAP(mgcrystl) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(kaneko16_state,mgcrystl) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mgcrystl, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_WATCHDOG_ADD("watchdog") @@ -2222,7 +2222,7 @@ MACHINE_CONFIG_START(kaneko16_state::mgcrystl) - MCFG_VIDEO_START_OVERRIDE(kaneko16_state,kaneko16) + set_video_start_cb(config, driver_callback_delegate(&video_start_kaneko16, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2307,7 +2307,7 @@ MACHINE_CONFIG_START(kaneko16_shogwarr_state::shogwarr) MCFG_DEVICE_PROGRAM_MAP(shogwarr) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_shogwarr_state, shogwarr_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(kaneko16_shogwarr_state,mgcrystl) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mgcrystl, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_DATA(shogwarr_default_eeprom, 128) @@ -2333,7 +2333,7 @@ MACHINE_CONFIG_START(kaneko16_shogwarr_state::shogwarr) MCFG_KANEKO_TMAP_OFFSET(0x33, -0x8, 320, 240) MCFG_KANEKO_TMAP_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(kaneko16_shogwarr_state,kaneko16) + set_video_start_cb(config, driver_callback_delegate(&video_start_kaneko16, this)); MCFG_DEVICE_ADD_VU002_SPRITES MCFG_KANEKO16_SPRITE_PRIORITIES(1 /* below all */ ,3 /* above tile[0], below the others */ ,5 /* above all */ ,7 /* above all */) diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp index 9ce4c4ee785..93652eee9f0 100644 --- a/src/mame/drivers/kangaroo.cpp +++ b/src/mame/drivers/kangaroo.cpp @@ -182,7 +182,7 @@ void kangaroo_state::machine_start() } -MACHINE_START_MEMBER(kangaroo_state,kangaroo_mcu) +void kangaroo_state::machine_start_kangaroo_mcu() { kangaroo_state::machine_start(); m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xef00, 0xefff, read8_delegate(FUNC(kangaroo_state::mcu_sim_r),this), write8_delegate(FUNC(kangaroo_state::mcu_sim_w),this)); @@ -463,7 +463,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(kangaroo_state::mcu) nomcu(config); - MCFG_MACHINE_START_OVERRIDE(kangaroo_state,kangaroo_mcu) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_kangaroo_mcu, this)); MCFG_DEVICE_ADD("mcu", MB8841, MASTER_CLOCK/4/2) MCFG_DEVICE_DISABLE() diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp index dcfee9c0010..e709dba8290 100644 --- a/src/mame/drivers/karnov.cpp +++ b/src/mame/drivers/karnov.cpp @@ -838,7 +838,7 @@ MACHINE_CONFIG_START(karnov_state::karnov) MCFG_DECO_KARNOVSPRITES_GFX_REGION(2) MCFG_DECO_KARNOVSPRITES_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(karnov_state,karnov) + set_video_start_cb(config, driver_callback_delegate(&video_start_karnov, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -916,7 +916,7 @@ MACHINE_CONFIG_START(karnov_state::wndrplnt) MCFG_DECO_KARNOVSPRITES_GFX_REGION(2) MCFG_DECO_KARNOVSPRITES_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(karnov_state,wndrplnt) + set_video_start_cb(config, driver_callback_delegate(&video_start_wndrplnt, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index e5528315443..32fe9e863c5 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -202,8 +202,8 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) MCFG_DEVICE_IO_MAP(kayproii_io) MCFG_Z80_DAISY_CHAIN(kayproii_daisy_chain) - MCFG_MACHINE_START_OVERRIDE(kaypro_state, kayproii ) - MCFG_MACHINE_RESET_OVERRIDE(kaypro_state, kaypro ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_kayproii, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_kaypro, this)); /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) @@ -211,7 +211,7 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(80*7, 24*10) MCFG_SCREEN_VISIBLE_AREA(0,80*7-1,0,24*10-1) - MCFG_VIDEO_START_OVERRIDE(kaypro_state, kaypro ) + set_video_start_cb(config, driver_callback_delegate(&video_start_kaypro, this)); MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kayproii) MCFG_SCREEN_PALETTE("palette") @@ -294,7 +294,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) MCFG_DEVICE_IO_MAP(kaypro484_io) MCFG_Z80_DAISY_CHAIN(kaypro484_daisy_chain) - MCFG_MACHINE_RESET_OVERRIDE(kaypro_state, kaypro ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_kaypro, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -302,7 +302,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(80*8, 25*16) MCFG_SCREEN_VISIBLE_AREA(0,80*8-1,0,25*16-1) - MCFG_VIDEO_START_OVERRIDE(kaypro_state, kaypro ) + set_video_start_cb(config, driver_callback_delegate(&video_start_kaypro, this)); MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kaypro484) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kaypro484) diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp index 79f04132c26..70f4bfbf94c 100644 --- a/src/mame/drivers/kchamp.cpp +++ b/src/mame/drivers/kchamp.cpp @@ -384,15 +384,15 @@ INTERRUPT_GEN_MEMBER(kchamp_state::sound_int) } -MACHINE_START_MEMBER(kchamp_state,kchamp) +void kchamp_state::machine_start_kchamp() { save_item(NAME(m_nmi_enable)); save_item(NAME(m_sound_nmi_enable)); } -MACHINE_START_MEMBER(kchamp_state,kchampvs) +void kchamp_state::machine_start_kchampvs() { - MACHINE_START_CALL_MEMBER(kchamp); + machine_start_kchamp(); save_item(NAME(m_msm_play_lo_nibble)); } @@ -421,7 +421,7 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, kchamp_state, nmi_enable_w)) MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, kchamp_state, sound_reset_w)) - MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchampvs) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_kchampvs, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -481,7 +481,7 @@ MACHINE_CONFIG_START(kchamp_state::kchamp) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, kchamp_state, flipscreen_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, kchamp_state, nmi_enable_w)) - MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchamp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_kchamp, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp index 41e816814d3..f6deb32dedb 100644 --- a/src/mame/drivers/kickgoal.cpp +++ b/src/mame/drivers/kickgoal.cpp @@ -661,7 +661,7 @@ MACHINE_CONFIG_START(kickgoal_state::kickgoal) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(kickgoal_state,kickgoal) + set_video_start_cb(config, driver_callback_delegate(&video_start_kickgoal, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -700,7 +700,7 @@ MACHINE_CONFIG_START(kickgoal_state::actionhw) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(kickgoal_state,actionhw) + set_video_start_cb(config, driver_callback_delegate(&video_start_actionhw, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp index 00941770e84..77216a25b36 100644 --- a/src/mame/drivers/kingobox.cpp +++ b/src/mame/drivers/kingobox.cpp @@ -503,7 +503,7 @@ MACHINE_CONFIG_START(kingofb_state::kingofb) MCFG_PALETTE_ADD("palette", 256+8*2) MCFG_PALETTE_INDIRECT_ENTRIES(256+8) MCFG_PALETTE_INIT_OWNER(kingofb_state,kingofb) - MCFG_VIDEO_START_OVERRIDE(kingofb_state,kingofb) + set_video_start_cb(config, driver_callback_delegate(&video_start_kingofb, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -562,7 +562,7 @@ MACHINE_CONFIG_START(kingofb_state::ringking) MCFG_PALETTE_ADD("palette", 256+8*2) MCFG_PALETTE_INDIRECT_ENTRIES(256+8) MCFG_PALETTE_INIT_OWNER(kingofb_state,ringking) - MCFG_VIDEO_START_OVERRIDE(kingofb_state,ringking) + set_video_start_cb(config, driver_callback_delegate(&video_start_ringking, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp index 879a152d852..822f1b86298 100644 --- a/src/mame/drivers/konamigq.cpp +++ b/src/mame/drivers/konamigq.cpp @@ -118,8 +118,8 @@ public: DECLARE_READ16_MEMBER(tms57002_status_word_r); DECLARE_WRITE16_MEMBER(tms57002_control_word_w); void init_konamigq(); - DECLARE_MACHINE_START(konamigq); - DECLARE_MACHINE_RESET(konamigq); + void machine_start_konamigq() ATTR_COLD; + void machine_reset_konamigq(); INTERRUPT_GEN_MEMBER(tms_sync); DECLARE_WRITE_LINE_MEMBER(k054539_irq_gen); @@ -316,14 +316,14 @@ void konamigq_state::init_konamigq() { } -MACHINE_START_MEMBER(konamigq_state,konamigq) +void konamigq_state::machine_start_konamigq() { save_item(NAME(m_sector_buffer)); save_item(NAME(m_sound_ctrl)); save_item(NAME(m_sound_intck)); } -MACHINE_RESET_MEMBER(konamigq_state,konamigq) +void konamigq_state::machine_reset_konamigq() { } @@ -345,8 +345,8 @@ MACHINE_CONFIG_START(konamigq_state::konamigq) MCFG_DEVICE_DATA_MAP(konamigq_dasp_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(konamigq_state, tms_sync, 48000) - MCFG_MACHINE_START_OVERRIDE(konamigq_state, konamigq) - MCFG_MACHINE_RESET_OVERRIDE(konamigq_state, konamigq) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_konamigq, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_konamigq, this)); MCFG_DEVICE_ADD("mb89371", MB89371, 0) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index a34811342e4..e08c723c778 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -1630,8 +1630,8 @@ MACHINE_CONFIG_START(konamigx_state::konamigx) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_START_OVERRIDE(konamigx_state,konamigx) - MCFG_MACHINE_RESET_OVERRIDE(konamigx_state,konamigx) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_konamigx, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_konamigx, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -1671,7 +1671,7 @@ MACHINE_CONFIG_START(konamigx_state::konamigx) MCFG_K055673_SET_SCREEN("screen") MCFG_K055673_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_5bpp) + set_video_start_cb(config, driver_callback_delegate(&video_start_konamigx_5bpp, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1730,7 +1730,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::dragoonj) konamigx(config); MCFG_SCREEN_MODIFY("screen") - MCFG_VIDEO_START_OVERRIDE(konamigx_state, dragoonj) + set_video_start_cb(config, driver_callback_delegate(&video_start_dragoonj, this)); MCFG_DEVICE_MODIFY("k053252") MCFG_K053252_OFFSETS(24+16, 16) @@ -1745,7 +1745,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::le2) konamigx(config); - MCFG_VIDEO_START_OVERRIDE(konamigx_state, le2) + set_video_start_cb(config, driver_callback_delegate(&video_start_le2, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konamigx_state, konamigx_type2_scanline, "screen", 0, 1) MCFG_DEVICE_MODIFY("k056832") @@ -1758,7 +1758,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::konamigx_6bpp) konamigx(config); - MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_6bpp) + set_video_start_cb(config, driver_callback_delegate(&video_start_konamigx_6bpp, this)); MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_6, 0, 0, "none") @@ -1784,7 +1784,7 @@ MACHINE_CONFIG_START(konamigx_state::opengolf) MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_opengolf) - MCFG_VIDEO_START_OVERRIDE(konamigx_state, opengolf) + set_video_start_cb(config, driver_callback_delegate(&video_start_opengolf, this)); MCFG_DEVICE_MODIFY("k055673") MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -53, -23) @@ -1802,8 +1802,13 @@ MACHINE_CONFIG_START(konamigx_state::racinfrc) //MCFG_SCREEN_RAW_PARAMS(6000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223) //MCFG_SCREEN_VISIBLE_AREA(32, 32+384-1, 16, 16+224-1) +<<<<<<< HEAD MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_racinfrc) MCFG_VIDEO_START_OVERRIDE(konamigx_state, racinfrc) +======= + MCFG_GFXDECODE_ADD("gfxdecode", "palette", racinfrc) + set_video_start_cb(config, driver_callback_delegate(&video_start_racinfrc, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_DEVICE_MODIFY("k053252") MCFG_K053252_OFFSETS(24-8+16, 0) @@ -1830,8 +1835,13 @@ MACHINE_CONFIG_START(konamigx_state::gxtype3) MCFG_DEFAULT_LAYOUT(layout_dualhsxs) +<<<<<<< HEAD MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_type3) MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type3) +======= + MCFG_GFXDECODE_ADD("gfxdecode", "palette", type3) + set_video_start_cb(config, driver_callback_delegate(&video_start_konamigx_type3, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_DEVICE_MODIFY("k053252") MCFG_K053252_OFFSETS(0, 16) @@ -1889,8 +1899,13 @@ MACHINE_CONFIG_START(konamigx_state::gxtype4) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() +<<<<<<< HEAD MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_type4) MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4) +======= + MCFG_GFXDECODE_ADD("gfxdecode", "palette", type4) + set_video_start_cb(config, driver_callback_delegate(&video_start_konamigx_type4, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_DEVICE_MODIFY("k053252") MCFG_K053252_OFFSETS(0, 16) @@ -1920,7 +1935,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype4_vsn) MCFG_SCREEN_SIZE(1024, 1024) MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16) - MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4_vsn) + set_video_start_cb(config, driver_callback_delegate(&video_start_konamigx_type4_vsn, this)); MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_8, 0, 2, "none") // set djmain_hack to 2 to kill layer association or half the tilemaps vanish on screen 0 @@ -1931,7 +1946,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::gxtype4sd2) gxtype4(config); - MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4_sd2) + set_video_start_cb(config, driver_callback_delegate(&video_start_konamigx_type4_sd2, this)); MCFG_DEVICE_MODIFY("k055673") MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -81, -23) @@ -3725,7 +3740,7 @@ ROM_END /**********************************************************************************/ /* initializers */ -MACHINE_START_MEMBER(konamigx_state,konamigx) +void konamigx_state::machine_start_konamigx() { save_item(NAME(m_sound_ctrl)); save_item(NAME(m_sound_intck)); @@ -3740,7 +3755,7 @@ MACHINE_START_MEMBER(konamigx_state,konamigx) save_item(NAME(m_prev_pixel_clock)); } -MACHINE_RESET_MEMBER(konamigx_state,konamigx) +void konamigx_state::machine_reset_konamigx() { m_gx_wrport1_0 = m_gx_wrport1_1 = 0; m_gx_wrport2 = 0; diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index 938582bc444..862b80caf71 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -57,7 +57,7 @@ public: { } DECLARE_PALETTE_INIT(konmedal); - DECLARE_MACHINE_START(shuriboy); + void machine_start_shuriboy() ATTR_COLD; DECLARE_READ8_MEMBER(vram_r); DECLARE_WRITE8_MEMBER(vram_w); @@ -367,7 +367,7 @@ void konmedal_state::machine_start() membank("bank1")->set_entry(4); } -MACHINE_START_MEMBER(konmedal_state, shuriboy) +void konmedal_state::machine_start_shuriboy() { membank("bank1")->configure_entries(0, 0x8, memregion("maincpu")->base()+0x8000, 0x2000); membank("bank1")->set_entry(0); @@ -564,7 +564,7 @@ MACHINE_CONFIG_START(konmedal_state::shuriboy) MCFG_GFX_PALETTE("palette") MCFG_K052109_CB(konmedal_state, shuriboy_tile_callback) - MCFG_MACHINE_START_OVERRIDE(konmedal_state, shuriboy) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_shuriboy, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index c8abab8703e..28d892c7294 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -419,7 +419,7 @@ public: void init_ddr(); void init_hyperbbc(); void init_drmn(); - DECLARE_MACHINE_RESET( konami573 ); + void machine_reset_konami573(); WRITE_LINE_MEMBER( h8_clk_w ); DECLARE_READ_LINE_MEMBER( h8_d0_r ); DECLARE_READ_LINE_MEMBER( h8_d1_r ); @@ -800,7 +800,7 @@ void ksys573_state::driver_start() save_item( NAME( m_control ) ); } -MACHINE_RESET_MEMBER( ksys573_state,konami573 ) +void ksys573_state::machine_reset_konami573() { update_disc(); @@ -2082,7 +2082,7 @@ MACHINE_CONFIG_START(ksys573_state::konami573) MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&ksys573_state::cdrom_dma_read, this ) ) MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&ksys573_state::cdrom_dma_write, this ) ) - MCFG_MACHINE_RESET_OVERRIDE( ksys573_state, konami573 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_konami573, this)); MCFG_DEVICE_ADD( "mb89371", MB89371, 0 ) diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp index 917f124a246..490e0d04167 100644 --- a/src/mame/drivers/ladyfrog.cpp +++ b/src/mame/drivers/ladyfrog.cpp @@ -347,7 +347,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(ladyfrog_state::toucheme) ladyfrog(config); - MCFG_VIDEO_START_OVERRIDE(ladyfrog_state,toucheme) + set_video_start_cb(config, driver_callback_delegate(&video_start_toucheme, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp index 25d9ed59b19..b12237b165e 100644 --- a/src/mame/drivers/lasso.cpp +++ b/src/mame/drivers/lasso.cpp @@ -472,7 +472,7 @@ void lasso_state::machine_start() save_item(NAME(m_gfxbank)); } -MACHINE_START_MEMBER(lasso_state,wwjgtin) +void lasso_state::machine_start_wwjgtin() { lasso_state::machine_start(); @@ -484,7 +484,7 @@ void lasso_state::machine_reset() m_gfxbank = 0; } -MACHINE_RESET_MEMBER(lasso_state,wwjgtin) +void lasso_state::machine_reset_wwjgtin() { lasso_state::machine_reset(); @@ -565,8 +565,8 @@ MACHINE_CONFIG_START(lasso_state::wwjgtin) MCFG_DEVICE_MODIFY("audiocpu") MCFG_DEVICE_PROGRAM_MAP(wwjgtin_audio_map) - MCFG_MACHINE_START_OVERRIDE(lasso_state,wwjgtin) - MCFG_MACHINE_RESET_OVERRIDE(lasso_state,wwjgtin) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_wwjgtin, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_wwjgtin, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -577,7 +577,7 @@ MACHINE_CONFIG_START(lasso_state::wwjgtin) MCFG_PALETTE_ADD("palette", 0x40 + 16*16) MCFG_PALETTE_INDIRECT_ENTRIES(64) MCFG_PALETTE_INIT_OWNER(lasso_state,wwjgtin) - MCFG_VIDEO_START_OVERRIDE(lasso_state,wwjgtin) + set_video_start_cb(config, driver_callback_delegate(&video_start_wwjgtin, this)); /* sound hardware */ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC @@ -601,7 +601,7 @@ MACHINE_CONFIG_START(lasso_state::pinbo) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pinbo) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(lasso_state,pinbo) + set_video_start_cb(config, driver_callback_delegate(&video_start_pinbo, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_chameleo) diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp index 2a62c11077e..8e34d674e37 100644 --- a/src/mame/drivers/lastbank.cpp +++ b/src/mame/drivers/lastbank.cpp @@ -524,8 +524,8 @@ MACHINE_CONFIG_START(lastbank_state::lastbank) MCFG_QUANTUM_PERFECT_CPU("maincpu") - //MCFG_MACHINE_START_OVERRIDE(lastbank_state,lastbank) - //MCFG_MACHINE_RESET_OVERRIDE(lastbank_state,lastbank) + //set_machine_start_cb(config, driver_callback_delegate(&machine_start_lastbank, this)); + //set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lastbank, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -543,7 +543,7 @@ MACHINE_CONFIG_START(lastbank_state::lastbank) MCFG_DEVICE_ADD("tc0091lvc", TC0091LVC, 0) MCFG_TC0091LVC_GFXDECODE("gfxdecode") -// MCFG_VIDEO_START_OVERRIDE(lastbank_state,lastbank) +// set_video_start_cb(config, driver_callback_delegate(&video_start_lastbank, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp index 85373eee22a..8deb011d948 100644 --- a/src/mame/drivers/lastduel.cpp +++ b/src/mame/drivers/lastduel.cpp @@ -462,19 +462,19 @@ TIMER_DEVICE_CALLBACK_MEMBER(lastduel_state::madgear_timer_cb) m_maincpu->set_input_line(6, HOLD_LINE); /* Controls */ } -MACHINE_START_MEMBER(lastduel_state,lastduel) +void lastduel_state::machine_start_lastduel() { save_item(NAME(m_tilemap_priority)); save_item(NAME(m_scroll)); } -MACHINE_START_MEMBER(lastduel_state,madgear) +void lastduel_state::machine_start_madgear() { uint8_t *ROM = memregion("audiocpu")->base(); membank("bank1")->configure_entries(0, 2, &ROM[0x10000], 0x4000); - MACHINE_START_CALL_MEMBER(lastduel); + machine_start_lastduel(); } void lastduel_state::machine_reset() @@ -498,7 +498,7 @@ MACHINE_CONFIG_START(lastduel_state::lastduel) MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_MACHINE_START_OVERRIDE(lastduel_state,lastduel) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_lastduel, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -516,7 +516,7 @@ MACHINE_CONFIG_START(lastduel_state::lastduel) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastduel) MCFG_PALETTE_ADD("palette", 1024) - MCFG_VIDEO_START_OVERRIDE(lastduel_state,lastduel) + set_video_start_cb(config, driver_callback_delegate(&video_start_lastduel, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -543,7 +543,7 @@ MACHINE_CONFIG_START(lastduel_state::madgear) MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) MCFG_DEVICE_PROGRAM_MAP(madgear_sound_map) - MCFG_MACHINE_START_OVERRIDE(lastduel_state,madgear) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_madgear, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -561,7 +561,7 @@ MACHINE_CONFIG_START(lastduel_state::madgear) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_madgear) MCFG_PALETTE_ADD("palette", 1024) - MCFG_VIDEO_START_OVERRIDE(lastduel_state,madgear) + set_video_start_cb(config, driver_callback_delegate(&video_start_madgear, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index 35982c419ee..77d2030cbc6 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -1255,7 +1255,7 @@ MACHINE_CONFIG_START(legionna_state::legionna) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(legionna_state,legionna) + set_video_start_cb(config, driver_callback_delegate(&video_start_legionna, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1308,7 +1308,7 @@ MACHINE_CONFIG_START(legionna_state::heatbrl) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(legionna_state,heatbrl) + set_video_start_cb(config, driver_callback_delegate(&video_start_heatbrl, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1362,7 +1362,7 @@ MACHINE_CONFIG_START(legionna_state::godzilla) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(legionna_state,godzilla) + set_video_start_cb(config, driver_callback_delegate(&video_start_godzilla, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1415,7 +1415,7 @@ MACHINE_CONFIG_START(legionna_state::denjinmk) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(legionna_state,denjinmk) + set_video_start_cb(config, driver_callback_delegate(&video_start_denjinmk, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1468,7 +1468,7 @@ MACHINE_CONFIG_START(legionna_state::grainbow) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(legionna_state,grainbow) + set_video_start_cb(config, driver_callback_delegate(&video_start_grainbow, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1522,7 +1522,7 @@ MACHINE_CONFIG_START(legionna_state::cupsoc) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(legionna_state,cupsoc) + set_video_start_cb(config, driver_callback_delegate(&video_start_cupsoc, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp index 10314d30b57..eb6b1216ae3 100644 --- a/src/mame/drivers/leland.cpp +++ b/src/mame/drivers/leland.cpp @@ -1014,8 +1014,8 @@ MACHINE_CONFIG_START(leland_state::leland) MCFG_DEVICE_PROGRAM_MAP(slave_small_map_program) MCFG_DEVICE_IO_MAP(slave_map_io) - MCFG_MACHINE_START_OVERRIDE(leland_state,leland) - MCFG_MACHINE_RESET_OVERRIDE(leland_state,leland) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_leland, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_leland, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_NVRAM_ADD_0FILL("battery") @@ -1104,8 +1104,8 @@ MACHINE_CONFIG_START(leland_state::ataxx) MCFG_80186_CHIP_SELECT_CB(WRITE16("custom", leland_80186_sound_device, peripheral_ctrl)) MCFG_80186_TMROUT0_HANDLER(WRITELINE("custom", leland_80186_sound_device, i80186_tmr0_w)) - MCFG_MACHINE_START_OVERRIDE(leland_state,ataxx) - MCFG_MACHINE_RESET_OVERRIDE(leland_state,ataxx) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ataxx, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ataxx, this)); MCFG_EEPROM_SERIAL_93C56_ADD("eeprom") MCFG_EEPROM_SERIAL_ENABLE_STREAMING() diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp index dca2cb79432..effae172c78 100644 --- a/src/mame/drivers/liberate.cpp +++ b/src/mame/drivers/liberate.cpp @@ -719,7 +719,7 @@ WRITE_LINE_MEMBER(liberate_state::prosport_interrupt) * *************************************/ -MACHINE_START_MEMBER(liberate_state,liberate) +void liberate_state::machine_start_liberate() { save_item(NAME(m_background_disable)); save_item(NAME(m_background_color)); @@ -730,7 +730,7 @@ MACHINE_START_MEMBER(liberate_state,liberate) save_item(NAME(m_io_ram)); } -MACHINE_RESET_MEMBER(liberate_state,liberate) +void liberate_state::machine_reset_liberate() { memset(m_io_ram, 0, ARRAY_LENGTH(m_io_ram)); @@ -754,8 +754,8 @@ MACHINE_CONFIG_START(liberate_state::liberate_base) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) - MCFG_MACHINE_START_OVERRIDE(liberate_state,liberate) - MCFG_MACHINE_RESET_OVERRIDE(liberate_state,liberate) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_liberate, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_liberate, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -771,7 +771,7 @@ MACHINE_CONFIG_START(liberate_state::liberate_base) MCFG_PALETTE_ADD("palette", 33) MCFG_PALETTE_INIT_OWNER(liberate_state,liberate) - MCFG_VIDEO_START_OVERRIDE(liberate_state,liberate) + set_video_start_cb(config, driver_callback_delegate(&video_start_liberate, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -802,7 +802,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(liberate_state::boomrang) liberate_base(config); - MCFG_VIDEO_START_OVERRIDE(liberate_state,boomrang) + set_video_start_cb(config, driver_callback_delegate(&video_start_boomrang, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(liberate_state, screen_update_boomrang) MACHINE_CONFIG_END @@ -828,7 +828,7 @@ MACHINE_CONFIG_START(liberate_state::prosoccr) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_prosoccr) - MCFG_VIDEO_START_OVERRIDE(liberate_state,prosoccr) + set_video_start_cb(config, driver_callback_delegate(&video_start_prosoccr, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(liberate_state::prosport) @@ -844,8 +844,8 @@ MACHINE_CONFIG_START(liberate_state::prosport) // MCFG_QUANTUM_TIME(attotime::from_hz(12000)) - MCFG_MACHINE_START_OVERRIDE(liberate_state,liberate) - MCFG_MACHINE_RESET_OVERRIDE(liberate_state,liberate) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_liberate, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_liberate, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -861,7 +861,7 @@ MACHINE_CONFIG_START(liberate_state::prosport) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(BBGGGRRR_inverted) - MCFG_VIDEO_START_OVERRIDE(liberate_state,prosport) + set_video_start_cb(config, driver_callback_delegate(&video_start_prosport, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index 78a3d41b02a..650884f795d 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -206,8 +206,8 @@ MACHINE_CONFIG_START(llc_state::llc1) MCFG_DEVICE_PROGRAM_MAP(llc1_mem) MCFG_DEVICE_IO_MAP(llc1_io) - MCFG_MACHINE_START_OVERRIDE(llc_state, llc1 ) - MCFG_MACHINE_RESET_OVERRIDE(llc_state, llc1 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_llc1, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_llc1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -250,7 +250,7 @@ MACHINE_CONFIG_START(llc_state::llc2) MCFG_DEVICE_PROGRAM_MAP(llc2_mem) MCFG_DEVICE_IO_MAP(llc2_io) - MCFG_MACHINE_RESET_OVERRIDE(llc_state, llc2 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_llc2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index efd8f870659..09fc1bb137d 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -543,17 +543,13 @@ WRITE8_MEMBER(lsasquad_state::unk) { } -MACHINE_START_MEMBER(lsasquad_state,lsasquad) +void lsasquad_state::machine_start_lsasquad() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x2000); } -MACHINE_RESET_MEMBER(lsasquad_state,lsasquad) -{ -} - /* Note: lsasquad clock values are not verified */ MACHINE_CONFIG_START(lsasquad_state::lsasquad) @@ -572,8 +568,7 @@ MACHINE_CONFIG_START(lsasquad_state::lsasquad) /* synchronization of the CPUs */ /* main<->sound synchronization depends on this */ - MCFG_MACHINE_START_OVERRIDE(lsasquad_state,lsasquad) - MCFG_MACHINE_RESET_OVERRIDE(lsasquad_state,lsasquad) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_lsasquad, this)); MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>)) @@ -640,8 +635,7 @@ MACHINE_CONFIG_START(lsasquad_state::daikaiju) /* synchronization of the CPUs */ /* main<->sound synchronization depends on this */ - MCFG_MACHINE_START_OVERRIDE(lsasquad_state,lsasquad) - MCFG_MACHINE_RESET_OVERRIDE(lsasquad_state,lsasquad) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_lsasquad, this)); MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>)) diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp index 907e1b08f57..5f33f11de8d 100644 --- a/src/mame/drivers/lvcards.cpp +++ b/src/mame/drivers/lvcards.cpp @@ -83,14 +83,14 @@ TODO: #include "speaker.h" -MACHINE_START_MEMBER(lvcards_state,lvpoker) +void lvcards_state::machine_start_lvpoker() { save_item(NAME(m_payout)); save_item(NAME(m_pulse)); save_item(NAME(m_result)); } -MACHINE_RESET_MEMBER(lvcards_state,lvpoker) +void lvcards_state::machine_reset_lvpoker() { m_payout = 0; m_pulse = 0; @@ -491,8 +491,8 @@ MACHINE_CONFIG_START(lvcards_state::lvpoker) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(lvpoker_map) - MCFG_MACHINE_START_OVERRIDE(lvcards_state,lvpoker) - MCFG_MACHINE_RESET_OVERRIDE(lvcards_state,lvpoker) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_lvpoker, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lvpoker, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(lvcards_state::ponttehk) @@ -502,7 +502,7 @@ MACHINE_CONFIG_START(lvcards_state::ponttehk) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(ponttehk_map) - MCFG_MACHINE_RESET_OVERRIDE(lvcards_state,lvpoker) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lvpoker, this)); // video hardware MCFG_DEVICE_REMOVE("palette") diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 06ec4209d51..3015331c7c1 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -1037,7 +1037,7 @@ MACHINE_CONFIG_START(lwings_state::trojan) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_trojan) - MCFG_VIDEO_START_OVERRIDE(lwings_state,trojan) + set_video_start_cb(config, driver_callback_delegate(&video_start_trojan, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(lwings_state, screen_update_trojan) @@ -1062,13 +1062,13 @@ MACHINE_CONFIG_START(lwings_state::avengers) MCFG_DEVICE_IO_MAP(avengers_adpcm_io_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(lwings_state,avengers) + set_video_start_cb(config, driver_callback_delegate(&video_start_avengers, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(lwings_state::avengersb) avengers(config); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(lwings_state,avengersb) + set_video_start_cb(config, driver_callback_delegate(&video_start_avengersb, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp index 933c2599b65..bac652826a5 100644 --- a/src/mame/drivers/m10.cpp +++ b/src/mame/drivers/m10.cpp @@ -168,7 +168,7 @@ PALETTE_INIT_MEMBER(m10_state,m10) } } -MACHINE_START_MEMBER(m10_state,m10) +void m10_state::machine_start_m10() { m_interrupt_timer = timer_alloc(TIMER_INTERRUPT); @@ -177,7 +177,7 @@ MACHINE_START_MEMBER(m10_state,m10) save_item(NAME(m_last)); } -MACHINE_RESET_MEMBER(m10_state,m10) +void m10_state::machine_reset_m10() { m_bottomline = 0; m_flip = 0; @@ -818,8 +818,8 @@ MACHINE_CONFIG_START(m10_state::m10) MCFG_DEVICE_ADD("maincpu", M6502,IREMM10_CPU_CLOCK) MCFG_DEVICE_PROGRAM_MAP(m10_main) - MCFG_MACHINE_START_OVERRIDE(m10_state,m10) - MCFG_MACHINE_RESET_OVERRIDE(m10_state,m10) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_m10, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_m10, this)); //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m10_state, m10_interrupt) @@ -833,7 +833,7 @@ MACHINE_CONFIG_START(m10_state::m10) MCFG_PALETTE_ADD("palette", 2*8) MCFG_PALETTE_INIT_OWNER(m10_state,m10) - MCFG_VIDEO_START_OVERRIDE(m10_state,m10) + set_video_start_cb(config, driver_callback_delegate(&video_start_m10, this)); /* 74LS123 */ @@ -882,8 +882,8 @@ MACHINE_CONFIG_START(m10_state::m15) MCFG_DEVICE_ADD("maincpu", M6502,IREMM15_CPU_CLOCK) MCFG_DEVICE_PROGRAM_MAP(m15_main) - MCFG_MACHINE_START_OVERRIDE(m10_state,m10) - MCFG_MACHINE_RESET_OVERRIDE(m10_state,m10) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_m10, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_m10, this)); MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m10_state, m15_interrupt) @@ -897,7 +897,7 @@ MACHINE_CONFIG_START(m10_state::m15) MCFG_PALETTE_ADD("palette", 2*8) MCFG_PALETTE_INIT_OWNER(m10_state,m10) - MCFG_VIDEO_START_OVERRIDE(m10_state, m15 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_m15, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/m62.cpp b/src/mame/drivers/m62.cpp index 0c207e09c98..7358ecbc7ab 100644 --- a/src/mame/drivers/m62.cpp +++ b/src/mame/drivers/m62.cpp @@ -944,7 +944,7 @@ void m62_state::machine_start() m62_amplify_contrast(1); } -MACHINE_START_MEMBER(m62_state, battroad) +void m62_state::machine_start_battroad() { machine_init_save(); m62_amplify_contrast(0); @@ -1012,7 +1012,7 @@ MACHINE_CONFIG_START(m62_state::kungfum) MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_kungfum) - MCFG_VIDEO_START_OVERRIDE(m62_state,kungfum) + set_video_start_cb(config, driver_callback_delegate(&video_start_kungfum, this)); MACHINE_CONFIG_END @@ -1025,7 +1025,7 @@ MACHINE_CONFIG_START(m62_state::battroad) MCFG_DEVICE_PROGRAM_MAP(battroad_map) MCFG_DEVICE_IO_MAP(battroad_io_map) - MCFG_MACHINE_START_OVERRIDE(m62_state,battroad) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_battroad, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1037,7 +1037,7 @@ MACHINE_CONFIG_START(m62_state::battroad) MCFG_PALETTE_ADD("fg_palette", 32) MCFG_PALETTE_INIT_OWNER(m62_state,m62_battroad_fg) - MCFG_VIDEO_START_OVERRIDE(m62_state,battroad) + set_video_start_cb(config, driver_callback_delegate(&video_start_battroad, this)); MACHINE_CONFIG_END @@ -1049,7 +1049,7 @@ MACHINE_CONFIG_START(m62_state::ldrun2) MCFG_DEVICE_PROGRAM_MAP(ldrun2_map) MCFG_DEVICE_IO_MAP(ldrun2_io_map) - MCFG_VIDEO_START_OVERRIDE(m62_state,ldrun2) + set_video_start_cb(config, driver_callback_delegate(&video_start_ldrun2, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_ldrun) MACHINE_CONFIG_END @@ -1064,7 +1064,7 @@ MACHINE_CONFIG_START(m62_state::ldrun3) MCFG_DEVICE_IO_MAP(ldrun3_io_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(m62_state,ldrun2) + set_video_start_cb(config, driver_callback_delegate(&video_start_ldrun2, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_ldrun3) MACHINE_CONFIG_END @@ -1079,7 +1079,7 @@ MACHINE_CONFIG_START(m62_state::ldrun4) MCFG_DEVICE_IO_MAP(ldrun4_io_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(m62_state,ldrun4) + set_video_start_cb(config, driver_callback_delegate(&video_start_ldrun4, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_ldrun4) MACHINE_CONFIG_END @@ -1101,7 +1101,7 @@ MACHINE_CONFIG_START(m62_state::lotlot) MCFG_PALETTE_INIT_OWNER(m62_state,m62_lotlot_fg) - MCFG_VIDEO_START_OVERRIDE(m62_state,lotlot) + set_video_start_cb(config, driver_callback_delegate(&video_start_lotlot, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_lotlot) MACHINE_CONFIG_END @@ -1118,7 +1118,7 @@ MACHINE_CONFIG_START(m62_state::kidniki) /* video hardware */ MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "chr_palette", gfx_m62_fg_kidniki) - MCFG_VIDEO_START_OVERRIDE(m62_state,kidniki) + set_video_start_cb(config, driver_callback_delegate(&video_start_kidniki, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_kidniki) MACHINE_CONFIG_END @@ -1134,7 +1134,7 @@ MACHINE_CONFIG_START(m62_state::spelunkr) /* video hardware */ MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "chr_palette", gfx_m62_fg_spelunkr) - MCFG_VIDEO_START_OVERRIDE(m62_state,spelunkr) + set_video_start_cb(config, driver_callback_delegate(&video_start_spelunkr, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_spelunkr) MACHINE_CONFIG_END @@ -1156,7 +1156,7 @@ MACHINE_CONFIG_START(m62_state::spelunk2) MCFG_PALETTE_ENTRIES(512) MCFG_PALETTE_INIT_OWNER(m62_state,spelunk2) - MCFG_VIDEO_START_OVERRIDE(m62_state,spelunk2) + set_video_start_cb(config, driver_callback_delegate(&video_start_spelunk2, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_spelunk2) MACHINE_CONFIG_END @@ -1179,7 +1179,7 @@ MACHINE_CONFIG_START(m62_state::youjyudn) MCFG_GFXDECODE_MODIFY("chr_decode", gfx_m62_tiles_youjyudn) MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "chr_palette", gfx_m62_fg_youjyudn) - MCFG_VIDEO_START_OVERRIDE(m62_state,youjyudn) + set_video_start_cb(config, driver_callback_delegate(&video_start_youjyudn, this)); MACHINE_CONFIG_END @@ -1195,7 +1195,7 @@ MACHINE_CONFIG_START(m62_state::horizon) MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_horizon) - MCFG_VIDEO_START_OVERRIDE(m62_state,horizon) + set_video_start_cb(config, driver_callback_delegate(&video_start_horizon, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index 66c2556fae9..84cf4c1df64 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -202,9 +202,9 @@ public: void init_fghtbskt(); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_MACHINE_START(m63); - DECLARE_MACHINE_RESET(m63); - DECLARE_VIDEO_START(m63); + void machine_start_m63() ATTR_COLD; + void machine_reset_m63(); + void video_start_m63() ATTR_COLD; DECLARE_PALETTE_INIT(m63); uint32_t screen_update_m63(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(snd_irq); @@ -329,7 +329,7 @@ TILE_GET_INFO_MEMBER(m63_state::get_fg_tile_info) SET_TILE_INFO_MEMBER(0, code, 0, m_fg_flag); } -VIDEO_START_MEMBER(m63_state,m63) +void m63_state::video_start_m63() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m63_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m63_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -722,7 +722,7 @@ INTERRUPT_GEN_MEMBER(m63_state::snd_irq) m_sound_irq = 1; } -MACHINE_START_MEMBER(m63_state,m63) +void m63_state::machine_start_m63() { save_item(NAME(m_pal_bank)); save_item(NAME(m_fg_flag)); @@ -735,7 +735,7 @@ MACHINE_START_MEMBER(m63_state,m63) save_item(NAME(m_p2)); } -MACHINE_RESET_MEMBER(m63_state,m63) +void m63_state::machine_reset_m63() { m_pal_bank = 0; m_fg_flag = 0; @@ -774,8 +774,8 @@ MACHINE_CONFIG_START(m63_state::m63) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, m63_state, irq_r)) MCFG_DEVICE_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60) - MCFG_MACHINE_START_OVERRIDE(m63_state,m63) - MCFG_MACHINE_RESET_OVERRIDE(m63_state,m63) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_m63, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_m63, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -790,7 +790,7 @@ MACHINE_CONFIG_START(m63_state::m63) MCFG_PALETTE_ADD("palette", 256+4) MCFG_PALETTE_INIT_OWNER(m63_state,m63) - MCFG_VIDEO_START_OVERRIDE(m63_state,m63) + set_video_start_cb(config, driver_callback_delegate(&video_start_m63, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); /* ????? */ @@ -827,8 +827,8 @@ MACHINE_CONFIG_START(m63_state::fghtbskt) MCFG_DEVICE_IO_MAP(i8039_port_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60/2) - MCFG_MACHINE_START_OVERRIDE(m63_state,m63) - MCFG_MACHINE_RESET_OVERRIDE(m63_state,m63) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_m63, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_m63, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -841,7 +841,7 @@ MACHINE_CONFIG_START(m63_state::fghtbskt) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fghtbskt) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(m63_state,m63) + set_video_start_cb(config, driver_callback_delegate(&video_start_m63, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index 030e082e482..bc0108baaaa 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -212,7 +212,7 @@ void m72_state::machine_start() m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m72_state::scanline_interrupt),this)); } -MACHINE_START_MEMBER(m72_state,kengo) +void m72_state::machine_start_kengo() { m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(m72_state::kengo_scanline_interrupt),this)); } @@ -232,7 +232,7 @@ void m72_state::machine_reset() machine().scheduler().synchronize(timer_expired_delegate(FUNC(m72_state::synch_callback),this)); } -MACHINE_RESET_MEMBER(m72_state,kengo) +void m72_state::machine_reset_kengo() { m_scanline_timer->adjust(m_screen->time_until_pos(0)); } @@ -1902,7 +1902,7 @@ MACHINE_CONFIG_START(m72_state::m72_base) MCFG_SCREEN_UPDATE_DRIVER(m72_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(m72_state,m72) + set_video_start_cb(config, driver_callback_delegate(&video_start_m72, this)); m72_audio_chips(config); MACHINE_CONFIG_END @@ -1977,7 +1977,7 @@ MACHINE_CONFIG_START(m72_state::m81_hharry) MCFG_DEVICE_IO_MAP(rtype2_sound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) - MCFG_VIDEO_START_OVERRIDE(m72_state,hharry) + set_video_start_cb(config, driver_callback_delegate(&video_start_hharry, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m72_state, screen_update_m81) @@ -1989,7 +1989,7 @@ MACHINE_CONFIG_START(m72_state::m81_xmultipl) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(xmultipl_map) - MCFG_VIDEO_START_OVERRIDE(m72_state,xmultipl) // different offsets + set_video_start_cb(config, driver_callback_delegate(&video_start_xmultipl, this)); // different offsets MACHINE_CONFIG_END MACHINE_CONFIG_START(m72_state::m81_dbreed) @@ -2027,7 +2027,7 @@ MACHINE_CONFIG_START(m72_state::rtype2) MCFG_SCREEN_UPDATE_DRIVER(m72_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(m72_state,rtype2) + set_video_start_cb(config, driver_callback_delegate(&video_start_rtype2, this)); m72_audio_chips(config); MACHINE_CONFIG_END @@ -2039,7 +2039,7 @@ MACHINE_CONFIG_START(m72_state::hharryu) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(hharryu_map) - MCFG_VIDEO_START_OVERRIDE(m72_state,hharryu) + set_video_start_cb(config, driver_callback_delegate(&video_start_hharryu, this)); MACHINE_CONFIG_END @@ -2058,8 +2058,8 @@ MACHINE_CONFIG_START(m72_state::cosmccop) MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ - MCFG_MACHINE_START_OVERRIDE(m72_state,kengo) - MCFG_MACHINE_RESET_OVERRIDE(m72_state,kengo) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_kengo, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_kengo, this)); // upd71059c isn't needed beacuse the V35 has its own IRQ controller @@ -2072,7 +2072,7 @@ MACHINE_CONFIG_START(m72_state::cosmccop) MCFG_SCREEN_UPDATE_DRIVER(m72_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(m72_state,hharryu) + set_video_start_cb(config, driver_callback_delegate(&video_start_hharryu, this)); m72_audio_chips(config); MACHINE_CONFIG_END @@ -2117,7 +2117,7 @@ MACHINE_CONFIG_START(m72_state::m82) MCFG_SCREEN_UPDATE_DRIVER(m72_state, screen_update_m82) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(m72_state,m82) + set_video_start_cb(config, driver_callback_delegate(&video_start_m82, this)); m72_audio_chips(config); MACHINE_CONFIG_END @@ -2160,7 +2160,7 @@ MACHINE_CONFIG_START(m72_state::poundfor) MCFG_SCREEN_UPDATE_DRIVER(m72_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(m72_state,poundfor) + set_video_start_cb(config, driver_callback_delegate(&video_start_poundfor, this)); m72_audio_chips(config); MACHINE_CONFIG_END diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index 570cc02e6ec..2a5e9d8df04 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -851,7 +851,7 @@ MACHINE_CONFIG_START(m90_state::bomblord) MCFG_SCREEN_UPDATE_DRIVER(m90_state, screen_update_bomblord) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, m90_state, bomblord_vblank_int_w)) - MCFG_VIDEO_START_OVERRIDE(m90_state,bomblord) + set_video_start_cb(config, driver_callback_delegate(&video_start_bomblord, this)); MACHINE_CONFIG_END @@ -872,7 +872,7 @@ MACHINE_CONFIG_START(m90_state::dynablsb) MCFG_SCREEN_UPDATE_DRIVER(m90_state, screen_update_dynablsb) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, m90_state, dynablsb_vblank_int_w)) - MCFG_VIDEO_START_OVERRIDE(m90_state,dynablsb) + set_video_start_cb(config, driver_callback_delegate(&video_start_dynablsb, this)); MCFG_DEVICE_REMOVE("m72") MCFG_DEVICE_REMOVE("soundirq") diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index 0af2c443394..db6b36805e5 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -215,7 +215,7 @@ psoldier dip locations still need verification. /*****************************************************************************/ -MACHINE_RESET_MEMBER(m92_state,m92) +void m92_state::machine_reset_m92() { m_sprite_buffer_busy = 1; } @@ -905,7 +905,7 @@ MACHINE_CONFIG_START(m92_state::m92) MCFG_DEVICE_ADD("upd71059c", PIC8259, 0) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) - MCFG_MACHINE_RESET_OVERRIDE(m92_state,m92) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_m92, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", m92_state, m92_scanline_interrupt, "screen", 0, 1) @@ -924,7 +924,7 @@ MACHINE_CONFIG_START(m92_state::m92) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(m92_state,m92) + set_video_start_cb(config, driver_callback_delegate(&video_start_m92, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1004,7 +1004,7 @@ MACHINE_CONFIG_START(m92_state::ppan) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(m92_state, screen_update_ppan) - MCFG_VIDEO_START_OVERRIDE(m92_state,ppan) + set_video_start_cb(config, driver_callback_delegate(&video_start_ppan, this)); MCFG_DEVICE_ADD("oki", OKIM6295, 1000000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index 1a785cc2182..3167a1c1f8a 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -417,7 +417,7 @@ WRITE8_MEMBER ( mac_state::mac_rbv_w ) } // Portable/PB100 video -VIDEO_START_MEMBER(mac_state,macprtb) +void mac_state::video_start_macprtb() { } @@ -950,7 +950,7 @@ MACHINE_CONFIG_START(mac_state::mac512ke) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(mac_state,mac) - MCFG_VIDEO_START_OVERRIDE(mac_state,mac) + set_video_start_cb(config, driver_callback_delegate(&video_start_mac, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mac_state, mac_scanline, "screen", 0, 1) @@ -1079,7 +1079,7 @@ MACHINE_CONFIG_START(mac_state::macprtb) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(mac_state,mac) - MCFG_VIDEO_START_OVERRIDE(mac_state,macprtb) + set_video_start_cb(config, driver_callback_delegate(&video_start_macprtb, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1274,8 +1274,8 @@ MACHINE_CONFIG_START(mac_state::maclc) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(256) - MCFG_VIDEO_START_OVERRIDE(mac_state,macv8) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,macrbv) + set_video_start_cb(config, driver_callback_delegate(&video_start_macv8, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_macrbv, this)); MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) @@ -1355,8 +1355,8 @@ MACHINE_CONFIG_START(mac_state::maclc3) MCFG_DEVICE_PROGRAM_MAP(maclc3_map) MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) - MCFG_VIDEO_START_OVERRIDE(mac_state,macsonora) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,macsonora) + set_video_start_cb(config, driver_callback_delegate(&video_start_macsonora, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_macsonora, this)); MCFG_SCREEN_MODIFY(MAC_SCREEN_NAME) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macsonora) @@ -1397,8 +1397,8 @@ MACHINE_CONFIG_START(mac_state::maciivx) MCFG_DEVICE_PROGRAM_MAP(maclc3_map) MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) - MCFG_VIDEO_START_OVERRIDE(mac_state,macv8) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,macrbv) + set_video_start_cb(config, driver_callback_delegate(&video_start_macv8, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_macrbv, this)); MCFG_SCREEN_MODIFY(MAC_SCREEN_NAME) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbvvram) @@ -1433,8 +1433,8 @@ MACHINE_CONFIG_START(mac_state::maciivi) MCFG_DEVICE_PROGRAM_MAP(maclc3_map) MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) - MCFG_VIDEO_START_OVERRIDE(mac_state,macv8) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,macrbv) + set_video_start_cb(config, driver_callback_delegate(&video_start_macv8, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_macrbv, this)); MCFG_SCREEN_MODIFY(MAC_SCREEN_NAME) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbvvram) @@ -1500,7 +1500,7 @@ MACHINE_CONFIG_START(mac_state::macse30) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(mac_state,mac) - MCFG_VIDEO_START_OVERRIDE(mac_state,mac) + set_video_start_cb(config, driver_callback_delegate(&video_start_mac, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1579,7 +1579,7 @@ MACHINE_CONFIG_START(mac_state::macpb140) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(mac_state,mac) - MCFG_VIDEO_START_OVERRIDE(mac_state,macprtb) + set_video_start_cb(config, driver_callback_delegate(&video_start_macprtb, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1670,7 +1670,7 @@ MACHINE_CONFIG_START(mac_state::macpb160) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(mac_state,macgsc) - MCFG_VIDEO_START_OVERRIDE(mac_state,macprtb) + set_video_start_cb(config, driver_callback_delegate(&video_start_macprtb, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1763,8 +1763,8 @@ MACHINE_CONFIG_START(mac_state::macclas2) MCFG_DEVICE_PROGRAM_MAP(maclc_map) MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) - MCFG_VIDEO_START_OVERRIDE(mac_state,macv8) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,maceagle) + set_video_start_cb(config, driver_callback_delegate(&video_start_macv8, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_maceagle, this)); MCFG_SCREEN_MODIFY(MAC_SCREEN_NAME) MCFG_SCREEN_SIZE(MAC_H_TOTAL, MAC_V_TOTAL) @@ -1801,8 +1801,8 @@ MACHINE_CONFIG_START(mac_state::maciici) MCFG_NUBUS_SLOT_REMOVE("nba") MCFG_NUBUS_SLOT_REMOVE("nbb") - MCFG_VIDEO_START_OVERRIDE(mac_state,macrbv) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,macrbv) + set_video_start_cb(config, driver_callback_delegate(&video_start_macrbv, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_macrbv, this)); MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) @@ -1836,8 +1836,8 @@ MACHINE_CONFIG_START(mac_state::maciisi) MCFG_NUBUS_SLOT_REMOVE("nbe") MCFG_DEVICE_REMOVE("nubus") - MCFG_VIDEO_START_OVERRIDE(mac_state,macrbv) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,macrbv) + set_video_start_cb(config, driver_callback_delegate(&video_start_macrbv, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_macrbv, this)); MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480) @@ -1880,8 +1880,8 @@ MACHINE_CONFIG_START(mac_state::pwrmac) MCFG_PALETTE_ADD("palette", 256) - MCFG_VIDEO_START_OVERRIDE(mac_state,macsonora) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,macrbv) + set_video_start_cb(config, driver_callback_delegate(&video_start_macsonora, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_macrbv, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1945,8 +1945,8 @@ MACHINE_CONFIG_START(mac_state::macqd700) MCFG_SCREEN_VISIBLE_AREA(0, 1152-1, 0, 870-1) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macdafb) - MCFG_VIDEO_START_OVERRIDE(mac_state,macdafb) - MCFG_VIDEO_RESET_OVERRIDE(mac_state,macdafb) + set_video_start_cb(config, driver_callback_delegate(&video_start_macdafb, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_macdafb, this)); MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index c998cbba7e2..a8053e6be21 100644 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -238,7 +238,7 @@ public: void init_mac128k512k(); void init_mac512ke(); void init_macplus(); - DECLARE_VIDEO_START(mac); + void video_start_mac() ATTR_COLD; DECLARE_PALETTE_INIT(mac); uint32_t screen_update_mac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); #ifndef MAC_USE_EMULATED_KBD @@ -1227,7 +1227,7 @@ PALETTE_INIT_MEMBER(mac128_state,mac) palette.set_pen_color(1, 0x00, 0x00, 0x00); } -VIDEO_START_MEMBER(mac128_state,mac) +void mac128_state::video_start_mac() { } @@ -1339,7 +1339,7 @@ MACHINE_CONFIG_START(mac128_state::mac512ke) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(mac128_state,mac) - MCFG_VIDEO_START_OVERRIDE(mac128_state,mac) + set_video_start_cb(config, driver_callback_delegate(&video_start_mac, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mac128_state, mac_scanline, "screen", 0, 1) diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp index b81b8700705..6986808a190 100644 --- a/src/mame/drivers/macs.cpp +++ b/src/mame/drivers/macs.cpp @@ -90,8 +90,8 @@ public: void init_kisekaeh(); void init_kisekaem(); void init_macs2(); - DECLARE_MACHINE_RESET(macs); - DECLARE_MACHINE_START(macs); + void machine_reset_macs(); + void machine_start_macs(); ST0016_DMA_OFFS_CB(dma_offset); uint32_t screen_update_macs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -505,8 +505,8 @@ MACHINE_CONFIG_START(macs_state::macs) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", macs_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(macs_state, macs) - MCFG_MACHINE_RESET_OVERRIDE(macs_state, macs) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_macs, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_macs, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -654,7 +654,7 @@ static const uint8_t ramdata[160]= }; #endif -MACHINE_START_MEMBER(macs_state,macs) +void macs_state::machine_start_macs() { m_rombank[0]->configure_entries(0 , 256, memregion("maincpu")->base(), 0x4000); m_rombank[0]->configure_entries(256, 256, m_cart1->get_rom_base(), 0x4000); @@ -673,7 +673,7 @@ MACHINE_START_MEMBER(macs_state,macs) m_rambank[1]->set_entry(0); } -MACHINE_RESET_MEMBER(macs_state,macs) +void macs_state::machine_reset_macs() { #if 0 uint8_t *macs_ram1 = m_ram1.get(); diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp index 8aad5870620..18a2163f904 100644 --- a/src/mame/drivers/magicfly.cpp +++ b/src/mame/drivers/magicfly.cpp @@ -477,7 +477,7 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(magicfly); DECLARE_PALETTE_INIT(bchance); - DECLARE_VIDEO_START(7mezzo); + void video_start_7mezzo() ATTR_COLD; uint32_t screen_update_magicfly(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<dac_bit_interface> m_dac; @@ -563,7 +563,7 @@ TILE_GET_INFO_MEMBER(magicfly_state::get_7mezzo_tile_info) SET_TILE_INFO_MEMBER(bank, code, color, 0); } -VIDEO_START_MEMBER(magicfly_state, 7mezzo) +void magicfly_state::video_start_7mezzo() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(magicfly_state::get_7mezzo_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29); } @@ -975,7 +975,7 @@ MACHINE_CONFIG_START(magicfly_state::_7mezzo) magicfly(config); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(magicfly_state, 7mezzo) + set_video_start_cb(config, driver_callback_delegate(&video_start_7mezzo, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp index d2b013fe385..76cc36b5cd6 100644 --- a/src/mame/drivers/mappy.cpp +++ b/src/mame/drivers/mappy.cpp @@ -1354,7 +1354,7 @@ MACHINE_CONFIG_START(mappy_state::superpac_common) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mappy_state, vblank_irq)) // cause IRQs on both CPUs; also update the custom I/O chips - MCFG_VIDEO_START_OVERRIDE(mappy_state,superpac) + set_video_start_cb(config, driver_callback_delegate(&video_start_superpac, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1482,7 +1482,7 @@ MACHINE_CONFIG_START(mappy_state::phozon) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mappy_state, vblank_irq)) // cause IRQs on all three CPUs; also update the custom I/O chips - MCFG_VIDEO_START_OVERRIDE(mappy_state,phozon) + set_video_start_cb(config, driver_callback_delegate(&video_start_phozon, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1532,7 +1532,7 @@ MACHINE_CONFIG_START(mappy_state::mappy_common) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mappy_state, vblank_irq)) // cause IRQs on both CPUs; also update the custom I/O chips - MCFG_VIDEO_START_OVERRIDE(mappy_state,mappy) + set_video_start_cb(config, driver_callback_delegate(&video_start_mappy, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index ad60406944f..118117a8658 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -652,7 +652,7 @@ MACHINE_CONFIG_START(mbee_state::mbee) MCFG_DEVICE_IO_MAP(mbee_io) MCFG_Z80_DAISY_CHAIN(mbee_daisy_chain) - MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mbee, this)); MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(12'000'000) / 6) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(mbee_state::mbee) MCFG_PALETTE_ADD("palette", 100) MCFG_PALETTE_INIT_OWNER(mbee_state, standard) - MCFG_VIDEO_START_OVERRIDE(mbee_state, mono) + set_video_start_cb(config, driver_callback_delegate(&video_start_mono, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -709,7 +709,7 @@ MACHINE_CONFIG_START(mbee_state::mbeeic) MCFG_DEVICE_IO_MAP(mbeeic_io) MCFG_Z80_DAISY_CHAIN(mbee_daisy_chain) - MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mbee, this)); MCFG_DEVICE_ADD("z80pio", Z80PIO, 3375000) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) @@ -730,7 +730,7 @@ MACHINE_CONFIG_START(mbee_state::mbeeic) MCFG_PALETTE_ADD("palette", 100) MCFG_PALETTE_INIT_OWNER(mbee_state, standard) - MCFG_VIDEO_START_OVERRIDE(mbee_state, standard) + set_video_start_cb(config, driver_callback_delegate(&video_start_standard, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -770,7 +770,7 @@ MACHINE_CONFIG_START(mbee_state::mbeeppc) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP(mbeeppc_mem) MCFG_DEVICE_IO_MAP(mbeeppc_io) - MCFG_VIDEO_START_OVERRIDE(mbee_state, premium) + set_video_start_cb(config, driver_callback_delegate(&video_start_premium, this)); MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_premium) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(mbee_state, premium) @@ -783,7 +783,7 @@ MACHINE_CONFIG_START(mbee_state::mbee56) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP(mbee56_mem) MCFG_DEVICE_IO_MAP(mbee56_io) - MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee56) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mbee56, this)); MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_drq_w)) @@ -799,7 +799,7 @@ MACHINE_CONFIG_START(mbee_state::mbee128) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP(mbee256_mem) MCFG_DEVICE_IO_MAP(mbee128_io) - MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mbee128, this)); MCFG_MC146818_ADD( "rtc", XTAL(32'768) ) MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, mbee_state, rtc_irq_w)) MACHINE_CONFIG_END @@ -809,7 +809,7 @@ MACHINE_CONFIG_START(mbee_state::mbee128p) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP(mbee256_mem) MCFG_DEVICE_IO_MAP(mbee128_io) - MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mbee128, this)); MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_drq_w)) @@ -825,7 +825,7 @@ MACHINE_CONFIG_START(mbee_state::mbee256) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP(mbee256_mem) MCFG_DEVICE_IO_MAP(mbee256_io) - MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee256) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mbee256, this)); MCFG_DEVICE_REMOVE("fdc:0") MCFG_DEVICE_REMOVE("fdc:1") @@ -840,7 +840,7 @@ MACHINE_CONFIG_START(mbee_state::mbeett) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP(mbeett_mem) MCFG_DEVICE_IO_MAP(mbeett_io) - MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbeett) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mbeett, this)); MCFG_DEVICE_REMOVE("quickload") MCFG_DEVICE_REMOVE("quickload2") MCFG_DEVICE_ADD("scc", SCC8530, 4000000) // clock unknown diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp index 15f945b433e..2e0fa13c978 100644 --- a/src/mame/drivers/mc1502.cpp +++ b/src/mame/drivers/mc1502.cpp @@ -182,7 +182,7 @@ void mc1502_state::init_mc1502() membank("bank10")->set_base(m_ram->pointer()); } -MACHINE_START_MEMBER(mc1502_state, mc1502) +void mc1502_state::machine_start_mc1502() { /* Keyboard polling circuit holds IRQ1 high until a key is @@ -197,7 +197,7 @@ MACHINE_START_MEMBER(mc1502_state, mc1502) m_kbd.keyb_signal_timer->adjust(attotime::from_msec(20), 0, attotime::from_msec(20)); } -MACHINE_RESET_MEMBER(mc1502_state, mc1502) +void mc1502_state::machine_reset_mc1502() { m_spkrdata = 0; m_pit_out2 = 1; @@ -236,8 +236,8 @@ MACHINE_CONFIG_START(mc1502_state::mc1502) MCFG_DEVICE_IO_MAP(mc1502_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) - MCFG_MACHINE_START_OVERRIDE( mc1502_state, mc1502 ) - MCFG_MACHINE_RESET_OVERRIDE( mc1502_state, mc1502 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mc1502, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mc1502, this)); MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_PIT8253_CLK0(XTAL(16'000'000)/12) /* heartbeat IRQ */ diff --git a/src/mame/drivers/mcb216.cpp b/src/mame/drivers/mcb216.cpp index 4a76c429e9f..d3f356da224 100644 --- a/src/mame/drivers/mcb216.cpp +++ b/src/mame/drivers/mcb216.cpp @@ -48,8 +48,8 @@ public: DECLARE_READ8_MEMBER(tms5501_status_r); - DECLARE_MACHINE_RESET(mcb216); - DECLARE_MACHINE_RESET(cb308); + void machine_reset_mcb216(); + void machine_reset_cb308(); IRQ_CALLBACK_MEMBER(irq_callback); @@ -108,11 +108,11 @@ IRQ_CALLBACK_MEMBER(mcb216_state::irq_callback) return m_tms5501->get_vector(); } -MACHINE_RESET_MEMBER( mcb216_state, mcb216 ) +void mcb216_state::machine_reset_mcb216() { } -MACHINE_RESET_MEMBER( mcb216_state, cb308 ) +void mcb216_state::machine_reset_cb308() { m_maincpu->set_state_int(Z80_PC, 0xe000); } @@ -124,7 +124,7 @@ MACHINE_CONFIG_START(mcb216_state::mcb216) MCFG_DEVICE_IO_MAP(mcb216_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mcb216_state, irq_callback) - MCFG_MACHINE_RESET_OVERRIDE(mcb216_state, mcb216) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mcb216, this)); MCFG_DEVICE_ADD("tms5501", TMS5501, 8_MHz_XTAL / 4) MCFG_TMS5501_XMT_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd)) @@ -141,7 +141,7 @@ MACHINE_CONFIG_START(mcb216_state::cb308) MCFG_DEVICE_IO_MAP(mcb216_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mcb216_state, irq_callback) - MCFG_MACHINE_RESET_OVERRIDE(mcb216_state, cb308) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cb308, this)); MCFG_DEVICE_ADD("tms5501", TMS5501, 8_MHz_XTAL / 4) MCFG_TMS5501_XMT_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd)) diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp index 3af3f26e2ef..c65da206067 100644 --- a/src/mame/drivers/mcr3.cpp +++ b/src/mame/drivers/mcr3.cpp @@ -1175,7 +1175,7 @@ MACHINE_CONFIG_START(mcr3_state::mcrscroll) MCFG_PALETTE_ENTRIES(64+4) MCFG_PALETTE_INIT_OWNER(mcr3_state,spyhunt) - MCFG_VIDEO_START_OVERRIDE(mcr3_state,spyhunt) + set_video_start_cb(config, driver_callback_delegate(&video_start_spyhunt, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp index 362d4cec05a..9cf9bb93ea0 100644 --- a/src/mame/drivers/mcr68.cpp +++ b/src/mame/drivers/mcr68.cpp @@ -903,8 +903,8 @@ MACHINE_CONFIG_START(mcr68_state::mcr68) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_VBLANK_INIT("screen", 8) - MCFG_MACHINE_START_OVERRIDE(mcr68_state,mcr68) - MCFG_MACHINE_RESET_OVERRIDE(mcr68_state,mcr68) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mcr68, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mcr68, this)); MCFG_DEVICE_ADD("ptm", PTM6840, 7723800 / 10) MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", 2)) @@ -924,7 +924,7 @@ MACHINE_CONFIG_START(mcr68_state::mcr68) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_FORMAT(xxxxxxxRRRBBBGGG) - MCFG_VIDEO_START_OVERRIDE(mcr68_state,mcr68) + set_video_start_cb(config, driver_callback_delegate(&video_start_mcr68, this)); /* sound hardware -- determined by specific machine */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp index 1b316f407da..014ec6ad0d1 100644 --- a/src/mame/drivers/megadriv.cpp +++ b/src/mame/drivers/megadriv.cpp @@ -247,7 +247,7 @@ INPUT_PORTS_END * *************************************/ -MACHINE_START_MEMBER(md_cons_state, md_common) +void md_cons_state::machine_start_md_common() { static const char *const pad6names[2][4] = { { "PAD1_6B", "PAD2_6B", "UNUSED", "UNUSED" }, @@ -314,9 +314,9 @@ void md_cons_state::install_tmss() } -MACHINE_START_MEMBER(md_cons_state, ms_megadriv) +void md_cons_state::machine_start_ms_megadriv() { - MACHINE_START_CALL_MEMBER( md_common ); + machine_start_md_common(); // the SVP introduces some kind of DMA 'lag', which we have to compensate for, this is obvious even on gfx DMAd from ROM (the Speedometer) if (m_cart->get_type() == SEGA_SVP) @@ -334,19 +334,19 @@ MACHINE_START_MEMBER(md_cons_state, ms_megadriv) } -MACHINE_START_MEMBER(md_cons_state, ms_megacd) +void md_cons_state::machine_start_ms_megacd() { - MACHINE_START_CALL_MEMBER( md_common ); + machine_start_md_common(); // the segaCD introduces some kind of DMA 'lag', which we have to compensate for, // at least when reading wordram? we might need to check what mode we're in the DMA... m_vdp->set_dma_delay(2); } -MACHINE_RESET_MEMBER(md_cons_state, ms_megadriv) +void md_cons_state::machine_reset_ms_megadriv() { m_maincpu->reset(); - MACHINE_RESET_CALL_MEMBER( megadriv ); + machine_reset_megadriv(); // if the system has a 32x, pause the extra CPUs until they are actually turned on if (m_32x) @@ -380,8 +380,8 @@ WRITE_LINE_MEMBER(md_cons_state::screen_vblank_console) MACHINE_CONFIG_START(md_cons_state::ms_megadriv) md_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megadriv) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ms_megadriv, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_SCREEN_MODIFY("megadriv") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console)) @@ -393,8 +393,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(md_cons_state::ms_megadpal) md_pal(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megadriv) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ms_megadriv, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_SCREEN_MODIFY("megadriv") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console)) @@ -411,8 +411,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(md_cons_state::dcat16_megadriv) dcat16_megadriv_base(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_md_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megadriv, this)); MCFG_SCREEN_MODIFY("megadriv") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console)) @@ -601,8 +601,8 @@ void md_cons_state::_32x_scanline_helper_callback(int scanline) MACHINE_CONFIG_START(md_cons_state::genesis_32x) md_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_md_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_DEVICE_MODIFY("gen_vdp") MCFG_SEGA315_5313_32X_SCANLINE_CB(md_cons_state, _32x_scanline_callback); @@ -642,8 +642,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(md_cons_state::mdj_32x) md_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_md_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_DEVICE_MODIFY("gen_vdp") MCFG_SEGA315_5313_32X_SCANLINE_CB(md_cons_state, _32x_scanline_callback); @@ -683,8 +683,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(md_cons_state::md_32x) md_pal(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_md_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_DEVICE_MODIFY("gen_vdp") MCFG_SEGA315_5313_32X_SCANLINE_CB(md_cons_state, _32x_scanline_callback); @@ -756,8 +756,8 @@ ROM_END MACHINE_CONFIG_START(md_cons_state::genesis_scd) md_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ms_megacd, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_SCREEN_MODIFY("megadriv") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console)) @@ -774,8 +774,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(md_cons_state::md_scd) md_pal(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ms_megacd, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_SCREEN_MODIFY("megadriv") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console)) @@ -792,8 +792,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(md_cons_state::mdj_scd) md_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) - MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ms_megacd, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_SCREEN_MODIFY("megadriv") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console)) @@ -818,7 +818,7 @@ MACHINE_CONFIG_START(md_cons_state::genesis_32x_scd) MCFG_CDROM_ADD( "cdrom" ) MCFG_CDROM_INTERFACE("scd_cdrom") - MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ms_megacd, this)); MCFG_DEVICE_REMOVE("cartslot") MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "_32x_cart") @@ -838,7 +838,7 @@ MACHINE_CONFIG_START(md_cons_state::md_32x_scd) MCFG_CDROM_ADD( "cdrom" ) MCFG_CDROM_INTERFACE("scd_cdrom") - MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ms_megacd, this)); MCFG_DEVICE_REMOVE("cartslot") MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "_32x_cart") @@ -858,7 +858,7 @@ MACHINE_CONFIG_START(md_cons_state::mdj_32x_scd) MCFG_CDROM_ADD( "cdrom" ) MCFG_CDROM_INTERFACE("scd_cdrom") - MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ms_megacd, this)); MCFG_DEVICE_REMOVE("cartslot") MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "_32x_cart") diff --git a/src/mame/drivers/megadriv_acbl.cpp b/src/mame/drivers/megadriv_acbl.cpp index 06bbf213b27..7f0c6975828 100644 --- a/src/mame/drivers/megadriv_acbl.cpp +++ b/src/mame/drivers/megadriv_acbl.cpp @@ -681,12 +681,12 @@ INPUT_PORTS_END MACHINE_CONFIG_START(md_boot_state::megadrvb) md_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_bootleg) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_md_bootleg, this)); MACHINE_CONFIG_END -MACHINE_START_MEMBER(md_boot_state, md_6button) +void md_boot_state::machine_start_md_6button() { - MACHINE_START_CALL_MEMBER(md_bootleg); + machine_start_md_bootleg(); m_io_pad_6b[0] = ioport("EXTRA1"); m_io_pad_6b[1] = ioport("EXTRA2"); @@ -700,7 +700,7 @@ MACHINE_START_MEMBER(md_boot_state, md_6button) MACHINE_CONFIG_START(md_boot_state::megadrvb_6b) md_ntsc(config); - MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_6button) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_md_6button, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/megadriv_rad.cpp b/src/mame/drivers/megadriv_rad.cpp index af62d046a7f..8b9db140bc2 100644 --- a/src/mame/drivers/megadriv_rad.cpp +++ b/src/mame/drivers/megadriv_rad.cpp @@ -102,9 +102,9 @@ static INPUT_PORTS_START( megadriv_radica_6button ) INPUT_PORTS_END -MACHINE_START_MEMBER(megadriv_radica_state, megadriv_radica_6button) +void megadriv_radica_state::machine_start_megadriv_radica_6button() { - MACHINE_START_CALL_MEMBER(megadriv); + machine_start_megadriv(); m_vdp->stop_timers(); m_io_pad_6b[0] = ioport("EXTRA1"); @@ -119,17 +119,17 @@ MACHINE_START_MEMBER(megadriv_radica_state, megadriv_radica_6button) save_item(NAME(m_bank)); } -MACHINE_START_MEMBER(megadriv_radica_state, megadriv_radica_3button) +void megadriv_radica_state::machine_start_megadriv_radica_3button() { - MACHINE_START_CALL_MEMBER(megadriv); + machine_start_megadriv(); m_vdp->stop_timers(); save_item(NAME(m_bank)); } -MACHINE_RESET_MEMBER(megadriv_radica_state, megadriv_radica) +void megadriv_radica_state::machine_reset_megadriv_radica() { m_bank = 0; - MACHINE_RESET_CALL_MEMBER(megadriv); + machine_reset_megadriv(); m_maincpu->reset(); } @@ -137,24 +137,24 @@ MACHINE_CONFIG_START(megadriv_radica_state::megadriv_radica_3button_ntsc) md_ntsc(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(megadriv_radica_map) - MCFG_MACHINE_START_OVERRIDE(megadriv_radica_state, megadriv_radica_3button) - MCFG_MACHINE_RESET_OVERRIDE(megadriv_radica_state, megadriv_radica) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_megadriv_radica_3button, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megadriv_radica, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(megadriv_radica_state::megadriv_radica_3button_pal) md_pal(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(megadriv_radica_map) - MCFG_MACHINE_START_OVERRIDE(megadriv_radica_state, megadriv_radica_3button) - MCFG_MACHINE_RESET_OVERRIDE(megadriv_radica_state, megadriv_radica) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_megadriv_radica_3button, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megadriv_radica, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(megadriv_radica_state::megadriv_radica_6button_pal) md_pal(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(megadriv_radica_map) - MCFG_MACHINE_START_OVERRIDE(megadriv_radica_state, megadriv_radica_6button) - MCFG_MACHINE_RESET_OVERRIDE(megadriv_radica_state, megadriv_radica) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_megadriv_radica_6button, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megadriv_radica, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp index 55d41d991ec..074e465689f 100644 --- a/src/mame/drivers/megaplay.cpp +++ b/src/mame/drivers/megaplay.cpp @@ -84,8 +84,8 @@ public: DECLARE_READ8_MEMBER(vdp1_count_r); void init_megaplay(); - DECLARE_VIDEO_START(megplay); - DECLARE_MACHINE_RESET(megaplay); + void video_start_megplay() ATTR_COLD; + void machine_reset_megaplay(); uint32_t screen_update_megplay(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void megaplay(machine_config &config); @@ -653,12 +653,12 @@ uint32_t mplay_state::screen_update_megplay(screen_device &screen, bitmap_rgb32 return 0; } -MACHINE_RESET_MEMBER(mplay_state,megaplay) +void mplay_state::machine_reset_megaplay() { m_bios_mode = MP_ROM; m_bios_bank_addr = 0; m_readpos = 1; - MACHINE_RESET_CALL_MEMBER(megadriv); + machine_reset_megadriv(); } MACHINE_CONFIG_START(mplay_state::megaplay) diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index b341c618d01..6a50b266643 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -136,16 +136,16 @@ RAM RW 0f0000-0f3fff 0e0000-0effff? < #define OKI4_SOUND_CLOCK XTAL(4'000'000) -MACHINE_RESET_MEMBER(megasys1_state,megasys1) +void megasys1_state::machine_reset_megasys1() { m_ignore_oki_status = 1; /* ignore oki status due 'protection' */ m_ip_latched = 0x0006; /* reset protection - some games expect this initial read without sending anything */ m_mcu_hs = 0; } -MACHINE_RESET_MEMBER(megasys1_state,megasys1_hachoo) +void megasys1_state::machine_reset_megasys1_hachoo() { - MACHINE_RESET_CALL_MEMBER(megasys1); + machine_reset_megasys1(); m_ignore_oki_status = 0; /* strangely hachoo need real oki status */ } @@ -1693,7 +1693,7 @@ MACHINE_CONFIG_START(megasys1_state::system_A) MCFG_QUANTUM_TIME(attotime::from_hz(120000)) - MCFG_MACHINE_RESET_OVERRIDE(megasys1_state,megasys1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megasys1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1709,7 +1709,7 @@ MACHINE_CONFIG_START(megasys1_state::system_A) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) MCFG_PALETTE_INIT_OWNER(megasys1_state,megasys1) - MCFG_VIDEO_START_OVERRIDE(megasys1_state,megasys1) + set_video_start_cb(config, driver_callback_delegate(&video_start_megasys1, this)); MCFG_MEGASYS1_TILEMAP_ADD("scroll0", "palette", 256*0) MCFG_MEGASYS1_TILEMAP_ADD("scroll1", "palette", 256*1) @@ -1738,7 +1738,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(megasys1_state::system_A_hachoo) system_A(config); - MCFG_MACHINE_RESET_OVERRIDE(megasys1_state,megasys1_hachoo) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megasys1_hachoo, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(megasys1_state::system_A_iganinju) @@ -1797,7 +1797,7 @@ MACHINE_CONFIG_START(megasys1_state::system_Bbl) MCFG_DEVICE_PROGRAM_MAP(megasys1B_edfbl_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", megasys1_state, megasys1B_scanline, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(megasys1_state,megasys1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megasys1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1814,7 +1814,7 @@ MACHINE_CONFIG_START(megasys1_state::system_Bbl) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) MCFG_PALETTE_INIT_OWNER(megasys1_state,megasys1) - MCFG_VIDEO_START_OVERRIDE(megasys1_state,megasys1) + set_video_start_cb(config, driver_callback_delegate(&video_start_megasys1, this)); MCFG_MEGASYS1_TILEMAP_ADD("scroll0", "palette", 256*0) MCFG_MEGASYS1_TILEMAP_ADD("scroll1", "palette", 256*1) @@ -1878,7 +1878,7 @@ MACHINE_CONFIG_START(megasys1_state::system_D) MCFG_DEVICE_PROGRAM_MAP(megasys1D_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", megasys1_state, megasys1D_irq) - MCFG_MACHINE_RESET_OVERRIDE(megasys1_state,megasys1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megasys1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1894,7 +1894,7 @@ MACHINE_CONFIG_START(megasys1_state::system_D) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) MCFG_PALETTE_INIT_OWNER(megasys1_state,megasys1) - MCFG_VIDEO_START_OVERRIDE(megasys1_state,megasys1) + set_video_start_cb(config, driver_callback_delegate(&video_start_megasys1, this)); MCFG_MEGASYS1_TILEMAP_ADD("scroll0", "palette", 256*0) MCFG_MEGASYS1_TILEMAP_ADD("scroll1", "palette", 256*1) @@ -1945,7 +1945,7 @@ MACHINE_CONFIG_START(megasys1_state::system_Z) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(megasys1_state,megasys1) + set_video_start_cb(config, driver_callback_delegate(&video_start_megasys1, this)); MCFG_MEGASYS1_TILEMAP_ADD("scroll0", "palette", 256*0) MCFG_MEGASYS1_TILEMAP_ADD("scroll1", "palette", 256*2) diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp index b2658ed72ac..27d19922004 100644 --- a/src/mame/drivers/megatech.cpp +++ b/src/mame/drivers/megatech.cpp @@ -126,7 +126,7 @@ public: void init_mt_crt(); void init_mt_slot(); - DECLARE_MACHINE_RESET(megatech); + void machine_reset_megatech(); image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, int gameno); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( mt_cart1 ) { return load_cart(image, m_cart1, 0); } @@ -640,10 +640,10 @@ WRITE_LINE_MEMBER(mtech_state::screen_vblank_main) screen_vblank_megadriv(state); } -MACHINE_RESET_MEMBER(mtech_state, megatech) +void mtech_state::machine_reset_megatech() { m_mt_bank_addr = 0; - MACHINE_RESET_CALL_MEMBER(megadriv); + machine_reset_megadriv(); std::string region_tag; if (m_cart1->get_rom_size() > 0) @@ -697,7 +697,7 @@ MACHINE_CONFIG_START(mtech_state::megatech) MCFG_CXD1095_IN_PORTE_CB(READ8(*this, mtech_state, bios_porte_r)) MCFG_CXD1095_OUT_PORTE_CB(WRITE8(*this, mtech_state, bios_porte_w)) - MCFG_MACHINE_RESET_OVERRIDE(mtech_state, megatech) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megatech, this)); MCFG_DEFAULT_LAYOUT(layout_dualhovu) diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp index a15e5b67e82..4a4101b1deb 100644 --- a/src/mame/drivers/mephisto.cpp +++ b/src/mame/drivers/mephisto.cpp @@ -99,7 +99,7 @@ public: void init_mephisto(); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_MACHINE_START(mm2); + void machine_start_mm2() ATTR_COLD; TIMER_DEVICE_CALLBACK_MEMBER(update_nmi); TIMER_DEVICE_CALLBACK_MEMBER(update_nmi_r5); TIMER_DEVICE_CALLBACK_MEMBER(update_irq); @@ -264,7 +264,7 @@ void mephisto_state::machine_start() m_allowNMI = 1; } -MACHINE_START_MEMBER(mephisto_state,mm2) +void mephisto_state::machine_start_mm2() { m_digits.resolve(); m_lcd_shift_counter = 3; @@ -336,7 +336,7 @@ MACHINE_CONFIG_START(mephisto_state::mm2) mephisto(config); MCFG_DEVICE_REPLACE("maincpu", M65C02, 3700000) MCFG_DEVICE_PROGRAM_MAP(mm2_mem) - MCFG_MACHINE_START_OVERRIDE(mephisto_state, mm2 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mm2, this)); MCFG_DEVICE_REMOVE("nmi_timer") MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", mephisto_state, update_irq, attotime::from_hz(450)) diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index 3f2e7983c0d..7e1d50013ea 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -128,7 +128,7 @@ public: void init_key_2(); void init_dtrvwz5(); virtual void machine_start() override; - DECLARE_MACHINE_START(casino5); + void machine_start_casino5() ATTR_COLD; MC6845_BEGIN_UPDATE(crtc_begin_update); MC6845_UPDATE_ROW(crtc_update_row); required_device<cpu_device> m_maincpu; @@ -1387,7 +1387,7 @@ void merit_state::dodge_nvram_init(nvram_device &nvram, void *base, size_t size) reinterpret_cast<uint8_t *>(base)[0x1040] = 0xc9; /* ret */ } -MACHINE_START_MEMBER(merit_state,casino5) +void merit_state::machine_start_casino5() { merit_state::machine_start(); membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x2000, 0x2000); @@ -1440,7 +1440,7 @@ MACHINE_CONFIG_START(merit_state::casino5) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_MACHINE_START_OVERRIDE(merit_state,casino5) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_casino5, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(merit_state::bigappg) diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 001d469f427..1c42c12280a 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -254,10 +254,10 @@ public: void init_megat3te(); virtual void machine_start() override; virtual void video_start() override; - DECLARE_MACHINE_START(meritm_crt250_questions); - DECLARE_MACHINE_START(meritm_crt250_crt252_crt258); - DECLARE_MACHINE_START(meritm_crt260); - DECLARE_MACHINE_START(merit_common); + void machine_start_meritm_crt250_questions() ATTR_COLD; + void machine_start_meritm_crt250_crt252_crt258() ATTR_COLD; + void machine_start_meritm_crt260() ATTR_COLD; + void machine_start_merit_common() ATTR_COLD; uint32_t screen_update_meritm(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(vblank_start_tick); TIMER_DEVICE_CALLBACK_MEMBER(vblank_end_tick); @@ -1043,7 +1043,7 @@ static const z80_daisy_config meritm_daisy_chain[] = { nullptr } }; -MACHINE_START_MEMBER(meritm_state,merit_common) +void meritm_state::machine_start_merit_common() { m_z80pio_0->strobe_a(1); m_z80pio_0->strobe_b(1); @@ -1056,23 +1056,22 @@ void meritm_state::machine_start() m_bank1->configure_entries(0, 8, m_region_maincpu->base(), 0x10000); m_bank = 0xff; meritm_crt250_switch_banks(); - MACHINE_START_CALL_MEMBER(merit_common); + machine_start_merit_common(); save_item(NAME(m_bank)); - } -MACHINE_START_MEMBER(meritm_state,meritm_crt250_questions) +void meritm_state::machine_start_meritm_crt250_questions() { meritm_state::machine_start(); save_item(NAME(m_questions_loword_address)); } -MACHINE_START_MEMBER(meritm_state,meritm_crt250_crt252_crt258) +void meritm_state::machine_start_meritm_crt250_crt252_crt258() { - MACHINE_START_CALL_MEMBER(meritm_crt250_questions); + machine_start_meritm_crt250_questions(); } -MACHINE_START_MEMBER(meritm_state,meritm_crt260) +void meritm_state::machine_start_meritm_crt260() { m_ram = std::make_unique<uint8_t[]>( 0x8000 ); machine().device<nvram_device>("nvram")->set_base(m_ram.get(), 0x8000); @@ -1083,7 +1082,7 @@ MACHINE_START_MEMBER(meritm_state,meritm_crt260) m_bank = 0xff; m_psd_a15 = 0; meritm_switch_banks(); - MACHINE_START_CALL_MEMBER(merit_common); + machine_start_merit_common(); save_item(NAME(m_bank)); save_item(NAME(m_psd_a15)); save_pointer(NAME(m_ram.get()), 0x8000); @@ -1155,14 +1154,14 @@ MACHINE_CONFIG_START(meritm_state::meritm_crt250_questions) meritm_crt250(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(meritm_crt250_questions_map) - MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt250_questions) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_meritm_crt250_questions, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(meritm_state::meritm_crt250_crt252_crt258) meritm_crt250_questions(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(meritm_crt250_crt258_io_map) - MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt250_crt252_crt258) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_meritm_crt250_crt252_crt258, this)); MCFG_DEVICE_ADD("ns16550", NS16550, UART_CLK) MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx)) @@ -1182,7 +1181,7 @@ MACHINE_CONFIG_START(meritm_state::meritm_crt260) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1200)) // DS1232, TD connected to VCC - MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt260) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_meritm_crt260, this)); MCFG_DEVICE_ADD("ns16550", NS16550, UART_CLK) MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx)) diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index ece5421b8ac..25dd40b3821 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -3748,7 +3748,7 @@ MACHINE_CONFIG_START(metro_state::blzntrnd) MCFG_SCREEN_PALETTE("vdp2:palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, karatour_vblank_irq)) - MCFG_VIDEO_START_OVERRIDE(metro_state,blzntrnd) + set_video_start_cb(config, driver_callback_delegate(&video_start_blzntrnd, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vdp2:palette", gfx_blzntrnd) @@ -3774,7 +3774,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(metro_state::gstrik2) blzntrnd(config); MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gstrik2) - MCFG_VIDEO_START_OVERRIDE(metro_state,gstrik2) + set_video_start_cb(config, driver_callback_delegate(&video_start_gstrik2, this)); MCFG_DEVICE_MODIFY("k053936") MCFG_K053936_OFFSETS(-77, -19) diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 227c3ed9d2a..32328972992 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -73,7 +73,7 @@ public: { } void init_micral(); - DECLARE_MACHINE_RESET(micral); + void machine_reset_micral(); DECLARE_READ8_MEMBER(keyin_r); DECLARE_READ8_MEMBER(status_r); DECLARE_READ8_MEMBER(unk_r); @@ -354,7 +354,7 @@ void micral_state::init_micral() //membank("bankw0")->configure_entry(0, &main[0xf800]); } -MACHINE_RESET_MEMBER( micral_state, micral ) +void micral_state::machine_reset_micral() { //membank("bankr0")->set_entry(0); // point at rom //membank("bankw0")->set_entry(0); // always write to ram @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(micral_state::micral) MCFG_DEVICE_PROGRAM_MAP(mem_kbd) MCFG_DEVICE_IO_MAP(io_kbd) - MCFG_MACHINE_RESET_OVERRIDE(micral_state, micral) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_micral, this)); // video hardware MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp index 4974c43a868..bb88a9be6fd 100644 --- a/src/mame/drivers/microvsn.cpp +++ b/src/mame/drivers/microvsn.cpp @@ -44,8 +44,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(microvision); - DECLARE_MACHINE_START(microvision); - DECLARE_MACHINE_RESET(microvision); + void machine_start_microvision() ATTR_COLD; + void machine_reset_microvision(); DECLARE_WRITE_LINE_MEMBER(screen_vblank); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( microvsn_cart ); @@ -145,7 +145,7 @@ PALETTE_INIT_MEMBER(microvision_state,microvision) } -MACHINE_START_MEMBER(microvision_state, microvision) +void microvision_state::machine_start_microvision() { m_paddle_timer = timer_alloc(TIMER_PADDLE); @@ -163,7 +163,7 @@ MACHINE_START_MEMBER(microvision_state, microvision) } -MACHINE_RESET_MEMBER(microvision_state, microvision) +void microvision_state::machine_reset_microvision() { for (auto & elem : m_lcd_latch) { @@ -652,8 +652,8 @@ MACHINE_CONFIG_START(microvision_state::microvision) MCFG_SCREEN_VBLANK_TIME(0) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(microvision_state, microvision ) - MCFG_MACHINE_RESET_OVERRIDE(microvision_state, microvision ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_microvision, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_microvision, this)); MCFG_SCREEN_UPDATE_DRIVER(microvision_state, screen_update) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, microvision_state, screen_vblank)) diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp index a53da696c83..e61018e7bbc 100644 --- a/src/mame/drivers/midtunit.cpp +++ b/src/mame/drivers/midtunit.cpp @@ -603,7 +603,7 @@ MACHINE_CONFIG_START(midtunit_state::tunit_core) MCFG_TMS340X0_TO_SHIFTREG_CB(midtunit_state, to_shiftreg) /* write to shiftreg function */ MCFG_TMS340X0_FROM_SHIFTREG_CB(midtunit_state, from_shiftreg) /* read from shiftreg function */ - MCFG_MACHINE_RESET_OVERRIDE(midtunit_state,midtunit) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_midtunit, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_WATCHDOG_ADD("watchdog") @@ -618,7 +618,7 @@ MACHINE_CONFIG_START(midtunit_state::tunit_core) MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_ind16) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(midtunit_state,midtunit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midtunit, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp index 2db42128d86..9aca03cc29d 100644 --- a/src/mame/drivers/midvunit.cpp +++ b/src/mame/drivers/midvunit.cpp @@ -75,7 +75,7 @@ void midvunit_state::machine_reset() } -MACHINE_RESET_MEMBER(midvunit_state,midvplus) +void midvunit_state::machine_reset_midvplus() { m_dcs->reset_w(1); m_dcs->reset_w(0); @@ -1130,7 +1130,7 @@ MACHINE_CONFIG_START(midvunit_state::midvplus) MCFG_DEVICE_PROGRAM_MAP(midvplus_map) MCFG_TMS3203X_XF1_CB(WRITE8(*this, midvunit_state, midvplus_xf1_w)) - MCFG_MACHINE_RESET_OVERRIDE(midvunit_state,midvplus) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_midvplus, this)); MCFG_DEVICE_REMOVE("nvram") MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true) diff --git a/src/mame/drivers/midwunit.cpp b/src/mame/drivers/midwunit.cpp index f126bb88247..20cb84ed82c 100644 --- a/src/mame/drivers/midwunit.cpp +++ b/src/mame/drivers/midwunit.cpp @@ -632,7 +632,7 @@ MACHINE_CONFIG_START(midwunit_state::wunit) MCFG_TMS340X0_TO_SHIFTREG_CB(midtunit_state, to_shiftreg) /* write to shiftreg function */ MCFG_TMS340X0_FROM_SHIFTREG_CB(midtunit_state, from_shiftreg) /* read from shiftreg function */ - MCFG_MACHINE_RESET_OVERRIDE(midwunit_state,midwunit) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_midwunit, this)); MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -645,7 +645,7 @@ MACHINE_CONFIG_START(midwunit_state::wunit) MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_ind16) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(midwunit_state,midwunit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midwunit, this)); /* sound hardware */ MCFG_DEVICE_ADD("dcs", DCS_AUDIO_8K, 0) diff --git a/src/mame/drivers/midxunit.cpp b/src/mame/drivers/midxunit.cpp index 3e4d10c09f8..4056d335012 100644 --- a/src/mame/drivers/midxunit.cpp +++ b/src/mame/drivers/midxunit.cpp @@ -253,7 +253,7 @@ MACHINE_CONFIG_START(midxunit_state::midxunit) MCFG_TMS340X0_TO_SHIFTREG_CB(midtunit_state, to_shiftreg) /* write to shiftreg function */ MCFG_TMS340X0_FROM_SHIFTREG_CB(midtunit_state, from_shiftreg) /* read from shiftreg function */ - MCFG_MACHINE_RESET_OVERRIDE(midxunit_state,midxunit) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_midxunit, this)); MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -264,7 +264,7 @@ MACHINE_CONFIG_START(midxunit_state::midxunit) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 506, 101, 501, 289, 20, 274) MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_ind16) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(midxunit_state,midxunit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midxunit, this)); MCFG_DEVICE_ADD("serial_pic", MIDWAY_SERIAL_PIC, 0) /* serial prefixes 419, 420 */ diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp index 9eb0f56f5d0..c1283327bf5 100644 --- a/src/mame/drivers/midyunit.cpp +++ b/src/mame/drivers/midyunit.cpp @@ -1111,7 +1111,7 @@ MACHINE_CONFIG_START(midyunit_state::zunit) MCFG_TMS340X0_TO_SHIFTREG_CB(midyunit_state, to_shiftreg) /* write to shiftreg function */ MCFG_TMS340X0_FROM_SHIFTREG_CB(midyunit_state, from_shiftreg) /* read from shiftreg function */ - MCFG_MACHINE_RESET_OVERRIDE(midyunit_state,midyunit) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_midyunit, this)); MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -1124,7 +1124,7 @@ MACHINE_CONFIG_START(midyunit_state::zunit) MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_ind16) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(midyunit_state,midzunit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midzunit, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1154,7 +1154,7 @@ MACHINE_CONFIG_START(midyunit_state::yunit_core) MCFG_TMS340X0_TO_SHIFTREG_CB(midyunit_state, to_shiftreg) /* write to shiftreg function */ MCFG_TMS340X0_FROM_SHIFTREG_CB(midyunit_state, from_shiftreg) /* read from shiftreg function */ - MCFG_MACHINE_RESET_OVERRIDE(midyunit_state,midyunit) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_midyunit, this)); MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -1183,7 +1183,7 @@ MACHINE_CONFIG_START(midyunit_state::yunit_cvsd_4bit_slow) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(256) - MCFG_VIDEO_START_OVERRIDE(midyunit_state,midyunit_4bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midyunit_4bit, this)); MACHINE_CONFIG_END @@ -1200,7 +1200,7 @@ MACHINE_CONFIG_START(midyunit_state::yunit_cvsd_4bit_fast) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(256) - MCFG_VIDEO_START_OVERRIDE(midyunit_state,midyunit_4bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midyunit_4bit, this)); MACHINE_CONFIG_END @@ -1214,7 +1214,7 @@ MACHINE_CONFIG_START(midyunit_state::yunit_cvsd_6bit_slow) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4096) - MCFG_VIDEO_START_OVERRIDE(midyunit_state,midyunit_6bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midyunit_6bit, this)); MACHINE_CONFIG_END @@ -1231,7 +1231,7 @@ MACHINE_CONFIG_START(midyunit_state::yunit_adpcm_6bit_fast) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4096) - MCFG_VIDEO_START_OVERRIDE(midyunit_state,midyunit_6bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midyunit_6bit, this)); MACHINE_CONFIG_END @@ -1248,7 +1248,7 @@ MACHINE_CONFIG_START(midyunit_state::yunit_adpcm_6bit_faster) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4096) - MCFG_VIDEO_START_OVERRIDE(midyunit_state,midyunit_6bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_midyunit_6bit, this)); MACHINE_CONFIG_END @@ -1273,7 +1273,7 @@ MACHINE_CONFIG_START(midyunit_state::mkyawdim) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4096) - MCFG_VIDEO_START_OVERRIDE(midyunit_state,mkyawdim) + set_video_start_cb(config, driver_callback_delegate(&video_start_mkyawdim, this)); /* sound hardware */ diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp index a56dccab475..b0e34ccbb45 100644 --- a/src/mame/drivers/midzeus.cpp +++ b/src/mame/drivers/midzeus.cpp @@ -91,7 +91,7 @@ private: * *************************************/ -MACHINE_START_MEMBER(midzeus_state,midzeus) +void midzeus_state::machine_start_midzeus() { m_digits.resolve(); @@ -112,7 +112,7 @@ MACHINE_START_MEMBER(midzeus_state,midzeus) } -MACHINE_RESET_MEMBER(midzeus_state,midzeus) +void midzeus_state::machine_reset_midzeus() { memcpy(m_ram_base, memregion("user1")->base(), 0x40000*4); *m_ram_base <<= 1; @@ -1270,8 +1270,8 @@ MACHINE_CONFIG_START(midzeus_state::midzeus) MCFG_DEVICE_PROGRAM_MAP(zeus_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", midzeus_state, display_irq) - MCFG_MACHINE_START_OVERRIDE(midzeus_state,midzeus) - MCFG_MACHINE_RESET_OVERRIDE(midzeus_state,midzeus) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_midzeus, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_midzeus, this)); MCFG_NVRAM_ADD_1FILL("nvram") /* video hardware */ @@ -1282,7 +1282,7 @@ MACHINE_CONFIG_START(midzeus_state::midzeus) MCFG_SCREEN_UPDATE_DRIVER(midzeus_state, screen_update_midzeus) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(midzeus_state,midzeus) + set_video_start_cb(config, driver_callback_delegate(&video_start_midzeus, this)); /* sound hardware */ MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) @@ -1314,8 +1314,8 @@ MACHINE_CONFIG_START(midzeus2_state::midzeus2) MCFG_DEVICE_PROGRAM_MAP(zeus2_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", midzeus2_state, display_irq) - MCFG_MACHINE_START_OVERRIDE(midzeus2_state,midzeus) - MCFG_MACHINE_RESET_OVERRIDE(midzeus2_state,midzeus) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_midzeus, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_midzeus, this)); MCFG_NVRAM_ADD_1FILL("nvram") /* video hardware */ diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp index 2b578241d3c..39cc8790e60 100644 --- a/src/mame/drivers/mikrosha.cpp +++ b/src/mame/drivers/mikrosha.cpp @@ -34,18 +34,18 @@ public: DECLARE_WRITE_LINE_MEMBER(mikrosha_pit_out2); I8275_DRAW_CHARACTER_MEMBER(display_pixels); - DECLARE_MACHINE_RESET(mikrosha); + void machine_reset_mikrosha(); void mikrosha(machine_config &config); void mikrosha_io(address_map &map); void mikrosha_mem(address_map &map); }; -MACHINE_RESET_MEMBER(mikrosha_state,mikrosha) +void mikrosha_state::machine_reset_mikrosha() { if (m_cart->exists()) m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x8000+m_cart->get_rom_size()-1, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart)); - MACHINE_RESET_CALL_MEMBER(radio86); + machine_reset_radio86(); } /* Address maps */ @@ -211,7 +211,7 @@ MACHINE_CONFIG_START(mikrosha_state::mikrosha) MCFG_DEVICE_PROGRAM_MAP(mikrosha_mem) MCFG_DEVICE_IO_MAP(mikrosha_io) - MCFG_MACHINE_RESET_OVERRIDE(mikrosha_state, mikrosha) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mikrosha, this)); MCFG_DEVICE_ADD("ppi8255_1", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, radio86_state, radio86_8255_portb_r2)) diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp index 3d6b1a6ed22..cfc51883ff9 100644 --- a/src/mame/drivers/missb2.cpp +++ b/src/mame/drivers/missb2.cpp @@ -40,8 +40,8 @@ public: DECLARE_READ8_MEMBER(missb2_oki_r); DECLARE_WRITE_LINE_MEMBER(irqhandler); void init_missb2(); - DECLARE_MACHINE_START(missb2); - DECLARE_MACHINE_RESET(missb2); + void machine_start_missb2() ATTR_COLD; + void machine_reset_missb2(); uint32_t screen_update_missb2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void missb2(machine_config &config); @@ -445,7 +445,7 @@ WRITE_LINE_MEMBER(missb2_state::irqhandler) /* Machine Driver */ -MACHINE_START_MEMBER(missb2_state,missb2) +void missb2_state::machine_start_missb2() { m_gfxdecode->gfx(1)->set_palette(*m_bgpalette); @@ -454,9 +454,9 @@ MACHINE_START_MEMBER(missb2_state,missb2) save_item(NAME(m_sreset_old)); } -MACHINE_RESET_MEMBER(missb2_state,missb2) +void missb2_state::machine_reset_missb2() { - MACHINE_RESET_CALL_MEMBER(common); + machine_reset_common(); m_oki->reset(); bublbobl_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xFF); // force a bankswitch write of all zeroes, as /RESET clears the latch } @@ -481,8 +481,8 @@ MACHINE_CONFIG_START(missb2_state::missb2) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_VBLANK_INIT("screen", 128); - MCFG_MACHINE_START_OVERRIDE(missb2_state,missb2) - MCFG_MACHINE_RESET_OVERRIDE(missb2_state,missb2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_missb2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_missb2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index 05dd1a796e3..66c580d25c7 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -1120,7 +1120,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(mitchell_state,mitchell) +void mitchell_state::machine_start_mitchell() { save_item(NAME(m_dial_selected)); save_item(NAME(m_keymatrix)); @@ -1138,7 +1138,7 @@ MACHINE_START_MEMBER(mitchell_state,mitchell) } } -MACHINE_RESET_MEMBER(mitchell_state,mitchell) +void mitchell_state::machine_reset_mitchell() { m_sample_select = false; m_dial_selected = 0; @@ -1169,8 +1169,8 @@ MACHINE_CONFIG_START(mitchell_state::mgakuen) MCFG_DEVICE_IO_MAP(mitchell_io_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell) - MCFG_MACHINE_RESET_OVERRIDE(mitchell_state,mitchell) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mitchell, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mitchell, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -1188,7 +1188,7 @@ MACHINE_CONFIG_START(mitchell_state::mgakuen) MCFG_PALETTE_ADD("palette", 1024) /* less colors than the others */ MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_VIDEO_START_OVERRIDE(mitchell_state,pang) + set_video_start_cb(config, driver_callback_delegate(&video_start_pang, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1210,8 +1210,8 @@ MACHINE_CONFIG_START(mitchell_state::pang) MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell) - MCFG_MACHINE_RESET_OVERRIDE(mitchell_state,mitchell) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mitchell, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mitchell, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -1229,7 +1229,7 @@ MACHINE_CONFIG_START(mitchell_state::pang) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_VIDEO_START_OVERRIDE(mitchell_state,pang) + set_video_start_cb(config, driver_callback_delegate(&video_start_pang, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1330,8 +1330,8 @@ MACHINE_CONFIG_START(mitchell_state::mstworld) MCFG_DEVICE_ADD("audiocpu", Z80,6000000) /* 6 MHz? */ MCFG_DEVICE_PROGRAM_MAP(mstworld_sound_map) - MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell) - MCFG_MACHINE_RESET_OVERRIDE(mitchell_state,mitchell) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mitchell, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mitchell, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1347,7 +1347,7 @@ MACHINE_CONFIG_START(mitchell_state::mstworld) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_VIDEO_START_OVERRIDE(mitchell_state,pang) + set_video_start_cb(config, driver_callback_delegate(&video_start_pang, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1384,7 +1384,7 @@ MACHINE_CONFIG_START(mitchell_state::marukin) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_VIDEO_START_OVERRIDE(mitchell_state,pang) + set_video_start_cb(config, driver_callback_delegate(&video_start_pang, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1439,7 +1439,7 @@ MACHINE_CONFIG_START(mitchell_state::pkladiesbl) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_VIDEO_START_OVERRIDE(mitchell_state,pang) + set_video_start_cb(config, driver_callback_delegate(&video_start_pang, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp index 772a2835f87..8a67665acf2 100644 --- a/src/mame/drivers/mmd1.cpp +++ b/src/mame/drivers/mmd1.cpp @@ -172,8 +172,8 @@ public: DECLARE_WRITE8_MEMBER(mmd2_status_callback); DECLARE_WRITE_LINE_MEMBER(mmd2_inte_callback); void init_mmd2(); - DECLARE_MACHINE_RESET(mmd1); - DECLARE_MACHINE_RESET(mmd2); + void machine_reset_mmd1(); + void machine_reset_mmd2(); void mmd1(machine_config &config); void mmd2(machine_config &config); void mmd1_io(address_map &map); @@ -441,12 +441,12 @@ WRITE_LINE_MEMBER( mmd1_state::mmd2_inte_callback ) output().set_value("led_inte", state); } -MACHINE_RESET_MEMBER(mmd1_state,mmd1) +void mmd1_state::machine_reset_mmd1() { m_return_code = 0xff; } -MACHINE_RESET_MEMBER(mmd1_state,mmd2) +void mmd1_state::machine_reset_mmd2() { membank("bank1")->set_entry(0); membank("bank2")->set_entry(0); @@ -497,7 +497,7 @@ MACHINE_CONFIG_START(mmd1_state::mmd1) MCFG_DEVICE_PROGRAM_MAP(mmd1_mem) MCFG_DEVICE_IO_MAP(mmd1_io) - MCFG_MACHINE_RESET_OVERRIDE(mmd1_state,mmd1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mmd1, this)); /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_mmd1) @@ -511,7 +511,7 @@ MACHINE_CONFIG_START(mmd1_state::mmd2) MCFG_I8085A_STATUS(WRITE8(*this, mmd1_state, mmd2_status_callback)) MCFG_I8085A_INTE(WRITELINE(*this, mmd1_state, mmd2_inte_callback)) - MCFG_MACHINE_RESET_OVERRIDE(mmd1_state,mmd2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mmd2, this)); /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_mmd2) diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp index 293a1c2a714..3bcc8987376 100644 --- a/src/mame/drivers/model1.cpp +++ b/src/mame/drivers/model1.cpp @@ -838,7 +838,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(model1_state::model1_interrupt) } } -MACHINE_RESET_MEMBER(model1_state,model1) +void model1_state::machine_reset_model1() { membank("bank1")->set_base(memregion("maincpu")->base() + 0x1000000); irq_init(); @@ -1719,8 +1719,8 @@ MACHINE_CONFIG_START(model1_state::model1) MCFG_DEVICE_ADDRESS_MAP(mb86233_device::AS_RF, copro_rf_map) #endif - MCFG_MACHINE_START_OVERRIDE(model1_state,model1) - MCFG_MACHINE_RESET_OVERRIDE(model1_state,model1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model1, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model1, this)); MCFG_DEVICE_ADD("ioboard", SEGA_MODEL1IO, 0) MCFG_MODEL1IO_READ_CB(READ8("dpram", mb8421_device, left_r)) @@ -1742,7 +1742,7 @@ MACHINE_CONFIG_START(model1_state::model1) MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(model1_state,model1) + set_video_start_cb(config, driver_callback_delegate(&video_start_model1, this)); MCFG_SEGAM1AUDIO_ADD(M1AUDIO_TAG) MCFG_SEGAM1AUDIO_RXD_HANDLER(WRITELINE("m1uart", i8251_device, write_rxd)) diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index edbb3c4babe..a5fe26cbb1b 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -156,7 +156,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(model2_state::model2_timer_cb) m_timerrun[tnum] = 0; } -MACHINE_START_MEMBER( model2_state, model2 ) +void model2_state::machine_start_model2() { // initialize custom debugger pool, @see machine/model2.cpp debug_init(); @@ -181,9 +181,9 @@ MACHINE_START_MEMBER( model2_state, model2 ) save_item(NAME(m_geo_read_start_address)); } -MACHINE_START_MEMBER(model2_tgp_state,model2_tgp) +void model2_tgp_state::machine_start_model2_tgp() { - MACHINE_START_CALL_MEMBER(model2); + machine_start_model2(); m_copro_fifo_in->setup(16, [this]() { m_copro_tgp->stall(); }, @@ -204,9 +204,9 @@ MACHINE_START_MEMBER(model2_tgp_state,model2_tgp) [ ]() { }); } -MACHINE_START_MEMBER(model2b_state,model2b) +void model2b_state::machine_start_model2b() { - MACHINE_START_CALL_MEMBER(model2); + machine_start_model2(); m_copro_fifo_in->setup(16, [ ]() { }, @@ -226,9 +226,9 @@ MACHINE_START_MEMBER(model2b_state,model2b) [this]() { m_copro_adsp->set_flag_input(1, m_copro_fifo_in->is_full()); }); } -MACHINE_START_MEMBER(model2c_state,model2c) +void model2c_state::machine_start_model2c() { - MACHINE_START_CALL_MEMBER(model2); + machine_start_model2(); m_copro_fifo_in->setup(16, [ ]() { }, @@ -248,7 +248,7 @@ MACHINE_START_MEMBER(model2c_state,model2c) [ ]() { }); } -MACHINE_RESET_MEMBER( model2_state, model2_common ) +void model2_state::machine_reset_model2_common() { int i; @@ -287,7 +287,7 @@ MACHINE_RESET_MEMBER( model2_state, model2_common ) m_geo_read_start_address = 0; } -MACHINE_RESET_MEMBER(model2_state,model2_scsp) +void model2_state::machine_reset_model2_scsp() { membank("bank4")->set_base(memregion("scsp")->base() + 0x200000); membank("bank5")->set_base(memregion("scsp")->base() + 0x600000); @@ -298,29 +298,29 @@ MACHINE_RESET_MEMBER(model2_state,model2_scsp) m_scsp->set_ram_base(m_soundram); } -MACHINE_RESET_MEMBER(model2_tgp_state,model2_tgp) +void model2_tgp_state::machine_reset_model2_tgp() { - MACHINE_RESET_CALL_MEMBER(model2_common); + machine_reset_model2_common(); // hold TGP in halt until we have code m_copro_tgp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } -MACHINE_RESET_MEMBER(model2o_state,model2o) +void model2o_state::machine_reset_model2o() { - MACHINE_RESET_CALL_MEMBER(model2_tgp); + machine_reset_model2_tgp(); } -MACHINE_RESET_MEMBER(model2a_state,model2a) +void model2a_state::machine_reset_model2a() { - MACHINE_RESET_CALL_MEMBER(model2_tgp); - MACHINE_RESET_CALL_MEMBER(model2_scsp); + machine_reset_model2_tgp(); + machine_reset_model2_scsp(); } -MACHINE_RESET_MEMBER(model2b_state,model2b) +void model2b_state::machine_reset_model2b() { - MACHINE_RESET_CALL_MEMBER(model2_common); - MACHINE_RESET_CALL_MEMBER(model2_scsp); + machine_reset_model2_common(); + machine_reset_model2_scsp(); m_copro_adsp->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); @@ -330,10 +330,10 @@ MACHINE_RESET_MEMBER(model2b_state,model2b) m_copro_adsp->set_input_line(SHARC_INPUT_FLAG1, CLEAR_LINE); } -MACHINE_RESET_MEMBER(model2c_state,model2c) +void model2c_state::machine_reset_model2c() { - MACHINE_RESET_CALL_MEMBER(model2_common); - MACHINE_RESET_CALL_MEMBER(model2_scsp); + machine_reset_model2_common(); + machine_reset_model2_scsp(); m_copro_tgpx4->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } @@ -2439,8 +2439,8 @@ MACHINE_CONFIG_START(model2o_state::model2o) MCFG_DEVICE_ADD("copro_fifo_in", GENERIC_FIFO_U32, 0) MCFG_DEVICE_ADD("copro_fifo_out", GENERIC_FIFO_U32, 0) - MCFG_MACHINE_START_OVERRIDE(model2_tgp_state,model2_tgp) - MCFG_MACHINE_RESET_OVERRIDE(model2o_state,model2o) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model2_tgp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model2o, this)); MCFG_NVRAM_ADD_1FILL("backup1") @@ -2583,8 +2583,8 @@ MACHINE_CONFIG_START(model2a_state::model2a) MCFG_DEVICE_ADD("copro_fifo_in", GENERIC_FIFO_U32, 0) MCFG_DEVICE_ADD("copro_fifo_out", GENERIC_FIFO_U32, 0) - MCFG_MACHINE_START_OVERRIDE(model2_tgp_state,model2_tgp) - MCFG_MACHINE_RESET_OVERRIDE(model2a_state,model2a) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model2_tgp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model2a, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_NVRAM_ADD_1FILL("backup1") @@ -2696,8 +2696,8 @@ MACHINE_CONFIG_START(model2b_state::model2b) MCFG_DEVICE_ADD("copro_fifo_in", GENERIC_FIFO_U32, 0) MCFG_DEVICE_ADD("copro_fifo_out", GENERIC_FIFO_U32, 0) - MCFG_MACHINE_START_OVERRIDE(model2b_state,model2b) - MCFG_MACHINE_RESET_OVERRIDE(model2b_state,model2b) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model2b, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model2b, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_NVRAM_ADD_1FILL("backup1") @@ -2811,8 +2811,8 @@ MACHINE_CONFIG_START(model2c_state::model2c) MCFG_DEVICE_ADD("copro_fifo_in", GENERIC_FIFO_U32, 0) MCFG_DEVICE_ADD("copro_fifo_out", GENERIC_FIFO_U32, 0) - MCFG_MACHINE_START_OVERRIDE(model2c_state,model2c) - MCFG_MACHINE_RESET_OVERRIDE(model2c_state,model2c) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model2c, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model2c, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_NVRAM_ADD_1FILL("backup1") diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index 9b2e6202b40..c4be4978fac 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -1283,28 +1283,28 @@ TIMER_CALLBACK_MEMBER(model3_state::real3d_dma_timer_callback) m_dma_busy = 0; } -MACHINE_START_MEMBER(model3_state,model3_10) +void model3_state::machine_start_model3_10() { configure_fast_ram(); m_sound_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(model3_state::model3_sound_timer_tick),this)); m_real3d_dma_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(model3_state::real3d_dma_timer_callback),this)); } -MACHINE_START_MEMBER(model3_state,model3_15) +void model3_state::machine_start_model3_15() { configure_fast_ram(); m_sound_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(model3_state::model3_sound_timer_tick),this)); m_real3d_dma_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(model3_state::real3d_dma_timer_callback),this)); } -MACHINE_START_MEMBER(model3_state,model3_20) +void model3_state::machine_start_model3_20() { configure_fast_ram(); m_sound_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(model3_state::model3_sound_timer_tick),this)); m_real3d_dma_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(model3_state::real3d_dma_timer_callback),this)); } -MACHINE_START_MEMBER(model3_state,model3_21) +void model3_state::machine_start_model3_21() { configure_fast_ram(); @@ -1365,10 +1365,10 @@ void model3_state::model3_init(int step) } } -MACHINE_RESET_MEMBER(model3_state,model3_10){ model3_init(0x10); } -MACHINE_RESET_MEMBER(model3_state,model3_15){ model3_init(0x15); } -MACHINE_RESET_MEMBER(model3_state,model3_20){ model3_init(0x20); } -MACHINE_RESET_MEMBER(model3_state,model3_21){ model3_init(0x21); } +void model3_state::machine_reset_model3_10(){ model3_init(0x10); } +void model3_state::machine_reset_model3_15(){ model3_init(0x15); } +void model3_state::machine_reset_model3_20(){ model3_init(0x20); } +void model3_state::machine_reset_model3_21(){ model3_init(0x21); } READ64_MEMBER(model3_state::model3_ctrl_r) @@ -5756,8 +5756,8 @@ MACHINE_CONFIG_START(model3_state::model3_10) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_START_OVERRIDE(model3_state,model3_10) - MCFG_MACHINE_RESET_OVERRIDE(model3_state,model3_10) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model3_10, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model3_10, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_NVRAM_ADD_1FILL("backup") @@ -5803,8 +5803,8 @@ MACHINE_CONFIG_START(model3_state::model3_15) MCFG_DEVICE_ADD("audiocpu", M68000, 12000000) MCFG_DEVICE_PROGRAM_MAP(model3_snd) - MCFG_MACHINE_START_OVERRIDE(model3_state,model3_15) - MCFG_MACHINE_RESET_OVERRIDE(model3_state,model3_15) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model3_15, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model3_15, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_NVRAM_ADD_1FILL("backup") @@ -5866,8 +5866,8 @@ MACHINE_CONFIG_START(model3_state::model3_20) MCFG_DEVICE_ADD("audiocpu", M68000, 12000000) MCFG_DEVICE_PROGRAM_MAP(model3_snd) - MCFG_MACHINE_START_OVERRIDE(model3_state, model3_20) - MCFG_MACHINE_RESET_OVERRIDE(model3_state, model3_20) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model3_20, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model3_20, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_NVRAM_ADD_1FILL("backup") @@ -5931,8 +5931,8 @@ MACHINE_CONFIG_START(model3_state::model3_21) MCFG_DEVICE_ADD("audiocpu", M68000, 12000000) MCFG_DEVICE_PROGRAM_MAP(model3_snd) - MCFG_MACHINE_START_OVERRIDE(model3_state, model3_21) - MCFG_MACHINE_RESET_OVERRIDE(model3_state, model3_21) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_model3_21, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_model3_21, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_NVRAM_ADD_1FILL("backup") diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp index 82b83c6782c..3353453a42e 100644 --- a/src/mame/drivers/moo.cpp +++ b/src/mame/drivers/moo.cpp @@ -464,7 +464,7 @@ static INPUT_PORTS_START( bucky ) INPUT_PORTS_END -MACHINE_START_MEMBER(moo_state,moo) +void moo_state::machine_start_moo() { save_item(NAME(m_cur_control2)); save_item(NAME(m_alpha_enabled)); @@ -476,17 +476,15 @@ MACHINE_START_MEMBER(moo_state,moo) m_dmaend_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(moo_state::dmaend_callback),this)); } -MACHINE_RESET_MEMBER(moo_state,moo) +void moo_state::machine_reset_moo() { - int i; - - for (i = 0; i < 16; i++) + for (int i = 0; i < 16; i++) m_protram[i] = 0; - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) m_layer_colorbase[i] = 0; - for (i = 0; i < 3; i++) + for (int i = 0; i < 3; i++) m_layerpri[i] = 0; m_cur_control2 = 0; @@ -504,8 +502,8 @@ MACHINE_CONFIG_START(moo_state::moo) MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(32'000'000)/4) // 8MHz verified MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_MACHINE_START_OVERRIDE(moo_state,moo) - MCFG_MACHINE_RESET_OVERRIDE(moo_state,moo) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_moo, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_moo, this)); MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") @@ -526,7 +524,7 @@ MACHINE_CONFIG_START(moo_state::moo) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(moo_state,moo) + set_video_start_cb(config, driver_callback_delegate(&video_start_moo, this)); MCFG_DEVICE_ADD("k053246", K053246, 0) MCFG_K053246_CB(moo_state, sprite_callback) @@ -564,8 +562,8 @@ MACHINE_CONFIG_START(moo_state::moobl) MCFG_DEVICE_PROGRAM_MAP(moobl_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", moo_state, moobl_interrupt) - MCFG_MACHINE_START_OVERRIDE(moo_state,moo) - MCFG_MACHINE_RESET_OVERRIDE(moo_state,moo) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_moo, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_moo, this)); MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") @@ -583,7 +581,7 @@ MACHINE_CONFIG_START(moo_state::moobl) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(moo_state,moo) + set_video_start_cb(config, driver_callback_delegate(&video_start_moo, this)); MCFG_DEVICE_ADD("k053246", K053246, 0) MCFG_K053246_CB(moo_state, sprite_callback) @@ -626,7 +624,7 @@ MACHINE_CONFIG_START(moo_state::bucky) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(moo_state,bucky) + set_video_start_cb(config, driver_callback_delegate(&video_start_bucky, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp index c94bb1f8aa7..d3681e41504 100644 --- a/src/mame/drivers/mpu4dealem.cpp +++ b/src/mame/drivers/mpu4dealem.cpp @@ -33,7 +33,7 @@ public: } optional_shared_ptr<uint8_t> m_dealem_videoram; - DECLARE_MACHINE_RESET(dealem_vid); + void machine_reset_dealem_vid(); DECLARE_PALETTE_INIT(dealem); uint32_t screen_update_dealem(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(dealem_vsync_changed); @@ -175,7 +175,7 @@ void mpu4dealem_state::dealem_memmap(address_map &map) map(0x8000, 0xffff).rom().nopw();/* 64k paged ROM (4 pages) */ } -MACHINE_RESET_MEMBER(mpu4dealem_state,dealem_vid) +void mpu4dealem_state::machine_reset_dealem_vid() { m_vfd->reset(); //for debug ports only @@ -198,8 +198,8 @@ MACHINE_RESET_MEMBER(mpu4dealem_state,dealem_vid) /* machine driver for Zenitone Deal 'Em board */ MACHINE_CONFIG_START(mpu4dealem_state::dealem) - MCFG_MACHINE_START_OVERRIDE(mpu4dealem_state,mod2) /* main mpu4 board initialisation */ - MCFG_MACHINE_RESET_OVERRIDE(mpu4dealem_state,dealem_vid) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mod2, this)); /* main mpu4 board initialisation */ + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dealem_vid, this)); MCFG_DEVICE_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4) MCFG_DEVICE_PROGRAM_MAP(dealem_memmap) diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index 808dca09b2c..538178f5367 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -274,9 +274,9 @@ public: void init_skiltrek(); void init_crmaze3(); void init_cybcas(); - DECLARE_MACHINE_START(mpu4_vid); - DECLARE_MACHINE_RESET(mpu4_vid); - DECLARE_VIDEO_START(mpu4_vid); + void machine_start_mpu4_vid() ATTR_COLD; + void machine_reset_mpu4_vid(); + void video_start_mpu4_vid() ATTR_COLD; SCN2674_DRAW_CHARACTER_MEMBER(display_pixels); DECLARE_WRITE_LINE_MEMBER(m6809_acia_irq); DECLARE_WRITE_LINE_MEMBER(m68k_acia_irq); @@ -435,7 +435,7 @@ WRITE16_MEMBER(mpu4vid_state::mpu4_vid_vidram_w ) } -VIDEO_START_MEMBER(mpu4vid_state,mpu4_vid) +void mpu4vid_state::video_start_mpu4_vid() { m_vid_vidram.allocate(0x20000/2); @@ -1149,7 +1149,7 @@ WRITE_LINE_MEMBER(mpu4vid_state::mpu_video_reset) } /* machine start (called only once) */ -MACHINE_START_MEMBER(mpu4vid_state,mpu4_vid) +void mpu4vid_state::machine_start_mpu4_vid() { mpu4_config_common(); @@ -1161,7 +1161,7 @@ MACHINE_START_MEMBER(mpu4vid_state,mpu4_vid) m_videocpu->set_reset_callback(write_line_delegate(FUNC(mpu4vid_state::mpu_video_reset),this)); } -MACHINE_RESET_MEMBER(mpu4vid_state,mpu4_vid) +void mpu4vid_state::machine_reset_mpu4_vid() { m_vfd->reset(); //for debug ports only @@ -1304,9 +1304,9 @@ MACHINE_CONFIG_START(mpu4vid_state::mpu4_vid) // MCFG_QUANTUM_TIME(attotime::from_hz(960)) - MCFG_MACHINE_START_OVERRIDE(mpu4vid_state,mpu4_vid) - MCFG_MACHINE_RESET_OVERRIDE(mpu4vid_state,mpu4_vid) - MCFG_VIDEO_START_OVERRIDE (mpu4vid_state,mpu4_vid) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4_vid, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mpu4_vid, this)); + set_video_start_cb(config, driver_callback_delegate(&video_start_mpu4_vid, this)); MCFG_PALETTE_ADD("palette", ef9369_device::NUMCOLORS) diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp index 02b121514f2..541808f8eba 100644 --- a/src/mame/drivers/mquake.cpp +++ b/src/mame/drivers/mquake.cpp @@ -332,7 +332,7 @@ MACHINE_CONFIG_START(mquake_state::mquake) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INIT_OWNER(mquake_state,amiga) - MCFG_VIDEO_START_OVERRIDE(mquake_state,amiga) + set_video_start_cb(config, driver_callback_delegate(&video_start_amiga, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp index bc8d75ee1ee..3f469c6240b 100644 --- a/src/mame/drivers/ms32.cpp +++ b/src/mame/drivers/ms32.cpp @@ -1750,7 +1750,7 @@ MACHINE_CONFIG_START(ms32_state::f1superb) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_f1superb) - MCFG_VIDEO_START_OVERRIDE(ms32_state,f1superb) + set_video_start_cb(config, driver_callback_delegate(&video_start_f1superb, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp index da5a749b4e5..86220b77d8e 100644 --- a/src/mame/drivers/msisaac.cpp +++ b/src/mame/drivers/msisaac.cpp @@ -428,7 +428,7 @@ void msisaac_state::machine_start() void msisaac_state::machine_reset() { - //MACHINE_RESET_CALL_MEMBER(ta7630); + //machine_reset_ta7630(); /* video */ m_bg2_textbank = 0; diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index 74b5c782b24..88e6ed33cd0 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -291,8 +291,8 @@ MACHINE_CONFIG_START(mtx_state::mtx512) MCFG_DEVICE_IO_MAP(mtx_io) MCFG_Z80_DAISY_CHAIN(mtx_daisy_chain) - MCFG_MACHINE_START_OVERRIDE(mtx_state,mtx512) - MCFG_MACHINE_RESET_OVERRIDE(mtx_state,mtx512) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mtx512, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mtx512, this)); /* video hardware */ MCFG_DEVICE_ADD( "tms9929a", TMS9929A, XTAL(10'738'635) / 2 ) diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp index 103c5dd446f..22fcd9aebe0 100644 --- a/src/mame/drivers/multigam.cpp +++ b/src/mame/drivers/multigam.cpp @@ -190,9 +190,9 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(multigam); - DECLARE_MACHINE_START(multigm3); - DECLARE_MACHINE_RESET(multigm3); - DECLARE_MACHINE_START(supergm3); + void machine_start_multigm3() ATTR_COLD; + void machine_reset_multigm3(); + void machine_start_supergm3() ATTR_COLD; TIMER_CALLBACK_MEMBER(mmc1_resync_callback); void set_videorom_bank( int start, int count, int bank, int bank_size_in_kb); void set_videoram_bank( int start, int count, int bank, int bank_size_in_kb); @@ -1145,7 +1145,7 @@ void multigam_state::machine_reset() { } -MACHINE_RESET_MEMBER(multigam_state,multigm3) +void multigam_state::machine_reset_multigm3() { address_space &space = m_maincpu->space(AS_PROGRAM); /* reset the ppu */ @@ -1165,7 +1165,7 @@ void multigam_state::machine_start() membank("bank1")->set_base(memregion("gfx1")->base()); } -MACHINE_START_MEMBER(multigam_state,multigm3) +void multigam_state::machine_start_multigm3() { m_nt_ram = std::make_unique<uint8_t[]>(0x1000); m_nt_page[0] = m_nt_ram.get(); @@ -1187,7 +1187,7 @@ MACHINE_START_MEMBER(multigam_state,multigm3) set_videorom_bank(0, 8, 0, 8); } -MACHINE_START_MEMBER(multigam_state,supergm3) +void multigam_state::machine_start_supergm3() { m_nt_ram = std::make_unique<uint8_t[]>(0x1000); m_nt_page[0] = m_nt_ram.get(); @@ -1226,8 +1226,8 @@ MACHINE_CONFIG_START(multigam_state::multigm3) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(multigm3_map) - MCFG_MACHINE_START_OVERRIDE(multigam_state, multigm3 ) - MCFG_MACHINE_RESET_OVERRIDE(multigam_state, multigm3 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_multigm3, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_multigm3, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(multigam_state::multigmt) @@ -1241,7 +1241,7 @@ MACHINE_CONFIG_START(multigam_state::supergm3) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(supergm3_map) - MCFG_MACHINE_START_OVERRIDE(multigam_state,supergm3) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_supergm3, this)); MACHINE_CONFIG_END ROM_START( multigam ) diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp index f42417d37ff..d9692da6e68 100644 --- a/src/mame/drivers/mw8080bw.cpp +++ b/src/mame/drivers/mw8080bw.cpp @@ -235,8 +235,8 @@ MACHINE_CONFIG_START(mw8080bw_state::mw8080bw_root) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu",I8080,MW8080BW_CPU_CLOCK) MCFG_DEVICE_PROGRAM_MAP(main_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,mw8080bw) - MCFG_MACHINE_RESET_OVERRIDE(mw8080bw_state,mw8080bw) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mw8080bw, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -890,7 +890,7 @@ TIMER_CALLBACK_MEMBER(mw8080bw_state::maze_tone_timing_timer_callback) } -MACHINE_START_MEMBER(mw8080bw_state,maze) +void mw8080bw_state::machine_start_maze() { /* create astable timer for IC B1 */ m_maze_tone_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mw8080bw_state::maze_tone_timing_timer_callback), this)); @@ -903,7 +903,7 @@ MACHINE_START_MEMBER(mw8080bw_state,maze) save_item(NAME(m_maze_tone_timing_state)); machine().save().register_postload(save_prepost_delegate(FUNC(mw8080bw_state::maze_update_discrete), this)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -968,7 +968,7 @@ MACHINE_CONFIG_START(mw8080bw_state::maze) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(maze_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,maze) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_maze, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))) /* 2.97s */ @@ -986,12 +986,12 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_START_MEMBER(mw8080bw_state,boothill) +void mw8080bw_state::machine_start_boothill() { /* setup for save states */ save_item(NAME(m_rev_shift_res)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -1062,7 +1062,7 @@ MACHINE_CONFIG_START(mw8080bw_state::boothill) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(boothill_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,boothill) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_boothill, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))) /* 2.97s */ @@ -1192,12 +1192,12 @@ MACHINE_CONFIG_END #define DESERTGU_DIP_SW_0_1_SET_2_TAG ("DIPSW01SET2") -MACHINE_START_MEMBER(mw8080bw_state,desertgu) +void mw8080bw_state::machine_start_desertgu() { /* setup for save states */ save_item(NAME(m_desertgun_controller_select)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -1300,7 +1300,7 @@ MACHINE_CONFIG_START(mw8080bw_state::desertgu) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(desertgu_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,desertgu) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_desertgu, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ)) @@ -1524,12 +1524,12 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_START_MEMBER(mw8080bw_state,gmissile) +void mw8080bw_state::machine_start_gmissile() { /* setup for save states */ save_item(NAME(m_rev_shift_res)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -1601,7 +1601,7 @@ MACHINE_CONFIG_START(mw8080bw_state::gmissile) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(gmissile_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,gmissile) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_gmissile, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ)) @@ -1622,12 +1622,12 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_START_MEMBER(mw8080bw_state,m4) +void mw8080bw_state::machine_start_m4() { /* setup for save states */ save_item(NAME(m_rev_shift_res)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -1697,7 +1697,7 @@ MACHINE_CONFIG_START(mw8080bw_state::m4) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(m4_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,m4) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_m4, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ)) @@ -1722,12 +1722,12 @@ MACHINE_CONFIG_END #define CLOWNS_CONTROLLER_P2_TAG ("CONTP2") -MACHINE_START_MEMBER(mw8080bw_state,clowns) +void mw8080bw_state::machine_start_clowns() { /* setup for save states */ save_item(NAME(m_clowns_controller_select)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -1868,7 +1868,7 @@ MACHINE_CONFIG_START(mw8080bw_state::clowns) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(clowns_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,clowns) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_clowns, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ)) @@ -1966,7 +1966,7 @@ MACHINE_CONFIG_START(mw8080bw_state::spacwalk) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(spacwalk_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,clowns) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_clowns, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ)) @@ -2170,7 +2170,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mw8080bw_state::spcenctr_strobe_timer_callback) } -MACHINE_START_MEMBER(mw8080bw_state,spcenctr) +void mw8080bw_state::machine_start_spcenctr() { /* setup for save states */ save_item(NAME(m_spcenctr_strobe_state)); @@ -2180,7 +2180,7 @@ MACHINE_START_MEMBER(mw8080bw_state,spcenctr) save_item(NAME(m_spcenctr_bright_control)); save_item(NAME(m_spcenctr_brightness)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -2292,7 +2292,7 @@ MACHINE_CONFIG_START(mw8080bw_state::spcenctr) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(spcenctr_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,spcenctr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_spcenctr, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ)) @@ -2323,12 +2323,12 @@ MACHINE_CONFIG_END *************************************/ -MACHINE_START_MEMBER(mw8080bw_state,phantom2) +void mw8080bw_state::machine_start_phantom2() { /* setup for save states */ save_item(NAME(m_phantom2_cloud_counter)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -2390,7 +2390,7 @@ MACHINE_CONFIG_START(mw8080bw_state::phantom2) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(phantom2_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,phantom2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_phantom2, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ)) @@ -2553,12 +2553,12 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_START_MEMBER(mw8080bw_state,invaders) +void mw8080bw_state::machine_start_invaders() { /* setup for save states */ save_item(NAME(m_flip_screen)); - MACHINE_START_CALL_MEMBER(mw8080bw); + machine_start_mw8080bw(); } @@ -2746,7 +2746,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invaders) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(invaders_io_map) - MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,invaders) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_invaders, this)); MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ)) diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp index e1b526456f7..1dce5c3f8fc 100644 --- a/src/mame/drivers/mystwarr.cpp +++ b/src/mame/drivers/mystwarr.cpp @@ -859,7 +859,7 @@ static GFXDECODE_START( gfx_dadandrn ) GFXDECODE_ENTRY( "gfx3", 0, bglayout_8bpp, 0x0000, 8 ) GFXDECODE_END -MACHINE_START_MEMBER(mystwarr_state,mystwarr) +void mystwarr_state::machine_start_mystwarr() { membank("z80bank")->configure_entries(0, 16, memregion("soundcpu")->base(), 0x4000); membank("z80bank")->set_entry(2); @@ -875,43 +875,38 @@ MACHINE_START_MEMBER(mystwarr_state,mystwarr) save_item(NAME(m_sound_nmi_clk)); } -MACHINE_RESET_MEMBER(mystwarr_state,mystwarr) +void mystwarr_state::machine_reset_mystwarr() { - int i; - // soften chorus(chip 0 channel 0-3), boost voice(chip 0 channel 4-7) - for (i=0; i<=3; i++) + for (int i = 0; i <= 3; i++) { m_k054539_1->set_gain(i, 0.8); m_k054539_1->set_gain(i+4, 2.0); } // soften percussions(chip 1 channel 0-7) - for (i=0; i<=7; i++) m_k054539_2->set_gain(i, 0.5); + for (int i = 0; i <= 7; i++) + m_k054539_2->set_gain(i, 0.5); } -MACHINE_RESET_MEMBER(mystwarr_state,dadandrn) +void mystwarr_state::machine_reset_dadandrn() { - int i; - // boost voice(chip 0 channel 4-7) - for (i=4; i<=7; i++) m_k054539_1->set_gain(i, 2.0); + for (int i = 4; i <= 7; i++) + m_k054539_1->set_gain(i, 2.0); } -MACHINE_RESET_MEMBER(mystwarr_state,viostorm) +void mystwarr_state::machine_reset_viostorm() { - int i; - // boost voice(chip 0 channel 4-7) - for (i=4; i<=7; i++) m_k054539_1->set_gain(i, 2.0); + for (int i = 4; i <= 7; i++) + m_k054539_1->set_gain(i, 2.0); } -MACHINE_RESET_MEMBER(mystwarr_state,metamrph) +void mystwarr_state::machine_reset_metamrph() { - int i; - // boost voice(chip 0 channel 4-7) and soften other channels - for (i=0; i<=3; i++) + for (int i = 0; i <= 3; i++) { m_k054539_1->set_gain(i, 0.8); m_k054539_1->set_gain(i+4, 1.8); @@ -920,23 +915,22 @@ MACHINE_RESET_MEMBER(mystwarr_state,metamrph) } } -MACHINE_RESET_MEMBER(mystwarr_state,martchmp) +void mystwarr_state::machine_reset_martchmp() { - int i; k054539_device *k054539 = subdevice<k054539_device>("k054539"); k054539->init_flags(k054539_device::REVERSE_STEREO); // boost voice(chip 0 channel 4-7) - for (i=4; i<=7; i++) k054539->set_gain(i, 1.4); + for (int i = 4; i <= 7; i++) + k054539->set_gain(i, 1.4); } -MACHINE_RESET_MEMBER(mystwarr_state,gaiapols) +void mystwarr_state::machine_reset_gaiapols() { - int i; - // boost voice(chip 0 channel 5-7) - for (i=5; i<=7; i++) m_k054539_1->set_gain(i, 2.0); + for (int i = 5; i <= 7; i++) + m_k054539_1->set_gain(i, 2.0); } @@ -957,8 +951,8 @@ MACHINE_CONFIG_START(mystwarr_state::mystwarr) MCFG_DEVICE_ADD("k053252", K053252, 6000000) // 6 MHz? MCFG_K053252_OFFSETS(24, 16) - MCFG_MACHINE_START_OVERRIDE(mystwarr_state,mystwarr) - MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,mystwarr) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mystwarr, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mystwarr, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -991,7 +985,7 @@ MACHINE_CONFIG_START(mystwarr_state::mystwarr) MCFG_K054338_ALPHAINV(1) MCFG_K054338_MIXER("k055555") - MCFG_VIDEO_START_OVERRIDE(mystwarr_state, mystwarr) + set_video_start_cb(config, driver_callback_delegate(&video_start_mystwarr, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1014,7 +1008,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mystwarr_state::viostorm) mystwarr(config); - MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,viostorm) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_viostorm, this)); MCFG_DEVICE_REPLACE("k053252", K053252, 16000000/2) MCFG_K053252_OFFSETS(40, 16) @@ -1026,7 +1020,7 @@ MACHINE_CONFIG_START(mystwarr_state::viostorm) MCFG_TIMER_DRIVER_CALLBACK(mystwarr_state, metamrph_interrupt) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(mystwarr_state, viostorm) + set_video_start_cb(config, driver_callback_delegate(&video_start_viostorm, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mystwarr_state, screen_update_metamrph) @@ -1046,7 +1040,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mystwarr_state::metamrph) mystwarr(config); - MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,metamrph) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_metamrph, this)); /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") @@ -1060,7 +1054,7 @@ MACHINE_CONFIG_START(mystwarr_state::metamrph) MCFG_K053250_ADD("k053250_1", "palette", "screen", -7, 0) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(mystwarr_state, metamrph) + set_video_start_cb(config, driver_callback_delegate(&video_start_metamrph, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mystwarr_state, screen_update_metamrph) @@ -1080,7 +1074,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mystwarr_state::dadandrn) mystwarr(config); - MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,dadandrn) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dadandrn, this)); /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") @@ -1094,7 +1088,7 @@ MACHINE_CONFIG_START(mystwarr_state::dadandrn) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dadandrn) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(mystwarr_state, dadandrn) + set_video_start_cb(config, driver_callback_delegate(&video_start_dadandrn, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mystwarr_state, screen_update_dadandrn) @@ -1114,7 +1108,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mystwarr_state::gaiapols) mystwarr(config); - MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,gaiapols) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gaiapols, this)); /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") @@ -1130,7 +1124,7 @@ MACHINE_CONFIG_START(mystwarr_state::gaiapols) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gaiapols) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(mystwarr_state, gaiapols) + set_video_start_cb(config, driver_callback_delegate(&video_start_gaiapols, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mystwarr_state, screen_update_dadandrn) @@ -1151,7 +1145,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mystwarr_state::martchmp) mystwarr(config); - MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,martchmp) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_martchmp, this)); /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") @@ -1170,7 +1164,7 @@ MACHINE_CONFIG_START(mystwarr_state::martchmp) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(mystwarr_state, martchmp) + set_video_start_cb(config, driver_callback_delegate(&video_start_martchmp, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index aa49256728b..23b81eb4d99 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -385,7 +385,7 @@ MACHINE_CONFIG_START(mz_state::mz700) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(16) MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000) - MCFG_MACHINE_RESET_OVERRIDE(mz_state, mz700) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mz700, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -450,8 +450,7 @@ MACHINE_CONFIG_START(mz_state::mz800) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(16) MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000) - MCFG_MACHINE_RESET_OVERRIDE(mz_state, mz800) - MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_mz800) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mz800, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz800) diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index 3e77ff298db..0920349268b 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -30,7 +30,7 @@ public: { } DECLARE_READ32_MEMBER(dd_null_r); - DECLARE_MACHINE_START(n64dd); + void machine_start_n64dd() ATTR_COLD; INTERRUPT_GEN_MEMBER(n64_reset_poll); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(n64_cart); void mempak_format(uint8_t* pak); @@ -378,7 +378,7 @@ DEVICE_IMAGE_LOAD_MEMBER(n64_mess_state,n64_cart) return image_init_result::PASS; } -MACHINE_START_MEMBER(n64_mess_state,n64dd) +void n64_mess_state::machine_start_n64dd() { machine_start(); machine().device<n64_periphs>("rcp")->dd_present = true; @@ -487,7 +487,7 @@ MACHINE_CONFIG_START(n64_mess_state::n64dd) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(n64dd_map) - MCFG_MACHINE_START_OVERRIDE(n64_mess_state, n64dd) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_n64dd, this)); MCFG_DEVICE_REMOVE("cartslot") MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "n64_cart") diff --git a/src/mame/drivers/n8080.cpp b/src/mame/drivers/n8080.cpp index 0fb413ba939..80bb18e1c9e 100644 --- a/src/mame/drivers/n8080.cpp +++ b/src/mame/drivers/n8080.cpp @@ -470,32 +470,32 @@ void n8080_state::machine_start() save_item(NAME(m_inte)); } -MACHINE_RESET_MEMBER(n8080_state,n8080) +void n8080_state::machine_reset_n8080() { m_shift_data = 0; m_shift_bits = 0; m_inte = 0; } -MACHINE_RESET_MEMBER(n8080_state,spacefev) +void n8080_state::machine_reset_spacefev() { - MACHINE_RESET_CALL_MEMBER(n8080); + machine_reset_n8080(); m_spacefev_red_screen = 0; m_spacefev_red_cannon = 0; } -MACHINE_RESET_MEMBER(n8080_state,sheriff) +void n8080_state::machine_reset_sheriff() { - MACHINE_RESET_CALL_MEMBER(n8080); + machine_reset_n8080(); m_sheriff_color_mode = 0; m_sheriff_color_data = 0; } -MACHINE_RESET_MEMBER(n8080_state,helifire) +void n8080_state::machine_reset_helifire() { - MACHINE_RESET_CALL_MEMBER(n8080); + machine_reset_n8080(); m_helifire_mv = 0; m_helifire_sc = 0; @@ -512,7 +512,7 @@ MACHINE_CONFIG_START(n8080_state::spacefev) MCFG_DEVICE_PROGRAM_MAP(main_cpu_map) MCFG_DEVICE_IO_MAP(main_io_map) - MCFG_MACHINE_RESET_OVERRIDE(n8080_state,spacefev) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_spacefev, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -524,7 +524,7 @@ MACHINE_CONFIG_START(n8080_state::spacefev) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(n8080_state,n8080) - MCFG_VIDEO_START_OVERRIDE(n8080_state,spacefev) + set_video_start_cb(config, driver_callback_delegate(&video_start_spacefev, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("rst1", n8080_state, rst1_tick, "screen", 128, 256) MCFG_TIMER_DRIVER_ADD_SCANLINE("rst2", n8080_state, rst2_tick, "screen", 240, 256) @@ -543,7 +543,7 @@ MACHINE_CONFIG_START(n8080_state::sheriff) MCFG_DEVICE_PROGRAM_MAP(main_cpu_map) MCFG_DEVICE_IO_MAP(main_io_map) - MCFG_MACHINE_RESET_OVERRIDE(n8080_state,sheriff) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sheriff, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -555,7 +555,7 @@ MACHINE_CONFIG_START(n8080_state::sheriff) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(n8080_state,n8080) - MCFG_VIDEO_START_OVERRIDE(n8080_state,sheriff) + set_video_start_cb(config, driver_callback_delegate(&video_start_sheriff, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("rst1", n8080_state, rst1_tick, "screen", 128, 256) MCFG_TIMER_DRIVER_ADD_SCANLINE("rst2", n8080_state, rst2_tick, "screen", 240, 256) @@ -587,7 +587,7 @@ MACHINE_CONFIG_START(n8080_state::helifire) MCFG_DEVICE_PROGRAM_MAP(helifire_main_cpu_map) MCFG_DEVICE_IO_MAP(main_io_map) - MCFG_MACHINE_RESET_OVERRIDE(n8080_state,helifire) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_helifire, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -600,7 +600,7 @@ MACHINE_CONFIG_START(n8080_state::helifire) MCFG_PALETTE_ADD("palette", 8 + 0x400) MCFG_PALETTE_INIT_OWNER(n8080_state,helifire) - MCFG_VIDEO_START_OVERRIDE(n8080_state,helifire) + set_video_start_cb(config, driver_callback_delegate(&video_start_helifire, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("rst1", n8080_state, rst1_tick, "screen", 128, 256) MCFG_TIMER_DRIVER_ADD_SCANLINE("rst2", n8080_state, rst2_tick, "screen", 240, 256) diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp index 285cc731d61..8fc1f906321 100644 --- a/src/mame/drivers/namcofl.cpp +++ b/src/mame/drivers/namcofl.cpp @@ -552,7 +552,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcofl_state::mcu_adc_cb) } -MACHINE_START_MEMBER(namcofl_state,namcofl) +void namcofl_state::machine_start_namcofl() { m_raster_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(namcofl_state::raster_interrupt_callback),this)); m_network_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(namcofl_state::network_interrupt_callback),this)); @@ -568,7 +568,7 @@ MACHINE_START_MEMBER(namcofl_state,namcofl) } -MACHINE_RESET_MEMBER(namcofl_state,namcofl) +void namcofl_state::machine_reset_namcofl() { m_network_interrupt_timer->adjust(m_screen->time_until_pos(m_screen->visible_area().max_y + 3)); m_vblank_interrupt_timer->adjust(m_screen->time_until_pos(m_screen->visible_area().max_y + 1)); @@ -592,8 +592,8 @@ MACHINE_CONFIG_START(namcofl_state::namcofl) MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq2", namcofl_state, mcu_irq2_cb, attotime::from_hz(60)) MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_adc", namcofl_state, mcu_adc_cb, attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(namcofl_state,namcofl) - MCFG_MACHINE_RESET_OVERRIDE(namcofl_state,namcofl) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcofl, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcofl, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_SCREEN_ADD("screen", RASTER) @@ -610,7 +610,7 @@ MACHINE_CONFIG_START(namcofl_state::namcofl) MCFG_DEVICE_ADD("c116", NAMCO_C116, 0) MCFG_GFX_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(namcofl_state,namcofl) + set_video_start_cb(config, driver_callback_delegate(&video_start_namcofl, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp index 1ec49d25dd6..3856f6c41c9 100644 --- a/src/mame/drivers/namconb1.cpp +++ b/src/mame/drivers/namconb1.cpp @@ -1058,7 +1058,7 @@ GFXDECODE_END /* gfxdecodeinfo2 */ /***************************************************************/ -MACHINE_RESET_MEMBER(namconb1_state, namconb) +void namconb1_state::machine_reset_namconb() { m_pos_irq_level = 0; m_unk_irq_level = 0; @@ -1077,7 +1077,7 @@ MACHINE_CONFIG_START(namconb1_state::namconb1) MCFG_DEVICE_IO_MAP(namcoc75_io) MCFG_EEPROM_2816_ADD("eeprom") - MCFG_MACHINE_RESET_OVERRIDE(namconb1_state, namconb) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namconb, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namconb1_state, scantimer, "screen", 0, 1) @@ -1100,7 +1100,7 @@ MACHINE_CONFIG_START(namconb1_state::namconb1) MCFG_DEVICE_ADD("c116", NAMCO_C116, 0) MCFG_GFX_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(namconb1_state,namconb1) + set_video_start_cb(config, driver_callback_delegate(&video_start_namconb1, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1120,7 +1120,7 @@ MACHINE_CONFIG_START(namconb1_state::namconb2) MCFG_DEVICE_IO_MAP(namcoc75_io) MCFG_EEPROM_2816_ADD("eeprom") - MCFG_MACHINE_RESET_OVERRIDE(namconb1_state, namconb) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namconb, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namconb1_state, scantimer, "screen", 0, 1) MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq0", namconb1_state, mcu_irq0_cb, attotime::from_hz(60)) @@ -1141,7 +1141,7 @@ MACHINE_CONFIG_START(namconb1_state::namconb2) MCFG_DEVICE_ADD("c116", NAMCO_C116, 0) MCFG_GFX_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(namconb1_state,namconb2) + set_video_start_cb(config, driver_callback_delegate(&video_start_namconb2, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp index 8d582106834..a37f12d3190 100644 --- a/src/mame/drivers/namcos10.cpp +++ b/src/mame/drivers/namcos10.cpp @@ -484,7 +484,7 @@ public: void init_mrdrilrg(); void init_chocovdr(); void init_konotako(); - DECLARE_MACHINE_RESET(namcos10); + void machine_reset_namcos10(); void memn_driver_init( ); required_device<cpu_device> m_maincpu; }; @@ -906,7 +906,7 @@ void namcos10_state::init_konotako() } -MACHINE_RESET_MEMBER(namcos10_state,namcos10) +void namcos10_state::machine_reset_namcos10() { i2c_dev_clock = i2c_dev_data = 1; i2c_host_clock = i2c_host_data = 1; @@ -931,7 +931,7 @@ MACHINE_CONFIG_START(namcos10_state::namcos10_memm) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("16M") - MCFG_MACHINE_RESET_OVERRIDE(namcos10_state, namcos10 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos10, this)); /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561CQ, 0x200000, XTAL(53'693'175) ) @@ -956,7 +956,7 @@ MACHINE_CONFIG_START(namcos10_state::namcos10_memn) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("16M") - MCFG_MACHINE_RESET_OVERRIDE(namcos10_state, namcos10 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos10, this)); /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561CQ, 0x200000, XTAL(53'693'175) ) diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 7c78344c051..13fa6c43304 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -1751,8 +1751,8 @@ MACHINE_CONFIG_START(namcos2_state::base) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2) - MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") configure_c148_standard(config); @@ -1832,8 +1832,8 @@ MACHINE_CONFIG_START(namcos2_state::gollygho) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2) - MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") configure_c148_standard(config); @@ -1883,8 +1883,8 @@ MACHINE_CONFIG_START(namcos2_state::finallap) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2) - MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") configure_c148_standard(config); @@ -1902,7 +1902,7 @@ MACHINE_CONFIG_START(namcos2_state::finallap) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_VIDEO_START_OVERRIDE(namcos2_state, finallap) + set_video_start_cb(config, driver_callback_delegate(&video_start_finallap, this)); MCFG_NAMCO_C45_ROAD_ADD("c45_road") MCFG_GFX_PALETTE("palette") @@ -1939,8 +1939,8 @@ MACHINE_CONFIG_START(namcos2_state::sgunner) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2) - MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") configure_c148_standard(config); @@ -1958,7 +1958,7 @@ MACHINE_CONFIG_START(namcos2_state::sgunner) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_VIDEO_START_OVERRIDE(namcos2_state, sgunner) + set_video_start_cb(config, driver_callback_delegate(&video_start_sgunner, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1997,8 +1997,8 @@ MACHINE_CONFIG_START(namcos2_state::sgunner2) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2) - MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") configure_c148_standard(config); @@ -2016,7 +2016,7 @@ MACHINE_CONFIG_START(namcos2_state::sgunner2) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_VIDEO_START_OVERRIDE(namcos2_state, sgunner) + set_video_start_cb(config, driver_callback_delegate(&video_start_sgunner, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -2050,8 +2050,8 @@ MACHINE_CONFIG_START(namcos2_state::luckywld) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2) - MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") configure_c148_standard(config); @@ -2069,7 +2069,7 @@ MACHINE_CONFIG_START(namcos2_state::luckywld) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_VIDEO_START_OVERRIDE(namcos2_state, luckywld) + set_video_start_cb(config, driver_callback_delegate(&video_start_luckywld, this)); MCFG_NAMCO_C45_ROAD_ADD("c45_road") MCFG_GFX_PALETTE("palette") @@ -2106,8 +2106,8 @@ MACHINE_CONFIG_START(namcos2_state::metlhawk) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos2_state,namcos2) - MCFG_MACHINE_RESET_OVERRIDE(namcos2_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") configure_c148_standard(config); @@ -2125,7 +2125,7 @@ MACHINE_CONFIG_START(namcos2_state::metlhawk) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_VIDEO_START_OVERRIDE(namcos2_state, metlhawk) + set_video_start_cb(config, driver_callback_delegate(&video_start_metlhawk, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index 2256fca5db3..d32130db49b 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -1875,9 +1875,9 @@ static GFXDECODE_START( gfx_namcos21 ) GFXDECODE_ENTRY( "gfx1", 0x000000, tile_layout, 0x1000, 0x10 ) GFXDECODE_END -MACHINE_START_MEMBER(namcos21_state,namcos21) +void namcos21_state::machine_start_namcos21() { - MACHINE_START_CALL_MEMBER( namcos2 ); + machine_start_namcos2(); namcos2_kickstart = namcos21_kickstart; } @@ -1947,8 +1947,8 @@ MACHINE_CONFIG_START(namcos21_state::namcos21) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) - MCFG_MACHINE_START_OVERRIDE(namcos21_state,namcos21) - MCFG_MACHINE_RESET_OVERRIDE(namcos21_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos21, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") @@ -1964,7 +1964,7 @@ MACHINE_CONFIG_START(namcos21_state::namcos21) MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS) MCFG_PALETTE_FORMAT(XBRG) - MCFG_VIDEO_START_OVERRIDE(namcos21_state,namcos21) + set_video_start_cb(config, driver_callback_delegate(&video_start_namcos21, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -2008,8 +2008,8 @@ MACHINE_CONFIG_START(namcos21_state::driveyes) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos21_state,namcos21) - MCFG_MACHINE_RESET_OVERRIDE(namcos21_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos21, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_DEVICE_ADD("gearbox", NAMCOIO_GEARBOX, 0) @@ -2026,7 +2026,7 @@ MACHINE_CONFIG_START(namcos21_state::driveyes) MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS) MCFG_PALETTE_FORMAT(XBRG) - MCFG_VIDEO_START_OVERRIDE(namcos21_state,namcos21) + set_video_start_cb(config, driver_callback_delegate(&video_start_namcos21, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -2076,8 +2076,8 @@ MACHINE_CONFIG_START(namcos21_state::winrun) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(namcos21_state,namcos21) - MCFG_MACHINE_RESET_OVERRIDE(namcos21_state,namcos2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcos21, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcos2, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_SCREEN_ADD("screen", RASTER) @@ -2090,7 +2090,7 @@ MACHINE_CONFIG_START(namcos21_state::winrun) MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS) MCFG_PALETTE_FORMAT(XBRG) - MCFG_VIDEO_START_OVERRIDE(namcos21_state,namcos21) + set_video_start_cb(config, driver_callback_delegate(&video_start_namcos21, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 75c5578da43..110ee66697c 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -3952,7 +3952,7 @@ MACHINE_CONFIG_START(namcos22_state::propcycl) MCFG_TIMER_DRIVER_ADD("pc_p_int", namcos22_state, propcycl_pedal_interrupt) MACHINE_CONFIG_END -MACHINE_START_MEMBER(namcos22_state,adillor) +void namcos22_state::machine_start_adillor() { machine_start(); @@ -3966,7 +3966,7 @@ MACHINE_CONFIG_START(namcos22_state::adillor) /* basic machine hardware */ MCFG_TIMER_DRIVER_ADD_PERIODIC("ar_tb_upd", namcos22_state, adillor_trackball_update, attotime::from_msec(20)) - MCFG_MACHINE_START_OVERRIDE(namcos22_state,adillor) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_adillor, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index e95bdcca138..82419395bee 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -1558,8 +1558,8 @@ public: DECLARE_WRITE16_MEMBER(c435_state_reset_w); void init_s23(); TILE_GET_INFO_MEMBER(TextTilemapGetInfo); - DECLARE_VIDEO_START(s23); - DECLARE_MACHINE_RESET(gmen); + void video_start_s23() ATTR_COLD; + void machine_reset_gmen(); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -2398,7 +2398,7 @@ WRITE32_MEMBER(namcos23_state::textchar_w) // Video start/update callbacks -VIDEO_START_MEMBER(namcos23_state,s23) +void namcos23_state::video_start_s23() { m_gfxdecode->gfx(0)->set_source(reinterpret_cast<uint8_t *>(m_charram.target())); m_bgtilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(namcos23_state::TextTilemapGetInfo),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); @@ -3481,7 +3481,7 @@ void namcos23_state::machine_reset() m_subcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -MACHINE_RESET_MEMBER(namcos23_state,gmen) +void namcos23_state::machine_reset_gmen() { machine_reset(); @@ -3614,7 +3614,7 @@ MACHINE_CONFIG_START(namcos23_state::gorgon) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos23) - MCFG_VIDEO_START_OVERRIDE(namcos23_state,s23) + set_video_start_cb(config, driver_callback_delegate(&video_start_s23, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -3681,7 +3681,7 @@ MACHINE_CONFIG_START(namcos23_state::s23) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos23) - MCFG_VIDEO_START_OVERRIDE(namcos23_state,s23) + set_video_start_cb(config, driver_callback_delegate(&video_start_s23, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -3713,7 +3713,7 @@ MACHINE_CONFIG_START(namcos23_state::gmen) MCFG_DEVICE_ADD("gmen_sh2", SH2, XTAL(28'700'000)) MCFG_DEVICE_PROGRAM_MAP(gmen_sh2_map) - MCFG_MACHINE_RESET_OVERRIDE(namcos23_state,gmen) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gmen, this)); MACHINE_CONFIG_END @@ -3761,7 +3761,7 @@ MACHINE_CONFIG_START(namcos23_state::ss23) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos23) - MCFG_VIDEO_START_OVERRIDE(namcos23_state,s23) + set_video_start_cb(config, driver_callback_delegate(&video_start_s23, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index fcf41775b19..b3b9ebba961 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -2662,7 +2662,7 @@ static INPUT_PORTS_START( aw1w ) PORT_INCLUDE( naomi_debug ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(naomi_state,naomi) +void naomi_state::machine_reset_naomi() { naomi_state::machine_reset(); m_aica->set_ram_base(dc_sound_ram, 8*1024*1024); @@ -2736,7 +2736,7 @@ MACHINE_CONFIG_START(naomi_state::naomi_base) MCFG_X76F100_ADD("naomibd_eeprom") MCFG_M3COMM_ADD("comm_board") - MCFG_MACHINE_RESET_OVERRIDE(naomi_state,naomi) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_naomi, this)); MCFG_NVRAM_ADD_0FILL("sram") MACHINE_CONFIG_END @@ -2851,7 +2851,7 @@ MACHINE_CONFIG_START(atomiswave_state::aw_base) MCFG_MACRONIX_29L001MC_ADD("awflash") MCFG_AW_ROM_BOARD_ADD("rom_board", "rom_key", WRITE8(*this, dc_state, g1_irq)) - MCFG_MACHINE_RESET_OVERRIDE(dc_state,dc_console) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dc_console, this)); MCFG_NVRAM_ADD_0FILL("sram") MACHINE_CONFIG_END diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp index db326f7fc7f..0f6d3081c2a 100644 --- a/src/mame/drivers/nbmj8688.cpp +++ b/src/mame/drivers/nbmj8688.cpp @@ -2474,7 +2474,7 @@ MACHINE_CONFIG_START(nbmj8688_state::NBMJDRV_4096) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INIT_OWNER(nbmj8688_state,mbmj8688_12bit) - MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_pure_12bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_mbmj8688_pure_12bit, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2499,7 +2499,7 @@ MACHINE_CONFIG_START(nbmj8688_state::NBMJDRV_256) MCFG_PALETTE_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(nbmj8688_state,mbmj8688_8bit) - MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_8bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_mbmj8688_8bit, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(nbmj8688_state::NBMJDRV_65536) @@ -2513,7 +2513,7 @@ MACHINE_CONFIG_START(nbmj8688_state::NBMJDRV_65536) MCFG_PALETTE_ENTRIES(65536) MCFG_PALETTE_INIT_OWNER(nbmj8688_state,mbmj8688_16bit) - MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_hybrid_16bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_mbmj8688_hybrid_16bit, this)); MACHINE_CONFIG_END // -------------------------------------------------------------------------------- @@ -2565,7 +2565,7 @@ MACHINE_CONFIG_START(nbmj8688_state::mbmj_h12bit) MCFG_DEVICE_IO_MAP(secolove_io_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_hybrid_12bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_mbmj8688_hybrid_12bit, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(nbmj8688_state::citylove) @@ -2616,7 +2616,7 @@ MACHINE_CONFIG_START(nbmj8688_state::mbmj_p16bit) MCFG_DEVICE_IO_MAP(secolove_io_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_pure_16bit) + set_video_start_cb(config, driver_callback_delegate(&video_start_mbmj8688_pure_16bit, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(nbmj8688_state::mbmj_p16bit_LCD) @@ -2667,7 +2667,7 @@ MACHINE_CONFIG_START(nbmj8688_state::mbmj_p16bit_LCD) MCFG_DEVICE_ADD("lcdc1", HD61830B, 5000000/2) // ??? MCFG_VIDEO_SET_SCREEN("lcd1") - MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_pure_16bit_LCD) + set_video_start_cb(config, driver_callback_delegate(&video_start_mbmj8688_pure_16bit_LCD, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/nbmj8891.cpp b/src/mame/drivers/nbmj8891.cpp index 37474214287..c7372078658 100644 --- a/src/mame/drivers/nbmj8891.cpp +++ b/src/mame/drivers/nbmj8891.cpp @@ -2280,7 +2280,7 @@ MACHINE_CONFIG_START(nbmj8891_state::mjcamerb) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) - MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) + set_video_start_cb(config, driver_callback_delegate(&video_start__1layer, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(nbmj8891_state::mmcamera) @@ -2298,7 +2298,7 @@ MACHINE_CONFIG_START(nbmj8891_state::mmcamera) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) - MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) + set_video_start_cb(config, driver_callback_delegate(&video_start__1layer, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(nbmj8891_state::hanamomo) @@ -2315,7 +2315,7 @@ MACHINE_CONFIG_START(nbmj8891_state::hanamomo) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) - MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) + set_video_start_cb(config, driver_callback_delegate(&video_start__1layer, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(nbmj8891_state::msjiken) @@ -2338,7 +2338,7 @@ MACHINE_CONFIG_START(nbmj8891_state::telmahjn) MCFG_NB1413M3_TYPE( NB1413M3_TELMAHJN ) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) + set_video_start_cb(config, driver_callback_delegate(&video_start__1layer, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(nbmj8891_state::mgmen89) @@ -2359,7 +2359,7 @@ MACHINE_CONFIG_START(nbmj8891_state::mjfocus) MCFG_NB1413M3_TYPE( NB1413M3_MJFOCUS ) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) + set_video_start_cb(config, driver_callback_delegate(&video_start__1layer, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(nbmj8891_state::pairsnb) @@ -2522,7 +2522,7 @@ MACHINE_CONFIG_START(nbmj8891_state::mjfocusm) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) - MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) + set_video_start_cb(config, driver_callback_delegate(&video_start__1layer, this)); /* sound hardware */ MCFG_DEVICE_REPLACE("fmsnd", AY8910, 1250000) @@ -2555,7 +2555,7 @@ MACHINE_CONFIG_START(nbmj8891_state::taiwanmb) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1) - MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) + set_video_start_cb(config, driver_callback_delegate(&video_start__1layer, this)); /* sound hardware */ MCFG_DEVICE_REPLACE("fmsnd", AY8910, 1250000) diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp index 097dc82f247..6cd5fc6af77 100644 --- a/src/mame/drivers/nbmj9195.cpp +++ b/src/mame/drivers/nbmj9195.cpp @@ -2593,7 +2593,7 @@ MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV2) OTHERS_TMZ84C011_MAIN_PORTS /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(nbmj9195_state,_1layer) + set_video_start_cb(config, driver_callback_delegate(&video_start__1layer, this)); MACHINE_CONFIG_END @@ -2608,7 +2608,7 @@ MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV3) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(512) - MCFG_VIDEO_START_OVERRIDE(nbmj9195_state,nb22090) + set_video_start_cb(config, driver_callback_delegate(&video_start_nb22090, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp index 9d4fca3f82d..087177453b7 100644 --- a/src/mame/drivers/nc.cpp +++ b/src/mame/drivers/nc.cpp @@ -1120,7 +1120,7 @@ void nc_state::nc200_floppy_drive_index_callback(int drive_id) } #endif -MACHINE_RESET_MEMBER(nc_state, nc200) +void nc_state::machine_reset_nc200() { /* 512k of rom */ m_membank_rom_mask = 0x1f; @@ -1139,7 +1139,7 @@ MACHINE_RESET_MEMBER(nc_state, nc200) nc200_video_set_backlight(0); } -MACHINE_START_MEMBER(nc_state, nc200) +void nc_state::machine_start_nc200() { m_type = NC_TYPE_200; @@ -1477,8 +1477,8 @@ MACHINE_CONFIG_START(nc_state::nc200) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_IO_MAP(nc200_io) - MCFG_MACHINE_START_OVERRIDE(nc_state, nc200) - MCFG_MACHINE_RESET_OVERRIDE(nc_state, nc200) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_nc200, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_nc200, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp index 4a9affd20f4..9643d55297a 100644 --- a/src/mame/drivers/neoprint.cpp +++ b/src/mame/drivers/neoprint.cpp @@ -65,7 +65,7 @@ public: void init_npcartv1(); void init_nprsp(); void init_unkneo(); - DECLARE_MACHINE_RESET(nprsp); + void machine_reset_nprsp(); uint32_t screen_update_neoprint(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_nprsp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(neoprint_state::neoprint) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_RESET_MEMBER(neoprint_state,nprsp) +void neoprint_state::machine_reset_nprsp() { m_bank_val = 0; } @@ -562,7 +562,7 @@ MACHINE_CONFIG_START(neoprint_state::nprsp) MCFG_SCREEN_UPDATE_DRIVER(neoprint_state, screen_update_nprsp) MCFG_SCREEN_PALETTE("palette") - MCFG_MACHINE_RESET_OVERRIDE(neoprint_state,nprsp) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_nprsp, this)); MCFG_PALETTE_ADD("palette", 0x10000) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp index 0583a6b1ea1..b52f2267001 100644 --- a/src/mame/drivers/nes.cpp +++ b/src/mame/drivers/nes.cpp @@ -193,7 +193,7 @@ void nes_state::setup_disk(nes_disksys_device *slot) } -MACHINE_START_MEMBER( nes_state, fds ) +void nes_state::machine_start_fds() { m_ciram = std::make_unique<uint8_t[]>(0x800); m_io_disksel = ioport("FLIPDISK"); @@ -204,7 +204,7 @@ MACHINE_START_MEMBER( nes_state, fds ) save_pointer(NAME(m_ciram.get()), 0x800); } -MACHINE_RESET_MEMBER( nes_state, fds ) +void nes_state::machine_reset_fds() { // Reset the mapper variables m_disk->pcb_reset(); @@ -215,8 +215,8 @@ MACHINE_RESET_MEMBER( nes_state, fds ) MACHINE_CONFIG_START(nes_state::fds) famicom(config); - MCFG_MACHINE_START_OVERRIDE( nes_state, fds ) - MCFG_MACHINE_RESET_OVERRIDE( nes_state, fds ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_fds, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_fds, this)); MCFG_DEVICE_REMOVE("nes_slot") MCFG_DEVICE_ADD("disk", NES_DISKSYS, 0) @@ -230,7 +230,7 @@ MACHINE_CONFIG_START(nes_state::fds) MACHINE_CONFIG_END -MACHINE_START_MEMBER( nes_state, famitwin ) +void nes_state::machine_start_famitwin() { // start the base nes stuff machine_start(); @@ -246,7 +246,7 @@ MACHINE_START_MEMBER( nes_state, famitwin ) } } -MACHINE_RESET_MEMBER( nes_state, famitwin ) +void nes_state::machine_reset_famitwin() { // Reset the mapper variables. Will also mark the char-gen ram as dirty m_cartslot->pcb_reset(); @@ -261,8 +261,8 @@ MACHINE_RESET_MEMBER( nes_state, famitwin ) MACHINE_CONFIG_START(nes_state::famitwin) famicom(config); - MCFG_MACHINE_START_OVERRIDE( nes_state, famitwin ) - MCFG_MACHINE_RESET_OVERRIDE( nes_state, famitwin ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_famitwin, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_famitwin, this)); MCFG_DEVICE_MODIFY("nes_slot") MCFG_NES_CARTRIDGE_NOT_MANDATORY diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp index c6d3302ba6d..852d1e399da 100644 --- a/src/mame/drivers/ninjakd2.cpp +++ b/src/mame/drivers/ninjakd2.cpp @@ -914,14 +914,14 @@ void ninjakd2_state::machine_reset() m_rom_bank_mask = num_banks - 1; } -MACHINE_START_MEMBER(ninjakd2_state,omegaf) +void ninjakd2_state::machine_start_omegaf() { omegaf_io_protection_start(); machine_start(); } -MACHINE_RESET_MEMBER(ninjakd2_state,omegaf) +void ninjakd2_state::machine_reset_omegaf() { omegaf_io_protection_reset(); @@ -1004,7 +1004,7 @@ MACHINE_CONFIG_START(ninjakd2_state::mnight) MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,mnight) + set_video_start_cb(config, driver_callback_delegate(&video_start_mnight, this)); /* sound hardware */ MCFG_DEVICE_REMOVE("pcm") @@ -1020,7 +1020,7 @@ MACHINE_CONFIG_START(ninjakd2_state::arkarea) MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,arkarea) + set_video_start_cb(config, driver_callback_delegate(&video_start_arkarea, this)); /* sound hardware */ MCFG_DEVICE_REMOVE("pcm") @@ -1043,7 +1043,7 @@ MACHINE_CONFIG_START(ninjakd2_state::robokid) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,robokid) + set_video_start_cb(config, driver_callback_delegate(&video_start_robokid, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(ninjakd2_state, screen_update_robokid) MACHINE_CONFIG_END @@ -1058,11 +1058,11 @@ MACHINE_CONFIG_START(ninjakd2_state::omegaf) MCFG_DEVICE_MODIFY("soundcpu") MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu) - MCFG_MACHINE_START_OVERRIDE(ninjakd2_state,omegaf) - MCFG_MACHINE_RESET_OVERRIDE(ninjakd2_state,omegaf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_omegaf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_omegaf, this)); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,omegaf) + set_video_start_cb(config, driver_callback_delegate(&video_start_omegaf, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(ninjakd2_state, screen_update_omegaf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp index 6e3d8d8608d..fb5e162bc61 100644 --- a/src/mame/drivers/niyanpai.cpp +++ b/src/mame/drivers/niyanpai.cpp @@ -71,7 +71,7 @@ READ16_MEMBER(niyanpai_state::dipsw_r) return ((dipsw_a << 8) | dipsw_b); } -MACHINE_START_MEMBER(niyanpai_state, musobana) +void niyanpai_state::machine_start_musobana() { save_item(NAME(m_motor_on)); save_item(NAME(m_musobana_inputport)); @@ -728,7 +728,7 @@ MACHINE_CONFIG_START(niyanpai_state::musobana) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(musobana_map) - MCFG_MACHINE_START_OVERRIDE(niyanpai_state, musobana) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_musobana, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(niyanpai_state::mhhonban) diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 29447b50129..7fd6460b3ed 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -3861,7 +3861,7 @@ MACHINE_CONFIG_START(nmk16_state::tharrier) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tharrier) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3901,7 +3901,7 @@ MACHINE_CONFIG_START(nmk16_state::mustang) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3944,7 +3944,7 @@ MACHINE_CONFIG_START(nmk16_state::mustangb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3982,7 +3982,7 @@ MACHINE_CONFIG_START(nmk16_state::bioship) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,bioship) + set_video_start_cb(config, driver_callback_delegate(&video_start_bioship, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4022,7 +4022,7 @@ MACHINE_CONFIG_START(nmk16_state::vandyke) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4065,7 +4065,7 @@ MACHINE_CONFIG_START(nmk16_state::vandykeb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4091,7 +4091,7 @@ MACHINE_CONFIG_START(nmk16_state::acrobatm) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4135,7 +4135,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragonb) /* bootleg using Raiden sound har MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4170,7 +4170,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragon) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4218,7 +4218,7 @@ MACHINE_CONFIG_START(nmk16_state::ssmissin) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4247,7 +4247,7 @@ MACHINE_CONFIG_START(nmk16_state::strahl) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,strahl) + set_video_start_cb(config, driver_callback_delegate(&video_start_strahl, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4287,7 +4287,7 @@ MACHINE_CONFIG_START(nmk16_state::hachamf) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4333,7 +4333,7 @@ MACHINE_CONFIG_START(nmk16_state::macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4373,7 +4373,7 @@ MACHINE_CONFIG_START(nmk16_state::blkheart) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4412,7 +4412,7 @@ MACHINE_CONFIG_START(nmk16_state::gunnail) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,gunnail) + set_video_start_cb(config, driver_callback_delegate(&video_start_gunnail, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4456,7 +4456,7 @@ MACHINE_CONFIG_START(nmk16_state::macross2) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross2) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4502,7 +4502,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragon2) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross2) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4555,7 +4555,7 @@ MACHINE_CONFIG_START(nmk16_state::raphero) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,raphero) + set_video_start_cb(config, driver_callback_delegate(&video_start_raphero, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4597,7 +4597,7 @@ MACHINE_CONFIG_START(nmk16_state::bjtwin) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,bjtwin) + set_video_start_cb(config, driver_callback_delegate(&video_start_bjtwin, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4659,7 +4659,7 @@ MACHINE_CONFIG_START(nmk16_state::manybloc) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5171,7 +5171,7 @@ MACHINE_CONFIG_START(nmk16_state::stagger1) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,afega) + set_video_start_cb(config, driver_callback_delegate(&video_start_afega, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -5216,7 +5216,7 @@ MACHINE_CONFIG_START(nmk16_state::grdnstrm) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_grdnstrm) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,firehawk) + set_video_start_cb(config, driver_callback_delegate(&video_start_firehawk, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_firehawk) MACHINE_CONFIG_END @@ -5229,8 +5229,13 @@ MACHINE_CONFIG_START(nmk16_state::grdnstrmk) /* Side by side with PCB, the music /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(57) /* Side by side with PCB, MAME is too fast at 56 */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_grdnstrm) MCFG_VIDEO_START_OVERRIDE(nmk16_state,grdnstrm) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", grdnstrm) + set_video_start_cb(config, driver_callback_delegate(&video_start_grdnstrm, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MACHINE_CONFIG_END MACHINE_CONFIG_START(nmk16_state::popspops) @@ -5262,7 +5267,7 @@ MACHINE_CONFIG_START(nmk16_state::firehawk) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,firehawk) + set_video_start_cb(config, driver_callback_delegate(&video_start_firehawk, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5303,7 +5308,7 @@ MACHINE_CONFIG_START(nmk16_state::twinactn) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) + set_video_start_cb(config, driver_callback_delegate(&video_start_macross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp index 3108cc31c94..73a9ea0463e 100644 --- a/src/mame/drivers/nova2001.cpp +++ b/src/mame/drivers/nova2001.cpp @@ -166,7 +166,7 @@ WRITE8_MEMBER(nova2001_state::ninjakun_cpu2_io_A002_w) * *************************************/ -MACHINE_START_MEMBER(nova2001_state,ninjakun) +void nova2001_state::machine_start_ninjakun() { /* Save State Stuff */ save_item(NAME(m_ninjakun_io_a002_ctrl)); @@ -668,7 +668,7 @@ MACHINE_CONFIG_START(nova2001_state::nova2001) MCFG_PALETTE_FORMAT_CLASS(1, nova2001_state, BBGGRRII) MCFG_PALETTE_INIT_OWNER(nova2001_state,nova2001) - MCFG_VIDEO_START_OVERRIDE(nova2001_state,nova2001) + set_video_start_cb(config, driver_callback_delegate(&video_start_nova2001, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -697,7 +697,7 @@ MACHINE_CONFIG_START(nova2001_state::ninjakun) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */ - MCFG_MACHINE_START_OVERRIDE(nova2001_state,ninjakun) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ninjakun, this)); /* video hardware */ @@ -712,7 +712,7 @@ MACHINE_CONFIG_START(nova2001_state::ninjakun) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT_CLASS(1, nova2001_state, BBGGRRII) - MCFG_VIDEO_START_OVERRIDE(nova2001_state,ninjakun) + set_video_start_cb(config, driver_callback_delegate(&video_start_ninjakun, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -749,7 +749,7 @@ MACHINE_CONFIG_START(nova2001_state::pkunwar) MCFG_PALETTE_FORMAT_CLASS(1, nova2001_state, BBGGRRII) MCFG_PALETTE_INIT_OWNER(nova2001_state,nova2001) - MCFG_VIDEO_START_OVERRIDE(nova2001_state,pkunwar) + set_video_start_cb(config, driver_callback_delegate(&video_start_pkunwar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -791,7 +791,7 @@ MACHINE_CONFIG_START(nova2001_state::raiders5) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT_CLASS(1, nova2001_state, BBGGRRII) - MCFG_VIDEO_START_OVERRIDE(nova2001_state,raiders5) + set_video_start_cb(config, driver_callback_delegate(&video_start_raiders5, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp index 3e108d567bf..1b7bd140808 100644 --- a/src/mame/drivers/novag6502.cpp +++ b/src/mame/drivers/novag6502.cpp @@ -110,7 +110,7 @@ public: DECLARE_WRITE8_MEMBER(sexpert_lcd_data_w); DECLARE_READ8_MEMBER(sexpert_input1_r); DECLARE_READ8_MEMBER(sexpert_input2_r); - DECLARE_MACHINE_RESET(sexpert); + void machine_reset_sexpert(); void init_sexpert(); DECLARE_INPUT_CHANGED_MEMBER(sexpert_cpu_freq); void sexpert_map(address_map &map); @@ -453,7 +453,7 @@ void novag6502_state::sexpert_set_cpu_freq() m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? (12_MHz_XTAL/2) : (10_MHz_XTAL/2)); } -MACHINE_RESET_MEMBER(novag6502_state, sexpert) +void novag6502_state::machine_reset_sexpert() { novagbase_state::machine_reset(); @@ -928,7 +928,7 @@ MACHINE_CONFIG_START(novag6502_state::sexpert) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_MACHINE_RESET_OVERRIDE(novag6502_state, sexpert) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sexpert, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", LCD) diff --git a/src/mame/drivers/novagmcs48.cpp b/src/mame/drivers/novagmcs48.cpp index e9a0d19c22c..8df3ec97df6 100644 --- a/src/mame/drivers/novagmcs48.cpp +++ b/src/mame/drivers/novagmcs48.cpp @@ -49,7 +49,7 @@ public: DECLARE_WRITE8_MEMBER(presto_mux_w); DECLARE_WRITE8_MEMBER(presto_control_w); DECLARE_READ8_MEMBER(presto_input_r); - DECLARE_MACHINE_RESET(octo); + void machine_reset_octo(); DECLARE_INPUT_CHANGED_MEMBER(octo_cpu_freq); void octo_set_cpu_freq(); void presto(machine_config &config); @@ -98,7 +98,7 @@ void novagmcs48_state::octo_set_cpu_freq() m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? (15000000) : (12000000)); } -MACHINE_RESET_MEMBER(novagmcs48_state, octo) +void novagmcs48_state::machine_reset_octo() { novagbase_state::machine_reset(); octo_set_cpu_freq(); @@ -169,7 +169,7 @@ MACHINE_CONFIG_START(novagmcs48_state::octo) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(12000000) // LC circuit, measured, see octo_set_cpu_freq - MCFG_MACHINE_RESET_OVERRIDE(novagmcs48_state, octo) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_octo, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp index bd6fc1d5de3..7a2b0ec7c3f 100644 --- a/src/mame/drivers/nycaptor.cpp +++ b/src/mame/drivers/nycaptor.cpp @@ -723,7 +723,7 @@ void nycaptor_state::machine_start() void nycaptor_state::machine_reset() { -// MACHINE_RESET_CALL_MEMBER(ta7630); +// machine_reset_ta7630(); m_generic_control_reg = 0; diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index ee2dcb778b1..594fb107ba3 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -655,7 +655,7 @@ static GFXDECODE_START( gfx_ojankohs ) GFXDECODE_ENTRY( "gfx1", 0, ojankohs_bglayout, 0, 64 ) GFXDECODE_END -MACHINE_START_MEMBER(ojankohs_state,common) +void ojankohs_state::machine_start_common() { save_item(NAME(m_gfxreg)); save_item(NAME(m_flipscreen)); @@ -669,31 +669,31 @@ MACHINE_START_MEMBER(ojankohs_state,common) save_item(NAME(m_vclk_left)); } -MACHINE_START_MEMBER(ojankohs_state,ojankohs) +void ojankohs_state::machine_start_ojankohs() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x40, &ROM[0x10000], 0x4000); - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); } -MACHINE_START_MEMBER(ojankohs_state,ojankoy) +void ojankohs_state::machine_start_ojankoy() { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 0x20, &ROM[0x10000], 0x4000); - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); } -MACHINE_START_MEMBER(ojankohs_state,ojankoc) +void ojankohs_state::machine_start_ojankoc() { uint8_t *ROM = memregion("user1")->base(); membank("bank1")->configure_entries(0, 0x10, &ROM[0x0000], 0x8000); - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); } void ojankohs_state::machine_reset() @@ -720,7 +720,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankohs) MCFG_DEVICE_IO_MAP(ojankohs_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankohs) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ojankohs, this)); MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -737,7 +737,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankohs) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(13'333'000)/2) // divider not verified - MCFG_VIDEO_START_OVERRIDE(ojankohs_state,ojankohs) + set_video_start_cb(config, driver_callback_delegate(&video_start_ojankohs, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -761,7 +761,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoy) MCFG_DEVICE_IO_MAP(ojankoy_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankoy) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ojankoy, this)); MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -777,7 +777,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoy) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_INIT_OWNER(ojankohs_state,ojankoy) - MCFG_VIDEO_START_OVERRIDE(ojankohs_state,ojankoy) + set_video_start_cb(config, driver_callback_delegate(&video_start_ojankoy, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -801,7 +801,7 @@ MACHINE_CONFIG_START(ojankohs_state::ccasino) MCFG_DEVICE_IO_MAP(ccasino_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankohs) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ojankohs, this)); MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -818,7 +818,7 @@ MACHINE_CONFIG_START(ojankohs_state::ccasino) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(13'333'000)/2) // divider not verified - MCFG_VIDEO_START_OVERRIDE(ojankohs_state,ccasino) + set_video_start_cb(config, driver_callback_delegate(&video_start_ccasino, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -842,7 +842,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoc) MCFG_DEVICE_IO_MAP(ojankoc_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold) - MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankoc) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ojankoc, this)); MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -856,7 +856,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoc) MCFG_PALETTE_ADD("palette", 16) - MCFG_VIDEO_START_OVERRIDE(ojankohs_state,ojankoc) + set_video_start_cb(config, driver_callback_delegate(&video_start_ojankoc, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp index 7cb100c5b6e..24745565da3 100644 --- a/src/mame/drivers/onyx.cpp +++ b/src/mame/drivers/onyx.cpp @@ -63,7 +63,7 @@ public: , m_pio2(*this, "pio2") { } - DECLARE_MACHINE_RESET(c8002); + void machine_reset_c8002(); void c8002(machine_config &config); void c5000(machine_config &config); @@ -86,7 +86,7 @@ static INPUT_PORTS_START( c8002 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(onyx_state, c8002) +void onyx_state::machine_reset_c8002() { } @@ -143,7 +143,7 @@ MACHINE_CONFIG_START(onyx_state::c8002) //MCFG_Z80_DAISY_CHAIN(sub_daisy_chain) MCFG_DEVICE_PROGRAM_MAP(submem) MCFG_DEVICE_IO_MAP(subio) - MCFG_MACHINE_RESET_OVERRIDE(onyx_state, c8002) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_c8002, this)); MCFG_DEVICE_ADD("sio1_clock", CLOCK, 307200) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio1", z80sio_device, rxca_w)) @@ -249,7 +249,7 @@ MACHINE_CONFIG_START(onyx_state::c5000) //MCFG_Z80_DAISY_CHAIN(sub_daisy_chain) MCFG_DEVICE_PROGRAM_MAP(c5000_mem) MCFG_DEVICE_IO_MAP(c5000_io) - //MCFG_MACHINE_RESET_OVERRIDE(onyx_state, c8002) + //set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_c8002, this)); MCFG_DEVICE_ADD("sio1_clock", CLOCK, 614400) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio1", z80sio_device, rxtxcb_w)) diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 7c4122f9529..3f33b5b2e58 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -457,7 +457,7 @@ void opwolf_state::machine_start() save_item(NAME(m_adpcm_end)); } -MACHINE_RESET_MEMBER(opwolf_state,opwolf) +void opwolf_state::machine_reset_opwolf() { m_adpcm_b[0] = m_adpcm_b[1] = 0; m_adpcm_c[0] = m_adpcm_c[1] = 0; @@ -796,7 +796,7 @@ MACHINE_CONFIG_START(opwolf_state::opwolf) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ - MCFG_MACHINE_RESET_OVERRIDE(opwolf_state,opwolf) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_opwolf, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp index 16519932b7a..ab6a9e8fa5e 100644 --- a/src/mame/drivers/orion.cpp +++ b/src/mame/drivers/orion.cpp @@ -97,8 +97,8 @@ MACHINE_CONFIG_START(orion_state::orion128) MCFG_DEVICE_PROGRAM_MAP(orion128_mem) MCFG_DEVICE_IO_MAP(orion128_io) - MCFG_MACHINE_START_OVERRIDE(orion_state, orion128 ) - MCFG_MACHINE_RESET_OVERRIDE(orion_state, orion128 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_orion128, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_orion128, this)); MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, orion_state, orion_romdisk_porta_r)) @@ -123,7 +123,7 @@ MACHINE_CONFIG_START(orion_state::orion128) MCFG_PALETTE_ADD("palette", 18) MCFG_PALETTE_INIT_OWNER(orion_state, orion128 ) - MCFG_VIDEO_START_OVERRIDE(orion_state,orion128) + set_video_start_cb(config, driver_callback_delegate(&video_start_orion128, this)); SPEAKER(config, "mono").front_center(); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); @@ -170,8 +170,8 @@ MACHINE_CONFIG_START(orion_state::orionz80) MCFG_DEVICE_IO_MAP(orionz80_io) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", orion_state, orionz80_interrupt) - MCFG_MACHINE_START_OVERRIDE(orion_state, orionz80 ) - MCFG_MACHINE_RESET_OVERRIDE(orion_state, orionz80 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_orionz80, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_orionz80, this)); MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, orion_state, orion_romdisk_porta_r)) @@ -196,7 +196,7 @@ MACHINE_CONFIG_START(orion_state::orionz80) MCFG_PALETTE_ADD("palette", 18) MCFG_PALETTE_INIT_OWNER(orion_state, orion128 ) - MCFG_VIDEO_START_OVERRIDE(orion_state,orion128) + set_video_start_cb(config, driver_callback_delegate(&video_start_orion128, this)); MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) ) @@ -247,7 +247,7 @@ MACHINE_CONFIG_START(orion_state::orionpro) MCFG_DEVICE_PROGRAM_MAP(orionpro_mem) MCFG_DEVICE_IO_MAP(orionpro_io) - MCFG_MACHINE_RESET_OVERRIDE(orion_state, orionpro ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_orionpro, this)); MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, orion_state, orion_romdisk_porta_r)) @@ -272,7 +272,7 @@ MACHINE_CONFIG_START(orion_state::orionpro) MCFG_PALETTE_ADD("palette", 18) MCFG_PALETTE_INIT_OWNER(orion_state, orion128 ) - MCFG_VIDEO_START_OVERRIDE(orion_state,orion128) + set_video_start_cb(config, driver_callback_delegate(&video_start_orion128, this)); SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 1.0); diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp index 79d0deef044..940b902cbfd 100644 --- a/src/mame/drivers/p8k.cpp +++ b/src/mame/drivers/p8k.cpp @@ -94,7 +94,7 @@ public: DECLARE_READ8_MEMBER(p8k_port0_r); DECLARE_WRITE8_MEMBER(p8k_port0_w); void init_p8k(); - DECLARE_MACHINE_RESET(p8k); + void machine_reset_p8k(); DECLARE_WRITE_LINE_MEMBER(fdc_irq); DECLARE_WRITE_LINE_MEMBER(p8k_daisy_interrupt); @@ -274,7 +274,7 @@ static INPUT_PORTS_START( p8k ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(p8k_state,p8k) +void p8k_state::machine_reset_p8k() { membank("bank0")->set_entry(0); membank("bank1")->set_entry(0); @@ -418,7 +418,7 @@ MACHINE_CONFIG_START(p8k_state::p8k) MCFG_Z80_DAISY_CHAIN(p8k_daisy_chain) MCFG_DEVICE_PROGRAM_MAP(p8k_memmap) MCFG_DEVICE_IO_MAP(p8k_iomap) - MCFG_MACHINE_RESET_OVERRIDE(p8k_state,p8k) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_p8k, this)); /* peripheral hardware */ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(4'000'000)) diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index 091fee90b95..e8a53bfd676 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -378,7 +378,7 @@ Boards: * *************************************/ -MACHINE_RESET_MEMBER(pacman_state,mschamp) +void pacman_state::machine_reset_mschamp() { uint8_t *rom = memregion("maincpu")->base() + 0x10000; int whichbank = ioport("GAME")->read() & 1; @@ -390,12 +390,12 @@ MACHINE_RESET_MEMBER(pacman_state,mschamp) membank("bank2")->set_entry(whichbank); } -MACHINE_RESET_MEMBER(pacman_state,superabc) +void pacman_state::machine_reset_superabc() { superabc_bank_w(m_maincpu->space(AS_PROGRAM), 0, 0); } -MACHINE_RESET_MEMBER(pacman_state,maketrax) +void pacman_state::machine_reset_maketrax() { m_maketrax_counter = 0; m_maketrax_offset = 0; @@ -3552,7 +3552,7 @@ MACHINE_CONFIG_START(pacman_state::pacman) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacman_state, vblank_irq)) - MCFG_VIDEO_START_OVERRIDE(pacman_state,pacman) + set_video_start_cb(config, driver_callback_delegate(&video_start_pacman, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3564,7 +3564,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pacman_state::maketrax) pacman(config); - MCFG_MACHINE_RESET_OVERRIDE(pacman_state,maketrax) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_maketrax, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pacman_state::korosuke) @@ -3597,7 +3597,7 @@ MACHINE_CONFIG_START(pacman_state::birdiy) //MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, pacman_state, coin_lockout_global_w)) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pacman_state, coin_counter_w)) - MCFG_VIDEO_START_OVERRIDE(pacman_state,birdiy) + set_video_start_cb(config, driver_callback_delegate(&video_start_birdiy, this)); MACHINE_CONFIG_END @@ -3702,8 +3702,8 @@ MACHINE_CONFIG_START(pacman_state::theglobp) MCFG_DEVICE_PROGRAM_MAP(epos_map) MCFG_DEVICE_IO_MAP(epos_portmap) - MCFG_MACHINE_START_OVERRIDE(pacman_state,theglobp) - MCFG_MACHINE_RESET_OVERRIDE(pacman_state,theglobp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_theglobp, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_theglobp, this)); MACHINE_CONFIG_END @@ -3715,8 +3715,8 @@ MACHINE_CONFIG_START(pacman_state::acitya) MCFG_DEVICE_PROGRAM_MAP(epos_map) MCFG_DEVICE_IO_MAP(epos_portmap) - MCFG_MACHINE_START_OVERRIDE(pacman_state,acitya) - MCFG_MACHINE_RESET_OVERRIDE(pacman_state,acitya) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_acitya, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_acitya, this)); MACHINE_CONFIG_END @@ -3728,8 +3728,8 @@ MACHINE_CONFIG_START(pacman_state::eeekk) MCFG_DEVICE_PROGRAM_MAP(epos_map) MCFG_DEVICE_IO_MAP(epos_portmap) - MCFG_MACHINE_START_OVERRIDE(pacman_state,eeekk) - MCFG_MACHINE_RESET_OVERRIDE(pacman_state,eeekk) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_eeekk, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_eeekk, this)); MACHINE_CONFIG_END @@ -3805,7 +3805,7 @@ MACHINE_CONFIG_START(pacman_state::s2650games) MCFG_SCREEN_UPDATE_DRIVER(pacman_state, screen_update_s2650games) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacman_state, s2650_interrupt)) - MCFG_VIDEO_START_OVERRIDE(pacman_state,s2650games) + set_video_start_cb(config, driver_callback_delegate(&video_start_s2650games, this)); /* sound hardware */ MCFG_DEVICE_REMOVE("namco") @@ -3862,7 +3862,7 @@ MACHINE_CONFIG_START(pacman_state::mschamp) MCFG_DEVICE_PROGRAM_MAP(mschamp_map) MCFG_DEVICE_IO_MAP(mschamp_portmap) - MCFG_MACHINE_RESET_OVERRIDE(pacman_state,mschamp) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mschamp, this)); MACHINE_CONFIG_END @@ -3875,7 +3875,7 @@ MACHINE_CONFIG_START(pacman_state::superabc) MCFG_NVRAM_ADD_0FILL("28c16.u17") - MCFG_MACHINE_RESET_OVERRIDE(pacman_state,superabc) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_superabc, this)); /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_superabc) diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp index b3213d3c8fc..a31436191a0 100644 --- a/src/mame/drivers/partner.cpp +++ b/src/mame/drivers/partner.cpp @@ -174,7 +174,7 @@ MACHINE_CONFIG_START(partner_state::partner) MCFG_DEVICE_ADD("maincpu", I8080, XTAL(16'000'000) / 9) MCFG_DEVICE_PROGRAM_MAP(partner_mem) - MCFG_MACHINE_RESET_OVERRIDE(partner_state, partner ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_partner, this)); MCFG_DEVICE_ADD("ppi8255_1", I8255, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2)) diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index 085775a906a..b025a5b4628 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -85,7 +85,7 @@ public: TIMER_CALLBACK_MEMBER(pio_timer); void init_p7_lcd(); void init_p7_raster(); - DECLARE_VIDEO_START(pasopia7); + void video_start_pasopia7() ATTR_COLD; DECLARE_PALETTE_INIT(p7_lcd); uint32_t screen_update_pasopia7(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -152,7 +152,7 @@ TIMER_CALLBACK_MEMBER( pasopia7_state::pio_timer ) m_pio->port_b_write(keyb_r(generic_space(),0,0xff)); } -VIDEO_START_MEMBER(pasopia7_state,pasopia7) +void pasopia7_state::video_start_pasopia7() { m_p7_pal = std::make_unique<uint8_t[]>(0x10); } @@ -978,7 +978,7 @@ MACHINE_CONFIG_START(pasopia7_state::p7_raster) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 32-1) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(pasopia7_state,pasopia7) + set_video_start_cb(config, driver_callback_delegate(&video_start_pasopia7, this)); MCFG_SCREEN_UPDATE_DRIVER(pasopia7_state, screen_update_pasopia7) MCFG_PALETTE_ADD_3BIT_BRG("palette") MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pasopia7) @@ -996,7 +996,7 @@ MACHINE_CONFIG_START(pasopia7_state::p7_lcd) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1) - MCFG_VIDEO_START_OVERRIDE(pasopia7_state,pasopia7) + set_video_start_cb(config, driver_callback_delegate(&video_start_pasopia7, this)); MCFG_SCREEN_UPDATE_DRIVER(pasopia7_state, screen_update_pasopia7) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index c0a993bc393..d0e57019600 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -1545,7 +1545,7 @@ MACHINE_CONFIG_START(pc6001mk2_state::pc6001mk2) MCFG_DEVICE_PROGRAM_MAP(pc6001mk2_map) MCFG_DEVICE_IO_MAP(pc6001mk2_io) -// MCFG_MACHINE_RESET_OVERRIDE(pc6001mk2_state,pc6001mk2) +// set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc6001mk2, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(pc6001mk2_state, screen_update_pc6001mk2) @@ -1583,7 +1583,7 @@ MACHINE_CONFIG_START(pc6001sr_state::pc6001sr) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pc6001sr_state, sr_vrtc_irq) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(pc6001_state, irq_callback) -// MCFG_MACHINE_RESET_OVERRIDE(pc6001sr_state,pc6001sr) +// set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc6001sr, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(pc6001sr_state, screen_update_pc6001sr) diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index 429b02c6e02..d12d068d7e6 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -488,9 +488,9 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; public: - DECLARE_MACHINE_RESET(pc8801_clock_speed); - DECLARE_MACHINE_RESET(pc8801_dic); - DECLARE_MACHINE_RESET(pc8801_cdrom); + void machine_reset_pc8801_clock_speed(); + void machine_reset_pc8801_dic(); + void machine_reset_pc8801_cdrom(); INTERRUPT_GEN_MEMBER(pc8801_vrtc_irq); TIMER_CALLBACK_MEMBER(pc8801fd_upd765_tc_to_zero); TIMER_DEVICE_CALLBACK_MEMBER(pc8801_rtc_irq); @@ -548,42 +548,34 @@ void pc8801_state::video_start() void pc8801_state::draw_bitmap_3bpp(bitmap_ind16 &bitmap,const rectangle &cliprect) { - int x,y,xi; - uint32_t count; - uint16_t y_size; - uint16_t y_double; + uint32_t count = 0; + uint16_t y_double = (pc8801_pixel_clock()); + uint16_t y_size = (y_double+1) * 200; - count = 0; - - y_double = (pc8801_pixel_clock()); - y_size = (y_double+1) * 200; - - for(y=0;y<y_size;y+=(y_double+1)) + for (int y = 0; y < y_size; y += (y_double + 1)) { - for(x=0;x<640;x+=8) + for (int x = 0; x < 640; x += 8) { - for(xi=0;xi<8;xi++) + for (int xi = 0; xi < 8; xi++) { - int pen; - - pen = 0; + int pen = 0; /* note: layer masking doesn't occur in 3bpp mode, Bug Attack relies on this */ pen |= ((m_gvram[count+0x0000] >> (7-xi)) & 1) << 0; pen |= ((m_gvram[count+0x4000] >> (7-xi)) & 1) << 1; pen |= ((m_gvram[count+0x8000] >> (7-xi)) & 1) << 2; - if(y_double) + if (y_double) { - if(cliprect.contains(x+xi, y+0)) + if (cliprect.contains(x+xi, y+0)) bitmap.pix16(y+0, x+xi) = m_palette->pen(pen & 7); - if(cliprect.contains(x+xi, y+1)) + if (cliprect.contains(x+xi, y+1)) bitmap.pix16(y+1, x+xi) = m_palette->pen(pen & 7); } else { - if(cliprect.contains(x+xi, y+0)) + if (cliprect.contains(x+xi, y+0)) bitmap.pix16(y, x+xi) = m_palette->pen(pen & 7); } } @@ -595,41 +587,34 @@ void pc8801_state::draw_bitmap_3bpp(bitmap_ind16 &bitmap,const rectangle &clipre void pc8801_state::draw_bitmap_1bpp(bitmap_ind16 &bitmap,const rectangle &cliprect) { - int x,y,xi; - uint32_t count; - uint8_t color; - uint8_t is_cursor; + uint32_t count = 0; + uint8_t color = (m_gfx_ctrl & 1) ? 7 & ((m_layer_mask ^ 0xe) >> 1) : 7; + uint8_t is_cursor = 0; - count = 0; - color = (m_gfx_ctrl & 1) ? 7 & ((m_layer_mask ^ 0xe) >> 1) : 7; - is_cursor = 0; - - for(y=0;y<200;y++) + for (int y = 0; y < 200; y++) { - for(x=0;x<640;x+=8) + for (int x = 0; x < 640; x += 8) { - if(!(m_gfx_ctrl & 1)) + if (!(m_gfx_ctrl & 1)) is_cursor = calc_cursor_pos(x/8,y/lines_per_char,y & (lines_per_char-1)); - for(xi=0;xi<8;xi++) + for (int xi = 0; xi < 8; xi++) { - int pen; - - pen = ((m_gvram[count+0x0000] >> (7-xi)) & 1); - if(is_cursor) + int pen = ((m_gvram[count+0x0000] >> (7-xi)) & 1); + if (is_cursor) pen^=1; - if((m_gfx_ctrl & 1)) + if ((m_gfx_ctrl & 1)) { - if(cliprect.contains(x+xi, y*2+0)) + if (cliprect.contains(x+xi, y*2+0)) bitmap.pix16(y*2+0, x+xi) = m_palette->pen(pen ? color : 0); - if(cliprect.contains(x+xi, y*2+1)) + if (cliprect.contains(x+xi, y*2+1)) bitmap.pix16(y*2+1, x+xi) = m_palette->pen(pen ? color : 0); } else { - if(cliprect.contains(x+xi, y)) + if (cliprect.contains(x+xi, y)) bitmap.pix16(y, x+xi) = m_palette->pen(pen ? color : 0); } } @@ -642,22 +627,20 @@ void pc8801_state::draw_bitmap_1bpp(bitmap_ind16 &bitmap,const rectangle &clipre { count = 0; - for(y=200;y<400;y++) + for (int y = 200; y < 400; y++) { - for(x=0;x<640;x+=8) + for (int x = 0; x < 640; x += 8) { - if(!(m_gfx_ctrl & 1)) - is_cursor = calc_cursor_pos(x/8,y/lines_per_char,y & (lines_per_char-1)); + if (!(m_gfx_ctrl & 1)) + is_cursor = calc_cursor_pos(x / 8, y / lines_per_char, y & (lines_per_char - 1)); - for(xi=0;xi<8;xi++) + for (int xi = 0; xi < 8; xi++) { - int pen; - - pen = ((m_gvram[count+0x4000] >> (7-xi)) & 1); - if(is_cursor) + int pen = ((m_gvram[count+0x4000] >> (7-xi)) & 1); + if (is_cursor) pen^=1; - if(cliprect.contains(x+xi, y)) + if (cliprect.contains(x+xi, y)) bitmap.pix16(y, x+xi) = m_palette->pen(pen ? 7 : 0); } @@ -669,20 +652,20 @@ void pc8801_state::draw_bitmap_1bpp(bitmap_ind16 &bitmap,const rectangle &clipre uint8_t pc8801_state::calc_cursor_pos(int x,int y,int yi) { - if(!(m_crtc.cursor_on)) // don't bother if cursor is off + if (!(m_crtc.cursor_on)) // don't bother if cursor is off return 0; - if(x == m_crtc.param[4][0] && y == m_crtc.param[4][1]) /* check if position matches */ + if (x == m_crtc.param[4][0] && y == m_crtc.param[4][1]) /* check if position matches */ { /* don't pass through if we are using underscore */ - if((!(m_crtc.param[0][2] & 0x40)) && yi != 7) + if ((!(m_crtc.param[0][2] & 0x40)) && yi != 7) return 0; /* finally check if blinking is currently active high */ - if(!(m_crtc.param[0][2] & 0x20)) + if (!(m_crtc.param[0][2] & 0x20)) return 1; - if(((m_screen->frame_number() / blink_speed) & 1) == 0) + if (((m_screen->frame_number() / blink_speed) & 1) == 0) return 1; return 0; @@ -696,121 +679,106 @@ uint8_t pc8801_state::calc_cursor_pos(int x,int y,int yi) uint8_t pc8801_state::extract_text_attribute(uint32_t address,int x, uint8_t width, uint8_t &non_special) { uint8_t *vram = m_work_ram.get(); - int i; - int fifo_size; - int offset; non_special = 0; - if(m_crtc.param[0][4] & 0x80) + if (m_crtc.param[0][4] & 0x80) { popmessage("Using non-separate mode for text tilemap, contact MESSdev"); return 0; } - fifo_size = (m_crtc.param[0][4] & 0x20) ? 0 : ((m_crtc.param[0][4] & 0x1f) + 1); + int fifo_size = (m_crtc.param[0][4] & 0x20) ? 0 : ((m_crtc.param[0][4] & 0x1f) + 1); - if(fifo_size == 0) + if (fifo_size == 0) { non_special = 1; return (text_color_flag) ? 0xe8 : 0; } /* TODO: correct or hack-ish? Certainly having 0 as a attribute X is weird in any case. */ - offset = (vram[address] == 0) ? 2 : 0; + int offset = (vram[address] == 0) ? 2 : 0; - for(i=0;i<fifo_size;i++) + for (int i = 0; i < fifo_size; i++) { - if(x < vram[address+offset]) + if (x < vram[address+offset]) { return vram[address+1]; } else - address+=2; + { + address += 2; + } } - return vram[address-3+offset]; + return vram[address - 3 + offset]; } void pc8801_state::pc8801_draw_char(bitmap_ind16 &bitmap,int x,int y,int pal,uint8_t gfx_mode,uint8_t reverse,uint8_t secret,uint8_t blink,uint8_t upper,uint8_t lower,int y_size,int width, uint8_t non_special) { - int xi,yi; uint8_t *vram = m_work_ram.get(); - uint8_t is_cursor; - uint8_t y_height, y_double; - uint8_t y_step; + uint8_t y_height = lines_per_char; + uint8_t y_double = (pc8801_pixel_clock()); + uint8_t y_step = (non_special) ? 80 : 120; // trusted by Elthlead + uint8_t is_cursor = 0; - y_height = lines_per_char; - y_double = (pc8801_pixel_clock()); - y_step = (non_special) ? 80 : 120; // trusted by Elthlead - is_cursor = 0; - - for(yi=0;yi<y_height;yi++) + for (int yi = 0; yi < y_height; yi++) { - if(m_gfx_ctrl & 1) + if (m_gfx_ctrl & 1) is_cursor = calc_cursor_pos(x,y,yi); - for(xi=0;xi<8;xi++) + for (int xi = 0; xi < 8; xi++) { - int res_x,res_y; - int tile; - int color; + int tile = vram[x+(y*y_step)+m_dma_address[2]]; - { - tile = vram[x+(y*y_step)+m_dma_address[2]]; - - res_x = x*8+xi*(width+1); - res_y = y*y_height+yi; + int res_x = x*8+xi*(width+1); + int res_y = y*y_height+yi; - if(!m_screen->visible_area().contains(res_x, res_y)) - continue; + if (!m_screen->visible_area().contains(res_x, res_y)) + continue; - if(gfx_mode) - { - uint8_t mask; + int color; + if (gfx_mode) + { + uint8_t mask = (xi & 4) ? 0x10 : 0x01; + mask <<= ((yi & (0x6 << y_double)) >> (1 + y_double)); + color = (tile & mask) ? pal : -1; + } + else + { + uint8_t blink_mask = 0; + if (blink && ((m_screen->frame_number() / blink_speed) & 3) == 1) + blink_mask = 1; - mask = (xi & 4) ? 0x10 : 0x01; - mask <<= ((yi & (0x6 << y_double)) >> (1+y_double)); - color = (tile & mask) ? pal : -1; - } + uint8_t char_data; + if (yi >= (1 << (y_double+3)) || secret || blink_mask) + char_data = 0; else - { - uint8_t char_data; - uint8_t blink_mask; - - blink_mask = 0; - if(blink && ((m_screen->frame_number() / blink_speed) & 3) == 1) - blink_mask = 1; - - if(yi >= (1 << (y_double+3)) || secret || blink_mask) - char_data = 0; - else - char_data = (m_cg_rom[tile*8+(yi >> y_double)] >> (7-xi)) & 1; + char_data = (m_cg_rom[tile * 8 + (yi >> y_double)] >> (7 - xi)) & 1; - if(yi == 0 && upper) - char_data = 1; + if (yi == 0 && upper) + char_data = 1; - if(yi == y_height && lower) - char_data = 1; + if (yi == y_height && lower) + char_data = 1; - if(is_cursor) - char_data^=1; + if (is_cursor) + char_data ^= 1; - if(reverse) - char_data^=1; + if (reverse) + char_data ^= 1; - color = char_data ? pal : -1; - } + color = char_data ? pal : -1; + } - if(color != -1) + if (color != -1) + { + bitmap.pix16(res_y, res_x) = m_palette->pen(color); + if (width) { - bitmap.pix16(res_y, res_x) = m_palette->pen(color); - if(width) - { - if(!m_screen->visible_area().contains(res_x+1, res_y)) - continue; - - bitmap.pix16(res_y, res_x+1) = m_palette->pen(color); - } + if (!m_screen->visible_area().contains(res_x + 1, res_y)) + continue; + + bitmap.pix16(res_y, res_x + 1) = m_palette->pen(color); } } } @@ -819,27 +787,19 @@ void pc8801_state::pc8801_draw_char(bitmap_ind16 &bitmap,int x,int y,int pal,uin void pc8801_state::draw_text(bitmap_ind16 &bitmap,int y_size, uint8_t width) { - int x,y; - uint8_t attr; - uint8_t reverse; - uint8_t gfx_mode; - uint8_t secret; - uint8_t upper; - uint8_t lower; - uint8_t blink; - int pal; - uint8_t non_special; - - for(y=0;y<y_size;y++) + for (int y = 0; y < y_size; y++) { - for(x=0;x<80;x++) + for (int x = 0; x < 80; x++) { - if(x & 1 && !width) + if (x & 1 && !width) continue; - attr = extract_text_attribute((((y*120)+80+m_dma_address[2]) & 0xffff),(x),width,non_special); + uint8_t non_special; + uint8_t attr = extract_text_attribute((((y * 120) + 80 + m_dma_address[2]) & 0xffff), x, width, non_special); - if(text_color_flag && (attr & 8)) // color mode + int pal; + uint8_t gfx_mode, reverse, secret, upper, lower, blink; + if (text_color_flag && (attr & 8)) // color mode { pal = ((attr & 0xe0) >> 5); gfx_mode = (attr & 0x10) >> 4; @@ -862,12 +822,11 @@ void pc8801_state::draw_text(bitmap_ind16 &bitmap,int y_size, uint8_t width) pal|=8; //text pal bank reverse ^= m_crtc.inverse; - if(attr & 0x80) + if (attr & 0x80) popmessage("Warning: mono gfx mode enabled, contact MESSdev"); - } - pc8801_draw_char(bitmap,x,y,pal,gfx_mode,reverse,secret,blink,upper,lower,y_size,!width,non_special); + pc8801_draw_char(bitmap, x, y, pal, gfx_mode, reverse, secret, blink, upper, lower, y_size, !width, non_special); } } } @@ -878,9 +837,9 @@ uint32_t pc8801_state::screen_update( screen_device &screen, bitmap_ind16 &bitma // popmessage("%04x %04x %02x",m_dma_address[2],m_dma_counter[2],m_dmac_mode); - if(m_gfx_ctrl & 8) + if (m_gfx_ctrl & 8) { - if(m_gfx_ctrl & 0x10) + if (m_gfx_ctrl & 0x10) draw_bitmap_3bpp(bitmap,cliprect); else draw_bitmap_1bpp(bitmap,cliprect); @@ -888,7 +847,7 @@ uint32_t pc8801_state::screen_update( screen_device &screen, bitmap_ind16 &bitma //popmessage("%02x %02x %02x %02x %02x",state->m_layer_mask,state->m_dmac_mode,state->m_crtc.status,state->m_crtc.irq_mask,state->m_gfx_ctrl); - if(!(m_layer_mask & 1) && m_dmac_mode & 4 && m_crtc.status & 0x10 && m_crtc.irq_mask == 3) + if (!(m_layer_mask & 1) && m_dmac_mode & 4 && m_crtc.status & 0x10 && m_crtc.irq_mask == 3) { //popmessage("%02x %02x",m_crtc.param[0][0],m_crtc.param[0][4]); @@ -900,38 +859,31 @@ uint32_t pc8801_state::screen_update( screen_device &screen, bitmap_ind16 &bitma READ8_MEMBER(pc8801_state::pc8801_alu_r) { - int i; - uint8_t b,r,g; - /* store data to ALU regs */ - for(i=0;i<3;i++) + for (int i = 0; i < 3; i++) m_alu_reg[i] = m_gvram[i*0x4000 + offset]; - b = m_gvram[offset + 0x0000]; - r = m_gvram[offset + 0x4000]; - g = m_gvram[offset + 0x8000]; - if(!(m_alu_ctrl2 & 1)) { b^=0xff; } - if(!(m_alu_ctrl2 & 2)) { r^=0xff; } - if(!(m_alu_ctrl2 & 4)) { g^=0xff; } + uint8_t b = m_gvram[offset + 0x0000]; + uint8_t r = m_gvram[offset + 0x4000]; + uint8_t g = m_gvram[offset + 0x8000]; + if (!(m_alu_ctrl2 & 1)) { b^=0xff; } + if (!(m_alu_ctrl2 & 2)) { r^=0xff; } + if (!(m_alu_ctrl2 & 4)) { g^=0xff; } return b & r & g; } WRITE8_MEMBER(pc8801_state::pc8801_alu_w) { - int i; - - switch(m_alu_ctrl2 & 0x30) // alu write mode + switch (m_alu_ctrl2 & 0x30) // alu write mode { case 0x00: //logic operation { - uint8_t logic_op; - - for(i=0;i<3;i++) + for (int i = 0; i < 3; i++) { - logic_op = (m_alu_ctrl1 & (0x11 << i)) >> i; + uint8_t logic_op = (m_alu_ctrl1 & (0x11 << i)) >> i; - switch(logic_op) + switch (logic_op) { case 0x00: { m_gvram[i*0x4000 + offset] &= ~data; } break; case 0x01: { m_gvram[i*0x4000 + offset] |= data; } break; @@ -944,7 +896,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_alu_w) case 0x10: // restore data from ALU regs { - for(i=0;i<3;i++) + for (int i = 0; i < 3; i++) m_gvram[i*0x4000 + offset] = m_alu_reg[i]; } break; @@ -972,7 +924,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_wram_w) READ8_MEMBER(pc8801_state::pc8801_ext_wram_r) { - if(offset < m_extram_size) + if (offset < m_extram_size) return m_ext_work_ram[offset]; return 0xff; @@ -980,7 +932,7 @@ READ8_MEMBER(pc8801_state::pc8801_ext_wram_r) WRITE8_MEMBER(pc8801_state::pc8801_ext_wram_w) { - if(offset < m_extram_size) + if (offset < m_extram_size) m_ext_work_ram[offset] = data; } @@ -1030,69 +982,67 @@ READ8_MEMBER(pc8801_state::pc8801_cdbios_rom_r) READ8_MEMBER(pc8801_state::pc8801_mem_r) { - if(offset <= 0x7fff) + if (offset <= 0x7fff) { - if(m_extram_mode & 1) - return pc8801_ext_wram_r(space,offset | (m_extram_bank * 0x8000)); + if (m_extram_mode & 1) + return pc8801_ext_wram_r(space, offset | (m_extram_bank * 0x8000)); - if(m_gfx_ctrl & 2) - return pc8801_wram_r(space,offset); + if (m_gfx_ctrl & 2) + return pc8801_wram_r(space, offset); - if(m_has_cdrom && m_cdrom_reg[9] & 0x10) - return pc8801_cdbios_rom_r(space,(offset & 0x7fff) | ((m_gfx_ctrl & 4) ? 0x8000 : 0x0000)); + if (m_has_cdrom && m_cdrom_reg[9] & 0x10) + return pc8801_cdbios_rom_r(space, (offset & 0x7fff) | ((m_gfx_ctrl & 4) ? 0x8000 : 0x0000)); - if(m_gfx_ctrl & 4) - return pc8801_nbasic_rom_r(space,offset); + if (m_gfx_ctrl & 4) + return pc8801_nbasic_rom_r(space, offset); - if(offset >= 0x6000 && offset <= 0x7fff && ((m_ext_rom_bank & 1) == 0)) - return pc8801_n88basic_rom_r(space,0x8000 + (offset & 0x1fff) + (0x2000 * (m_misc_ctrl & 3))); + if (offset >= 0x6000 && offset <= 0x7fff && ((m_ext_rom_bank & 1) == 0)) + return pc8801_n88basic_rom_r(space, 0x8000 + (offset & 0x1fff) + (0x2000 * (m_misc_ctrl & 3))); return pc8801_n88basic_rom_r(space,offset); } - else if(offset >= 0x8000 && offset <= 0x83ff) // work RAM window + else if (offset >= 0x8000 && offset <= 0x83ff) // work RAM window { - uint32_t window_offset; - - if(m_gfx_ctrl & 6) //wram read select or n basic select banks this as normal wram - return pc8801_wram_r(space,offset); + if (m_gfx_ctrl & 6) //wram read select or n basic select banks this as normal wram + return pc8801_wram_r(space, offset); - window_offset = (offset & 0x3ff) + (m_window_offset_bank << 8); + uint32_t window_offset = (offset & 0x3ff) + (m_window_offset_bank << 8); - if(((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10)) + if (((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10)) printf("Read from 0xf000 - 0xffff window offset\n"); //accessed by Castle Excellent, no noticeable quirk - if(((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10)) - return pc8801_high_wram_r(space,window_offset & 0xfff); + if (((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10)) + return pc8801_high_wram_r(space, window_offset & 0xfff); - return pc8801_wram_r(space,window_offset); + return pc8801_wram_r(space, window_offset); } - else if(offset >= 0x8400 && offset <= 0xbfff) + else if (offset >= 0x8400 && offset <= 0xbfff) { - return pc8801_wram_r(space,offset); + return pc8801_wram_r(space, offset); } - else if(offset >= 0xc000 && offset <= 0xffff) + else if (offset >= 0xc000 && offset <= 0xffff) { - if(m_has_dictionary && m_dic_ctrl) - return pc8801ma_dic_r(space,(offset & 0x3fff) + ((m_dic_bank & 0x1f) * 0x4000)); + if (m_has_dictionary && m_dic_ctrl) + return pc8801ma_dic_r(space, (offset & 0x3fff) + ((m_dic_bank & 0x1f) * 0x4000)); - if(m_misc_ctrl & 0x40) + if (m_misc_ctrl & 0x40) { - if(!machine().side_effects_disabled()) + if (!machine().side_effects_disabled()) m_vram_sel = 3; - if(m_alu_ctrl2 & 0x80) - return pc8801_alu_r(space,offset & 0x3fff); + if (m_alu_ctrl2 & 0x80) + return pc8801_alu_r(space, offset & 0x3fff); } - if(m_vram_sel == 3) + if (m_vram_sel == 3) { - if(offset >= 0xf000 && offset <= 0xffff && (m_misc_ctrl & 0x10)) - return pc8801_high_wram_r(space,offset & 0xfff); + if (offset >= 0xf000 && offset <= 0xffff && (m_misc_ctrl & 0x10)) + return pc8801_high_wram_r(space, offset & 0xfff); - return pc8801_wram_r(space,offset); + return pc8801_wram_r(space, offset); } - return pc8801_gvram_r(space,(offset & 0x3fff) + (0x4000 * m_vram_sel)); + return pc8801_gvram_r(space, (offset & 0x3fff) + (0x4000 * m_vram_sel)); } return 0xff; @@ -1100,68 +1050,66 @@ READ8_MEMBER(pc8801_state::pc8801_mem_r) WRITE8_MEMBER(pc8801_state::pc8801_mem_w) { - if(offset <= 0x7fff) + if (offset <= 0x7fff) { - if(m_extram_mode & 0x10) - pc8801_ext_wram_w(space,offset | (m_extram_bank * 0x8000),data); + if (m_extram_mode & 0x10) + pc8801_ext_wram_w(space, offset | (m_extram_bank * 0x8000), data); else - pc8801_wram_w(space,offset,data); + pc8801_wram_w(space, offset, data); return; } - else if(offset >= 0x8000 && offset <= 0x83ff) + else if (offset >= 0x8000 && offset <= 0x83ff) { - if(m_gfx_ctrl & 6) //wram read select or n basic select banks this as normal wram - pc8801_wram_w(space,offset,data); + if (m_gfx_ctrl & 6) //wram read select or n basic select banks this as normal wram + pc8801_wram_w(space, offset, data); else { - uint32_t window_offset; - - window_offset = (offset & 0x3ff) + (m_window_offset_bank << 8); + uint32_t window_offset = (offset & 0x3ff) + (m_window_offset_bank << 8); - if(((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10)) + if (((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10)) printf("Write to 0xf000 - 0xffff window offset\n"); //accessed by Castle Excellent, no noticeable quirk - if(((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10)) - pc8801_high_wram_w(space,window_offset & 0xfff,data); + if (((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10)) + pc8801_high_wram_w(space, window_offset & 0xfff, data); else - pc8801_wram_w(space,window_offset,data); + pc8801_wram_w(space, window_offset, data); } return; } - else if(offset >= 0x8400 && offset <= 0xbfff) + else if (offset >= 0x8400 && offset <= 0xbfff) { - pc8801_wram_w(space,offset,data); + pc8801_wram_w(space, offset, data); return; } - else if(offset >= 0xc000 && offset <= 0xffff) + else if (offset >= 0xc000 && offset <= 0xffff) { - if(m_misc_ctrl & 0x40) + if (m_misc_ctrl & 0x40) { - if(!machine().side_effects_disabled()) + if (!machine().side_effects_disabled()) m_vram_sel = 3; - if(m_alu_ctrl2 & 0x80) + if (m_alu_ctrl2 & 0x80) { - pc8801_alu_w(space,offset & 0x3fff,data); + pc8801_alu_w(space, offset & 0x3fff, data); return; } } - if(m_vram_sel == 3) + if (m_vram_sel == 3) { - if(offset >= 0xf000 && offset <= 0xffff && (m_misc_ctrl & 0x10)) + if (offset >= 0xf000 && offset <= 0xffff && (m_misc_ctrl & 0x10)) { - pc8801_high_wram_w(space,offset & 0xfff,data); + pc8801_high_wram_w(space, offset & 0xfff, data); return; } - pc8801_wram_w(space,offset,data); + pc8801_wram_w(space, offset, data); return; } - pc8801_gvram_w(space,(offset & 0x3fff) + (0x4000 * m_vram_sel),data); + pc8801_gvram_w(space, (offset & 0x3fff) + (0x4000 * m_vram_sel), data); return; } } @@ -1201,23 +1149,23 @@ WRITE8_MEMBER(pc8801_state::pc8801_ctrl_w) m_rtc->stb_w((data & 2) >> 1); m_rtc->clk_w((data & 4) >> 2); - if(((m_device_ctrl_data & 0x20) == 0x00) && ((data & 0x20) == 0x20)) + if (((m_device_ctrl_data & 0x20) == 0x00) && ((data & 0x20) == 0x20)) m_beeper->set_state(1); - if(((m_device_ctrl_data & 0x20) == 0x20) && ((data & 0x20) == 0x00)) + if (((m_device_ctrl_data & 0x20) == 0x20) && ((data & 0x20) == 0x00)) m_beeper->set_state(0); - if((m_device_ctrl_data & 0x40) != (data & 0x40)) + if ((m_device_ctrl_data & 0x40) != (data & 0x40)) { attotime new_time = machine().time(); - if(m_mouse.phase == 0) + if (m_mouse.phase == 0) { m_mouse.x = ioport("MOUSEX")->read(); m_mouse.y = ioport("MOUSEY")->read(); } - if(data & 0x40 && (new_time - m_mouse.time) > attotime::from_hz(900)) + if (data & 0x40 && (new_time - m_mouse.time) > attotime::from_hz(900)) { m_mouse.phase = 0; } @@ -1231,7 +1179,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_ctrl_w) } /* TODO: is SING a buzzer mask? Bastard Special relies on this ... */ - if(m_device_ctrl_data & 0x80) + if (m_device_ctrl_data & 0x80) m_beeper->set_state(0); m_device_ctrl_data = data; @@ -1257,22 +1205,21 @@ uint8_t pc8801_state::pc8801_pixel_clock(void) void pc8801_state::pc8801_dynamic_res_change(void) { rectangle visarea; - int xsize,ysize,xvis,yvis; attoseconds_t refresh;; /* bail out if screen params aren't valid */ - if(!m_crtc.param[0][0] || !m_crtc.param[0][1] || !m_crtc.param[0][2] || !m_crtc.param[0][3]) + if (!m_crtc.param[0][0] || !m_crtc.param[0][1] || !m_crtc.param[0][2] || !m_crtc.param[0][3]) return; - xvis = screen_width; - yvis = screen_height * lines_per_char; - xsize = screen_width + hretrace; - ysize = screen_height * lines_per_char + vretrace * lines_per_char; + int xvis = screen_width; + int yvis = screen_height * lines_per_char; + int xsize = screen_width + hretrace; + int ysize = screen_height * lines_per_char + vretrace * lines_per_char; // popmessage("H %d V %d (%d x %d) HR %d VR %d (%d %d)\n",xvis,yvis,screen_height,lines_per_char,hretrace,vretrace, xsize,ysize); visarea.set(0, xvis - 1, 0, yvis - 1); - if(pc8801_pixel_clock()) + if (pc8801_pixel_clock()) refresh = HZ_TO_ATTOSECONDS(PIXEL_CLOCK_24KHz) * (xsize) * ysize; else refresh = HZ_TO_ATTOSECONDS(PIXEL_CLOCK_15KHz) * (xsize) * ysize; @@ -1310,7 +1257,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_vram_select_w) WRITE8_MEMBER(pc8801_state::i8214_irq_level_w) { - if(data & 8) + if (data & 8) m_pic->b_w(7); else m_pic->b_w(data & 0x07); @@ -1326,7 +1273,7 @@ WRITE8_MEMBER(pc8801_state::i8214_irq_mask_w) #else WRITE8_MEMBER(pc8801_state::pc8801_irq_level_w) { - if(data & 8) + if (data & 8) m_i8214_irq_level = 7; else m_i8214_irq_level = data & 7; @@ -1340,13 +1287,13 @@ WRITE8_MEMBER(pc8801_state::pc8801_irq_mask_w) m_timer_irq_mask = data & 1; m_vrtc_irq_mask = data & 2; - if(m_timer_irq_mask == 0) + if (m_timer_irq_mask == 0) m_timer_irq_latch = 0; - if(m_vrtc_irq_mask == 0) + if (m_vrtc_irq_mask == 0) m_vrtc_irq_latch = 0; - if(m_timer_irq_latch == 0 && m_vrtc_irq_latch == 0 && m_sound_irq_latch == 0) + if (m_timer_irq_latch == 0 && m_vrtc_irq_latch == 0 && m_sound_irq_latch == 0) m_maincpu->set_input_line(0,CLEAR_LINE); // IRQ_LOG(("%02x MASK (%02x %02x)\n",data,m_timer_irq_latch,m_vrtc_irq_latch)); @@ -1391,13 +1338,13 @@ WRITE8_MEMBER(pc8801_state::pc8801_misc_ctrl_w) #else m_sound_irq_mask = ((data & 0x80) == 0); - if(m_sound_irq_mask == 0) + if (m_sound_irq_mask == 0) m_sound_irq_latch = 0; - if(m_timer_irq_latch == 0 && m_vrtc_irq_latch == 0 && m_sound_irq_latch == 0) + if (m_timer_irq_latch == 0 && m_vrtc_irq_latch == 0 && m_sound_irq_latch == 0) m_maincpu->set_input_line(0,CLEAR_LINE); - if(m_sound_irq_mask && m_sound_irq_pending) + if (m_sound_irq_mask && m_sound_irq_pending) { m_maincpu->set_input_line(0,HOLD_LINE); m_sound_irq_latch = 1; @@ -1415,9 +1362,9 @@ WRITE8_MEMBER(pc8801_state::pc8801_bgpal_w) WRITE8_MEMBER(pc8801_state::pc8801_palram_w) { - if(m_misc_ctrl & 0x20) //analog palette + if (m_misc_ctrl & 0x20) //analog palette { - if((data & 0x40) == 0) + if ((data & 0x40) == 0) { m_palram[offset].b = data & 0x7; m_palram[offset].r = (data & 0x38) >> 3; @@ -1457,10 +1404,10 @@ READ8_MEMBER(pc8801_state::pc8801_crtc_param_r) WRITE8_MEMBER(pc8801_state::pc88_crtc_param_w) { - if(m_crtc.param_count < 5) + if (m_crtc.param_count < 5) { m_crtc.param[m_crtc.cmd][m_crtc.param_count] = data; - if(m_crtc.cmd == 0) + if (m_crtc.cmd == 0) pc8801_dynamic_res_change(); m_crtc.param_count++; @@ -1499,7 +1446,7 @@ WRITE8_MEMBER(pc8801_state::pc88_crtc_cmd_w) m_crtc.cmd = (data & 0xe0) >> 5; m_crtc.param_count = 0; - switch(m_crtc.cmd) + switch (m_crtc.cmd) { case 0: // reset CRTC m_crtc.status &= (~0x16); @@ -1539,7 +1486,7 @@ READ8_MEMBER(pc8801_state::pc8801_dmac_r) WRITE8_MEMBER(pc8801_state::pc8801_dmac_w) { - if(offset & 1) + if (offset & 1) m_dma_counter[offset >> 1] = (m_dmac_ff) ? (m_dma_counter[offset >> 1]&0xff)|(data<<8) : (m_dma_counter[offset >> 1]&0xff00)|(data&0xff); else m_dma_address[offset >> 1] = (m_dmac_ff) ? (m_dma_address[offset >> 1]&0xff)|(data<<8) : (m_dma_address[offset >> 1]&0xff00)|(data&0xff); @@ -1558,7 +1505,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_dmac_mode_w) m_dmac_mode = data; m_dmac_ff = 0; - if(data != 0xe4 && data != 0xa0 && data != 0xc4 && data != 0x80 && data != 0x00) + if (data != 0xe4 && data != 0xa0 && data != 0xc4 && data != 0x80 && data != 0x00) printf("%02x DMAC mode\n",data); } @@ -1599,7 +1546,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_alu_ctrl2_w) WRITE8_MEMBER(pc8801_state::pc8801_pcg8100_w) { - if(data) + if (data) printf("Write to PCG-8100 %02x %02x\n",offset,data); } @@ -1616,7 +1563,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_txt_cmt_ctrl_w) READ8_MEMBER(pc8801_state::pc8801_kanji_r) { - if((offset & 2) == 0) + if ((offset & 2) == 0) return m_kanji_rom[m_knj_addr[0]*2+((offset & 1) ^ 1)]; return 0xff; @@ -1624,13 +1571,13 @@ READ8_MEMBER(pc8801_state::pc8801_kanji_r) WRITE8_MEMBER(pc8801_state::pc8801_kanji_w) { - if((offset & 2) == 0) + if ((offset & 2) == 0) m_knj_addr[0] = ((offset & 1) == 0) ? ((m_knj_addr[0]&0xff00)|(data&0xff)) : ((m_knj_addr[0]&0x00ff)|(data<<8)); } READ8_MEMBER(pc8801_state::pc8801_kanji_lv2_r) { - if((offset & 2) == 0) + if ((offset & 2) == 0) return m_kanji_rom[m_knj_addr[1]*2+((offset & 1) ^ 1)]; return 0xff; @@ -1638,21 +1585,21 @@ READ8_MEMBER(pc8801_state::pc8801_kanji_lv2_r) WRITE8_MEMBER(pc8801_state::pc8801_kanji_lv2_w) { - if((offset & 2) == 0) + if ((offset & 2) == 0) m_knj_addr[1] = ((offset & 1) == 0) ? ((m_knj_addr[1]&0xff00)|(data&0xff)) : ((m_knj_addr[1]&0x00ff)|(data<<8)); } WRITE8_MEMBER(pc8801_state::pc8801_dic_bank_w) { printf("JISHO BANK = %02x\n",data); - if(m_has_dictionary) + if (m_has_dictionary) m_dic_bank = data & 0x1f; } WRITE8_MEMBER(pc8801_state::pc8801_dic_ctrl_w) { printf("JISHO CTRL = %02x\n",data); - if(m_has_dictionary) + if (m_has_dictionary) m_dic_ctrl = (data ^ 1) & 1; } @@ -1674,13 +1621,13 @@ WRITE8_MEMBER(pc8801_state::pc8801_cdrom_w) */ //printf("CD-ROM write %02x -> [%02x]\n",data,offset); - if(m_has_cdrom) + if (m_has_cdrom) m_cdrom_reg[offset] = data; } READ8_MEMBER(pc8801_state::pc8801_cpuclock_r) { - if(m_has_clock_speed) + if (m_has_clock_speed) return 0x10 | m_clock_setting; return 0xff; @@ -1688,7 +1635,7 @@ READ8_MEMBER(pc8801_state::pc8801_cpuclock_r) READ8_MEMBER(pc8801_state::pc8801_baudrate_r) { - if(m_has_clock_speed) + if (m_has_clock_speed) return 0xf0 | m_baudrate_val; return 0xff; @@ -1696,7 +1643,7 @@ READ8_MEMBER(pc8801_state::pc8801_baudrate_r) WRITE8_MEMBER(pc8801_state::pc8801_baudrate_w) { - if(m_has_clock_speed) + if (m_has_clock_speed) m_baudrate_val = data & 0xf; } @@ -1712,7 +1659,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_rtc_w) READ8_MEMBER(pc8801_state::pc8801_sound_board_r) { - if(m_has_opna) + if (m_has_opna) return m_opna->read(space, offset); return (offset & 2) ? 0xff : m_opn->read(space, offset); @@ -1720,15 +1667,15 @@ READ8_MEMBER(pc8801_state::pc8801_sound_board_r) WRITE8_MEMBER(pc8801_state::pc8801_sound_board_w) { - if(m_has_opna) + if (m_has_opna) m_opna->write(space, offset,data); - else if((offset & 2) == 0) + else if ((offset & 2) == 0) m_opn->write(space, offset, data); } READ8_MEMBER(pc8801_state::pc8801_opna_r) { - if(m_has_opna && (offset & 2) == 0) + if (m_has_opna && (offset & 2) == 0) return m_opna->read(space, (offset & 1) | ((offset & 4) >> 1)); return 0xff; @@ -1736,19 +1683,19 @@ READ8_MEMBER(pc8801_state::pc8801_opna_r) WRITE8_MEMBER(pc8801_state::pc8801_opna_w) { - if(m_has_opna && (offset & 2) == 0) + if (m_has_opna && (offset & 2) == 0) m_opna->write(space, (offset & 1) | ((offset & 4) >> 1),data); - else if(m_has_opna && offset == 2) + else if (m_has_opna && offset == 2) { m_sound_irq_mask = ((data & 0x80) == 0); - if(m_sound_irq_mask == 0) + if (m_sound_irq_mask == 0) m_sound_irq_latch = 0; - if(m_timer_irq_latch == 0 && m_vrtc_irq_latch == 0 && m_sound_irq_latch == 0) + if (m_timer_irq_latch == 0 && m_vrtc_irq_latch == 0 && m_sound_irq_latch == 0) m_maincpu->set_input_line(0,CLEAR_LINE); - if(m_sound_irq_mask && m_sound_irq_pending) + if (m_sound_irq_mask && m_sound_irq_pending) { m_maincpu->set_input_line(0,HOLD_LINE); m_sound_irq_latch = 1; @@ -2266,7 +2213,7 @@ static const cassette_interface pc88_cassette_interface = #ifdef USE_PROPER_I8214 void pc8801_state::pc8801_raise_irq(uint8_t irq,uint8_t state) { - if(state) + if (state) { drvm_int_state |= irq; @@ -2316,7 +2263,7 @@ IRQ_CALLBACK_MEMBER(pc8801_state::pc8801_irq_callback) WRITE_LINE_MEMBER(pc8801_state::pc8801_sound_irq) { - if(m_sound_irq_mask && state) + if (m_sound_irq_mask && state) pc8801_raise_irq(machine(),1<<(4),1); } @@ -2330,7 +2277,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pc8801_state::pc8801_rtc_irq) INTERRUPT_GEN_MEMBER(pc8801_state::pc8801_vrtc_irq) { - if(m_vblank_irq_mask) + if (m_vblank_irq_mask) pc8801_raise_irq(machine(),1<<(1),1); } @@ -2340,17 +2287,17 @@ INTERRUPT_GEN_MEMBER(pc8801_state::pc8801_vrtc_irq) IRQ_CALLBACK_MEMBER(pc8801_state::pc8801_irq_callback) { - if(m_sound_irq_latch) + if (m_sound_irq_latch) { m_sound_irq_latch = 0; return 4*2; } - else if(m_vrtc_irq_latch) + else if (m_vrtc_irq_latch) { m_vrtc_irq_latch = 0; return 1*2; } - else if(m_timer_irq_latch) + else if (m_timer_irq_latch) { m_timer_irq_latch = 0; return 2*2; @@ -2366,9 +2313,9 @@ WRITE_LINE_MEMBER(pc8801_state::pc8801_sound_irq) { // printf("%02x %02x %02x\n",m_sound_irq_mask,m_i8214_irq_level,state); /* TODO: correct i8214 irq level? */ - if(state) + if (state) { - if(m_sound_irq_mask) + if (m_sound_irq_mask) { m_sound_irq_latch = 1; m_sound_irq_pending = 0; @@ -2382,7 +2329,7 @@ WRITE_LINE_MEMBER(pc8801_state::pc8801_sound_irq) TIMER_DEVICE_CALLBACK_MEMBER(pc8801_state::pc8801_rtc_irq) { - if(m_timer_irq_mask && m_i8214_irq_level >= 3) + if (m_timer_irq_mask && m_i8214_irq_level >= 3) { m_timer_irq_latch = 1; //IRQ_LOG(("timer\n")); @@ -2392,7 +2339,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pc8801_state::pc8801_rtc_irq) INTERRUPT_GEN_MEMBER(pc8801_state::pc8801_vrtc_irq) { - if(m_vrtc_irq_mask && m_i8214_irq_level >= 2) + if (m_vrtc_irq_mask && m_i8214_irq_level >= 2) { m_vrtc_irq_latch = 1; //IRQ_LOG(("vrtc\n")); @@ -2452,9 +2399,7 @@ void pc8801_state::machine_reset() } { - int i; - - for(i=0;i<3;i++) + for (int i = 0; i < 3; i++) m_alu_reg[i] = 0x00; } @@ -2495,9 +2440,7 @@ void pc8801_state::machine_reset() } { - int i; - - for(i=0;i<0x10;i++) //text + bitmap + for (int i = 0; i < 0x10; i++) //text + bitmap m_palette->set_pen_color(i, pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 0)); } @@ -2509,7 +2452,7 @@ void pc8801_state::machine_reset() m_has_opna = ioport("BOARD_CONFIG")->read() & 1; } -MACHINE_RESET_MEMBER(pc8801_state,pc8801_clock_speed) +void pc8801_state::machine_reset_pc8801_clock_speed() { pc8801_state::machine_reset(); m_has_clock_speed = 1; @@ -2520,32 +2463,28 @@ MACHINE_RESET_MEMBER(pc8801_state,pc8801_clock_speed) m_baudrate_val = 0; } -MACHINE_RESET_MEMBER(pc8801_state,pc8801_dic) +void pc8801_state::machine_reset_pc8801_dic() { - MACHINE_RESET_CALL_MEMBER( pc8801_clock_speed ); + machine_reset_pc8801_clock_speed(); m_has_dictionary = 1; m_dic_bank = 0; m_dic_ctrl = 0; } -MACHINE_RESET_MEMBER(pc8801_state,pc8801_cdrom) +void pc8801_state::machine_reset_pc8801_cdrom() { - MACHINE_RESET_CALL_MEMBER( pc8801_dic ); + machine_reset_pc8801_dic(); m_has_cdrom = 1; { - int i; - - for(i=0;i<0x10;i++) + for (int i = 0; i < 0x10; i++) m_cdrom_reg[i] = 0; } } PALETTE_INIT_MEMBER(pc8801_state, pc8801) { - int i; - - for(i=0;i<0x10;i++) //text + bitmap + for (int i = 0; i < 0x10; i++) //text + bitmap palette.set_pen_color(i, pal1bit(i >> 1), pal1bit(i >> 2), pal1bit(i >> 0)); } @@ -2555,10 +2494,8 @@ READ8_MEMBER(pc8801_state::opn_porta_r) { if(ioport("BOARD_CONFIG")->read() & 2) { - uint8_t shift,res; - - shift = (m_mouse.phase & 1) ? 0 : 4; - res = (m_mouse.phase & 2) ? m_mouse.y : m_mouse.x; + uint8_t shift = (m_mouse.phase & 1) ? 0 : 4; + uint8_t res = (m_mouse.phase & 2) ? m_mouse.y : m_mouse.x; // printf("%d\n",m_mouse.phase); @@ -2639,7 +2576,7 @@ MACHINE_CONFIG_START(pc8801_state::pc8801) MCFG_PALETTE_ADD("palette", 0x10) MCFG_PALETTE_INIT_OWNER(pc8801_state, pc8801) -// MCFG_VIDEO_START_OVERRIDE(pc8801_state,pc8801) +// set_video_start_cb(config, driver_callback_delegate(&video_start_pc8801, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2663,17 +2600,17 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pc8801_state::pc8801fh) pc8801(config); - MCFG_MACHINE_RESET_OVERRIDE(pc8801_state, pc8801_clock_speed ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc8801_clock_speed, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pc8801_state::pc8801ma) pc8801(config); - MCFG_MACHINE_RESET_OVERRIDE(pc8801_state, pc8801_dic ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc8801_dic, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pc8801_state::pc8801mc) pc8801(config); - MCFG_MACHINE_RESET_OVERRIDE(pc8801_state, pc8801_cdrom ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc8801_cdrom, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index a4bd94cb1db..33c54369475 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -2038,7 +2038,7 @@ PALETTE_INIT_MEMBER(pc9801_state,pc9801) palette.set_pen_color(i, pal1bit(0), pal1bit(0), pal1bit(0)); } -MACHINE_START_MEMBER(pc9801_state,pc9801_common) +void pc9801_state::machine_start_pc9801_common() { m_rtc->cs_w(1); m_rtc->oe_w(1); @@ -2056,45 +2056,45 @@ MACHINE_START_MEMBER(pc9801_state,pc9801_common) save_pointer(NAME(m_egc.regs), 8); } -MACHINE_START_MEMBER(pc9801_state,pc9801f) +void pc9801_state::machine_start_pc9801f() { - MACHINE_START_CALL_MEMBER(pc9801_common); + machine_start_pc9801_common(); m_fdc_2hd->set_rate(500000); m_fdc_2dd->set_rate(250000); m_sys_type = 0x00 >> 6; } -MACHINE_START_MEMBER(pc9801_state,pc9801rs) +void pc9801_state::machine_start_pc9801rs() { - MACHINE_START_CALL_MEMBER(pc9801_common); + machine_start_pc9801_common(); m_sys_type = 0x80 >> 6; } -MACHINE_START_MEMBER(pc9801_state,pc9801bx2) +void pc9801_state::machine_start_pc9801bx2() { - MACHINE_START_CALL_MEMBER(pc9801rs); + machine_start_pc9801rs(); save_pointer(NAME(m_sdip), 24); } -MACHINE_START_MEMBER(pc9801_state,pc9821) +void pc9801_state::machine_start_pc9821() { - MACHINE_START_CALL_MEMBER(pc9801rs); + machine_start_pc9801rs(); save_pointer(NAME(m_sdip), 24); } -MACHINE_START_MEMBER(pc9801_state,pc9821ap2) +void pc9801_state::machine_start_pc9821ap2() { - MACHINE_START_CALL_MEMBER(pc9821); + machine_start_pc9821(); // ... } -MACHINE_RESET_MEMBER(pc9801_state,pc9801_common) +void pc9801_state::machine_reset_pc9801_common() { memset(m_tvram.get(), 0, sizeof(uint16_t) * 0x2000); /* this looks like to be some kind of backup ram, system will boot with green colors otherwise */ @@ -2120,9 +2120,9 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801_common) memset(&m_egc, 0, sizeof(m_egc)); } -MACHINE_RESET_MEMBER(pc9801_state,pc9801f) +void pc9801_state::machine_reset_pc9801f() { - MACHINE_RESET_CALL_MEMBER(pc9801_common); + machine_reset_pc9801_common(); uint8_t op_mode; uint8_t *ROM; @@ -2142,9 +2142,9 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801f) ROM[i] = PRG[i+op_mode*0x8000+0x10000]; } -MACHINE_RESET_MEMBER(pc9801_state,pc9801rs) +void pc9801_state::machine_reset_pc9801rs() { - MACHINE_RESET_CALL_MEMBER(pc9801_common); + machine_reset_pc9801_common(); m_gate_a20 = 0; m_fdc_ctrl = 3; @@ -2161,9 +2161,9 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801rs) } } -MACHINE_RESET_MEMBER(pc9801_state,pc9821) +void pc9801_state::machine_reset_pc9821() { - MACHINE_RESET_CALL_MEMBER(pc9801rs); + machine_reset_pc9801rs(); m_pc9821_window_bank = 0x08; } @@ -2391,8 +2391,8 @@ MACHINE_CONFIG_START(pc9801_state::pc9801) pc9801_common(config); - MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9801f) - MCFG_MACHINE_RESET_OVERRIDE(pc9801_state,pc9801f) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pc9801f, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc9801f, this)); // TODO: maybe force dips to avoid beep error MCFG_RAM_ADD(RAM_TAG) @@ -2432,8 +2432,8 @@ MACHINE_CONFIG_START(pc9801_state::pc9801rs) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(18) MCFG_ADDRESS_MAP_BANK_STRIDE(0x18000) - MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9801rs) - MCFG_MACHINE_RESET_OVERRIDE(pc9801_state,pc9801rs) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pc9801rs, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc9801rs, this)); MCFG_DEVICE_MODIFY("i8237") MCFG_DEVICE_CLOCK(MAIN_CLOCK_X1*8); // unknown clock @@ -2462,8 +2462,8 @@ MACHINE_CONFIG_START(pc9801_state::pc9801vm) MCFG_RAM_DEFAULT_SIZE("640K") MCFG_RAM_EXTRA_OPTIONS("640K") - MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9801_common) - MCFG_MACHINE_RESET_OVERRIDE(pc9801_state,pc9801_common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pc9801_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc9801_common, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pc9801_state::pc9801ux) @@ -2483,7 +2483,7 @@ MACHINE_CONFIG_START(pc9801_state::pc9801bx2) MCFG_DEVICE_IO_MAP(pc9821_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb) - MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9801bx2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pc9801bx2, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pc9801_state::pc9821) @@ -2498,8 +2498,8 @@ MACHINE_CONFIG_START(pc9801_state::pc9821) MCFG_PIT8253_CLK1(MAIN_CLOCK_X2) MCFG_PIT8253_CLK2(MAIN_CLOCK_X2) - MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9821) - MCFG_MACHINE_RESET_OVERRIDE(pc9801_state,pc9821) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pc9821, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pc9821, this)); MCFG_DEVICE_MODIFY("i8237") MCFG_DEVICE_CLOCK(16000000); // unknown clock @@ -2516,7 +2516,7 @@ MACHINE_CONFIG_START(pc9801_state::pc9821ap2) MCFG_DEVICE_IO_MAP(pc9821_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb) - MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9821ap2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pc9821ap2, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pc9801_state::pc9821v20) diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp index 38d5ec71e7c..beff31f8d8c 100644 --- a/src/mame/drivers/pce.cpp +++ b/src/mame/drivers/pce.cpp @@ -321,8 +321,8 @@ MACHINE_CONFIG_START(pce_state::pce_common) MCFG_DEVICE_IO_MAP(pce_io) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(pce_state, pce ) - MCFG_MACHINE_RESET_OVERRIDE(pce_state, mess_pce ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pce, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mess_pce, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -374,8 +374,8 @@ MACHINE_CONFIG_START(pce_state::sgx) MCFG_DEVICE_IO_MAP(sgx_io) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(pce_state, pce ) - MCFG_MACHINE_RESET_OVERRIDE(pce_state, mess_pce ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pce, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mess_pce, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/pdp11.cpp b/src/mame/drivers/pdp11.cpp index b28d09f1fff..b9683ca535c 100644 --- a/src/mame/drivers/pdp11.cpp +++ b/src/mame/drivers/pdp11.cpp @@ -113,8 +113,8 @@ public: uint8_t m_teletype_data; uint16_t m_teletype_status; virtual void machine_reset() override; - DECLARE_MACHINE_RESET(pdp11ub2); - DECLARE_MACHINE_RESET(pdp11qb); + void machine_reset_pdp11ub2(); + void machine_reset_pdp11qb(); void load9312prom(uint8_t *desc, uint8_t *src, int size); void pdp11ub2(machine_config &config); void pdp11(machine_config &config); @@ -310,7 +310,7 @@ void pdp11_state::load9312prom(uint8_t *desc, uint8_t *src, int size) } } -MACHINE_RESET_MEMBER(pdp11_state,pdp11ub2) +void pdp11_state::machine_reset_pdp11ub2() { // Load M9312 uint8_t* user1 = memregion("consproms")->base() + ioport("CONSPROM")->read() * 0x0400; @@ -341,7 +341,7 @@ MACHINE_RESET_MEMBER(pdp11_state,pdp11ub2) } -MACHINE_RESET_MEMBER(pdp11_state,pdp11qb) +void pdp11_state::machine_reset_pdp11qb() { m_maincpu->set_state_int(T11_PC, 0xea00); } @@ -369,12 +369,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pdp11_state::pdp11ub2) pdp11(config); - MCFG_MACHINE_RESET_OVERRIDE(pdp11_state,pdp11ub2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pdp11ub2, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pdp11_state::pdp11qb) pdp11(config); - MCFG_MACHINE_RESET_OVERRIDE(pdp11_state,pdp11qb) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pdp11qb, this)); MCFG_DEVICE_MODIFY("maincpu") MCFG_T11_INITIAL_MODE(0 << 13) diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp index a85dc5d6200..580bde119cd 100644 --- a/src/mame/drivers/pengo.cpp +++ b/src/mame/drivers/pengo.cpp @@ -407,7 +407,7 @@ MACHINE_CONFIG_START(pengo_state::pengo) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pengo_state, vblank_irq)) - MCFG_VIDEO_START_OVERRIDE(pengo_state,pengo) + set_video_start_cb(config, driver_callback_delegate(&video_start_pengo, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -445,7 +445,7 @@ MACHINE_CONFIG_START(pengo_state::jrpacmbl) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, pengo_state, jrpacman_spritebank_w)) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pengo_state, jrpacman_charbank_w)) - MCFG_VIDEO_START_OVERRIDE(pengo_state,jrpacman) + set_video_start_cb(config, driver_callback_delegate(&video_start_jrpacman, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp index b0c0456dbaa..bb9f38c8353 100644 --- a/src/mame/drivers/pentagon.cpp +++ b/src/mame/drivers/pentagon.cpp @@ -37,8 +37,8 @@ public: DECLARE_READ8_MEMBER(beta_neutral_r); DECLARE_READ8_MEMBER(beta_enable_r); DECLARE_READ8_MEMBER(beta_disable_r); - DECLARE_MACHINE_RESET(pentagon); - DECLARE_VIDEO_START(pentagon); + void machine_reset_pentagon(); + void video_start_pentagon() ATTR_COLD; INTERRUPT_GEN_MEMBER(pentagon_interrupt); TIMER_CALLBACK_MEMBER(irq_on); TIMER_CALLBACK_MEMBER(irq_off); @@ -210,7 +210,7 @@ void pentagon_state::pentagon_switch(address_map &map) map(0x4000, 0xffff).r(this, FUNC(pentagon_state::beta_disable_r)); } -MACHINE_RESET_MEMBER(pentagon_state,pentagon) +void pentagon_state::machine_reset_pentagon() { uint8_t *messram = m_ram->pointer(); m_program = &m_maincpu->space(AS_PROGRAM); @@ -237,7 +237,7 @@ MACHINE_RESET_MEMBER(pentagon_state,pentagon) pentagon_update_memory(); } -VIDEO_START_MEMBER(pentagon_state,pentagon) +void pentagon_state::video_start_pentagon() { m_frame_invert_count = 16; m_frame_number = 0; @@ -281,12 +281,12 @@ MACHINE_CONFIG_START(pentagon_state::pentagon) MCFG_DEVICE_IO_MAP(pentagon_io) MCFG_DEVICE_OPCODES_MAP(pentagon_switch) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pentagon_state, pentagon_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(pentagon_state, pentagon ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pentagon, this)); MCFG_SCREEN_MODIFY("screen") //MCFG_SCREEN_RAW_PARAMS(XTAL(14'000'000) / 2, 448, 0, 352, 320, 0, 304) MCFG_SCREEN_RAW_PARAMS(XTAL(14'000'000) / 2, 448, 0, 352, 320, 0, 287) - MCFG_VIDEO_START_OVERRIDE(pentagon_state, pentagon ) + set_video_start_cb(config, driver_callback_delegate(&video_start_pentagon, this)); MCFG_BETA_DISK_ADD(BETA_DISK_TAG) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pentagon) diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index 85da3d4590e..20e31e5be73 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -243,11 +243,11 @@ public: required_ioport_array<10> m_row; required_ioport m_lock; - DECLARE_MACHINE_START( pet ); - DECLARE_MACHINE_START( pet2001 ); - DECLARE_MACHINE_RESET( pet ); - DECLARE_MACHINE_START( pet40 ); - DECLARE_MACHINE_RESET( pet40 ); + void machine_start_pet(); + void machine_start_pet2001(); + void machine_reset_pet(); + void machine_start_pet40(); + void machine_reset_pet40(); MC6845_BEGIN_UPDATE( pet_begin_update ); MC6845_UPDATE_ROW( pet40_update_row ); @@ -381,8 +381,8 @@ public: pet2001b_state(mconfig, type, tag) { } - DECLARE_MACHINE_START( pet80 ); - DECLARE_MACHINE_RESET( pet80 ); + void machine_start_pet80() ATTR_COLD; + void machine_reset_pet80(); MC6845_UPDATE_ROW( pet80_update_row ); MC6845_UPDATE_ROW( cbm8296_update_row ); @@ -431,8 +431,8 @@ public: required_device<pla_device> m_pla1; required_device<pla_device> m_pla2; - DECLARE_MACHINE_START( cbm8296 ); - DECLARE_MACHINE_RESET( cbm8296 ); + void machine_start_cbm8296() ATTR_COLD; + void machine_reset_cbm8296(); void read_pla1(offs_t offset, int phi2, int brw, int noscreen, int noio, int ramsela, int ramsel9, int ramon, int norom, int &cswff, int &cs9, int &csa, int &csio, int &cse, int &cskb, int &fa12, int &casena1); @@ -1599,7 +1599,7 @@ void cbm8296d_ieee488_devices(device_slot_interface &device) // MACHINE_START( pet ) //------------------------------------------------- -MACHINE_START_MEMBER( pet_state, pet ) +void pet_state::machine_start_pet() { // allocate memory m_video_ram.allocate(m_video_ram_size); @@ -1640,15 +1640,15 @@ MACHINE_START_MEMBER( pet_state, pet ) // MACHINE_START( pet2001 ) //------------------------------------------------- -MACHINE_START_MEMBER( pet_state, pet2001 ) +void pet_state::machine_start_pet2001() { m_video_ram_size = 0x400; - MACHINE_START_CALL_MEMBER(pet); + machine_start_pet(); } -MACHINE_RESET_MEMBER( pet_state, pet ) +void pet_state::machine_reset_pet() { m_maincpu->reset(); @@ -1666,17 +1666,17 @@ MACHINE_RESET_MEMBER( pet_state, pet ) // MACHINE_START( pet40 ) //------------------------------------------------- -MACHINE_START_MEMBER( pet_state, pet40 ) +void pet_state::machine_start_pet40() { m_video_ram_size = 0x400; - MACHINE_START_CALL_MEMBER(pet); + machine_start_pet(); } -MACHINE_RESET_MEMBER( pet_state, pet40 ) +void pet_state::machine_reset_pet40() { - MACHINE_RESET_CALL_MEMBER(pet); + machine_reset_pet(); m_crtc->reset(); } @@ -1686,29 +1686,29 @@ MACHINE_RESET_MEMBER( pet_state, pet40 ) // MACHINE_START( pet80 ) //------------------------------------------------- -MACHINE_START_MEMBER( pet80_state, pet80 ) +void pet80_state::machine_start_pet80() { m_video_ram_size = 0x800; - MACHINE_START_CALL_MEMBER(pet); + machine_start_pet(); } -MACHINE_RESET_MEMBER( pet80_state, pet80 ) +void pet80_state::machine_reset_pet80() { - MACHINE_RESET_CALL_MEMBER(pet); + machine_reset_pet(); m_crtc->reset(); } //------------------------------------------------- -// MACHINE_START( cbm8296 ) +// machine_start_cbm8296() //------------------------------------------------- -MACHINE_START_MEMBER( cbm8296_state, cbm8296 ) +void cbm8296_state::machine_start_cbm8296() { - MACHINE_START_CALL_MEMBER(pet80); + machine_start_pet80(); // state saving save_item(NAME(m_cr)); @@ -1716,9 +1716,9 @@ MACHINE_START_MEMBER( cbm8296_state, cbm8296 ) } -MACHINE_RESET_MEMBER( cbm8296_state, cbm8296 ) +void cbm8296_state::machine_reset_cbm8296() { - MACHINE_RESET_CALL_MEMBER(pet80); + machine_reset_pet80(); m_cr = 0; m_via_pa = 0xff; @@ -1778,8 +1778,8 @@ MACHINE_CONFIG_END //------------------------------------------------- MACHINE_CONFIG_START(pet_state::pet) - MCFG_MACHINE_START_OVERRIDE(pet_state, pet2001) - MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pet2001, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pet, this)); // basic machine hardware MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(8'000'000)/8) @@ -2072,8 +2072,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pet2001b_state::pet4032f) pet4000(config); - MCFG_MACHINE_START_OVERRIDE(pet_state, pet40) - MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet40) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pet40, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pet40, this)); // video hardware MCFG_SCREEN_MODIFY(SCREEN_TAG) @@ -2148,8 +2148,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pet_state::cbm4032f) cbm4000(config); - MCFG_MACHINE_START_OVERRIDE(pet_state, pet40) - MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet40) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pet40, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pet40, this)); // video hardware MCFG_SCREEN_MODIFY(SCREEN_TAG) @@ -2231,8 +2231,8 @@ MACHINE_CONFIG_END //------------------------------------------------- MACHINE_CONFIG_START(pet80_state::pet80) - MCFG_MACHINE_START_OVERRIDE(pet80_state, pet80) - MCFG_MACHINE_RESET_OVERRIDE(pet80_state, pet80) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pet80, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pet80, this)); // basic machine hardware MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) @@ -2373,8 +2373,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cbm8296_state::cbm8296) pet80(config); - MCFG_MACHINE_START_OVERRIDE(cbm8296_state, cbm8296) - MCFG_MACHINE_RESET_OVERRIDE(cbm8296_state, cbm8296) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm8296, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cbm8296, this)); MCFG_DEVICE_MODIFY(M6502_TAG) MCFG_DEVICE_PROGRAM_MAP(cbm8296_mem) diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index 1f20b8eca9c..caf32d02b22 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -498,12 +498,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(pgm_state::pgm_interrupt) if (!m_irq4_disabled) m_maincpu->set_input_line(4, HOLD_LINE); } -MACHINE_START_MEMBER(pgm_state,pgm) +void pgm_state::machine_start_pgm() { // machine().base_datetime(m_systime); } -MACHINE_RESET_MEMBER(pgm_state,pgm) +void pgm_state::machine_reset_pgm() { m_soundcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } @@ -519,8 +519,8 @@ MACHINE_CONFIG_START(pgm_state::pgmbase) MCFG_DEVICE_PROGRAM_MAP(pgm_z80_mem) MCFG_DEVICE_IO_MAP(pgm_z80_io) - MCFG_MACHINE_START_OVERRIDE(pgm_state, pgm ) - MCFG_MACHINE_RESET_OVERRIDE(pgm_state, pgm ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pgm, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pgm, this)); MCFG_NVRAM_ADD_0FILL("sram") MCFG_V3021_ADD("rtc") @@ -539,7 +539,7 @@ MACHINE_CONFIG_START(pgm_state::pgmbase) MCFG_PALETTE_ADD("palette", 0x1200/2) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(pgm_state,pgm) + set_video_start_cb(config, driver_callback_delegate(&video_start_pgm, this)); /*sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/phoenix.cpp b/src/mame/drivers/phoenix.cpp index 242166bd3b2..486854b8a9c 100644 --- a/src/mame/drivers/phoenix.cpp +++ b/src/mame/drivers/phoenix.cpp @@ -435,7 +435,7 @@ static GFXDECODE_START( gfx_pleiads ) GFXDECODE_END -MACHINE_RESET_MEMBER(phoenix_state,phoenix) +void phoenix_state::machine_reset_phoenix() { membank("bank1")->set_base(memregion("maincpu")->base() + 0x4000); } @@ -447,7 +447,7 @@ MACHINE_CONFIG_START(phoenix_state::phoenix) MCFG_DEVICE_ADD("maincpu", I8085A, CPU_CLOCK) /* 2.75 MHz */ MCFG_DEVICE_PROGRAM_MAP(phoenix_memory_map) - MCFG_MACHINE_RESET_OVERRIDE(phoenix_state,phoenix) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_phoenix, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -459,7 +459,7 @@ MACHINE_CONFIG_START(phoenix_state::phoenix) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(phoenix_state,phoenix) - MCFG_VIDEO_START_OVERRIDE(phoenix_state,phoenix) + set_video_start_cb(config, driver_callback_delegate(&video_start_phoenix, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -517,7 +517,7 @@ MACHINE_CONFIG_START(phoenix_state::survival) MCFG_I8085A_SID(READLINE(*this, phoenix_state, survival_sid_callback)) MCFG_DEVICE_PROGRAM_MAP(survival_memory_map) - MCFG_MACHINE_RESET_OVERRIDE(phoenix_state,phoenix) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_phoenix, this)); /* video hardware */ @@ -533,7 +533,7 @@ MACHINE_CONFIG_START(phoenix_state::survival) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(phoenix_state,survival) - MCFG_VIDEO_START_OVERRIDE(phoenix_state,phoenix) + set_video_start_cb(config, driver_callback_delegate(&video_start_phoenix, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp index 9fe9e395da6..a83508ed377 100644 --- a/src/mame/drivers/pipedrm.cpp +++ b/src/mame/drivers/pipedrm.cpp @@ -182,8 +182,8 @@ public: required_device<generic_latch_8_device> m_soundlatch; - DECLARE_MACHINE_START(pipedrm); - DECLARE_MACHINE_RESET(pipedrm); + void machine_start_pipedrm() ATTR_COLD; + void machine_reset_pipedrm(); void init_pipedrm(); void init_hatris(); DECLARE_WRITE8_MEMBER( pipedrm_bankswitch_w ); @@ -548,7 +548,7 @@ GFXDECODE_END * *************************************/ -MACHINE_START_MEMBER(pipedrm_state,pipedrm) +void pipedrm_state::machine_start_pipedrm() { /* initialize main Z80 bank */ membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x2000); @@ -561,7 +561,7 @@ MACHINE_START_MEMBER(pipedrm_state,pipedrm) /* video-related elements are saved in video_start */ } -MACHINE_RESET_MEMBER(pipedrm_state,pipedrm) +void pipedrm_state::machine_reset_pipedrm() { m_flipscreen_old = -1; m_scrollx_ofs = 0x159; @@ -588,8 +588,8 @@ MACHINE_CONFIG_START(pipedrm_state::pipedrm) MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_DEVICE_IO_MAP(sound_portmap) - MCFG_MACHINE_START_OVERRIDE(pipedrm_state,pipedrm) - MCFG_MACHINE_RESET_OVERRIDE(pipedrm_state,pipedrm) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pipedrm, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pipedrm, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -614,7 +614,7 @@ MACHINE_CONFIG_START(pipedrm_state::pipedrm) MCFG_VSYSTEM_SPR2_SET_PRITYPE(3) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(pipedrm_state,pipedrm) + set_video_start_cb(config, driver_callback_delegate(&video_start_pipedrm, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -643,8 +643,8 @@ MACHINE_CONFIG_START(pipedrm_state::hatris) MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_DEVICE_IO_MAP(hatris_sound_portmap) - MCFG_MACHINE_START_OVERRIDE(pipedrm_state,pipedrm) - MCFG_MACHINE_RESET_OVERRIDE(pipedrm_state,pipedrm) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pipedrm, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pipedrm, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -663,7 +663,7 @@ MACHINE_CONFIG_START(pipedrm_state::hatris) MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w)) - MCFG_VIDEO_START_OVERRIDE(pipedrm_state,hatris) + set_video_start_cb(config, driver_callback_delegate(&video_start_hatris, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp index cda2f74ea77..a7dae80013c 100644 --- a/src/mame/drivers/piratesh.cpp +++ b/src/mame/drivers/piratesh.cpp @@ -95,9 +95,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(helm_r); DECLARE_CUSTOM_INPUT_MEMBER(battery_r); - DECLARE_MACHINE_START(piratesh); - DECLARE_MACHINE_RESET(piratesh); - DECLARE_VIDEO_START(piratesh); + void machine_start_piratesh() ATTR_COLD; + void machine_reset_piratesh(); + void video_start_piratesh() ATTR_COLD; uint32_t screen_update_piratesh(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen); TIMER_DEVICE_CALLBACK_MEMBER(piratesh_interrupt); @@ -181,7 +181,7 @@ K055673_CB_MEMBER(piratesh_state::piratesh_sprite_callback) -VIDEO_START_MEMBER(piratesh_state, piratesh) +void piratesh_state::video_start_piratesh() { // TODO: These come from the 055555 m_layer_colorbase[0] = 0; @@ -551,7 +551,7 @@ INPUT_PORTS_END /**********************************************************************************/ -MACHINE_START_MEMBER(piratesh_state, piratesh) +void piratesh_state::machine_start_piratesh() { #if 0 m_sound_ctrl = 2; @@ -566,14 +566,12 @@ MACHINE_START_MEMBER(piratesh_state, piratesh) #endif } -MACHINE_RESET_MEMBER(piratesh_state,piratesh) +void piratesh_state::machine_reset_piratesh() { m_int_status = 0; - int i; - // soften chorus(chip 0 channel 0-3), boost voice(chip 0 channel 4-7) - for (i=0; i<=7; i++) + for (int i = 0; i <= 7; i++) { // m_k054539->set_gain(i, 0.5); } @@ -595,8 +593,8 @@ MACHINE_CONFIG_START(piratesh_state::piratesh) MCFG_DEVICE_ADD("k053252", K053252, XTAL(32'000'000)/4) MCFG_K053252_OFFSETS(40, 16) // TODO - MCFG_MACHINE_START_OVERRIDE(piratesh_state, piratesh) - MCFG_MACHINE_RESET_OVERRIDE(piratesh_state, piratesh) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_piratesh, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_piratesh, this)); MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) @@ -640,7 +638,7 @@ MACHINE_CONFIG_START(piratesh_state::piratesh) MCFG_K054338_ALPHAINV(1) MCFG_K054338_MIXER("k055555") - MCFG_VIDEO_START_OVERRIDE(piratesh_state, piratesh) + set_video_start_cb(config, driver_callback_delegate(&video_start_piratesh, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp index 235b73b9e70..8e031af6e6a 100644 --- a/src/mame/drivers/playch10.cpp +++ b/src/mame/drivers/playch10.cpp @@ -705,8 +705,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(playch10_state::playch10_hboard) playch10(config); - MCFG_VIDEO_START_OVERRIDE(playch10_state,playch10_hboard) - MCFG_MACHINE_START_OVERRIDE(playch10_state,playch10_hboard) + set_video_start_cb(config, driver_callback_delegate(&video_start_playch10_hboard, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_playch10_hboard, this)); MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp index 9bcdf106d5a..04d6c4883de 100644 --- a/src/mame/drivers/playmark.cpp +++ b/src/mame/drivers/playmark.cpp @@ -1003,7 +1003,7 @@ void playmark_state::configure_oki_banks() } } -MACHINE_START_MEMBER(playmark_state,playmark) +void playmark_state::machine_start_playmark() { save_item(NAME(m_bgscrollx)); save_item(NAME(m_bgscrolly)); @@ -1024,7 +1024,7 @@ MACHINE_START_MEMBER(playmark_state,playmark) -MACHINE_RESET_MEMBER(playmark_state,playmark) +void playmark_state::machine_reset_playmark() { m_bgscrollx = 0; m_bgscrolly = 0; @@ -1055,8 +1055,8 @@ MACHINE_CONFIG_START(playmark_state::bigtwin) MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r)) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, playmark_snd_control_w)) - MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) - MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_playmark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_playmark, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1071,7 +1071,7 @@ MACHINE_CONFIG_START(playmark_state::bigtwin) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(playmark_state,bigtwin) + set_video_start_cb(config, driver_callback_delegate(&video_start_bigtwin, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1095,8 +1095,8 @@ MACHINE_CONFIG_START(playmark_state::bigtwinb) MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r)) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, playmark_snd_control_w)) - MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) - MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_playmark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_playmark, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1111,7 +1111,7 @@ MACHINE_CONFIG_START(playmark_state::bigtwinb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(playmark_state,bigtwinb) + set_video_start_cb(config, driver_callback_delegate(&video_start_bigtwinb, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1139,8 +1139,8 @@ MACHINE_CONFIG_START(playmark_state::wbeachvl) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0) - MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) - MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_playmark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_playmark, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1155,7 +1155,7 @@ MACHINE_CONFIG_START(playmark_state::wbeachvl) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) - MCFG_VIDEO_START_OVERRIDE(playmark_state,wbeachvl) + set_video_start_cb(config, driver_callback_delegate(&video_start_wbeachvl, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1179,8 +1179,8 @@ MACHINE_CONFIG_START(playmark_state::excelsr) MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r)) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, playmark_snd_control_w)) - MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) - MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_playmark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_playmark, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1195,7 +1195,7 @@ MACHINE_CONFIG_START(playmark_state::excelsr) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(playmark_state,excelsr) + set_video_start_cb(config, driver_callback_delegate(&video_start_excelsr, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1220,8 +1220,8 @@ MACHINE_CONFIG_START(playmark_state::hrdtimes) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, hrdtimes_snd_control_w)) MCFG_DEVICE_DISABLE() /* Internal code is not dumped yet */ - MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) - MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_playmark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_playmark, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1236,7 +1236,7 @@ MACHINE_CONFIG_START(playmark_state::hrdtimes) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(playmark_state,hrdtimes) + set_video_start_cb(config, driver_callback_delegate(&video_start_hrdtimes, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1263,8 +1263,8 @@ MACHINE_CONFIG_START(playmark_state::hotmind) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0) - MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) - MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_playmark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_playmark, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1279,7 +1279,7 @@ MACHINE_CONFIG_START(playmark_state::hotmind) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(playmark_state,hotmind) + set_video_start_cb(config, driver_callback_delegate(&video_start_hotmind, this)); MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ) MCFG_TICKET_DISPENSER_ADD("token", attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ) @@ -1308,8 +1308,8 @@ MACHINE_CONFIG_START(playmark_state::luckboomh) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) - MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_playmark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_playmark, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1324,7 +1324,7 @@ MACHINE_CONFIG_START(playmark_state::luckboomh) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(playmark_state,luckboomh) + set_video_start_cb(config, driver_callback_delegate(&video_start_luckboomh, this)); MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ) MCFG_TICKET_DISPENSER_ADD("token", attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ) diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp index 241a59c2f66..c1d1171d458 100644 --- a/src/mame/drivers/pocketc.cpp +++ b/src/mame/drivers/pocketc.cpp @@ -812,7 +812,7 @@ MACHINE_CONFIG_START(pc1251_state::pc1260) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP( pc1260_mem) - MCFG_MACHINE_START_OVERRIDE(pc1251_state, pc1260 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pc1260, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pc1251_state::pc1261) diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp index 5441d1a4bd0..a705246e55a 100644 --- a/src/mame/drivers/poisk1.cpp +++ b/src/mame/drivers/poisk1.cpp @@ -94,8 +94,8 @@ public: required_ioport_array<8> m_kbdio; void init_poisk1(); - DECLARE_MACHINE_START(poisk1); - DECLARE_MACHINE_RESET(poisk1); + void machine_start_poisk1() ATTR_COLD; + void machine_reset_poisk1(); DECLARE_PALETTE_INIT(p1); virtual void video_start() override; @@ -604,12 +604,12 @@ void p1_state::init_poisk1() membank("bank10")->set_base(m_ram->pointer()); } -MACHINE_START_MEMBER(p1_state, poisk1) +void p1_state::machine_start_poisk1() { DBG_LOG(0, "init", ("machine_start()\n")); } -MACHINE_RESET_MEMBER(p1_state, poisk1) +void p1_state::machine_reset_poisk1() { DBG_LOG(0, "init", ("machine_reset()\n")); @@ -648,8 +648,8 @@ MACHINE_CONFIG_START(p1_state::poisk1) MCFG_DEVICE_IO_MAP(poisk1_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) - MCFG_MACHINE_START_OVERRIDE( p1_state, poisk1 ) - MCFG_MACHINE_RESET_OVERRIDE( p1_state, poisk1 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_poisk1, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_poisk1, this)); MCFG_DEVICE_ADD( "pit8253", PIT8253 ,0) MCFG_PIT8253_CLK0(XTAL(15'000'000)/12) /* heartbeat IRQ */ diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index 7dbaa289564..c2dae67d081 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -395,7 +395,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(polepos_state::polepos_scanline) } -MACHINE_RESET_MEMBER(polepos_state,polepos) +void polepos_state::machine_reset_polepos() { /* set the interrupt vectors (this shouldn't be needed) */ m_subcpu->set_input_line_vector(0, Z8000_NVI); @@ -892,7 +892,7 @@ MACHINE_CONFIG_START(polepos_state::polepos) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* some interleaving */ - MCFG_MACHINE_RESET_OVERRIDE(polepos_state,polepos) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_polepos, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", polepos_state, polepos_scanline, "screen", 0, 1) @@ -920,7 +920,7 @@ MACHINE_CONFIG_START(polepos_state::polepos) MCFG_DEFAULT_LAYOUT(layout_polepos) MCFG_PALETTE_INIT_OWNER(polepos_state,polepos) - MCFG_VIDEO_START_OVERRIDE(polepos_state,polepos) + set_video_start_cb(config, driver_callback_delegate(&video_start_polepos, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1005,7 +1005,7 @@ MACHINE_CONFIG_START(polepos_state::topracern) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* some interleaving */ - MCFG_MACHINE_RESET_OVERRIDE(polepos_state,polepos) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_polepos, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", polepos_state, polepos_scanline, "screen", 0, 1) @@ -1033,7 +1033,7 @@ MACHINE_CONFIG_START(polepos_state::topracern) MCFG_DEFAULT_LAYOUT(layout_topracer) MCFG_PALETTE_INIT_OWNER(polepos_state,polepos) - MCFG_VIDEO_START_OVERRIDE(polepos_state,polepos) + set_video_start_cb(config, driver_callback_delegate(&video_start_polepos, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp index 46b92ae4347..89ec8d99bab 100644 --- a/src/mame/drivers/powerbal.cpp +++ b/src/mame/drivers/powerbal.cpp @@ -45,10 +45,10 @@ private: int m_bg_yoffset; TILE_GET_INFO_MEMBER(powerbal_get_bg_tile_info); - DECLARE_MACHINE_START(powerbal); - DECLARE_MACHINE_RESET(powerbal); - DECLARE_VIDEO_START(powerbal); - DECLARE_VIDEO_START(atombjt); + void machine_start_powerbal() ATTR_COLD; + void machine_reset_powerbal(); + void video_start_powerbal() ATTR_COLD; + void video_start_atombjt() ATTR_COLD; uint32_t screen_update_powerbal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites_powerbal( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE16_MEMBER(magicstk_coin_eeprom_w); @@ -555,7 +555,7 @@ void powerbal_state::draw_sprites_powerbal(bitmap_ind16 &bitmap, const rectangle } } -VIDEO_START_MEMBER(powerbal_state,powerbal) +void powerbal_state::video_start_powerbal() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(powerbal_state::powerbal_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -564,7 +564,7 @@ VIDEO_START_MEMBER(powerbal_state,powerbal) m_bg_tilemap->set_scrolly(0, m_bg_yoffset); } -VIDEO_START_MEMBER(powerbal_state,atombjt) +void powerbal_state::video_start_atombjt() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(powerbal_state::powerbal_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); @@ -614,12 +614,12 @@ GFXDECODE_END -MACHINE_START_MEMBER(powerbal_state,powerbal) +void powerbal_state::machine_start_powerbal() { save_item(NAME(m_tilebank)); } -MACHINE_RESET_MEMBER(powerbal_state,powerbal) +void powerbal_state::machine_reset_powerbal() { m_tilebank = 0; configure_oki_banks(); @@ -632,8 +632,8 @@ MACHINE_CONFIG_START(powerbal_state::powerbal) MCFG_DEVICE_PROGRAM_MAP(powerbal_main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", powerbal_state, irq2_line_hold) - MCFG_MACHINE_START_OVERRIDE(powerbal_state,powerbal) - MCFG_MACHINE_RESET_OVERRIDE(powerbal_state,powerbal) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_powerbal, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_powerbal, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -648,7 +648,7 @@ MACHINE_CONFIG_START(powerbal_state::powerbal) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(powerbal_state,powerbal) + set_video_start_cb(config, driver_callback_delegate(&video_start_powerbal, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -668,8 +668,8 @@ MACHINE_CONFIG_START(powerbal_state::magicstk) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0) - MCFG_MACHINE_START_OVERRIDE(powerbal_state,powerbal) - MCFG_MACHINE_RESET_OVERRIDE(powerbal_state,powerbal) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_powerbal, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_powerbal, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -684,7 +684,7 @@ MACHINE_CONFIG_START(powerbal_state::magicstk) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(powerbal_state,powerbal) + set_video_start_cb(config, driver_callback_delegate(&video_start_powerbal, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -706,7 +706,7 @@ MACHINE_CONFIG_START(powerbal_state::atombjt) MCFG_SCREEN_SIZE(512, 256) \ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1) \ - MCFG_VIDEO_START_OVERRIDE(powerbal_state,atombjt) + set_video_start_cb(config, driver_callback_delegate(&video_start_atombjt, this)); MACHINE_CONFIG_END /* diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp index 007e48b3274..d6ca4b900d8 100644 --- a/src/mame/drivers/powerins.cpp +++ b/src/mame/drivers/powerins.cpp @@ -296,7 +296,7 @@ GFXDECODE_END ***************************************************************************/ -MACHINE_START_MEMBER(powerins_state, powerinsa) +void powerins_state::machine_start_powerinsa() { membank("okibank")->configure_entries(0, 5, memregion("oki1")->base() + 0x30000, 0x10000); } @@ -360,7 +360,7 @@ MACHINE_CONFIG_START(powerins_state::powerinsa) MCFG_DEVICE_REMOVE("soundcpu") - MCFG_MACHINE_START_OVERRIDE(powerins_state, powerinsa) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_powerinsa, this)); MCFG_DEVICE_REPLACE("oki1", OKIM6295, 990000, okim6295_device::PIN7_LOW) // pin7 not verified MCFG_DEVICE_ADDRESS_MAP(0, powerinsa_oki_map) diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp index 079b2a643d9..6f421323ff6 100644 --- a/src/mame/drivers/primo.cpp +++ b/src/mame/drivers/primo.cpp @@ -304,7 +304,7 @@ MACHINE_CONFIG_START(primo_state::primob32) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(primob_port) - MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_primob, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(primo_state::primob48) @@ -312,7 +312,7 @@ MACHINE_CONFIG_START(primo_state::primob48) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(primob_port) - MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_primob, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(primo_state::primob64) @@ -320,7 +320,7 @@ MACHINE_CONFIG_START(primo_state::primob64) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(primob_port) - MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_primob, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(primo_state::primoc64) @@ -328,7 +328,7 @@ MACHINE_CONFIG_START(primo_state::primoc64) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(primob_port) - MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_primob, this)); MACHINE_CONFIG_END ROM_START( primoa32 ) diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp index 389b268074e..eec86586adb 100644 --- a/src/mame/drivers/psikyo.cpp +++ b/src/mame/drivers/psikyo.cpp @@ -1048,7 +1048,7 @@ MACHINE_CONFIG_START(psikyo_state::sngkace) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(psikyo_state,sngkace) + set_video_start_cb(config, driver_callback_delegate(&video_start_sngkace, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1094,7 +1094,7 @@ MACHINE_CONFIG_START(psikyo_state::gunbird) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(psikyo_state,psikyo) + set_video_start_cb(config, driver_callback_delegate(&video_start_psikyo, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1135,7 +1135,7 @@ MACHINE_CONFIG_START(psikyo_state::s1945bl) /* Bootleg hardware based on the unp MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(psikyo_state,psikyo) + set_video_start_cb(config, driver_callback_delegate(&video_start_psikyo, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1180,7 +1180,7 @@ MACHINE_CONFIG_START(psikyo_state::s1945) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(psikyo_state,psikyo) + set_video_start_cb(config, driver_callback_delegate(&video_start_psikyo, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp index 0b4479e4e71..e749e8ec016 100644 --- a/src/mame/drivers/psx.cpp +++ b/src/mame/drivers/psx.cpp @@ -51,7 +51,7 @@ public: uint8_t m_cd_io_status; uint8_t m_cd_param[8]; uint8_t m_cd_result[8]; - DECLARE_MACHINE_RESET(psx); + void machine_reset_psx(); inline void ATTR_PRINTF(3,4) verboselog( int n_level, const char *s_fmt, ... ); void psxexe_conv32(uint32_t *uint32); int load_psxexe(std::vector<uint8_t> buffer); diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp index e80b5b709dd..1576aeae0c9 100644 --- a/src/mame/drivers/psychic5.cpp +++ b/src/mame/drivers/psychic5.cpp @@ -339,14 +339,14 @@ Notes (23-Jan-2016 AS): #include "speaker.h" -MACHINE_START_MEMBER(psychic5_state, psychic5) +void psychic5_state::machine_start_psychic5() { membank("mainbank")->configure_entries(0, 4, memregion("maincpu")->base() + 0x10000, 0x4000); save_item(NAME(m_bank_latch)); } -MACHINE_START_MEMBER(psychic5_state, bombsa) +void psychic5_state::machine_start_bombsa() { membank("mainbank")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000); @@ -740,7 +740,7 @@ MACHINE_CONFIG_START(psychic5_state::psychic5) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* Allow time for 2nd cpu to interleave */ - MCFG_MACHINE_START_OVERRIDE(psychic5_state,psychic5) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_psychic5, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -752,8 +752,8 @@ MACHINE_CONFIG_START(psychic5_state::psychic5) MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0) - MCFG_VIDEO_START_OVERRIDE(psychic5_state,psychic5) - MCFG_VIDEO_RESET_OVERRIDE(psychic5_state,psychic5) + set_video_start_cb(config, driver_callback_delegate(&video_start_psychic5, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_psychic5, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -794,7 +794,7 @@ MACHINE_CONFIG_START(psychic5_state::bombsa) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_START_OVERRIDE(psychic5_state,bombsa) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bombsa, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -804,8 +804,8 @@ MACHINE_CONFIG_START(psychic5_state::bombsa) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bombsa) MCFG_PALETTE_ADD("palette", 768) - MCFG_VIDEO_START_OVERRIDE(psychic5_state,bombsa) - MCFG_VIDEO_RESET_OVERRIDE(psychic5_state,psychic5) + set_video_start_cb(config, driver_callback_delegate(&video_start_bombsa, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_psychic5, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp index 78acc618a48..0268a8098aa 100644 --- a/src/mame/drivers/puckpkmn.cpp +++ b/src/mame/drivers/puckpkmn.cpp @@ -284,7 +284,7 @@ MACHINE_CONFIG_START(md_boot_state::puckpkmn) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(puckpkmn_map) - MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_bootleg) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_md_bootleg, this)); MCFG_DEVICE_REMOVE("genesis_snd_z80") diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index 68d2c46e03c..f6f33ad2cdc 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -60,7 +60,7 @@ public: { } void init_pulsar(); - DECLARE_MACHINE_RESET(pulsar); + void machine_reset_pulsar(); TIMER_CALLBACK_MEMBER(pulsar_reset); DECLARE_WRITE8_MEMBER(baud_w); DECLARE_WRITE8_MEMBER(ppi_pa_w); @@ -188,7 +188,7 @@ static void pulsar_floppies(device_slot_interface &device) static INPUT_PORTS_START( pulsar ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( pulsar_state, pulsar ) +void pulsar_state::machine_reset_pulsar() { machine().scheduler().timer_set(attotime::from_usec(3), timer_expired_delegate(FUNC(pulsar_state::pulsar_reset),this)); membank("bankr0")->set_entry(0); // point at rom @@ -217,7 +217,7 @@ MACHINE_CONFIG_START(pulsar_state::pulsar) MCFG_DEVICE_PROGRAM_MAP(pulsar_mem) MCFG_DEVICE_IO_MAP(pulsar_io) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) - MCFG_MACHINE_RESET_OVERRIDE(pulsar_state, pulsar) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pulsar, this)); /* Devices */ MCFG_DEVICE_ADD("ppi", I8255, 0) diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp index 3feeffa8e4c..8472def8bc3 100644 --- a/src/mame/drivers/punchout.cpp +++ b/src/mame/drivers/punchout.cpp @@ -616,7 +616,7 @@ WRITE_LINE_MEMBER(punchout_state::vblank_irq) } -MACHINE_RESET_MEMBER(punchout_state, spnchout) +void punchout_state::machine_reset_spnchout() { m_rp5h01->enable_w(0); // _CE -> GND } @@ -692,7 +692,7 @@ MACHINE_CONFIG_START(punchout_state::spnchout) MCFG_RP5C01_REMOVE_BATTERY() MCFG_RP5H01_ADD("rp5h01") - MCFG_MACHINE_RESET_OVERRIDE(punchout_state, spnchout) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_spnchout, this)); MACHINE_CONFIG_END @@ -706,7 +706,7 @@ MACHINE_CONFIG_START(punchout_state::armwrest) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_armwrest) - MCFG_VIDEO_START_OVERRIDE(punchout_state, armwrest) + set_video_start_cb(config, driver_callback_delegate(&video_start_armwrest, this)); MCFG_SCREEN_MODIFY("top") MCFG_SCREEN_UPDATE_DRIVER(punchout_state, screen_update_armwrest_top) MCFG_SCREEN_MODIFY("bottom") diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp index e7e8fa54c73..bdde9fb64f7 100644 --- a/src/mame/drivers/qdrmfgp.cpp +++ b/src/mame/drivers/qdrmfgp.cpp @@ -495,20 +495,20 @@ WRITE_LINE_MEMBER(qdrmfgp_state::k054539_irq1_gen) * *************************************/ -MACHINE_START_MEMBER(qdrmfgp_state,qdrmfgp) +void qdrmfgp_state::machine_start_qdrmfgp() { save_item(NAME(m_control)); save_item(NAME(m_pal)); save_item(NAME(m_gp2_irq_control)); } -MACHINE_START_MEMBER(qdrmfgp_state,qdrmfgp2) +void qdrmfgp_state::machine_start_qdrmfgp2() { /* sound irq (CCU? 240Hz) */ m_gp2_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(qdrmfgp_state::gp2_timer_callback), this)); m_gp2_timer->adjust(attotime::from_hz(XTAL(18'432'000)/76800), 0, attotime::from_hz(XTAL(18'432'000)/76800)); - MACHINE_START_CALL_MEMBER( qdrmfgp ); + machine_start_qdrmfgp(); } void qdrmfgp_state::machine_reset() @@ -530,7 +530,7 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp) MCFG_DEVICE_PROGRAM_MAP(qdrmfgp_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", qdrmfgp_state, qdrmfgp_interrupt, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE(qdrmfgp_state,qdrmfgp) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_qdrmfgp, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true) @@ -548,7 +548,7 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(qdrmfgp_state,qdrmfgp) + set_video_start_cb(config, driver_callback_delegate(&video_start_qdrmfgp, this)); MCFG_DEVICE_ADD("k056832", K056832, 0) MCFG_K056832_CB(qdrmfgp_state, qdrmfgp_tile_callback) @@ -576,7 +576,7 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp2) MCFG_DEVICE_PROGRAM_MAP(qdrmfgp2_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", qdrmfgp_state, qdrmfgp2_interrupt) - MCFG_MACHINE_START_OVERRIDE(qdrmfgp_state,qdrmfgp2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_qdrmfgp2, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true) @@ -594,7 +594,7 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp2) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(qdrmfgp_state,qdrmfgp2) + set_video_start_cb(config, driver_callback_delegate(&video_start_qdrmfgp2, this)); MCFG_DEVICE_ADD("k056832", K056832, 0) MCFG_K056832_CB(qdrmfgp_state, qdrmfgp2_tile_callback) diff --git a/src/mame/drivers/qix.cpp b/src/mame/drivers/qix.cpp index 224537cc677..4a922c6ad0d 100644 --- a/src/mame/drivers/qix.cpp +++ b/src/mame/drivers/qix.cpp @@ -662,7 +662,7 @@ MACHINE_CONFIG_START(qix_state::mcu) MCFG_M68705_PORTA_W_CB(WRITE8(*this, qix_state, qix_68705_portA_w)) MCFG_M68705_PORTB_W_CB(WRITE8(*this, qix_state, qix_68705_portB_w)) - MCFG_MACHINE_START_OVERRIDE(qix_state,qixmcu) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_qixmcu, this)); MCFG_DEVICE_MODIFY("pia0") MCFG_PIA_READPB_HANDLER(READ8(*this, qix_state, qixmcu_coin_r)) diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp index 350d5e08657..616b85927f2 100644 --- a/src/mame/drivers/quasar.cpp +++ b/src/mame/drivers/quasar.cpp @@ -279,9 +279,9 @@ INTERRUPT_GEN_MEMBER(quasar_state::quasar_interrupt) // Quasar S2650 Main CPU, I8035 sound board // **************************************** -MACHINE_START_MEMBER(quasar_state,quasar) +void quasar_state::machine_start_quasar() { - MACHINE_START_CALL_MEMBER(cvs); + machine_start_cvs(); /* register state save */ save_item(NAME(m_effectcontrol)); @@ -289,9 +289,9 @@ MACHINE_START_MEMBER(quasar_state,quasar) save_item(NAME(m_io_page)); } -MACHINE_RESET_MEMBER(quasar_state,quasar) +void quasar_state::machine_reset_quasar() { - MACHINE_RESET_CALL_MEMBER(cvs); + machine_reset_cvs(); m_effectcontrol = 0; m_page = 0; @@ -314,8 +314,8 @@ MACHINE_CONFIG_START(quasar_state::quasar) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, quasar_state, audio_t1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) - MCFG_MACHINE_START_OVERRIDE(quasar_state,quasar) - MCFG_MACHINE_RESET_OVERRIDE(quasar_state,quasar) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_quasar, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quasar, this)); MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -342,7 +342,7 @@ MACHINE_CONFIG_START(quasar_state::quasar) MCFG_DEVICE_ADD("s2636_2", S2636, 0) MCFG_S2636_OFFSETS(CVS_S2636_Y_OFFSET - 8, CVS_S2636_X_OFFSET - 9) - MCFG_VIDEO_START_OVERRIDE(quasar_state,quasar) + set_video_start_cb(config, driver_callback_delegate(&video_start_quasar, this)); /* sound hardware */ MCFG_GENERIC_LATCH_8_ADD("soundlatch") diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index 0fc49f6fea4..791a693fffb 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -120,8 +120,8 @@ public: INTERRUPT_GEN_MEMBER(rdx_v33_interrupt); - DECLARE_MACHINE_RESET(r2dx_v33); - DECLARE_MACHINE_RESET(nzeroteam); + void machine_reset_r2dx_v33(); + void machine_reset_nzeroteam(); void nzerotea(machine_config &config); void rdx_v33(machine_config &config); @@ -765,12 +765,12 @@ static INPUT_PORTS_START( zerotm2k ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(r2dx_v33_state,r2dx_v33) +void r2dx_v33_state::machine_reset_r2dx_v33() { common_reset(); } -MACHINE_RESET_MEMBER(r2dx_v33_state,nzeroteam) +void r2dx_v33_state::machine_reset_nzeroteam() { common_reset(); @@ -791,7 +791,7 @@ MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33) MCFG_DEVICE_PROGRAM_MAP(rdx_v33_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(r2dx_v33_state,r2dx_v33) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_r2dx_v33, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -807,7 +807,7 @@ MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33) MCFG_PALETTE_ADD("palette", 2048) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2) + set_video_start_cb(config, driver_callback_delegate(&video_start_raiden2, this)); MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0) MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden2_state, tilemap_enable_w)) @@ -828,7 +828,7 @@ MACHINE_CONFIG_START(r2dx_v33_state::nzerotea) MCFG_DEVICE_PROGRAM_MAP(nzerotea_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(r2dx_v33_state,nzeroteam) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_nzeroteam, this)); MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4) MCFG_DEVICE_PROGRAM_MAP(zeroteam_sound_map) @@ -845,7 +845,7 @@ MACHINE_CONFIG_START(r2dx_v33_state::nzerotea) MCFG_PALETTE_ADD("palette", 2048) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2) + set_video_start_cb(config, driver_callback_delegate(&video_start_raiden2, this)); MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0) MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden2_state, tilemap_enable_w)) diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp index 36395c72287..95f466cf8c8 100644 --- a/src/mame/drivers/radio86.cpp +++ b/src/mame/drivers/radio86.cpp @@ -356,7 +356,7 @@ MACHINE_CONFIG_START(radio86_state::radio86) MCFG_DEVICE_ADD("maincpu",I8080, XTAL(16'000'000) / 9) MCFG_DEVICE_PROGRAM_MAP(radio86_mem) MCFG_DEVICE_IO_MAP(radio86_io) - MCFG_MACHINE_RESET_OVERRIDE(radio86_state, radio86 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_radio86, this)); MCFG_DEVICE_ADD("ppi8255_1", I8255, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2)) diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index acf620a1906..c8f76110094 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -427,7 +427,7 @@ MACHINE_CONFIG_START(raiden_state::raidenb) MCFG_DEVICE_PROGRAM_MAP(raidenb_main_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(raiden_state,raidenb) + set_video_start_cb(config, driver_callback_delegate(&video_start_raidenb, this)); MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0) MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden_state, raidenb_layer_enable_w)) diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index c1d61acb00b..3a1d0c0b7a7 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -522,7 +522,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_text_tile_info) /* VIDEO START (move to video file) */ -VIDEO_START_MEMBER(raiden2_state,raiden2) +void raiden2_state::video_start_raiden2() { back_data = make_unique_clear<uint16_t[]>(0x800/2); fore_data = make_unique_clear<uint16_t[]>(0x800/2); @@ -743,7 +743,7 @@ void raiden2_state::common_reset() tx_bank = 0; } -MACHINE_RESET_MEMBER(raiden2_state,raiden2) +void raiden2_state::machine_reset_raiden2() { common_reset(); sprcpt_init(); @@ -755,7 +755,7 @@ MACHINE_RESET_MEMBER(raiden2_state,raiden2) //cop_init(); } -MACHINE_RESET_MEMBER(raiden2_state,raidendx) +void raiden2_state::machine_reset_raidendx() { common_reset(); sprcpt_init(); @@ -768,7 +768,7 @@ MACHINE_RESET_MEMBER(raiden2_state,raidendx) //cop_init(); } -MACHINE_RESET_MEMBER(raiden2_state,zeroteam) +void raiden2_state::machine_reset_zeroteam() { bg_bank = 0; fg_bank = 2; @@ -783,7 +783,7 @@ MACHINE_RESET_MEMBER(raiden2_state,zeroteam) //cop_init(); } -MACHINE_RESET_MEMBER(raiden2_state,xsedae) +void raiden2_state::machine_reset_xsedae() { bg_bank = 0; fg_bank = 2; @@ -1437,7 +1437,7 @@ MACHINE_CONFIG_START(raiden2_state::raiden2) MCFG_DEVICE_PROGRAM_MAP(raiden2_mem) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raiden2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_raiden2, this)); MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/8) MCFG_DEVICE_PROGRAM_MAP(raiden2_sound_map) @@ -1459,7 +1459,7 @@ MACHINE_CONFIG_START(raiden2_state::raiden2) MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0) MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, raiden2_state, m_videoram_private_w)) - MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2) + set_video_start_cb(config, driver_callback_delegate(&video_start_raiden2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1487,7 +1487,7 @@ MACHINE_CONFIG_START(raiden2_state::xsedae) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(xsedae_mem) - MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,xsedae) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_xsedae, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) @@ -1499,7 +1499,7 @@ MACHINE_CONFIG_START(raiden2_state::raidendx) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(raidendx_mem) - MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raidendx) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_raidendx, this)); MACHINE_CONFIG_END @@ -1510,7 +1510,7 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam) MCFG_DEVICE_PROGRAM_MAP(zeroteam_mem) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,zeroteam) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_zeroteam, this)); MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/8) MCFG_DEVICE_PROGRAM_MAP(zeroteam_sound_map) @@ -1533,7 +1533,7 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam) MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0) MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, raiden2_state, m_videoram_private_w)) - MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2) + set_video_start_cb(config, driver_callback_delegate(&video_start_raiden2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp index 2f469c09906..81c452cdc85 100644 --- a/src/mame/drivers/rallyx.cpp +++ b/src/mame/drivers/rallyx.cpp @@ -795,7 +795,7 @@ static const char *const rallyx_sample_names[] = * *************************************/ -MACHINE_START_MEMBER(rallyx_state,rallyx) +void rallyx_state::machine_start_rallyx() { save_item(NAME(m_last_bang)); save_item(NAME(m_stars_enable)); @@ -833,7 +833,7 @@ MACHINE_CONFIG_START(rallyx_state::rallyx) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(rallyx_state,rallyx) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_rallyx, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -851,7 +851,7 @@ MACHINE_CONFIG_START(rallyx_state::rallyx) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_INIT_OWNER(rallyx_state,rallyx) - MCFG_VIDEO_START_OVERRIDE(rallyx_state,rallyx) + set_video_start_cb(config, driver_callback_delegate(&video_start_rallyx, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -885,7 +885,7 @@ MACHINE_CONFIG_START(rallyx_state::jungler) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(rallyx_state,rallyx) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_rallyx, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -903,7 +903,7 @@ MACHINE_CONFIG_START(rallyx_state::jungler) MCFG_PALETTE_INDIRECT_ENTRIES(32+64) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_INIT_OWNER(rallyx_state,jungler) - MCFG_VIDEO_START_OVERRIDE(rallyx_state,jungler) + set_video_start_cb(config, driver_callback_delegate(&video_start_jungler, this)); /* sound hardware */ MCFG_DEVICE_ADD("timeplt_audio", LOCOMOTN_AUDIO) @@ -916,7 +916,7 @@ MACHINE_CONFIG_START(rallyx_state::tactcian) /* basic machine hardware */ /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(rallyx_state,locomotn) + set_video_start_cb(config, driver_callback_delegate(&video_start_locomotn, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(rallyx_state, screen_update_locomotn) MACHINE_CONFIG_END @@ -931,7 +931,7 @@ MACHINE_CONFIG_START(rallyx_state::locomotn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(rallyx_state, screen_update_locomotn) - MCFG_VIDEO_START_OVERRIDE(rallyx_state,locomotn) + set_video_start_cb(config, driver_callback_delegate(&video_start_locomotn, this)); MACHINE_CONFIG_END @@ -944,7 +944,7 @@ MACHINE_CONFIG_START(rallyx_state::commsega) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(rallyx_state, screen_update_locomotn) - MCFG_VIDEO_START_OVERRIDE(rallyx_state,commsega) + set_video_start_cb(config, driver_callback_delegate(&video_start_commsega, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index 9d74a4f245d..214ca027312 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -99,7 +99,7 @@ public: DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(leds_w); void kbd_put(u8 data); - DECLARE_MACHINE_RESET(ravens2); + void machine_reset_ravens2(); DECLARE_READ_LINE_MEMBER(cass_r); DECLARE_WRITE_LINE_MEMBER(cass_w); DECLARE_QUICKLOAD_LOAD_MEMBER( ravens ); @@ -202,7 +202,7 @@ WRITE8_MEMBER( ravens_state::port1c_w ) m_term_char = data; } -MACHINE_RESET_MEMBER( ravens_state, ravens2 ) +void ravens_state::machine_reset_ravens2() { m_term_data = 0x80; m_digits[6] = 0; @@ -364,7 +364,7 @@ MACHINE_CONFIG_START(ravens_state::ravens2) MCFG_S2650_SENSE_INPUT(READLINE(*this, ravens_state, cass_r)) MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, ravens_state, cass_w)) - MCFG_MACHINE_RESET_OVERRIDE(ravens_state, ravens2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ravens2, this)); /* video hardware */ MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp index cdc848fb709..6c86b77a753 100644 --- a/src/mame/drivers/rbisland.cpp +++ b/src/mame/drivers/rbisland.cpp @@ -737,7 +737,7 @@ MACHINE_CONFIG_START(rbisland_state::jumping) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(rbisland_state,jumping) + set_video_start_cb(config, driver_callback_delegate(&video_start_jumping, this)); MCFG_DEVICE_ADD("pc080sn", PC080SN, 0) MCFG_PC080SN_GFX_REGION(1) diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp index b10f0ce2a71..d34e559d162 100644 --- a/src/mame/drivers/rc702.cpp +++ b/src/mame/drivers/rc702.cpp @@ -58,7 +58,7 @@ public: } void init_rc702(); - DECLARE_MACHINE_RESET(rc702); + void machine_reset_rc702(); DECLARE_READ8_MEMBER(memory_read_byte); DECLARE_WRITE8_MEMBER(memory_write_byte); DECLARE_WRITE8_MEMBER(port14_w); @@ -147,7 +147,7 @@ static INPUT_PORTS_START( rc702 ) PORT_DIPSETTING( 0x00, DEF_STR( On )) INPUT_PORTS_END -MACHINE_RESET_MEMBER( rc702_state, rc702 ) +void rc702_state::machine_reset_rc702() { membank("bankr0")->set_entry(0); // point at rom membank("bankw0")->set_entry(0); // always write to ram @@ -334,7 +334,7 @@ MACHINE_CONFIG_START(rc702_state::rc702) MCFG_DEVICE_IO_MAP(rc702_io) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) - MCFG_MACHINE_RESET_OVERRIDE(rc702_state, rc702) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_rc702, this)); MCFG_DEVICE_ADD("ctc_clock", CLOCK, 614000) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, rc702_state, clock_w)) diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp index 01f7fd0a265..f0e09108b03 100644 --- a/src/mame/drivers/rd100.cpp +++ b/src/mame/drivers/rd100.cpp @@ -33,7 +33,7 @@ public: { } void init_rd100(); - DECLARE_MACHINE_RESET(rd100); + void machine_reset_rd100(); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void rd100(machine_config &config); @@ -93,7 +93,7 @@ void rd100_state::init_rd100() { } -MACHINE_RESET_MEMBER( rd100_state, rd100 ) +void rd100_state::machine_reset_rd100() { } @@ -102,7 +102,7 @@ MACHINE_CONFIG_START(rd100_state::rd100) MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000)) // MC6809P??? MCFG_DEVICE_PROGRAM_MAP(mem_map) - MCFG_MACHINE_RESET_OVERRIDE(rd100_state, rd100) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_rd100, this)); MCFG_DEVICE_ADD("pia1", PIA6821, 0) diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp index ce294a2e278..c2c16c72eeb 100644 --- a/src/mame/drivers/rm380z.cpp +++ b/src/mame/drivers/rm380z.cpp @@ -279,7 +279,7 @@ MACHINE_CONFIG_START(rm380z_state::rm480z) MCFG_DEVICE_PROGRAM_MAP(rm480z_mem) MCFG_DEVICE_IO_MAP(rm480z_io) - MCFG_MACHINE_RESET_OVERRIDE(rm380z_state, rm480z) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_rm480z, this)); /* video hardware */ // MCFG_SCREEN_ADD("screen", RASTER) // MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp index 840e11ecc85..0cd0dd5cf52 100644 --- a/src/mame/drivers/rohga.cpp +++ b/src/mame/drivers/rohga.cpp @@ -1037,7 +1037,7 @@ MACHINE_CONFIG_START(rohga_state::wizdfire) MCFG_DECO146_SOUNDLATCH_IRQ_CB(INPUTLINE("audiocpu", 0)) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_REVERSE - MCFG_VIDEO_START_OVERRIDE(rohga_state, wizdfire) + set_video_start_cb(config, driver_callback_delegate(&video_start_wizdfire, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1125,7 +1125,7 @@ MACHINE_CONFIG_START(rohga_state::nitrobal) MCFG_DECO_SPRITE_GFX_REGION(4) MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") - MCFG_VIDEO_START_OVERRIDE(rohga_state, wizdfire) + set_video_start_cb(config, driver_callback_delegate(&video_start_wizdfire, this)); MCFG_DECO146_ADD("ioprot") MCFG_DECO146_IN_PORTA_CB(IOPORT("INPUTS")) diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp index 585681451d6..b2f3b2df5d5 100644 --- a/src/mame/drivers/route16.cpp +++ b/src/mame/drivers/route16.cpp @@ -596,12 +596,12 @@ static INPUT_PORTS_START( ttmahjng ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) INPUT_PORTS_END -MACHINE_START_MEMBER(route16_state, speakres) +void route16_state::machine_start_speakres() { save_item(NAME(m_speakres_vrx)); } -MACHINE_START_MEMBER(route16_state, ttmahjng) +void route16_state::machine_start_ttmahjng() { save_item(NAME(m_ttmahjng_port_select)); } @@ -696,7 +696,7 @@ MACHINE_CONFIG_START(route16_state::speakres) MCFG_DEVICE_MODIFY("cpu1") MCFG_DEVICE_PROGRAM_MAP(speakres_cpu1_map) - MCFG_MACHINE_START_OVERRIDE(route16_state, speakres) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_speakres, this)); MACHINE_CONFIG_END @@ -715,7 +715,7 @@ MACHINE_CONFIG_START(route16_state::ttmahjng) MCFG_DEVICE_PROGRAM_MAP(ttmahjng_cpu1_map) MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO) - MCFG_MACHINE_START_OVERRIDE(route16_state, ttmahjng) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ttmahjng, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp index 8d70ef8e0db..340dc7b265f 100644 --- a/src/mame/drivers/rpunch.cpp +++ b/src/mame/drivers/rpunch.cpp @@ -487,7 +487,7 @@ MACHINE_CONFIG_START(rpunch_state::rpunch) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, VIDEO_CLOCK/2) // verified from rpunch schematics MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, rpunch_state, rpunch_gga_data_w)) - MCFG_VIDEO_START_OVERRIDE(rpunch_state,rpunch) + set_video_start_cb(config, driver_callback_delegate(&video_start_rpunch, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -503,7 +503,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(rpunch_state::svolley) rpunch(config); - MCFG_VIDEO_START_OVERRIDE(rpunch_state,svolley) + set_video_start_cb(config, driver_callback_delegate(&video_start_svolley, this)); MACHINE_CONFIG_END @@ -538,7 +538,7 @@ MACHINE_CONFIG_START(rpunch_state::svolleybl) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, VIDEO_CLOCK/2) MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, rpunch_state, rpunch_gga_data_w)) - MCFG_VIDEO_START_OVERRIDE(rpunch_state,rpunch) + set_video_start_cb(config, driver_callback_delegate(&video_start_rpunch, this)); /* sound hardware */ diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp index 09a2551944f..a937c1de25e 100644 --- a/src/mame/drivers/runaway.cpp +++ b/src/mame/drivers/runaway.cpp @@ -377,7 +377,7 @@ MACHINE_CONFIG_START(runaway_state::qwak) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_qwak) - MCFG_VIDEO_START_OVERRIDE(runaway_state,qwak) + set_video_start_cb(config, driver_callback_delegate(&video_start_qwak, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(runaway_state, screen_update_qwak) diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index 6ae7b96f16b..e94f545c636 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -167,7 +167,7 @@ void s11_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo } } -MACHINE_RESET_MEMBER( s11_state, s11 ) +void s11_state::machine_reset_s11() { membank("bank0")->set_entry(0); membank("bank1")->set_entry(0); @@ -386,7 +386,7 @@ MACHINE_CONFIG_START(s11_state::s11) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(s11_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s11_state, s11) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s11, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s11) diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp index 04e917ad90b..8c34fad6954 100644 --- a/src/mame/drivers/s11a.cpp +++ b/src/mame/drivers/s11a.cpp @@ -143,9 +143,9 @@ static INPUT_PORTS_START( s11a ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( s11a_state, s11a ) +void s11a_state::machine_reset_s11a() { - MACHINE_RESET_CALL_MEMBER(s11); + machine_reset_s11(); membank("bgbank")->set_entry(0); } @@ -178,7 +178,7 @@ MACHINE_CONFIG_START(s11a_state::s11a) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(s11a_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s11a_state, s11a) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s11a, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s11a) diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp index bf5b0226458..479d60eec8a 100644 --- a/src/mame/drivers/s11b.cpp +++ b/src/mame/drivers/s11b.cpp @@ -145,7 +145,7 @@ static INPUT_PORTS_START( s11b ) PORT_CONFSETTING( 0x10, "English" ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( s11b_state, s11b ) +void s11b_state::machine_reset_s11b() { membank("bank0")->set_entry(0); membank("bank1")->set_entry(0); @@ -252,7 +252,7 @@ MACHINE_CONFIG_START(s11b_state::s11b) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(s11b_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s11b_state, s11b) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s11b, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s11b) diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp index 69b05ae1131..2029e0770a3 100644 --- a/src/mame/drivers/s11c.cpp +++ b/src/mame/drivers/s11c.cpp @@ -135,7 +135,7 @@ WRITE8_MEMBER( s11c_state::bgbank_w ) // popmessage("BG bank set to %02x (%i)",data,bank); } */ -MACHINE_RESET_MEMBER( s11c_state, s11c ) +void s11c_state::machine_reset_s11c() { // membank("bgbank")->set_entry(0); // reset the CPUs again, so that the CPUs are starting with the right vectors (otherwise sound may die on reset) @@ -157,7 +157,7 @@ MACHINE_CONFIG_START(s11c_state::s11c) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(s11c_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s11c_state, s11c) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s11c, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s11c) diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp index e39fddbab10..e8516e88510 100644 --- a/src/mame/drivers/s3.cpp +++ b/src/mame/drivers/s3.cpp @@ -88,8 +88,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - DECLARE_MACHINE_RESET(s3); - DECLARE_MACHINE_RESET(s3a); + void machine_reset_s3(); + void machine_reset_s3a(); void s3a(machine_config &config); void s3(machine_config &config); void s3_audio_map(address_map &map); @@ -273,13 +273,13 @@ static INPUT_PORTS_START( s3 ) PORT_DIPSETTING( 0x07, "31" ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( s3_state, s3 ) +void s3_state::machine_reset_s3() { m_t_c = 0; m_chimes = 1; } -MACHINE_RESET_MEMBER( s3_state, s3a ) +void s3_state::machine_reset_s3a() { m_t_c = 0; m_chimes = 0; @@ -438,7 +438,7 @@ MACHINE_CONFIG_START(s3_state::s3) MCFG_DEVICE_ADD("maincpu", M6800, 3580000) MCFG_DEVICE_PROGRAM_MAP(s3_main_map) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s3_state, irq, attotime::from_hz(250)) - MCFG_MACHINE_RESET_OVERRIDE(s3_state, s3) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s3, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s3) @@ -490,7 +490,7 @@ MACHINE_CONFIG_START(s3_state::s3a) /* Add the soundcard */ MCFG_DEVICE_ADD("audiocpu", M6802, 3580000) MCFG_DEVICE_PROGRAM_MAP(s3_audio_map) - MCFG_MACHINE_RESET_OVERRIDE(s3_state, s3a) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s3a, this)); SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp index e72e341b30e..927b096469d 100644 --- a/src/mame/drivers/s4.cpp +++ b/src/mame/drivers/s4.cpp @@ -82,8 +82,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - DECLARE_MACHINE_RESET(s4); - DECLARE_MACHINE_RESET(s4a); + void machine_reset_s4(); + void machine_reset_s4a(); void s4(machine_config &config); void s4a(machine_config &config); void s4_audio_map(address_map &map); @@ -267,13 +267,13 @@ static INPUT_PORTS_START( s4 ) PORT_DIPSETTING( 0x07, "31" ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( s4_state, s4 ) +void s4_state::machine_reset_s4() { m_t_c = 0; m_chimes = 1; } -MACHINE_RESET_MEMBER( s4_state, s4a ) +void s4_state::machine_reset_s4a() { m_t_c = 0; m_chimes = 0; @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(s4_state::s4) MCFG_DEVICE_ADD("maincpu", M6800, 3580000) MCFG_DEVICE_PROGRAM_MAP(s4_main_map) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s4_state, irq, attotime::from_hz(250)) - MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s4, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s4) @@ -484,7 +484,7 @@ MACHINE_CONFIG_START(s4_state::s4a) /* Add the soundcard */ MCFG_DEVICE_ADD("audiocpu", M6808, 3580000) MCFG_DEVICE_PROGRAM_MAP(s4_audio_map) - MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4a) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s4a, this)); SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index 3f4a59d8c2d..3b80a050468 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -96,7 +96,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_irq); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - DECLARE_MACHINE_RESET(s6); + void machine_reset_s6(); void init_s6(); void s6(machine_config &config); void s6_audio_map(address_map &map); @@ -394,7 +394,7 @@ void s6_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi } } -MACHINE_RESET_MEMBER( s6_state, s6 ) +void s6_state::machine_reset_s6() { } @@ -408,7 +408,7 @@ MACHINE_CONFIG_START(s6_state::s6) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6808, 3580000) // 6802 or 6808 could be used here MCFG_DEVICE_PROGRAM_MAP(s6_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s6_state, s6) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s6, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s6) diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp index 9ee583a01af..d6aacf58df4 100644 --- a/src/mame/drivers/s6a.cpp +++ b/src/mame/drivers/s6a.cpp @@ -89,7 +89,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_irq); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - DECLARE_MACHINE_RESET(s6a); + void machine_reset_s6a(); void init_s6a(); void s6a(machine_config &config); void s6a_audio_map(address_map &map); @@ -377,7 +377,7 @@ void s6a_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo } } -MACHINE_RESET_MEMBER( s6a_state, s6a ) +void s6a_state::machine_reset_s6a() { } @@ -391,7 +391,7 @@ MACHINE_CONFIG_START(s6a_state::s6a) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6808, 3580000) MCFG_DEVICE_PROGRAM_MAP(s6a_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s6a_state, s6a) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s6a, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s6a) diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index c9e13954582..2073376337c 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -115,7 +115,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_INPUT_CHANGED_MEMBER(diag_coin); - DECLARE_MACHINE_RESET(s7); + void machine_reset_s7(); void init_s7(); void s7(machine_config &config); void s7_audio_map(address_map &map); @@ -420,7 +420,7 @@ void s7_state::machine_start() machine().device<nvram_device>("nvram")->set_base(m_nvram, sizeof(m_nvram)); } -MACHINE_RESET_MEMBER( s7_state, s7 ) +void s7_state::machine_reset_s7() { } @@ -434,7 +434,7 @@ MACHINE_CONFIG_START(s7_state::s7) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6808, 3580000) MCFG_DEVICE_PROGRAM_MAP(s7_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s7_state, s7) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s7, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s7) diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp index 5f2eb552595..13f86854e4a 100644 --- a/src/mame/drivers/s8.cpp +++ b/src/mame/drivers/s8.cpp @@ -90,7 +90,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_irq); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - DECLARE_MACHINE_RESET(s8); + void machine_reset_s8(); void init_s8(); void s8(machine_config &config); void s8_audio_map(address_map &map); @@ -302,7 +302,7 @@ void s8_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi } } -MACHINE_RESET_MEMBER( s8_state, s8 ) +void s8_state::machine_reset_s8() { } @@ -316,7 +316,7 @@ MACHINE_CONFIG_START(s8_state::s8) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(s8_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s8_state, s8) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s8, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s8) diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp index d72096f0cea..8da7deeca82 100644 --- a/src/mame/drivers/s8a.cpp +++ b/src/mame/drivers/s8a.cpp @@ -66,7 +66,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_irq); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - DECLARE_MACHINE_RESET(s8a); + void machine_reset_s8a(); void init_s8a(); void s8a(machine_config &config); void s8a_audio_map(address_map &map); @@ -274,7 +274,7 @@ void s8a_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo } } -MACHINE_RESET_MEMBER( s8a_state, s8a ) +void s8a_state::machine_reset_s8a() { } @@ -288,7 +288,7 @@ MACHINE_CONFIG_START(s8a_state::s8a) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(s8a_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s8a_state, s8a) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s8a, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s8a) diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp index 21806f9c001..eef093d2756 100644 --- a/src/mame/drivers/s9.cpp +++ b/src/mame/drivers/s9.cpp @@ -77,7 +77,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_irq); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - DECLARE_MACHINE_RESET(s9); + void machine_reset_s9(); void init_s9(); void s9(machine_config &config); void s9_audio_map(address_map &map); @@ -308,7 +308,7 @@ void s9_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi } } -MACHINE_RESET_MEMBER( s9_state, s9 ) +void s9_state::machine_reset_s9() { } @@ -322,7 +322,7 @@ MACHINE_CONFIG_START(s9_state::s9) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(s9_main_map) - MCFG_MACHINE_RESET_OVERRIDE(s9_state, s9) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_s9, this)); /* Video */ MCFG_DEFAULT_LAYOUT(layout_s9) diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp index 8482572363f..c657e41c82c 100644 --- a/src/mame/drivers/sangho.cpp +++ b/src/mame/drivers/sangho.cpp @@ -94,8 +94,8 @@ public: DECLARE_WRITE8_MEMBER(sexyboom_bank_w); void init_pzlestar(); virtual void machine_start() override; - DECLARE_MACHINE_RESET(pzlestar); - DECLARE_MACHINE_RESET(sexyboom); + void machine_reset_pzlestar(); + void machine_reset_sexyboom(); void pzlestar_map_banks(); void sexyboom_map_bank(int bank); DECLARE_READ8_MEMBER(sec_slot_r); @@ -437,13 +437,13 @@ void sangho_state::machine_start() m_ram = std::make_unique<uint8_t[]>(0x20000); // TODO: define how much RAM these ones have (MSX2+ can potentially go up to 4MB) } -MACHINE_RESET_MEMBER(sangho_state,pzlestar) +void sangho_state::machine_reset_pzlestar() { m_pzlestar_mem_bank = 2; pzlestar_map_banks(); } -MACHINE_RESET_MEMBER(sangho_state,sexyboom) +void sangho_state::machine_reset_sexyboom() { m_sexyboom_bank[0] = 0x00; m_sexyboom_bank[1] = 0x00; @@ -470,7 +470,7 @@ MACHINE_CONFIG_START(sangho_state::pzlestar) MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272)) - MCFG_MACHINE_RESET_OVERRIDE(sangho_state,pzlestar) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pzlestar, this)); SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(21'477'272)/6) @@ -489,7 +489,7 @@ MACHINE_CONFIG_START(sangho_state::sexyboom) MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272)) - MCFG_MACHINE_RESET_OVERRIDE(sangho_state,sexyboom) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sexyboom, this)); MCFG_PALETTE_ADD("palette", 19780) diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index a6aca9f2020..b64aeecb2d8 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -77,8 +77,8 @@ public: void init_sapizps3(); void init_sapizps3a(); void init_sapizps3b(); - DECLARE_MACHINE_RESET(sapi1); - DECLARE_MACHINE_RESET(sapizps3); + void machine_reset_sapi1(); + void machine_reset_sapizps3(); MC6845_UPDATE_ROW(crtc_update_row); uint32_t screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -583,13 +583,13 @@ WRITE8_MEMBER( sapi1_state::sapi3_25_w ) m_zps3_25 = data & 0xfc; //?? } -MACHINE_RESET_MEMBER( sapi1_state, sapi1 ) +void sapi1_state::machine_reset_sapi1() { m_keyboard_mask = 0; m_refresh_counter = 0x20; } -MACHINE_RESET_MEMBER( sapi1_state, sapizps3 ) +void sapi1_state::machine_reset_sapizps3() { m_keyboard_mask = 0; m_bank1->set_entry(1); @@ -620,7 +620,7 @@ MACHINE_CONFIG_START(sapi1_state::sapi1) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228 MCFG_DEVICE_PROGRAM_MAP(sapi1_mem) - MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapi1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sapi1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -653,7 +653,7 @@ MACHINE_CONFIG_START(sapi1_state::sapi3) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(sapi3_mem) MCFG_DEVICE_IO_MAP(sapi3_io) - MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sapizps3, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(40*6, 20*9) MCFG_SCREEN_VISIBLE_AREA(0, 40*6-1, 0, 20*9-1) @@ -691,7 +691,7 @@ MACHINE_CONFIG_START(sapi1_state::sapi3a) MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228 MCFG_DEVICE_PROGRAM_MAP(sapi3a_mem) MCFG_DEVICE_IO_MAP(sapi3a_io) - MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sapizps3, this)); /* video hardware */ MCFG_DEVICE_ADD("uart", AY51013, 0) // Tesla MHB1012 diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index 07a3a76d090..8229cf4b9a0 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -463,8 +463,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(tray_open); DECLARE_INPUT_CHANGED_MEMBER(tray_close); - DECLARE_MACHINE_START(saturn); - DECLARE_MACHINE_RESET(saturn); + void machine_start_saturn() ATTR_COLD; + void machine_reset_saturn(); DECLARE_READ8_MEMBER(saturn_cart_type_r); DECLARE_READ32_MEMBER(abus_dummy_r); @@ -595,7 +595,7 @@ void sat_console_state::nvram_init(nvram_device &nvram, void *data, size_t size) } -MACHINE_START_MEMBER(sat_console_state, saturn) +void sat_console_state::machine_start_saturn() { machine().device<scsp_device>("scsp")->set_ram_base(m_sound_ram); @@ -672,7 +672,7 @@ WRITE32_MEMBER(sat_console_state::saturn_null_ram_w) { } -MACHINE_RESET_MEMBER(sat_console_state,saturn) +void sat_console_state::machine_reset_saturn() { m_scsp_last_line = 0; @@ -821,8 +821,8 @@ MACHINE_CONFIG_START(sat_console_state::saturn) MCFG_SMPC_HLE_DOT_SELECT_CB(WRITELINE(*this, saturn_state, dot_select_w)) MCFG_SMPC_HLE_IRQ_HANDLER_CB(WRITELINE("scu", sega_scu_device, smpc_irq_w)) - MCFG_MACHINE_START_OVERRIDE(sat_console_state,saturn) - MCFG_MACHINE_RESET_OVERRIDE(sat_console_state,saturn) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_saturn, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_saturn, this)); MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", sat_console_state, nvram_init) @@ -834,7 +834,7 @@ MACHINE_CONFIG_START(sat_console_state::saturn) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stv) - MCFG_VIDEO_START_OVERRIDE(sat_console_state,stv_vdp2) + set_video_start_cb(config, driver_callback_delegate(&video_start_stv_vdp2, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index f239cd1f5f5..2343637c0e0 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -491,7 +491,7 @@ MACHINE_CONFIG_START(sauro_state::trckydoc) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_trckydoc) - MCFG_VIDEO_START_OVERRIDE(sauro_state,trckydoc) + set_video_start_cb(config, driver_callback_delegate(&video_start_trckydoc, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(sauro_state, screen_update_trckydoc) @@ -518,7 +518,7 @@ MACHINE_CONFIG_START(sauro_state::sauro) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sauro) - MCFG_VIDEO_START_OVERRIDE(sauro_state,sauro) + set_video_start_cb(config, driver_callback_delegate(&video_start_sauro, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(sauro_state, screen_update_sauro) diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index 85b9429f41e..e651c6058fb 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -76,7 +76,7 @@ public: {} void init_sbrain(); - DECLARE_MACHINE_RESET(sbrain); + void machine_reset_sbrain(); DECLARE_READ8_MEMBER(ppi_pa_r); DECLARE_WRITE8_MEMBER(ppi_pa_w); DECLARE_READ8_MEMBER(ppi_pb_r); @@ -475,7 +475,7 @@ static void sbrain_floppies(device_slot_interface &device) device.option_add("525dd", FLOPPY_525_DD); } -MACHINE_RESET_MEMBER( sbrain_state, sbrain ) +void sbrain_state::machine_reset_sbrain() { m_keydown = 0; m_bankr0->set_entry(1); // point at rom @@ -548,7 +548,7 @@ MACHINE_CONFIG_START(sbrain_state::sbrain) MCFG_DEVICE_PROGRAM_MAP(sbrain_submem) MCFG_DEVICE_IO_MAP(sbrain_subio) - MCFG_MACHINE_RESET_OVERRIDE(sbrain_state, sbrain) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sbrain, this)); /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber()) diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp index 2284f8b413c..50b06689958 100644 --- a/src/mame/drivers/scobra.cpp +++ b/src/mame/drivers/scobra.cpp @@ -876,7 +876,7 @@ MACHINE_CONFIG_START(scobra_state::type1) MCFG_DEVICE_ADD("konami_7474", TTL7474, 0) MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,scramble_sh_7474_q_callback)) - MCFG_MACHINE_RESET_OVERRIDE(scobra_state,scramble) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_scramble, this)); MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -910,7 +910,7 @@ MACHINE_CONFIG_START(scobra_state::type1) MCFG_PALETTE_ADD("palette", 32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 1 for background */ MCFG_PALETTE_INIT_OWNER(scobra_state,scrambold) - MCFG_VIDEO_START_OVERRIDE(scobra_state,scrambold) + set_video_start_cb(config, driver_callback_delegate(&video_start_scrambold, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -941,7 +941,7 @@ MACHINE_CONFIG_START(scobra_state::rescue) MCFG_PALETTE_ENTRIES(32+64+2+128) /* 32 for characters, 64 for stars, 2 for bullets, 128 for background */ MCFG_PALETTE_INIT_OWNER(scobra_state,rescue) - MCFG_VIDEO_START_OVERRIDE(scobra_state,rescue) + set_video_start_cb(config, driver_callback_delegate(&video_start_rescue, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(scobra_state::rescuefe) @@ -969,7 +969,7 @@ MACHINE_CONFIG_START(scobra_state::minefld) MCFG_PALETTE_ENTRIES(32+64+2+256) /* 32 for characters, 64 for stars, 2 for bullets, 256 for background */ MCFG_PALETTE_INIT_OWNER(scobra_state,minefld) - MCFG_VIDEO_START_OVERRIDE(scobra_state,minefld) + set_video_start_cb(config, driver_callback_delegate(&video_start_minefld, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(scobra_state::minefldfe) @@ -987,7 +987,7 @@ MACHINE_CONFIG_START(scobra_state::mimonkey) MCFG_DEVICE_PROGRAM_MAP(mimonkey_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(scobra_state,mimonkey) + set_video_start_cb(config, driver_callback_delegate(&video_start_mimonkey, this)); MACHINE_CONFIG_END @@ -1024,7 +1024,7 @@ MACHINE_CONFIG_START(scobra_state::stratgyx) MCFG_PALETTE_ENTRIES( 32+64+2+8) /* 32 for characters, 64 for stars, 2 for bullets, 8 for background */ MCFG_PALETTE_INIT_OWNER(scobra_state,stratgyx) - MCFG_VIDEO_START_OVERRIDE(scobra_state,stratgyx) + set_video_start_cb(config, driver_callback_delegate(&video_start_stratgyx, this)); MACHINE_CONFIG_END @@ -1038,7 +1038,7 @@ MACHINE_CONFIG_START(scobra_state::darkplnt) MCFG_PALETTE_ENTRIES(32+64+2) /* 32 for characters, 64 (buffer) for stars, 2 for bullets */ MCFG_PALETTE_INIT_OWNER(scobra_state,darkplnt) - MCFG_VIDEO_START_OVERRIDE(scobra_state,darkplnt) + set_video_start_cb(config, driver_callback_delegate(&video_start_darkplnt, this)); MACHINE_CONFIG_END @@ -1056,7 +1056,7 @@ MACHINE_CONFIG_START(scobra_state::hustler) MCFG_DEVICE_ADD("konami_7474", TTL7474, 0) MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,scramble_sh_7474_q_callback)) - MCFG_MACHINE_RESET_OVERRIDE(scobra_state,scramble) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_scramble, this)); MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0) MCFG_7474_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_1_callback)) @@ -1090,7 +1090,7 @@ MACHINE_CONFIG_START(scobra_state::hustler) MCFG_PALETTE_ADD("palette", 32+64+2) /* 32 for characters, 64 for stars, 2 for bullets */ MCFG_PALETTE_INIT_OWNER(scobra_state,galaxold) - MCFG_VIDEO_START_OVERRIDE(scobra_state,scrambold) + set_video_start_cb(config, driver_callback_delegate(&video_start_scrambold, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp index be9647505ab..275b286e401 100644 --- a/src/mame/drivers/scorpion.cpp +++ b/src/mame/drivers/scorpion.cpp @@ -30,8 +30,8 @@ public: DECLARE_WRITE8_MEMBER(scorpion_0000_w); DECLARE_WRITE8_MEMBER(scorpion_port_7ffd_w); DECLARE_WRITE8_MEMBER(scorpion_port_1ffd_w); - DECLARE_MACHINE_START(scorpion); - DECLARE_MACHINE_RESET(scorpion); + void machine_start_scorpion() ATTR_COLD; + void machine_reset_scorpion(); TIMER_DEVICE_CALLBACK_MEMBER(nmi_check_callback); void scorpion(machine_config &config); void profi(machine_config &config); @@ -206,7 +206,7 @@ void scorpion_state::scorpion_switch(address_map &map) map(0x4000, 0xffff).r(this, FUNC(scorpion_state::beta_disable_r)); } -MACHINE_RESET_MEMBER(scorpion_state,scorpion) +void scorpion_state::machine_reset_scorpion() { uint8_t *messram = m_ram->pointer(); m_program = &m_maincpu->space(AS_PROGRAM); @@ -230,7 +230,8 @@ MACHINE_RESET_MEMBER(scorpion_state,scorpion) m_port_1ffd_data = 0; scorpion_update_memory(); } -MACHINE_START_MEMBER(scorpion_state,scorpion) + +void scorpion_state::machine_start_scorpion() { } @@ -296,8 +297,8 @@ MACHINE_CONFIG_START(scorpion_state::scorpion) MCFG_DEVICE_IO_MAP(scorpion_io) MCFG_DEVICE_OPCODES_MAP(scorpion_switch) - MCFG_MACHINE_START_OVERRIDE(scorpion_state, scorpion ) - MCFG_MACHINE_RESET_OVERRIDE(scorpion_state, scorpion ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_scorpion, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_scorpion, this)); MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_scorpion) MCFG_BETA_DISK_ADD(BETA_DISK_TAG) diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp index 62433f71fd8..aaf59ad3809 100644 --- a/src/mame/drivers/scramble.cpp +++ b/src/mame/drivers/scramble.cpp @@ -1326,7 +1326,7 @@ MACHINE_CONFIG_START(scramble_state::scramble) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_RESET_OVERRIDE(scramble_state,scramble) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_scramble, this)); MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -1350,7 +1350,7 @@ MACHINE_CONFIG_START(scramble_state::scramble) MCFG_PALETTE_ADD("palette", 32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,scrambold) - MCFG_VIDEO_START_OVERRIDE(scramble_state,scrambold) + set_video_start_cb(config, driver_callback_delegate(&video_start_scrambold, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1412,7 +1412,7 @@ MACHINE_CONFIG_START(scramble_state::newsin7) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) - MCFG_VIDEO_START_OVERRIDE(scramble_state,newsin7) + set_video_start_cb(config, driver_callback_delegate(&video_start_newsin7, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(scramble_state::mrkougb) @@ -1451,7 +1451,7 @@ MACHINE_CONFIG_START(scramble_state::ckongs) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) - MCFG_VIDEO_START_OVERRIDE(scramble_state,ckongs) + set_video_start_cb(config, driver_callback_delegate(&video_start_ckongs, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(scramble_state::hotshock) @@ -1467,13 +1467,13 @@ MACHINE_CONFIG_START(scramble_state::hotshock) MCFG_DEVICE_MODIFY("audiocpu") MCFG_DEVICE_IO_MAP(hotshock_sound_io_map) - MCFG_MACHINE_RESET_OVERRIDE(scramble_state,galaxold) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaxold, this)); /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) - MCFG_VIDEO_START_OVERRIDE(scramble_state,pisces) + set_video_start_cb(config, driver_callback_delegate(&video_start_pisces, this)); MCFG_DEVICE_MODIFY("8910.1") MCFG_SOUND_ROUTES_RESET() @@ -1495,7 +1495,7 @@ MACHINE_CONFIG_START(scramble_state::cavelon) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) - MCFG_VIDEO_START_OVERRIDE(scramble_state,ckongs) + set_video_start_cb(config, driver_callback_delegate(&video_start_ckongs, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(scramble_state::mimonscr) @@ -1506,7 +1506,7 @@ MACHINE_CONFIG_START(scramble_state::mimonscr) MCFG_DEVICE_PROGRAM_MAP(mimonscr_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(scramble_state,mimonkey) + set_video_start_cb(config, driver_callback_delegate(&video_start_mimonkey, this)); MACHINE_CONFIG_END /* Triple Punch and Mariner are different - only one CPU, one 8910 */ @@ -1548,7 +1548,7 @@ MACHINE_CONFIG_START(scramble_state::mariner) MCFG_PALETTE_ENTRIES(32+64+2+16) /* 32 for characters, 64 for stars, 2 for bullets, 16 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,mariner) - MCFG_VIDEO_START_OVERRIDE(scramble_state,mariner) + set_video_start_cb(config, driver_callback_delegate(&video_start_mariner, this)); MACHINE_CONFIG_END /* Hunchback replaces the Z80 with a S2650 CPU */ @@ -1579,7 +1579,7 @@ MACHINE_CONFIG_START(scramble_state::hncholms) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(18432000/6/2/2) - MCFG_VIDEO_START_OVERRIDE(scramble_state,scorpion) + set_video_start_cb(config, driver_callback_delegate(&video_start_scorpion, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(scramble_state::ad2083) @@ -1600,7 +1600,7 @@ MACHINE_CONFIG_START(scramble_state::ad2083) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_RESET_OVERRIDE(scramble_state,galaxold) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaxold, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1615,7 +1615,7 @@ MACHINE_CONFIG_START(scramble_state::ad2083) MCFG_PALETTE_ADD("palette", 32+64+2+8) /* 32 for characters, 64 for stars, 2 for bullets, 8 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,turtles) - MCFG_VIDEO_START_OVERRIDE(scramble_state,ad2083) + set_video_start_cb(config, driver_callback_delegate(&video_start_ad2083, this)); /* sound hardware */ @@ -1636,7 +1636,7 @@ MACHINE_CONFIG_START(scramble_state::harem) MCFG_DEVICE_PROGRAM_MAP(harem_sound_map) MCFG_DEVICE_IO_MAP(harem_sound_io_map) - MCFG_VIDEO_START_OVERRIDE(scramble_state,harem) + set_video_start_cb(config, driver_callback_delegate(&video_start_harem, this)); /* extra AY8910 with I/O ports */ MCFG_DEVICE_ADD("8910.3", AY8910, 14318000/8) diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp index 4b0294cf114..bcce5959229 100644 --- a/src/mame/drivers/scregg.cpp +++ b/src/mame/drivers/scregg.cpp @@ -70,8 +70,8 @@ public: DECLARE_READ8_MEMBER(scregg_irqack_r); void init_rockduck(); - DECLARE_MACHINE_START(scregg); - DECLARE_MACHINE_RESET(scregg); + void machine_start_scregg() ATTR_COLD; + void machine_reset_scregg(); TIMER_DEVICE_CALLBACK_MEMBER(scregg_interrupt); void scregg(machine_config &config); void dommy(machine_config &config); @@ -245,7 +245,7 @@ GFXDECODE_END -MACHINE_START_MEMBER(scregg_state,scregg) +void scregg_state::machine_start_scregg() { save_item(NAME(m_btime_palette)); save_item(NAME(m_bnj_scroll1)); @@ -253,7 +253,7 @@ MACHINE_START_MEMBER(scregg_state,scregg) save_item(NAME(m_btime_tilemap)); } -MACHINE_RESET_MEMBER(scregg_state,scregg) +void scregg_state::machine_reset_scregg() { m_btime_palette = 0; m_bnj_scroll1 = 0; @@ -271,8 +271,8 @@ MACHINE_CONFIG_START(scregg_state::dommy) MCFG_DEVICE_PROGRAM_MAP(dommy_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("irq", scregg_state, scregg_interrupt, "screen", 0, 8) - MCFG_MACHINE_START_OVERRIDE(scregg_state,scregg) - MCFG_MACHINE_RESET_OVERRIDE(scregg_state,scregg) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_scregg, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_scregg, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -303,8 +303,8 @@ MACHINE_CONFIG_START(scregg_state::scregg) MCFG_DEVICE_PROGRAM_MAP(eggs_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("irq", scregg_state, scregg_interrupt, "screen", 0, 8) - MCFG_MACHINE_START_OVERRIDE(scregg_state,scregg) - MCFG_MACHINE_RESET_OVERRIDE(scregg_state,scregg) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_scregg, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_scregg, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp index b73330d40f1..e8cf52288f3 100644 --- a/src/mame/drivers/segac2.cpp +++ b/src/mame/drivers/segac2.cpp @@ -159,9 +159,9 @@ public: void init_pclubjv4(); void init_pclubjv5(); void segac2_common_init(segac2_prot_delegate prot_func); - DECLARE_VIDEO_START(segac2_new); - DECLARE_MACHINE_START(segac2); - DECLARE_MACHINE_RESET(segac2); + void video_start_segac2_new() ATTR_COLD; + void machine_start_segac2() ATTR_COLD; + void machine_reset_segac2(); uint32_t screen_update_segac2_new(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); int m_segac2_bg_pal_lookup[4]; @@ -236,7 +236,7 @@ public: ******************************************************************************/ -MACHINE_START_MEMBER(segac2_state,segac2) +void segac2_state::machine_start_segac2() { save_item(NAME(m_prot_write_buf)); save_item(NAME(m_prot_read_buf)); @@ -245,7 +245,7 @@ MACHINE_START_MEMBER(segac2_state,segac2) } -MACHINE_RESET_MEMBER(segac2_state,segac2) +void segac2_state::machine_reset_segac2() { // megadriv_scanline_timer = machine().device<timer_device>("md_scan_timer"); // megadriv_scanline_timer->adjust(attotime::zero); @@ -1446,9 +1446,9 @@ WRITE_LINE_MEMBER(segac2_state::segac2_irq2_interrupt) ******************************************************************************/ -VIDEO_START_MEMBER(segac2_state,segac2_new) +void segac2_state::video_start_segac2_new() { - VIDEO_START_CALL_MEMBER(megadriv); + video_start_megadriv(); } // C2 doesn't use the internal VDP CRAM, instead it uses the digital output of the chip @@ -1544,8 +1544,8 @@ MACHINE_CONFIG_START(segac2_state::segac) MCFG_DEVICE_PROGRAM_MAP(main_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) - MCFG_MACHINE_START_OVERRIDE(segac2_state,segac2) - MCFG_MACHINE_RESET_OVERRIDE(segac2_state,segac2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_segac2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_segac2, this)); MCFG_NVRAM_ADD_1FILL("nvram") // borencha requires 0xff fill or there is no sound (it lacks some of the init code of the borench set) MCFG_DEVICE_ADD("io", SEGA_315_5296, XL2_CLOCK/6) // clock divider guessed @@ -1578,7 +1578,7 @@ MACHINE_CONFIG_START(segac2_state::segac) MCFG_PALETTE_ADD("palette", 2048*3) - MCFG_VIDEO_START_OVERRIDE(segac2_state,segac2_new) + set_video_start_cb(config, driver_callback_delegate(&video_start_segac2_new, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp index 19fb33b7235..8d8612b0a23 100644 --- a/src/mame/drivers/segapico.cpp +++ b/src/mame/drivers/segapico.cpp @@ -167,7 +167,7 @@ public: m_picocart(*this, "picoslot") { } required_device<pico_cart_slot_device> m_picocart; - DECLARE_MACHINE_START(pico); + void machine_start_pico() ATTR_COLD; void pico(machine_config &config); void picopal(machine_config &config); }; @@ -378,7 +378,7 @@ static void pico_cart(device_slot_interface &device) device.option_add_internal("rom_sramsafe", MD_ROM_SRAM); // not sure these are needed... } -MACHINE_START_MEMBER(pico_state,pico) +void pico_state::machine_start_pico() { m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7fffff, read16_delegate(FUNC(base_md_cart_slot_device::read),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write),(base_md_cart_slot_device*)m_picocart)); m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a13),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a13),(base_md_cart_slot_device*)m_picocart)); @@ -397,8 +397,8 @@ MACHINE_CONFIG_START(pico_state::pico) MCFG_DEVICE_REMOVE("genesis_snd_z80") MCFG_DEVICE_REMOVE("ymsnd") - MCFG_MACHINE_START_OVERRIDE( pico_state, pico ) - MCFG_MACHINE_RESET_OVERRIDE( pico_base_state, ms_megadriv ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pico, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_PICO_CARTRIDGE_ADD("picoslot", pico_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","pico") @@ -418,8 +418,8 @@ MACHINE_CONFIG_START(pico_state::picopal) MCFG_DEVICE_REMOVE("genesis_snd_z80") MCFG_DEVICE_REMOVE("ymsnd") - MCFG_MACHINE_START_OVERRIDE( pico_state, pico ) - MCFG_MACHINE_RESET_OVERRIDE( pico_base_state, ms_megadriv ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pico, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_PICO_CARTRIDGE_ADD("picoslot", pico_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","pico") @@ -563,7 +563,7 @@ public: m_picocart(*this, "coperaslot") { } required_device<copera_cart_slot_device> m_picocart; - DECLARE_MACHINE_START(copera); + void machine_start_copera() ATTR_COLD; void copera(machine_config &config); void copera_mem(address_map &map); }; @@ -590,7 +590,7 @@ static void copera_cart(device_slot_interface &device) device.option_add_internal("rom_sramsafe", MD_ROM_SRAM); // not sure these are needed... } -MACHINE_START_MEMBER(copera_state,copera) +void copera_state::machine_start_copera() { m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7fffff, read16_delegate(FUNC(base_md_cart_slot_device::read),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write),(base_md_cart_slot_device*)m_picocart)); m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a13),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a13),(base_md_cart_slot_device*)m_picocart)); @@ -613,8 +613,8 @@ MACHINE_CONFIG_START(copera_state::copera) MCFG_DEVICE_REMOVE("genesis_snd_z80") MCFG_DEVICE_REMOVE("ymsnd") - MCFG_MACHINE_START_OVERRIDE( copera_state, copera ) - MCFG_MACHINE_RESET_OVERRIDE( pico_base_state, ms_megadriv ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_copera, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ms_megadriv, this)); MCFG_COPERA_CARTRIDGE_ADD("coperaslot", copera_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","copera") diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index aa04e9014b4..2c262e1c282 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -1851,7 +1851,7 @@ void seibuspi_state::machine_start() if (m_z80_rom != nullptr) save_pointer(NAME(m_z80_rom->base()), m_z80_rom->bytes()); } -MACHINE_RESET_MEMBER(seibuspi_state,spi) +void seibuspi_state::machine_reset_spi() { m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -1873,7 +1873,7 @@ MACHINE_CONFIG_START(seibuspi_state::spi) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) - MCFG_MACHINE_RESET_OVERRIDE(seibuspi_state, spi) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_spi, this)); MCFG_DS2404_ADD("ds2404", 1995, 1, 1) @@ -1916,7 +1916,7 @@ MACHINE_CONFIG_START(seibuspi_state::ejanhs) spi(config); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(seibuspi_state, ejanhs) + set_video_start_cb(config, driver_callback_delegate(&video_start_ejanhs, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(seibuspi_state::rdft2) @@ -1928,7 +1928,7 @@ MACHINE_CONFIG_END /* single boards */ -MACHINE_RESET_MEMBER(seibuspi_state,sxx2e) +void seibuspi_state::machine_reset_sxx2e() { m_z80_bank->set_entry(0); m_z80_lastbank = 0; @@ -1945,7 +1945,7 @@ MACHINE_CONFIG_START(seibuspi_state::sxx2e) MCFG_DEVICE_MODIFY("audiocpu") MCFG_DEVICE_PROGRAM_MAP(sxx2e_soundmap) - MCFG_MACHINE_RESET_OVERRIDE(seibuspi_state, sxx2e) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sxx2e, this)); MCFG_DEVICE_REMOVE("soundflash1") MCFG_DEVICE_REMOVE("soundflash2") @@ -2077,7 +2077,7 @@ MACHINE_CONFIG_START(seibuspi_state::sys386f) MCFG_PALETTE_ADD_INIT_BLACK("palette", 8192) - MCFG_VIDEO_START_OVERRIDE(seibuspi_state, sys386f) + set_video_start_cb(config, driver_callback_delegate(&video_start_sys386f, this)); /* sound hardware */ // Single PCBs only output mono sound diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp index f2000226e59..bc947773a11 100644 --- a/src/mame/drivers/seicupbl.cpp +++ b/src/mame/drivers/seicupbl.cpp @@ -292,16 +292,16 @@ uint32_t seicupbl_state::screen_update( screen_device &screen, bitmap_ind16 &bit m_sc_layer[i]->set_scrolly(0, m_vregs[i*2+1]); } - if (!(m_layer_disable&0x0001)) + if (!(m_layer_disable&0x0001)) m_sc_layer[0]->draw(screen, bitmap, cliprect, 0, 1); - - if (!(m_layer_disable&0x0002)) + + if (!(m_layer_disable&0x0002)) m_sc_layer[1]->draw(screen, bitmap, cliprect, 0, 2); - - if (!(m_layer_disable&0x0004)) + + if (!(m_layer_disable&0x0004)) m_sc_layer[2]->draw(screen, bitmap, cliprect, 0, 4); - - if (!(m_layer_disable&0x0008)) + + if (!(m_layer_disable&0x0008)) m_sc_layer[3]->draw(screen, bitmap, cliprect, 0, 8); if (!(m_layer_disable&0x0010)) @@ -588,7 +588,7 @@ MACHINE_CONFIG_START(seicupbl_state::cupsocbl) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) -// MCFG_VIDEO_START_OVERRIDE(seicupbl_state,cupsoc) +// set_video_start_cb(config, driver_callback_delegate(&video_start_cupsoc, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp index 3415f1bf4ad..24cbd1ed00f 100644 --- a/src/mame/drivers/selz80.cpp +++ b/src/mame/drivers/selz80.cpp @@ -53,8 +53,8 @@ public: DECLARE_WRITE8_MEMBER(scanlines_w); DECLARE_WRITE8_MEMBER(digit_w); DECLARE_READ8_MEMBER(kbd_r); - DECLARE_MACHINE_RESET(dagz80); - DECLARE_MACHINE_RESET(selz80); + void machine_reset_dagz80(); + void machine_reset_selz80(); void selz80(machine_config &config); void dagz80(machine_config &config); @@ -175,12 +175,12 @@ void selz80_state::setup_baud() } } -MACHINE_RESET_MEMBER(selz80_state, selz80) +void selz80_state::machine_reset_selz80() { setup_baud(); } -MACHINE_RESET_MEMBER(selz80_state, dagz80) +void selz80_state::machine_reset_dagz80() { setup_baud(); uint8_t* rom = memregion("user1")->base(); @@ -220,7 +220,7 @@ MACHINE_CONFIG_START(selz80_state::selz80) MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000)) // it's actually a 5MHz XTAL with a NEC uPD780C-1 cpu MCFG_DEVICE_PROGRAM_MAP(selz80_mem) MCFG_DEVICE_IO_MAP(selz80_io) - MCFG_MACHINE_RESET_OVERRIDE(selz80_state, selz80 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_selz80, this)); /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_selz80) @@ -252,7 +252,7 @@ MACHINE_CONFIG_START(selz80_state::dagz80) selz80(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(dagz80_mem) - MCFG_MACHINE_RESET_OVERRIDE(selz80_state, dagz80 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dagz80, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 06a360aa8cb..89aac47cb11 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -2213,7 +2213,7 @@ void seta_state::keroppi_map(address_map &map) map(0xe00600, 0xe00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); } -MACHINE_START_MEMBER(seta_state,keroppi) +void seta_state::machine_start_keroppi() { m_keroppi_prize_hop = 0; m_keroppi_protection_count = 0; @@ -2372,7 +2372,7 @@ void seta_state::drgnunit_map(address_map &map) ***************************************************************************/ // Coin drop -MACHINE_RESET_MEMBER(setaroul_state, setaroul) +void setaroul_state::machine_reset_setaroul() { m_coin_start_cycles = 0; } @@ -3476,7 +3476,7 @@ void seta_state::downtown_sub_map(address_map &map) Caliber 50 / U.S. Classic ***************************************************************************/ -MACHINE_RESET_MEMBER(seta_state,calibr50) +void seta_state::machine_reset_calibr50() { address_space &space = m_maincpu->space(AS_PROGRAM); calibr50_sub_bankswitch_w(space, 0, 0); @@ -7839,7 +7839,7 @@ MACHINE_CONFIG_START(seta_state::tndrcade) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -7894,7 +7894,7 @@ MACHINE_CONFIG_START(seta_state::twineagl) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) - MCFG_VIDEO_START_OVERRIDE(seta_state,twineagl_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_twineagl_1_layer, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7940,7 +7940,7 @@ MACHINE_CONFIG_START(seta_state::downtown) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_1_layer, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7975,7 +7975,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::calibr50_interrupt) } -MACHINE_START_MEMBER(seta_state, usclssic) +void seta_state::machine_start_usclssic() { m_buttonmux->ab_w(0xff); } @@ -8002,8 +8002,8 @@ MACHINE_CONFIG_START(seta_state::usclssic) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("upd4701", upd4701_device, right_w)) MCFG_DEVCB_BIT(1) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("upd4701", upd4701_device, left_w)) MCFG_DEVCB_BIT(2) - MCFG_MACHINE_START_OVERRIDE(seta_state,usclssic) - MCFG_MACHINE_RESET_OVERRIDE(seta_state,calibr50) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_usclssic, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_calibr50, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -8024,7 +8024,7 @@ MACHINE_CONFIG_START(seta_state::usclssic) MCFG_PALETTE_INDIRECT_ENTRIES(0x400) MCFG_PALETTE_INIT_OWNER(seta_state,usclssic) /* layer is 6 planes deep */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_1_layer, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8064,7 +8064,7 @@ MACHINE_CONFIG_START(seta_state::calibr50) MCFG_UPD4701_PORTX("ROT1") MCFG_UPD4701_PORTY("ROT2") - MCFG_MACHINE_RESET_OVERRIDE(seta_state,calibr50) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_calibr50, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -8082,7 +8082,7 @@ MACHINE_CONFIG_START(seta_state::calibr50) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_1_layer, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8132,7 +8132,7 @@ MACHINE_CONFIG_START(seta_state::metafox) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_1_layer, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8172,7 +8172,7 @@ MACHINE_CONFIG_START(seta_state::atehate) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8220,7 +8220,7 @@ MACHINE_CONFIG_START(seta_state::blandia) MCFG_PALETTE_INDIRECT_ENTRIES(0x600*2) MCFG_PALETTE_INIT_OWNER(seta_state,blandia) /* layers 1&2 are 6 planes deep */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8257,7 +8257,7 @@ MACHINE_CONFIG_START(seta_state::blandiap) MCFG_PALETTE_INDIRECT_ENTRIES(0x600*2) MCFG_PALETTE_INIT_OWNER(seta_state,blandia) /* layers 1&2 are 6 planes deep */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8294,7 +8294,7 @@ MACHINE_CONFIG_START(seta_state::blockcar) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8368,7 +8368,7 @@ MACHINE_CONFIG_START(seta_state::daioh) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8405,7 +8405,7 @@ MACHINE_CONFIG_START(seta_state::daiohp) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_daiohp) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8448,7 +8448,7 @@ MACHINE_CONFIG_START(seta_state::drgnunit) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_1_layer, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8484,7 +8484,7 @@ MACHINE_CONFIG_START(seta_state::qzkklgy2) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_qzkklgy2) MCFG_PALETTE_ADD("palette", 512) - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_1_layer, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -8520,7 +8520,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", setaroul_state, interrupt, "screen", 0, 1) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_RESET_OVERRIDE(setaroul_state, setaroul) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_setaroul, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -8548,7 +8548,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(setaroul_state,setaroul) - MCFG_VIDEO_START_OVERRIDE(setaroul_state,setaroul_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_setaroul_1_layer, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -8590,7 +8590,7 @@ MACHINE_CONFIG_START(seta_state::eightfrc) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8636,7 +8636,7 @@ MACHINE_CONFIG_START(seta_state::extdwnhl) MCFG_PALETTE_INDIRECT_ENTRIES(0x600) MCFG_PALETTE_INIT_OWNER(seta_state,zingzip) /* layer 1 gfx is 6 planes deep */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -8657,7 +8657,10 @@ INTERRUPT_GEN_MEMBER(seta_state::wrofaero_interrupt) device.execute().set_input_line(2, HOLD_LINE ); } -MACHINE_START_MEMBER(seta_state,wrofaero){ uPD71054_timer_init(); } +void seta_state::machine_start_wrofaero() +{ + uPD71054_timer_init(); +} #endif // __uPD71054_TIMER @@ -8682,7 +8685,7 @@ MACHINE_CONFIG_START(seta_state::gundhara) MCFG_WATCHDOG_ADD("watchdog") #if __uPD71054_TIMER - MCFG_MACHINE_START_OVERRIDE(seta_state, wrofaero ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_wrofaero, this)); #endif // __uPD71054_TIMER MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) @@ -8704,7 +8707,7 @@ MACHINE_CONFIG_START(seta_state::gundhara) MCFG_PALETTE_INDIRECT_ENTRIES(0x600) MCFG_PALETTE_INIT_OWNER(seta_state,gundhara) /* layers are 6 planes deep (seta_state,but have only 4 palettes) */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8765,7 +8768,7 @@ MACHINE_CONFIG_START(seta_state::jjsquawk) MCFG_PALETTE_INDIRECT_ENTRIES(0x600) MCFG_PALETTE_INIT_OWNER(seta_state,jjsquawk) /* layers are 6 planes deep */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8800,7 +8803,7 @@ MACHINE_CONFIG_START(seta_state::jjsquawb) MCFG_PALETTE_INDIRECT_ENTRIES(0x600) MCFG_PALETTE_INIT_OWNER(seta_state,jjsquawk) /* layers are 6 planes deep */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8842,7 +8845,7 @@ MACHINE_CONFIG_START(seta_state::kamenrid) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8880,7 +8883,7 @@ MACHINE_CONFIG_START(seta_state::orbs) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_orbs) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -8905,7 +8908,7 @@ MACHINE_CONFIG_START(seta_state::keroppij) MCFG_DEVICE_PROGRAM_MAP(keroppi_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1) - MCFG_MACHINE_START_OVERRIDE(seta_state,keroppi) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_keroppi, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -8923,7 +8926,7 @@ MACHINE_CONFIG_START(seta_state::keroppij) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_orbs) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -8974,7 +8977,7 @@ MACHINE_CONFIG_START(seta_state::krzybowl) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9021,7 +9024,7 @@ MACHINE_CONFIG_START(seta_state::madshark) MCFG_PALETTE_INDIRECT_ENTRIES(0x600) MCFG_PALETTE_INIT_OWNER(seta_state,jjsquawk) /* layers are 6 planes deep */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9064,7 +9067,7 @@ MACHINE_CONFIG_START(seta_state::magspeed) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9108,7 +9111,7 @@ MACHINE_CONFIG_START(seta_state::msgundam) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9146,7 +9149,7 @@ MACHINE_CONFIG_START(seta_state::oisipuzl) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,oisipuzl_2_layers) // flip is inverted for the tilemaps + set_video_start_cb(config, driver_callback_delegate(&video_start_oisipuzl_2_layers, this)); // flip is inverted for the tilemaps /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -9186,7 +9189,7 @@ MACHINE_CONFIG_START(seta_state::triplfun) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,oisipuzl_2_layers) // flip is inverted for the tilemaps + set_video_start_cb(config, driver_callback_delegate(&video_start_oisipuzl_2_layers, this)); // flip is inverted for the tilemaps /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -9230,7 +9233,7 @@ MACHINE_CONFIG_START(seta_state::kiwame) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -9273,7 +9276,7 @@ MACHINE_CONFIG_START(seta_state::rezon) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9313,7 +9316,7 @@ MACHINE_CONFIG_START(seta_state::thunderl) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9389,7 +9392,7 @@ MACHINE_CONFIG_START(seta_state::wiggie) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wiggie) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9430,7 +9433,7 @@ MACHINE_CONFIG_START(seta_state::wits) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9467,7 +9470,7 @@ MACHINE_CONFIG_START(seta_state::umanclub) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9508,7 +9511,7 @@ MACHINE_CONFIG_START(seta_state::utoukond) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -9547,7 +9550,7 @@ MACHINE_CONFIG_START(seta_state::wrofaero) MCFG_WATCHDOG_ADD("watchdog") #if __uPD71054_TIMER - MCFG_MACHINE_START_OVERRIDE(seta_state, wrofaero ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_wrofaero, this)); #endif // __uPD71054_TIMER MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) @@ -9566,7 +9569,7 @@ MACHINE_CONFIG_START(seta_state::wrofaero) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9615,7 +9618,7 @@ MACHINE_CONFIG_START(seta_state::zingzip) MCFG_PALETTE_INDIRECT_ENTRIES(0x600) MCFG_PALETTE_INIT_OWNER(seta_state,zingzip) /* layer 1 gfx is 6 planes deep */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9668,7 +9671,7 @@ MACHINE_CONFIG_START(seta_state::pairlove) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pairlove) MCFG_PALETTE_ADD("palette", 2048) /* sprites only */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9719,7 +9722,7 @@ MACHINE_CONFIG_START(seta_state::crazyfgt) MCFG_PALETTE_INDIRECT_ENTRIES(0x600) MCFG_PALETTE_INIT_OWNER(seta_state,gundhara) /* layers are 6 planes deep (seta_state,but have only 4 palettes) */ - MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_2_layers, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9789,7 +9792,7 @@ MACHINE_CONFIG_START(jockeyc_state::jockeyc) MCFG_PALETTE_ADD("palette", 512 * 1) MCFG_PALETTE_INIT_OWNER(seta_state,palette_init_RRRRRGGGGGBBBBB_proms) - MCFG_VIDEO_START_OVERRIDE(jockeyc_state,jockeyc_1_layer) + set_video_start_cb(config, driver_callback_delegate(&video_start_jockeyc_1_layer, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index 94775441662..490c3eb1653 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -226,7 +226,7 @@ void seta2_state::gundamex_map(address_map &map) Wakakusamonogatari Mahjong Yonshimai ***************************************************************************/ -MACHINE_START_MEMBER(seta2_state, mj4simai) +void seta2_state::machine_start_mj4simai() { save_item(NAME(m_keyboard_row)); } @@ -2559,7 +2559,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(seta2_state::mj4simai) seta2(config); - MCFG_MACHINE_START_OVERRIDE(seta2_state, mj4simai) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mj4simai, this)); MACHINE_CONFIG_END @@ -2601,7 +2601,7 @@ MACHINE_CONFIG_START(seta2_state::myangel) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x00, 0xf0-1) - MCFG_VIDEO_START_OVERRIDE(seta2_state,yoffset) + set_video_start_cb(config, driver_callback_delegate(&video_start_yoffset, this)); MACHINE_CONFIG_END @@ -2614,7 +2614,7 @@ MACHINE_CONFIG_START(seta2_state::myangel2) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x00, 0xf0-1) - MCFG_VIDEO_START_OVERRIDE(seta2_state,yoffset) + set_video_start_cb(config, driver_callback_delegate(&video_start_yoffset, this)); MACHINE_CONFIG_END @@ -2663,7 +2663,7 @@ MACHINE_CONFIG_START(seta2_state::reelquak) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0x40, 0x180-1, 0x80, 0x170-1) - MCFG_VIDEO_START_OVERRIDE(seta2_state,xoffset) + set_video_start_cb(config, driver_callback_delegate(&video_start_xoffset, this)); MACHINE_CONFIG_END @@ -2717,7 +2717,7 @@ MACHINE_CONFIG_START(seta2_state::telpacfl) // video hardware MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0x0, 0x180-1, 0xff, 0x1ef-1) - MCFG_VIDEO_START_OVERRIDE(seta2_state,xoffset1) + set_video_start_cb(config, driver_callback_delegate(&video_start_xoffset1, this)); MACHINE_CONFIG_END @@ -2736,13 +2736,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta2_state::funcube_interrupt) m_maincpu->set_input_line(2, HOLD_LINE); } -MACHINE_START_MEMBER(seta2_state, funcube) +void seta2_state::machine_start_funcube() { save_item(NAME(m_funcube_coin_start_cycles)); save_item(NAME(m_funcube_hopper_motor)); } -MACHINE_RESET_MEMBER(seta2_state, funcube) +void seta2_state::machine_reset_funcube() { m_funcube_coin_start_cycles = 0; m_funcube_hopper_motor = 0; @@ -2767,8 +2767,8 @@ MACHINE_CONFIG_START(seta2_state::funcube) MCFG_WATCHDOG_ADD("watchdog") - MCFG_MACHINE_START_OVERRIDE(seta2_state, funcube) - MCFG_MACHINE_RESET_OVERRIDE(seta2_state, funcube) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_funcube, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_funcube, this)); // video hardware MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index de83c1c82f1..8c6ce3e9452 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -191,7 +191,7 @@ void shangkid_state::init_shangkid() /***************************************************************************************/ -MACHINE_RESET_MEMBER(shangkid_state,shangkid) +void shangkid_state::machine_reset_shangkid() { membank("bank2")->set_entry(0); } @@ -415,7 +415,7 @@ MACHINE_CONFIG_START(shangkid_state::chinhero) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chinhero) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(shangkid_state,shangkid) + set_video_start_cb(config, driver_callback_delegate(&video_start_shangkid, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -450,7 +450,7 @@ MACHINE_CONFIG_START(shangkid_state::shangkid) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(MEMBANK("bank1")) - MCFG_MACHINE_RESET_OVERRIDE(shangkid_state,shangkid) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_shangkid, this)); /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_shangkid) diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index 7ce5e6f91a0..3d9a01f80d7 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -281,8 +281,8 @@ public: void init_haekaka(); void init_gocowboy(); - DECLARE_MACHINE_RESET(sigmab98); - DECLARE_MACHINE_RESET(sammymdl); + void machine_reset_sigmab98(); + void machine_reset_sammymdl(); virtual void video_start() override; uint32_t screen_update_sigmab98(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -347,7 +347,7 @@ public: DECLARE_WRITE8_MEMBER(lufykzku_c8_w); DECLARE_WRITE8_MEMBER(lufykzku_watchdog_w); - DECLARE_MACHINE_RESET(lufykzku); + void machine_reset_lufykzku(); void init_lufykzku(); TIMER_DEVICE_CALLBACK_MEMBER(lufykzku_irq); @@ -2819,7 +2819,7 @@ INPUT_PORTS_END Sigma B-98 Games ***************************************************************************/ -MACHINE_RESET_MEMBER(sigmab98_state,sigmab98) +void sigmab98_state::machine_reset_sigmab98() { m_rombank = 0; membank("rombank")->set_entry(0); @@ -2839,7 +2839,7 @@ MACHINE_CONFIG_START(sigmab98_state::sigmab98) MCFG_DEVICE_IO_MAP(gegege_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sigmab98_state, sigmab98_vblank_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(sigmab98_state, sigmab98) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sigmab98, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -2899,7 +2899,7 @@ MACHINE_CONFIG_END Banpresto Medal Games ***************************************************************************/ -MACHINE_RESET_MEMBER(lufykzku_state,lufykzku) +void lufykzku_state::machine_reset_lufykzku() { m_rombank = 0; membank("romrambank")->set_entry(0); @@ -2923,7 +2923,7 @@ MACHINE_CONFIG_START(lufykzku_state::lufykzku) MCFG_DEVICE_IO_MAP(lufykzku_io_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", lufykzku_state, lufykzku_irq, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(lufykzku_state, lufykzku) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lufykzku, this)); MCFG_NVRAM_ADD_0FILL("nvram") // battery backed RAM // No EEPROM @@ -2969,7 +2969,7 @@ MACHINE_CONFIG_END Sammy Medal Games ***************************************************************************/ -MACHINE_RESET_MEMBER(sigmab98_state,sammymdl) +void sigmab98_state::machine_reset_sammymdl() { m_maincpu->set_state_int(Z80_PC, 0x400); // code starts at 400 ??? (000 = cart header) } @@ -2994,7 +2994,7 @@ MACHINE_CONFIG_START(sigmab98_state::sammymdl) MCFG_DEVICE_IO_MAP( animalc_io ) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sigmab98_state, sammymdl_irq, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(sigmab98_state, sammymdl ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sammymdl, this)); MCFG_NVRAM_ADD_0FILL("nvram") // battery backed RAM MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") diff --git a/src/mame/drivers/simple_st0016.cpp b/src/mame/drivers/simple_st0016.cpp index 1260aa81686..3678122b2e1 100644 --- a/src/mame/drivers/simple_st0016.cpp +++ b/src/mame/drivers/simple_st0016.cpp @@ -484,7 +484,7 @@ MACHINE_CONFIG_START(st0016_state::st0016) MCFG_SCREEN_PALETTE("maincpu:palette") -// MCFG_VIDEO_START_OVERRIDE(st0016_state,st0016) +// set_video_start_cb(config, driver_callback_delegate(&video_start_st0016, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index cdceb753451..c31e0838562 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -923,7 +923,7 @@ MACHINE_CONFIG_START(slapfght_state::perfrman) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_perfrman) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(slapfght_state, perfrman) + set_video_start_cb(config, driver_callback_delegate(&video_start_perfrman, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -975,7 +975,7 @@ MACHINE_CONFIG_START(slapfght_state::tigerh) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_slapfght) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(slapfght_state, slapfight) + set_video_start_cb(config, driver_callback_delegate(&video_start_slapfight, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1048,7 +1048,7 @@ MACHINE_CONFIG_START(slapfght_state::slapfigh) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_slapfght) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(slapfght_state, slapfight) + set_video_start_cb(config, driver_callback_delegate(&video_start_slapfight, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp index 490a34432dc..e1b6722515d 100644 --- a/src/mame/drivers/sms.cpp +++ b/src/mame/drivers/sms.cpp @@ -494,8 +494,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(sms_state::sms_base) - MCFG_MACHINE_START_OVERRIDE(sms_state,sms) - MCFG_MACHINE_RESET_OVERRIDE(sms_state,sms) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sms, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sms, this)); /* basic machine hardware */ SPEAKER(config, "mono").front_center(); @@ -612,8 +612,8 @@ MACHINE_CONFIG_START(sms_state::sms1_ntsc) MCFG_DEFAULT_LAYOUT(layout_sms1) - MCFG_VIDEO_START_OVERRIDE(sms_state,sms1) - MCFG_VIDEO_RESET_OVERRIDE(sms_state,sms1) + set_video_start_cb(config, driver_callback_delegate(&video_start_sms1, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_sms1, this)); MCFG_DEVICE_ADD("sms_vdp", SEGA315_5124, 0) MCFG_SEGA315_5124_SET_SCREEN("screen") @@ -726,8 +726,8 @@ MACHINE_CONFIG_START(sms_state::sms1_pal) MCFG_DEFAULT_LAYOUT(layout_sms1) - MCFG_VIDEO_START_OVERRIDE(sms_state,sms1) - MCFG_VIDEO_RESET_OVERRIDE(sms_state,sms1) + set_video_start_cb(config, driver_callback_delegate(&video_start_sms1, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_sms1, this)); MCFG_DEVICE_ADD("sms_vdp", SEGA315_5124, 0) MCFG_SEGA315_5124_SET_SCREEN("screen") @@ -793,8 +793,8 @@ MACHINE_CONFIG_START(sms_state::sms1_paln) MCFG_DEFAULT_LAYOUT(layout_sms1) - MCFG_VIDEO_START_OVERRIDE(sms_state,sms1) - MCFG_VIDEO_RESET_OVERRIDE(sms_state,sms1) + set_video_start_cb(config, driver_callback_delegate(&video_start_sms1, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_sms1, this)); MCFG_DEVICE_ADD("sms_vdp", SEGA315_5124, 0) MCFG_SEGA315_5124_SET_SCREEN("screen") @@ -862,8 +862,8 @@ MACHINE_CONFIG_START(sms_state::sms1_br) MCFG_DEFAULT_LAYOUT(layout_sms1) - MCFG_VIDEO_START_OVERRIDE(sms_state,sms1) - MCFG_VIDEO_RESET_OVERRIDE(sms_state,sms1) + set_video_start_cb(config, driver_callback_delegate(&video_start_sms1, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_sms1, this)); MCFG_DEVICE_ADD("sms_vdp", SEGA315_5124, 0) MCFG_SEGA315_5124_SET_SCREEN("screen") @@ -949,16 +949,16 @@ MACHINE_CONFIG_START(sms_state::gamegear) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(sms_state,sms) - MCFG_MACHINE_RESET_OVERRIDE(sms_state,sms) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sms, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sms, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_GG_RAW_PARAMS(MASTER_CLOCK_GG/6) MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_gamegear) - MCFG_VIDEO_START_OVERRIDE(sms_state,gamegear) - MCFG_VIDEO_RESET_OVERRIDE(sms_state,gamegear) + set_video_start_cb(config, driver_callback_delegate(&video_start_gamegear, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_gamegear, this)); MCFG_DEVICE_ADD("sms_vdp", SEGA315_5378, 0) MCFG_SEGA315_5378_SET_SCREEN("screen") diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp index aca12490c20..2e315689820 100644 --- a/src/mame/drivers/sms_bootleg.cpp +++ b/src/mame/drivers/sms_bootleg.cpp @@ -281,8 +281,8 @@ MACHINE_CONFIG_START(smsbootleg_state::sms_supergame) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_START_OVERRIDE(sms_state,sms) - MCFG_MACHINE_RESET_OVERRIDE(sms_state,sms) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sms, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sms, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp index ade4e98837e..36de292ea7b 100644 --- a/src/mame/drivers/smsmcorp.cpp +++ b/src/mame/drivers/smsmcorp.cpp @@ -249,7 +249,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_MACHINE_START(sureshot); + void machine_start_sureshot() ATTR_COLD; uint32_t screen_update_sms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<screen_device> m_screen; @@ -530,7 +530,7 @@ void smsmfg_state::machine_start() save_item(NAME(m_communication_port)); } -MACHINE_START_MEMBER(smsmfg_state,sureshot) +void smsmfg_state::machine_start_sureshot() { save_item(NAME(m_communication_port_status)); save_item(NAME(m_communication_port)); @@ -586,7 +586,7 @@ MACHINE_CONFIG_START(smsmfg_state::sureshot) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(sureshot_map) - MCFG_MACHINE_START_OVERRIDE(smsmfg_state,sureshot) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sureshot, this)); MACHINE_CONFIG_END /************************************* diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp index ba764891716..616d223cfed 100644 --- a/src/mame/drivers/snesb.cpp +++ b/src/mame/drivers/snesb.cpp @@ -184,7 +184,7 @@ public: void init_endless(); void init_mk3snes(); void init_legendsb(); - DECLARE_MACHINE_RESET(ffight2b); + void machine_reset_ffight2b(); void mk3snes(machine_config &config); void ffight2b(machine_config &config); void kinstb(machine_config &config); @@ -737,7 +737,7 @@ MACHINE_CONFIG_START(snesb_state::mk3snes) MACHINE_CONFIG_END -MACHINE_RESET_MEMBER( snesb_state, ffight2b ) +void snesb_state::machine_reset_ffight2b() { address_space &cpu0space = m_maincpu->space(AS_PROGRAM); snes_state::machine_reset(); @@ -748,7 +748,7 @@ MACHINE_RESET_MEMBER( snesb_state, ffight2b ) MACHINE_CONFIG_START(snesb_state::ffight2b) kinstb(config); - MCFG_MACHINE_RESET_OVERRIDE( snesb_state, ffight2b ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ffight2b, this)); MACHINE_CONFIG_END void snesb_state::init_kinstb() diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index 4e0e22b5339..e7e94d50066 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -3679,7 +3679,7 @@ MACHINE_CONFIG_START(snk_state::marvins) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_INIT_OWNER(snk_state,tnk3) - MCFG_VIDEO_START_OVERRIDE(snk_state,marvins) + set_video_start_cb(config, driver_callback_delegate(&video_start_marvins, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3753,7 +3753,7 @@ MACHINE_CONFIG_START(snk_state::jcross) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_INIT_OWNER(snk_state,tnk3) - MCFG_VIDEO_START_OVERRIDE(snk_state,jcross) + set_video_start_cb(config, driver_callback_delegate(&video_start_jcross, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3782,7 +3782,7 @@ MACHINE_CONFIG_START(snk_state::sgladiat) /* visible area is correct. Debug info is shown in the black bars at the sides of the screen when the Debug dip switch is on */ - MCFG_VIDEO_START_OVERRIDE(snk_state,sgladiat) + set_video_start_cb(config, driver_callback_delegate(&video_start_sgladiat, this)); MACHINE_CONFIG_END @@ -3802,7 +3802,7 @@ MACHINE_CONFIG_START(snk_state::hal21) MCFG_DEVICE_PERIODIC_INT_DRIVER(snk_state, irq0_line_hold, 220) // music tempo, hand tuned /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(snk_state,hal21) + set_video_start_cb(config, driver_callback_delegate(&video_start_hal21, this)); MACHINE_CONFIG_END @@ -3836,7 +3836,7 @@ MACHINE_CONFIG_START(snk_state::tnk3) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_INIT_OWNER(snk_state,tnk3) - MCFG_VIDEO_START_OVERRIDE(snk_state,tnk3) + set_video_start_cb(config, driver_callback_delegate(&video_start_tnk3, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3863,7 +3863,7 @@ MACHINE_CONFIG_START(snk_state::aso) MCFG_DEVICE_PROGRAM_MAP(aso_YM3526_sound_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(snk_state,aso) + set_video_start_cb(config, driver_callback_delegate(&video_start_aso, this)); MACHINE_CONFIG_END @@ -3931,7 +3931,7 @@ MACHINE_CONFIG_START(snk_state::ikari) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_VIDEO_START_OVERRIDE(snk_state,ikari) + set_video_start_cb(config, driver_callback_delegate(&video_start_ikari, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3989,7 +3989,7 @@ MACHINE_CONFIG_START(snk_state::bermudat) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gwar) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) - MCFG_VIDEO_START_OVERRIDE(snk_state,gwar) + set_video_start_cb(config, driver_callback_delegate(&video_start_gwar, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4010,7 +4010,7 @@ MACHINE_CONFIG_START(snk_state::psychos) bermudat(config); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(snk_state,psychos) + set_video_start_cb(config, driver_callback_delegate(&video_start_psychos, this)); MACHINE_CONFIG_END @@ -4094,7 +4094,7 @@ MACHINE_CONFIG_START(snk_state::tdfever) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_VIDEO_START_OVERRIDE(snk_state,tdfever) + set_video_start_cb(config, driver_callback_delegate(&video_start_tdfever, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp index a37d836fcfa..f40e9cde9fa 100644 --- a/src/mame/drivers/snk6502.cpp +++ b/src/mame/drivers/snk6502.cpp @@ -795,7 +795,7 @@ INTERRUPT_GEN_MEMBER(snk6502_state::snk6502_interrupt) * *************************************/ -MACHINE_RESET_MEMBER(snk6502_state,sasuke) +void snk6502_state::machine_reset_sasuke() { m_sound->set_music_clock(M_LN2 * (RES_K(18) + RES_K(1)) * CAP_U(1)); @@ -805,7 +805,7 @@ MACHINE_RESET_MEMBER(snk6502_state,sasuke) sasuke_start_counter(); } -MACHINE_RESET_MEMBER(snk6502_state,satansat) +void snk6502_state::machine_reset_satansat() { // same as sasuke (assumption?) // NOTE: this was set before sasuke was adjusted to a lower freq, please don't modify until measured/confirmed on pcb @@ -814,13 +814,13 @@ MACHINE_RESET_MEMBER(snk6502_state,satansat) sasuke_start_counter(); } -MACHINE_RESET_MEMBER(snk6502_state,vanguard) +void snk6502_state::machine_reset_vanguard() { // 41.6 Hz update (measured) m_sound->set_music_clock(1 / 41.6); } -MACHINE_RESET_MEMBER(snk6502_state,pballoon) +void snk6502_state::machine_reset_pballoon() { // 40.3 Hz update (measured) m_sound->set_music_clock(1 / 40.3); @@ -840,7 +840,7 @@ MACHINE_CONFIG_START(snk6502_state::sasuke) MCFG_DEVICE_PROGRAM_MAP(sasuke_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk6502_state, satansat_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,sasuke) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sasuke, this)); // video hardware @@ -856,7 +856,7 @@ MACHINE_CONFIG_START(snk6502_state::sasuke) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(snk6502_state,satansat) - MCFG_VIDEO_START_OVERRIDE(snk6502_state,satansat) + set_video_start_cb(config, driver_callback_delegate(&video_start_satansat, this)); MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK / 16) MCFG_MC6845_SHOW_BORDER_AREA(false) @@ -934,7 +934,7 @@ MACHINE_CONFIG_START(snk6502_state::satansat) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(satansat_map) - MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,satansat) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_satansat, this)); // video hardware MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_satansat) @@ -974,7 +974,7 @@ MACHINE_CONFIG_START(snk6502_state::vanguard) MCFG_DEVICE_PROGRAM_MAP(vanguard_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk6502_state, snk6502_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,vanguard) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_vanguard, this)); // video hardware @@ -990,7 +990,7 @@ MACHINE_CONFIG_START(snk6502_state::vanguard) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(snk6502_state,snk6502) - MCFG_VIDEO_START_OVERRIDE(snk6502_state,snk6502) + set_video_start_cb(config, driver_callback_delegate(&video_start_snk6502, this)); MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK / 16) MCFG_MC6845_SHOW_BORDER_AREA(false) @@ -1092,9 +1092,9 @@ MACHINE_CONFIG_START(snk6502_state::pballoon) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(pballoon_map) - MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,pballoon) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pballoon, this)); - MCFG_VIDEO_START_OVERRIDE(snk6502_state, pballoon ) + set_video_start_cb(config, driver_callback_delegate(&video_start_pballoon, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp index 23cec980956..28f21e2cc7b 100644 --- a/src/mame/drivers/snk68.cpp +++ b/src/mame/drivers/snk68.cpp @@ -646,7 +646,7 @@ MACHINE_CONFIG_START(snk68_state::searchar) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(searchar_map) - MCFG_VIDEO_START_OVERRIDE(snk68_state,searchar) + set_video_start_cb(config, driver_callback_delegate(&video_start_searchar, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp index d61b2e2dd92..0993b7bb348 100644 --- a/src/mame/drivers/snookr10.cpp +++ b/src/mame/drivers/snookr10.cpp @@ -1079,7 +1079,7 @@ MACHINE_CONFIG_START(snookr10_state::apple10) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(snookr10_state, apple10) - MCFG_VIDEO_START_OVERRIDE(snookr10_state, apple10) + set_video_start_cb(config, driver_callback_delegate(&video_start_apple10, this)); MACHINE_CONFIG_END @@ -1101,7 +1101,7 @@ MACHINE_CONFIG_START(snookr10_state::crystalc) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(snookr10_state, crystalc) - MCFG_VIDEO_START_OVERRIDE(snookr10_state, crystalc) + set_video_start_cb(config, driver_callback_delegate(&video_start_crystalc, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp index c5f036ac5a3..46429098e73 100644 --- a/src/mame/drivers/snowbros.cpp +++ b/src/mame/drivers/snowbros.cpp @@ -1706,7 +1706,7 @@ static GFXDECODE_START( gfx_hyperpac ) GFXDECODE_ENTRY( "gfx1", 0, hyperpac_tilelayout, 0, 16 ) GFXDECODE_END -MACHINE_RESET_MEMBER(snowbros_state,semiprot) +void snowbros_state::machine_reset_semiprot() { uint16_t *PROTDATA = (uint16_t*)memregion("user1")->base(); int i; @@ -1715,7 +1715,7 @@ MACHINE_RESET_MEMBER(snowbros_state,semiprot) m_hyperpac_ram[0xf000/2 + i] = PROTDATA[i]; } -MACHINE_RESET_MEMBER(snowbros_state,finalttr) +void snowbros_state::machine_reset_finalttr() { uint16_t *PROTDATA = (uint16_t*)memregion("user1")->base(); int i; @@ -1830,7 +1830,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(snowbros_state::semiprot) semicom(config); - MCFG_MACHINE_RESET_OVERRIDE (snowbros_state, semiprot ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_semiprot, this)); MACHINE_CONFIG_END @@ -1941,7 +1941,7 @@ MACHINE_CONFIG_START(snowbros_state::finalttr) MCFG_DEVICE_MODIFY("soundcpu") MCFG_DEVICE_CLOCK(XTAL(3'579'545)) - MCFG_MACHINE_RESET_OVERRIDE (snowbros_state, finalttr ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_finalttr, this)); MCFG_DEVICE_REPLACE("ymsnd", YM2151, XTAL(3'579'545)) /* possible but less likely 4MHz (12MHz/3) */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index 11356065706..aaf4e58ff1c 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -489,7 +489,7 @@ MACHINE_CONFIG_START(sorcerer_state::sorcererd) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(sorcererd_mem) - MCFG_MACHINE_START_OVERRIDE(sorcerer_state, sorcererd ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_sorcererd, this)); MCFG_DEVICE_ADD("fdc", MICROPOLIS, 0) MCFG_MICROPOLIS_DEFAULT_DRIVE4_TAGS diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp index 97b2af00d96..e48b8d2727b 100644 --- a/src/mame/drivers/spbactn.cpp +++ b/src/mame/drivers/spbactn.cpp @@ -428,7 +428,7 @@ MACHINE_CONFIG_START(spbactn_state::spbactn) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) #endif - MCFG_VIDEO_START_OVERRIDE(spbactn_state,spbactn) + set_video_start_cb(config, driver_callback_delegate(&video_start_spbactn, this)); MCFG_SCREEN_UPDATE_DRIVER(spbactn_state, screen_update_spbactn) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spbactn) @@ -482,7 +482,7 @@ MACHINE_CONFIG_START(spbactn_state::spbactnp) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) - MCFG_VIDEO_START_OVERRIDE(spbactn_state,spbactnp) + set_video_start_cb(config, driver_callback_delegate(&video_start_spbactnp, this)); MCFG_SCREEN_UPDATE_DRIVER(spbactn_state, screen_update_spbactnp) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spbactnp) diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp index 6ba02055d15..21fb62cbdb2 100644 --- a/src/mame/drivers/spc1500.cpp +++ b/src/mame/drivers/spc1500.cpp @@ -287,7 +287,7 @@ public: DECLARE_WRITE8_MEMBER(double_w); DECLARE_READ8_MEMBER(io_r); DECLARE_PALETTE_INIT(spc); - DECLARE_VIDEO_START(spc); + void video_start_spc() ATTR_COLD; MC6845_UPDATE_ROW(crtc_update_row); MC6845_RECONFIGURE(crtc_reconfig); TIMER_DEVICE_CALLBACK_MEMBER(timer); @@ -514,7 +514,7 @@ PALETTE_INIT_MEMBER(spc1500_state,spc) palette.set_pen_color(7,rgb_t(0xff,0xff,0xff)); } -VIDEO_START_MEMBER(spc1500_state, spc) +void spc1500_state::video_start_spc() { } @@ -895,7 +895,7 @@ MACHINE_CONFIG_START(spc1500_state::spc1500) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(spc1500_state, crtc_update_row) MCFG_MC6845_RECONFIGURE_CB(spc1500_state, crtc_reconfig) - MCFG_VIDEO_START_OVERRIDE(spc1500_state, spc) + set_video_start_cb(config, driver_callback_delegate(&video_start_spc, this)); MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp index 598ac5ac8f7..61272834467 100644 --- a/src/mame/drivers/spec128.cpp +++ b/src/mame/drivers/spec128.cpp @@ -250,7 +250,7 @@ void spectrum_state::spectrum_128_mem(address_map &map) map(0xc000, 0xffff).bankrw("bank4"); } -MACHINE_RESET_MEMBER(spectrum_state,spectrum_128) +void spectrum_state::machine_reset_spectrum_128() { uint8_t *messram = m_ram->pointer(); @@ -263,7 +263,7 @@ MACHINE_RESET_MEMBER(spectrum_state,spectrum_128) /* Bank 2 is always in 0x8000 - 0xbfff */ membank("bank3")->set_base(messram + (2<<14)); - MACHINE_RESET_CALL_MEMBER(spectrum); + machine_reset_spectrum(); /* set initial ram config */ m_port_7ffd_data = 0; @@ -301,13 +301,13 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_128) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum_128 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_spectrum_128, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(X1_128_SINCLAIR / 2.5f, 456, 0, 352, 311, 0, 296) - MCFG_VIDEO_START_OVERRIDE(spectrum_state, spectrum_128 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_spectrum_128, this)); MCFG_GFXDECODE_MODIFY("gfxdecode", spec128) /* sound hardware */ diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp index f331f040b79..81a9a1000af 100644 --- a/src/mame/drivers/special.cpp +++ b/src/mame/drivers/special.cpp @@ -368,7 +368,7 @@ MACHINE_CONFIG_START(special_state::special) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", I8080, 2000000) MCFG_DEVICE_PROGRAM_MAP(specialist_mem) - MCFG_MACHINE_RESET_OVERRIDE(special_state, special ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_special, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -376,7 +376,7 @@ MACHINE_CONFIG_START(special_state::special) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(384, 256) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 256-1) - MCFG_VIDEO_START_OVERRIDE(special_state,special) + set_video_start_cb(config, driver_callback_delegate(&video_start_special, this)); MCFG_SCREEN_UPDATE_DRIVER(special_state, screen_update_special) MCFG_SCREEN_PALETTE("palette") @@ -417,7 +417,7 @@ MACHINE_CONFIG_START(special_state::specialp) MCFG_SCREEN_UPDATE_DRIVER(special_state, screen_update_specialp) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) - MCFG_VIDEO_START_OVERRIDE(special_state,specialp) + set_video_start_cb(config, driver_callback_delegate(&video_start_specialp, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(special_state::specialm) @@ -437,13 +437,13 @@ MACHINE_CONFIG_START(special_state::specimx) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(specimx_mem) - MCFG_MACHINE_START_OVERRIDE (special_state, specimx ) - MCFG_MACHINE_RESET_OVERRIDE (special_state, specimx ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_specimx, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_specimx, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(special_state, screen_update_specimx) - MCFG_VIDEO_START_OVERRIDE(special_state,specimx) + set_video_start_cb(config, driver_callback_delegate(&video_start_specimx, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(16) @@ -488,7 +488,7 @@ MACHINE_CONFIG_START(special_state::erik) MCFG_DEVICE_ADD("maincpu", Z80, 4000000) MCFG_DEVICE_PROGRAM_MAP(erik_mem) MCFG_DEVICE_IO_MAP(erik_io_map) - MCFG_MACHINE_RESET_OVERRIDE(special_state, erik ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_erik, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -496,7 +496,7 @@ MACHINE_CONFIG_START(special_state::erik) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(384, 256) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 256-1) - MCFG_VIDEO_START_OVERRIDE(special_state,erik) + set_video_start_cb(config, driver_callback_delegate(&video_start_erik, this)); MCFG_SCREEN_UPDATE_DRIVER(special_state, screen_update_erik) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/specpls3.cpp b/src/mame/drivers/specpls3.cpp index 9e96b9d22e0..330934a9c45 100644 --- a/src/mame/drivers/specpls3.cpp +++ b/src/mame/drivers/specpls3.cpp @@ -325,12 +325,12 @@ void spectrum_state::spectrum_plus3_mem(address_map &map) map(0xc000, 0xffff).bankrw("bank4"); } -MACHINE_RESET_MEMBER(spectrum_state,spectrum_plus3) +void spectrum_state::machine_reset_spectrum_plus3() { uint8_t *messram = m_ram->pointer(); memset(messram,0,128*1024); - MACHINE_RESET_CALL_MEMBER(spectrum); + machine_reset_spectrum(); /* Initial configuration */ m_port_7ffd_data = 0; @@ -381,7 +381,7 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_plus3) MCFG_SCREEN_REFRESH_RATE(50.01) MCFG_GFXDECODE_MODIFY("gfxdecode", specpls3) - MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum_plus3 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_spectrum_plus3, this)); MCFG_UPD765A_ADD("upd765", true, true) MCFG_FLOPPY_DRIVE_ADD("upd765:0", specpls3_floppies, "3ssdd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index 82a6110c36f..4a9485d6bbc 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -619,7 +619,7 @@ void spectrum_state::init_spectrum() } } -MACHINE_RESET_MEMBER(spectrum_state,spectrum) +void spectrum_state::machine_reset_spectrum() { m_port_7ffd_data = -1; m_port_1ffd_data = -1; @@ -674,7 +674,7 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_common) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_spectrum, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -689,7 +689,7 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_common) MCFG_PALETTE_INIT_OWNER(spectrum_state, spectrum ) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spectrum) - MCFG_VIDEO_START_OVERRIDE(spectrum_state, spectrum ) + set_video_start_cb(config, driver_callback_delegate(&video_start_spectrum, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp index d581cae6fb2..9cfa2dc1960 100644 --- a/src/mame/drivers/speglsht.cpp +++ b/src/mame/drivers/speglsht.cpp @@ -144,9 +144,9 @@ public: DECLARE_READ32_MEMBER(cop_r); DECLARE_READ32_MEMBER(irq_ack_clear); void init_speglsht(); - DECLARE_MACHINE_RESET(speglsht); + void machine_reset_speglsht(); virtual void machine_start() override; - DECLARE_VIDEO_START(speglsht); + void video_start_speglsht() ATTR_COLD; uint32_t screen_update_speglsht(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(st0016_rom_bank_w); @@ -356,15 +356,15 @@ static GFXDECODE_START( gfx_speglsht ) GFXDECODE_END -MACHINE_RESET_MEMBER(speglsht_state,speglsht) +void speglsht_state::machine_reset_speglsht() { std::fill(&m_shared[0],&m_shared[m_shared.bytes()],0); } -VIDEO_START_MEMBER(speglsht_state,speglsht) +void speglsht_state::video_start_speglsht() { m_bitmap = std::make_unique<bitmap_ind16>(512, 5122 ); -// VIDEO_START_CALL_MEMBER(st0016); +// video_start_st0016(); } #define PLOT_PIXEL_RGB(x,y,r,g,b) if(y>=0 && x>=0 && x<512 && y<512) \ @@ -422,7 +422,7 @@ MACHINE_CONFIG_START(speglsht_state::speglsht) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", speglsht_state, irq4_line_assert) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_RESET_OVERRIDE(speglsht_state,speglsht) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_speglsht, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -435,7 +435,7 @@ MACHINE_CONFIG_START(speglsht_state::speglsht) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_speglsht) MCFG_PALETTE_ADD("palette", 16*16*4+1) - MCFG_VIDEO_START_OVERRIDE(speglsht_state,speglsht) + set_video_start_cb(config, driver_callback_delegate(&video_start_speglsht, this)); MACHINE_CONFIG_END ROM_START( speglsht ) diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 93dceb955fd..00e095f0aae 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -474,12 +474,12 @@ static GFXDECODE_START( gfx_splash ) GFXDECODE_END -MACHINE_START_MEMBER(splash_state,splash) +void splash_state::machine_start_splash() { save_item(NAME(m_adpcm_data)); } -MACHINE_RESET_MEMBER(splash_state,splash) +void splash_state::machine_reset_splash() { m_adpcm_data = 0; m_ret = 0x100; @@ -515,8 +515,8 @@ MACHINE_CONFIG_START(splash_state::splash) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_MACHINE_START_OVERRIDE(splash_state, splash ) - MCFG_MACHINE_RESET_OVERRIDE(splash_state, splash ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_splash, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_splash, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(splash_state::splash) MACHINE_CONFIG_END -MACHINE_START_MEMBER(splash_state, roldfrog) +void splash_state::machine_start_roldfrog() { save_item(NAME(m_ret)); save_item(NAME(m_vblank_irq)); @@ -578,8 +578,8 @@ MACHINE_CONFIG_START(splash_state::roldfrog) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_MACHINE_START_OVERRIDE(splash_state, roldfrog ) - MCFG_MACHINE_RESET_OVERRIDE(splash_state, splash ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_roldfrog, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_splash, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index e13065ecab7..4fd4b5f9858 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -81,7 +81,7 @@ public: tilemap_t *m_bg_tilemap; DECLARE_WRITE8_MEMBER(spyhuntertec_paletteram_w); void init_spyhuntertec(); -// DECLARE_VIDEO_START(spyhuntertec); +// void video_start_spyhuntertec() ATTR_COLD; // uint32_t screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(spyhuntertec_port04_w); DECLARE_WRITE8_MEMBER(spyhuntertec_portf0_w); diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index 3efffe5bfdd..26ae5e90afe 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -88,7 +88,7 @@ void srmp2_state::machine_start() save_item(NAME(m_iox.data)); } -MACHINE_START_MEMBER(srmp2_state,srmp2) +void srmp2_state::machine_start_srmp2() { machine_start(); @@ -104,7 +104,7 @@ MACHINE_START_MEMBER(srmp2_state,srmp2) save_item(NAME(m_color_bank)); } -MACHINE_START_MEMBER(srmp2_state,srmp3) +void srmp2_state::machine_start_srmp3() { machine_start(); @@ -121,7 +121,7 @@ MACHINE_START_MEMBER(srmp2_state,srmp3) save_item(NAME(m_gfx_bank)); } -MACHINE_START_MEMBER(srmp2_state,rmgoldyh) +void srmp2_state::machine_start_rmgoldyh() { machine_start(); @@ -138,7 +138,7 @@ MACHINE_START_MEMBER(srmp2_state,rmgoldyh) save_item(NAME(m_gfx_bank)); } -MACHINE_START_MEMBER(srmp2_state,mjyuugi) +void srmp2_state::machine_start_mjyuugi() { machine_start(); @@ -1149,7 +1149,7 @@ MACHINE_CONFIG_START(srmp2_state::srmp2) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp2_state, irq4_line_assert) MCFG_DEVICE_PERIODIC_INT_DRIVER(srmp2_state, irq2_line_assert, 15*60) /* Interrupt times is not understood */ - MCFG_MACHINE_START_OVERRIDE(srmp2_state,srmp2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_srmp2, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) @@ -1195,7 +1195,7 @@ MACHINE_CONFIG_START(srmp2_state::srmp3) MCFG_DEVICE_IO_MAP(srmp3_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp2_state, irq0_line_assert) - MCFG_MACHINE_START_OVERRIDE(srmp2_state,srmp3) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_srmp3, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) @@ -1238,7 +1238,7 @@ MACHINE_CONFIG_START(srmp2_state::rmgoldyh) MCFG_DEVICE_PROGRAM_MAP(rmgoldyh_map) MCFG_DEVICE_IO_MAP(rmgoldyh_io_map) - MCFG_MACHINE_START_OVERRIDE(srmp2_state,rmgoldyh) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_rmgoldyh, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(srmp2_state::mjyuugi) @@ -1249,7 +1249,7 @@ MACHINE_CONFIG_START(srmp2_state::mjyuugi) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp2_state, irq4_line_assert) MCFG_DEVICE_PERIODIC_INT_DRIVER(srmp2_state, irq2_line_assert, 15*60) /* Interrupt times is not understood */ - MCFG_MACHINE_START_OVERRIDE(srmp2_state,mjyuugi) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjyuugi, this)); MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp index f4ebd420f20..7d323fd5f00 100644 --- a/src/mame/drivers/sslam.cpp +++ b/src/mame/drivers/sslam.cpp @@ -714,7 +714,7 @@ MACHINE_CONFIG_START(sslam_state::sslam) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(sslam_state,sslam) + set_video_start_cb(config, driver_callback_delegate(&video_start_sslam, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -748,7 +748,7 @@ MACHINE_CONFIG_START(sslam_state::powerbls) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(sslam_state,powerbls) + set_video_start_cb(config, driver_callback_delegate(&video_start_powerbls, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp index 59dbabfcedb..68209d5ccea 100644 --- a/src/mame/drivers/ssv.cpp +++ b/src/mame/drivers/ssv.cpp @@ -2624,7 +2624,7 @@ MACHINE_CONFIG_START(ssv_state::gdfs) MCFG_ST0020_SPRITES_PALETTE("palette") MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gdfs) - MCFG_VIDEO_START_OVERRIDE(ssv_state,gdfs) + set_video_start_cb(config, driver_callback_delegate(&video_start_gdfs, this)); MACHINE_CONFIG_END @@ -2838,8 +2838,13 @@ MACHINE_CONFIG_START(ssv_state::eaglshot) MCFG_SCREEN_VISIBLE_AREA(0, (0xca - 0x2a)*2-1, 0, (0xf6 - 0x16)-1) MCFG_SCREEN_UPDATE_DRIVER(ssv_state, screen_update_eaglshot) +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_eaglshot) MCFG_VIDEO_START_OVERRIDE(ssv_state,eaglshot) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", eaglshot) + set_video_start_cb(config, driver_callback_delegate(&video_start_eaglshot, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MACHINE_CONFIG_END diff --git a/src/mame/drivers/stargame.cpp b/src/mame/drivers/stargame.cpp index e8f29d61ebe..eafcb168c7d 100644 --- a/src/mame/drivers/stargame.cpp +++ b/src/mame/drivers/stargame.cpp @@ -30,7 +30,7 @@ public: { } DECLARE_WRITE8_MEMBER(rint_w); - DECLARE_MACHINE_RESET(stargame); + void machine_reset_stargame(); void stargame(machine_config &config); void audiocpu_io(address_map &map); @@ -89,7 +89,7 @@ WRITE8_MEMBER( stargame_state::rint_w ) m_audiocpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -MACHINE_RESET_MEMBER( stargame_state, stargame ) +void stargame_state::machine_reset_stargame() { m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); // doesn't do anything? cpu should be stuck in reset until allowed to start by SRESET line } @@ -112,7 +112,7 @@ MACHINE_CONFIG_START(stargame_state::stargame) MCFG_DEVICE_PROGRAM_MAP(audiocpu_map) MCFG_DEVICE_IO_MAP(audiocpu_io) - MCFG_MACHINE_RESET_OVERRIDE(stargame_state, stargame) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_stargame, this)); /* video hardware */ //MCFG_DEFAULT_LAYOUT() diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp index 3cdfd56a8ab..729c39f2ecf 100644 --- a/src/mame/drivers/statriv2.cpp +++ b/src/mame/drivers/statriv2.cpp @@ -119,7 +119,7 @@ public: TILE_GET_INFO_MEMBER(vertical_tile_info); virtual void video_start() override; DECLARE_PALETTE_INIT(statriv2); - DECLARE_VIDEO_START(vertical); + void video_start_vertical() ATTR_COLD; uint32_t screen_update_statriv2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(statriv2_interrupt); void statriv2(machine_config &config); @@ -177,7 +177,7 @@ void statriv2_state::video_start() m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(statriv2_state::horizontal_tile_info), this), TILEMAP_SCAN_ROWS, 8, 15, 64, 16); } -VIDEO_START_MEMBER(statriv2_state,vertical) +void statriv2_state::video_start_vertical() { m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(statriv2_state::vertical_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -644,7 +644,7 @@ MACHINE_CONFIG_START(statriv2_state::statriv2v) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 392, 0, 256, 262, 0, 256) - MCFG_VIDEO_START_OVERRIDE(statriv2_state, vertical) + set_video_start_cb(config, driver_callback_delegate(&video_start_vertical, this)); MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_vertical) MACHINE_CONFIG_END diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 6fe65d4c1bb..3eb41ad0f90 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1097,8 +1097,8 @@ MACHINE_CONFIG_START(stv_state::stv) MCFG_SMPC_HLE_DOT_SELECT_CB(WRITELINE(*this, saturn_state, dot_select_w)) MCFG_SMPC_HLE_IRQ_HANDLER_CB(WRITELINE("scu", sega_scu_device, smpc_irq_w)) - MCFG_MACHINE_START_OVERRIDE(stv_state,stv) - MCFG_MACHINE_RESET_OVERRIDE(stv_state,stv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_stv, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_stv, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* Actually AK93C45F */ @@ -1111,7 +1111,7 @@ MACHINE_CONFIG_START(stv_state::stv) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stv) - MCFG_VIDEO_START_OVERRIDE(stv_state,stv_vdp2) + set_video_start_cb(config, driver_callback_delegate(&video_start_stv_vdp2, this)); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1209,7 +1209,7 @@ MACHINE_CONFIG_START(stv_state::hopper) MCFG_HOPPER_ADD("hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) MACHINE_CONFIG_END -MACHINE_RESET_MEMBER(stv_state,stv) +void stv_state::machine_reset_stv() { m_scsp_last_line = 0; @@ -1282,7 +1282,7 @@ image_init_result stv_state::load_cart(device_image_interface &image, generic_sl } -MACHINE_START_MEMBER(stv_state,stv) +void stv_state::machine_start_stv() { machine().device<scsp_device>("scsp")->set_ram_base(m_sound_ram); diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index e840760a910..ca8230bf33c 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -319,11 +319,11 @@ private: TILE_GET_INFO_MEMBER(get_stbsub_tile_info); template<uint8_t Reel> TILE_GET_INFO_MEMBER(get_reel_tile_info); template<uint8_t Reel> TILE_GET_INFO_MEMBER(get_stbsub_reel_tile_info); - DECLARE_VIDEO_START(subsino); + void video_start_subsino() ATTR_COLD; DECLARE_PALETTE_INIT(_2proms); DECLARE_PALETTE_INIT(_3proms); - DECLARE_VIDEO_START(reels); - DECLARE_VIDEO_START(stbsub); + void video_start_reels() ATTR_COLD; + void video_start_stbsub() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_reels(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_stbsub_reels(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -389,7 +389,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_stbsub_tile_info) } -VIDEO_START_MEMBER(subsino_state,subsino) +void subsino_state::video_start_subsino() { m_tmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 0x40,0x20); m_tmap->set_transparent_pen(0 ); @@ -429,9 +429,9 @@ TILE_GET_INFO_MEMBER(subsino_state::get_stbsub_reel_tile_info) } -VIDEO_START_MEMBER(subsino_state, reels) +void subsino_state::video_start_reels() { - VIDEO_START_CALL_MEMBER( subsino ); + video_start_subsino(); m_reel_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_reel_tile_info<0>), this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8); m_reel_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_reel_tile_info<1>), this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8); @@ -443,7 +443,7 @@ VIDEO_START_MEMBER(subsino_state, reels) } -VIDEO_START_MEMBER(subsino_state,stbsub) +void subsino_state::video_start_stbsub() { m_tmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(subsino_state::get_stbsub_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20); m_tmap->set_transparent_pen(0 ); @@ -2731,7 +2731,7 @@ MACHINE_CONFIG_START(subsino_state::victor21) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(subsino_state, _2proms) - MCFG_VIDEO_START_OVERRIDE(subsino_state,subsino) + set_video_start_cb(config, driver_callback_delegate(&video_start_subsino, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2775,7 +2775,7 @@ MACHINE_CONFIG_START(subsino_state::crsbingo) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(subsino_state, _2proms) - MCFG_VIDEO_START_OVERRIDE(subsino_state,subsino) + set_video_start_cb(config, driver_callback_delegate(&video_start_subsino, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2817,7 +2817,7 @@ MACHINE_CONFIG_START(subsino_state::srider) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(subsino_state, _3proms) - MCFG_VIDEO_START_OVERRIDE(subsino_state,subsino) + set_video_start_cb(config, driver_callback_delegate(&video_start_subsino, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2870,7 +2870,7 @@ MACHINE_CONFIG_START(subsino_state::tisub) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(subsino_state, _3proms) - MCFG_VIDEO_START_OVERRIDE(subsino_state, reels) + set_video_start_cb(config, driver_callback_delegate(&video_start_reels, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2913,7 +2913,7 @@ MACHINE_CONFIG_START(subsino_state::stbsub) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC - MCFG_VIDEO_START_OVERRIDE(subsino_state,stbsub) + set_video_start_cb(config, driver_callback_delegate(&video_start_stbsub, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp index a3894fad3c8..6ae5ab973b9 100644 --- a/src/mame/drivers/subsino2.cpp +++ b/src/mame/drivers/subsino2.cpp @@ -173,7 +173,7 @@ public: void init_ptrain(); TILE_GET_INFO_MEMBER(ss9601_get_tile_info_0); TILE_GET_INFO_MEMBER(ss9601_get_tile_info_1); - DECLARE_VIDEO_START(subsino2); + void video_start_subsino2() ATTR_COLD; uint32_t screen_update_subsino2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(am188em_int0_irq); required_device<cpu_device> m_maincpu; @@ -624,7 +624,7 @@ WRITE8_MEMBER(subsino2_state::ss9601_disable_w) Video Update ***************************************************************************/ -VIDEO_START_MEMBER(subsino2_state,subsino2) +void subsino2_state::video_start_subsino2() { // SS9601 Regs: @@ -2387,7 +2387,7 @@ MACHINE_CONFIG_START(subsino2_state::bishjan) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC - MCFG_VIDEO_START_OVERRIDE(subsino2_state, subsino2 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_subsino2, this)); // sound hardware // SS9904 @@ -2438,7 +2438,7 @@ MACHINE_CONFIG_START(subsino2_state::mtrain) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC - MCFG_VIDEO_START_OVERRIDE(subsino2_state, subsino2 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_subsino2, this)); // sound hardware SPEAKER(config, "mono").front_center(); @@ -2472,7 +2472,7 @@ MACHINE_CONFIG_START(subsino2_state::saklove) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC - MCFG_VIDEO_START_OVERRIDE(subsino2_state, subsino2 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_subsino2, this)); // sound hardware SPEAKER(config, "mono").front_center(); @@ -2510,7 +2510,7 @@ MACHINE_CONFIG_START(subsino2_state::xplan) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC - MCFG_VIDEO_START_OVERRIDE(subsino2_state, subsino2 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_subsino2, this)); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index 7b7a83ab1d8..42e3e0ac0d3 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -224,7 +224,7 @@ void suna16_state::bestbest_map(address_map &map) map(0x5e0000, 0x5fffff).ram().share("spriteram2"); // Sprites (Chip 2) } -MACHINE_START_MEMBER(suna16_state,bestbest) +void suna16_state::machine_start_bestbest() { save_item(NAME(m_prot)); } @@ -307,7 +307,7 @@ void suna16_state::bestbest_sound_map(address_map &map) Back Street Soccer ***************************************************************************/ -MACHINE_START_MEMBER(suna16_state, bssoccer) +void suna16_state::machine_start_bssoccer() { m_bank1->configure_entries(0, 8, memregion("pcm1")->base() + 0x1000, 0x10000); m_bank2->configure_entries(0, 8, memregion("pcm2")->base() + 0x1000, 0x10000); @@ -396,14 +396,14 @@ void suna16_state::uballoon_pcm_1_io_map(address_map &map) map(0x03, 0x03).w(this, FUNC(suna16_state::uballoon_pcm_1_bankswitch_w)); // Rom Bank } -MACHINE_START_MEMBER(suna16_state,uballoon) +void suna16_state::machine_start_uballoon() { m_bank1->configure_entries(0, 2, memregion("pcm1")->base() + 0x400, 0x10000); save_item(NAME(m_prot)); } -MACHINE_RESET_MEMBER(suna16_state,uballoon) +void suna16_state::machine_reset_uballoon() { address_space &space = m_maincpu->space(AS_PROGRAM); uballoon_pcm_1_bankswitch_w(space, 0, 0); @@ -832,7 +832,7 @@ MACHINE_CONFIG_START(suna16_state::bssoccer) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_START_OVERRIDE(suna16_state,bssoccer) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bssoccer, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -894,8 +894,8 @@ MACHINE_CONFIG_START(suna16_state::uballoon) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_START_OVERRIDE(suna16_state,uballoon) - MCFG_MACHINE_RESET_OVERRIDE(suna16_state,uballoon) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_uballoon, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_uballoon, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -950,8 +950,8 @@ MACHINE_CONFIG_START(suna16_state::sunaq) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_START_OVERRIDE(suna16_state,uballoon) - MCFG_MACHINE_RESET_OVERRIDE(suna16_state,uballoon) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_uballoon, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_uballoon, this)); /* video hardware */ @@ -1012,7 +1012,7 @@ MACHINE_CONFIG_START(suna16_state::bestbest) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_START_OVERRIDE(suna16_state, bestbest) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bestbest, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp index 29c70849241..9177ee5a569 100644 --- a/src/mame/drivers/suna8.cpp +++ b/src/mame/drivers/suna8.cpp @@ -1904,7 +1904,7 @@ MACHINE_CONFIG_START(suna8_state::hardhead) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_VIDEO_START_OVERRIDE(suna8_state,suna8_text) + set_video_start_cb(config, driver_callback_delegate(&video_start_suna8_text, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1963,7 +1963,7 @@ MACHINE_CONFIG_START(suna8_state::rranger) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_VIDEO_START_OVERRIDE(suna8_state,suna8_text) + set_video_start_cb(config, driver_callback_delegate(&video_start_suna8_text, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1992,7 +1992,7 @@ MACHINE_CONFIG_END /* 1 x 24 MHz crystal */ -MACHINE_RESET_MEMBER(suna8_state,brickzn) +void suna8_state::machine_reset_brickzn() { m_protection_val = m_prot2 = m_prot2_prev = 0xff; m_paletteram_enab = 1; // for brickzn11 @@ -2016,7 +2016,7 @@ MACHINE_CONFIG_START(suna8_state::brickzn11) MCFG_DEVICE_PROGRAM_MAP(brickzn_pcm_map) MCFG_DEVICE_IO_MAP(brickzn_pcm_io_map) - MCFG_MACHINE_RESET_OVERRIDE(suna8_state, brickzn ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_brickzn, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2032,7 +2032,7 @@ MACHINE_CONFIG_START(suna8_state::brickzn11) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_VIDEO_START_OVERRIDE(suna8_state,suna8_brickzn) + set_video_start_cb(config, driver_callback_delegate(&video_start_suna8_brickzn, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2083,7 +2083,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(suna8_state::hardhea2_interrupt) if (m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -MACHINE_RESET_MEMBER(suna8_state,hardhea2) +void suna8_state::machine_reset_hardhea2() { address_space &space = m_maincpu->space(AS_PROGRAM); hardhea2_rambank_0_w(space,0,0); @@ -2098,7 +2098,7 @@ MACHINE_CONFIG_START(suna8_state::hardhea2) MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna8_state, hardhea2_interrupt, "screen", 0, 1) - MCFG_MACHINE_RESET_OVERRIDE(suna8_state,hardhea2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hardhea2, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(256) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2146,7 +2146,7 @@ MACHINE_CONFIG_START(suna8_state::starfigh) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_VIDEO_START_OVERRIDE(suna8_state,suna8_starfigh) + set_video_start_cb(config, driver_callback_delegate(&video_start_suna8_starfigh, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2200,7 +2200,7 @@ MACHINE_CONFIG_START(suna8_state::sparkman) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_VIDEO_START_OVERRIDE(suna8_state,suna8_sparkman) + set_video_start_cb(config, driver_callback_delegate(&video_start_suna8_sparkman, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index f6acb3ea1f4..28db479af82 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -711,7 +711,7 @@ MACHINE_CONFIG_START(super80_state::super80) MCFG_DEVICE_PROGRAM_MAP(super80_map) MCFG_DEVICE_IO_MAP(super80_io) MCFG_Z80_DAISY_CHAIN(super80_daisy_chain) - MCFG_MACHINE_RESET_OVERRIDE(super80_state, super80) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_super80, this)); MCFG_DEVICE_ADD("z80pio", Z80PIO, MASTER_CLOCK/6) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) @@ -729,7 +729,7 @@ MACHINE_CONFIG_START(super80_state::super80) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_super80) MCFG_DEFAULT_LAYOUT( layout_super80 ) - MCFG_VIDEO_START_OVERRIDE(super80_state,super80) + set_video_start_cb(config, driver_callback_delegate(&video_start_super80, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -798,7 +798,7 @@ MACHINE_CONFIG_START(super80_state::super80v) MCFG_DEVICE_PROGRAM_MAP(super80v_map) MCFG_DEVICE_IO_MAP(super80v_io) MCFG_Z80_DAISY_CHAIN(super80_daisy_chain) - MCFG_MACHINE_RESET_OVERRIDE(super80_state, super80r) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_super80r, this)); MCFG_DEVICE_ADD("z80pio", Z80PIO, MASTER_CLOCK/6) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp index 38f4f61defb..8ef225b16c3 100644 --- a/src/mame/drivers/supercrd.cpp +++ b/src/mame/drivers/supercrd.cpp @@ -190,7 +190,7 @@ public: DECLARE_WRITE8_MEMBER(supercrd_colorram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); DECLARE_PALETTE_INIT(supercrd); - DECLARE_VIDEO_START(supercrd); + void video_start_supercrd() ATTR_COLD; uint32_t screen_update_supercrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; @@ -270,7 +270,7 @@ TILE_GET_INFO_MEMBER(supercrd_state::get_bg_tile_info) } -VIDEO_START_MEMBER(supercrd_state, supercrd) +void supercrd_state::video_start_supercrd() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(supercrd_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 29); } @@ -439,7 +439,7 @@ MACHINE_CONFIG_START(supercrd_state::supercrd) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(supercrd_state, supercrd) - MCFG_VIDEO_START_OVERRIDE(supercrd_state, supercrd) + set_video_start_cb(config, driver_callback_delegate(&video_start_supercrd, this)); // MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/8) // MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index fee953cae2e..311f123d3ce 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -920,7 +920,7 @@ void superqix_state_base::machine_init_common() // superqix specific stuff, TODO: should be moved to superqix_state below save_item(NAME(m_gfxbank)); save_item(NAME(m_show_bitmap)); - // the following are saved in VIDEO_START_MEMBER(superqix_state,superqix): + // the following are saved in superqix_state::video_start_superqix: //save_item(NAME(*m_fg_bitmap[0])); //save_item(NAME(*m_fg_bitmap[1])); } @@ -949,7 +949,7 @@ void hotsmash_state::machine_init_common() save_item(NAME(m_dial_sign)); } -MACHINE_RESET_MEMBER(superqix_state, superqix) +void superqix_state::machine_reset_superqix() { if (m_mcu.found()) // mcu sets only { @@ -962,7 +962,7 @@ MACHINE_RESET_MEMBER(superqix_state, superqix) } } -MACHINE_START_MEMBER(superqix_state, superqix) +void superqix_state::machine_start_superqix() { /* configure the banks */ membank("bank1")->configure_entries(0, 4, memregion("maincpu")->base() + 0x10000, 0x4000); @@ -970,7 +970,7 @@ MACHINE_START_MEMBER(superqix_state, superqix) machine_init_common(); } -MACHINE_START_MEMBER(hotsmash_state, pbillian) +void hotsmash_state::machine_start_pbillian() { /* configure the banks */ membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000); @@ -1362,7 +1362,7 @@ MACHINE_CONFIG_START(hotsmash_state::pbillian) MCFG_M68705_PORTC_W_CB(WRITE8(*this, hotsmash_state, hotsmash_68705_portC_w)) //MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_MACHINE_START_OVERRIDE(hotsmash_state, pbillian) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pbillian, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1378,7 +1378,7 @@ MACHINE_CONFIG_START(hotsmash_state::pbillian) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT_CLASS(1, superqix_state, BBGGRRII) - MCFG_VIDEO_START_OVERRIDE(hotsmash_state, pbillian) + set_video_start_cb(config, driver_callback_delegate(&video_start_pbillian, this)); SPEAKER(config, "mono").front_center(); @@ -1408,7 +1408,7 @@ MACHINE_CONFIG_START(superqix_state::sqix) MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, superqix_state, mcu_port3_r)) MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, superqix_state, mcu_port3_w)) - MCFG_MACHINE_START_OVERRIDE(superqix_state,superqix) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_superqix, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1423,7 +1423,7 @@ MACHINE_CONFIG_START(superqix_state::sqix) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT_CLASS(1, superqix_state, BBGGRRII) - MCFG_VIDEO_START_OVERRIDE(superqix_state,superqix) + set_video_start_cb(config, driver_callback_delegate(&video_start_superqix, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1461,7 +1461,7 @@ MACHINE_CONFIG_START(superqix_state::sqix_nomcu) MCFG_DEVICE_IO_MAP(sqix_port_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(superqix_state, sqix_timer_irq, 4*60) /* ??? */ - MCFG_MACHINE_START_OVERRIDE(superqix_state,superqix) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_superqix, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1476,7 +1476,7 @@ MACHINE_CONFIG_START(superqix_state::sqix_nomcu) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT_CLASS(1, superqix_state, BBGGRRII) - MCFG_VIDEO_START_OVERRIDE(superqix_state,superqix) + set_video_start_cb(config, driver_callback_delegate(&video_start_superqix, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index fd34849a11c..a9446f10870 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -826,31 +826,31 @@ MACHINE_CONFIG_START(skns_state::skns) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_RESET_MEMBER(skns_state,sknsa) +void skns_state::machine_reset_sknsa() { m_region = 'A'; skns_state::machine_reset(); } -MACHINE_RESET_MEMBER(skns_state,sknsj) +void skns_state::machine_reset_sknsj() { m_region = 'J'; skns_state::machine_reset(); } -MACHINE_RESET_MEMBER(skns_state,sknsu) +void skns_state::machine_reset_sknsu() { m_region = 'U'; skns_state::machine_reset(); } -MACHINE_RESET_MEMBER(skns_state,sknse) +void skns_state::machine_reset_sknse() { m_region = 'E'; skns_state::machine_reset(); } -MACHINE_RESET_MEMBER(skns_state,sknsk) +void skns_state::machine_reset_sknsk() { m_region = 'K'; skns_state::machine_reset(); @@ -859,27 +859,27 @@ MACHINE_RESET_MEMBER(skns_state,sknsk) MACHINE_CONFIG_START(skns_state::sknsa) skns(config); - MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknsa) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sknsa, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(skns_state::sknsj) skns(config); - MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknsj) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sknsj, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(skns_state::sknsu) skns(config); - MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknsu) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sknsu, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(skns_state::sknse) skns(config); - MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknse) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sknse, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(skns_state::sknsk) skns(config); - MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknsk) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sknsk, this)); MACHINE_CONFIG_END /***** IDLE SKIPPING *****/ diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp index dc8abd1fdac..f95d45c33de 100644 --- a/src/mame/drivers/svision.cpp +++ b/src/mame/drivers/svision.cpp @@ -500,7 +500,7 @@ void svision_state::machine_reset() } -MACHINE_RESET_MEMBER(svision_state,tvlink) +void svision_state::machine_reset_tvlink() { svision_state::machine_reset(); m_tvlink.palette_on = false; @@ -581,7 +581,7 @@ MACHINE_CONFIG_START(svision_state::tvlinkp) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(tvlink_mem) - MCFG_MACHINE_RESET_OVERRIDE(svision_state, tvlink) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tvlink, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_NO_PALETTE diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp index f004fef679c..344d92b7b86 100644 --- a/src/mame/drivers/swyft.cpp +++ b/src/mame/drivers/swyft.cpp @@ -335,9 +335,9 @@ public: optional_ioport m_y6; optional_ioport m_y7;*/ - DECLARE_MACHINE_START(swyft); - DECLARE_MACHINE_RESET(swyft); - DECLARE_VIDEO_START(swyft); + void machine_start_swyft() ATTR_COLD; + void machine_reset_swyft(); + void video_start_swyft() ATTR_COLD; uint32_t screen_update_swyft(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -573,7 +573,7 @@ void swyft_state::swyft_mem(address_map &map) map(0x0e4000, 0x0e4fff).rw(this, FUNC(swyft_state::swyft_via1_r), FUNC(swyft_state::swyft_via1_w)); } -MACHINE_START_MEMBER(swyft_state,swyft) +void swyft_state::machine_start_swyft() { m_via0->write_ca1(1); m_via0->write_ca2(1); @@ -586,11 +586,11 @@ MACHINE_START_MEMBER(swyft_state,swyft) m_via1->write_cb2(1); } -MACHINE_RESET_MEMBER(swyft_state,swyft) +void swyft_state::machine_reset_swyft() { } -VIDEO_START_MEMBER(swyft_state,swyft) +void swyft_state::video_start_swyft() { } @@ -768,8 +768,8 @@ MACHINE_CONFIG_START(swyft_state::swyft) MCFG_DEVICE_ADD("maincpu",M68008, XTAL(15'897'600)/2) //MC68008P8, Y1=15.8976Mhz, clock GUESSED at Y1 / 2 MCFG_DEVICE_PROGRAM_MAP(swyft_mem) - MCFG_MACHINE_START_OVERRIDE(swyft_state,swyft) - MCFG_MACHINE_RESET_OVERRIDE(swyft_state,swyft) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_swyft, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_swyft, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -782,7 +782,7 @@ MACHINE_CONFIG_START(swyft_state::swyft) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_VIDEO_START_OVERRIDE(swyft_state,swyft) + set_video_start_cb(config, driver_callback_delegate(&video_start_swyft, this)); MCFG_DEVICE_ADD("acia6850", ACIA6850, 0) // acia rx and tx clocks come from one of the VIA pins and are tied together, fix this below? acia e clock comes from 68008 diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index 7c14f8f0a1c..797097cc601 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -400,7 +400,7 @@ void system1_state::machine_start() } -MACHINE_START_MEMBER(system1_state,system2) +void system1_state::machine_start_system2() { system1_state::machine_start(); m_mute_xor = 0x01; @@ -2486,10 +2486,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(system1_state::sys2) sys1ppi(config); - MCFG_MACHINE_START_OVERRIDE(system1_state,system2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_system2, this)); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(system1_state,system2) + set_video_start_cb(config, driver_callback_delegate(&video_start_system2, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(system1_state, screen_update_system2) MACHINE_CONFIG_END diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 933b76ed934..d32402cc3d2 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -2179,7 +2179,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::system16_base) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD("palette", 2048*SHADOW_COLORS_MULTIPLIER) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system16) + set_video_start_cb(config, driver_callback_delegate(&video_start_system16, this)); MCFG_GENERIC_LATCH_8_ADD("soundlatch") MACHINE_CONFIG_END @@ -2194,7 +2194,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::shinobi_datsu) MCFG_BOOTLEG_SYS16A_SPRITES_ADD("sprites") MCFG_BOOTLEG_SYS16A_SPRITES_XORIGIN(189-117) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_shinobi ) + set_video_start_cb(config, driver_callback_delegate(&video_start_s16a_bootleg_shinobi, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg) @@ -2213,7 +2213,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::passshtb) MCFG_BOOTLEG_SYS16A_SPRITES_XORIGIN(189-117) MCFG_BOOTLEG_SYS16A_SPRITES_REMAP(1,0,3,2,5,4,7,6) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_passsht ) + set_video_start_cb(config, driver_callback_delegate(&video_start_s16a_bootleg_passsht, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg) @@ -2233,7 +2233,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::passsht4b) MCFG_BOOTLEG_SYS16A_SPRITES_XORIGIN(189-117) MCFG_BOOTLEG_SYS16A_SPRITES_REMAP(1,0,3,2,5,4,7,6) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_passsht ) + set_video_start_cb(config, driver_callback_delegate(&video_start_s16a_bootleg_passsht, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg_passht4b) @@ -2254,7 +2254,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::wb3bb) MCFG_BOOTLEG_SYS16A_SPRITES_REMAP(4,0,5,1,6,2,7,3) MCFG_BOOTLEG_SYS16A_SPRITES_YORIGIN(0) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_wb3bl ) + set_video_start_cb(config, driver_callback_delegate(&video_start_s16a_bootleg_wb3bl, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg) @@ -2287,7 +2287,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::goldnaxeb_base) MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites") MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-121) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system16) + set_video_start_cb(config, driver_callback_delegate(&video_start_system16, this)); MCFG_GENERIC_LATCH_8_ADD("soundlatch") MACHINE_CONFIG_END @@ -2448,7 +2448,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::system18) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD("palette", (2048+2048)*SHADOW_COLORS_MULTIPLIER) // 64 extra colours for vdp (but we use 2048 so shadow mask works) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system18old) + set_video_start_cb(config, driver_callback_delegate(&video_start_system18old, this)); MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites") MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-107) @@ -2504,7 +2504,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::astormb2) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD("palette", (2048+2048)*SHADOW_COLORS_MULTIPLIER) // 64 extra colours for vdp (but we use 2048 so shadow mask works) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system18old) + set_video_start_cb(config, driver_callback_delegate(&video_start_system18old, this)); MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites") MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-107) @@ -2568,7 +2568,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::shdancbla) MACHINE_CONFIG_END -MACHINE_RESET_MEMBER(segas1x_bootleg_state,ddcrewbl) +void segas1x_bootleg_state::machine_reset_ddcrewbl() { // set up the initial banks for this game // because it doesn't appear to actually program banks 0-3. @@ -2599,12 +2599,12 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::ddcrewbl) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD("palette", (2048+2048)*SHADOW_COLORS_MULTIPLIER) - MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system18old) + set_video_start_cb(config, driver_callback_delegate(&video_start_system18old, this)); MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites") MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-124) - MCFG_MACHINE_RESET_OVERRIDE(segas1x_bootleg_state,ddcrewbl) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddcrewbl, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 7364faa6a2c..ecaa22f51fc 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -1978,7 +1978,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order0, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0xc0) @@ -2035,7 +2035,7 @@ MACHINE_CONFIG_START(taitob_state::masterw) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order2, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x30) @@ -2113,7 +2113,7 @@ MACHINE_CONFIG_START(taitob_state::ashura) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order0, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0xc0) @@ -2170,7 +2170,7 @@ MACHINE_CONFIG_START(taitob_state::crimec) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order1) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order1, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x00) @@ -2228,8 +2228,8 @@ MACHINE_CONFIG_START(taitob_state::hitice) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,hitice) - MCFG_VIDEO_RESET_OVERRIDE(taitob_state,hitice) + set_video_start_cb(config, driver_callback_delegate(&video_start_hitice, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_hitice, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0xc0) @@ -2291,7 +2291,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order0, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0xc0) @@ -2349,7 +2349,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order2, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x30) @@ -2412,7 +2412,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order1) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order1, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x00) @@ -2475,7 +2475,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order1) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order1, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x00) @@ -2532,7 +2532,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order2, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x30) @@ -2595,7 +2595,7 @@ MACHINE_CONFIG_START(taitob_state::qzshowby) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order1) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order1, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x00) @@ -2652,7 +2652,7 @@ MACHINE_CONFIG_START(taitob_state::viofight) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order2, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x30) @@ -2714,7 +2714,7 @@ MACHINE_CONFIG_START(taitob_state::silentd) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order2, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x30) @@ -2771,7 +2771,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order2, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x30) @@ -2837,7 +2837,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order2, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0x30) @@ -2901,7 +2901,7 @@ MACHINE_CONFIG_START(taitob_state::sbm) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitob_color_order0, this)); MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) MCFG_TC0180VCU_BG_COLORBASE(0xc0) @@ -2956,7 +2956,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitob_state,realpunc) + set_video_start_cb(config, driver_callback_delegate(&video_start_realpunc, this)); MCFG_HD63484_ADD("hd63484", 0, realpunc_hd63484_map) MCFG_HD63484_AUTO_CONFIGURE_SCREEN(false) diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp index db3619182e5..528d499112e 100644 --- a/src/mame/drivers/taito_f2.cpp +++ b/src/mame/drivers/taito_f2.cpp @@ -2838,14 +2838,14 @@ WRITE8_MEMBER(taitof2_state::cameltrya_porta_w) MACHINE DRIVERS ***********************************************************/ -MACHINE_START_MEMBER(taitof2_state,common) +void taitof2_state::machine_start_common() { m_int6_timer = timer_alloc(TIMER_TAITOF2_INTERRUPT6); } -MACHINE_START_MEMBER(taitof2_state,f2) +void taitof2_state::machine_start_f2() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); membank("bank2")->configure_entries(0, 8, memregion("audiocpu")->base() + 0x10000, 0x4000); } @@ -2858,7 +2858,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2) MCFG_DEVICE_ADD("audiocpu", Z80, 24000000/6) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_MACHINE_START_OVERRIDE(taitof2_state,f2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_f2, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -2876,7 +2876,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_default) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_default, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -2947,7 +2947,7 @@ MACHINE_CONFIG_START(taitof2_state::finalb) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_finalb) - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_finalb) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_finalb, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed)) @@ -2971,8 +2971,13 @@ MACHINE_CONFIG_START(taitof2_state::dondokod) MCFG_DEVICE_PROGRAM_MAP(dondokod_map) /* video hardware */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dondokod) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", pivot) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_dondokod, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed)) MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz) @@ -3006,7 +3011,7 @@ MACHINE_CONFIG_START(taitof2_state::megab) MCFG_TIMER_DRIVER_ADD("cchip_irq_clear", taitof2_state, cchip_irq_clear_cb) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_megab) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_megab, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3029,8 +3034,13 @@ MACHINE_CONFIG_START(taitof2_state::thundfox) MCFG_DEVICE_PROGRAM_MAP(thundfox_map) /* video hardware */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_thundfox) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_thundfox) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", thundfox) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_thundfox, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_thundfox) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed_thundfox)) @@ -3067,8 +3077,13 @@ MACHINE_CONFIG_START(taitof2_state::cameltry) MCFG_DEVICE_PROGRAM_MAP(cameltry_map) /* video hardware */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dondokod) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", pivot) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_dondokod, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz) @@ -3118,7 +3133,7 @@ MACHINE_CONFIG_START(taitof2_state::liquidk) MCFG_DEVICE_PROGRAM_MAP(liquidk_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_megab) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_megab, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed)) @@ -3168,7 +3183,7 @@ MACHINE_CONFIG_START(taitof2_state::ssi) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_ssi) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_ssi, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_ssi) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed_thundfox)) @@ -3193,7 +3208,7 @@ MACHINE_CONFIG_START(taitof2_state::gunfront) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_gunfront) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_gunfront, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed)) @@ -3217,7 +3232,7 @@ MACHINE_CONFIG_START(taitof2_state::growl) MCFG_DEVICE_PROGRAM_MAP(growl_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_growl) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_growl, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3243,7 +3258,7 @@ MACHINE_CONFIG_START(taitof2_state::mjnquest) MCFG_DEVICE_PROGRAM_MAP(mjnquest_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_mjnquest) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_mjnquest, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3264,8 +3279,13 @@ MACHINE_CONFIG_START(taitof2_state::footchmp) MCFG_DEVICE_PROGRAM_MAP(footchmp_map) /* video hardware */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_footchmp) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_footchmp, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_full_buffer_delayed)) @@ -3297,8 +3317,13 @@ MACHINE_CONFIG_START(taitof2_state::hthero) MCFG_DEVICE_PROGRAM_MAP(footchmp_map) /* video hardware */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_hthero) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_hthero, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_full_buffer_delayed)) @@ -3323,7 +3348,7 @@ MACHINE_CONFIG_START(taitof2_state::koshien) MCFG_DEVICE_PROGRAM_MAP(koshien_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_koshien) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_koshien, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3353,8 +3378,13 @@ MACHINE_CONFIG_START(taitof2_state::yuyugogo) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) /* video hardware */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_yuyugogo) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_yuyugogo) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_yuyugogo, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_yesnoj) @@ -3385,7 +3415,7 @@ MACHINE_CONFIG_START(taitof2_state::ninjak) MCFG_TE7750_OUT_PORT8_CB(WRITE8(*this, taitof2_state, taitof2_4p_coin_word_w)) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_ninjak) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_ninjak, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3408,7 +3438,7 @@ MACHINE_CONFIG_START(taitof2_state::solfigtr) MCFG_DEVICE_PROGRAM_MAP(solfigtr_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_solfigtr) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_solfigtr, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3452,8 +3482,13 @@ MACHINE_CONFIG_START(taitof2_state::pulirula) MCFG_DEVICE_PROGRAM_MAP(pulirula_map) /* video hardware */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_pulirula) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", pivot) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_pulirula, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz) @@ -3485,7 +3520,7 @@ MACHINE_CONFIG_START(taitof2_state::metalb) MCFG_PALETTE_ENTRIES(8192) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_metalb) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_metalb, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_metalb) @@ -3510,7 +3545,7 @@ MACHINE_CONFIG_START(taitof2_state::qzchikyu) MCFG_DEVICE_PROGRAM_MAP(qzchikyu_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_qzchikyu) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_qzchikyu, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed_qzchikyu)) @@ -3537,7 +3572,7 @@ MACHINE_CONFIG_START(taitof2_state::yesnoj) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_yesnoj) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_yesnoj, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_yesnoj) @@ -3564,7 +3599,7 @@ MACHINE_CONFIG_START(taitof2_state::deadconx) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_deadconx) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_deadconx, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx) @@ -3588,8 +3623,13 @@ MACHINE_CONFIG_START(taitof2_state::deadconxj) MCFG_DEVICE_PROGRAM_MAP(deadconx_map) /* video hardware */ +<<<<<<< HEAD MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_deadconxj) +======= + MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_deadconxj, this)); +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx) @@ -3613,7 +3653,7 @@ MACHINE_CONFIG_START(taitof2_state::dinorex) MCFG_DEVICE_PROGRAM_MAP(dinorex_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dinorex) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_dinorex, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3639,7 +3679,7 @@ MACHINE_CONFIG_START(taitof2_state::qjinsei) MCFG_DEVICE_PROGRAM_MAP(qjinsei_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_quiz, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3665,7 +3705,7 @@ MACHINE_CONFIG_START(taitof2_state::qcrayon) MCFG_DEVICE_PROGRAM_MAP(qcrayon_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_quiz, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3691,7 +3731,7 @@ MACHINE_CONFIG_START(taitof2_state::qcrayon2) MCFG_DEVICE_PROGRAM_MAP(qcrayon2_map) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_quiz, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri) @@ -3719,7 +3759,7 @@ MACHINE_CONFIG_START(taitof2_state::driftout) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot) - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_driftout) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_driftout, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz) @@ -3748,7 +3788,7 @@ MACHINE_CONFIG_START(taitof2_state::cameltrya) MCFG_DEVICE_ADD("audiocpu", Z80,24000000/4) /* verifed on pcb */ MCFG_DEVICE_PROGRAM_MAP(cameltrya_sound_map) - MCFG_MACHINE_START_OVERRIDE(taitof2_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); MCFG_DEVICE_ADD("tc0220ioc", TC0220IOC, 0) MCFG_TC0220IOC_READ_0_CB(IOPORT("DSWA")) @@ -3772,7 +3812,7 @@ MACHINE_CONFIG_START(taitof2_state::cameltrya) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dondokod) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_dondokod, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3817,7 +3857,7 @@ MACHINE_CONFIG_START(taitof2_state::driveout) MCFG_DEVICE_ADD("audiocpu", Z80,24000000/6) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(driveout_sound_map) - MCFG_MACHINE_START_OVERRIDE(taitof2_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); MCFG_DEVICE_ADD("tc0510nio", TC0510NIO, 0) MCFG_TC0510NIO_READ_0_CB(IOPORT("DSWA")) @@ -3841,7 +3881,7 @@ MACHINE_CONFIG_START(taitof2_state::driveout) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_driftout) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_driftout, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index 2b2ab0fb6a2..fe146c99aa8 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -451,7 +451,7 @@ void taito_f3_state::machine_start() save_item(NAME(m_coin_word)); } -MACHINE_RESET_MEMBER(taito_f3_state,f3) +void taito_f3_state::machine_reset_f3() { /* start with sound m68k off, qtheater relies on it (otherwise main CPU tries to reset it while 68k is working with irq table vectors). */ m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -464,7 +464,7 @@ MACHINE_CONFIG_START(taito_f3_state::f3) MCFG_DEVICE_PROGRAM_MAP(f3_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2) - MCFG_MACHINE_RESET_OVERRIDE(taito_f3_state,f3) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_f3, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -482,7 +482,7 @@ MACHINE_CONFIG_START(taito_f3_state::f3) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_f3) MCFG_PALETTE_ADD("palette", 0x2000) - MCFG_VIDEO_START_OVERRIDE(taito_f3_state,f3) + set_video_start_cb(config, driver_callback_delegate(&video_start_f3, this)); /* sound hardware */ MCFG_DEVICE_ADD("taito_en", TAITO_EN, 0) @@ -580,7 +580,7 @@ MACHINE_CONFIG_START(taito_f3_state::bubsympb) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bubsympb) MCFG_PALETTE_ADD("palette", 8192) - MCFG_VIDEO_START_OVERRIDE(taito_f3_state,f3) + set_video_start_cb(config, driver_callback_delegate(&video_start_f3, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 65ab91263ca..7388fc8cd46 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -123,7 +123,7 @@ void taitol_1cpu_state::state_register() } -MACHINE_START_MEMBER(taitol_state, taito_l) +void taitol_state::machine_start_taito_l() { state_register(); } @@ -184,7 +184,7 @@ void taitol_1cpu_state::taito_machine_reset() } -MACHINE_RESET_MEMBER(taitol_state, taito_l) +void taitol_state::machine_reset_taito_l() { taito_machine_reset(); } @@ -1479,7 +1479,7 @@ MACHINE_CONFIG_START(taitol_state::l_system_video) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(taitol_state, taito_l) + set_video_start_cb(config, driver_callback_delegate(&video_start_taito_l, this)); MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", taitol_state, vbl_interrupt, "screen", 0, 1) MACHINE_CONFIG_END @@ -1509,8 +1509,8 @@ MACHINE_CONFIG_START(fhawk_state::fhawk) MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w)) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) - MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l) - MCFG_MACHINE_RESET_OVERRIDE(taitol_state, taito_l) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taito_l, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taito_l, this)); /* video hardware */ l_system_video(config); @@ -1584,8 +1584,8 @@ MACHINE_CONFIG_START(taitol_2cpu_state::raimais) MCFG_DEVICE_ADD("dpram", MB8421, 0) - MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l) - MCFG_MACHINE_RESET_OVERRIDE(taitol_state, taito_l) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taito_l, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taito_l, this)); /* video hardware */ l_system_video(config); @@ -1628,8 +1628,8 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint) MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w)) MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2")) - MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l) - MCFG_MACHINE_RESET_OVERRIDE(taitol_state, taito_l) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taito_l, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taito_l, this)); /* video hardware */ l_system_video(config); @@ -1652,8 +1652,8 @@ MACHINE_CONFIG_START(taitol_1cpu_state::plotting) MCFG_DEVICE_PROGRAM_MAP(plotting_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l) - MCFG_MACHINE_RESET_OVERRIDE(taitol_state, taito_l) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taito_l, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taito_l, this)); /* video hardware */ l_system_video(config); @@ -1776,8 +1776,8 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston) MCFG_DEVICE_ADD("dpram", MB8421, 0) MCFG_MB8421_INTL_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l) - MCFG_MACHINE_RESET_OVERRIDE(taitol_state, taito_l) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taito_l, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taito_l, this)); /* video hardware */ l_system_video(config); diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 459ea330c7b..93f1a30ef55 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -800,7 +800,7 @@ GFXDECODE_END /**************************************************************************/ -MACHINE_START_MEMBER(taitox_state,taitox) +void taitox_state::machine_start_taitox() { int banks = memregion("audiocpu")->bytes() / 0x4000; membank("z80bank")->configure_entries(0, banks, memregion("audiocpu")->base(), 0x4000); @@ -841,7 +841,7 @@ MACHINE_CONFIG_START(taitox_state::superman) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ - MCFG_MACHINE_START_OVERRIDE(taitox_state,taitox) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitox, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -859,7 +859,7 @@ MACHINE_CONFIG_START(taitox_state::superman) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(taitox_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -889,7 +889,7 @@ MACHINE_CONFIG_START(taitox_state::daisenpu) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ - MCFG_MACHINE_START_OVERRIDE(taitox_state,taitox) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitox, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -907,7 +907,7 @@ MACHINE_CONFIG_START(taitox_state::daisenpu) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(taitox_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -935,7 +935,7 @@ MACHINE_CONFIG_START(taitox_state::gigandes) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ - MCFG_MACHINE_START_OVERRIDE(taitox_state,taitox) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitox, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -953,7 +953,7 @@ MACHINE_CONFIG_START(taitox_state::gigandes) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(taitox_state,seta_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_seta_no_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -983,7 +983,7 @@ MACHINE_CONFIG_START(taitox_state::ballbros) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ - MCFG_MACHINE_START_OVERRIDE(taitox_state,taitox) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitox, this)); MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -1001,7 +1001,7 @@ MACHINE_CONFIG_START(taitox_state::ballbros) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(taitox_state, kyustrkr_no_layers) + set_video_start_cb(config, driver_callback_delegate(&video_start_kyustrkr_no_layers, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index a31f050cf1e..49585e7c2f7 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -3148,7 +3148,7 @@ Contcirc road glitchiness in attract? SAVE STATES ***********************************************************/ -MACHINE_START_MEMBER(taitoz_state,bshark) +void taitoz_state::machine_start_bshark() { save_item(NAME(m_cpua_ctrl)); @@ -3157,16 +3157,16 @@ MACHINE_START_MEMBER(taitoz_state,bshark) save_item(NAME(m_ioc220_port)); } -MACHINE_START_MEMBER(taitoz_state,taitoz) +void taitoz_state::machine_start_taitoz() { int banks = memregion("audiocpu")->bytes() / 0x4000; membank("z80bank")->configure_entries(0, banks, memregion("audiocpu")->base(), 0x4000); - MACHINE_START_CALL_MEMBER(bshark); + machine_start_bshark(); } -MACHINE_RESET_MEMBER(taitoz_state,taitoz) +void taitoz_state::machine_reset_taitoz() { m_cpua_ctrl = 0xff; m_sci_int6 = 0; @@ -3189,8 +3189,8 @@ MACHINE_CONFIG_START(taitoz_state::contcirc) MCFG_DEVICE_PROGRAM_MAP(contcirc_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitoz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_DEVICE_ADD("tc0040ioc", TC0040IOC, 0) MCFG_TC0040IOC_READ_0_CB(IOPORT("DSWA")) @@ -3213,7 +3213,7 @@ MACHINE_CONFIG_START(taitoz_state::contcirc) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3264,8 +3264,8 @@ MACHINE_CONFIG_START(taitoz_state::chasehq) MCFG_DEVICE_PROGRAM_MAP(chq_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitoz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_DEVICE_ADD("tc0040ioc", TC0040IOC, 0) MCFG_TC0040IOC_READ_0_CB(IOPORT("DSWA")) @@ -3288,7 +3288,7 @@ MACHINE_CONFIG_START(taitoz_state::chasehq) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3339,8 +3339,8 @@ MACHINE_CONFIG_START(taitoz_state::enforce) MCFG_DEVICE_PROGRAM_MAP(enforce_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitoz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -3365,7 +3365,7 @@ MACHINE_CONFIG_START(taitoz_state::enforce) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3413,8 +3413,8 @@ MACHINE_CONFIG_START(taitoz_state::bshark) MCFG_DEVICE_PROGRAM_MAP(bshark_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,bshark) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bshark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -3446,7 +3446,7 @@ MACHINE_CONFIG_START(taitoz_state::bshark) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3501,8 +3501,8 @@ MACHINE_CONFIG_START(taitoz_state::sci) MCFG_DEVICE_PROGRAM_MAP(sci_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitoz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_QUANTUM_TIME(attotime::from_hz(3000)) @@ -3527,7 +3527,7 @@ MACHINE_CONFIG_START(taitoz_state::sci) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3575,8 +3575,8 @@ MACHINE_CONFIG_START(taitoz_state::nightstr) MCFG_DEVICE_PROGRAM_MAP(nightstr_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitoz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -3608,7 +3608,7 @@ MACHINE_CONFIG_START(taitoz_state::nightstr) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3659,8 +3659,8 @@ MACHINE_CONFIG_START(taitoz_state::aquajack) MCFG_DEVICE_PROGRAM_MAP(aquajack_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitoz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_QUANTUM_TIME(attotime::from_hz(30000)) @@ -3685,7 +3685,7 @@ MACHINE_CONFIG_START(taitoz_state::aquajack) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) MCFG_TC0100SCN_GFX_REGION(1) @@ -3733,8 +3733,8 @@ MACHINE_CONFIG_START(taitoz_state::spacegun) MCFG_DEVICE_PROGRAM_MAP(spacegun_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,bshark) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bshark, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_DATA(spacegun_default_eeprom, 128) @@ -3812,8 +3812,8 @@ MACHINE_CONFIG_START(taitoz_state::dblaxle) MCFG_DEVICE_PROGRAM_MAP(dblaxle_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitoz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); // make quantum time to be a multiple of the xtal (fixes road layer stuck on continue) MCFG_QUANTUM_TIME(attotime::from_hz(XTAL(32'000'000)/1024)) @@ -3839,7 +3839,7 @@ MACHINE_CONFIG_START(taitoz_state::dblaxle) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0480scp", TC0480SCP, 0) MCFG_TC0480SCP_GFX_REGION(1) @@ -3887,8 +3887,8 @@ MACHINE_CONFIG_START(taitoz_state::racingb) MCFG_DEVICE_PROGRAM_MAP(racingb_cpub_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) - MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_taitoz, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_taitoz, this)); MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -3912,7 +3912,7 @@ MACHINE_CONFIG_START(taitoz_state::racingb) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dblaxle) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) + set_video_start_cb(config, driver_callback_delegate(&video_start_taitoz, this)); MCFG_DEVICE_ADD("tc0480scp", TC0480SCP, 0) MCFG_TC0480SCP_GFX_REGION(1) diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index d9bf6c9bf88..e2e4d51fd4c 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -112,7 +112,7 @@ public: void machine_start() override; - DECLARE_MACHINE_RESET(tandy1000rl); + void machine_reset_tandy1000rl(); struct { @@ -405,7 +405,7 @@ void tandy1000_state::tandy1000_set_bios_bank() m_biosbank->set_bank( bank ); } -MACHINE_RESET_MEMBER(tandy1000_state, tandy1000rl) +void tandy1000_state::machine_reset_tandy1000rl() { m_tandy_bios_bank = 6; tandy1000_set_bios_bank(); @@ -733,7 +733,7 @@ MACHINE_CONFIG_START(tandy1000_state::t1000rl) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(20) MCFG_ADDRESS_MAP_BANK_STRIDE(0x10000) - MCFG_MACHINE_RESET_OVERRIDE(tandy1000_state,tandy1000rl) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tandy1000rl, this)); MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_EXTRA_OPTIONS("384K") MACHINE_CONFIG_END diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp index 4aa1a1d4175..5ddd6c72cbd 100644 --- a/src/mame/drivers/tasman.cpp +++ b/src/mame/drivers/tasman.cpp @@ -70,7 +70,7 @@ public: DECLARE_READ32_MEMBER(test_r); // DECLARE_READ32_MEMBER(rng_r); void init_kingtut(); - DECLARE_VIDEO_START(kongambl); + void video_start_kongambl() ATTR_COLD; uint8_t m_irq_mask; virtual void machine_reset() override { m_irq_mask = 0; }; @@ -86,7 +86,7 @@ public: }; -VIDEO_START_MEMBER(kongambl_state,kongambl) +void kongambl_state::video_start_kongambl() { #if CUSTOM_DRAW @@ -664,7 +664,7 @@ MACHINE_CONFIG_START(kongambl_state::kongambl) MCFG_PALETTE_ADD("palette", 32768) MCFG_PALETTE_FORMAT(XRGB) - MCFG_VIDEO_START_OVERRIDE(kongambl_state,kongambl) + set_video_start_cb(config, driver_callback_delegate(&video_start_kongambl, this)); MCFG_K055555_ADD("k055555") diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 9ed8a453c93..832cfdcb8a9 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -27,7 +27,7 @@ changes the size at runtime. Big Fight/Cyclewarriors - misc graphics problems. Cyclewarriors - test mode text does not appear as it needs a -256 Y scroll offset from somewhere. - + reference of bigfight : https://youtu.be/aUUoUCr6yhk Emulation by Bryan McPhail, mish@tendril.co.uk @@ -848,7 +848,7 @@ WRITE_LINE_MEMBER(apache3_state::apache3_68000_reset) m_subcpu2->set_input_line(INPUT_LINE_RESET, PULSE_LINE); } -MACHINE_RESET_MEMBER(apache3_state,apache3) +void apache3_state::machine_reset_apache3() { m_subcpu2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); // TODO @@ -877,7 +877,7 @@ MACHINE_CONFIG_START(apache3_state::apache3) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_MACHINE_RESET_OVERRIDE(apache3_state, apache3) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_apache3, this)); MCFG_DEVICE_ADD("adc", M58990, 1000000) // unknown clock MCFG_ADC0808_IN0_CB(IOPORT("STICK_X")) @@ -907,7 +907,7 @@ MACHINE_CONFIG_START(apache3_state::apache3) bit 0: 3.9kOhm resistor */ - MCFG_VIDEO_START_OVERRIDE(apache3_state, apache3) + set_video_start_cb(config, driver_callback_delegate(&video_start_apache3, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -956,7 +956,7 @@ MACHINE_CONFIG_START(roundup5_state::roundup5) MCFG_PALETTE_MEMBITS(8) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_VIDEO_START_OVERRIDE(roundup5_state,roundup5) + set_video_start_cb(config, driver_callback_delegate(&video_start_roundup5, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1013,7 +1013,7 @@ MACHINE_CONFIG_START(cyclwarr_state::cyclwarr) MCFG_PALETTE_ADD("palette", 8192 + 8192) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(cyclwarr_state, cyclwarr) + set_video_start_cb(config, driver_callback_delegate(&video_start_cyclwarr, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1073,7 +1073,7 @@ MACHINE_CONFIG_START(cyclwarr_state::bigfight) MCFG_PALETTE_ADD("palette", 8192 + 8192) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_VIDEO_START_OVERRIDE(cyclwarr_state, bigfight) + set_video_start_cb(config, driver_callback_delegate(&video_start_bigfight, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index c1ee4d059ee..3063f4b1af3 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -93,8 +93,8 @@ public: DECLARE_READ8_MEMBER(pb_ivg_r); void kbd_put(u8 data); DECLARE_WRITE8_MEMBER(ds_w); - DECLARE_MACHINE_RESET(cpu09); - DECLARE_MACHINE_RESET(ivg09); + void machine_reset_cpu09(); + void machine_reset_ivg09(); MC6845_UPDATE_ROW(crtc_update_row); void ivg09(machine_config &config); @@ -175,12 +175,12 @@ static INPUT_PORTS_START( ivg09 ) PORT_DIPSETTING( 0x60, "IVG09 (mc6845)" ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( tavernie_state, cpu09) +void tavernie_state::machine_reset_cpu09() { m_term_data = 0; } -MACHINE_RESET_MEMBER( tavernie_state, ivg09) +void tavernie_state::machine_reset_ivg09() { m_beep->set_state(1); m_term_data = 0; @@ -297,7 +297,7 @@ MACHINE_CONFIG_START(tavernie_state::cpu09) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(cpu09_mem) - MCFG_MACHINE_RESET_OVERRIDE(tavernie_state, cpu09) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cpu09, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -338,7 +338,7 @@ MACHINE_CONFIG_START(tavernie_state::ivg09) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(ivg09_mem) - MCFG_MACHINE_RESET_OVERRIDE(tavernie_state, ivg09) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ivg09, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp index d8fc26b9d47..e44ebe38110 100644 --- a/src/mame/drivers/tecmo16.cpp +++ b/src/mame/drivers/tecmo16.cpp @@ -420,14 +420,14 @@ MACHINE_CONFIG_START(tecmo16_state::ginkun) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(ginkun_map) - MCFG_VIDEO_START_OVERRIDE(tecmo16_state,ginkun) + set_video_start_cb(config, driver_callback_delegate(&video_start_ginkun, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(tecmo16_state::riot) ginkun(config); /* basic machine hardware */ - MCFG_VIDEO_START_OVERRIDE(tecmo16_state,riot) + set_video_start_cb(config, driver_callback_delegate(&video_start_riot, this)); MACHINE_CONFIG_END /******************************************************************************/ diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index 7e7fa8a0777..845beeea346 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -1716,7 +1716,7 @@ MACHINE_CONFIG_START(tetrisp2_state::tetrisp2) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,tetrisp2) + set_video_start_cb(config, driver_callback_delegate(&video_start_tetrisp2, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1751,7 +1751,7 @@ MACHINE_CONFIG_START(tetrisp2_state::nndmseal) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,nndmseal) // bg layer offset + set_video_start_cb(config, driver_callback_delegate(&video_start_nndmseal, this)); // bg layer offset /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1784,7 +1784,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rockn) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,rockntread) + set_video_start_cb(config, driver_callback_delegate(&video_start_rockntread, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1819,7 +1819,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rockn2) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,rockntread) + set_video_start_cb(config, driver_callback_delegate(&video_start_rockntread, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1870,7 +1870,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rocknms) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1) MCFG_SCREEN_UPDATE_DRIVER(tetrisp2_state, screen_update_rocknms_right) - MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,rocknms) + set_video_start_cb(config, driver_callback_delegate(&video_start_rocknms, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1921,7 +1921,7 @@ MACHINE_CONFIG_START(stepstag_state::stepstag) MCFG_SCREEN_UPDATE_DRIVER(stepstag_state, screen_update_stepstag_right) MCFG_SCREEN_PALETTE("rpalette") - MCFG_VIDEO_START_OVERRIDE(stepstag_state, stepstag ) + set_video_start_cb(config, driver_callback_delegate(&video_start_stepstag, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) @@ -1994,8 +1994,13 @@ MACHINE_CONFIG_START(stepstag_state::vjdash) // 4 Screens MCFG_SCREEN_UPDATE_DRIVER(stepstag_state, screen_update_stepstag_right) MCFG_SCREEN_PALETTE("rpalette") +<<<<<<< HEAD MCFG_VIDEO_START_OVERRIDE(stepstag_state, stepstag ) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) +======= + set_video_start_cb(config, driver_callback_delegate(&video_start_stepstag, this)); + MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2) +>>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much MCFG_PALETTE_ADD("palette", 0x8000) MCFG_DEVICE_ADD("gfxdecode_l", GFXDECODE, "lpalette", gfx_vj_lscreen) diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index a1b7bd1b582..dd42cc69cb7 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -68,8 +68,8 @@ public: DECLARE_WRITE8_MEMBER(unk_w); // machine - DECLARE_MACHINE_START(thedealr); - DECLARE_MACHINE_RESET(thedealr); + void machine_start_thedealr() ATTR_COLD; + void machine_reset_thedealr(); TIMER_DEVICE_CALLBACK_MEMBER(thedealr_interrupt); // video @@ -135,7 +135,7 @@ void thedealr_state::iox_reset() m_iox_coins = 0x00; } -MACHINE_RESET_MEMBER(thedealr_state,thedealr) +void thedealr_state::machine_reset_thedealr() { iox_reset(); } @@ -506,7 +506,7 @@ GFXDECODE_END ***************************************************************************/ -MACHINE_START_MEMBER(thedealr_state,thedealr) +void thedealr_state::machine_start_thedealr() { save_item(NAME(m_iox_status)); save_item(NAME(m_iox_ret)); @@ -546,8 +546,8 @@ MACHINE_CONFIG_START(thedealr_state::thedealr) MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") - MCFG_MACHINE_RESET_OVERRIDE(thedealr_state,thedealr) - MCFG_MACHINE_START_OVERRIDE(thedealr_state,thedealr) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_thedealr, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_thedealr, this)); // video hardware MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp index 4188d925cc4..9d4a19d9a04 100644 --- a/src/mame/drivers/thomson.cpp +++ b/src/mame/drivers/thomson.cpp @@ -621,8 +621,8 @@ static void cd90_640_floppies(device_slot_interface &device) MACHINE_CONFIG_START(thomson_state::to7) - MCFG_MACHINE_START_OVERRIDE( thomson_state, to7 ) - MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to7 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_to7, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_to7, this)); /* cpu */ MCFG_DEVICE_ADD("maincpu", MC6809E, 1000000) @@ -646,7 +646,7 @@ MACHINE_CONFIG_START(thomson_state::to7) MCFG_PALETTE_ADD ( "palette", 4097 ) /* 12-bit color + transparency */ MCFG_PALETTE_INIT_OWNER(thomson_state, thom) - MCFG_VIDEO_START_OVERRIDE( thomson_state, thom ) + set_video_start_cb(config, driver_callback_delegate(&video_start_thom, this)); /* sound */ SPEAKER(config, "speaker").front_center(); @@ -929,8 +929,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(thomson_state::to770) to7(config); - MCFG_MACHINE_START_OVERRIDE( thomson_state, to770 ) - MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to770 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_to770, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_to770, this)); MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP ( to770) @@ -1122,8 +1122,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(thomson_state::mo5) to7(config); - MCFG_MACHINE_START_OVERRIDE( thomson_state, mo5 ) - MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo5 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mo5, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mo5, this)); MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP ( mo5) @@ -1485,8 +1485,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(thomson_state::to9) to7(config); - MCFG_MACHINE_START_OVERRIDE( thomson_state, to9 ) - MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to9 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_to9, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_to9, this)); MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP ( to9) @@ -1709,8 +1709,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(thomson_state::to8) to7(config); - MCFG_MACHINE_START_OVERRIDE( thomson_state, to8 ) - MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to8 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_to8, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_to8, this)); MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP ( to8) @@ -1875,8 +1875,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(thomson_state::to9p) to7(config); - MCFG_MACHINE_START_OVERRIDE( thomson_state, to9p ) - MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to9p ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_to9p, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_to9p, this)); MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP ( to9p) @@ -2224,8 +2224,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(thomson_state::mo6) to7(config); - MCFG_MACHINE_START_OVERRIDE( thomson_state, mo6 ) - MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo6 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mo6, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mo6, this)); MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP ( mo6) @@ -2494,8 +2494,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(thomson_state::mo5nr) to7(config); - MCFG_MACHINE_START_OVERRIDE( thomson_state, mo5nr ) - MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo5nr ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mo5nr, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mo5nr, this)); MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP ( mo5nr) diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp index e4fb6c8ce24..8bd3547f3fc 100644 --- a/src/mame/drivers/ti85.cpp +++ b/src/mame/drivers/ti85.cpp @@ -607,7 +607,7 @@ MACHINE_CONFIG_START(ti85_state::ti85) MCFG_DEVICE_CLOCK(6000000) /* 6 MHz */ MCFG_DEVICE_IO_MAP(ti85_io) - MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti85, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(128, 64) @@ -630,7 +630,7 @@ MACHINE_CONFIG_START(ti85_state::ti82) MCFG_DEVICE_CLOCK(6000000) /* 6 MHz */ MCFG_DEVICE_IO_MAP(ti82_io) - MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti85, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DEVICE("t6a04", t6a04_device, screen_update) @@ -659,7 +659,7 @@ MACHINE_CONFIG_START(ti85_state::ti83) MCFG_DEVICE_CLOCK(6000000) /* 6 MHz */ MCFG_DEVICE_IO_MAP(ti83_io) - MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti85, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DEVICE("t6a04", t6a04_device, screen_update) @@ -678,8 +678,8 @@ MACHINE_CONFIG_START(ti85_state::ti86) MCFG_DEVICE_PROGRAM_MAP(ti86_mem) MCFG_DEVICE_IO_MAP(ti86_io) - MCFG_MACHINE_START_OVERRIDE(ti85_state, ti86 ) - MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti86, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti85, this)); MCFG_SNAPSHOT_ADD("snapshot", ti85_state, ti8x, "sav", 0) MACHINE_CONFIG_END @@ -691,8 +691,8 @@ MACHINE_CONFIG_START(ti85_state::ti83p) MCFG_DEVICE_PROGRAM_MAP(ti83p_asic_mem) MCFG_DEVICE_IO_MAP(ti83p_io) - MCFG_MACHINE_START_OVERRIDE(ti85_state, ti83p ) - MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti83p ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti83p, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti83p, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DEVICE("t6a04", t6a04_device, screen_update) @@ -751,7 +751,7 @@ MACHINE_CONFIG_START(ti85_state::ti83pse) MCFG_DEVICE_MODIFY("membank4") MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem) - MCFG_MACHINE_START_OVERRIDE(ti85_state, ti83pse ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti83pse, this)); MCFG_DEVICE_REPLACE("flash", FUJITSU_29F160T, 0) MACHINE_CONFIG_END @@ -769,13 +769,13 @@ MACHINE_CONFIG_START(ti85_state::ti84p) MCFG_DEVICE_MODIFY("membank4") MCFG_DEVICE_PROGRAM_MAP(ti84p_banked_mem) - MCFG_MACHINE_START_OVERRIDE(ti85_state, ti84p ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti84p, this)); MCFG_DEVICE_REPLACE("flash", AMD_29F800T , 0) MACHINE_CONFIG_END MACHINE_CONFIG_START(ti85_state::ti84pse) ti83pse(config); - MCFG_MACHINE_START_OVERRIDE(ti85_state, ti84pse ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti84pse, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(ti85_state::ti73) diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp index 6b21c5def9a..a08c2d6c9ac 100644 --- a/src/mame/drivers/ti990_4.cpp +++ b/src/mame/drivers/ti990_4.cpp @@ -67,7 +67,7 @@ public: void init_ti990_4(); void init_ti990_4v(); - DECLARE_MACHINE_RESET(ti990_4); + void machine_reset_ti990_4(); void ti990_4v(machine_config &config); void ti990_4(machine_config &config); @@ -276,7 +276,7 @@ void ti990_4_state::cru_map_v(address_map &map) nullptr }; */ -MACHINE_RESET_MEMBER(ti990_4_state,ti990_4) +void ti990_4_state::machine_reset_ti990_4() { hold_load(); reset_int_lines(); @@ -296,7 +296,7 @@ MACHINE_CONFIG_START(ti990_4_state::ti990_4) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, ti990_4_state, external_operation) ) MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(*this, ti990_4_state, interrupt_level) ) - MCFG_MACHINE_RESET_OVERRIDE(ti990_4_state, ti990_4 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti990_4, this)); // Terminal MCFG_DEVICE_ADD("asr733", ASR733, 0) @@ -316,7 +316,7 @@ MACHINE_CONFIG_START(ti990_4_state::ti990_4v) MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map_v) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, ti990_4_state, external_operation) ) MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(*this, ti990_4_state, interrupt_level) ) - MCFG_MACHINE_RESET_OVERRIDE(ti990_4_state, ti990_4 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti990_4, this)); // Terminal MCFG_DEVICE_ADD("vdt911", VDT911, 0) diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp index d6fba45c76e..62372187133 100644 --- a/src/mame/drivers/ti99_2.cpp +++ b/src/mame/drivers/ti99_2.cpp @@ -203,9 +203,9 @@ public: { } - DECLARE_MACHINE_START( ti99_224 ); - DECLARE_MACHINE_START( ti99_232 ); - DECLARE_MACHINE_RESET( ti99_2 ); + void machine_start_ti99_224() ATTR_COLD; + void machine_start_ti99_232() ATTR_COLD; + void machine_reset_ti99_2(); DECLARE_WRITE8_MEMBER(intflag_write); @@ -244,7 +244,7 @@ private: int m_first_ram_page; }; -MACHINE_START_MEMBER(ti99_2_state, ti99_224) +void ti99_2_state::machine_start_ti99_224() { m_rom = memregion(TI992_ROM)->base(); m_ram_start = 0xf000 - m_ram->default_size(); @@ -252,7 +252,7 @@ MACHINE_START_MEMBER(ti99_2_state, ti99_224) m_have_banked_ROM = false; } -MACHINE_START_MEMBER(ti99_2_state, ti99_232) +void ti99_2_state::machine_start_ti99_232() { m_rom = memregion(TI992_ROM)->base(); m_ram_start = 0xf000 - m_ram->default_size(); @@ -260,7 +260,7 @@ MACHINE_START_MEMBER(ti99_2_state, ti99_232) m_have_banked_ROM = true; } -MACHINE_RESET_MEMBER(ti99_2_state, ti99_2) +void ti99_2_state::machine_reset_ti99_2() { m_otherbank = false; @@ -591,7 +591,7 @@ MACHINE_CONFIG_START(ti99_2_state::ti99_224) MCFG_VIDEO992_SCREEN_ADD( TI_SCREEN_TAG ) MCFG_SCREEN_UPDATE_DEVICE( TI_VDC_TAG, bus::ti99::internal::video992_device, screen_update ) - MCFG_MACHINE_START_OVERRIDE(ti99_2_state, ti99_224 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti99_224, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(ti99_2_state::ti99_232) @@ -604,7 +604,7 @@ MACHINE_CONFIG_START(ti99_2_state::ti99_232) MCFG_VIDEO992_SCREEN_ADD( TI_SCREEN_TAG ) MCFG_SCREEN_UPDATE_DEVICE( TI_VDC_TAG, bus::ti99::internal::video992_device, screen_update ) - MCFG_MACHINE_START_OVERRIDE(ti99_2_state, ti99_232 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti99_232, this)); MACHINE_CONFIG_END @@ -622,7 +622,7 @@ MACHINE_CONFIG_START(ti99_2_state::ti99_2) MCFG_RAM_DEFAULT_SIZE("4096") MCFG_RAM_DEFAULT_VALUE(0) - MCFG_MACHINE_RESET_OVERRIDE(ti99_2_state, ti99_2 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti99_2, this)); // Cassette drives // There is no route from the cassette to some audio output, so we don't hear it. diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp index 1b0d1d5dcf9..c55b8647c12 100644 --- a/src/mame/drivers/ti99_4p.cpp +++ b/src/mame/drivers/ti99_4p.cpp @@ -180,7 +180,7 @@ public: DECLARE_WRITE8_MEMBER(tms9901_interrupt); DECLARE_WRITE_LINE_MEMBER(alphaW); virtual void machine_start() override; - DECLARE_MACHINE_RESET(ti99_4p); + void machine_reset_ti99_4p(); DECLARE_WRITE_LINE_MEMBER(video_interrupt_in); @@ -981,7 +981,7 @@ WRITE_LINE_MEMBER(ti99_4p_state::video_interrupt_in) /* Reset the machine. */ -MACHINE_RESET_MEMBER(ti99_4p_state,ti99_4p) +void ti99_4p_state::machine_reset_ti99_4p() { set_9901_int(12, CLEAR_LINE); diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp index 11e0bf10170..983deef0095 100644 --- a/src/mame/drivers/ti99_4x.cpp +++ b/src/mame/drivers/ti99_4x.cpp @@ -90,14 +90,14 @@ public: { } // Machine management - DECLARE_MACHINE_START(ti99_4); - DECLARE_MACHINE_START(ti99_4a); - DECLARE_MACHINE_START(ti99_4qi); - DECLARE_MACHINE_START(ti99_4ev); + void machine_start_ti99_4() ATTR_COLD; + void machine_start_ti99_4a() ATTR_COLD; + void machine_start_ti99_4qi() ATTR_COLD; + void machine_start_ti99_4ev() ATTR_COLD; - DECLARE_MACHINE_RESET(ti99_4); - DECLARE_MACHINE_RESET(ti99_4a); - DECLARE_MACHINE_RESET(ti99_4ev); + void machine_reset_ti99_4(); + void machine_reset_ti99_4a(); + void machine_reset_ti99_4ev(); // Processor connections with the main board DECLARE_READ8_MEMBER( cruread ); @@ -820,14 +820,14 @@ void ti99_4x_state::register_save_state() Machine definitions ******************************************************************************/ -MACHINE_START_MEMBER(ti99_4x_state,ti99_4) +void ti99_4x_state::machine_start_ti99_4() { m_nready_combined = 0; m_model = MODEL_4; register_save_state(); } -MACHINE_RESET_MEMBER(ti99_4x_state,ti99_4) +void ti99_4x_state::machine_reset_ti99_4() { m_cpu->set_ready(ASSERT_LINE); m_cpu->set_hold(CLEAR_LINE); @@ -848,8 +848,8 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4) MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(*this, ti99_4x_state, clock_out) ) MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(*this, ti99_4x_state, dbin_line) ) - MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4 ) - MCFG_MACHINE_RESET_OVERRIDE(ti99_4x_state, ti99_4 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti99_4, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti99_4, this)); // Main board MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000) @@ -942,14 +942,14 @@ MACHINE_CONFIG_END TI-99/4A - replaced the 99/4 and became the standard TI-99 console ***********************************************************************/ -MACHINE_START_MEMBER(ti99_4x_state,ti99_4a) +void ti99_4x_state::machine_start_ti99_4a() { m_nready_combined = 0; m_model = MODEL_4A; register_save_state(); } -MACHINE_RESET_MEMBER(ti99_4x_state,ti99_4a) +void ti99_4x_state::machine_reset_ti99_4a() { m_cpu->set_ready(ASSERT_LINE); m_cpu->set_hold(CLEAR_LINE); @@ -966,8 +966,8 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4a) MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(*this, ti99_4x_state, clock_out) ) MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(*this, ti99_4x_state, dbin_line) ) - MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4a ) - MCFG_MACHINE_RESET_OVERRIDE(ti99_4x_state, ti99_4a ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti99_4a, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti99_4a, this)); // Main board MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000) @@ -1064,7 +1064,7 @@ MACHINE_CONFIG_END those from Atarisoft. *************************************************************************/ -MACHINE_START_MEMBER(ti99_4x_state, ti99_4qi) +void ti99_4x_state::machine_start_ti99_4qi() { m_model = MODEL_4QI; m_nready_combined = 0; @@ -1073,7 +1073,7 @@ MACHINE_START_MEMBER(ti99_4x_state, ti99_4qi) MACHINE_CONFIG_START(ti99_4x_state::ti99_4qi) ti99_4a(config); - MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4qi ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti99_4qi, this)); MACHINE_CONFIG_END /* @@ -1098,7 +1098,7 @@ MACHINE_CONFIG_END which is intended to use the EVPC, does not have an own sound chip. *************************************************************************/ -MACHINE_START_MEMBER(ti99_4x_state, ti99_4ev) +void ti99_4x_state::machine_start_ti99_4ev() { m_nready_combined = 0; m_model = MODEL_4A; @@ -1108,7 +1108,7 @@ MACHINE_START_MEMBER(ti99_4x_state, ti99_4ev) register_save_state(); } -MACHINE_RESET_MEMBER(ti99_4x_state, ti99_4ev) +void ti99_4x_state::machine_reset_ti99_4ev() { m_cpu->set_ready(ASSERT_LINE); m_cpu->set_hold(CLEAR_LINE); @@ -1126,8 +1126,8 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4ev_60hz) MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(*this, ti99_4x_state, clock_out) ) MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(*this, ti99_4x_state, dbin_line) ) - MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4ev ) - MCFG_MACHINE_RESET_OVERRIDE(ti99_4x_state, ti99_4ev ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti99_4ev, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti99_4ev, this)); // Main board MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000) diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp index 8ad91d0895a..0e12f76b693 100644 --- a/src/mame/drivers/ti99_8.cpp +++ b/src/mame/drivers/ti99_8.cpp @@ -227,8 +227,8 @@ public: } // Machine management - DECLARE_MACHINE_START(ti99_8); - DECLARE_MACHINE_RESET(ti99_8); + void machine_start_ti99_8() ATTR_COLD; + void machine_reset_ti99_8(); // Processor connections with the main board DECLARE_READ8_MEMBER( cruread ); @@ -691,7 +691,7 @@ WRITE_LINE_MEMBER( ti99_8_state::dbin_line ) m_mainboard->dbin_in(state); } -MACHINE_START_MEMBER(ti99_8_state,ti99_8) +void ti99_8_state::machine_start_ti99_8() { // Need to configure the speech ROM for inverse bit order speechrom_device* mem = subdevice<speechrom_device>(TI998_SPEECHROM_REG); @@ -703,7 +703,7 @@ MACHINE_START_MEMBER(ti99_8_state,ti99_8) save_item(NAME(m_int2)); } -MACHINE_RESET_MEMBER(ti99_8_state, ti99_8) +void ti99_8_state::machine_reset_ti99_8() { m_cpu->hold_line(CLEAR_LINE); @@ -730,8 +730,8 @@ MACHINE_CONFIG_START(ti99_8_state::ti99_8) MCFG_TMS9995_DBIN_HANDLER( WRITELINE(*this, ti99_8_state, dbin_line) ) MCFG_TMS9995_HOLDA_HANDLER( WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, holda_line) ) - MCFG_MACHINE_START_OVERRIDE(ti99_8_state, ti99_8 ) - MCFG_MACHINE_RESET_OVERRIDE(ti99_8_state, ti99_8 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ti99_8, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ti99_8, this)); // 9901 configuration MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, XTAL(10'738'635)/4.0) diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp index 43ac507d597..b22e86f168e 100644 --- a/src/mame/drivers/tiamc1.cpp +++ b/src/mame/drivers/tiamc1.cpp @@ -363,7 +363,7 @@ MACHINE_CONFIG_START(tiamc1_state::kot) MCFG_DEVICE_IO_MAP(kotrybolov_io_map) MCFG_SCREEN_MODIFY("screen") - MCFG_VIDEO_START_OVERRIDE(tiamc1_state, kot) + set_video_start_cb(config, driver_callback_delegate(&video_start_kot, this)); MCFG_SCREEN_UPDATE_DRIVER(tiamc1_state, screen_update_kot) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_kot) diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp index c9b4f632e0b..fcc5497a467 100644 --- a/src/mame/drivers/tickee.cpp +++ b/src/mame/drivers/tickee.cpp @@ -79,9 +79,9 @@ public: DECLARE_WRITE16_MEMBER(ff7f_w); DECLARE_WRITE16_MEMBER(rapidfir_control_w); DECLARE_WRITE16_MEMBER(sound_bank_w); - DECLARE_MACHINE_RESET(tickee); - DECLARE_VIDEO_START(tickee); - DECLARE_MACHINE_RESET(rapidfir); + void machine_reset_tickee(); + void video_start_tickee() ATTR_COLD; + void machine_reset_rapidfir(); TIMER_CALLBACK_MEMBER(trigger_gun_interrupt); TIMER_CALLBACK_MEMBER(clear_gun_interrupt); TIMER_CALLBACK_MEMBER(setup_gun_interrupts); @@ -201,7 +201,7 @@ TIMER_CALLBACK_MEMBER(tickee_state::setup_gun_interrupts) * *************************************/ -VIDEO_START_MEMBER(tickee_state,tickee) +void tickee_state::video_start_tickee() { /* start a timer going on the first scanline of every frame */ m_setup_gun_timer = timer_alloc(TIMER_SETUP_GUN_INTERRUPTS); @@ -277,13 +277,13 @@ TMS340X0_SCANLINE_RGB32_CB_MEMBER(tickee_state::rapidfir_scanline_update) * *************************************/ -MACHINE_RESET_MEMBER(tickee_state,tickee) +void tickee_state::machine_reset_tickee() { m_beamxadd = 50; m_beamyadd = 0; } -MACHINE_RESET_MEMBER(tickee_state,rapidfir) +void tickee_state::machine_reset_rapidfir() { m_beamxadd = 0; m_beamyadd = -5; @@ -766,7 +766,7 @@ MACHINE_CONFIG_START(tickee_state::tickee) MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */ MCFG_TMS340X0_SCANLINE_RGB32_CB(tickee_state, scanline_update) /* scanline callback (rgb32) */ - MCFG_MACHINE_RESET_OVERRIDE(tickee_state,tickee) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tickee, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_TICKET_DISPENSER_ADD("ticket1", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH) @@ -775,7 +775,7 @@ MACHINE_CONFIG_START(tickee_state::tickee) /* video hardware */ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) - MCFG_VIDEO_START_OVERRIDE(tickee_state,tickee) + set_video_start_cb(config, driver_callback_delegate(&video_start_tickee, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) @@ -817,7 +817,7 @@ MACHINE_CONFIG_START(tickee_state::rapidfir) MCFG_TMS340X0_TO_SHIFTREG_CB(tickee_state, rapidfir_to_shiftreg) /* write to shiftreg function */ MCFG_TMS340X0_FROM_SHIFTREG_CB(tickee_state, rapidfir_from_shiftreg) /* read from shiftreg function */ - MCFG_MACHINE_RESET_OVERRIDE(tickee_state,rapidfir) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_rapidfir, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_WATCHDOG_ADD("watchdog") @@ -825,7 +825,7 @@ MACHINE_CONFIG_START(tickee_state::rapidfir) /* video hardware */ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) - MCFG_VIDEO_START_OVERRIDE(tickee_state,tickee) + set_video_start_cb(config, driver_callback_delegate(&video_start_tickee, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) @@ -849,7 +849,7 @@ MACHINE_CONFIG_START(tickee_state::mouseatk) MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */ MCFG_TMS340X0_SCANLINE_RGB32_CB(tickee_state, scanline_update) /* scanline callback (rgb32) */ - MCFG_MACHINE_RESET_OVERRIDE(tickee_state,tickee) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tickee, this)); MCFG_NVRAM_ADD_1FILL("nvram") MCFG_TICKET_DISPENSER_ADD("ticket1", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH) diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp index 9239fec90bc..59d831af379 100644 --- a/src/mame/drivers/timeplt.cpp +++ b/src/mame/drivers/timeplt.cpp @@ -479,7 +479,7 @@ MACHINE_CONFIG_START(timeplt_state::psurge) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) - MCFG_VIDEO_START_OVERRIDE(timeplt_state,psurge) + set_video_start_cb(config, driver_callback_delegate(&video_start_psurge, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(timeplt_state::bikkuric) @@ -491,7 +491,7 @@ MACHINE_CONFIG_START(timeplt_state::bikkuric) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(chkun_main_map) - MCFG_VIDEO_START_OVERRIDE(timeplt_state,chkun) + set_video_start_cb(config, driver_callback_delegate(&video_start_chkun, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(timeplt_state::chkun) diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp index d5d1b78716f..4e977d58638 100644 --- a/src/mame/drivers/timex.cpp +++ b/src/mame/drivers/timex.cpp @@ -547,7 +547,7 @@ void spectrum_state::ts2068_mem(address_map &map) } -MACHINE_RESET_MEMBER(spectrum_state,ts2068) +void spectrum_state::machine_reset_ts2068() { m_port_ff_data = 0; m_port_f4_data = 0; @@ -557,7 +557,7 @@ MACHINE_RESET_MEMBER(spectrum_state,ts2068) m_dock_cart_type = m_dock_crt ? TIMEX_CART_DOCK : TIMEX_CART_NONE; ts2068_update_memory(); - MACHINE_RESET_CALL_MEMBER(spectrum); + machine_reset_spectrum(); } @@ -583,7 +583,7 @@ void spectrum_state::tc2048_mem(address_map &map) map(0x4000, 0xffff).bankr("bank1").bankw("bank2"); } -MACHINE_RESET_MEMBER(spectrum_state,tc2048) +void spectrum_state::machine_reset_tc2048() { uint8_t *messram = m_ram->pointer(); @@ -591,7 +591,7 @@ MACHINE_RESET_MEMBER(spectrum_state,tc2048) membank("bank2")->set_base(messram); m_port_ff_data = 0; m_port_f4_data = -1; - MACHINE_RESET_CALL_MEMBER(spectrum); + machine_reset_spectrum(); } @@ -694,7 +694,7 @@ MACHINE_CONFIG_START(spectrum_state::ts2068) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, ts2068 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ts2068, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -706,7 +706,7 @@ MACHINE_CONFIG_START(spectrum_state::ts2068) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_ts2068) - MCFG_VIDEO_START_OVERRIDE(spectrum_state, ts2068 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_ts2068, this)); /* sound */ MCFG_DEVICE_REPLACE("ay8912", AY8912, XTAL(14'112'000)/8) /* From Schematic; 1.764 MHz */ @@ -739,7 +739,7 @@ MACHINE_CONFIG_START(spectrum_state::tc2048) MCFG_DEVICE_PROGRAM_MAP(tc2048_mem) MCFG_DEVICE_IO_MAP(tc2048_io) - MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, tc2048 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tc2048, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -749,7 +749,7 @@ MACHINE_CONFIG_START(spectrum_state::tc2048) MCFG_SCREEN_UPDATE_DRIVER(spectrum_state, screen_update_tc2048) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, spectrum_state, screen_vblank_timex)) - MCFG_VIDEO_START_OVERRIDE(spectrum_state, spectrum_128 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_spectrum_128, this)); /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index 77a37924400..01c4238e6fa 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -151,10 +151,12 @@ public: DECLARE_WRITE_LINE_MEMBER(sys9901_tapewdata_w); DECLARE_WRITE8_MEMBER( xmit_callback ); - DECLARE_MACHINE_START(tm990_189); - DECLARE_MACHINE_RESET(tm990_189); - DECLARE_MACHINE_START(tm990_189_v); - DECLARE_MACHINE_RESET(tm990_189_v); + + void machine_start_tm990_189() ATTR_COLD; + void machine_reset_tm990_189(); + + void machine_start_tm990_189_v() ATTR_COLD; + void machine_reset_tm990_189_v(); TIMER_DEVICE_CALLBACK_MEMBER(display_callback); TIMER_CALLBACK_MEMBER(clear_load); @@ -177,20 +179,20 @@ private: #define displayena_duration attotime::from_usec(4500) /* Can anyone confirm this? 74LS123 connected to C=0.1uF and R=100kOhm */ -MACHINE_RESET_MEMBER(tm990189_state,tm990_189) +void tm990189_state::machine_reset_tm990_189() { m_tms9980a->set_ready(ASSERT_LINE); m_tms9980a->set_hold(CLEAR_LINE); hold_load(); } -MACHINE_START_MEMBER(tm990189_state,tm990_189) +void tm990189_state::machine_start_tm990_189() { m_digits.resolve(); m_displayena_timer = machine().scheduler().timer_alloc(timer_expired_delegate()); } -MACHINE_START_MEMBER(tm990189_state,tm990_189_v) +void tm990189_state::machine_start_tm990_189_v() { m_digits.resolve(); m_displayena_timer = machine().scheduler().timer_alloc(timer_expired_delegate()); @@ -201,7 +203,7 @@ MACHINE_START_MEMBER(tm990189_state,tm990_189_v) m_joy2y_timer = machine().scheduler().timer_alloc(timer_expired_delegate()); } -MACHINE_RESET_MEMBER(tm990189_state,tm990_189_v) +void tm990189_state::machine_reset_tm990_189_v() { m_tms9980a->set_ready(ASSERT_LINE); m_tms9980a->set_hold(CLEAR_LINE); @@ -816,8 +818,8 @@ MACHINE_CONFIG_START(tm990189_state::tm990_189) MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2000000, tm990_189_memmap, tm990_189_cru_map) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, tm990189_state, external_operation) ) - MCFG_MACHINE_START_OVERRIDE(tm990189_state, tm990_189 ) - MCFG_MACHINE_RESET_OVERRIDE(tm990189_state, tm990_189 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tm990_189, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tm990_189, this)); /* Video hardware */ MCFG_DEFAULT_LAYOUT(layout_tm990189) @@ -871,8 +873,8 @@ MACHINE_CONFIG_START(tm990189_state::tm990_189_v) MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2000000, tm990_189_v_memmap, tm990_189_cru_map) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, tm990189_state, external_operation) ) - MCFG_MACHINE_START_OVERRIDE(tm990189_state, tm990_189_v ) - MCFG_MACHINE_RESET_OVERRIDE(tm990189_state, tm990_189_v ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tm990_189_v, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tm990_189_v, this)); /* video hardware */ MCFG_DEVICE_ADD( "tms9918", TMS9918, XTAL(10'738'635) / 2 ) diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index 122eac1cd11..400eeebd849 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -1889,7 +1889,7 @@ WRITE8_MEMBER(tmnt_state::volume_callback) m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); } -MACHINE_START_MEMBER(tmnt_state,common) +void tmnt_state::machine_start_common() { save_item(NAME(m_toggle)); save_item(NAME(m_last)); @@ -1901,7 +1901,7 @@ MACHINE_START_MEMBER(tmnt_state,common) save_item(NAME(m_irq5_mask)); } -MACHINE_RESET_MEMBER(tmnt_state,common) +void tmnt_state::machine_reset_common() { m_toggle = 0; m_last = 0; @@ -1917,8 +1917,8 @@ MACHINE_CONFIG_START(tmnt_state::cuebrick) MCFG_DEVICE_PROGRAM_MAP(cuebrick_main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt) - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -1940,7 +1940,7 @@ MACHINE_CONFIG_START(tmnt_state::cuebrick) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(tmnt_state,cuebrick) + set_video_start_cb(config, driver_callback_delegate(&video_start_cuebrick, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -1972,8 +1972,8 @@ MACHINE_CONFIG_START(tmnt_state::mia) MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) MCFG_DEVICE_PROGRAM_MAP(mia_audio_map) - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -1992,7 +1992,7 @@ MACHINE_CONFIG_START(tmnt_state::mia) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(tmnt_state,mia) + set_video_start_cb(config, driver_callback_delegate(&video_start_mia, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -2020,7 +2020,7 @@ MACHINE_CONFIG_START(tmnt_state::mia) MACHINE_CONFIG_END -MACHINE_RESET_MEMBER(tmnt_state,tmnt) +void tmnt_state::machine_reset_tmnt() { /* the UPD7759 control flip-flops are cleared: /ST is 1, /RESET is 0 */ m_upd7759->start_w(0); @@ -2037,8 +2037,8 @@ MACHINE_CONFIG_START(tmnt_state::tmnt) MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) MCFG_DEVICE_PROGRAM_MAP(tmnt_audio_map) - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,tmnt) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tmnt, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -2058,7 +2058,7 @@ MACHINE_CONFIG_START(tmnt_state::tmnt) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(tmnt_state,tmnt) + set_video_start_cb(config, driver_callback_delegate(&video_start_tmnt, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -2105,8 +2105,8 @@ MACHINE_CONFIG_START(tmnt_state::punkshot) MCFG_DEVICE_PROGRAM_MAP(punkshot_audio_map) /* NMIs are generated by the 053260 */ - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -2158,8 +2158,8 @@ MACHINE_CONFIG_START(tmnt_state::lgtnfght) MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) MCFG_DEVICE_PROGRAM_MAP(lgtnfght_audio_map) - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -2178,7 +2178,7 @@ MACHINE_CONFIG_START(tmnt_state::lgtnfght) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(tmnt_state,lgtnfght) + set_video_start_cb(config, driver_callback_delegate(&video_start_lgtnfght, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -2216,8 +2216,8 @@ MACHINE_CONFIG_START(tmnt_state::blswhstl) MCFG_DEVICE_PROGRAM_MAP(ssriders_audio_map) /* NMIs are generated by the 053260 */ - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") @@ -2239,7 +2239,7 @@ MACHINE_CONFIG_START(tmnt_state::blswhstl) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(tmnt_state, blswhstl ) + set_video_start_cb(config, driver_callback_delegate(&video_start_blswhstl, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -2295,8 +2295,8 @@ MACHINE_CONFIG_START(tmnt_state::glfgreat) MCFG_DEVICE_PROGRAM_MAP(glfgreat_audio_map) /* NMIs are generated by the 053260 */ - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_WATCHDOG_ADD("watchdog") @@ -2317,7 +2317,7 @@ MACHINE_CONFIG_START(tmnt_state::glfgreat) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(tmnt_state,glfgreat) + set_video_start_cb(config, driver_callback_delegate(&video_start_glfgreat, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -2344,9 +2344,9 @@ MACHINE_CONFIG_START(tmnt_state::glfgreat) MACHINE_CONFIG_END -MACHINE_START_MEMBER(tmnt_state,prmrsocr) +void tmnt_state::machine_start_prmrsocr() { - MACHINE_START_CALL_MEMBER(common); + machine_start_common(); uint8_t *ROM = memregion("audiocpu")->base(); membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x4000); } @@ -2362,8 +2362,8 @@ MACHINE_CONFIG_START(tmnt_state::prmrsocr) MCFG_DEVICE_PROGRAM_MAP(prmrsocr_audio_map) /* NMIs are generated by the 054539 */ - MCFG_MACHINE_START_OVERRIDE(tmnt_state,prmrsocr) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_prmrsocr, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") @@ -2386,7 +2386,7 @@ MACHINE_CONFIG_START(tmnt_state::prmrsocr) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(tmnt_state,prmrsocr) + set_video_start_cb(config, driver_callback_delegate(&video_start_prmrsocr, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -2432,8 +2432,8 @@ MACHINE_CONFIG_START(tmnt_state::tmnt2) MCFG_DEVICE_PROGRAM_MAP(ssriders_audio_map) /* NMIs are generated by the 053260 */ - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") @@ -2454,7 +2454,7 @@ MACHINE_CONFIG_START(tmnt_state::tmnt2) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(tmnt_state,lgtnfght) + set_video_start_cb(config, driver_callback_delegate(&video_start_lgtnfght, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -2492,8 +2492,8 @@ MACHINE_CONFIG_START(tmnt_state::ssriders) MCFG_DEVICE_PROGRAM_MAP(ssriders_audio_map) /* NMIs are generated by the 053260 */ - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") @@ -2514,7 +2514,7 @@ MACHINE_CONFIG_START(tmnt_state::ssriders) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_VIDEO_START_OVERRIDE(tmnt_state,lgtnfght) + set_video_start_cb(config, driver_callback_delegate(&video_start_lgtnfght, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") @@ -2548,8 +2548,8 @@ MACHINE_CONFIG_START(tmnt_state::sunsetbl) MCFG_DEVICE_PROGRAM_MAP(sunsetbl_main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, irq4_line_hold) - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") @@ -2599,8 +2599,8 @@ MACHINE_CONFIG_START(tmnt_state::thndrx2) MCFG_DEVICE_PROGRAM_MAP(thndrx2_audio_map) /* NMIs are generated by the 053260 */ - MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) - MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this)); MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index 6cde6c5486b..278b7828088 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -1927,7 +1927,7 @@ MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, toaplan1_rallybik_state, coin_lockout_1_w)) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, toaplan1_rallybik_state, coin_lockout_2_w)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,toaplan1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1943,7 +1943,7 @@ MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_rallybik_state,rallybik) + set_video_start_cb(config, driver_callback_delegate(&video_start_rallybik, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1966,7 +1966,7 @@ MACHINE_CONFIG_START(toaplan1_state::truxton) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,toaplan1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1980,7 +1980,7 @@ MACHINE_CONFIG_START(toaplan1_state::truxton) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_state,toaplan1) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2003,7 +2003,7 @@ MACHINE_CONFIG_START(toaplan1_state::hellfire) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,toaplan1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2017,7 +2017,7 @@ MACHINE_CONFIG_START(toaplan1_state::hellfire) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_state,toaplan1) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2040,7 +2040,7 @@ MACHINE_CONFIG_START(toaplan1_state::zerowing) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,zerowing) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_zerowing, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2054,7 +2054,7 @@ MACHINE_CONFIG_START(toaplan1_state::zerowing) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_state,toaplan1) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2082,7 +2082,7 @@ MACHINE_CONFIG_START(toaplan1_state::demonwld) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,demonwld) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_demonwld, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2096,7 +2096,7 @@ MACHINE_CONFIG_START(toaplan1_state::demonwld) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_state,toaplan1) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2119,7 +2119,7 @@ MACHINE_CONFIG_START(toaplan1_state::samesame) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,zerowing) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_zerowing, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2133,7 +2133,7 @@ MACHINE_CONFIG_START(toaplan1_state::samesame) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_state,toaplan1) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2156,7 +2156,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzone) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,zerowing) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_zerowing, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2170,7 +2170,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzone) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_state,toaplan1) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2193,7 +2193,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzonecv) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,zerowing) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_zerowing, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2207,7 +2207,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzonecv) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_state,toaplan1) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2230,7 +2230,7 @@ MACHINE_CONFIG_START(toaplan1_state::vimana) MCFG_QUANTUM_TIME(attotime::from_hz(600)) // GUESSED - MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,vimana) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_vimana, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2244,7 +2244,7 @@ MACHINE_CONFIG_START(toaplan1_state::vimana) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(toaplan1_state,toaplan1) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan1, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index b099bad81bc..a1c0a280b44 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -424,7 +424,7 @@ WRITE_LINE_MEMBER(toaplan2_state::toaplan2_reset) } -MACHINE_RESET_MEMBER(toaplan2_state,toaplan2) +void toaplan2_state::machine_reset_toaplan2() { // All games execute a RESET instruction on init, presumably to reset the sound CPU. // This is important for games with common RAM; the RAM test will fail @@ -433,9 +433,9 @@ MACHINE_RESET_MEMBER(toaplan2_state,toaplan2) } -MACHINE_RESET_MEMBER(toaplan2_state,ghox) +void toaplan2_state::machine_reset_ghox() { - MACHINE_RESET_CALL_MEMBER(toaplan2); + machine_reset_toaplan2(); m_old_p1_paddle_h = 0; m_old_p2_paddle_h = 0; } @@ -3249,7 +3249,7 @@ MACHINE_CONFIG_START(toaplan2_state::tekipaki) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -3269,7 +3269,7 @@ MACHINE_CONFIG_START(toaplan2_state::tekipaki) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3292,7 +3292,7 @@ MACHINE_CONFIG_START(toaplan2_state::ghox) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,ghox) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ghox, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -3312,7 +3312,7 @@ MACHINE_CONFIG_START(toaplan2_state::ghox) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3403,7 +3403,7 @@ MACHINE_CONFIG_START(toaplan2_state::dogyuun) MCFG_DEVICE_ADD("gp9001_1", GP9001_VDP, XTAL(27'000'000)) MCFG_GFX_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3449,7 +3449,7 @@ MACHINE_CONFIG_START(toaplan2_state::kbash) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3486,7 +3486,7 @@ MACHINE_CONFIG_START(toaplan2_state::kbash2) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3521,7 +3521,7 @@ MACHINE_CONFIG_START(toaplan2_state::truxton2) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_2)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,truxton2) + set_video_start_cb(config, driver_callback_delegate(&video_start_truxton2, this)); /* sound hardware */ #ifdef TRUXTON2_STEREO // music data is stereo... @@ -3558,7 +3558,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibs) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -3578,7 +3578,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibs) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3601,7 +3601,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibsbl) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -3621,7 +3621,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibsbl) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(ASSERTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3700,7 +3700,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeight) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,truxton2) + set_video_start_cb(config, driver_callback_delegate(&video_start_truxton2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3739,7 +3739,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeightbl) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(ASSERTLINE("maincpu", M68K_IRQ_2)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,fixeightbl) + set_video_start_cb(config, driver_callback_delegate(&video_start_fixeightbl, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3779,7 +3779,7 @@ MACHINE_CONFIG_START(toaplan2_state::vfive) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3823,7 +3823,7 @@ MACHINE_CONFIG_START(toaplan2_state::batsugun) MCFG_DEVICE_ADD("gp9001_1", GP9001_VDP, XTAL(27'000'000)) MCFG_GFX_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3862,7 +3862,7 @@ MACHINE_CONFIG_START(toaplan2_state::pwrkick) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3895,7 +3895,7 @@ MACHINE_CONFIG_START(toaplan2_state::othldrby) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3925,7 +3925,7 @@ MACHINE_CONFIG_START(toaplan2_state::enmadaio) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3962,7 +3962,7 @@ MACHINE_CONFIG_START(toaplan2_state::snowbro2) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan2, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3986,7 +3986,7 @@ MACHINE_CONFIG_START(toaplan2_state::mahoudai) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -4007,7 +4007,7 @@ MACHINE_CONFIG_START(toaplan2_state::mahoudai) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,bgaregga) + set_video_start_cb(config, driver_callback_delegate(&video_start_bgaregga, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4031,7 +4031,7 @@ MACHINE_CONFIG_START(toaplan2_state::shippumd) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -4052,7 +4052,7 @@ MACHINE_CONFIG_START(toaplan2_state::shippumd) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,bgaregga) + set_video_start_cb(config, driver_callback_delegate(&video_start_bgaregga, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4075,7 +4075,7 @@ MACHINE_CONFIG_START(toaplan2_state::bgaregga) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -4096,7 +4096,7 @@ MACHINE_CONFIG_START(toaplan2_state::bgaregga) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,bgaregga) + set_video_start_cb(config, driver_callback_delegate(&video_start_bgaregga, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4118,7 +4118,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(toaplan2_state::bgareggabl) bgaregga(config); - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,bgareggabl) + set_video_start_cb(config, driver_callback_delegate(&video_start_bgareggabl, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_bootleg) @@ -4136,7 +4136,7 @@ MACHINE_CONFIG_START(toaplan2_state::batrider) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan2, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -4157,7 +4157,7 @@ MACHINE_CONFIG_START(toaplan2_state::batrider) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_2)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,batrider) + set_video_start_cb(config, driver_callback_delegate(&video_start_batrider, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4195,7 +4195,7 @@ MACHINE_CONFIG_START(toaplan2_state::bbakraid) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_toaplan2, this)); MCFG_EEPROM_SERIAL_93C66_8BIT_ADD("eeprom") @@ -4218,7 +4218,7 @@ MACHINE_CONFIG_START(toaplan2_state::bbakraid) MCFG_GFX_PALETTE("palette") MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_1)) - MCFG_VIDEO_START_OVERRIDE(toaplan2_state,batrider) + set_video_start_cb(config, driver_callback_delegate(&video_start_batrider, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp index c7412e6c947..b42e90a80e2 100644 --- a/src/mame/drivers/tosh1000.cpp +++ b/src/mame/drivers/tosh1000.cpp @@ -72,7 +72,7 @@ public: , m_bram(*this, "bram") { } - DECLARE_MACHINE_RESET(tosh1000); + void machine_reset_tosh1000(); void init_tosh1000(); DECLARE_WRITE8_MEMBER(romdos_bank_w); @@ -106,7 +106,7 @@ void tosh1000_state::init_tosh1000() { } -MACHINE_RESET_MEMBER(tosh1000_state, tosh1000) +void tosh1000_state::machine_reset_tosh1000() { m_bram_latch = false; m_bram_offset = 0; @@ -265,7 +265,7 @@ MACHINE_CONFIG_START(tosh1000_state::tosh1000) MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8) MCFG_ADDRESS_MAP_BANK_STRIDE(0x10000) - MCFG_MACHINE_RESET_OVERRIDE(tosh1000_state, tosh1000) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tosh1000, this)); MCFG_IBM5160_MOTHERBOARD_ADD("mb", "maincpu") diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp index a4d10a3ebbc..97d950c4c25 100644 --- a/src/mame/drivers/trackfld.cpp +++ b/src/mame/drivers/trackfld.cpp @@ -869,7 +869,7 @@ GFXDECODE_END -MACHINE_START_MEMBER(trackfld_state,trackfld) +void trackfld_state::machine_start_trackfld() { save_item(NAME(m_irq_mask)); save_item(NAME(m_nmi_mask)); @@ -881,7 +881,7 @@ MACHINE_START_MEMBER(trackfld_state,trackfld) save_item(NAME(m_old_gfx_bank)); } -MACHINE_RESET_MEMBER(trackfld_state,trackfld) +void trackfld_state::machine_reset_trackfld() { m_bg_bank = 0; m_sprite_bank1 = 0; @@ -910,8 +910,8 @@ MACHINE_CONFIG_START(trackfld_state::trackfld) MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/4) MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_MACHINE_START_OVERRIDE(trackfld_state,trackfld) - MCFG_MACHINE_RESET_OVERRIDE(trackfld_state,trackfld) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_trackfld, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_trackfld, this)); MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 1D MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, trackfld_state, flipscreen_w)) // FLIP @@ -941,7 +941,7 @@ MACHINE_CONFIG_START(trackfld_state::trackfld) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(trackfld_state,trackfld) - MCFG_VIDEO_START_OVERRIDE(trackfld_state,trackfld) + set_video_start_cb(config, driver_callback_delegate(&video_start_trackfld, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -986,8 +986,8 @@ MACHINE_CONFIG_START(trackfld_state::yieartf) // MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/4) // MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_MACHINE_START_OVERRIDE(trackfld_state,trackfld) - MCFG_MACHINE_RESET_OVERRIDE(trackfld_state,trackfld) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_trackfld, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_trackfld, this)); MCFG_DEVICE_ADD("mainlatch", LS259, 0) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, trackfld_state, flipscreen_w)) @@ -1017,7 +1017,7 @@ MACHINE_CONFIG_START(trackfld_state::yieartf) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(trackfld_state,trackfld) - MCFG_VIDEO_START_OVERRIDE(trackfld_state,trackfld) + set_video_start_cb(config, driver_callback_delegate(&video_start_trackfld, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1069,8 +1069,8 @@ MACHINE_CONFIG_START(trackfld_state::hyprolyb) MCFG_DEVICE_MODIFY("audiocpu") MCFG_DEVICE_PROGRAM_MAP(hyprolyb_sound_map) - MCFG_MACHINE_START_OVERRIDE(trackfld_state,trackfld) - MCFG_MACHINE_RESET_OVERRIDE(trackfld_state,trackfld) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_trackfld, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_trackfld, this)); /* sound hardware */ MCFG_DEVICE_REMOVE("vlm") @@ -1090,7 +1090,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(trackfld_state::atlantol) hyprolyb(config); - MCFG_VIDEO_START_OVERRIDE(trackfld_state,atlantol) + set_video_start_cb(config, driver_callback_delegate(&video_start_atlantol, this)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index b9e3d5c7c06..96259b6be36 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -679,7 +679,7 @@ MACHINE_CONFIG_START(trs80_state::model3) MCFG_DEVICE_IO_MAP(model3_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(trs80_state, trs80_rtc_interrupt, 20.2752_MHz_XTAL / 10 / 67584) - MCFG_MACHINE_RESET_OVERRIDE(trs80_state, trs80m4) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_trs80m4, this)); MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_trs80m4) @@ -719,7 +719,7 @@ MACHINE_CONFIG_START(trs80_state::lnw80) MCFG_DEVICE_CLOCK(16_MHz_XTAL / 4) // or 16MHz / 9; 4MHz or 1.77MHz operation selected by HI/LO switch MCFG_DEVICE_PROGRAM_MAP(lnw80_map) MCFG_DEVICE_IO_MAP(lnw80_io) - MCFG_MACHINE_RESET_OVERRIDE(trs80_state, lnw80) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lnw80, this)); MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_lnw80) @@ -762,7 +762,7 @@ MACHINE_CONFIG_START(trs80_state::cp500) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(cp500_io) - MCFG_MACHINE_RESET_OVERRIDE(trs80_state, cp500) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cp500, this)); MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp index 97c221dd06d..d7a695f2774 100644 --- a/src/mame/drivers/trvquest.cpp +++ b/src/mame/drivers/trvquest.cpp @@ -152,7 +152,7 @@ static INPUT_PORTS_START( trvquest ) INPUT_PORTS_END -MACHINE_START_MEMBER(gameplan_state,trvquest) +void gameplan_state::machine_start_trvquest() { /* register for save states */ save_item(NAME(m_video_x)); @@ -164,7 +164,7 @@ MACHINE_START_MEMBER(gameplan_state,trvquest) m_via_0->write_pb5(1); } -MACHINE_RESET_MEMBER(gameplan_state,trvquest) +void gameplan_state::machine_reset_trvquest() { m_video_x = 0; m_video_y = 0; @@ -185,8 +185,8 @@ MACHINE_CONFIG_START(gameplan_state::trvquest) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gameplan_state, trvquest_interrupt) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_MACHINE_START_OVERRIDE(gameplan_state,trvquest) - MCFG_MACHINE_RESET_OVERRIDE(gameplan_state,trvquest) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_trvquest, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_trvquest, this)); /* video hardware */ trvquest_video(config); diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index eab513a9b10..0c8acc48c03 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -40,7 +40,7 @@ public: { } void init_ts802(); - DECLARE_MACHINE_RESET(ts802); + void machine_reset_ts802(); DECLARE_READ8_MEMBER(port00_r) { return 0x80; }; DECLARE_READ8_MEMBER(port0c_r) { return 1; }; DECLARE_READ8_MEMBER(port0e_r) { return 0; }; @@ -143,7 +143,7 @@ static void ts802_floppies(device_slot_interface &device) device.option_add("525dd", FLOPPY_525_DD); } -MACHINE_RESET_MEMBER( ts802_state, ts802 ) +void ts802_state::machine_reset_ts802() { membank("bankr0")->set_entry(0); // point at rom membank("bankw0")->set_entry(0); // always write to ram @@ -191,7 +191,7 @@ MACHINE_CONFIG_START(ts802_state::ts802) MCFG_DEVICE_PROGRAM_MAP(ts802_mem) MCFG_DEVICE_IO_MAP(ts802_io) //MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) // causes problems - MCFG_MACHINE_RESET_OVERRIDE(ts802_state, ts802) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ts802, this)); /* Devices */ MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index b7181baf540..bc16b887838 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -55,20 +55,20 @@ void tsamurai_state::machine_start() save_item(NAME(m_nmi_enabled)); } -MACHINE_START_MEMBER(tsamurai_state, tsamurai) +void tsamurai_state::machine_start_tsamurai() { save_item(NAME(m_sound_command1)); save_item(NAME(m_sound_command2)); machine_start(); } -MACHINE_START_MEMBER(tsamurai_state, m660) +void tsamurai_state::machine_start_m660() { - MACHINE_START_CALL_MEMBER(tsamurai); + machine_start_tsamurai(); save_item(NAME(m_sound_command3)); } -MACHINE_START_MEMBER(tsamurai_state, vsgongf) +void tsamurai_state::machine_start_vsgongf() { save_item(NAME(m_vsgongf_sound_nmi_enabled)); machine_start(); @@ -729,7 +729,7 @@ MACHINE_CONFIG_START(tsamurai_state::tsamurai) MCFG_DEVICE_ADD("audio2", Z80, XTAL(24'000'000)/8) MCFG_DEVICE_PROGRAM_MAP(sound2_map) - MCFG_MACHINE_START_OVERRIDE(tsamurai_state,tsamurai) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tsamurai, this)); MCFG_DEVICE_ADD("mainlatch", LS259, 0) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, tsamurai_state, flip_screen_w)) @@ -750,7 +750,7 @@ MACHINE_CONFIG_START(tsamurai_state::tsamurai) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(tsamurai_state,tsamurai) + set_video_start_cb(config, driver_callback_delegate(&video_start_tsamurai, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -777,7 +777,7 @@ MACHINE_CONFIG_START(tsamurai_state::vsgongf) MCFG_DEVICE_IO_MAP(vsgongf_audio_io_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(tsamurai_state, vsgongf_sound_interrupt, 3*60) - MCFG_MACHINE_START_OVERRIDE(tsamurai_state,vsgongf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_vsgongf, this)); MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 4L MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // vreg? always 0 @@ -798,7 +798,7 @@ MACHINE_CONFIG_START(tsamurai_state::vsgongf) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(tsamurai_state,vsgongf) + set_video_start_cb(config, driver_callback_delegate(&video_start_vsgongf, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -831,7 +831,7 @@ MACHINE_CONFIG_START(tsamurai_state::m660) MCFG_DEVICE_PROGRAM_MAP(sound3_m660_map) MCFG_DEVICE_IO_MAP(sound3_m660_io_map) - MCFG_MACHINE_START_OVERRIDE(tsamurai_state,m660) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_m660, this)); MCFG_DEVICE_ADD("mainlatch", LS259, 0) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, tsamurai_state, flip_screen_w)) @@ -854,7 +854,7 @@ MACHINE_CONFIG_START(tsamurai_state::m660) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_VIDEO_START_OVERRIDE(tsamurai_state,m660) + set_video_start_cb(config, driver_callback_delegate(&video_start_m660, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index e79836157d7..aa897ce93b3 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -345,7 +345,7 @@ void tubep_state::tubep_setup_save_state() -MACHINE_START_MEMBER(tubep_state,tubep) +void tubep_state::machine_start_tubep() { /* Create interrupt timer */ m_interrupt_timer = timer_alloc(TIMER_TUBEP_SCANLINE); @@ -354,7 +354,7 @@ MACHINE_START_MEMBER(tubep_state,tubep) } -MACHINE_RESET_MEMBER(tubep_state,tubep) +void tubep_state::machine_reset_tubep() { m_interrupt_timer->adjust(m_screen->time_until_pos(0)); } @@ -489,7 +489,7 @@ TIMER_CALLBACK_MEMBER(tubep_state::rjammer_scanline_callback) } -MACHINE_START_MEMBER(tubep_state,rjammer) +void tubep_state::machine_start_rjammer() { /* Create interrupt timer */ m_interrupt_timer = timer_alloc(TIMER_RJAMMER_SCANLINE); @@ -497,7 +497,7 @@ MACHINE_START_MEMBER(tubep_state,rjammer) tubep_setup_save_state(); } -MACHINE_RESET_MEMBER(tubep_state,rjammer) +void tubep_state::machine_reset_rjammer() { m_interrupt_timer->adjust(m_screen->time_until_pos(0)); } @@ -848,8 +848,8 @@ MACHINE_CONFIG_START(tubep_state::tubep) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, tubep_state, background_romselect_w)) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, tubep_state, colorproms_A4_line_w)) - MCFG_MACHINE_START_OVERRIDE(tubep_state,tubep) - MCFG_MACHINE_RESET_OVERRIDE(tubep_state,tubep) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tubep, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tubep, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -920,8 +920,8 @@ MACHINE_CONFIG_START(tubep_state::rjammer) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, tubep_state, coin2_counter_w)) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, tubep_state, screen_flip_w)) - MCFG_MACHINE_START_OVERRIDE(tubep_state,rjammer) - MCFG_MACHINE_RESET_OVERRIDE(tubep_state,rjammer) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_rjammer, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_rjammer, this)); /* video hardware */ diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index 48c79922795..84c7eca4ded 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -2000,7 +2000,7 @@ GFXDECODE_END /******************************************************************************/ -MACHINE_START_MEMBER(tumbleb_state,tumbleb) +void tumbleb_state::machine_start_tumbleb() { save_item(NAME(m_music_command)); save_item(NAME(m_music_bank)); @@ -2010,7 +2010,7 @@ MACHINE_START_MEMBER(tumbleb_state,tumbleb) save_item(NAME(m_tilebank)); } -MACHINE_RESET_MEMBER(tumbleb_state,tumbleb) +void tumbleb_state::machine_reset_tumbleb() { m_music_command = 0; m_music_bank = 0; @@ -2026,8 +2026,8 @@ MACHINE_CONFIG_START(tumbleb_state::tumblepb) MCFG_DEVICE_PROGRAM_MAP(tumblepopb_main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold) - MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb) - MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tumbleb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tumbleb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2047,7 +2047,7 @@ MACHINE_CONFIG_START(tumbleb_state::tumblepb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(tumbleb_state,tumblepb) + set_video_start_cb(config, driver_callback_delegate(&video_start_tumblepb, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2064,8 +2064,8 @@ MACHINE_CONFIG_START(tumbleb_state::tumbleb2) MCFG_DEVICE_PROGRAM_MAP(tumblepopb_main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, tumbleb2_interrupt) - MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb) - MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tumbleb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tumbleb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2085,7 +2085,7 @@ MACHINE_CONFIG_START(tumbleb_state::tumbleb2) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(tumbleb_state,tumblepb) + set_video_start_cb(config, driver_callback_delegate(&video_start_tumblepb, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2105,8 +2105,8 @@ MACHINE_CONFIG_START(tumbleb_state::jumpkids) MCFG_DEVICE_ADD("audiocpu", Z80, 8000000/2) MCFG_DEVICE_PROGRAM_MAP(jumpkids_sound_map) - MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb) - MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tumbleb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tumbleb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2126,7 +2126,7 @@ MACHINE_CONFIG_START(tumbleb_state::jumpkids) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(tumbleb_state,tumblepb) + set_video_start_cb(config, driver_callback_delegate(&video_start_tumblepb, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2144,8 +2144,8 @@ MACHINE_CONFIG_START(tumbleb_state::fncywld) MCFG_DEVICE_PROGRAM_MAP(fncywld_main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold) - MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb) - MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tumbleb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tumbleb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2166,7 +2166,7 @@ MACHINE_CONFIG_START(tumbleb_state::fncywld) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_VIDEO_START_OVERRIDE(tumbleb_state,fncywld) + set_video_start_cb(config, driver_callback_delegate(&video_start_fncywld, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2180,7 +2180,7 @@ MACHINE_CONFIG_END -MACHINE_RESET_MEMBER(tumbleb_state,htchctch) +void tumbleb_state::machine_reset_htchctch() { if (memregion("user1") != nullptr) { @@ -2192,7 +2192,7 @@ MACHINE_RESET_MEMBER(tumbleb_state,htchctch) m_mainram[0x000 / 2 + i] = PROTDATA[i]; } - MACHINE_RESET_CALL_MEMBER(tumbleb); + machine_reset_tumbleb(); } MACHINE_CONFIG_START(tumbleb_state::htchctch) @@ -2205,8 +2205,8 @@ MACHINE_CONFIG_START(tumbleb_state::htchctch) MCFG_DEVICE_ADD("audiocpu", Z80, 15000000/4) /* verified on dquizgo */ MCFG_DEVICE_PROGRAM_MAP(semicom_sound_map) - MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb) - MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,htchctch) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tumbleb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_htchctch, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2226,7 +2226,7 @@ MACHINE_CONFIG_START(tumbleb_state::htchctch) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(tumbleb_state,tumblepb) + set_video_start_cb(config, driver_callback_delegate(&video_start_tumblepb, this)); /* sound hardware - same as hyperpac */ SPEAKER(config, "mono").front_center(); @@ -2290,7 +2290,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(tumbleb_state::sdfight) bcstory(config); - MCFG_VIDEO_START_OVERRIDE(tumbleb_state,sdfight) + set_video_start_cb(config, driver_callback_delegate(&video_start_sdfight, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(tumbleb_state, screen_update_sdfight) MACHINE_CONFIG_END @@ -2319,8 +2319,8 @@ MACHINE_CONFIG_START(tumbleb_state::suprtrio) MCFG_DEVICE_ADD("audiocpu", Z80, 8000000) MCFG_DEVICE_PROGRAM_MAP(suprtrio_sound_map) - MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb) - MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tumbleb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tumbleb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2340,7 +2340,7 @@ MACHINE_CONFIG_START(tumbleb_state::suprtrio) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(tumbleb_state,suprtrio) + set_video_start_cb(config, driver_callback_delegate(&video_start_suprtrio, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2358,8 +2358,8 @@ MACHINE_CONFIG_START(tumbleb_state::pangpang) MCFG_DEVICE_PROGRAM_MAP(pangpang_main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, tumbleb2_interrupt) - MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb) - MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_tumbleb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tumbleb, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2379,7 +2379,7 @@ MACHINE_CONFIG_START(tumbleb_state::pangpang) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_VIDEO_START_OVERRIDE(tumbleb_state,pangpang) + set_video_start_cb(config, driver_callback_delegate(&video_start_pangpang, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp index ef175948410..f69d9928582 100644 --- a/src/mame/drivers/turbo.cpp +++ b/src/mame/drivers/turbo.cpp @@ -189,7 +189,7 @@ * *************************************/ -MACHINE_RESET_MEMBER(turbo_state,buckrog) +void turbo_state::machine_reset_buckrog() { m_buckrog_command = 0x00; memset(m_alt_spriteram, 0x00, sizeof(m_alt_spriteram)); @@ -891,7 +891,7 @@ MACHINE_CONFIG_START(turbo_state::turbo) MCFG_SCREEN_UPDATE_DRIVER(turbo_state, screen_update_turbo) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(turbo_state,turbo) + set_video_start_cb(config, driver_callback_delegate(&video_start_turbo, this)); /* sound hardware */ turbo_samples(config); @@ -931,7 +931,7 @@ MACHINE_CONFIG_START(turbo_state::subroc3d) MCFG_SCREEN_UPDATE_DRIVER(turbo_state, screen_update_subroc3d) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(turbo_state,turbo) + set_video_start_cb(config, driver_callback_delegate(&video_start_turbo, this)); /* sound hardware */ subroc3d_samples(config); @@ -951,7 +951,7 @@ MACHINE_CONFIG_START(turbo_state::buckrog) MCFG_DEVICE_IO_MAP(buckrog_cpu2_portmap) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(turbo_state,buckrog) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_buckrog, this)); MCFG_DEVICE_ADD("i8255_0", I8255, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, turbo_state, buckrog_ppi0a_w)) @@ -979,7 +979,7 @@ MACHINE_CONFIG_START(turbo_state::buckrog) MCFG_SCREEN_UPDATE_DRIVER(turbo_state, screen_update_buckrog) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(turbo_state,buckrog) + set_video_start_cb(config, driver_callback_delegate(&video_start_buckrog, this)); /* sound hardware */ buckrog_samples(config); diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp index 97679afc645..057bbd1acc9 100644 --- a/src/mame/drivers/twincobr.cpp +++ b/src/mame/drivers/twincobr.cpp @@ -669,7 +669,7 @@ MACHINE_CONFIG_START(twincobr_state::twincobr) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_RESET_OVERRIDE(twincobr_state,twincobr) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_twincobr, this)); MCFG_DEVICE_ADD("mainlatch", LS259, 0) MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, twincobr_state, int_enable_w)) @@ -706,7 +706,7 @@ MACHINE_CONFIG_START(twincobr_state::twincobr) MCFG_PALETTE_ADD("palette", 1792) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(twincobr_state,toaplan0) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan0, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp index e535c37c073..34f4f9cb97a 100644 --- a/src/mame/drivers/tx1.cpp +++ b/src/mame/drivers/tx1.cpp @@ -632,7 +632,7 @@ MACHINE_CONFIG_START(tx1_state::tx1) MCFG_DEVICE_IO_MAP(tx1_sound_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(tx1_state, irq0_line_hold, TX1_PIXEL_CLOCK / 4 / 2048 / 2) - MCFG_MACHINE_RESET_OVERRIDE(tx1_state,tx1) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tx1, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -662,7 +662,7 @@ MACHINE_CONFIG_START(tx1_state::tx1) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tx1_state, screen_vblank_tx1)) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(tx1_state,tx1) + set_video_start_cb(config, driver_callback_delegate(&video_start_tx1, this)); SPEAKER(config, "frontleft", -0.2, 0.0, 1.0); SPEAKER(config, "frontright", 0.2, 0.0, 1.0); @@ -696,7 +696,7 @@ MACHINE_CONFIG_START(tx1_state::buggyboy) MCFG_DEVICE_PERIODIC_INT_DRIVER(tx1_state, z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048) MCFG_DEVICE_IO_MAP(buggyboy_sound_io) - MCFG_MACHINE_RESET_OVERRIDE(tx1_state,buggyboy) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_buggyboy, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_DEVICE_ADD("ppi8255", I8255A, 0) @@ -725,7 +725,7 @@ MACHINE_CONFIG_START(tx1_state::buggyboy) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(tx1_state,buggyboy) - MCFG_VIDEO_START_OVERRIDE(tx1_state,buggyboy) + set_video_start_cb(config, driver_callback_delegate(&video_start_buggyboy, this)); SPEAKER(config, "frontleft", -0.2, 0.0, 1.0); SPEAKER(config, "frontright", 0.2, 0.0, 1.0); @@ -762,7 +762,7 @@ MACHINE_CONFIG_START(tx1_state::buggybjr) MCFG_DEVICE_IO_MAP(buggyboy_sound_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(tx1_state, z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048) - MCFG_MACHINE_RESET_OVERRIDE(tx1_state,buggyboy) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_buggyboy, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_SCREEN_ADD("screen", RASTER) @@ -773,7 +773,7 @@ MACHINE_CONFIG_START(tx1_state::buggybjr) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(tx1_state,buggyboy) - MCFG_VIDEO_START_OVERRIDE(tx1_state,buggybjr) + set_video_start_cb(config, driver_callback_delegate(&video_start_buggybjr, this)); SPEAKER(config, "frontleft", -0.2, 0.0, 1.0); SPEAKER(config, "frontright", 0.2, 0.0, 1.0); diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp index a2a425c3857..4b306df5afb 100644 --- a/src/mame/drivers/upscope.cpp +++ b/src/mame/drivers/upscope.cpp @@ -284,7 +284,7 @@ MACHINE_CONFIG_START(upscope_state::upscope) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INIT_OWNER(upscope_state,amiga) - MCFG_VIDEO_START_OVERRIDE(upscope_state,amiga) + set_video_start_cb(config, driver_callback_delegate(&video_start_amiga, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index ac1a43070f7..f7b57107512 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -192,7 +192,7 @@ MACHINE_CONFIG_START(ut88_state::ut88) MCFG_DEVICE_ADD("maincpu", I8080, 2000000) MCFG_DEVICE_PROGRAM_MAP(ut88_mem) MCFG_DEVICE_IO_MAP(ut88_io) - MCFG_MACHINE_RESET_OVERRIDE(ut88_state, ut88 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ut88, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -200,7 +200,7 @@ MACHINE_CONFIG_START(ut88_state::ut88) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(64*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 28*8-1) - MCFG_VIDEO_START_OVERRIDE(ut88_state,ut88) + set_video_start_cb(config, driver_callback_delegate(&video_start_ut88, this)); MCFG_SCREEN_UPDATE_DRIVER(ut88_state, screen_update_ut88) MCFG_SCREEN_PALETTE("palette") @@ -234,8 +234,8 @@ MACHINE_CONFIG_START(ut88_state::ut88mini) MCFG_DEVICE_ADD("maincpu", I8080, 2000000) MCFG_DEVICE_PROGRAM_MAP(ut88mini_mem) MCFG_DEVICE_IO_MAP(ut88mini_io) - MCFG_MACHINE_START_OVERRIDE(ut88_state,ut88mini) - MCFG_MACHINE_RESET_OVERRIDE(ut88_state, ut88mini ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_ut88mini, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ut88mini, this)); /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_ut88mini) diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index adbb53f0897..0b3b3ab22e3 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -89,7 +89,7 @@ public: DECLARE_WRITE8_MEMBER(v6809_address_w); DECLARE_WRITE8_MEMBER(v6809_register_w); void kbd_put(u8 data); - DECLARE_MACHINE_RESET(v6809); + void machine_reset_v6809(); MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); @@ -135,7 +135,7 @@ void v6809_state::v6809_mem(address_map &map) static INPUT_PORTS_START( v6809 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( v6809_state, v6809) +void v6809_state::machine_reset_v6809() { m_term_data = 0; m_pia0->cb1_w(1); @@ -282,7 +282,7 @@ MACHINE_CONFIG_START(v6809_state::v6809) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(16'000'000) / 4) // divided by 4 again internally MCFG_DEVICE_PROGRAM_MAP(v6809_mem) - MCFG_MACHINE_RESET_OVERRIDE(v6809_state, v6809) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_v6809, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp index 6f05b5dbb55..3134ac3afee 100644 --- a/src/mame/drivers/vcombat.cpp +++ b/src/mame/drivers/vcombat.cpp @@ -128,8 +128,8 @@ public: DECLARE_WRITE_LINE_MEMBER(sound_update); void init_shadfgtr(); void init_vcombat(); - DECLARE_MACHINE_RESET(vcombat); - DECLARE_MACHINE_RESET(shadfgtr); + void machine_reset_vcombat(); + void machine_reset_shadfgtr(); uint32_t update_screen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int index); uint32_t screen_update_vcombat_main(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_vcombat_aux(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -427,7 +427,7 @@ void vcombat_state::sound_map(address_map &map) } -MACHINE_RESET_MEMBER(vcombat_state,vcombat) +void vcombat_state::machine_reset_vcombat() { m_vid_0->i860_set_pin(DEC_PIN_BUS_HOLD, 1); m_vid_1->i860_set_pin(DEC_PIN_BUS_HOLD, 1); @@ -435,7 +435,7 @@ MACHINE_RESET_MEMBER(vcombat_state,vcombat) m_crtc_select = 0; } -MACHINE_RESET_MEMBER(vcombat_state,shadfgtr) +void vcombat_state::machine_reset_shadfgtr() { m_vid_0->i860_set_pin(DEC_PIN_BUS_HOLD, 1); @@ -572,7 +572,7 @@ MACHINE_CONFIG_START(vcombat_state::vcombat) MCFG_DEVICE_PERIODIC_INT_DRIVER(vcombat_state, irq1_line_hold, 15000) /* Remove this if MC6845 is enabled */ MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_MACHINE_RESET_OVERRIDE(vcombat_state,vcombat) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_vcombat, this)); /* Temporary hack for experimenting with timing. */ #if 0 @@ -615,7 +615,7 @@ MACHINE_CONFIG_START(vcombat_state::shadfgtr) MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_MACHINE_RESET_OVERRIDE(vcombat_state,shadfgtr) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_shadfgtr, this)); MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp index 96b87af1ccd..718b5ecd2d0 100644 --- a/src/mame/drivers/vegaeo.cpp +++ b/src/mame/drivers/vegaeo.cpp @@ -48,7 +48,7 @@ public: DECLARE_WRITE8_MEMBER(qs1000_p3_w); void init_vegaeo(); - DECLARE_VIDEO_START(vega); + void video_start_vega() ATTR_COLD; uint32_t screen_update_vega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void vega(machine_config &config); @@ -150,7 +150,7 @@ static INPUT_PORTS_START( crazywar ) INPUT_PORTS_END -VIDEO_START_MEMBER(vegaeo_state,vega) +void vegaeo_state::video_start_vega() { m_vram = std::make_unique<uint8_t[]>(0x14000*2); save_pointer(NAME(m_vram.get()), 0x14000*2); @@ -190,7 +190,7 @@ MACHINE_CONFIG_START(vegaeo_state::vega) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_MEMBITS(16) - MCFG_VIDEO_START_OVERRIDE(vegaeo_state,vega) + set_video_start_cb(config, driver_callback_delegate(&video_start_vega, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index d55b26b6c9d..e8974610482 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(vicdual_state::frogs) MCFG_DEVICE_PROGRAM_MAP(frogs_map) MCFG_DEVICE_IO_MAP(frogs_io_map) - MCFG_MACHINE_START_OVERRIDE(vicdual_state,frogs_audio) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_frogs_audio, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -991,7 +991,7 @@ static INPUT_PORTS_START( digger ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( vicdual_state, headon2 ) +void vicdual_state::machine_reset_headon2() { m_palette_bank = 3; } @@ -1005,7 +1005,7 @@ MACHINE_CONFIG_START(vicdual_state::headon2) MCFG_DEVICE_PROGRAM_MAP(headon2_map) MCFG_DEVICE_IO_MAP(headon2_io_map) - MCFG_MACHINE_RESET_OVERRIDE(vicdual_state, headon2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_headon2, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2348,7 +2348,7 @@ static INPUT_PORTS_START( samurai ) INPUT_PORTS_END -MACHINE_START_MEMBER(vicdual_state,samurai) +void vicdual_state::machine_start_samurai() { m_samurai_protection_data = 0; save_item(NAME(m_samurai_protection_data)); @@ -2364,7 +2364,7 @@ MACHINE_CONFIG_START(vicdual_state::samurai) MCFG_DEVICE_PROGRAM_MAP(samurai_map) MCFG_DEVICE_IO_MAP(samurai_io_map) - MCFG_MACHINE_START_OVERRIDE(vicdual_state,samurai) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_samurai, this)); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2524,7 +2524,7 @@ static INPUT_PORTS_START( nsub ) INPUT_PORTS_END -MACHINE_START_MEMBER(nsub_state, nsub) +void nsub_state::machine_start_nsub() { m_nsub_play_counter = 0; save_item(NAME(m_nsub_coin_counter)); @@ -2537,7 +2537,7 @@ MACHINE_START_MEMBER(nsub_state, nsub) m_nsub_coinage_timer->adjust(attotime::zero, 0, attotime::from_msec(150)); } -MACHINE_RESET_MEMBER(nsub_state, nsub) +void nsub_state::machine_reset_nsub() { m_nsub_coin_counter = m_coinage->read() & 7; @@ -2559,8 +2559,8 @@ MACHINE_CONFIG_START(nsub_state::nsub) MCFG_SCREEN_UPDATE_DRIVER(nsub_state, screen_update_color) MCFG_S97269PB_ADD("s97269pb") - MCFG_MACHINE_START_OVERRIDE(nsub_state, nsub) - MCFG_MACHINE_RESET_OVERRIDE(nsub_state, nsub) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_nsub, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_nsub, this)); /* audio hardware */ MCFG_S97271P_ADD("s97271p") diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index 6d91c5ca464..91d870f2e02 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -371,7 +371,7 @@ public: virtual void machine_start() override; virtual void video_start() override; DECLARE_PALETTE_INIT(videopkr); - DECLARE_VIDEO_START(vidadcba); + void video_start_vidadcba() ATTR_COLD; DECLARE_PALETTE_INIT(babypkr); DECLARE_PALETTE_INIT(fortune1); uint32_t screen_update_videopkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -546,7 +546,7 @@ void videopkr_state::video_start() m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(videopkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } -VIDEO_START_MEMBER(videopkr_state,vidadcba) +void videopkr_state::video_start_vidadcba() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(videopkr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 32, 32); } @@ -1333,7 +1333,7 @@ MACHINE_CONFIG_START(videopkr_state::videodad) MCFG_SCREEN_VISIBLE_AREA(4*16, 31*16-1, 2*8, 30*8-1) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_videodad) - MCFG_VIDEO_START_OVERRIDE(videopkr_state,vidadcba) + set_video_start_cb(config, driver_callback_delegate(&video_start_vidadcba, this)); MACHINE_CONFIG_END @@ -1364,7 +1364,7 @@ MACHINE_CONFIG_START(videopkr_state::babypkr) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(videopkr_state,babypkr) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_videodad) - MCFG_VIDEO_START_OVERRIDE(videopkr_state,vidadcba) + set_video_start_cb(config, driver_callback_delegate(&video_start_vidadcba, this)); MCFG_DEVICE_ADD("aysnd", AY8910, CPU_CLOCK / 6) /* no ports used */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp index 9b84ef57280..3912d77f06c 100644 --- a/src/mame/drivers/vlc.cpp +++ b/src/mame/drivers/vlc.cpp @@ -202,7 +202,7 @@ public: DECLARE_WRITE16_MEMBER( nevada_sec_w ); DECLARE_WRITE16_MEMBER( vram_w ); - DECLARE_MACHINE_START(nevada); + void machine_start_nevada() ATTR_COLD; void init_nevada(); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -570,7 +570,7 @@ INPUT_PORTS_END * Machine start * *************************/ -MACHINE_START_MEMBER(nevada_state, nevada) +void nevada_state::machine_start_nevada() { m_nvram->set_base(m_ram62256, 0x1000); } @@ -589,7 +589,7 @@ MACHINE_CONFIG_START(nevada_state::nevada) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(150)) /* 150ms Ds1232 TD to Ground */ - MCFG_MACHINE_START_OVERRIDE(nevada_state, nevada) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_nevada, this)); MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", nevada_state, nvram_init) diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp index 870860b1c8c..4e7ee3231e5 100644 --- a/src/mame/drivers/votrtnt.cpp +++ b/src/mame/drivers/votrtnt.cpp @@ -51,7 +51,7 @@ public: , m_clock(*this, "acia_clock") { } - DECLARE_MACHINE_RESET(votrtnt); + void machine_reset_votrtnt(); void votrtnt(machine_config &config); void _6802_mem(address_map &map); @@ -112,7 +112,7 @@ static INPUT_PORTS_START(votrtnt) PORT_DIPSETTING( 0x80, "9600" ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( votrtnt_state, votrtnt ) +void votrtnt_state::machine_reset_votrtnt() { // Read the dips, whichever one is found to be on first is accepted u8 dips = ioport("DSW1")->read(); @@ -140,7 +140,7 @@ MACHINE_CONFIG_START(votrtnt_state::votrtnt) MCFG_DEVICE_ADD("maincpu", M6802, XTAL(2'457'600)) /* 2.4576MHz XTAL, verified; divided by 4 inside the m6802*/ MCFG_DEVICE_PROGRAM_MAP(_6802_mem) - MCFG_MACHINE_RESET_OVERRIDE(votrtnt_state, votrtnt) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_votrtnt, this)); /* video hardware */ //MCFG_DEFAULT_LAYOUT(layout_votrtnt) diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp index 03aa62e370d..6f29f8d5ac6 100644 --- a/src/mame/drivers/vsnes.cpp +++ b/src/mame/drivers/vsnes.cpp @@ -1707,8 +1707,8 @@ MACHINE_CONFIG_START(vsnes_state::vsnes) MCFG_DEVICE_ADD("maincpu", N2A03, NTSC_APU_CLOCK) MCFG_DEVICE_PROGRAM_MAP(vsnes_cpu1_map) /* some carts also trigger IRQs */ - MCFG_MACHINE_RESET_OVERRIDE(vsnes_state,vsnes) - MCFG_MACHINE_START_OVERRIDE(vsnes_state,vsnes) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_vsnes, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_vsnes, this)); /* video hardware */ MCFG_SCREEN_ADD("screen1", RASTER) @@ -1775,8 +1775,8 @@ MACHINE_CONFIG_START(vsnes_state::vsdual) MCFG_DEVICE_ADD("sub", N2A03, NTSC_APU_CLOCK) MCFG_DEVICE_PROGRAM_MAP(vsnes_cpu2_map) - MCFG_MACHINE_RESET_OVERRIDE(vsnes_state,vsdual) - MCFG_MACHINE_START_OVERRIDE(vsnes_state,vsdual) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_vsdual, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_vsdual, this)); MCFG_DEFAULT_LAYOUT(layout_dualhsxs) @@ -1821,8 +1821,8 @@ MACHINE_CONFIG_START(vsnes_state::vsnes_bootleg) MCFG_DEVICE_ADD("maincpu", M6502,XTAL(16'000'000)/4) // 4mhz? seems too high but flickers badly otherwise, issue elsewhere? MCFG_DEVICE_PROGRAM_MAP(vsnes_cpu1_bootleg_map) /* some carts also trigger IRQs */ - MCFG_MACHINE_RESET_OVERRIDE(vsnes_state,vsnes) - MCFG_MACHINE_START_OVERRIDE(vsnes_state,vsnes) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_vsnes, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_vsnes, this)); MCFG_DEVICE_ADD("sub", Z80,XTAL(16'000'000)/4) /* ? MHz */ // Z8400APS-Z80CPU MCFG_DEVICE_PROGRAM_MAP(vsnes_bootleg_z80_map) diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp index a6e044ee83f..68f689f630f 100644 --- a/src/mame/drivers/vtech2.cpp +++ b/src/mame/drivers/vtech2.cpp @@ -457,13 +457,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(vtech2_state::laser500) laser350(config); - MCFG_MACHINE_RESET_OVERRIDE(vtech2_state, laser500 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_laser500, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(vtech2_state::laser700) laser350(config); - MCFG_MACHINE_RESET_OVERRIDE(vtech2_state, laser700 ) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_laser700, this)); /* Second 5.25" floppy drive */ MCFG_LEGACY_FLOPPY_DRIVE_ADD( FLOPPY_1, vtech2_floppy_interface ) diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index ce3780b746b..6ed15ecbb5c 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -104,8 +104,8 @@ private: DECLARE_PALETTE_INIT(wallc); DECLARE_PALETTE_INIT(unkitpkr); - DECLARE_VIDEO_START(unkitpkr); - DECLARE_VIDEO_START(sidampkr); + void video_start_unkitpkr() ATTR_COLD; + void video_start_sidampkr() ATTR_COLD; }; @@ -238,12 +238,12 @@ void wallc_state::video_start() m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wallc_state::get_bg_tile_info), this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); } -VIDEO_START_MEMBER(wallc_state, unkitpkr) +void wallc_state::video_start_unkitpkr() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wallc_state::get_bg_tile_info_unkitpkr), this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); } -VIDEO_START_MEMBER(wallc_state, sidampkr) +void wallc_state::video_start_sidampkr() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wallc_state::get_bg_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -545,7 +545,7 @@ MACHINE_CONFIG_START(wallc_state::unkitpkr) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(unkitpkr_map) - MCFG_VIDEO_START_OVERRIDE(wallc_state, unkitpkr) + set_video_start_cb(config, driver_callback_delegate(&video_start_unkitpkr, this)); MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(wallc_state, unkitpkr) @@ -558,7 +558,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(wallc_state::sidampkr) unkitpkr(config); - MCFG_VIDEO_START_OVERRIDE(wallc_state, sidampkr) + set_video_start_cb(config, driver_callback_delegate(&video_start_sidampkr, this)); MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index 4ac08f52c56..e8ae3de4b77 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -370,7 +370,7 @@ void wardner_state::driver_start() void wardner_state::machine_reset() { - MACHINE_RESET_CALL_MEMBER(twincobr); + machine_reset_twincobr(); m_membank->set_bank(0); } @@ -436,7 +436,7 @@ MACHINE_CONFIG_START(wardner_state::wardner) MCFG_PALETTE_ADD("palette", 1792) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_VIDEO_START_OVERRIDE(wardner_state,toaplan0) + set_video_start_cb(config, driver_callback_delegate(&video_start_toaplan0, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp index 97585d47c62..fb5e188e488 100644 --- a/src/mame/drivers/warpwarp.cpp +++ b/src/mame/drivers/warpwarp.cpp @@ -741,7 +741,7 @@ MACHINE_CONFIG_START(warpwarp_state::geebee) MCFG_PALETTE_ADD("palette", 4*2) MCFG_PALETTE_INIT_OWNER(warpwarp_state,geebee) - MCFG_VIDEO_START_OVERRIDE(warpwarp_state,geebee) + set_video_start_cb(config, driver_callback_delegate(&video_start_geebee, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -765,7 +765,7 @@ MACHINE_CONFIG_START(warpwarp_state::navarone) MCFG_PALETTE_ENTRIES(2*2) MCFG_PALETTE_INIT_OWNER(warpwarp_state,navarone) - MCFG_VIDEO_START_OVERRIDE(warpwarp_state,navarone) + set_video_start_cb(config, driver_callback_delegate(&video_start_navarone, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(warpwarp_state::kaitei) @@ -776,7 +776,7 @@ MACHINE_CONFIG_START(warpwarp_state::kaitei) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4*2+1) - MCFG_MACHINE_RESET_OVERRIDE(warpwarp_state,kaitei) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_kaitei, this)); MACHINE_CONFIG_END @@ -809,7 +809,7 @@ MACHINE_CONFIG_START(warpwarp_state::bombbee) MCFG_PALETTE_ADD("palette", 2*256+1) MCFG_PALETTE_INIT_OWNER(warpwarp_state,warpwarp) - MCFG_VIDEO_START_OVERRIDE(warpwarp_state,warpwarp) + set_video_start_cb(config, driver_callback_delegate(&video_start_warpwarp, this)); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp index 494636bccc3..3c7547f3311 100644 --- a/src/mame/drivers/wc90.cpp +++ b/src/mame/drivers/wc90.cpp @@ -394,7 +394,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(wc90_state::wc90t) wc90(config); - MCFG_VIDEO_START_OVERRIDE(wc90_state, wc90t ) + set_video_start_cb(config, driver_callback_delegate(&video_start_wc90t, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(wc90_state::pac90) diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index ca577f2f5f1..1a6d9c9c56b 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -1030,12 +1030,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(wecleman_state::hotchase_scanline) m_maincpu->set_input_line(4, HOLD_LINE); } -MACHINE_RESET_MEMBER(wecleman_state, wecleman) +void wecleman_state::machine_reset_wecleman() { m_k007232[0]->set_bank( 0, 1 ); } -MACHINE_START_MEMBER(wecleman_state, wecleman) +void wecleman_state::machine_start_wecleman() { m_led.resolve(); } @@ -1056,8 +1056,8 @@ MACHINE_CONFIG_START(wecleman_state::wecleman) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_START_OVERRIDE(wecleman_state, wecleman) - MCFG_MACHINE_RESET_OVERRIDE(wecleman_state, wecleman) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_wecleman, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_wecleman, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1071,7 +1071,7 @@ MACHINE_CONFIG_START(wecleman_state::wecleman) MCFG_PALETTE_ADD("palette", 2048) - MCFG_VIDEO_START_OVERRIDE(wecleman_state,wecleman) + set_video_start_cb(config, driver_callback_delegate(&video_start_wecleman, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -1099,18 +1099,16 @@ INTERRUPT_GEN_MEMBER(wecleman_state::hotchase_sound_timer) device.execute().set_input_line(M6809_FIRQ_LINE, HOLD_LINE); } -MACHINE_START_MEMBER(wecleman_state, hotchase) +void wecleman_state::machine_start_hotchase() { m_led.resolve(); } -MACHINE_RESET_MEMBER(wecleman_state, hotchase) +void wecleman_state::machine_reset_hotchase() { - int i; - /* TODO: PCB reference clearly shows that the POST has random/filled data on the paletteram. For now let's fill everything with white colors until we have better info about it */ - for(i=0;i<0x2000/2;i++) + for (int i = 0; i < 0x2000 / 2; i++) { m_generic_paletteram_16[i] = 0xffff; m_palette->set_pen_color(i,0xff,0xff,0xff); @@ -1134,8 +1132,8 @@ MACHINE_CONFIG_START(wecleman_state::hotchase) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_RESET_OVERRIDE(wecleman_state, hotchase) - MCFG_MACHINE_START_OVERRIDE(wecleman_state, hotchase) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_hotchase, this)); + set_machine_start_cb(config, driver_callback_delegate(&machine_start_hotchase, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1149,7 +1147,7 @@ MACHINE_CONFIG_START(wecleman_state::hotchase) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hotchase) MCFG_PALETTE_ADD("palette", 2048*2) - MCFG_VIDEO_START_OVERRIDE(wecleman_state, hotchase) + set_video_start_cb(config, driver_callback_delegate(&video_start_hotchase, this)); MCFG_DEVICE_ADD("k051316_1", K051316, 0) MCFG_GFX_PALETTE("palette") diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp index 5e3e61e2210..af7acdfd3fd 100644 --- a/src/mame/drivers/wgp.cpp +++ b/src/mame/drivers/wgp.cpp @@ -971,7 +971,7 @@ MACHINE_CONFIG_START(wgp_state::wgp2) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(wgp_state, wgp2) + set_video_start_cb(config, driver_callback_delegate(&video_start_wgp2, this)); MCFG_DEVICE_MODIFY("tc0100scn") MCFG_TC0100SCN_OFFSETS(4, 2) diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp index 085bad25a8c..326a1b43311 100644 --- a/src/mame/drivers/williams.cpp +++ b/src/mame/drivers/williams.cpp @@ -1471,8 +1471,8 @@ MACHINE_CONFIG_START(williams_state::williams) MCFG_DEVICE_ADD("soundcpu", M6808, SOUND_CLOCK) // internal clock divider of 4, effective frequency is 894.886kHz MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_MACHINE_START_OVERRIDE(williams_state,williams) - MCFG_MACHINE_RESET_OVERRIDE(williams_state,williams) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_williams, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_williams, this)); MCFG_NVRAM_ADD_0FILL("nvram") // 5101 (Defender), 5114 or 6514 (later games) + battery MCFG_TIMER_DRIVER_ADD("scan_timer", williams_state, williams_va11_callback) @@ -1486,7 +1486,7 @@ MACHINE_CONFIG_START(williams_state::williams) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 6, 298, 260, 7, 247) MCFG_SCREEN_UPDATE_DRIVER(williams_state, screen_update_williams) - MCFG_VIDEO_START_OVERRIDE(williams_state,williams) + set_video_start_cb(config, driver_callback_delegate(&video_start_williams, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1530,8 +1530,8 @@ MACHINE_CONFIG_START(williams_state::defender) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(16) MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) - MCFG_MACHINE_START_OVERRIDE(williams_state,defender) - MCFG_MACHINE_RESET_OVERRIDE(williams_state,defender) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_defender, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_defender, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(12, 304-1, 7, 247-1) @@ -1648,11 +1648,11 @@ MACHINE_CONFIG_START(blaster_state::blastkit) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(blaster_map) - MCFG_MACHINE_START_OVERRIDE(blaster_state,blaster) - MCFG_MACHINE_RESET_OVERRIDE(blaster_state,blaster) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_blaster, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_blaster, this)); /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(blaster_state,blaster) + set_video_start_cb(config, driver_callback_delegate(&video_start_blaster, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(blaster_state, screen_update_blaster) @@ -1733,8 +1733,8 @@ MACHINE_CONFIG_START(williams2_state::williams2) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(12) MCFG_ADDRESS_MAP_BANK_STRIDE(0x0800) - MCFG_MACHINE_START_OVERRIDE(williams2_state,williams2) - MCFG_MACHINE_RESET_OVERRIDE(williams2_state,williams2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_williams2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_williams2, this)); MCFG_NVRAM_ADD_0FILL("nvram") // 5114 + battery MCFG_TIMER_DRIVER_ADD("scan_timer", williams2_state, williams2_va11_callback) @@ -1751,7 +1751,7 @@ MACHINE_CONFIG_START(williams2_state::williams2) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 8, 284, 260, 8, 248) MCFG_SCREEN_UPDATE_DRIVER(williams2_state, screen_update_williams2) - MCFG_VIDEO_START_OVERRIDE(williams2_state,williams2) + set_video_start_cb(config, driver_callback_delegate(&video_start_williams2, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1846,8 +1846,8 @@ MACHINE_CONFIG_START(joust2_state::joust2) MCFG_DEVICE_ADD("cvsd", WILLIAMS_CVSD_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_MACHINE_START_OVERRIDE(joust2_state,joust2) - MCFG_MACHINE_RESET_OVERRIDE(joust2_state,joust2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_joust2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_joust2, this)); /* pia */ MCFG_DEVICE_MODIFY("pia_0") diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp index f047d0b921d..575b653c8d6 100644 --- a/src/mame/drivers/wmg.cpp +++ b/src/mame/drivers/wmg.cpp @@ -90,7 +90,7 @@ public: , m_keyboard(*this, "X%d", 0) { } - DECLARE_MACHINE_RESET(wmg); + void machine_reset_wmg(); void init_wmg(); DECLARE_READ8_MEMBER(wmg_nvram_r); DECLARE_WRITE8_MEMBER(wmg_nvram_w); @@ -413,7 +413,7 @@ WRITE8_MEMBER( wmg_state::wmg_d000_w ) } -MACHINE_RESET_MEMBER( wmg_state, wmg ) +void wmg_state::machine_reset_wmg() { address_space &space1 = m_maincpu->space(AS_PROGRAM); m_wmg_c400=0xff; @@ -421,7 +421,7 @@ MACHINE_RESET_MEMBER( wmg_state, wmg ) m_wmg_port_select=0; m_wmg_vram_bank=0; wmg_c400_w( space1, 0, 0); - MACHINE_RESET_CALL_MEMBER(williams_common); + machine_reset_williams_common(); m_maincpu->reset(); } @@ -499,8 +499,8 @@ MACHINE_CONFIG_START(wmg_state::wmg) MCFG_DEVICE_ADD("soundcpu", M6808, SOUND_CLOCK) MCFG_DEVICE_PROGRAM_MAP(wmg_cpu2) - MCFG_MACHINE_START_OVERRIDE(williams_state,williams) - MCFG_MACHINE_RESET_OVERRIDE(wmg_state, wmg) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_williams, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_wmg, this)); MCFG_NVRAM_ADD_0FILL("nvram") MCFG_TIMER_DRIVER_ADD("scan_timer", williams_state, williams_va11_callback) @@ -514,7 +514,7 @@ MACHINE_CONFIG_START(wmg_state::wmg) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 6, 298, 260, 7, 247) MCFG_SCREEN_UPDATE_DRIVER(williams_state, screen_update_williams) - MCFG_VIDEO_START_OVERRIDE(williams_state,williams) + set_video_start_cb(config, driver_callback_delegate(&video_start_williams, this)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index 646063e60a9..ea1be8a6f67 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -74,7 +74,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); DECLARE_WRITE8_MEMBER(bgram_w); DECLARE_WRITE8_MEMBER(fgram_w); - DECLARE_VIDEO_START(wyvernf0); + void video_start_wyvernf0() ATTR_COLD; uint32_t screen_update_wyvernf0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, bool is_foreground ); @@ -89,8 +89,8 @@ public: DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(nmi_disable_w); DECLARE_WRITE8_MEMBER(nmi_enable_w); - DECLARE_MACHINE_START(wyvernf0); - DECLARE_MACHINE_RESET(wyvernf0); + void machine_start_wyvernf0() ATTR_COLD; + void machine_reset_wyvernf0(); TIMER_CALLBACK_MEMBER(nmi_callback); // MCU @@ -157,7 +157,7 @@ TILE_GET_INFO_MEMBER(wyvernf0_state::get_fg_tile_info) SET_TILE_INFO_MEMBER(1, code, color, TILE_FLIPXY(code >> 14)); } -VIDEO_START_MEMBER(wyvernf0_state,wyvernf0) +void wyvernf0_state::video_start_wyvernf0() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wyvernf0_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wyvernf0_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -613,7 +613,7 @@ GFXDECODE_END ***************************************************************************/ -MACHINE_START_MEMBER(wyvernf0_state,wyvernf0) +void wyvernf0_state::machine_start_wyvernf0() { uint8_t *ROM = memregion("rombank")->base(); membank("rombank")->configure_entries(0, 8, ROM, 0x2000); @@ -631,7 +631,7 @@ MACHINE_START_MEMBER(wyvernf0_state,wyvernf0) save_item(NAME(m_mcu_ready)); } -MACHINE_RESET_MEMBER(wyvernf0_state,wyvernf0) +void wyvernf0_state::machine_reset_wyvernf0() { m_sound_nmi_enable = 0; m_pending_nmi = 0; @@ -656,8 +656,8 @@ MACHINE_CONFIG_START(wyvernf0_state::wyvernf0) // MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU - MCFG_MACHINE_START_OVERRIDE(wyvernf0_state,wyvernf0) - MCFG_MACHINE_RESET_OVERRIDE(wyvernf0_state,wyvernf0) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_wyvernf0, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_wyvernf0, this)); // video hardware MCFG_SCREEN_ADD("screen", RASTER) @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(wyvernf0_state::wyvernf0) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_VIDEO_START_OVERRIDE(wyvernf0_state,wyvernf0) + set_video_start_cb(config, driver_callback_delegate(&video_start_wyvernf0, this)); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index c2cd9f511df..d23b6276979 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -2089,7 +2089,7 @@ TIMER_CALLBACK_MEMBER(x1_state::x1_rtc_increment) if((m_rtc.year & 0xf0) >= 0xa0) { m_rtc.year = 0; } //roll over } -MACHINE_RESET_MEMBER(x1_state,x1) +void x1_state::machine_reset_x1() { //uint8_t *ROM = memregion("x1_cpu")->base(); int i; @@ -2133,9 +2133,9 @@ MACHINE_RESET_MEMBER(x1_state,x1) // m_old_vpos = -1; } -MACHINE_RESET_MEMBER(x1_state,x1turbo) +void x1_state::machine_reset_x1turbo() { - MACHINE_RESET_CALL_MEMBER( x1 ); + machine_reset_x1(); m_is_turbo = 1; m_ex_bank = 0x10; @@ -2153,7 +2153,7 @@ static const gfx_layout x1_pcg_8x8 = 8*8 }; -MACHINE_START_MEMBER(x1_state,x1) +void x1_state::machine_start_x1() { /* set up RTC */ { @@ -2229,8 +2229,8 @@ MACHINE_CONFIG_START(x1_state::x1) MCFG_I8255_IN_PORTC_CB(READ8(*this, x1_state, x1_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, x1_state, x1_portc_w)) - MCFG_MACHINE_START_OVERRIDE(x1_state,x1) - MCFG_MACHINE_RESET_OVERRIDE(x1_state,x1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_x1, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_x1, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2249,7 +2249,7 @@ MACHINE_CONFIG_START(x1_state::x1) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_x1) - MCFG_VIDEO_START_OVERRIDE(x1_state,x1) + set_video_start_cb(config, driver_callback_delegate(&video_start_x1, this)); MCFG_MB8877_ADD("fdc", MAIN_CLOCK / 16) // TODO: guesswork, try to implicitily start the motor @@ -2294,7 +2294,7 @@ MACHINE_CONFIG_START(x1_state::x1turbo) MCFG_DEVICE_MODIFY("x1_cpu") MCFG_DEVICE_PROGRAM_MAP(x1turbo_mem) MCFG_Z80_DAISY_CHAIN(x1turbo_daisy) - MCFG_MACHINE_RESET_OVERRIDE(x1_state,x1turbo) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_x1turbo, this)); MCFG_DEVICE_MODIFY("iobank") MCFG_DEVICE_PROGRAM_MAP(x1turbo_io_banks) diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index 2ac2ae944a9..85f9ce7318e 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -441,8 +441,8 @@ MACHINE_CONFIG_START(x1twin_state::x1twin) MCFG_I8255_IN_PORTC_CB(READ8(*this, x1_state, x1_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, x1_state, x1_portc_w)) - MCFG_MACHINE_START_OVERRIDE(x1twin_state,x1) - MCFG_MACHINE_RESET_OVERRIDE(x1twin_state,x1) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_x1, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_x1, this)); #if 0 MCFG_DEVICE_ADD("pce_cpu", H6280, PCE_MAIN_CLOCK/3) @@ -475,7 +475,7 @@ MACHINE_CONFIG_START(x1twin_state::x1twin) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_x1) - MCFG_VIDEO_START_OVERRIDE(x1twin_state,x1) + set_video_start_cb(config, driver_callback_delegate(&video_start_x1, this)); MCFG_MB8877_ADD("fdc", MAIN_CLOCK / 16) // TODO: guesswork, try to implicitily start the motor diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 149a2b0937f..f8f84ad31f7 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -1689,7 +1689,7 @@ MACHINE_CONFIG_START(x68k_state::x68000) MCFG_PALETTE_ADD("pcgpalette", 256) MCFG_PALETTE_FORMAT_CLASS(2, x68k_state, GGGGGRRRRRBBBBBI) - MCFG_VIDEO_START_OVERRIDE(x68k_state, x68000 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_x68000, this)); MCFG_DEFAULT_LAYOUT( layout_x68000 ) diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index beed0af6d52..1339f571fb2 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -387,7 +387,7 @@ MACHINE_CONFIG_START(xmen_state::xmen6p) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, xmen_state, screen_vblank_xmen6p)) MCFG_SCREEN_PALETTE("palette") - MCFG_VIDEO_START_OVERRIDE(xmen_state,xmen6p) + set_video_start_cb(config, driver_callback_delegate(&video_start_xmen6p, this)); MCFG_DEVICE_ADD("k052109", K052109, 0) MCFG_GFX_PALETTE("palette") diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp index 963b0989b6b..129d3f3e964 100644 --- a/src/mame/drivers/yunsun16.cpp +++ b/src/mame/drivers/yunsun16.cpp @@ -573,14 +573,14 @@ void yunsun16_state::machine_reset() m_sprites_scrolldy = -0x0f; } -MACHINE_START_MEMBER(yunsun16_state, shocking) +void yunsun16_state::machine_start_shocking() { machine_start(); membank("okibank")->configure_entries(0, 0x80000 / 0x20000, memregion("oki")->base(), 0x20000); membank("okibank")->set_entry(0); } -MACHINE_RESET_MEMBER(yunsun16_state, shocking) +void yunsun16_state::machine_reset_shocking() { machine_reset(); membank("okibank")->set_entry(0); @@ -641,8 +641,8 @@ MACHINE_CONFIG_START(yunsun16_state::shocking) MCFG_DEVICE_PROGRAM_MAP(main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", yunsun16_state, irq2_line_hold) - MCFG_MACHINE_START_OVERRIDE(yunsun16_state, shocking) - MCFG_MACHINE_RESET_OVERRIDE(yunsun16_state, shocking) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_shocking, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_shocking, this)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp index ab1187cd790..7d56919b00a 100644 --- a/src/mame/drivers/z80ne.cpp +++ b/src/mame/drivers/z80ne.cpp @@ -421,8 +421,8 @@ MACHINE_CONFIG_START(z80ne_state::z80ne) MCFG_DEVICE_PROGRAM_MAP(z80ne_mem) MCFG_DEVICE_IO_MAP(z80ne_io) - MCFG_MACHINE_START_OVERRIDE(z80ne_state,z80ne) - MCFG_MACHINE_RESET_OVERRIDE(z80ne_state,z80ne) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_z80ne, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_z80ne, this)); MCFG_DEVICE_ADD( "uart", AY31015, 0 ) MCFG_AY31015_TX_CLOCK(4800.0) @@ -453,8 +453,8 @@ MACHINE_CONFIG_START(z80ne_state::z80net) MCFG_DEVICE_PROGRAM_MAP(z80net_mem) MCFG_DEVICE_IO_MAP(z80net_io) - MCFG_MACHINE_START_OVERRIDE(z80ne_state, z80net ) - MCFG_MACHINE_RESET_OVERRIDE(z80ne_state, z80net ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_z80net, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_z80net, this)); MCFG_DEVICE_ADD("lx387_kr2376", KR2376_ST, 50000) MCFG_KR2376_MATRIX_X0(IOPORT("X0")) @@ -492,8 +492,8 @@ MACHINE_CONFIG_START(z80ne_state::z80netb) MCFG_DEVICE_PROGRAM_MAP(z80netb_mem) MCFG_DEVICE_IO_MAP(z80net_io) - MCFG_MACHINE_START_OVERRIDE(z80ne_state,z80netb) - MCFG_MACHINE_RESET_OVERRIDE(z80ne_state,z80netb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_z80netb, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_z80netb, this)); MCFG_DEVICE_ADD( "uart", AY31015, 0 ) MCFG_AY31015_TX_CLOCK(4800.0) @@ -543,8 +543,8 @@ MACHINE_CONFIG_START(z80netf_state::z80netf) MCFG_DEVICE_PROGRAM_MAP(z80netf_mem) MCFG_DEVICE_IO_MAP(z80netf_io) - MCFG_MACHINE_START_OVERRIDE(z80netf_state,z80netf) - MCFG_MACHINE_RESET_OVERRIDE(z80netf_state,z80netf) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_z80netf, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_z80netf, this)); MCFG_DEVICE_ADD( "uart", AY31015, 0 ) MCFG_AY31015_TX_CLOCK(4800.0) diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index e7c6a29648e..49ddca01749 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -1014,7 +1014,7 @@ MACHINE_CONFIG_START(zaxxon_state::razmataze) MCFG_DEVICE_REMOVE("ppi8255") /* video hardware */ - MCFG_VIDEO_START_OVERRIDE(zaxxon_state,razmataz) + set_video_start_cb(config, driver_callback_delegate(&video_start_razmataz, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(zaxxon_state, screen_update_razmataz) @@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(zaxxon_state::congo) MCFG_PALETTE_ENTRIES(512) MCFG_PALETTE_INIT_OWNER(zaxxon_state, zaxxon) - MCFG_VIDEO_START_OVERRIDE(zaxxon_state,congo) + set_video_start_cb(config, driver_callback_delegate(&video_start_congo, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(zaxxon_state, screen_update_congo) diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index 47ad63fa2b8..17994ab1f0b 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -124,23 +124,23 @@ public: void init_jdredd(); void init_coh1000w(); void init_primrag2(); - DECLARE_MACHINE_START(coh1000c); - DECLARE_MACHINE_START(coh1000ta); - DECLARE_MACHINE_START(coh1002e); - DECLARE_MACHINE_START(bam2); - DECLARE_MACHINE_START(nbajamex); - DECLARE_MACHINE_START(coh1001l); - DECLARE_MACHINE_START(coh1002v); - DECLARE_MACHINE_START(coh1002m); - DECLARE_MACHINE_RESET(coh1000c); - DECLARE_MACHINE_RESET(glpracr); - DECLARE_MACHINE_RESET(coh1000ta); - DECLARE_MACHINE_RESET(coh1002e); - DECLARE_MACHINE_RESET(bam2); - DECLARE_MACHINE_RESET(nbajamex); - DECLARE_MACHINE_RESET(coh1001l); - DECLARE_MACHINE_RESET(coh1002v); - DECLARE_MACHINE_RESET(coh1002m); + void machine_start_coh1000c(); + void machine_start_coh1000ta(); + void machine_start_coh1002e(); + void machine_start_bam2(); + void machine_start_nbajamex(); + void machine_start_coh1001l(); + void machine_start_coh1002v(); + void machine_start_coh1002m(); + void machine_reset_coh1000c(); + void machine_reset_glpracr(); + void machine_reset_coh1000ta(); + void machine_reset_coh1002e(); + void machine_reset_bam2(); + void machine_reset_nbajamex(); + void machine_reset_coh1001l(); + void machine_reset_coh1002v(); + void machine_reset_coh1002m(); INTERRUPT_GEN_MEMBER(qsound_interrupt); void atpsx_dma_read(uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); void atpsx_dma_write(uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); @@ -613,22 +613,22 @@ void zn_state::coh1000c_map(address_map &map) map(0x1fb60000, 0x1fb60000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); } -MACHINE_START_MEMBER(zn_state,coh1000c) +void zn_state::machine_start_coh1000c() { m_rombank[0]->configure_entries( 0, 16, m_bankedroms->base() + 0x400000, 0x400000 ); /* banked game rom */ m_soundbank->configure_entries( 0, 16, memregion("audiocpu")->base() + 0x8000, 0x4000 ); /* banked audio rom */ } -MACHINE_RESET_MEMBER(zn_state,coh1000c) +void zn_state::machine_reset_coh1000c() { m_rombank[0]->set_entry( 0 ); m_soundbank->set_entry( 0 ); } -MACHINE_RESET_MEMBER(zn_state,glpracr) +void zn_state::machine_reset_glpracr() { m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); // glpracr qsound rom sockets are empty - MACHINE_RESET_CALL_MEMBER(coh1000c); + machine_reset_coh1000c(); } void zn_state::qsound_map(address_map &map) @@ -657,8 +657,8 @@ MACHINE_CONFIG_START(zn_state::coh1000c) MCFG_DEVICE_IO_MAP(qsound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1000c, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1000c, this)); MCFG_DEVICE_MODIFY("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, INPUT_LINE_NMI)) @@ -670,7 +670,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(zn_state::glpracr) coh1000c(config); - MCFG_MACHINE_RESET_OVERRIDE(zn_state, glpracr) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_glpracr, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(zn_state::coh1002c) @@ -683,8 +683,8 @@ MACHINE_CONFIG_START(zn_state::coh1002c) MCFG_DEVICE_IO_MAP(qsound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1000c, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1000c, this)); MCFG_DEVICE_MODIFY("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, INPUT_LINE_NMI)) @@ -845,8 +845,8 @@ MACHINE_CONFIG_START(zn_state::coh3002c) MCFG_DEVICE_IO_MAP(qsound_portmap) MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1000c, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1000c, this)); MCFG_DEVICE_MODIFY("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, INPUT_LINE_NMI)) @@ -1100,7 +1100,7 @@ void zn_state::coh1000ta_map(address_map &map) map(0x1fb80002, 0x1fb80002).rw("tc0140syt", FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w)); } -MACHINE_START_MEMBER(zn_state,coh1000ta) +void zn_state::machine_start_coh1000ta() { m_rombank[0]->configure_entries( 0, 4, m_bankedroms->base(), 0x800000 ); /* banked game rom */ if (m_soundbank.found()) @@ -1110,7 +1110,7 @@ MACHINE_START_MEMBER(zn_state,coh1000ta) } } -MACHINE_RESET_MEMBER(zn_state,coh1000ta) +void zn_state::machine_reset_coh1000ta() { m_rombank[0]->set_entry( 0 ); if (m_soundbank.found()) @@ -1140,8 +1140,8 @@ MACHINE_CONFIG_START(zn_state::coh1000ta) MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(16'000'000) / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(fx1a_sound_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1000ta, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1000ta, this)); MCFG_DEVICE_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) MCFG_YM2610_IRQ_HANDLER(INPUTLINE(m_audiocpu, 0)) @@ -1195,8 +1195,8 @@ MACHINE_CONFIG_START(zn_state::coh1000tb) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(coh1000tb_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1000ta, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1000ta, this)); MCFG_NVRAM_ADD_1FILL("fm1208s") MCFG_MB3773_ADD("mb3773") @@ -1217,8 +1217,8 @@ MACHINE_CONFIG_START(zn_state::coh1002tb) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(coh1000tb_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1000ta, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1000ta, this)); MCFG_NVRAM_ADD_1FILL("fm1208s") MCFG_MB3773_ADD("mb3773") @@ -1642,14 +1642,14 @@ void zn_state::coh1002e_map(address_map &map) map(0x1fb00004, 0x1fb00004).w(this, FUNC(zn_state::coh1002e_sound_irq_w)); } -MACHINE_START_MEMBER(zn_state,coh1002e) +void zn_state::machine_start_coh1002e() { m_rombank[0]->configure_entries( 0, 4, m_bankedroms->base(), 0x800000 ); /* banked game rom */ if (m_okibank.found()) m_okibank->configure_entries( 0, memregion( "oki" )->bytes()/0x10000, memregion( "oki" )->base(), 0x10000 ); /* not verified */ } -MACHINE_RESET_MEMBER(zn_state,coh1002e) +void zn_state::machine_reset_coh1002e() { m_rombank[0]->set_entry( 0 ); if (m_okibank.found()) @@ -1685,8 +1685,8 @@ MACHINE_CONFIG_START(zn_state::coh1002e) MCFG_DEVICE_ADD(m_audiocpu, M68000, XTAL(12'000'000)) MCFG_DEVICE_PROGRAM_MAP(psarc_snd_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002e) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1002e, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1002e, this)); MCFG_DEVICE_ADD("ymf", YMF271, XTAL(16'934'400)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) @@ -1701,8 +1701,8 @@ MACHINE_CONFIG_START(zn_state::beastrzrb) MCFG_DEVICE_ADD(m_audiocpu, AT89C4051, XTAL(12'000'000)) // clock unverified MCFG_DEVICE_PROGRAM_MAP(beastrzrb_snd_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002e) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1002e, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1002e, this)); MCFG_DEVICE_ADD("oki", OKIM6295, 1000000, okim6295_device::PIN7_LOW) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) @@ -1823,12 +1823,12 @@ void zn_state::init_bam2() save_item(NAME(m_bam2_mcu_command)); } -MACHINE_START_MEMBER(zn_state,bam2) +void zn_state::machine_start_bam2() { m_rombank[0]->configure_entries( 0, 16, m_bankedroms->base(), 0x400000 ); /* banked game rom */ } -MACHINE_RESET_MEMBER(zn_state,bam2) +void zn_state::machine_reset_bam2() { m_rombank[0]->set_entry( 1 ); } @@ -1838,8 +1838,8 @@ MACHINE_CONFIG_START(zn_state::bam2) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(bam2_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, bam2) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, bam2) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_bam2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bam2, this)); MACHINE_CONFIG_END /* @@ -2154,7 +2154,7 @@ void zn_state::init_nbajamex() save_item(NAME(m_nbajamex_rombank)); } -MACHINE_START_MEMBER(zn_state,nbajamex) +void zn_state::machine_start_nbajamex() { for (int bank = 0; bank < 2; bank++) m_rombank[bank]->configure_entries( 0, 16, m_bankedroms->base(), 0x200000 ); @@ -2162,7 +2162,7 @@ MACHINE_START_MEMBER(zn_state,nbajamex) membank( "sram" )->set_base( m_nbajamex_sram.get() ); } -MACHINE_RESET_MEMBER(zn_state,nbajamex) +void zn_state::machine_reset_nbajamex() { m_nbajamex_bankmap->set_bank( 0 ); m_rombank[0]->set_entry( 0 ); @@ -2196,8 +2196,8 @@ MACHINE_CONFIG_START(zn_state::nbajamex) MCFG_NVRAM_ADD_1FILL("71256") - MCFG_MACHINE_START_OVERRIDE(zn_state, nbajamex) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, nbajamex) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_nbajamex, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_nbajamex, this)); MCFG_DEVICE_ADD("nbajamex_bankmap", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(nbajamex_bank_map) @@ -2358,12 +2358,12 @@ void zn_state::coh1001l_map(address_map &map) map(0x1fb00002, 0x1fb00002).w(this, FUNC(zn_state::coh1001l_bank_w)); } -MACHINE_START_MEMBER(zn_state,coh1001l) +void zn_state::machine_start_coh1001l() { m_rombank[0]->configure_entries( 0, 4, m_bankedroms->base(), 0x800000 ); /* banked game rom */ } -MACHINE_RESET_MEMBER(zn_state,coh1001l) +void zn_state::machine_reset_coh1001l() { m_rombank[0]->set_entry( 0 ); } @@ -2385,8 +2385,8 @@ MACHINE_CONFIG_START(zn_state::coh1001l) MCFG_DEVICE_ADD(m_audiocpu, M68000, XTAL(10'000'000)) MCFG_DEVICE_PROGRAM_MAP(atlus_snd_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1001l) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1001l) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1001l, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1001l, this)); MCFG_GENERIC_LATCH_16_ADD("soundlatch16") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, 3)) @@ -2423,12 +2423,12 @@ void zn_state::coh1002v_map(address_map &map) map(0x1fb00000, 0x1fb00000).w(this, FUNC(zn_state::coh1002v_bank_w)); } -MACHINE_START_MEMBER(zn_state,coh1002v) +void zn_state::machine_start_coh1002v() { m_rombank[0]->configure_entries( 0, 24, m_bankedroms->base(), 0x100000 ); /* banked game rom */ } -MACHINE_RESET_MEMBER(zn_state,coh1002v) +void zn_state::machine_reset_coh1002v() { m_rombank[0]->set_entry( 0 ); } @@ -2438,8 +2438,8 @@ MACHINE_CONFIG_START(zn_state::coh1002v) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(coh1002v_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002v) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002v) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1002v, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1002v, this)); MACHINE_CONFIG_END /* @@ -2613,12 +2613,12 @@ void zn_state::coh1002m_map(address_map &map) map(0x1fb00006, 0x1fb00006).w(this, FUNC(zn_state::coh1002m_bank_w)); } -MACHINE_START_MEMBER(zn_state,coh1002m) +void zn_state::machine_start_coh1002m() { m_rombank[0]->configure_entries( 0, 8, m_bankedroms->base(), 0x800000 ); /* banked game rom */ } -MACHINE_RESET_MEMBER(zn_state,coh1002m) +void zn_state::machine_reset_coh1002m() { m_rombank[0]->set_entry( 0 ); } @@ -2628,8 +2628,8 @@ MACHINE_CONFIG_START(zn_state::coh1002m) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(coh1002m_map) - MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002m) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002m) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_coh1002m, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coh1002m, this)); MACHINE_CONFIG_END READ8_MEMBER(zn_state::cbaj_sound_main_status_r) diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 9d6f79f5e8a..068fbfdbf2c 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -252,8 +252,8 @@ public: void init_common(); void init_zr107(); void init_jetwave(); - DECLARE_VIDEO_START(zr107); - DECLARE_VIDEO_START(jetwave); + void video_start_zr107() ATTR_COLD; + void video_start_jetwave() ATTR_COLD; uint32_t screen_update_zr107(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_jetwave(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(zr107_vblank); @@ -277,7 +277,7 @@ protected: -VIDEO_START_MEMBER(zr107_state,jetwave) +void zr107_state::video_start_jetwave() { } @@ -317,7 +317,7 @@ K056832_CB_MEMBER(zr107_state::tile_callback) *color += layer * 0x40; } -VIDEO_START_MEMBER(zr107_state,zr107) +void zr107_state::video_start_zr107() { m_k056832->set_layer_offs(0, -29, -27); m_k056832->set_layer_offs(1, -29, -27); @@ -804,7 +804,7 @@ MACHINE_CONFIG_START(zr107_state::zr107) MCFG_PALETTE_ADD("palette", 65536) - MCFG_VIDEO_START_OVERRIDE(zr107_state,zr107) + set_video_start_cb(config, driver_callback_delegate(&video_start_zr107, this)); MCFG_DEVICE_ADD("k056832", K056832, 0) MCFG_K056832_CB(zr107_state, tile_callback) @@ -876,7 +876,7 @@ MACHINE_CONFIG_START(zr107_state::jetwave) MCFG_PALETTE_ADD("palette", 65536) - MCFG_VIDEO_START_OVERRIDE(zr107_state,jetwave) + set_video_start_cb(config, driver_callback_delegate(&video_start_jetwave, this)); MCFG_DEVICE_ADD("k001604", K001604, 0) MCFG_K001604_LAYER_SIZE(0) diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp index cd5782a773c..f7c7b135405 100644 --- a/src/mame/drivers/zwackery.cpp +++ b/src/mame/drivers/zwackery.cpp @@ -52,7 +52,7 @@ public: m_fg_tilemap(nullptr) { } - DECLARE_VIDEO_START(zwackery); + void video_start_zwackery() ATTR_COLD; TIMER_DEVICE_CALLBACK_MEMBER(scanline_cb); DECLARE_WRITE16_MEMBER(videoram_w); DECLARE_READ8_MEMBER(spriteram_r); @@ -183,7 +183,7 @@ INPUT_PORTS_END // VIDEO EMULATION //************************************************************************** -VIDEO_START_MEMBER( zwackery_state, zwackery ) +void zwackery_state::video_start_zwackery() { const uint8_t *colordatabase = (const uint8_t *)memregion("bg_color")->base(); gfx_element *gfx0 = m_gfxdecode->gfx(0); @@ -533,7 +533,7 @@ MACHINE_CONFIG_START(zwackery_state::zwackery) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xRRRRRBBBBBGGGGG_inverted) - MCFG_VIDEO_START_OVERRIDE(zwackery_state, zwackery) + set_video_start_cb(config, driver_callback_delegate(&video_start_zwackery, this)); // sound hardware SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h index 8d176a2401f..b9617277357 100644 --- a/src/mame/includes/3do.h +++ b/src/mame/includes/3do.h @@ -173,7 +173,7 @@ public: DECLARE_WRITE32_MEMBER(_3do_clio_w); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_VIDEO_START(_3do); + void video_start__3do() ATTR_COLD; uint32_t screen_update__3do(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER( timer_x16_cb ); diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 6f17fd32c7a..846c756dc9c 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -94,9 +94,9 @@ public: void init_40love(); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start() override; - DECLARE_MACHINE_START(40love); - DECLARE_MACHINE_RESET(40love); - DECLARE_MACHINE_RESET(common); + void machine_start_40love() ATTR_COLD; + void machine_reset_40love(); + void machine_reset_common(); uint32_t screen_update_fortyl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void redraw_pixels(); void fortyl_set_scroll_x( int offset ); diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index 0ed578644b3..a192f42db6f 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -128,20 +128,20 @@ public: void init_vortex(); void init_attackfc(); - DECLARE_MACHINE_START(extra_8080bw); - DECLARE_MACHINE_START(rollingc); - DECLARE_MACHINE_START(sflush); - DECLARE_MACHINE_START(schaser); - DECLARE_MACHINE_START(schasercv); - DECLARE_MACHINE_RESET(schaser); - DECLARE_MACHINE_START(polaris); - DECLARE_MACHINE_START(darthvdr); - DECLARE_MACHINE_RESET(darthvdr); - DECLARE_MACHINE_START(extra_8080bw_sh); - DECLARE_MACHINE_START(extra_8080bw_vh); - DECLARE_MACHINE_START(schaser_sh); - DECLARE_MACHINE_RESET(schaser_sh); - DECLARE_MACHINE_START(claybust); + void machine_start_extra_8080bw() ATTR_COLD; + void machine_start_rollingc() ATTR_COLD; + void machine_start_sflush() ATTR_COLD; + void machine_start_schaser() ATTR_COLD; + void machine_start_schasercv() ATTR_COLD; + void machine_reset_schaser(); + void machine_start_polaris() ATTR_COLD; + void machine_start_darthvdr() ATTR_COLD; + void machine_reset_darthvdr(); + void machine_start_extra_8080bw_sh() ATTR_COLD; + void machine_start_extra_8080bw_vh() ATTR_COLD; + void machine_start_schaser_sh() ATTR_COLD; + void machine_reset_schaser_sh(); + void machine_start_claybust() ATTR_COLD; DECLARE_PALETTE_INIT(rollingc); DECLARE_PALETTE_INIT(sflush); diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 470306f3d4e..d40065a38da 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -43,8 +43,8 @@ public: DECLARE_WRITE8_MEMBER(triothep_control_select_w); DECLARE_READ8_MEMBER(triothep_control_r); DECLARE_WRITE8_MEMBER(actfancr_buffer_spriteram_w); - DECLARE_MACHINE_START(triothep); - DECLARE_MACHINE_RESET(triothep); + void machine_start_triothep() ATTR_COLD; + void machine_reset_triothep(); uint32_t screen_update_actfancr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void triothep(machine_config &config); void actfancr(machine_config &config); diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 886d7db0a8f..44f48a8e9f4 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -102,16 +102,16 @@ public: template<int Layer> TILE_GET_INFO_MEMBER(karatblz_tile_info); template<int Layer> TILE_GET_INFO_MEMBER(spinlbrk_tile_info); template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_MACHINE_START(aerofgt); - DECLARE_MACHINE_START(spinlbrk); - DECLARE_MACHINE_RESET(aerofgt); - DECLARE_VIDEO_START(pspikes); - DECLARE_MACHINE_START(common); - DECLARE_MACHINE_RESET(common); - DECLARE_VIDEO_START(karatblz); - DECLARE_VIDEO_START(spinlbrk); - DECLARE_VIDEO_START(turbofrc); - DECLARE_VIDEO_START(wbbc97); + void machine_start_aerofgt() ATTR_COLD; + void machine_start_spinlbrk() ATTR_COLD; + void machine_reset_aerofgt(); + void video_start_pspikes() ATTR_COLD; + void machine_start_common() ATTR_COLD; + void machine_reset_common(); + void video_start_karatblz() ATTR_COLD; + void video_start_spinlbrk() ATTR_COLD; + void video_start_turbofrc() ATTR_COLD; + void video_start_wbbc97() ATTR_COLD; void init_banked_oki(); void init_kickball(); uint32_t screen_update_pspikes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 61807f31ddb..23a4ecba753 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -93,15 +93,15 @@ public: void init_kyros(); void init_sstingry(); TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_MACHINE_START(common); - DECLARE_MACHINE_RESET(common); + void machine_start_common() ATTR_COLD; + void machine_reset_common(); DECLARE_PALETTE_INIT(kyros); DECLARE_PALETTE_INIT(paddlem); - DECLARE_MACHINE_START(alpha68k_II); - DECLARE_MACHINE_RESET(alpha68k_II); - DECLARE_VIDEO_START(alpha68k); - DECLARE_MACHINE_START(alpha68k_V); - DECLARE_MACHINE_RESET(alpha68k_V); + void machine_start_alpha68k_II() ATTR_COLD; + void machine_reset_alpha68k_II(); + void video_start_alpha68k() ATTR_COLD; + void machine_start_alpha68k_V() ATTR_COLD; + void machine_reset_alpha68k_V(); uint32_t screen_update_sstingry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_kyros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_alpha68k_I(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 63e5fc79375..db1c5339f7b 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -412,8 +412,8 @@ public: int m_aga_sprite_fetched_words; int m_aga_sprite_dma_used_words[8]; - DECLARE_VIDEO_START( amiga ); - DECLARE_VIDEO_START( amiga_aga ); + void video_start_amiga() ATTR_COLD; + void video_start_amiga_aga() ATTR_COLD; DECLARE_PALETTE_INIT( amiga ); uint32_t screen_update_amiga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index f4fe5ede1a7..f0d8540df7b 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -32,7 +32,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(s2k_get_bg_tile_info); DECLARE_PALETTE_INIT(ampoker2); - DECLARE_VIDEO_START(sigma2k); + void video_start_sigma2k() ATTR_COLD; protected: virtual void video_start() override; diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index 94ffc948eb5..abbbc52286b 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -212,21 +212,21 @@ public: DECLARE_WRITE8_MEMBER(amstrad_cpc_io_w); DECLARE_READ8_MEMBER(amstrad_psg_porta_read); void amstrad_plus_seqcheck(int data); - DECLARE_MACHINE_START(amstrad); - DECLARE_MACHINE_RESET(amstrad); - DECLARE_VIDEO_START(amstrad); + void machine_start_amstrad() ATTR_COLD; + void machine_reset_amstrad(); + void video_start_amstrad() ATTR_COLD; DECLARE_PALETTE_INIT(amstrad_cpc); DECLARE_PALETTE_INIT(amstrad_cpc_green); - DECLARE_MACHINE_START(plus); - DECLARE_MACHINE_RESET(plus); + void machine_start_plus() ATTR_COLD; + void machine_reset_plus(); DECLARE_PALETTE_INIT(amstrad_plus); - DECLARE_MACHINE_START(gx4000); - DECLARE_MACHINE_RESET(gx4000); - DECLARE_MACHINE_START(kccomp); - DECLARE_MACHINE_RESET(kccomp); + void machine_start_gx4000() ATTR_COLD; + void machine_reset_gx4000(); + void machine_start_kccomp() ATTR_COLD; + void machine_reset_kccomp(); DECLARE_PALETTE_INIT(kccomp); - DECLARE_MACHINE_START(aleste); - DECLARE_MACHINE_RESET(aleste); + void machine_start_aleste() ATTR_COLD; + void machine_reset_aleste(); DECLARE_PALETTE_INIT(aleste); uint32_t screen_update_amstrad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_amstrad); diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index 382cafb91bf..aa4b6dacbd0 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -206,8 +206,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_MACHINE_RESET(apollo); - DECLARE_MACHINE_START(apollo); + void machine_reset_apollo(); + void machine_start_apollo() ATTR_COLD; IRQ_CALLBACK_MEMBER(apollo_irq_acknowledge); IRQ_CALLBACK_MEMBER(apollo_pic_acknowledge); diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h index b88d02703ab..ed7bf1c15de 100644 --- a/src/mame/includes/apple2.h +++ b/src/mame/includes/apple2.h @@ -330,20 +330,20 @@ public: write8_delegate wd_inh_d000; read8_delegate rd_inh_e000; write8_delegate wd_inh_e000; - DECLARE_MACHINE_START(apple2orig); - DECLARE_MACHINE_START(apple2e); - DECLARE_MACHINE_START(apple2c); - DECLARE_MACHINE_START(apple2cp); - DECLARE_MACHINE_START(tk2000); - DECLARE_MACHINE_START(tk3000); - DECLARE_MACHINE_START(laser128); - DECLARE_MACHINE_START(space84); - DECLARE_MACHINE_START(laba2p); - DECLARE_VIDEO_START(apple2); + void machine_start_apple2orig() ATTR_COLD; + void machine_start_apple2e() ATTR_COLD; + void machine_start_apple2c() ATTR_COLD; + void machine_start_apple2cp() ATTR_COLD; + void machine_start_tk2000() ATTR_COLD; + void machine_start_tk3000() ATTR_COLD; + void machine_start_laser128() ATTR_COLD; + void machine_start_space84() ATTR_COLD; + void machine_start_laba2p() ATTR_COLD; + void video_start_apple2() ATTR_COLD; DECLARE_PALETTE_INIT(apple2); - DECLARE_VIDEO_START(apple2p); - DECLARE_VIDEO_START(apple2e); - DECLARE_VIDEO_START(apple2c); + void video_start_apple2p() ATTR_COLD; + void video_start_apple2e() ATTR_COLD; + void video_start_apple2c() ATTR_COLD; uint32_t screen_update_apple2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(apple2_interrupt); DECLARE_WRITE_LINE_MEMBER(a2bus_irq_w); diff --git a/src/mame/includes/apple2gs.h b/src/mame/includes/apple2gs.h index 76252a8459d..442f0217e32 100644 --- a/src/mame/includes/apple2gs.h +++ b/src/mame/includes/apple2gs.h @@ -190,12 +190,12 @@ public: write8_delegate write_delegates_2gs0400[2]; write8_delegate write_delegates_2gs2000[2]; write8_delegate write_delegates_2gs4000[2]; - DECLARE_MACHINE_START(apple2gs); - DECLARE_MACHINE_RESET(apple2gs); - DECLARE_VIDEO_START(apple2gs); + void machine_start_apple2gs() ATTR_COLD; + void machine_reset_apple2gs(); + void video_start_apple2gs() ATTR_COLD; DECLARE_PALETTE_INIT(apple2gs); - DECLARE_MACHINE_START(apple2gsr1); - DECLARE_MACHINE_START(apple2gscommon); + void machine_start_apple2gsr1() ATTR_COLD; + void machine_start_apple2gscommon() ATTR_COLD; uint32_t screen_update_apple2gs(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(apple2gs_clock_tick); TIMER_CALLBACK_MEMBER(apple2gs_qsecond_tick); diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h index b35a7c33665..9bd645750d9 100644 --- a/src/mame/includes/apple3.h +++ b/src/mame/includes/apple3.h @@ -91,8 +91,8 @@ public: DECLARE_READ8_MEMBER(apple3_c0xx_r); DECLARE_WRITE8_MEMBER(apple3_c0xx_w); void init_apple3(); - DECLARE_MACHINE_RESET(apple3); - DECLARE_VIDEO_START(apple3); + void machine_reset_apple3(); + void video_start_apple3() ATTR_COLD; uint32_t screen_update_apple3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(apple3_interrupt); TIMER_CALLBACK_MEMBER(scanstart_cb); diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index c111396fdb6..a352544e140 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -107,12 +107,12 @@ public: TILE_GET_INFO_MEMBER(butasan_get_bg1_tile_info); virtual void machine_start() override; - DECLARE_VIDEO_START(argus); - DECLARE_VIDEO_RESET(argus); - DECLARE_VIDEO_START(valtric); - DECLARE_VIDEO_RESET(valtric); - DECLARE_VIDEO_START(butasan); - DECLARE_VIDEO_RESET(butasan); + void video_start_argus() ATTR_COLD; + void video_reset_argus(); + void video_start_valtric() ATTR_COLD; + void video_reset_valtric(); + void video_start_butasan() ATTR_COLD; + void video_reset_butasan(); uint32_t screen_update_argus(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_valtric(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index b76b14045d6..cef31ba7402 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -94,10 +94,10 @@ public: TILE_GET_INFO_MEMBER(get_armedf_tx_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_MACHINE_START(armedf); - DECLARE_MACHINE_RESET(armedf); - DECLARE_VIDEO_START(terraf); - DECLARE_VIDEO_START(armedf); + void machine_start_armedf() ATTR_COLD; + void machine_reset_armedf(); + void video_start_terraf() ATTR_COLD; + void video_start_armedf() ATTR_COLD; uint32_t screen_update_armedf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); void armedf_drawgfx(bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx, diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index 4f35cefd134..7a56b8bd2bc 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -154,7 +154,7 @@ public: void init_astrocde(); virtual void video_start() override; DECLARE_PALETTE_INIT(astrocde); - DECLARE_VIDEO_START(profpac); + void video_start_profpac() ATTR_COLD; DECLARE_PALETTE_INIT(profpac); uint32_t screen_update_astrocde(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_profpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index 80b3c6a5029..57571b53e56 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -76,11 +76,11 @@ public: void init_sstarbtl(); void init_acombat3(); virtual void video_start() override; - DECLARE_MACHINE_START(astrof); - DECLARE_MACHINE_START(abattle); - DECLARE_MACHINE_RESET(abattle); - DECLARE_MACHINE_START(spfghmk2); - DECLARE_MACHINE_START(tomahawk); + void machine_start_astrof() ATTR_COLD; + void machine_start_abattle() ATTR_COLD; + void machine_reset_abattle(); + void machine_start_spfghmk2() ATTR_COLD; + void machine_start_tomahawk() ATTR_COLD; uint32_t screen_update_astrof(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_tomahawk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(irq_callback); diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index f2cd433ae58..a4282fc9779 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -62,9 +62,9 @@ public: void init_pitfightb(); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); - DECLARE_MACHINE_START(atarig1); - DECLARE_MACHINE_RESET(atarig1); - DECLARE_VIDEO_START(atarig1); + void machine_start_atarig1() ATTR_COLD; + void machine_reset_atarig1(); + void video_start_atarig1() ATTR_COLD; uint32_t screen_update_atarig1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void atarig1(machine_config &config); void pitfightj(machine_config &config); diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 56ee8830eea..27011dd4b26 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -43,7 +43,7 @@ protected: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILEMAP_MAPPER_MEMBER(atarig42_playfield_scan); - DECLARE_VIDEO_START(atarig42); + void video_start_atarig42() ATTR_COLD; uint32_t screen_update_atarig42(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void atarig42(machine_config &config); void main_map(address_map &map); diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index f42940f556f..d29bac19e31 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -86,9 +86,9 @@ public: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILEMAP_MAPPER_MEMBER(atarigt_playfield_scan); - DECLARE_MACHINE_START(atarigt); - DECLARE_MACHINE_RESET(atarigt); - DECLARE_VIDEO_START(atarigt); + void machine_start_atarigt() ATTR_COLD; + void machine_reset_atarigt(); + void video_start_atarigt() ATTR_COLD; uint32_t screen_update_atarigt(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void atarigt(machine_config &config); void tmek(machine_config &config); diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index e7cf6d2253a..0e58ebc6e28 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -89,9 +89,9 @@ public: void init_indytemp(); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); - DECLARE_MACHINE_START(atarisy1); - DECLARE_MACHINE_RESET(atarisy1); - DECLARE_VIDEO_START(atarisy1); + void machine_start_atarisy1() ATTR_COLD; + void machine_reset_atarisy1(); + void video_start_atarisy1() ATTR_COLD; uint32_t screen_update_atarisy1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(joystick_int); TIMER_DEVICE_CALLBACK_MEMBER(atarisy1_reset_yscroll_callback); diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index b274be89577..edccdc46f18 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -102,9 +102,9 @@ public: void init_720(); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); - DECLARE_MACHINE_START(atarisy2); - DECLARE_MACHINE_RESET(atarisy2); - DECLARE_VIDEO_START(atarisy2); + void machine_start_atarisy2() ATTR_COLD; + void machine_reset_atarisy2(); + void video_start_atarisy2() ATTR_COLD; uint32_t screen_update_atarisy2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_int); TIMER_CALLBACK_MEMBER(delayed_int_enable_w); diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index 612aed65c48..7acc284634f 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -59,9 +59,9 @@ public: DECLARE_WRITE8_MEMBER(audio_io_w); void init_badlands(); TILE_GET_INFO_MEMBER(get_playfield_tile_info); - DECLARE_MACHINE_START(badlands); - DECLARE_MACHINE_RESET(badlands); - DECLARE_VIDEO_START(badlands); + void machine_start_badlands() ATTR_COLD; + void machine_reset_badlands(); + void video_start_badlands() ATTR_COLD; uint32_t screen_update_badlands(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_int); DECLARE_WRITE16_MEMBER(video_int_ack_w); diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index b759c516566..747876fb864 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -47,7 +47,7 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - DECLARE_VIDEO_START(dodgeman); + void video_start_dodgeman(); ATTR_COLD TILE_GET_INFO_MEMBER(get_dodgeman_bg_tile_info); void dodgeman(machine_config &config); void battlex(machine_config &config); diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h index 1d81608cb24..325012c241e 100644 --- a/src/mame/includes/bbc.h +++ b/src/mame/includes/bbc.h @@ -145,22 +145,22 @@ public: DECLARE_READ8_MEMBER(bbc_fe_r); void init_bbc(); - DECLARE_VIDEO_START(bbc); - - DECLARE_MACHINE_START(bbca); - DECLARE_MACHINE_RESET(bbca); - DECLARE_MACHINE_START(bbcb); - DECLARE_MACHINE_RESET(bbcb); - DECLARE_MACHINE_RESET(torch); - DECLARE_MACHINE_START(bbcbp); - DECLARE_MACHINE_RESET(bbcbp); - DECLARE_MACHINE_START(bbcm); - DECLARE_MACHINE_RESET(bbcm); - DECLARE_MACHINE_START(bbcmc); - DECLARE_MACHINE_RESET(bbcmc); - DECLARE_MACHINE_RESET(ltmpbp); - DECLARE_MACHINE_RESET(ltmpm); - DECLARE_MACHINE_START(cfa3000); + void video_start_bbc() ATTR_COLD; + + void machine_start_bbca() ATTR_COLD; + void machine_reset_bbca(); + void machine_start_bbcb() ATTR_COLD; + void machine_reset_bbcb(); + void machine_reset_torch(); + void machine_start_bbcbp() ATTR_COLD; + void machine_reset_bbcbp(); + void machine_start_bbcm() ATTR_COLD; + void machine_reset_bbcm(); + void machine_start_bbcmc() ATTR_COLD; + void machine_reset_bbcmc(); + void machine_reset_ltmpbp(); + void machine_reset_ltmpm(); + void machine_start_cfa3000() ATTR_COLD; DECLARE_PALETTE_INIT(bbc); INTERRUPT_GEN_MEMBER(bbcb_keyscan); diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 8c026972105..1c095b9da8c 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -65,8 +65,8 @@ public: TILE_GET_INFO_MEMBER(get_pf2_tile_info); virtual void machine_start() override; - DECLARE_VIDEO_START(bbuster); - DECLARE_VIDEO_START(mechatt); + void video_start_bbuster() ATTR_COLD; + void video_start_mechatt() ATTR_COLD; uint32_t screen_update_bbuster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_mechatt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 69fc79967b6..c01f11a7457 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -88,9 +88,9 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(bking); - DECLARE_MACHINE_START(bking3); - DECLARE_MACHINE_RESET(bking3); - DECLARE_MACHINE_RESET(common); + void machine_start_bking3() ATTR_COLD; + void machine_reset_bking3(); + void machine_reset_common(); uint32_t screen_update_bking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_bking); void bking(machine_config &config); diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 8ceba7a8929..41401696dd0 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -60,10 +60,10 @@ public: void init_blmbycar(); virtual void video_start() override; - DECLARE_MACHINE_START(blmbycar); - DECLARE_MACHINE_RESET(blmbycar); - DECLARE_MACHINE_START(watrball); - DECLARE_MACHINE_RESET(watrball); + void machine_start_blmbycar() ATTR_COLD; + void machine_reset_blmbycar(); + void machine_start_watrball() ATTR_COLD; + void machine_reset_watrball(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index 78c48fcbb0c..e45ad94966f 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -40,7 +40,7 @@ protected: virtual void scanline_update(screen_device &screen, int scanline) override; DECLARE_WRITE16_MEMBER(blstroid_halt_until_hblank_0_w); TILE_GET_INFO_MEMBER(get_playfield_tile_info); - DECLARE_VIDEO_START(blstroid); + void video_start_blstroid() ATTR_COLD; uint32_t screen_update_blstroid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 6d23fc3ddab..4481fc90abc 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -52,7 +52,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_VIDEO_START(blueprnt); + void video_start_blueprnt() ATTR_COLD; DECLARE_PALETTE_INIT(blueprnt); uint32_t screen_update_blueprnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/bosco.h b/src/mame/includes/bosco.h index fe5473e85f7..256581d524b 100644 --- a/src/mame/includes/bosco.h +++ b/src/mame/includes/bosco.h @@ -30,7 +30,7 @@ public: TILEMAP_MAPPER_MEMBER(fg_tilemap_scan); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(fg_get_tile_info); - DECLARE_VIDEO_START(bosco); + void video_start_bosco() ATTR_COLD; DECLARE_PALETTE_INIT(bosco); uint32_t screen_update_bosco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_bosco); diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 38af9ef7f05..a112e1b7553 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -108,15 +108,15 @@ public: void init_protennb(); void init_disco(); void init_lnc(); - DECLARE_MACHINE_START(btime); - DECLARE_MACHINE_RESET(btime); + void machine_start_btime() ATTR_COLD; + void machine_reset_btime(); DECLARE_PALETTE_INIT(btime); - DECLARE_MACHINE_RESET(lnc); + void machine_reset_lnc(); DECLARE_PALETTE_INIT(lnc); - DECLARE_MACHINE_START(mmonkey); - DECLARE_MACHINE_RESET(mmonkey); - DECLARE_VIDEO_START(bnj); - DECLARE_VIDEO_START(disco); + void machine_start_mmonkey() ATTR_COLD; + void machine_reset_mmonkey(); + void video_start_bnj() ATTR_COLD; + void video_start_disco() ATTR_COLD; uint32_t screen_update_btime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cookrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_lnc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index 1bf355da100..b18f7873728 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -120,14 +120,15 @@ public: void init_dland(); void init_common(); - DECLARE_MACHINE_START(tokio); - DECLARE_MACHINE_RESET(tokio); - DECLARE_MACHINE_START(bublbobl); - DECLARE_MACHINE_RESET(bublbobl); - DECLARE_MACHINE_START(boblbobl); - DECLARE_MACHINE_RESET(boblbobl); - DECLARE_MACHINE_START(common); - DECLARE_MACHINE_RESET(common); + void machine_start_tokio() ATTR_COLD; + void machine_reset_tokio(); + void machine_start_bublbobl() ATTR_COLD; + void machine_reset_bublbobl(); + void machine_start_boblbobl() ATTR_COLD; + void machine_reset_boblbobl(); + void machine_start_common() ATTR_COLD; + void machine_reset_common(); + uint32_t screen_update_bublbobl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void configure_banks(); @@ -172,8 +173,8 @@ public: INTERRUPT_GEN_MEMBER(bublbobl_m68705_interrupt); - DECLARE_MACHINE_START(bub68705); - DECLARE_MACHINE_RESET(bub68705); + void machine_start_bub68705() ATTR_COLD; + void machine_reset_bub68705(); void bub68705(machine_config &config); protected: diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index ec0a72e15d0..3b53c024ad0 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -58,8 +58,8 @@ public: DECLARE_WRITE8_MEMBER(cabalbl_2_adpcm_w); void init_cabal(); - DECLARE_MACHINE_START(cabalbl); - DECLARE_MACHINE_RESET(cabalbl); + void machine_start_cabalbl() ATTR_COLD; + void machine_reset_cabalbl(); virtual void video_start() override; TILE_GET_INFO_MEMBER(get_back_tile_info); diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 3bae5ccb4c9..1826ce8289c 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -223,20 +223,20 @@ public: void init_ppsatan(); TILE_GET_INFO_MEMBER(sailormn_get_tile_info_2); template<int Chip> TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_MACHINE_START(cave); - DECLARE_MACHINE_RESET(cave); - DECLARE_MACHINE_RESET(sailormn); - DECLARE_VIDEO_START(cave_2_layers); + void machine_start_cave() ATTR_COLD; + void machine_reset_cave(); + void machine_reset_sailormn(); + void video_start_cave_2_layers() ATTR_COLD; DECLARE_PALETTE_INIT(dfeveron); - DECLARE_VIDEO_START(cave_3_layers); + void video_start_cave_3_layers() ATTR_COLD; DECLARE_PALETTE_INIT(ddonpach); DECLARE_PALETTE_INIT(cave); - DECLARE_VIDEO_START(cave_1_layer); + void video_start_cave_1_layer() ATTR_COLD; DECLARE_PALETTE_INIT(korokoro); DECLARE_PALETTE_INIT(mazinger); - DECLARE_VIDEO_START(cave_4_layers); + void video_start_cave_4_layers() ATTR_COLD; DECLARE_PALETTE_INIT(pwrinst2); - DECLARE_VIDEO_START(sailormn_3_layers); + void video_start_sailormn_3_layers() ATTR_COLD; DECLARE_PALETTE_INIT(sailormn); DECLARE_PALETTE_INIT(ppsatan); uint32_t screen_update_cave(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 7bdcfe6cb94..09ae03334fb 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -82,12 +82,12 @@ public: void init_cannonb(); void init_dking(); void init_rpatrol(); - DECLARE_VIDEO_START(cclimber); + void video_start_cclimber() ATTR_COLD; DECLARE_PALETTE_INIT(cclimber); - DECLARE_VIDEO_START(swimmer); + void video_start_swimmer() ATTR_COLD; DECLARE_PALETTE_INIT(swimmer); DECLARE_PALETTE_INIT(yamato); - DECLARE_VIDEO_START(toprollr); + void video_start_toprollr() ATTR_COLD; DECLARE_PALETTE_INIT(toprollr); TILE_GET_INFO_MEMBER(cclimber_get_pf_tile_info); diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h index e39f6e83ba9..37136aea8b1 100644 --- a/src/mame/includes/cdi.h +++ b/src/mame/includes/cdi.h @@ -106,12 +106,12 @@ public: virtual void machine_start() override { } virtual void video_start() override; - DECLARE_MACHINE_RESET(cdimono1); - DECLARE_MACHINE_RESET(cdimono2); - DECLARE_MACHINE_RESET(quizard1); - DECLARE_MACHINE_RESET(quizard2); - DECLARE_MACHINE_RESET(quizard3); - DECLARE_MACHINE_RESET(quizard4); + void machine_reset_cdimono1(); + void machine_reset_cdimono2(); + void machine_reset_quizard1(); + void machine_reset_quizard2(); + void machine_reset_quizard3(); + void machine_reset_quizard4(); DECLARE_READ8_MEMBER(servo_io_r); DECLARE_WRITE8_MEMBER(servo_io_w); DECLARE_READ8_MEMBER(slave_io_r); diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 2c2dcbf9f25..b6a659f92a6 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -103,13 +103,13 @@ private: TILE_GET_INFO_MEMBER(warlords_get_tile_info); TILE_GET_INFO_MEMBER(milliped_get_tile_info); TILE_GET_INFO_MEMBER(bullsdrt_get_tile_info); - DECLARE_MACHINE_START(centiped); - DECLARE_MACHINE_RESET(centiped); - DECLARE_VIDEO_START(centiped); - DECLARE_VIDEO_START(bullsdrt); - DECLARE_MACHINE_RESET(magworm); - DECLARE_VIDEO_START(milliped); - DECLARE_VIDEO_START(warlords); + void machine_start_centiped() ATTR_COLD; + void machine_reset_centiped(); + void video_start_centiped() ATTR_COLD; + void video_start_bullsdrt() ATTR_COLD; + void machine_reset_magworm(); + void video_start_milliped() ATTR_COLD; + void video_start_warlords() ATTR_COLD; DECLARE_PALETTE_INIT(warlords); uint32_t screen_update_centiped(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_bullsdrt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index b938cc5f4e3..0795ec1c11d 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -68,8 +68,8 @@ public: DECLARE_PALETTE_INIT(champbas); DECLARE_PALETTE_INIT(exctsccr); - DECLARE_VIDEO_START(champbas); - DECLARE_VIDEO_START(exctsccr); + void video_start_champbas() ATTR_COLD; + void video_start_exctsccr() ATTR_COLD; TILE_GET_INFO_MEMBER(champbas_get_bg_tile_info); TILE_GET_INFO_MEMBER(exctsccr_get_bg_tile_info); diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 2841726dd98..9e9a83891c1 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -98,12 +98,12 @@ public: virtual void sound_start() override; virtual void sound_reset() override; virtual void video_start() override; - DECLARE_SOUND_RESET(demon); - DECLARE_SOUND_RESET(qb3); - DECLARE_VIDEO_START(cinemat_16level); - DECLARE_VIDEO_START(cinemat_64level); - DECLARE_VIDEO_START(cinemat_color); - DECLARE_VIDEO_START(cinemat_qb3color); + void sound_reset_demon(); + void sound_reset_qb3(); + void video_start_cinemat_16level() ATTR_COLD; + void video_start_cinemat_64level() ATTR_COLD; + void video_start_cinemat_color() ATTR_COLD; + void video_start_cinemat_qb3color() ATTR_COLD; uint32_t screen_update_cinemat(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_spacewar(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER(sound_porta_r); diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 6d8b89d6905..b2926d18ca8 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -46,9 +46,9 @@ public: void init_firebatl(); virtual void machine_reset() override; - DECLARE_VIDEO_START(firebatl); + void video_start_firebatl() ATTR_COLD; DECLARE_PALETTE_INIT(firebatl); - DECLARE_VIDEO_START(clshroad); + void video_start_clshroad() ATTR_COLD; DECLARE_PALETTE_INIT(clshroad); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index b101a2e49fe..353fe243bbc 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -61,10 +61,10 @@ public: DECLARE_WRITE8_MEMBER(cninjabl2_oki_bank_w); void init_mutantf(); void init_cninjabl2(); - DECLARE_MACHINE_START(robocop2); - DECLARE_MACHINE_RESET(robocop2); - DECLARE_VIDEO_START(stoneage); - DECLARE_VIDEO_START(mutantf); + void machine_start_robocop2() ATTR_COLD; + void machine_reset_robocop2(); + void video_start_stoneage() ATTR_COLD; + void video_start_mutantf() ATTR_COLD; uint32_t screen_update_cninja(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cninjabl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cninjabl2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 957a217e8b4..bc3803d4d23 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -104,11 +104,11 @@ public: TILE_GET_INFO_MEMBER(get_tile_info1_bootleg); TILE_GET_INFO_MEMBER(get_text_info_bootleg); virtual void machine_reset() override; - DECLARE_MACHINE_START(combatsc); - DECLARE_VIDEO_START(combatsc); + void machine_start_combatsc() ATTR_COLD; + void video_start_combatsc() ATTR_COLD; DECLARE_PALETTE_INIT(combatsc); - DECLARE_MACHINE_START(combatscb); - DECLARE_VIDEO_START(combatscb); + void machine_start_combatscb() ATTR_COLD; + void video_start_combatscb() ATTR_COLD; DECLARE_PALETTE_INIT(combatscb); uint32_t screen_update_combatsc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_combatscb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h index ee06b54ba88..b2c8b7b9a5e 100644 --- a/src/mame/includes/coolpool.h +++ b/src/mame/includes/coolpool.h @@ -68,8 +68,8 @@ public: void init_coolpool(); void init_amerdart(); void init_9ballsht(); - DECLARE_MACHINE_RESET(amerdart); - DECLARE_MACHINE_RESET(coolpool); + void machine_reset_amerdart(); + void machine_reset_coolpool(); TIMER_DEVICE_CALLBACK_MEMBER(nvram_write_timeout); TIMER_DEVICE_CALLBACK_MEMBER(amerdart_audio_int_gen); void register_state_save(); diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 9cc06ec17dd..b4f735bbbb7 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -84,9 +84,9 @@ public: void init_nomnlnd(); void init_cosmica(); void init_panic(); - DECLARE_MACHINE_START(cosmic); - DECLARE_MACHINE_RESET(cosmic); - DECLARE_MACHINE_RESET(cosmicg); + void machine_start_cosmic() ATTR_COLD; + void machine_reset_cosmic(); + void machine_reset_cosmicg(); DECLARE_PALETTE_INIT(cosmicg); DECLARE_PALETTE_INIT(panic); DECLARE_PALETTE_INIT(cosmica); diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 51ec10adafb..f78aab06bc2 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -311,16 +311,16 @@ public: TILE_GET_INFO_MEMBER(get_tile0_info); TILE_GET_INFO_MEMBER(get_tile1_info); TILE_GET_INFO_MEMBER(get_tile2_info); - DECLARE_MACHINE_START(cps1); - DECLARE_VIDEO_START(cps1); - DECLARE_MACHINE_START(common); - DECLARE_MACHINE_START(cps2); - DECLARE_VIDEO_START(cps2); - DECLARE_MACHINE_START(qsound); - DECLARE_MACHINE_START(ganbare); - DECLARE_MACHINE_RESET(cps); - DECLARE_VIDEO_START(cps); - DECLARE_MACHINE_START(sf2m1); + void machine_start_cps1() ATTR_COLD; + void video_start_cps1() ATTR_COLD; + void machine_start_common() ATTR_COLD; + void machine_start_cps2() ATTR_COLD; + void video_start_cps2() ATTR_COLD; + void machine_start_qsound() ATTR_COLD; + void machine_start_ganbare() ATTR_COLD; + void machine_reset_cps(); + void video_start_cps() ATTR_COLD; + void machine_start_sf2m1() ATTR_COLD; uint32_t screen_update_cps1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_cps1); INTERRUPT_GEN_MEMBER(cps1_interrupt); @@ -345,16 +345,16 @@ public: void init_sf2b(); void init_slampic(); void init_wofabl(); - DECLARE_MACHINE_START(fcrash); - DECLARE_MACHINE_RESET(fcrash); - DECLARE_MACHINE_START(cawingbl); - DECLARE_MACHINE_START(dinopic); - DECLARE_MACHINE_START(knightsb); - DECLARE_MACHINE_START(kodb); - DECLARE_MACHINE_START(punipic); - DECLARE_MACHINE_START(sf2mdt); - DECLARE_MACHINE_START(slampic); - DECLARE_MACHINE_START(sgyxz); + void machine_start_fcrash() ATTR_COLD; + void machine_reset_fcrash(); + void machine_start_cawingbl() ATTR_COLD; + void machine_start_dinopic() ATTR_COLD; + void machine_start_knightsb() ATTR_COLD; + void machine_start_kodb() ATTR_COLD; + void machine_start_punipic() ATTR_COLD; + void machine_start_sf2mdt() ATTR_COLD; + void machine_start_slampic() ATTR_COLD; + void machine_start_sgyxz() ATTR_COLD; DECLARE_WRITE16_MEMBER(cawingbl_soundlatch_w); DECLARE_WRITE16_MEMBER(dinopic_layer_w); DECLARE_WRITE16_MEMBER(dinopic_layer2_w); diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index b36f0b89159..94afa6eb9b7 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -127,9 +127,9 @@ public: void init_hero(); void init_superbik(); void init_hunchbaka(); - DECLARE_MACHINE_START(cvs); - DECLARE_MACHINE_RESET(cvs); - DECLARE_VIDEO_START(cvs); + void machine_start_cvs() ATTR_COLD; + void machine_reset_cvs(); + void video_start_cvs() ATTR_COLD; DECLARE_PALETTE_INIT(cvs); uint32_t screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cvs_main_cpu_interrupt); diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 0c8c8558a1d..0aa161293e9 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -94,7 +94,7 @@ class dc_state : public driver_device void generic_dma(uint32_t main_adr, void *dma_ptr, uint32_t length, uint32_t size, bool to_mainram); TIMER_DEVICE_CALLBACK_MEMBER(dc_scanline); - DECLARE_MACHINE_RESET(dc_console); + void machine_reset_dc_console(); void naomi_aw_base(machine_config &config); void dc_audio_map(address_map &map); diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index f1c6a6455bc..25351b19e05 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -98,9 +98,9 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); uint32_t screen_update_ddragon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_MACHINE_START(ddragon); - DECLARE_MACHINE_RESET(ddragon); - DECLARE_VIDEO_START(ddragon); + void machine_start_ddragon() ATTR_COLD; + void machine_reset_ddragon(); + void video_start_ddragon() ATTR_COLD; TIMER_DEVICE_CALLBACK_MEMBER(ddragon_scanline); diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 5c0855cf307..26b3184b66c 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -129,7 +129,7 @@ public: TILE_GET_INFO_MEMBER(get_fg0_tile_info); virtual void video_start() override; - DECLARE_VIDEO_START(wwfwfstb); + void video_start_wwfwfstb() ATTR_COLD; uint32_t screen_update_wwfwfest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void wwfwfest(machine_config &config); diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 2edfd3670d5..eb5e451dafa 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -104,9 +104,9 @@ public: void init_ffantasybl(); virtual void machine_start() override; - DECLARE_MACHINE_RESET(slyspy); - DECLARE_VIDEO_START(dec0); - DECLARE_VIDEO_START(dec0_nodma); + void machine_reset_slyspy(); + void video_start_dec0() ATTR_COLD; + void video_start_dec0_nodma() ATTR_COLD; uint32_t screen_update_hbarrel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_baddudes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 1c78b79f80d..92177bc69de 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -157,14 +157,14 @@ public: TILE_GET_INFO_MEMBER(get_gondo_tile_info); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_VIDEO_START(lastmisn); - DECLARE_VIDEO_START(shackled); - DECLARE_VIDEO_START(gondo); - DECLARE_VIDEO_START(garyoret); - DECLARE_VIDEO_START(ghostb); - DECLARE_VIDEO_START(oscar); - DECLARE_VIDEO_START(srdarwin); - DECLARE_VIDEO_START(cobracom); + void video_start_lastmisn() ATTR_COLD; + void video_start_shackled() ATTR_COLD; + void video_start_gondo() ATTR_COLD; + void video_start_garyoret() ATTR_COLD; + void video_start_ghostb() ATTR_COLD; + void video_start_oscar() ATTR_COLD; + void video_start_srdarwin() ATTR_COLD; + void video_start_cobracom() ATTR_COLD; void allocate_buffered_spriteram16(); uint32_t screen_update_lastmisn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_shackled(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 7250d0df2e9..d7702f638e4 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -112,7 +112,7 @@ public: DECLARE_READ8_MEMBER(captaven_dsw3_r); DECLARE_READ8_MEMBER(captaven_soundcpu_status_r); - DECLARE_VIDEO_START(captaven); + void video_start_captaven() ATTR_COLD; void init_captaven(); uint32_t screen_update_captaven(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -138,7 +138,7 @@ public: DECLARE_READ32_MEMBER(unk_status_r); void init_fghthist(); - DECLARE_VIDEO_START(fghthist); + void video_start_fghthist() ATTR_COLD; uint32_t screen_update_fghthist(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -168,7 +168,7 @@ public: void init_tattass(); void init_nslasher(); - DECLARE_VIDEO_START(nslasher); + void video_start_nslasher() ATTR_COLD; uint32_t screen_update_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -241,7 +241,7 @@ public: void init_dragngun(); void init_dragngunj(); void init_lockload(); - DECLARE_VIDEO_START(dragngun); + void video_start_dragngun() ATTR_COLD; void dragngun_init_common(); DECLARE_INPUT_CHANGED_MEMBER(lockload_gun_trigger); diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index e63af284675..3a6b067c407 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -76,8 +76,8 @@ public: void init_mlc(); void init_avengrgs(); - DECLARE_MACHINE_RESET(mlc); - DECLARE_VIDEO_START(mlc); + void machine_reset_mlc(); + void video_start_mlc() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_mlc); TIMER_DEVICE_CALLBACK_MEMBER(interrupt_gen); diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index 29bc9666697..aa8c4bcbaa0 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -219,23 +219,23 @@ public: m_type1_map = nullptr; } - DECLARE_MACHINE_RESET(ctsttape); - DECLARE_MACHINE_RESET(chwy); - DECLARE_MACHINE_RESET(cdsteljn); - DECLARE_MACHINE_RESET(cterrani); - DECLARE_MACHINE_RESET(castfant); - DECLARE_MACHINE_RESET(csuperas); - DECLARE_MACHINE_RESET(cmanhat); - DECLARE_MACHINE_RESET(clocknch); - DECLARE_MACHINE_RESET(cprogolf); - DECLARE_MACHINE_RESET(cprogolfj); - DECLARE_MACHINE_RESET(cluckypo); - DECLARE_MACHINE_RESET(ctisland); - DECLARE_MACHINE_RESET(ctisland3); - DECLARE_MACHINE_RESET(cexplore); - DECLARE_MACHINE_RESET(cocean1a); /* 10 */ - DECLARE_MACHINE_RESET(cfboy0a1); /* 12 */ - DECLARE_MACHINE_RESET(clocknchj); /* 11 */ + void machine_reset_ctsttape(); + void machine_reset_chwy(); + void machine_reset_cdsteljn(); + void machine_reset_cterrani(); + void machine_reset_castfant(); + void machine_reset_csuperas(); + void machine_reset_cmanhat(); + void machine_reset_clocknch(); + void machine_reset_cprogolf(); + void machine_reset_cprogolfj(); + void machine_reset_cluckypo(); + void machine_reset_ctisland(); + void machine_reset_ctisland3(); + void machine_reset_cexplore(); + void machine_reset_cocean1a(); /* 10 */ + void machine_reset_cfboy0a1(); /* 12 */ + void machine_reset_clocknchj(); /* 11 */ void cprogolfj(machine_config &config); void cfboy0a1(machine_config &config); @@ -303,20 +303,20 @@ public: { } - DECLARE_MACHINE_RESET(cfishing); - DECLARE_MACHINE_RESET(cbtime); - DECLARE_MACHINE_RESET(cburnrub); - DECLARE_MACHINE_RESET(cgraplop); - DECLARE_MACHINE_RESET(cgraplop2); - DECLARE_MACHINE_RESET(clapapa); - DECLARE_MACHINE_RESET(cskater); - DECLARE_MACHINE_RESET(cprobowl); - DECLARE_MACHINE_RESET(cnightst); - DECLARE_MACHINE_RESET(cpsoccer); - DECLARE_MACHINE_RESET(csdtenis); - DECLARE_MACHINE_RESET(czeroize); - DECLARE_MACHINE_RESET(cppicf); - DECLARE_MACHINE_RESET(cfghtice); + void machine_reset_cfishing(); + void machine_reset_cbtime(); + void machine_reset_cburnrub(); + void machine_reset_cgraplop(); + void machine_reset_cgraplop2(); + void machine_reset_clapapa(); + void machine_reset_cskater(); + void machine_reset_cprobowl(); + void machine_reset_cnightst(); + void machine_reset_cpsoccer(); + void machine_reset_csdtenis(); + void machine_reset_czeroize(); + void machine_reset_cppicf(); + void machine_reset_cfghtice(); void csdtenis(machine_config &config); void cburnrub(machine_config &config); diff --git a/src/mame/includes/digdug.h b/src/mame/includes/digdug.h index 32856d5c12a..1df1206db55 100644 --- a/src/mame/includes/digdug.h +++ b/src/mame/includes/digdug.h @@ -22,7 +22,7 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(tx_get_tile_info); - DECLARE_VIDEO_START(digdug); + void video_start_digdug() ATTR_COLD; DECLARE_PALETTE_INIT(digdug); uint32_t screen_update_digdug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h index 4de581ddb39..930b9a0dcbb 100644 --- a/src/mame/includes/divebomb.h +++ b/src/mame/includes/divebomb.h @@ -52,9 +52,9 @@ public: uint8_t m_roz_pal; bool m_roz_enable[2]; - DECLARE_MACHINE_RESET(divebomb); - DECLARE_MACHINE_START(divebomb); - DECLARE_VIDEO_START(divebomb); + void machine_reset_divebomb(); + void machine_start_divebomb() ATTR_COLD; + void video_start_divebomb() ATTR_COLD; DECLARE_PALETTE_INIT(divebomb); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 6cde8a1ebea..bda364b276e 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -256,21 +256,21 @@ public: void init_dkong3hs(); TILE_GET_INFO_MEMBER(dkong_bg_tile_info); TILE_GET_INFO_MEMBER(radarscp1_bg_tile_info); - DECLARE_MACHINE_START(dkong2b); - DECLARE_MACHINE_RESET(dkong); - DECLARE_MACHINE_RESET(ddk); - DECLARE_VIDEO_START(dkong); - DECLARE_VIDEO_START(dkong_base); + void machine_start_dkong2b() ATTR_COLD; + void machine_reset_dkong(); + void machine_reset_ddk(); + void video_start_dkong() ATTR_COLD; + void video_start_dkong_base() ATTR_COLD; DECLARE_PALETTE_INIT(dkong2b); - DECLARE_MACHINE_START(dkong3); + void machine_start_dkong3() ATTR_COLD; DECLARE_PALETTE_INIT(dkong3); - DECLARE_MACHINE_START(radarscp); + void machine_start_radarscp() ATTR_COLD; DECLARE_PALETTE_INIT(radarscp); - DECLARE_MACHINE_START(radarscp1); + void machine_start_radarscp1() ATTR_COLD; DECLARE_PALETTE_INIT(radarscp1); - DECLARE_MACHINE_START(s2650); - DECLARE_MACHINE_RESET(strtheat); - DECLARE_MACHINE_RESET(drakton); + void machine_start_s2650() ATTR_COLD; + void machine_reset_strtheat(); + void machine_reset_drakton(); DECLARE_WRITE8_MEMBER(M58817_command_w); DECLARE_READ8_MEMBER(dkong_voice_status_r); DECLARE_READ8_MEMBER(dkong_tune_r); diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 34ea0e27bdb..74cd1e4bb0a 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -72,7 +72,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(docastle); - DECLARE_VIDEO_START(dorunrun); + void video_start_dorunrun() ATTR_COLD; uint32_t screen_update_docastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void video_start_common( uint32_t tile_transmask ); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 1bc90064d8e..711a6170ffb 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -262,29 +262,29 @@ public: DECLARE_WRITE_LINE_MEMBER(adpcm_int); DECLARE_WRITE_LINE_MEMBER(adpcm_int_cpu1); - DECLARE_MACHINE_RESET(adpcm); + void machine_reset_adpcm(); DECLARE_WRITE8_MEMBER(adpcm_reset_w); DECLARE_WRITE_LINE_MEMBER(adpcm_reset_kludge_w); DECLARE_WRITE8_MEMBER(tenkai_dswsel_w); DECLARE_READ8_MEMBER(tenkai_dsw_r); DECLARE_WRITE_LINE_MEMBER(tenkai_blitter_ack_w); - DECLARE_MACHINE_RESET(dynax); - DECLARE_MACHINE_START(dynax); - DECLARE_MACHINE_START(hanamai); - DECLARE_MACHINE_START(hjingi); - DECLARE_VIDEO_START(hanamai); - DECLARE_VIDEO_START(hnoridur); + void machine_reset_dynax(); + void machine_start_dynax() ATTR_COLD; + void machine_start_hanamai() ATTR_COLD; + void machine_start_hjingi() ATTR_COLD; + void video_start_hanamai() ATTR_COLD; + void video_start_hnoridur() ATTR_COLD; DECLARE_PALETTE_INIT(sprtmtch); - DECLARE_VIDEO_START(sprtmtch); - DECLARE_MACHINE_START(jantouki); - DECLARE_VIDEO_START(jantouki); - DECLARE_VIDEO_START(mjelctrn); - DECLARE_VIDEO_START(mjembase); - DECLARE_VIDEO_START(mjdialq2); - DECLARE_VIDEO_START(mcnpshnt); + void video_start_sprtmtch() ATTR_COLD; + void machine_start_jantouki() ATTR_COLD; + void video_start_jantouki() ATTR_COLD; + void video_start_mjelctrn() ATTR_COLD; + void video_start_mjembase() ATTR_COLD; + void video_start_mjdialq2() ATTR_COLD; + void video_start_mcnpshnt() ATTR_COLD; DECLARE_PALETTE_INIT(janyuki); - DECLARE_VIDEO_START(neruton); - DECLARE_VIDEO_START(tenkai); + void video_start_neruton() ATTR_COLD; + void video_start_tenkai() ATTR_COLD; inline void blitter_plot_pixel( int layer, int mask, int x, int y, int pen, int wrap, int flags ); int blitter_drawgfx( int layer, int mask, memory_region *gfx, int src, int pen, int x, int y, int wrap, int flags ); diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 616a5da4f4d..24c4bf4aa31 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -44,8 +44,8 @@ public: void init_landbrka(); void init_landbrkb(); - DECLARE_MACHINE_RESET(eolith); - DECLARE_VIDEO_START(eolith); + void machine_reset_eolith(); + void video_start_eolith(); TIMER_DEVICE_CALLBACK_MEMBER(eolith_speedup); diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index df5ce02a6a9..5729c21aeef 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -37,8 +37,8 @@ public: DECLARE_WRITE8_MEMBER(dealer_pal_w); void init_dealer(); virtual void machine_reset() override; - DECLARE_MACHINE_START(epos); - DECLARE_MACHINE_START(dealer); + void machine_start_epos() ATTR_COLD; + void machine_start_dealer() ATTR_COLD; DECLARE_PALETTE_INIT(epos); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void set_pal_color( uint8_t offset, uint8_t data ); diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 3f1e0f5e91a..11f06791b97 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -45,8 +45,8 @@ protected: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILE_GET_INFO_MEMBER(guts_get_playfield_tile_info); - DECLARE_VIDEO_START(eprom); - DECLARE_VIDEO_START(guts); + void video_start_eprom() ATTR_COLD; + void video_start_guts() ATTR_COLD; uint32_t screen_update_eprom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_guts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void update_palette(); diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 9cb108b2a53..be2cf2f6264 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -108,7 +108,7 @@ public: void init_equites(); TILE_GET_INFO_MEMBER(equites_fg_info); TILE_GET_INFO_MEMBER(equites_bg_info); - DECLARE_VIDEO_START(equites); + void video_start_equites() ATTR_COLD; DECLARE_PALETTE_INIT(equites); uint32_t screen_update_equites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(equites_8155_timer_pulse); @@ -165,7 +165,7 @@ protected: DECLARE_WRITE16_MEMBER(splndrbt_bg_scrolly_w); TILE_GET_INFO_MEMBER(splndrbt_fg_info); TILE_GET_INFO_MEMBER(splndrbt_bg_info); - DECLARE_VIDEO_START(splndrbt); + void video_start_splndrbt() ATTR_COLD; DECLARE_PALETTE_INIT(splndrbt); uint32_t screen_update_splndrbt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(splndrbt_scanline); diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 7474320046c..c1f45947ff4 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -65,7 +65,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(espial); - DECLARE_VIDEO_START(netwars); + void video_start_netwars() ATTR_COLD; uint32_t screen_update_espial(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(espial_sound_nmi_gen); TIMER_DEVICE_CALLBACK_MEMBER(espial_scanline); diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 92381382593..cbf4ae4efd5 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -96,7 +96,7 @@ public: void init_phantoma(); virtual void video_start() override; - DECLARE_MACHINE_START(teetert); + void machine_start_teetert() ATTR_COLD; uint32_t screen_update_exidy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 42197a9e967..b3d121bf611 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -91,12 +91,12 @@ public: TILE_GET_INFO_MEMBER(f1gp_get_roz_tile_info); TILE_GET_INFO_MEMBER(f1gp2_get_roz_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_MACHINE_START(f1gp); - DECLARE_MACHINE_RESET(f1gp); - DECLARE_VIDEO_START(f1gp); - DECLARE_MACHINE_START(f1gpb); - DECLARE_VIDEO_START(f1gpb); - DECLARE_VIDEO_START(f1gp2); + void machine_start_f1gp() ATTR_COLD; + void machine_reset_f1gp(); + void video_start_f1gp() ATTR_COLD; + void machine_start_f1gpb() ATTR_COLD; + void video_start_f1gpb() ATTR_COLD; + void video_start_f1gp2() ATTR_COLD; uint32_t screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_f1gp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 8ca9c568f4a..12fef69ff46 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -64,10 +64,10 @@ public: DECLARE_READ8_MEMBER(borntofi_inputs_r); DECLARE_WRITE8_MEMBER(borntofi_msm5205_w); DECLARE_CUSTOM_INPUT_MEMBER(wheelrun_wheel_r); - DECLARE_MACHINE_START(fantland); - DECLARE_MACHINE_RESET(fantland); - DECLARE_MACHINE_START(borntofi); - DECLARE_MACHINE_RESET(borntofi); + void machine_start_fantland() ATTR_COLD; + void machine_reset_fantland(); + void machine_start_borntofi() ATTR_COLD; + void machine_reset_borntofi(); uint32_t screen_update_fantland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(fantland_irq); INTERRUPT_GEN_MEMBER(fantland_sound_irq); diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index 469eb864db0..47e8285eb22 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -79,9 +79,9 @@ public: virtual void machine_start() override; DECLARE_PALETTE_INIT(fastfred); - DECLARE_MACHINE_START(imago); - DECLARE_VIDEO_START(fastfred); - DECLARE_VIDEO_START(imago); + void machine_start_imago() ATTR_COLD; + void video_start_fastfred() ATTR_COLD; + void video_start_imago() ATTR_COLD; uint32_t screen_update_fastfred(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_imago(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index b5e533cef40..c9ba134d3d4 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -130,8 +130,8 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(firetrk); - DECLARE_VIDEO_START(superbug); - DECLARE_VIDEO_START(montecar); + void video_start_superbug() ATTR_COLD; + void video_start_montecar() ATTR_COLD; DECLARE_PALETTE_INIT(montecar); uint32_t screen_update_firetrk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_superbug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index ce0ee008e02..e54f562f1a5 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -88,12 +88,12 @@ public: TILE_GET_INFO_MEMBER(victnine_get_tile_info); TILE_GET_INFO_MEMBER(get_rumba_tile_info); virtual void machine_start() override; - DECLARE_MACHINE_RESET(flstory); - DECLARE_VIDEO_START(flstory); - DECLARE_VIDEO_START(victnine); - DECLARE_MACHINE_RESET(rumba); - DECLARE_VIDEO_START(rumba); - DECLARE_MACHINE_RESET(ta7630); + void machine_reset_flstory(); + void video_start_flstory() ATTR_COLD; + void video_start_victnine() ATTR_COLD; + void machine_reset_rumba(); + void video_start_rumba() ATTR_COLD; + void machine_reset_ta7630(); uint32_t screen_update_flstory(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_victnine(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_rumba(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h index 7010f83d176..88816aee5f1 100644 --- a/src/mame/includes/fm7.h +++ b/src/mame/includes/fm7.h @@ -159,10 +159,10 @@ public: virtual void machine_reset() override; virtual void video_start() override; - DECLARE_MACHINE_START(fm7); - DECLARE_MACHINE_START(fm77av); - DECLARE_MACHINE_START(fm11); - DECLARE_MACHINE_START(fm16); + void machine_start_fm7() ATTR_COLD; + void machine_start_fm77av() ATTR_COLD; + void machine_start_fm11() ATTR_COLD; + void machine_start_fm16() ATTR_COLD; DECLARE_WRITE_LINE_MEMBER(fm7_fdc_intrq_w); DECLARE_WRITE_LINE_MEMBER(fm7_fdc_drq_w); diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index f7b984b754a..4978c82d8a5 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -54,11 +54,11 @@ public: void init_pbillrds(); TILE_GET_INFO_MEMBER(get_freek_tile_info); virtual void video_start() override; - DECLARE_MACHINE_START(pbillrd); - DECLARE_MACHINE_RESET(freekick); - DECLARE_MACHINE_START(freekick); - DECLARE_MACHINE_START(oigas); - DECLARE_MACHINE_RESET(oigas); + void machine_start_pbillrd() ATTR_COLD; + void machine_reset_freekick(); + void machine_start_freekick() ATTR_COLD; + void machine_start_oigas() ATTR_COLD; + void machine_reset_oigas(); uint32_t screen_update_pbillrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_freekick(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_gigas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index d4aefe4a413..85b8710cc94 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -94,11 +94,11 @@ public: template<int VRAM, int Layer> TILE_GET_INFO_MEMBER(fromanc2_get_tile_info); template<int VRAM, int Layer> TILE_GET_INFO_MEMBER(fromancr_get_tile_info); virtual void machine_reset() override; - DECLARE_MACHINE_START(fromanc2); - DECLARE_VIDEO_START(fromanc2); - DECLARE_VIDEO_START(fromancr); - DECLARE_MACHINE_START(fromanc4); - DECLARE_VIDEO_START(fromanc4); + void machine_start_fromanc2() ATTR_COLD; + void video_start_fromanc2() ATTR_COLD; + void video_start_fromancr() ATTR_COLD; + void machine_start_fromanc4() ATTR_COLD; + void video_start_fromanc4() ATTR_COLD; uint32_t screen_update_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline void fromanc2_dispvram_w( offs_t offset, uint16_t data, uint16_t mem_mask, int vram, int layer ); diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 044b0385276..f0edb0392a9 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -82,12 +82,12 @@ public: TILE_GET_INFO_MEMBER(get_fromance_fg_tile_info); TILE_GET_INFO_MEMBER(get_nekkyoku_bg_tile_info); TILE_GET_INFO_MEMBER(get_nekkyoku_fg_tile_info); - DECLARE_MACHINE_START(fromance); - DECLARE_MACHINE_RESET(fromance); - DECLARE_VIDEO_START(nekkyoku); - DECLARE_VIDEO_START(fromance); - DECLARE_VIDEO_START(pipedrm); - DECLARE_VIDEO_START(hatris); + void machine_start_fromance() ATTR_COLD; + void machine_reset_fromance(); + void video_start_nekkyoku() ATTR_COLD; + void video_start_fromance() ATTR_COLD; + void video_start_pipedrm() ATTR_COLD; + void video_start_hatris() ATTR_COLD; uint32_t screen_update_fromance(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_pipedrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(crtc_interrupt_gen); diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 0c39ac93bdd..19aff25804c 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -37,12 +37,12 @@ public: void init_rcdino4(); void init_rcdinch(); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_VIDEO_START(funworld); + void video_start_funworld() ATTR_COLD; DECLARE_PALETTE_INIT(funworld); - DECLARE_VIDEO_START(magicrd2); - DECLARE_VIDEO_START(chinatow); - DECLARE_MACHINE_START(lunapark); - DECLARE_MACHINE_RESET(lunapark); + void video_start_magicrd2() ATTR_COLD; + void video_start_chinatow() ATTR_COLD; + void machine_start_lunapark() ATTR_COLD; + void machine_reset_lunapark(); uint32_t screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index ffb0157367d..17128cc6479 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -57,8 +57,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_gaelco_screen1); virtual void machine_start() override; - DECLARE_VIDEO_START(bigkarnk); - DECLARE_VIDEO_START(maniacsq); + void video_start_bigkarnk() ATTR_COLD; + void video_start_maniacsq() ATTR_COLD; uint32_t screen_update_bigkarnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_maniacsq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 2b9c80638f3..d05c76bcce6 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -45,8 +45,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1); TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen0_dual); TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1_dual); - DECLARE_VIDEO_START(gaelco2); - DECLARE_VIDEO_START(gaelco2_dual); + void video_start_gaelco2() ATTR_COLD; + void video_start_gaelco2_dual() ATTR_COLD; uint32_t screen_update_gaelco2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_gaelco2_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_gaelco2_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index 8aa9c02c07b..de597c63be6 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -146,8 +146,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_MACHINE_RESET(gaelco3d2); - DECLARE_MACHINE_RESET(common); + void machine_reset_gaelco3d2(); + void machine_reset_common(); uint32_t screen_update_gaelco3d(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_gen); TIMER_DEVICE_CALLBACK_MEMBER(adsp_autobuffer_irq); diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 83c6fb8acb7..24c2f5b40c9 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -109,11 +109,11 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info_raiga); TILE_GET_INFO_MEMBER(get_tx_tile_info); - DECLARE_MACHINE_START(mastninj); - DECLARE_MACHINE_RESET(raiga); - DECLARE_VIDEO_START(gaiden); - DECLARE_VIDEO_START(drgnbowl); - DECLARE_VIDEO_START(raiga); + void machine_start_mastninj() ATTR_COLD; + void machine_reset_raiga(); + void video_start_gaiden() ATTR_COLD; + void video_start_drgnbowl() ATTR_COLD; + void video_start_raiga() ATTR_COLD; uint32_t screen_update_gaiden(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_drgnbowl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void drgnbowl_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index f26e6602349..a02776d22d6 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -76,9 +76,9 @@ public: void init_gatsbee(); TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_MACHINE_START(galaga); - DECLARE_MACHINE_RESET(galaga); - DECLARE_VIDEO_START(galaga); + void machine_start_galaga() ATTR_COLD; + void machine_reset_galaga(); + void video_start_galaga() ATTR_COLD; DECLARE_PALETTE_INIT(galaga); uint32_t screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_galaga); diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h index bf65a808a0e..9606b215a5a 100644 --- a/src/mame/includes/galaxia.h +++ b/src/mame/includes/galaxia.h @@ -25,9 +25,9 @@ public: DECLARE_READ8_MEMBER(galaxia_collision_clear); TILE_GET_INFO_MEMBER(get_galaxia_bg_tile_info); TILE_GET_INFO_MEMBER(get_astrowar_bg_tile_info); - DECLARE_VIDEO_START(galaxia); + void video_start_galaxia() ATTR_COLD; DECLARE_PALETTE_INIT(galaxia); - DECLARE_VIDEO_START(astrowar); + void video_start_astrowar() ATTR_COLD; DECLARE_PALETTE_INIT(astrowar); uint32_t screen_update_galaxia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_astrowar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 754a70921cc..0ae95217a0a 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -170,9 +170,9 @@ public: TILE_GET_INFO_MEMBER(rockclim_get_tile_info); TILE_GET_INFO_MEMBER(harem_get_tile_info); - DECLARE_MACHINE_RESET(galaxold); - DECLARE_MACHINE_RESET(devilfsg); - DECLARE_MACHINE_RESET(hunchbkg); + void machine_reset_galaxold(); + void machine_reset_devilfsg(); + void machine_reset_hunchbkg(); DECLARE_PALETTE_INIT(galaxold); DECLARE_PALETTE_INIT(rockclim); @@ -185,31 +185,31 @@ public: DECLARE_PALETTE_INIT(dambustr); DECLARE_PALETTE_INIT(turtles); - DECLARE_VIDEO_START(galaxold); - DECLARE_VIDEO_START(drivfrcg); - DECLARE_VIDEO_START(racknrol); - DECLARE_VIDEO_START(mooncrst); - DECLARE_VIDEO_START(scrambold); - DECLARE_VIDEO_START(newsin7); - DECLARE_VIDEO_START(pisces); - DECLARE_VIDEO_START(dkongjrm); - DECLARE_VIDEO_START(dkongjrmc); - DECLARE_VIDEO_START(rockclim); - DECLARE_VIDEO_START(galaxold_plain); - DECLARE_VIDEO_START(ozon1); - DECLARE_VIDEO_START(bongo); - DECLARE_VIDEO_START(ckongs); - DECLARE_VIDEO_START(darkplnt); - DECLARE_VIDEO_START(rescue); - DECLARE_VIDEO_START(minefld); - DECLARE_VIDEO_START(stratgyx); - DECLARE_VIDEO_START(mariner); - DECLARE_VIDEO_START(mimonkey); - DECLARE_VIDEO_START(scorpion); - DECLARE_VIDEO_START(ad2083); - DECLARE_VIDEO_START(dambustr); - DECLARE_VIDEO_START(harem); - DECLARE_VIDEO_START(bagmanmc); + void video_start_galaxold(); + void video_start_drivfrcg(); + void video_start_racknrol(); + void video_start_mooncrst(); + void video_start_scrambold(); + void video_start_newsin7(); + void video_start_pisces(); + void video_start_dkongjrm(); + void video_start_dkongjrmc(); + void video_start_rockclim(); + void video_start_galaxold_plain(); + void video_start_ozon1(); + void video_start_bongo(); + void video_start_ckongs(); + void video_start_darkplnt(); + void video_start_rescue(); + void video_start_minefld(); + void video_start_stratgyx(); + void video_start_mariner(); + void video_start_mimonkey(); + void video_start_scorpion(); + void video_start_ad2083(); + void video_start_dambustr(); + void video_start_harem(); + void video_start_bagmanmc(); uint32_t screen_update_galaxold(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_dambustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/galaxy.h b/src/mame/includes/galaxy.h index 45fc06b272c..da9bdd5049d 100644 --- a/src/mame/includes/galaxy.h +++ b/src/mame/includes/galaxy.h @@ -30,8 +30,8 @@ public: void init_galaxy(); void init_galaxyp(); virtual void video_start() override; - DECLARE_MACHINE_RESET(galaxy); - DECLARE_MACHINE_RESET(galaxyp); + void machine_reset_galaxy(); + void machine_reset_galaxyp(); uint32_t screen_update_galaxy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(galaxy_interrupt); TIMER_CALLBACK_MEMBER(gal_video); diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 7e31de535c8..0a1e4aee680 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -60,12 +60,12 @@ public: TILE_GET_INFO_MEMBER(ninjemak_get_bg_tile_info); TILE_GET_INFO_MEMBER(ninjemak_get_tx_tile_info); DECLARE_PALETTE_INIT(galivan); - DECLARE_MACHINE_START(galivan); - DECLARE_MACHINE_RESET(galivan); - DECLARE_VIDEO_START(galivan); - DECLARE_MACHINE_START(ninjemak); - DECLARE_MACHINE_RESET(ninjemak); - DECLARE_VIDEO_START(ninjemak); + void machine_start_galivan() ATTR_COLD; + void machine_reset_galivan(); + void video_start_galivan() ATTR_COLD; + void machine_start_ninjemak() ATTR_COLD; + void machine_reset_ninjemak(); + void video_start_ninjemak() ATTR_COLD; uint32_t screen_update_galivan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_ninjemak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index cbd574532a3..c8c8fa840ac 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -53,7 +53,7 @@ public: uint32_t screen_update_galspnbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background( bitmap_ind16 &bitmap, const rectangle &cliprect ); bitmap_ind16 m_sprite_bitmap; - DECLARE_VIDEO_START(galspnbl); + void video_start_galspnbl() ATTR_COLD; void mix_sprite_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index 0eb102f8e18..5d28eddcf01 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -48,6 +48,8 @@ public: m_screen(*this, "screen"), m_soundlatch(*this, "soundlatch") { } + void video_start() override; + /* machine state */ uint8_t m_current_port; optional_shared_ptr<uint8_t> m_trvquest_question; @@ -80,15 +82,11 @@ public: DECLARE_WRITE_LINE_MEMBER(audio_trigger_w); DECLARE_WRITE_LINE_MEMBER(r6532_irq); DECLARE_WRITE8_MEMBER(r6532_soundlatch_w); - DECLARE_MACHINE_START(gameplan); - DECLARE_MACHINE_RESET(gameplan); - DECLARE_MACHINE_START(trvquest); - DECLARE_MACHINE_RESET(trvquest); - DECLARE_VIDEO_START(gameplan); - DECLARE_VIDEO_RESET(gameplan); - DECLARE_VIDEO_START(leprechn); - DECLARE_VIDEO_START(trvquest); - DECLARE_VIDEO_START(common); + void machine_start_gameplan() ATTR_COLD; + void machine_reset_gameplan(); + void machine_start_trvquest() ATTR_COLD; + void machine_reset_trvquest(); + void video_reset_gameplan(); uint32_t screen_update_gameplan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_leprechn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(trvquest_interrupt); diff --git a/src/mame/includes/gb.h b/src/mame/includes/gb.h index cd24651a6af..affa28930cf 100644 --- a/src/mame/includes/gb.h +++ b/src/mame/includes/gb.h @@ -71,12 +71,12 @@ public: DECLARE_WRITE8_MEMBER(gbc_io2_w); DECLARE_READ8_MEMBER(gbc_io2_r); DECLARE_PALETTE_INIT(gb); - DECLARE_MACHINE_START(sgb); - DECLARE_MACHINE_RESET(sgb); + void machine_start_sgb() ATTR_COLD; + void machine_reset_sgb(); DECLARE_PALETTE_INIT(sgb); DECLARE_PALETTE_INIT(gbp); - DECLARE_MACHINE_START(gbc); - DECLARE_MACHINE_RESET(gbc); + void machine_start_gbc() ATTR_COLD; + void machine_reset_gbc(); DECLARE_PALETTE_INIT(gbc); DECLARE_WRITE8_MEMBER(gb_timer_callback); @@ -142,8 +142,8 @@ public: DECLARE_READ8_MEMBER(megaduck_sound_r1); DECLARE_WRITE8_MEMBER(megaduck_sound_w2); DECLARE_READ8_MEMBER(megaduck_sound_r2); - DECLARE_MACHINE_START(megaduck); - DECLARE_MACHINE_RESET(megaduck); + void machine_start_megaduck() ATTR_COLD; + void machine_reset_megaduck(); DECLARE_PALETTE_INIT(megaduck); DECLARE_READ8_MEMBER(cart_r); diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 7e4568c3a96..80d230ef2d9 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -57,9 +57,9 @@ public: DECLARE_WRITE8_MEMBER(gberetb_scroll_w); void init_mrgoemon(); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_MACHINE_START(gberet); - DECLARE_MACHINE_RESET(gberet); - DECLARE_VIDEO_START(gberet); + void machine_start_gberet() ATTR_COLD; + void machine_reset_gberet(); + void video_start_gberet() ATTR_COLD; DECLARE_PALETTE_INIT(gberet); uint32_t screen_update_gberet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_gberetb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 0c74c1d2b13..72a393b4506 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -137,8 +137,8 @@ public: void init_gladiatr(); - DECLARE_MACHINE_RESET(gladiator); - DECLARE_VIDEO_START(gladiatr); + void machine_reset_gladiator(); + void video_start_gladiatr() ATTR_COLD; uint32_t screen_update_gladiatr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void swap_block(uint8_t *src1,uint8_t *src2,int len); @@ -187,8 +187,8 @@ public: void init_ppking(); - DECLARE_MACHINE_RESET(ppking); - DECLARE_VIDEO_START(ppking); + void machine_reset_ppking(); + void video_start_ppking() ATTR_COLD; uint32_t screen_update_ppking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index f7780fe120a..8ea0b2d39c2 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -44,9 +44,9 @@ public: void init_cmast91(); void init_wcherry(); void init_super9(); - DECLARE_VIDEO_START(goldstar); + void video_start_goldstar() ATTR_COLD; DECLARE_PALETTE_INIT(cm); - DECLARE_VIDEO_START(cherrym); + void video_start_cherrym() ATTR_COLD; DECLARE_PALETTE_INIT(cmast91); DECLARE_PALETTE_INIT(lucky8); uint32_t screen_update_goldstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -210,8 +210,8 @@ public: void init_flaming7(); void init_flam7_tw(); - DECLARE_VIDEO_START(bingowng); - DECLARE_VIDEO_START(magical); + void video_start_bingowng() ATTR_COLD; + void video_start_magical() ATTR_COLD; DECLARE_PALETTE_INIT(magodds); uint32_t screen_update_bingowng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_magical(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -294,7 +294,7 @@ public: DECLARE_WRITE8_MEMBER(reel2_attrram_w); DECLARE_WRITE8_MEMBER(reel3_attrram_w); - DECLARE_VIDEO_START(sangho); + void video_start_sangho() ATTR_COLD; uint32_t screen_update_sangho(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void star100(machine_config &config); @@ -340,7 +340,7 @@ public: void init_unkch3(); void init_unkch4(); - DECLARE_VIDEO_START(unkch); + void video_start_unkch() ATTR_COLD; uint32_t screen_update_unkch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index a7ca9e6128e..7121cbcdc00 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -128,7 +128,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(screwloo); + void video_start_screwloo() ATTR_COLD; uint32_t screen_update_gottlieb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(gottlieb_interrupt); TIMER_CALLBACK_MEMBER(laserdisc_philips_callback); diff --git a/src/mame/includes/hec2hrp.h b/src/mame/includes/hec2hrp.h index f263a6c4908..aac4d84b874 100644 --- a/src/mame/includes/hec2hrp.h +++ b/src/mame/includes/hec2hrp.h @@ -159,13 +159,13 @@ public: DECLARE_WRITE8_MEMBER(hector_io_8255_w); DECLARE_WRITE8_MEMBER(hector_mx40_io_port_w); DECLARE_WRITE8_MEMBER(hector_mx80_io_port_w); - DECLARE_MACHINE_START(hec2hrp); - DECLARE_MACHINE_RESET(hec2hrp); - DECLARE_VIDEO_START(hec2hrp); - DECLARE_MACHINE_START(hec2hrx); - DECLARE_MACHINE_RESET(hec2hrx); - DECLARE_MACHINE_START(hec2mdhrx); - DECLARE_MACHINE_RESET(hec2mdhrx); + void machine_start_hec2hrp() ATTR_COLD; + void machine_reset_hec2hrp(); + void video_start_hec2hrp() ATTR_COLD; + void machine_start_hec2hrx() ATTR_COLD; + void machine_reset_hec2hrx(); + void machine_start_hec2mdhrx() ATTR_COLD; + void machine_reset_hec2mdhrx(); uint32_t screen_update_hec2hrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(Callback_CK); diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index bfc2a61103e..d8aa64d12e3 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -49,7 +49,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(barricad); + void video_start_barricad() ATTR_COLD; uint32_t screen_update_hitme(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_barricad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint8_t read_port_and_t0( int port ); diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index 572f8b96045..753ffa56061 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -43,7 +43,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(untoucha); + void video_start_untoucha() ATTR_COLD; MC6845_UPDATE_ROW(hnayayoi_update_row); MC6845_UPDATE_ROW(untoucha_update_row); void common_vh_start( int num_pixmaps ); diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index d8767ea979b..fed7e8665bd 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -49,8 +49,8 @@ public: TILE_GET_INFO_MEMBER(holeland_get_tile_info); TILE_GET_INFO_MEMBER(crzrally_get_tile_info); - DECLARE_VIDEO_START(holeland); - DECLARE_VIDEO_START(crzrally); + void video_start_holeland() ATTR_COLD; + void video_start_crzrally() ATTR_COLD; uint32_t screen_update_holeland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_crzrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 3bdb1516d22..fcee3bae1d9 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -120,21 +120,21 @@ public: TILE_GET_INFO_MEMBER(mirderby_get_info1_0); TILE_GET_INFO_MEMBER(mirderby_get_info0_1); TILE_GET_INFO_MEMBER(mirderby_get_info1_1); - DECLARE_MACHINE_START(homedata); - DECLARE_MACHINE_RESET(homedata); - DECLARE_VIDEO_START(mrokumei); + void machine_start_homedata() ATTR_COLD; + void machine_reset_homedata(); + void video_start_mrokumei() ATTR_COLD; DECLARE_PALETTE_INIT(mrokumei); - DECLARE_MACHINE_START(reikaids); - DECLARE_MACHINE_RESET(reikaids); - DECLARE_VIDEO_START(reikaids); + void machine_start_reikaids() ATTR_COLD; + void machine_reset_reikaids(); + void video_start_reikaids() ATTR_COLD; DECLARE_PALETTE_INIT(reikaids); - DECLARE_MACHINE_START(pteacher); - DECLARE_MACHINE_RESET(pteacher); - DECLARE_VIDEO_START(pteacher); + void machine_start_pteacher() ATTR_COLD; + void machine_reset_pteacher(); + void video_start_pteacher() ATTR_COLD; DECLARE_PALETTE_INIT(pteacher); - DECLARE_VIDEO_START(mirderby); + void video_start_mirderby() ATTR_COLD; DECLARE_PALETTE_INIT(mirderby); - DECLARE_VIDEO_START(lemnangl); + void video_start_lemnangl() ATTR_COLD; uint32_t screen_update_mrokumei(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_reikaids(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_pteacher(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h index 4d281cbb793..a7fa42ff064 100644 --- a/src/mame/includes/hp48.h +++ b/src/mame/includes/hp48.h @@ -65,12 +65,12 @@ public: void init_hp48(); DECLARE_PALETTE_INIT(hp48); - DECLARE_MACHINE_START(hp49g); - DECLARE_MACHINE_START(hp48gx); - DECLARE_MACHINE_START(hp48g); - DECLARE_MACHINE_START(hp48gp); - DECLARE_MACHINE_START(hp48sx); - DECLARE_MACHINE_START(hp48s); + void machine_start_hp49g() ATTR_COLD; + void machine_start_hp48gx() ATTR_COLD; + void machine_start_hp48g() ATTR_COLD; + void machine_start_hp48gp() ATTR_COLD; + void machine_start_hp48sx() ATTR_COLD; + void machine_start_hp48s() ATTR_COLD; uint32_t screen_update_hp48(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(io_w); DECLARE_READ8_MEMBER(io_r); diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index fb970fe84a7..f6ac4137863 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -50,7 +50,7 @@ public: virtual void machine_start() override; virtual void video_start() override; DECLARE_PALETTE_INIT(hyperspt); - DECLARE_VIDEO_START(roadf); + void video_start_roadf() ATTR_COLD; TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(roadf_get_bg_tile_info); diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index e19b20fb06e..9ee473d50ea 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -44,7 +44,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(farwest_irq); DECLARE_PALETTE_INIT(ironhors); - DECLARE_VIDEO_START(farwest); + void video_start_farwest() ATTR_COLD; void farwest(machine_config &config); void ironhors(machine_config &config); diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 6ad5cadac4e..830eb7612b6 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -176,7 +176,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_MACHINE_RESET(drivedge); + void machine_reset_drivedge(); void init_program_rom(); void init_sftm_common(int prot_addr); void init_shuffle_bowl_common(int prot_addr); diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index a5e28d42777..305653f8672 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -133,8 +133,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(slikshot); - DECLARE_MACHINE_START(sstrike); + void video_start_slikshot() ATTR_COLD; + void machine_start_sstrike() ATTR_COLD; uint32_t screen_update_2layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_grmatch(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index d614ed3db75..eea4d31a739 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -68,12 +68,12 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan_cols_flipy); TILE_GET_INFO_MEMBER(joinem_get_bg_tile_info); - DECLARE_VIDEO_START(joinem); + void video_start_joinem() ATTR_COLD; DECLARE_PALETTE_INIT(joinem); - DECLARE_MACHINE_START(striv); - DECLARE_MACHINE_RESET(striv); - DECLARE_MACHINE_START(joinem); - DECLARE_MACHINE_RESET(joinem); + void machine_start_striv() ATTR_COLD; + void machine_reset_striv(); + void machine_start_joinem() ATTR_COLD; + void machine_reset_joinem(); uint32_t screen_update_jack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_striv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index 3fc55f7dc44..4101c906c9b 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -112,11 +112,11 @@ public: TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg); TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update); - DECLARE_MACHINE_START(jpmimpct); - DECLARE_MACHINE_RESET(jpmimpct); - DECLARE_VIDEO_START(jpmimpct); - DECLARE_MACHINE_START(impctawp); - DECLARE_MACHINE_RESET(impctawp); + void machine_start_jpmimpct() ATTR_COLD; + void machine_reset_jpmimpct(); + void video_start_jpmimpct() ATTR_COLD; + void machine_start_impctawp() ATTR_COLD; + void machine_reset_impctawp(); TIMER_DEVICE_CALLBACK_MEMBER(duart_1_timer_event); void impctawp(machine_config &config); void jpmimpct(machine_config &config); diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index eb8e44a726a..e8ea1303582 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -79,9 +79,9 @@ public: void init_bakubrkr(); - DECLARE_MACHINE_RESET(gtmr); - DECLARE_VIDEO_START(kaneko16); - DECLARE_MACHINE_RESET(mgcrystl); + void machine_reset_gtmr(); + void video_start_kaneko16() ATTR_COLD; + void machine_reset_mgcrystl(); uint32_t screen_update_kaneko16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); template<class _BitmapClass> @@ -174,7 +174,7 @@ public: void init_berlwallt(); void init_berlwall_common(); DECLARE_PALETTE_INIT(berlwall); - DECLARE_VIDEO_START(berlwall); + void video_start_berlwall() ATTR_COLD; uint32_t screen_update_berlwall(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void kaneko16_render_15bpp_bitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index 00bc4de7be1..4363e187603 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -33,7 +33,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_MACHINE_START(kangaroo_mcu); + void machine_start_kangaroo_mcu() ATTR_COLD; uint32_t screen_update_kangaroo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void videoram_write( uint16_t offset, uint8_t data, uint8_t mask ); void blitter_execute( ); diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 59eda457c98..63dda24ef84 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -70,8 +70,8 @@ public: TILE_GET_INFO_MEMBER(get_fix_tile_info); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_VIDEO_START(karnov); - DECLARE_VIDEO_START(wndrplnt); + void video_start_karnov() ATTR_COLD; + void video_start_wndrplnt() ATTR_COLD; uint32_t screen_update_karnov(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vbint_w); void karnov_flipscreen_w( int data ); diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h index 1026d283edc..3f4ac29743e 100644 --- a/src/mame/includes/kaypro.h +++ b/src/mame/includes/kaypro.h @@ -55,9 +55,9 @@ public: DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); DECLARE_READ8_MEMBER(kaypro_videoram_r); DECLARE_WRITE8_MEMBER(kaypro_videoram_w); - DECLARE_MACHINE_START(kayproii); - DECLARE_MACHINE_RESET(kaypro); - DECLARE_VIDEO_START(kaypro); + void machine_start_kayproii() ATTR_COLD; + void machine_reset_kaypro(); + void video_start_kaypro() ATTR_COLD; DECLARE_PALETTE_INIT(kaypro); void init_kaypro(); uint32_t screen_update_kayproii(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 091ab8c3adf..1befddbb711 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -71,8 +71,8 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(kchamp); - DECLARE_MACHINE_START(kchampvs); - DECLARE_MACHINE_START(kchamp); + void machine_start_kchampvs() ATTR_COLD; + void machine_start_kchamp() ATTR_COLD; uint32_t screen_update_kchampvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_kchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index cc28d3df757..587150dcd4c 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -41,8 +41,8 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksbg); TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksbg2); TILEMAP_MAPPER_MEMBER(tilemap_scan_actionhwbg2); - DECLARE_VIDEO_START(kickgoal); - DECLARE_VIDEO_START(actionhw); + void video_start_kickgoal() ATTR_COLD; + void video_start_actionhw() ATTR_COLD; INTERRUPT_GEN_MEMBER(kickgoal_interrupt); diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 079dcd02c30..ffe04ab8a13 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -61,9 +61,9 @@ public: TILE_GET_INFO_MEMBER(ringking_get_bg_tile_info); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_VIDEO_START(kingofb); + void video_start_kingofb() ATTR_COLD; DECLARE_PALETTE_INIT(kingofb); - DECLARE_VIDEO_START(ringking); + void video_start_ringking() ATTR_COLD; DECLARE_PALETTE_INIT(ringking); uint32_t screen_update_kingofb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_ringking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 26bf9f7a790..0fb5aa6b4fd 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -112,18 +112,18 @@ public: TILE_GET_INFO_MEMBER(get_gx_psac3_alt_tile_info); TILE_GET_INFO_MEMBER(get_gx_psac1a_tile_info); TILE_GET_INFO_MEMBER(get_gx_psac1b_tile_info); - DECLARE_MACHINE_START(konamigx); - DECLARE_MACHINE_RESET(konamigx); - DECLARE_VIDEO_START(konamigx_5bpp); - DECLARE_VIDEO_START(dragoonj); - DECLARE_VIDEO_START(le2); - DECLARE_VIDEO_START(konamigx_6bpp); - DECLARE_VIDEO_START(opengolf); - DECLARE_VIDEO_START(racinfrc); - DECLARE_VIDEO_START(konamigx_type3); - DECLARE_VIDEO_START(konamigx_type4); - DECLARE_VIDEO_START(konamigx_type4_vsn); - DECLARE_VIDEO_START(konamigx_type4_sd2); + void machine_start_konamigx() ATTR_COLD; + void machine_reset_konamigx() ATTR_COLD; + void video_start_konamigx_5bpp() ATTR_COLD; + void video_start_dragoonj() ATTR_COLD; + void video_start_le2() ATTR_COLD; + void video_start_konamigx_6bpp() ATTR_COLD; + void video_start_opengolf() ATTR_COLD; + void video_start_racinfrc() ATTR_COLD; + void video_start_konamigx_type3() ATTR_COLD; + void video_start_konamigx_type4() ATTR_COLD; + void video_start_konamigx_type4_vsn() ATTR_COLD; + void video_start_konamigx_type4_sd2() ATTR_COLD; uint32_t screen_update_konamigx(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_konamigx_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_konamigx_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index f5ac228b7ca..9406188a68f 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -72,8 +72,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(toucheme); - DECLARE_VIDEO_START(ladyfrog_common); + void video_start_toucheme() ATTR_COLD; + void video_start_ladyfrog_common() ATTR_COLD; uint32_t screen_update_ladyfrog(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(nmi_callback); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 472808438c4..3a6d44a8c31 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -72,11 +72,11 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(lasso); - DECLARE_MACHINE_START(wwjgtin); - DECLARE_MACHINE_RESET(wwjgtin); - DECLARE_VIDEO_START(wwjgtin); + void machine_start_wwjgtin() ATTR_COLD; + void machine_reset_wwjgtin(); + void video_start_wwjgtin() ATTR_COLD; DECLARE_PALETTE_INIT(wwjgtin); - DECLARE_VIDEO_START(pinbo); + void video_start_pinbo() ATTR_COLD; uint32_t screen_update_lasso(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_chameleo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_wwjgtin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index c2a7be4ea7f..040625f1059 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -65,10 +65,10 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_fix_info); virtual void machine_reset() override; - DECLARE_MACHINE_START(lastduel); - DECLARE_VIDEO_START(lastduel); - DECLARE_MACHINE_START(madgear); - DECLARE_VIDEO_START(madgear); + void machine_start_lastduel(); ATTR_COLD + void video_start_lastduel(); ATTR_COLD + void machine_start_madgear(); ATTR_COLD + void video_start_madgear(); ATTR_COLD uint32_t screen_update_lastduel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_madgear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(lastduel_timer_cb); diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index f921881a2fb..9288fe4e9c9 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -82,12 +82,12 @@ public: TILE_GET_INFO_MEMBER(get_fore_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info_denji); TILE_GET_INFO_MEMBER(get_text_tile_info); - DECLARE_VIDEO_START(legionna); - DECLARE_VIDEO_START(heatbrl); - DECLARE_VIDEO_START(godzilla); - DECLARE_VIDEO_START(denjinmk); - DECLARE_VIDEO_START(grainbow); - DECLARE_VIDEO_START(cupsoc); + void video_start_legionna() ATTR_COLD; + void video_start_heatbrl() ATTR_COLD; + void video_start_godzilla() ATTR_COLD; + void video_start_denjinmk() ATTR_COLD; + void video_start_grainbow() ATTR_COLD; + void video_start_cupsoc() ATTR_COLD; uint32_t screen_update_legionna(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_heatbrl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_godzilla(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index 7f1157acf7f..2ce14d0ccdd 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -172,13 +172,13 @@ public: void init_indyheat(); void init_brutforc(); void init_asylum(); - DECLARE_MACHINE_START(ataxx); - DECLARE_MACHINE_RESET(ataxx); - DECLARE_MACHINE_START(leland); - DECLARE_MACHINE_RESET(leland); - DECLARE_VIDEO_START(leland); - DECLARE_VIDEO_START(leland2); - DECLARE_VIDEO_START(ataxx); + void machine_start_ataxx() ATTR_COLD; + void machine_reset_ataxx(); + void machine_start_leland() ATTR_COLD; + void machine_reset_leland(); + void video_start_leland() ATTR_COLD; + void video_start_leland2() ATTR_COLD; + void video_start_ataxx() ATTR_COLD; uint32_t screen_update_leland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_ataxx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index 9390e408d5f..0a2230e3481 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -70,13 +70,13 @@ public: TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_fix_tile_info); TILE_GET_INFO_MEMBER(prosport_get_back_tile_info); - DECLARE_MACHINE_START(liberate); - DECLARE_MACHINE_RESET(liberate); - DECLARE_VIDEO_START(liberate); + void machine_start_liberate() ATTR_COLD; + void machine_reset_liberate(); + void video_start_liberate() ATTR_COLD; DECLARE_PALETTE_INIT(liberate); - DECLARE_VIDEO_START(prosport); - DECLARE_VIDEO_START(boomrang); - DECLARE_VIDEO_START(prosoccr); + void video_start_prosport() ATTR_COLD; + void video_start_boomrang() ATTR_COLD; + void video_start_prosoccr() ATTR_COLD; uint32_t screen_update_liberate(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_prosport(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_boomrang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h index f407e402694..912a2612682 100644 --- a/src/mame/includes/llc.h +++ b/src/mame/includes/llc.h @@ -46,9 +46,9 @@ public: DECLARE_WRITE8_MEMBER(llc2_port1_b_w); void init_llc2(); void init_llc1(); - DECLARE_MACHINE_START(llc1); - DECLARE_MACHINE_RESET(llc1); - DECLARE_MACHINE_RESET(llc2); + void machine_start_llc1() ATTR_COLD; + void machine_reset_llc1(); + void machine_reset_llc2(); uint32_t screen_update_llc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_llc2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index e7238b97012..d1058391fce 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -48,8 +48,7 @@ public: DECLARE_READ8_MEMBER(lsasquad_mcu_status_r); DECLARE_READ8_MEMBER(daikaiju_mcu_status_r); DECLARE_WRITE8_MEMBER(unk); - DECLARE_MACHINE_START(lsasquad); - DECLARE_MACHINE_RESET(lsasquad); + void machine_start_lsasquad() ATTR_COLD; uint32_t screen_update_lsasquad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_daikaiju(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(nmi_callback); diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 088308af814..2132f047b1c 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -24,8 +24,8 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start() override; DECLARE_PALETTE_INIT(lvcards); - DECLARE_MACHINE_START(lvpoker); - DECLARE_MACHINE_RESET(lvpoker); + void machine_start_lvpoker() ATTR_COLD; + void machine_reset_lvpoker(); uint32_t screen_update_lvcards(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 2630d6b9f37..8cb518bc8ba 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -70,9 +70,9 @@ public: virtual void machine_reset() override; virtual void video_start() override; void init_avengersb(); - DECLARE_VIDEO_START(trojan); - DECLARE_VIDEO_START(avengers); - DECLARE_VIDEO_START(avengersb); + void video_start_trojan() ATTR_COLD; + void video_start_avengers() ATTR_COLD; + void video_start_avengersb() ATTR_COLD; uint32_t screen_update_lwings(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_trojan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(lwings_interrupt); diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index d237339f637..369f1b9def3 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -102,11 +102,11 @@ public: void init_ipminva1(); TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_MACHINE_START(m10); - DECLARE_MACHINE_RESET(m10); - DECLARE_VIDEO_START(m10); + void machine_start_m10() ATTR_COLD; + void machine_reset_m10(); + void video_start_m10() ATTR_COLD; DECLARE_PALETTE_INIT(m10); - DECLARE_VIDEO_START(m15); + void video_start_m15() ATTR_COLD; uint32_t screen_update_m10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_m15(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(m15_interrupt); diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index 7c7204c7990..4f9d75e1fe1 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -98,7 +98,7 @@ public: TILE_GET_INFO_MEMBER(get_youjyudn_bg_tile_info); TILE_GET_INFO_MEMBER(get_youjyudn_fg_tile_info); TILE_GET_INFO_MEMBER(get_horizon_bg_tile_info); - DECLARE_MACHINE_START(battroad); + void machine_start_battroad() ATTR_COLD; void machine_init_save(); virtual void machine_start() override; virtual void machine_reset() override; @@ -107,17 +107,17 @@ public: DECLARE_PALETTE_INIT(m62_chr); DECLARE_PALETTE_INIT(m62_lotlot_fg); DECLARE_PALETTE_INIT(m62_battroad_fg); - DECLARE_VIDEO_START(kungfum); - DECLARE_VIDEO_START(battroad); - DECLARE_VIDEO_START(ldrun2); - DECLARE_VIDEO_START(ldrun4); - DECLARE_VIDEO_START(lotlot); - DECLARE_VIDEO_START(kidniki); - DECLARE_VIDEO_START(spelunkr); - DECLARE_VIDEO_START(spelunk2); + void video_start_kungfum() ATTR_COLD; + void video_start_battroad() ATTR_COLD; + void video_start_ldrun2() ATTR_COLD; + void video_start_ldrun4() ATTR_COLD; + void video_start_lotlot() ATTR_COLD; + void video_start_kidniki() ATTR_COLD; + void video_start_spelunkr() ATTR_COLD; + void video_start_spelunk2() ATTR_COLD; DECLARE_PALETTE_INIT(spelunk2); - DECLARE_VIDEO_START(youjyudn); - DECLARE_VIDEO_START(horizon); + void video_start_youjyudn() ATTR_COLD; + void video_start_horizon() ATTR_COLD; uint32_t screen_update_ldrun(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_kungfum(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_battroad(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 0c82d032a4e..40e771f698d 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -158,15 +158,15 @@ public: void machine_start() override; void machine_reset() override; - DECLARE_VIDEO_START(m72); - DECLARE_VIDEO_START(xmultipl); - DECLARE_VIDEO_START(hharry); - DECLARE_VIDEO_START(rtype2); - DECLARE_VIDEO_START(m82); - DECLARE_VIDEO_START(hharryu); - DECLARE_VIDEO_START(poundfor); - DECLARE_MACHINE_START(kengo); - DECLARE_MACHINE_RESET(kengo); + void video_start_m72() ATTR_COLD; + void video_start_xmultipl() ATTR_COLD; + void video_start_hharry() ATTR_COLD; + void video_start_rtype2() ATTR_COLD; + void video_start_m82() ATTR_COLD; + void video_start_hharryu() ATTR_COLD; + void video_start_poundfor() ATTR_COLD; + void machine_start_kengo() ATTR_COLD; + void machine_reset_kengo(); void init_dkgenm72(); void init_bchopper(); void init_gallop(); diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index bc16bab9f5d..8e2605bc067 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -42,8 +42,8 @@ public: virtual void machine_start() override; virtual void video_start() override; void common_tilemap_init(); - DECLARE_VIDEO_START(bomblord); - DECLARE_VIDEO_START(dynablsb); + void video_start_bomblord() ATTR_COLD; + void video_start_dynablsb() ATTR_COLD; uint32_t screen_update_m90(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_bomblord(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_dynablsb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index ca04d7ca717..b9188d6f31a 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -85,9 +85,9 @@ public: void init_m92(); void init_m92_bank(); TILE_GET_INFO_MEMBER(get_pf_tile_info); - DECLARE_MACHINE_RESET(m92); - DECLARE_VIDEO_START(m92); - DECLARE_VIDEO_START(ppan); + void machine_reset_m92(); + void video_start_m92() ATTR_COLD; + void video_start_ppan() ATTR_COLD; uint32_t screen_update_m92(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_ppan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(m92_scanline_interrupt); diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h index 2a166288136..97781e6189e 100644 --- a/src/mame/includes/mac.h +++ b/src/mame/includes/mac.h @@ -503,18 +503,18 @@ public: void init_macpm7100(); void init_macpm8100(); void init_macpb100(); - DECLARE_VIDEO_START(mac); + void video_start_mac() ATTR_COLD; DECLARE_PALETTE_INIT(mac); - DECLARE_VIDEO_START(macprtb); + void video_start_macprtb() ATTR_COLD; DECLARE_PALETTE_INIT(macgsc); - DECLARE_VIDEO_START(macsonora); - DECLARE_VIDEO_RESET(macrbv); - DECLARE_VIDEO_START(macdafb); - DECLARE_VIDEO_RESET(macdafb); - DECLARE_VIDEO_START(macv8); - DECLARE_VIDEO_RESET(macsonora); - DECLARE_VIDEO_RESET(maceagle); - DECLARE_VIDEO_START(macrbv); + void video_start_macsonora() ATTR_COLD; + void video_reset_macsonora(); + void video_start_macdafb() ATTR_COLD; + void video_reset_macdafb(); + void video_start_macv8() ATTR_COLD; + void video_reset_maceagle(); + void video_start_macrbv() ATTR_COLD; + void video_reset_macrbv(); uint32_t screen_update_mac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_macprtb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_macse30(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index e253ccd5ac0..15e8b4b1b8a 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -70,7 +70,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_BG_1); TILE_GET_INFO_MEMBER(get_tile_info_BG_2); TILE_GET_INFO_MEMBER(get_tile_info_FG); - DECLARE_VIDEO_START(madalien); + void video_start_madalien() ATTR_COLD; DECLARE_PALETTE_INIT(madalien); uint32_t screen_update_madalien(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline int scan_helper(int col, int row, int section); diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index e68f760c709..40ecfd63c72 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -65,11 +65,11 @@ public: TILE_GET_INFO_MEMBER(phozon_get_tile_info); TILE_GET_INFO_MEMBER(mappy_get_tile_info); virtual void machine_start() override; - DECLARE_VIDEO_START(superpac); + void video_start_superpac() ATTR_COLD; DECLARE_PALETTE_INIT(superpac); - DECLARE_VIDEO_START(phozon); + void video_start_phozon() ATTR_COLD; DECLARE_PALETTE_INIT(phozon); - DECLARE_VIDEO_START(mappy); + void video_start_mappy() ATTR_COLD; DECLARE_PALETTE_INIT(mappy); uint32_t screen_update_superpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_phozon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index fcecfb87871..9030f013086 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -101,16 +101,16 @@ public: void init_mbeepc(); void init_mbeeic(); void init_mbee128(); - DECLARE_MACHINE_RESET(mbee); - DECLARE_VIDEO_START(mono); - DECLARE_VIDEO_START(standard); - DECLARE_VIDEO_START(premium); + void machine_reset_mbee(); + void video_start_mono() ATTR_COLD; + void video_start_standard() ATTR_COLD; + void video_start_premium() ATTR_COLD; DECLARE_PALETTE_INIT(standard); DECLARE_PALETTE_INIT(premium); - DECLARE_MACHINE_RESET(mbee56); - DECLARE_MACHINE_RESET(mbee128); - DECLARE_MACHINE_RESET(mbee256); - DECLARE_MACHINE_RESET(mbeett); + void machine_reset_mbee56(); + void machine_reset_mbee128(); + void machine_reset_mbee256(); + void machine_reset_mbeett(); uint32_t screen_update_mbee(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(timer_newkb); DECLARE_QUICKLOAD_LOAD_MEMBER(mbee); diff --git a/src/mame/includes/mc1502.h b/src/mame/includes/mc1502.h index e9c89f66a23..51d430f0320 100644 --- a/src/mame/includes/mc1502.h +++ b/src/mame/includes/mc1502.h @@ -57,8 +57,8 @@ public: required_ioport_array<12> m_kbdio; void init_mc1502(); - DECLARE_MACHINE_START(mc1502); - DECLARE_MACHINE_RESET(mc1502); + void machine_start_mc1502() ATTR_COLD; + void machine_reset_mc1502(); TIMER_CALLBACK_MEMBER(keyb_signal_callback); diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index e2084d51956..20319ee6b4e 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -55,7 +55,7 @@ public: void init_rampage(); void init_spyhunt(); void init_sarge(); - DECLARE_VIDEO_START(spyhunt); + void video_start_spyhunt() ATTR_COLD; DECLARE_PALETTE_INIT(spyhunt); uint32_t screen_update_mcr3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 8fa90d260a9..3981b434855 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -69,9 +69,9 @@ public: void init_archrivlb(); DECLARE_READ16_MEMBER(archrivlb_port_1_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_MACHINE_START(mcr68); - DECLARE_MACHINE_RESET(mcr68); - DECLARE_VIDEO_START(mcr68); + void machine_start_mcr68() ATTR_COLD; + void machine_reset_mcr68(); + void video_start_mcr68() ATTR_COLD; uint32_t screen_update_mcr68(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(scanline_cb); TIMER_CALLBACK_MEMBER(mcr68_493_off_callback); diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index e2f239afcd3..a0c6ed63d54 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -123,9 +123,9 @@ public: void megadriv_stop_scanline_timer(); - DECLARE_MACHINE_START( megadriv ); - DECLARE_MACHINE_RESET( megadriv ); - DECLARE_VIDEO_START( megadriv ); + void machine_start_megadriv() ATTR_COLD; + void machine_reset_megadriv(); + void video_start_megadriv() ATTR_COLD; uint32_t screen_update_megadriv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_megadriv); @@ -170,10 +170,10 @@ public: READ8_MEMBER(mess_md_io_read_data_port); WRITE16_MEMBER(mess_md_io_write_data_port); - DECLARE_MACHINE_START( md_common ); // setup ioport_port - DECLARE_MACHINE_START( ms_megadriv ); // setup ioport_port + install cartslot handlers - DECLARE_MACHINE_START( ms_megacd ); // setup ioport_port + dma delay for cd - DECLARE_MACHINE_RESET( ms_megadriv ); + void machine_start_md_common() ATTR_COLD; // setup ioport_port + void machine_start_ms_megadriv() ATTR_COLD; // setup ioport_port + install cartslot handlers + void machine_start_ms_megacd() ATTR_COLD; // setup ioport_port + dma delay for cd + void machine_reset_ms_megadriv(); DECLARE_WRITE_LINE_MEMBER(screen_vblank_console); diff --git a/src/mame/includes/megadriv_acbl.h b/src/mame/includes/megadriv_acbl.h index bf9d9fd440e..11be22426d8 100644 --- a/src/mame/includes/megadriv_acbl.h +++ b/src/mame/includes/megadriv_acbl.h @@ -28,8 +28,8 @@ public: DECLARE_READ16_MEMBER(puckpkmna_70001c_r); DECLARE_READ16_MEMBER(puckpkmna_4b2476_r); - DECLARE_MACHINE_START(md_bootleg) { MACHINE_START_CALL_MEMBER(megadriv); m_vdp->stop_timers(); } - DECLARE_MACHINE_START(md_6button); + void machine_start_md_bootleg() { machine_start_megadriv(); m_vdp->stop_timers(); } + void machine_start_md_6button() ATTR_COLD; void megadrvb(machine_config &config); void megadrvb_6b(machine_config &config); void md_bootleg(machine_config &config); diff --git a/src/mame/includes/megadriv_rad.h b/src/mame/includes/megadriv_rad.h index e4899647745..1affba7aadc 100644 --- a/src/mame/includes/megadriv_rad.h +++ b/src/mame/includes/megadriv_rad.h @@ -15,9 +15,9 @@ public: void init_megadriv_radica_6button_pal(); - DECLARE_MACHINE_START(megadriv_radica_6button); - DECLARE_MACHINE_START(megadriv_radica_3button); - DECLARE_MACHINE_RESET(megadriv_radica); + void machine_start_megadriv_radica_6button() ATTR_COLD; + void machine_start_megadriv_radica_3button() ATTR_COLD; + void machine_reset_megadriv_radica(); DECLARE_READ16_MEMBER(read); DECLARE_READ16_MEMBER(read_a13); diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index 1da991feee4..37b570a9cea 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -152,10 +152,10 @@ public: void init_stdragona(); void init_stdragonb(); void init_systemz(); - DECLARE_MACHINE_RESET(megasys1); - DECLARE_VIDEO_START(megasys1); + void machine_reset_megasys1(); + void video_start_megasys1() ATTR_COLD; DECLARE_PALETTE_INIT(megasys1); - DECLARE_MACHINE_RESET(megasys1_hachoo); + void machine_reset_megasys1_hachoo(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index ff522ce937c..dd7906ed079 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -98,8 +98,8 @@ public: TILE_GET_INFO_MEMBER(metro_k053936_get_tile_info); TILE_GET_INFO_MEMBER(metro_k053936_gstrik2_get_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan_gstrik2); - DECLARE_VIDEO_START(blzntrnd); - DECLARE_VIDEO_START(gstrik2); + void video_start_blzntrnd() ATTR_COLD; + void video_start_gstrik2() ATTR_COLD; uint32_t screen_update_psac_vdp2_mix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(metro_vblank_irq); INTERRUPT_GEN_MEMBER(metro_periodic_interrupt); diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 1726a072c16..01d93922cf2 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -85,8 +85,8 @@ public: void init_jdreddp(); void init_mk2(); - DECLARE_MACHINE_RESET(midtunit); - DECLARE_VIDEO_START(midtunit); + void machine_reset_midtunit(); + void video_start_midtunit() ATTR_COLD; void register_state_saving(); void init_tunit_generic(int sound); diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index c03eb47030a..fcdc9304f48 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -155,7 +155,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_MACHINE_RESET(midvplus); + void machine_reset_midvplus(); uint32_t screen_update_midvunit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(scanline_timer_cb); required_device<cpu_device> m_maincpu; diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h index 34736675581..125c742c55e 100644 --- a/src/mame/includes/midwunit.h +++ b/src/mame/includes/midwunit.h @@ -56,8 +56,8 @@ public: void init_umk3r11(); void init_mk3r20(); - DECLARE_MACHINE_RESET(midwunit); - DECLARE_VIDEO_START(midwunit); + void machine_reset_midwunit(); + void video_start_midwunit() ATTR_COLD; void register_state_saving(); void init_wunit_generic(); diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h index b1bafb5c0c3..36cb0bbe4ba 100644 --- a/src/mame/includes/midxunit.h +++ b/src/mame/includes/midxunit.h @@ -32,8 +32,8 @@ public: DECLARE_WRITE16_MEMBER(midxunit_sound_w); DECLARE_WRITE_LINE_MEMBER(midxunit_dcs_output_full); void init_revx(); - DECLARE_MACHINE_RESET(midxunit); - DECLARE_VIDEO_START(midxunit); + void machine_reset_midxunit(); + void video_start_midxunit() ATTR_COLD; void register_state_saving(); TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update); diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index a582129c94b..84bcafd9612 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -140,12 +140,12 @@ public: void init_hiimpact(); void init_mkyturbo(); void init_term2la2(); - DECLARE_MACHINE_RESET(midyunit); - DECLARE_VIDEO_START(midzunit); - DECLARE_VIDEO_START(midyunit_4bit); - DECLARE_VIDEO_START(midyunit_6bit); - DECLARE_VIDEO_START(mkyawdim); - DECLARE_VIDEO_START(common); + void machine_reset_midyunit(); + void video_start_midzunit() ATTR_COLD; + void video_start_midyunit_4bit() ATTR_COLD; + void video_start_midyunit_6bit() ATTR_COLD; + void video_start_mkyawdim() ATTR_COLD; + void video_start_common() ATTR_COLD; TIMER_CALLBACK_MEMBER(dma_callback); TIMER_CALLBACK_MEMBER(autoerase_line); diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index d4a19a0fc9c..b5dfcb10902 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -70,9 +70,9 @@ public: void init_mk4(); void init_thegrid(); void init_crusnexo(); - DECLARE_MACHINE_START(midzeus); - DECLARE_MACHINE_RESET(midzeus); - DECLARE_VIDEO_START(midzeus); + void machine_start_midzeus() ATTR_COLD; + void machine_reset_midzeus(); + void video_start_midzeus() ATTR_COLD; uint32_t screen_update_midzeus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(display_irq); TIMER_CALLBACK_MEMBER(display_irq_off); diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 9ca090695c0..78a06cffc35 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -123,9 +123,9 @@ public: void init_blockbl(); void init_dokaben(); TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_MACHINE_START(mitchell); - DECLARE_MACHINE_RESET(mitchell); - DECLARE_VIDEO_START(pang); + void machine_start_mitchell() ATTR_COLD; + void machine_reset_mitchell(); + void video_start_pang() ATTR_COLD; uint32_t screen_update_pang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(mitchell_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index c89e12463e0..ec5e4321ebf 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -60,8 +60,8 @@ public: } // Machine - DECLARE_MACHINE_START(model1); - DECLARE_MACHINE_RESET(model1); + void machine_start_model1() ATTR_COLD; + void machine_reset_model1(); DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); @@ -122,7 +122,7 @@ public: DECLARE_WRITE8_MEMBER(r360_w); // Rendering - DECLARE_VIDEO_START(model1); + void video_start_model1() ATTR_COLD; DECLARE_READ16_MEMBER(model1_listctl_r); DECLARE_WRITE16_MEMBER(model1_listctl_w); diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 02fe76586fc..0fe91cd5c0b 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -69,7 +69,7 @@ public: /* Public for access by MCFG */ TIMER_DEVICE_CALLBACK_MEMBER(model2_interrupt); uint16_t crypt_read_callback(uint32_t addr); - DECLARE_MACHINE_START(model2); + void machine_start_model2() ATTR_COLD; /* Public for access by GAME() */ @@ -195,9 +195,9 @@ protected: DECLARE_READ8_MEMBER(driveio_porth_r); DECLARE_WRITE8_MEMBER(driveio_port_w); void push_geo_data(uint32_t data); - DECLARE_VIDEO_START(model2); - DECLARE_MACHINE_RESET(model2_common); - DECLARE_MACHINE_RESET(model2_scsp); + void video_start_model2() ATTR_COLD; + void machine_reset_model2_common(); + void machine_reset_model2_scsp(); uint32_t screen_update_model2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); // DECLARE_WRITE_LINE_MEMBER(screen_vblank_model2); // DECLARE_WRITE_LINE_MEMBER(sound_ready_w); @@ -309,7 +309,7 @@ public: m_copro_tgp_bank(*this, "copro_tgp_bank") {} - DECLARE_MACHINE_START(model2_tgp); + void machine_start_model2_tgp(); protected: required_device<mb86234_device> m_copro_tgp; @@ -346,7 +346,7 @@ protected: DECLARE_WRITE32_MEMBER(copro_atan_w); DECLARE_READ32_MEMBER(copro_atan_r); - DECLARE_MACHINE_RESET(model2_tgp); + void machine_reset_model2_tgp(); void model2_tgp_mem(address_map &map); @@ -373,7 +373,7 @@ public: : model2_tgp_state(mconfig, type, tag) {} - DECLARE_MACHINE_RESET(model2o); + void machine_reset_model2o(); void model2o(machine_config &config); void daytona(machine_config &config); @@ -444,7 +444,7 @@ public: : model2_tgp_state(mconfig, type, tag) {} - DECLARE_MACHINE_RESET(model2a); + void machine_reset_model2a(); void manxtt(machine_config &config); void manxttdx(machine_config &config); @@ -475,8 +475,8 @@ public: m_copro_adsp(*this, "copro_adsp") {} - DECLARE_MACHINE_RESET(model2b); - DECLARE_MACHINE_START(model2b); + void machine_reset_model2b(); + void machine_start_model2b() ATTR_COLD; void model2b(machine_config &config); void model2b_0229(machine_config &config); @@ -524,8 +524,8 @@ public: m_copro_tgpx4_program(*this, "copro_tgpx4_program") {} - DECLARE_MACHINE_RESET(model2c); - DECLARE_MACHINE_START(model2c); + void machine_reset_model2c(); + void machine_start_model2c() ATTR_COLD; void model2c(machine_config &config); void model2c_5881(machine_config &config); diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 7ca250b5f8f..1224f3e42ee 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -267,14 +267,14 @@ public: void init_magtruck(); void init_lamachin(); void init_model3_15(); - DECLARE_MACHINE_START(model3_10); - DECLARE_MACHINE_RESET(model3_10); - DECLARE_MACHINE_START(model3_15); - DECLARE_MACHINE_RESET(model3_15); - DECLARE_MACHINE_START(model3_20); - DECLARE_MACHINE_RESET(model3_20); - DECLARE_MACHINE_START(model3_21); - DECLARE_MACHINE_RESET(model3_21); + void machine_start_model3_10() ATTR_COLD; + void machine_reset_model3_10(); + void machine_start_model3_15() ATTR_COLD; + void machine_reset_model3_15(); + void machine_start_model3_20() ATTR_COLD; + void machine_reset_model3_20(); + void machine_start_model3_21() ATTR_COLD; + void machine_reset_model3_21(); TIMER_CALLBACK_MEMBER(model3_sound_timer_tick); TIMER_CALLBACK_MEMBER(real3d_dma_timer_callback); TIMER_DEVICE_CALLBACK_MEMBER(model3_interrupt); diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index 541e4c197d3..3e967857287 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -73,10 +73,10 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE16_MEMBER(moo_prot_w); DECLARE_WRITE16_MEMBER(moobl_oki_bank_w); - DECLARE_MACHINE_START(moo); - DECLARE_MACHINE_RESET(moo); - DECLARE_VIDEO_START(moo); - DECLARE_VIDEO_START(bucky); + void machine_start_moo() ATTR_COLD; + void machine_reset_moo(); + void video_start_moo() ATTR_COLD; + void video_start_bucky() ATTR_COLD; uint32_t screen_update_moo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(moo_interrupt); INTERRUPT_GEN_MEMBER(moobl_interrupt); diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h index 10d8f068012..50a98b12460 100644 --- a/src/mame/includes/mpu4.h +++ b/src/mame/includes/mpu4.h @@ -245,15 +245,15 @@ public: void init_m4andyfh(); void init_m4andyge(); void init_m4apachg(); - DECLARE_MACHINE_START(mod2); - DECLARE_MACHINE_RESET(mpu4); - DECLARE_MACHINE_START(mpu4yam); - DECLARE_MACHINE_START(mpu4oki); - DECLARE_MACHINE_START(mpu4oki_alt); - DECLARE_MACHINE_START(mod4oki_5r); - DECLARE_MACHINE_START(mod2_alt); - DECLARE_MACHINE_START(mpu4bwb); - DECLARE_MACHINE_START(mpu4cry); + void machine_start_mod2() ATTR_COLD; + void machine_reset_mpu4(); + void machine_start_mpu4yam() ATTR_COLD; + void machine_start_mpu4oki() ATTR_COLD; + void machine_start_mpu4oki_alt() ATTR_COLD; + void machine_start_mod4oki_5r() ATTR_COLD; + void machine_start_mod2_alt() ATTR_COLD; + void machine_start_mpu4bwb() ATTR_COLD; + void machine_start_mpu4cry() ATTR_COLD; TIMER_DEVICE_CALLBACK_MEMBER(gen_50hz); template <unsigned N> DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } void bwboki(machine_config &config); diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index c306cb34c1d..29fc19ed9a5 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -118,7 +118,7 @@ public: TILE_GET_INFO_MEMBER(get_ms32_extra_tile_info); virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(f1superb); + void video_start_f1superb() ATTR_COLD; uint32_t screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(ms32_interrupt); IRQ_CALLBACK_MEMBER(irq_callback); diff --git a/src/mame/includes/mtx.h b/src/mame/includes/mtx.h index 46538172426..fe576464c28 100644 --- a/src/mame/includes/mtx.h +++ b/src/mame/includes/mtx.h @@ -85,8 +85,8 @@ public: DECLARE_WRITE8_MEMBER(hrx_data_w); DECLARE_READ8_MEMBER(hrx_attr_r); DECLARE_WRITE8_MEMBER(hrx_attr_w); - DECLARE_MACHINE_START(mtx512); - DECLARE_MACHINE_RESET(mtx512); + void machine_start_mtx512() ATTR_COLD; + void machine_reset_mtx512(); TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); TIMER_DEVICE_CALLBACK_MEMBER(cassette_tick); DECLARE_WRITE_LINE_MEMBER(ctc_trg1_w); diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 75026d596c5..28197a5b9c8 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -155,18 +155,18 @@ public: DECLARE_WRITE8_MEMBER(bowler_audio_4_w); DECLARE_WRITE8_MEMBER(bowler_audio_5_w); DECLARE_WRITE8_MEMBER(bowler_audio_6_w); - DECLARE_MACHINE_START(mw8080bw); - DECLARE_MACHINE_RESET(mw8080bw); - DECLARE_MACHINE_START(maze); - DECLARE_MACHINE_START(boothill); - DECLARE_MACHINE_START(desertgu); - DECLARE_MACHINE_START(gmissile); - DECLARE_MACHINE_START(m4); - DECLARE_MACHINE_START(clowns); - DECLARE_MACHINE_START(spcenctr); - DECLARE_MACHINE_START(phantom2); - DECLARE_MACHINE_START(invaders); - DECLARE_SOUND_START(samples); + void machine_start_mw8080bw() ATTR_COLD; + void machine_reset_mw8080bw(); + void machine_start_maze() ATTR_COLD; + void machine_start_boothill() ATTR_COLD; + void machine_start_desertgu() ATTR_COLD; + void machine_start_gmissile() ATTR_COLD; + void machine_start_m4() ATTR_COLD; + void machine_start_clowns() ATTR_COLD; + void machine_start_spcenctr() ATTR_COLD; + void machine_start_phantom2() ATTR_COLD; + void machine_start_invaders() ATTR_COLD; + void sound_start_samples() ATTR_COLD; uint32_t screen_update_mw8080bw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_spcenctr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_phantom2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 7dfd1fdad46..2f8ac4365f7 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -52,8 +52,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_VIDEO_START(mystston); - DECLARE_VIDEO_RESET(mystston); + void video_start_mystston() ATTR_COLD; + void video_reset_mystston() ATTR_COLD; uint32_t screen_update_mystston(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(interrupt_callback); void set_palette(); diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 279f6e3b74b..be62883df42 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -67,19 +67,19 @@ public: DECLARE_READ16_MEMBER(ddd_053936_tilerom_2_r); TILE_GET_INFO_MEMBER(get_gai_936_tile_info); TILE_GET_INFO_MEMBER(get_ult_936_tile_info); - DECLARE_MACHINE_START(mystwarr); - DECLARE_MACHINE_RESET(mystwarr); - DECLARE_VIDEO_START(mystwarr); - DECLARE_MACHINE_RESET(viostorm); - DECLARE_VIDEO_START(viostorm); - DECLARE_MACHINE_RESET(metamrph); - DECLARE_VIDEO_START(metamrph); - DECLARE_MACHINE_RESET(dadandrn); - DECLARE_VIDEO_START(dadandrn); - DECLARE_MACHINE_RESET(gaiapols); - DECLARE_VIDEO_START(gaiapols); - DECLARE_MACHINE_RESET(martchmp); - DECLARE_VIDEO_START(martchmp); + void machine_start_mystwarr() ATTR_COLD; + void machine_reset_mystwarr(); + void video_start_mystwarr() ATTR_COLD; + void machine_reset_viostorm(); + void video_start_viostorm() ATTR_COLD; + void machine_reset_metamrph(); + void video_start_metamrph() ATTR_COLD; + void machine_reset_dadandrn(); + void video_start_dadandrn() ATTR_COLD; + void machine_reset_gaiapols(); + void video_start_gaiapols() ATTR_COLD; + void machine_reset_martchmp(); + void video_start_martchmp() ATTR_COLD; uint32_t screen_update_mystwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_metamrph(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_dadandrn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h index fb499e9d70e..b480486b85a 100644 --- a/src/mame/includes/mz700.h +++ b/src/mame/includes/mz700.h @@ -63,8 +63,8 @@ public: DECLARE_WRITE8_MEMBER(mz800_cgram_w); void init_mz800(); void init_mz700(); - DECLARE_MACHINE_RESET(mz700); - DECLARE_MACHINE_RESET(mz800); + void machine_reset_mz700(); + void machine_reset_mz800(); virtual void machine_start() override; uint32_t screen_update_mz700(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_mz800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index 142368729cd..bafc7829a8d 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -80,22 +80,22 @@ public: DECLARE_WRITE_LINE_MEMBER(n8080_inte_callback); DECLARE_WRITE8_MEMBER(n8080_status_callback); virtual void machine_start() override; - DECLARE_MACHINE_RESET(spacefev); - DECLARE_VIDEO_START(spacefev); + void machine_reset_spacefev(); + void video_start_spacefev() ATTR_COLD; DECLARE_PALETTE_INIT(n8080); - DECLARE_MACHINE_RESET(sheriff); - DECLARE_VIDEO_START(sheriff); - DECLARE_MACHINE_RESET(helifire); - DECLARE_VIDEO_START(helifire); + void machine_reset_sheriff(); + void video_start_sheriff() ATTR_COLD; + void machine_reset_helifire(); + void video_start_helifire() ATTR_COLD; DECLARE_PALETTE_INIT(helifire); - DECLARE_SOUND_START(spacefev); - DECLARE_SOUND_RESET(spacefev); - DECLARE_SOUND_START(sheriff); - DECLARE_SOUND_RESET(sheriff); - DECLARE_SOUND_START(helifire); - DECLARE_SOUND_RESET(helifire); - DECLARE_MACHINE_START(n8080); - DECLARE_MACHINE_RESET(n8080); + void sound_start_spacefev() ATTR_COLD; + void sound_reset_spacefev(); + void sound_start_sheriff() ATTR_COLD; + void sound_reset_sheriff(); + void sound_start_helifire() ATTR_COLD; + void sound_reset_helifire(); + void machine_start_n8080() ATTR_COLD; + void machine_reset_n8080(); uint32_t screen_update_spacefev(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_sheriff(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_helifire(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index c8b8a6a53fe..01b640a919e 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -71,9 +71,9 @@ public: DECLARE_WRITE32_MEMBER(namcofl_spritebank_w); void init_speedrcr(); void init_finalapr(); - DECLARE_MACHINE_START(namcofl); - DECLARE_MACHINE_RESET(namcofl); - DECLARE_VIDEO_START(namcofl); + void machine_start_namcofl() ATTR_COLD; + void machine_reset_namcofl(); + void video_start_namcofl() ATTR_COLD; uint32_t screen_update_namcofl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(network_interrupt_callback); TIMER_CALLBACK_MEMBER(vblank_interrupt_callback); diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index d2b4a9c69aa..1aaa61e89f9 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -102,9 +102,9 @@ public: void init_gslgr94j(); void init_outfxies(); void init_gslgr94u(); - DECLARE_MACHINE_RESET(namconb); - DECLARE_VIDEO_START(namconb1); - DECLARE_VIDEO_START(namconb2); + void machine_reset_namconb(); + void video_start_namconb1() ATTR_COLD; + void video_start_namconb2() ATTR_COLD; void video_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int bROZ); uint32_t screen_update_namconb1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_namconb2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 8c23fdebb35..75445484106 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -236,8 +236,8 @@ public: DECLARE_WRITE16_MEMBER( c355_obj_ram_w ); DECLARE_READ16_MEMBER( c355_obj_position_r ); DECLARE_WRITE16_MEMBER( c355_obj_position_w ); - DECLARE_MACHINE_START(namcos2); - DECLARE_MACHINE_RESET(namcos2); + void machine_start_namcos2() ATTR_COLD; + void machine_reset_namcos2(); protected: // C355 Motion Object internals template<class _BitmapClass> diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index a42fb078c29..1cfb4f2244a 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -171,8 +171,8 @@ public: void init_solvalou(); void init_cybsled(); void init_aircomb(); - DECLARE_MACHINE_START(namcos21); - DECLARE_VIDEO_START(namcos21); + void machine_start_namcos21() ATTR_COLD; + void video_start_namcos21() ATTR_COLD; uint32_t screen_update_namcos21(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_winrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_driveyes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index d8a312c2d29..e3eac9736f7 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -489,7 +489,7 @@ public: virtual void machine_reset() override; virtual void machine_start() override; virtual void video_start() override; - DECLARE_MACHINE_START(adillor); + void machine_start_adillor() ATTR_COLD; uint32_t screen_update_namcos22s(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_namcos22(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(namcos22s_interrupt); diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h index 66d3892c434..8e8973ea46c 100644 --- a/src/mame/includes/naomi.h +++ b/src/mame/includes/naomi.h @@ -49,7 +49,7 @@ class naomi_state : public dc_state required_device<eeprom_serial_93cxx_device> m_eeprom; optional_shared_ptr<uint64_t> m_rombase; - DECLARE_MACHINE_RESET(naomi); + void machine_reset_naomi(); void init_naomigd(); void init_ggxx(); void init_ggxxrl(); diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 153186e91b0..236502efd97 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -73,16 +73,16 @@ public: void init_kaguya2(); void init_mjcamera(); void init_kanatuen(); - DECLARE_VIDEO_START(mbmj8688_pure_12bit); + void video_start_mbmj8688_pure_12bit() ATTR_COLD; DECLARE_PALETTE_INIT(mbmj8688_12bit); - DECLARE_VIDEO_START(mbmj8688_pure_16bit_LCD); + void video_start_mbmj8688_pure_16bit_LCD() ATTR_COLD; DECLARE_PALETTE_INIT(mbmj8688_16bit); DECLARE_PALETTE_INIT(mbmj8688_lcd); - DECLARE_VIDEO_START(mbmj8688_8bit); + void video_start_mbmj8688_8bit() ATTR_COLD; DECLARE_PALETTE_INIT(mbmj8688_8bit); - DECLARE_VIDEO_START(mbmj8688_hybrid_16bit); - DECLARE_VIDEO_START(mbmj8688_hybrid_12bit); - DECLARE_VIDEO_START(mbmj8688_pure_16bit); + void video_start_mbmj8688_hybrid_16bit() ATTR_COLD; + void video_start_mbmj8688_hybrid_12bit() ATTR_COLD; + void video_start_mbmj8688_pure_16bit() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void vramflip(); diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 61a8da24873..bf2e591ee11 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -88,7 +88,7 @@ public: void init_pairsnb(); void init_mjnanpas(); virtual void video_start() override; - DECLARE_VIDEO_START(_1layer); + void video_start__1layer() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void vramflip(int vram); diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index 5b7359da554..a8299a648f6 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -101,8 +101,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(_1layer); - DECLARE_VIDEO_START(nb22090); + void video_start__1layer() ATTR_COLD; + void video_start_nb22090() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); int blitter_r(int offset, int vram); diff --git a/src/mame/includes/nc.h b/src/mame/includes/nc.h index 39c51be1b2d..33ee7000b59 100644 --- a/src/mame/includes/nc.h +++ b/src/mame/includes/nc.h @@ -74,8 +74,8 @@ public: DECLARE_WRITE8_MEMBER(nc200_poweroff_control_w); DECLARE_PALETTE_INIT(nc); - DECLARE_MACHINE_START(nc200); - DECLARE_MACHINE_RESET(nc200); + void machine_start_nc200() ATTR_COLD; + void machine_reset_nc200(); uint32_t screen_update_nc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(nc_keyboard_timer_callback); TIMER_DEVICE_CALLBACK_MEMBER(dummy_timer_callback); diff --git a/src/mame/includes/nes.h b/src/mame/includes/nes.h index d0e88b52d56..edf8773686b 100644 --- a/src/mame/includes/nes.h +++ b/src/mame/includes/nes.h @@ -96,10 +96,10 @@ public: void init_famicom(); // these are needed until we modernize the FDS controller - DECLARE_MACHINE_START(fds); - DECLARE_MACHINE_START(famitwin); - DECLARE_MACHINE_RESET(fds); - DECLARE_MACHINE_RESET(famitwin); + void machine_start_fds() ATTR_COLD; + void machine_start_famitwin() ATTR_COLD; + void machine_reset_fds(); + void machine_reset_famitwin(); void setup_disk(nes_disksys_device *slot); void suborkbd(machine_config &config); diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 6b25338a637..a2930c0afab 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -106,12 +106,12 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(mnight); - DECLARE_VIDEO_START(arkarea); - DECLARE_VIDEO_START(robokid); - DECLARE_MACHINE_START(omegaf); - DECLARE_MACHINE_RESET(omegaf); - DECLARE_VIDEO_START(omegaf); + void video_start_mnight() ATTR_COLD; + void video_start_arkarea() ATTR_COLD; + void video_start_robokid() ATTR_COLD; + void machine_start_omegaf() ATTR_COLD; + void machine_reset_omegaf(); + void video_start_omegaf() ATTR_COLD; uint32_t screen_update_ninjakd2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_robokid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_omegaf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 656d2cc5bbf..49cbefeafc5 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -85,7 +85,7 @@ public: void init_niyanpai(); virtual void video_start() override; - DECLARE_MACHINE_START(musobana); + void machine_start_musobana() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); int blitter_r(int vram, int offset); diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index a03a7cb7516..6f7d04a1bf0 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -134,16 +134,16 @@ public: TILE_GET_INFO_MEMBER(common_get_tx_tile_info); TILE_GET_INFO_MEMBER(bjtwin_get_bg_tile_info); TILE_GET_INFO_MEMBER(get_tile_info_0_8bit); - DECLARE_VIDEO_START(macross); - DECLARE_VIDEO_START(bioship); - DECLARE_VIDEO_START(strahl); - DECLARE_VIDEO_START(gunnail); - DECLARE_VIDEO_START(macross2); - DECLARE_VIDEO_START(raphero); - DECLARE_VIDEO_START(bjtwin); - DECLARE_VIDEO_START(afega); - DECLARE_VIDEO_START(firehawk); - DECLARE_VIDEO_START(grdnstrm); + void video_start_macross() ATTR_COLD; + void video_start_bioship() ATTR_COLD; + void video_start_strahl() ATTR_COLD; + void video_start_gunnail() ATTR_COLD; + void video_start_macross2() ATTR_COLD; + void video_start_raphero() ATTR_COLD; + void video_start_bjtwin() ATTR_COLD; + void video_start_afega() ATTR_COLD; + void video_start_firehawk() ATTR_COLD; + void video_start_grdnstrm() ATTR_COLD; uint32_t screen_update_tharrier(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_manybloc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_macross(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index da5cf099368..4a21c5ea268 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -40,13 +40,13 @@ public: void init_raiders5(); void init_pkunwar(); - DECLARE_VIDEO_START(nova2001); + void video_start_nova2001() ATTR_COLD; DECLARE_PALETTE_INIT(nova2001); DECLARE_PALETTE_DECODER(BBGGRRII); - DECLARE_MACHINE_START(ninjakun); - DECLARE_VIDEO_START(ninjakun); - DECLARE_VIDEO_START(pkunwar); - DECLARE_VIDEO_START(raiders5); + void machine_start_ninjakun() ATTR_COLD; + void video_start_ninjakun() ATTR_COLD; + void video_start_pkunwar() ATTR_COLD; + void video_start_raiders5() ATTR_COLD; TILE_GET_INFO_MEMBER(nova2001_get_bg_tile_info); TILE_GET_INFO_MEMBER(nova2001_get_fg_tile_info); diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index 11df115fcd4..865139fbf76 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -94,15 +94,15 @@ public: TILE_GET_INFO_MEMBER(ojankohs_get_tile_info); TILE_GET_INFO_MEMBER(ojankoy_get_tile_info); virtual void machine_reset() override; - DECLARE_MACHINE_START(ojankohs); - DECLARE_VIDEO_START(ojankohs); - DECLARE_MACHINE_START(ojankoy); - DECLARE_VIDEO_START(ojankoy); + void machine_start_ojankohs() ATTR_COLD; + void video_start_ojankohs() ATTR_COLD; + void machine_start_ojankoy() ATTR_COLD; + void video_start_ojankoy() ATTR_COLD; DECLARE_PALETTE_INIT(ojankoy); - DECLARE_VIDEO_START(ccasino); - DECLARE_MACHINE_START(ojankoc); - DECLARE_VIDEO_START(ojankoc); - DECLARE_MACHINE_START(common); + void video_start_ccasino() ATTR_COLD; + void machine_start_ojankoc() ATTR_COLD; + void video_start_ojankoc() ATTR_COLD; + void machine_start_common() ATTR_COLD; uint32_t screen_update_ojankohs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_ojankoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ojankoc_flipscreen( address_space &space, int data ); diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index 2bf20a5c1ea..85c09ab3312 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -70,7 +70,7 @@ protected: virtual void machine_start() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - DECLARE_MACHINE_RESET(opwolf); + void machine_reset_opwolf(); uint32_t screen_update_opwolf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(opwolf_timer_callback); TIMER_CALLBACK_MEMBER(cchip_timer); diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h index e9d6ba44bdb..d07b2a87cc7 100644 --- a/src/mame/includes/orion.h +++ b/src/mame/includes/orion.h @@ -72,13 +72,13 @@ public: DECLARE_WRITE8_MEMBER(orionpro_memory_page_w); DECLARE_READ8_MEMBER(orionpro_io_r); DECLARE_WRITE8_MEMBER(orionpro_io_w); - DECLARE_MACHINE_START(orion128); - DECLARE_MACHINE_RESET(orion128); - DECLARE_VIDEO_START(orion128); + void machine_start_orion128() ATTR_COLD; + void machine_reset_orion128(); + void video_start_orion128() ATTR_COLD; DECLARE_PALETTE_INIT(orion128); - DECLARE_MACHINE_START(orionz80); - DECLARE_MACHINE_RESET(orionz80); - DECLARE_MACHINE_RESET(orionpro); + void machine_start_orionz80() ATTR_COLD; + void machine_reset_orionz80(); + void machine_reset_orionpro(); uint32_t screen_update_orion128(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(orionz80_interrupt); DECLARE_READ8_MEMBER(orion_romdisk_porta_r); diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 9ef8d9c4f50..0807702d655 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -170,15 +170,15 @@ public: TILE_GET_INFO_MEMBER(s2650_get_tile_info); TILEMAP_MAPPER_MEMBER(jrpacman_scan_rows); TILE_GET_INFO_MEMBER(jrpacman_get_tile_info); - DECLARE_VIDEO_START(pacman); + void video_start_pacman() ATTR_COLD; DECLARE_PALETTE_INIT(pacman); - DECLARE_VIDEO_START(birdiy); - DECLARE_VIDEO_START(s2650games); - DECLARE_MACHINE_RESET(mschamp); - DECLARE_MACHINE_RESET(superabc); - DECLARE_MACHINE_RESET(maketrax); - DECLARE_VIDEO_START(pengo); - DECLARE_VIDEO_START(jrpacman); + void video_start_birdiy() ATTR_COLD; + void video_start_s2650games() ATTR_COLD; + void machine_reset_mschamp(); + void machine_reset_superabc(); + void machine_reset_maketrax(); + void video_start_pengo() ATTR_COLD; + void video_start_jrpacman() ATTR_COLD; uint32_t screen_update_pacman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_s2650games(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); @@ -196,12 +196,12 @@ private: public: // epos.c DECLARE_READ8_MEMBER(epos_decryption_w); - DECLARE_MACHINE_START(theglobp); - DECLARE_MACHINE_RESET(theglobp); - DECLARE_MACHINE_START(eeekk); - DECLARE_MACHINE_RESET(eeekk); - DECLARE_MACHINE_START(acitya); - DECLARE_MACHINE_RESET(acitya); + void machine_start_theglobp() ATTR_COLD; + void machine_reset_theglobp(); + void machine_start_eeekk() ATTR_COLD; + void machine_reset_eeekk(); + void machine_start_acitya() ATTR_COLD; + void machine_reset_acitya(); void birdiy(machine_config &config); void rocktrv2(machine_config &config); diff --git a/src/mame/includes/partner.h b/src/mame/includes/partner.h index a94e321a8cb..f7f41db7d04 100644 --- a/src/mame/includes/partner.h +++ b/src/mame/includes/partner.h @@ -33,8 +33,8 @@ public: DECLARE_WRITE8_MEMBER(partner_win_memory_page_w); DECLARE_WRITE8_MEMBER(partner_mem_page_w); void init_partner(); - DECLARE_MACHINE_START(partner); - DECLARE_MACHINE_RESET(partner); + void machine_start_partner() ATTR_COLD; + void machine_reset_partner(); I8275_DRAW_CHARACTER_MEMBER(display_pixels); DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/mame/includes/pc1251.h b/src/mame/includes/pc1251.h index 18d86ad0c70..d61752359d1 100644 --- a/src/mame/includes/pc1251.h +++ b/src/mame/includes/pc1251.h @@ -50,7 +50,7 @@ public: DECLARE_READ8_MEMBER(pc1251_lcd_read); DECLARE_WRITE8_MEMBER(pc1251_lcd_write); virtual void machine_start() override; - DECLARE_MACHINE_START(pc1260); + void machine_start_pc1260() ATTR_COLD; required_device<sc61860_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h index a65e61f435e..02d2752a471 100644 --- a/src/mame/includes/pc9801.h +++ b/src/mame/includes/pc9801.h @@ -261,16 +261,16 @@ private: UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); - DECLARE_MACHINE_START(pc9801_common); - DECLARE_MACHINE_START(pc9801f); - DECLARE_MACHINE_START(pc9801rs); - DECLARE_MACHINE_START(pc9801bx2); - DECLARE_MACHINE_START(pc9821); - DECLARE_MACHINE_START(pc9821ap2); - DECLARE_MACHINE_RESET(pc9801_common); - DECLARE_MACHINE_RESET(pc9801f); - DECLARE_MACHINE_RESET(pc9801rs); - DECLARE_MACHINE_RESET(pc9821); + void machine_start_pc9801_common() ATTR_COLD; + void machine_start_pc9801f() ATTR_COLD; + void machine_start_pc9801rs() ATTR_COLD; + void machine_start_pc9801bx2() ATTR_COLD; + void machine_start_pc9821() ATTR_COLD; + void machine_start_pc9821ap2() ATTR_COLD; + void machine_reset_pc9801_common(); + void machine_reset_pc9801f(); + void machine_reset_pc9801rs(); + void machine_reset_pc9821(); DECLARE_PALETTE_INIT(pc9801); DECLARE_WRITE_LINE_MEMBER(vrtc_irq); diff --git a/src/mame/includes/pce.h b/src/mame/includes/pce.h index 6ca8f8ce4cc..e205773f75e 100644 --- a/src/mame/includes/pce.h +++ b/src/mame/includes/pce.h @@ -74,8 +74,8 @@ public: void init_tg16(); void init_mess_pce(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_MACHINE_START(pce); - DECLARE_MACHINE_RESET(mess_pce); + void machine_start_pce() ATTR_COLD; + void machine_reset_mess_pce(); void pce_common(machine_config &config); void pce(machine_config &config); void tg16(machine_config &config); diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 117f67a16f6..b7a5d39ca3c 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -97,9 +97,9 @@ public: TILE_GET_INFO_MEMBER(get_pgm_tx_tilemap_tile_info); TILE_GET_INFO_MEMBER(get_pgm_bg_tilemap_tile_info); - DECLARE_VIDEO_START(pgm); - DECLARE_MACHINE_START(pgm); - DECLARE_MACHINE_RESET(pgm); + void video_start_pgm() ATTR_COLD; + void machine_start_pgm() ATTR_COLD; + void machine_reset_pgm(); uint32_t screen_update_pgm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_pgm); TIMER_DEVICE_CALLBACK_MEMBER(pgm_interrupt); diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index 083e0ae4432..67429d88cde 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -32,8 +32,8 @@ public: void init_oneprom_coindsw(); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_MACHINE_RESET(phoenix); - DECLARE_VIDEO_START(phoenix); + void machine_reset_phoenix(); + void video_start_phoenix() ATTR_COLD; DECLARE_PALETTE_INIT(phoenix); DECLARE_PALETTE_INIT(survival); DECLARE_PALETTE_INIT(pleiads); diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 13e01f0a630..5810ba93582 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -101,8 +101,8 @@ private: }; DECLARE_PALETTE_INIT(playch10); - DECLARE_MACHINE_START(playch10_hboard); - DECLARE_VIDEO_START(playch10_hboard); + void machine_start_playch10_hboard() ATTR_COLD; + void video_start_playch10_hboard() ATTR_COLD; DECLARE_WRITE_LINE_MEMBER(vblank_irq); void pc10_set_videorom_bank( int first, int count, int bank, int size ); diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 2add2a3fc3b..1641a61cc49 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -95,15 +95,15 @@ public: TILE_GET_INFO_MEMBER(bigtwinb_get_tx_tile_info); TILE_GET_INFO_MEMBER(hrdtimes_get_fg_tile_info); TILE_GET_INFO_MEMBER(hrdtimes_get_bg_tile_info); - DECLARE_MACHINE_START(playmark); - DECLARE_MACHINE_RESET(playmark); - DECLARE_VIDEO_START(bigtwin); - DECLARE_VIDEO_START(bigtwinb); - DECLARE_VIDEO_START(wbeachvl); - DECLARE_VIDEO_START(excelsr); - DECLARE_VIDEO_START(hotmind); - DECLARE_VIDEO_START(hrdtimes); - DECLARE_VIDEO_START(luckboomh); + void machine_start_playmark() ATTR_COLD; + void machine_reset_playmark() ATTR_COLD; + void video_start_bigtwin() ATTR_COLD; + void video_start_bigtwinb() ATTR_COLD; + void video_start_wbeachvl() ATTR_COLD; + void video_start_excelsr() ATTR_COLD; + void video_start_hotmind() ATTR_COLD; + void video_start_hrdtimes() ATTR_COLD; + void video_start_luckboomh() ATTR_COLD; TILEMAP_MAPPER_MEMBER(playmark_tilemap_scan_pages); uint32_t screen_update_bigtwin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_bigtwinb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index b7702b19237..eb85c958e8e 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -105,8 +105,8 @@ public: void init_polepos2(); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(tx_get_tile_info); - DECLARE_MACHINE_RESET(polepos); - DECLARE_VIDEO_START(polepos); + void machine_reset_polepos(); + void video_start_polepos() ATTR_COLD; DECLARE_PALETTE_INIT(polepos); uint32_t screen_update_polepos(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(polepos_scanline); diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 170037d4b9b..2991978aa72 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -39,7 +39,7 @@ public: DECLARE_WRITE16_MEMBER(vram_1_w); DECLARE_READ8_MEMBER(powerinsb_fake_ym2203_r); - DECLARE_MACHINE_START(powerinsa); + void machine_start_powerinsa() ATTR_COLD; TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); diff --git a/src/mame/includes/primo.h b/src/mame/includes/primo.h index bc524e1406f..606f6bbad18 100644 --- a/src/mame/includes/primo.h +++ b/src/mame/includes/primo.h @@ -54,7 +54,7 @@ protected: DECLARE_WRITE8_MEMBER(primo_FD_w); virtual void machine_reset() override; virtual void machine_start() override; - DECLARE_MACHINE_RESET(primob); + void machine_reset_primob(); uint32_t screen_update_primo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); void primo_draw_scanline(bitmap_ind16 &bitmap, int primo_scanline); diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 7ddf3b0eade..bd40b9249df 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -93,8 +93,8 @@ public: template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_VIDEO_START(sngkace); - DECLARE_VIDEO_START(psikyo); + void video_start_sngkace() ATTR_COLD; + void video_start_psikyo() ATTR_COLD; uint32_t screen_update_psikyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_psikyo_bootleg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_psikyo); diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index 25b1af8f5ba..f065104c9db 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -76,12 +76,12 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void machine_reset() override; - DECLARE_MACHINE_START(psychic5); - DECLARE_MACHINE_START(bombsa); + void machine_start_psychic5() ATTR_COLD; + void machine_start_bombsa() ATTR_COLD; virtual void video_start() override; - DECLARE_VIDEO_START(psychic5); - DECLARE_VIDEO_START(bombsa); - DECLARE_VIDEO_RESET(psychic5); + void video_start_psychic5() ATTR_COLD; + void video_start_bombsa() ATTR_COLD; + void video_reset_psychic5(); TIMER_DEVICE_CALLBACK_MEMBER(scanline); diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 97c1ad01871..58ad38d3d5b 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -78,8 +78,8 @@ public: TILEMAP_MAPPER_MEMBER(armwrest_bs1_scan); TILEMAP_MAPPER_MEMBER(armwrest_bs1_scan_flipx); virtual void video_start() override; - DECLARE_VIDEO_START(armwrest); - DECLARE_MACHINE_RESET(spnchout); + void video_start_armwrest() ATTR_COLD; + void machine_reset_spnchout(); uint32_t screen_update_punchout_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_punchout_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_armwrest_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index 39665416597..c0356eb7420 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -65,10 +65,10 @@ private: DECLARE_READ16_MEMBER(gp2_ide_std_r); DECLARE_READ16_MEMBER(inputs_r); - DECLARE_MACHINE_START(qdrmfgp); - DECLARE_VIDEO_START(qdrmfgp); - DECLARE_MACHINE_START(qdrmfgp2); - DECLARE_VIDEO_START(qdrmfgp2); + void machine_start_qdrmfgp() ATTR_COLD; + void video_start_qdrmfgp() ATTR_COLD; + void machine_start_qdrmfgp2() ATTR_COLD; + void video_start_qdrmfgp2() ATTR_COLD; uint32_t screen_update_qdrmfgp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(qdrmfgp2_interrupt); diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index 31f59f808ef..44c99cca584 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -115,8 +115,8 @@ public: void init_zookeep(); void init_kram3(); virtual void machine_reset() override; - DECLARE_MACHINE_START(qixmcu); - DECLARE_VIDEO_START(qix); + void machine_start_qixmcu() ATTR_COLD; + void video_start_qix() ATTR_COLD; TIMER_CALLBACK_MEMBER(pia_w_callback); TIMER_CALLBACK_MEMBER(deferred_sndpia1_porta_w); DECLARE_WRITE_LINE_MEMBER(qix_vsync_changed); diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h index 4b4a931a48c..a7e204b609a 100644 --- a/src/mame/includes/quasar.h +++ b/src/mame/includes/quasar.h @@ -26,9 +26,9 @@ public: DECLARE_WRITE8_MEMBER(quasar_sh_command_w); DECLARE_READ8_MEMBER(quasar_sh_command_r); DECLARE_READ_LINE_MEMBER(audio_t1_r); - DECLARE_MACHINE_START(quasar); - DECLARE_MACHINE_RESET(quasar); - DECLARE_VIDEO_START(quasar); + void machine_start_quasar() ATTR_COLD; + void machine_reset_quasar(); + void video_start_quasar() ATTR_COLD; DECLARE_PALETTE_INIT(quasar); uint32_t screen_update_quasar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(quasar_interrupt); diff --git a/src/mame/includes/radio86.h b/src/mame/includes/radio86.h index 5ac8d1e82b6..e7b0c9983a7 100644 --- a/src/mame/includes/radio86.h +++ b/src/mame/includes/radio86.h @@ -70,7 +70,7 @@ public: DECLARE_WRITE8_MEMBER(radio86_pagesel); void init_radioram(); void init_radio86(); - DECLARE_MACHINE_RESET(radio86); + void machine_reset_radio86(); DECLARE_PALETTE_INIT(radio86); DECLARE_READ8_MEMBER(radio86_8255_portb_r2); DECLARE_READ8_MEMBER(radio86_8255_portc_r2); diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index 376b075ca53..e71300a30bf 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -64,7 +64,7 @@ public: TILE_GET_INFO_MEMBER(get_text_tile_info); virtual void video_start() override; - DECLARE_VIDEO_START(raidenb); + void video_start_raidenb() ATTR_COLD; uint32_t screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t *scrollregs); uint32_t screen_update_raiden(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 3d6a87ebe15..76b8bb05134 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -132,11 +132,11 @@ public: TILE_GET_INFO_MEMBER(get_mid_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); - DECLARE_MACHINE_RESET(raiden2); - DECLARE_VIDEO_START(raiden2); - DECLARE_MACHINE_RESET(zeroteam); - DECLARE_MACHINE_RESET(xsedae); - DECLARE_MACHINE_RESET(raidendx); + void machine_reset_raiden2(); + void video_start_raiden2() ATTR_COLD; + void machine_reset_zeroteam(); + void machine_reset_xsedae(); + void machine_reset_raidendx(); uint32_t screen_update_raiden2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(raiden2_interrupt); void combine32(uint32_t *val, int offset, uint16_t data, uint16_t mem_mask); diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index d7f739742b7..2f6ad308f92 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -72,13 +72,13 @@ public: TILE_GET_INFO_MEMBER(rallyx_fg_get_tile_info); TILE_GET_INFO_MEMBER(locomotn_bg_get_tile_info); TILE_GET_INFO_MEMBER(locomotn_fg_get_tile_info); - DECLARE_MACHINE_START(rallyx); - DECLARE_VIDEO_START(rallyx); + void machine_start_rallyx() ATTR_COLD; + void video_start_rallyx() ATTR_COLD; DECLARE_PALETTE_INIT(rallyx); - DECLARE_VIDEO_START(jungler); + void video_start_jungler() ATTR_COLD; DECLARE_PALETTE_INIT(jungler); - DECLARE_VIDEO_START(locomotn); - DECLARE_VIDEO_START(commsega); + void video_start_locomotn() ATTR_COLD; + void video_start_commsega() ATTR_COLD; uint32_t screen_update_rallyx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_jungler(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_locomotn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/rbisland.h b/src/mame/includes/rbisland.h index 05deffe9296..2045b74c91f 100644 --- a/src/mame/includes/rbisland.h +++ b/src/mame/includes/rbisland.h @@ -48,7 +48,7 @@ public: void init_jumping(); void init_rbisland(); virtual void machine_start() override; - DECLARE_VIDEO_START(jumping); + void video_start_jumping() ATTR_COLD; uint32_t screen_update_rainbow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_jumping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(cchip_timer); diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index da87a21ccc5..d023bf1b1c2 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -56,10 +56,10 @@ public: DECLARE_WRITE8_MEMBER(redalert_ay8910_latch_2_w); DECLARE_WRITE8_MEMBER(redalert_voice_command_w); DECLARE_WRITE8_MEMBER(demoneye_audio_command_w); - DECLARE_VIDEO_START(redalert); - DECLARE_VIDEO_START(ww3); - DECLARE_SOUND_START(redalert); - DECLARE_SOUND_START(demoneye); + void video_start_redalert() ATTR_COLD; + void video_start_ww3() ATTR_COLD; + void sound_start_redalert() ATTR_COLD; + void sound_start_demoneye() ATTR_COLD; uint32_t screen_update_redalert(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_demoneye(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_panther(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h index 79de425e7ad..0d38306d977 100644 --- a/src/mame/includes/rm380z.h +++ b/src/mame/includes/rm380z.h @@ -133,7 +133,7 @@ public: void init_rm380z34d(); void init_rm380z34e(); void init_rm480z(); - DECLARE_MACHINE_RESET(rm480z); + void machine_reset_rm480z(); void config_memory_map(); void update_screen(bitmap_ind16 &bitmap); diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index 7ce0373beab..9615f2f09d1 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -57,7 +57,7 @@ public: void init_schmeisr(); void init_hangzo(); void init_rohga(); - DECLARE_VIDEO_START(wizdfire); + void video_start_wizdfire() ATTR_COLD; uint32_t screen_update_rohga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_wizdfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_nitrobal(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h index 6d39d812a5b..b935a7ff8a7 100644 --- a/src/mame/includes/route16.h +++ b/src/mame/includes/route16.h @@ -28,8 +28,8 @@ public: DECLARE_READ8_MEMBER(speakres_in3_r); DECLARE_WRITE8_MEMBER(speakres_out2_w); DECLARE_WRITE8_MEMBER(stratvox_sn76477_w); - DECLARE_MACHINE_START(speakres); - DECLARE_MACHINE_START(ttmahjng); + void machine_start_speakres() ATTR_COLD; + void machine_start_ttmahjng() ATTR_COLD; void init_route16(); uint32_t screen_update_route16(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index e9ad46495e6..cc541836b54 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -62,8 +62,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_VIDEO_START(rpunch); - DECLARE_VIDEO_START(svolley); + void video_start_rpunch() ATTR_COLD; + void video_start_svolley() ATTR_COLD; uint32_t screen_update_rpunch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 87a33b920f1..274b32430fd 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -31,7 +31,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(qwak); + void video_start_qwak() ATTR_COLD; uint32_t screen_update_runaway(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_qwak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(interrupt_callback); diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h index 9c73da17393..b28f856dcee 100644 --- a/src/mame/includes/s11.h +++ b/src/mame/includes/s11.h @@ -79,7 +79,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_irq); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - DECLARE_MACHINE_RESET(s11); + void machine_reset_s11(); void init_s11(); void s11(machine_config &config); void s11_audio_map(address_map &map); diff --git a/src/mame/includes/s11a.h b/src/mame/includes/s11a.h index 3220a2d0f17..ec5a0a025db 100644 --- a/src/mame/includes/s11a.h +++ b/src/mame/includes/s11a.h @@ -20,7 +20,7 @@ public: DECLARE_WRITE8_MEMBER(bgbank_w); DECLARE_WRITE8_MEMBER(dig0_w); - DECLARE_MACHINE_RESET(s11a); + void machine_reset_s11a(); void init_s11a(); void s11a(machine_config &config); diff --git a/src/mame/includes/s11b.h b/src/mame/includes/s11b.h index 1ede5d1d446..6b89b8a48b8 100644 --- a/src/mame/includes/s11b.h +++ b/src/mame/includes/s11b.h @@ -27,7 +27,7 @@ public: DECLARE_WRITE8_MEMBER(bg_speech_clock_w); DECLARE_WRITE8_MEMBER(bg_speech_digit_w); - DECLARE_MACHINE_RESET(s11b); + void machine_reset_s11b(); void init_s11b(); void init_s11b_invert(); diff --git a/src/mame/includes/s11c.h b/src/mame/includes/s11c.h index 5052ebbfcef..0647eb4ad01 100644 --- a/src/mame/includes/s11c.h +++ b/src/mame/includes/s11c.h @@ -18,7 +18,7 @@ public: : s11b_state(mconfig, type, tag) { } - DECLARE_MACHINE_RESET(s11c); + void machine_reset_s11c(); void init_s11c(); void s11c(machine_config &config); diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h index bc5bed44f73..c0b815c436f 100644 --- a/src/mame/includes/saturn.h +++ b/src/mame/includes/saturn.h @@ -113,7 +113,7 @@ public: required_device<palette_device> m_palette; bitmap_rgb32 m_tmpbitmap; - DECLARE_VIDEO_START(stv_vdp2); + void video_start_stv_vdp2() ATTR_COLD; uint32_t screen_update_stv_vdp2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(saturn_scanline); TIMER_DEVICE_CALLBACK_MEMBER(saturn_slave_scanline); diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index a99dbc660ad..a21beba25f6 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -64,8 +64,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_fg); void init_tecfri(); - DECLARE_VIDEO_START(trckydoc); - DECLARE_VIDEO_START(sauro); + void video_start_trckydoc() ATTR_COLD; + void video_start_sauro() ATTR_COLD; uint32_t screen_update_trckydoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_sauro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index 684c36db84d..776e56a3725 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -78,8 +78,8 @@ public: void init_hustler(); void init_hustlerd(); void init_billiard(); - DECLARE_MACHINE_RESET(scramble); - DECLARE_MACHINE_RESET(explorer); + void machine_reset_scramble(); + void machine_reset_explorer(); DECLARE_WRITE_LINE_MEMBER(scramble_sh_7474_q_callback); DECLARE_READ8_MEMBER( mariner_protection_1_r ); DECLARE_READ8_MEMBER( mariner_protection_2_r ); diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 33ea13e2c41..9f513726eda 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -123,10 +123,10 @@ public: virtual void machine_start() override; virtual void video_start() override; - DECLARE_MACHINE_RESET(spi); - DECLARE_MACHINE_RESET(sxx2e); - DECLARE_VIDEO_START(ejanhs); - DECLARE_VIDEO_START(sys386f); + void machine_reset_spi(); + void machine_reset_sxx2e(); + void video_start_ejanhs() ATTR_COLD; + void video_start_sys386f() ATTR_COLD; TILE_GET_INFO_MEMBER(get_text_tile_info); TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_midl_tile_info); diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index cef9c7e4a6c..903d0456e2a 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -187,22 +187,22 @@ public: void init_pairlove(); template<int Offset> TILE_GET_INFO_MEMBER(twineagl_get_tile_info); template<int Layer, int Offset> TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_VIDEO_START(seta_no_layers); - DECLARE_VIDEO_START(kyustrkr_no_layers); - DECLARE_VIDEO_START(twineagl_1_layer); - DECLARE_VIDEO_START(seta_1_layer); - DECLARE_MACHINE_RESET(calibr50); + void video_start_seta_no_layers() ATTR_COLD; + void video_start_kyustrkr_no_layers() ATTR_COLD; + void video_start_twineagl_1_layer() ATTR_COLD; + void video_start_seta_1_layer() ATTR_COLD; + void machine_reset_calibr50(); DECLARE_PALETTE_INIT(palette_init_RRRRRGGGGGBBBBB_proms); DECLARE_PALETTE_INIT(usclssic); - DECLARE_MACHINE_START(usclssic); - DECLARE_VIDEO_START(seta_2_layers); + void machine_start_usclssic() ATTR_COLD; + void video_start_seta_2_layers() ATTR_COLD; DECLARE_PALETTE_INIT(blandia); DECLARE_PALETTE_INIT(zingzip); - DECLARE_MACHINE_START(wrofaero); + void machine_start_wrofaero() ATTR_COLD; DECLARE_PALETTE_INIT(gundhara); DECLARE_PALETTE_INIT(jjsquawk); - DECLARE_MACHINE_START(keroppi); - DECLARE_VIDEO_START(oisipuzl_2_layers); + void machine_start_keroppi() ATTR_COLD; + void video_start_oisipuzl_2_layers() ATTR_COLD; uint32_t screen_update_seta_no_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_usclssic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -360,9 +360,9 @@ public: DECLARE_WRITE16_MEMBER(spritectrl_w); - DECLARE_MACHINE_RESET(setaroul); + void machine_reset_setaroul(); - DECLARE_VIDEO_START(setaroul_1_layer); + void video_start_setaroul_1_layer() ATTR_COLD; DECLARE_PALETTE_INIT(setaroul); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -414,7 +414,7 @@ public: DECLARE_READ16_MEMBER(trackball_r); - DECLARE_VIDEO_START(jockeyc_1_layer); + void video_start_jockeyc_1_layer() ATTR_COLD; TIMER_DEVICE_CALLBACK_MEMBER(interrupt); diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 7e2f1239a98..f3c80a8e970 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -112,14 +112,14 @@ public: void init_funcube(); void init_funcube2(); - DECLARE_MACHINE_START(mj4simai); - DECLARE_MACHINE_START(funcube); - DECLARE_MACHINE_RESET(funcube); + void machine_start_mj4simai() ATTR_COLD; + void machine_start_funcube() ATTR_COLD; + void machine_reset_funcube(); virtual void video_start() override; - DECLARE_VIDEO_START(yoffset); - DECLARE_VIDEO_START(xoffset); - DECLARE_VIDEO_START(xoffset1); + void video_start_yoffset() ATTR_COLD; + void video_start_xoffset() ATTR_COLD; + void video_start_xoffset1() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 588fcc00971..6f85177dcea 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -60,9 +60,9 @@ public: void init_dynamski(); void init_shangkid(); void init_chinhero(); - DECLARE_VIDEO_START(shangkid); + void video_start_shangkid() ATTR_COLD; DECLARE_PALETTE_INIT(dynamski); - DECLARE_MACHINE_RESET(shangkid); + void machine_reset_shangkid(); uint32_t screen_update_shangkid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_dynamski(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h index b18a181c819..813af65ed6c 100644 --- a/src/mame/includes/simple_st0016.h +++ b/src/mame/includes/simple_st0016.h @@ -38,7 +38,7 @@ public: void init_mayjisn2(); void init_renju(); virtual void machine_start() override; - DECLARE_VIDEO_START(st0016); + void video_start_st0016() ATTR_COLD; uint32_t screen_update_st0016(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(st0016_int); void st0016(machine_config &config); diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 522f8f873a3..f909f5235b3 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -106,8 +106,8 @@ public: TILE_GET_INFO_MEMBER(get_pf_tile_info); TILE_GET_INFO_MEMBER(get_pf1_tile_info); TILE_GET_INFO_MEMBER(get_fix_tile_info); - DECLARE_VIDEO_START(perfrman); - DECLARE_VIDEO_START(slapfight); + void video_start_perfrman() ATTR_COLD; + void video_start_slapfight() ATTR_COLD; void draw_perfrman_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int layer); void draw_slapfight_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/sms.h b/src/mame/includes/sms.h index 3c635f9ddcf..53eca9bab79 100644 --- a/src/mame/includes/sms.h +++ b/src/mame/includes/sms.h @@ -216,12 +216,12 @@ public: void init_smsj(); void init_sms1(); void init_sms(); - DECLARE_MACHINE_START(sms); - DECLARE_MACHINE_RESET(sms); - DECLARE_VIDEO_START(gamegear); - DECLARE_VIDEO_RESET(gamegear); - DECLARE_VIDEO_START(sms1); - DECLARE_VIDEO_RESET(sms1); + void machine_start_sms() ATTR_COLD; + void machine_reset_sms(); + void video_start_gamegear() ATTR_COLD; + void video_reset_gamegear(); + void video_start_sms1() ATTR_COLD; + void video_reset_sms1(); uint32_t screen_update_sms(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_sms1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index c6fe8609725..eb83cb6d2fc 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -173,19 +173,19 @@ public: TILE_GET_INFO_MEMBER(tnk3_get_bg_tile_info); TILE_GET_INFO_MEMBER(ikari_get_bg_tile_info); TILE_GET_INFO_MEMBER(gwar_get_bg_tile_info); - DECLARE_VIDEO_START(marvins); + void video_start_marvins() ATTR_COLD; DECLARE_PALETTE_INIT(tnk3); - DECLARE_VIDEO_START(jcross); - DECLARE_VIDEO_START(tnk3); - DECLARE_VIDEO_START(ikari); - DECLARE_VIDEO_START(gwar); - DECLARE_VIDEO_START(tdfever); - DECLARE_VIDEO_START(sgladiat); - DECLARE_VIDEO_START(hal21); - DECLARE_VIDEO_START(aso); - DECLARE_VIDEO_START(psychos); - DECLARE_VIDEO_START(snk_3bpp_shadow); - DECLARE_VIDEO_START(snk_4bpp_shadow); + void video_start_jcross() ATTR_COLD; + void video_start_tnk3() ATTR_COLD; + void video_start_ikari() ATTR_COLD; + void video_start_gwar() ATTR_COLD; + void video_start_tdfever() ATTR_COLD; + void video_start_sgladiat() ATTR_COLD; + void video_start_hal21() ATTR_COLD; + void video_start_aso() ATTR_COLD; + void video_start_psychos() ATTR_COLD; + void video_start_snk_3bpp_shadow() ATTR_COLD; + void video_start_snk_4bpp_shadow() ATTR_COLD; uint32_t screen_update_marvins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_tnk3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_ikari(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index 2e3b338ea8a..e20ef0e7dbc 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -69,15 +69,15 @@ public: TILE_GET_INFO_MEMBER(satansat_get_fg_tile_info); virtual void machine_start() override; - DECLARE_MACHINE_RESET(sasuke); - DECLARE_VIDEO_START(satansat); + void machine_reset_sasuke(); + void video_start_satansat() ATTR_COLD; DECLARE_PALETTE_INIT(satansat); - DECLARE_MACHINE_RESET(vanguard); - DECLARE_VIDEO_START(snk6502); + void machine_reset_vanguard(); + void video_start_snk6502() ATTR_COLD; DECLARE_PALETTE_INIT(snk6502); - DECLARE_MACHINE_RESET(satansat); - DECLARE_MACHINE_RESET(pballoon); - DECLARE_VIDEO_START(pballoon); + void machine_reset_satansat(); + void machine_reset_pballoon(); + void video_start_pballoon() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index d5911655fe8..5dbd9271c0d 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -63,7 +63,7 @@ public: virtual void machine_start() override; virtual void video_start() override; - DECLARE_VIDEO_START(searchar); + void video_start_searchar() ATTR_COLD; void common_video_start(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 1eebbf56b4c..95695674d2d 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -32,8 +32,8 @@ public: TILE_GET_INFO_MEMBER(crystalc_get_bg_tile_info); virtual void video_start() override; DECLARE_PALETTE_INIT(snookr10); - DECLARE_VIDEO_START(apple10); - DECLARE_VIDEO_START(crystalc); + void video_start_apple10() ATTR_COLD; + void video_start_crystalc() ATTR_COLD; DECLARE_PALETTE_INIT(apple10); DECLARE_PALETTE_INIT(crystalc); uint32_t screen_update_snookr10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index 44910f0a213..a9470986e67 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -62,8 +62,8 @@ public: void init_toto(); void init_hyperpac(); void init_yutnori(); - DECLARE_MACHINE_RESET(semiprot); - DECLARE_MACHINE_RESET(finalttr); + void machine_reset_semiprot(); + void machine_reset_finalttr(); uint32_t screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_honeydol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h index 7db223944cb..27edded9157 100644 --- a/src/mame/includes/sorcerer.h +++ b/src/mame/includes/sorcerer.h @@ -73,7 +73,7 @@ public: DECLARE_WRITE8_MEMBER(sorcerer_fd_w); DECLARE_WRITE8_MEMBER(sorcerer_fe_w); DECLARE_WRITE8_MEMBER(sorcerer_ff_w); - DECLARE_MACHINE_START(sorcererd); + void machine_start_sorcererd() ATTR_COLD; void init_sorcerer(); TIMER_CALLBACK_MEMBER(sorcerer_cassette_tc); TIMER_CALLBACK_MEMBER(sorcerer_serial_tc); diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index ca6c73ae5e4..0b2038c542b 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -71,8 +71,8 @@ public: DECLARE_WRITE16_MEMBER(spbatnp_90124_w); DECLARE_WRITE16_MEMBER(spbatnp_9012c_w); - DECLARE_VIDEO_START(spbactn); - DECLARE_VIDEO_START(spbactnp); + void video_start_spbactn() ATTR_COLD; + void video_start_spbactnp() ATTR_COLD; //virtual void video_start(); diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h index 3316daf0df4..b852ceefcfd 100644 --- a/src/mame/includes/special.h +++ b/src/mame/includes/special.h @@ -87,15 +87,15 @@ public: DECLARE_WRITE8_MEMBER(specialist_8255_portc_w); void init_erik(); void init_special(); - DECLARE_MACHINE_RESET(special); - DECLARE_VIDEO_START(special); - DECLARE_MACHINE_RESET(erik); - DECLARE_VIDEO_START(erik); + void machine_reset_special(); + void video_start_special() ATTR_COLD; + void machine_reset_erik(); + void video_start_erik() ATTR_COLD; DECLARE_PALETTE_INIT(erik); - DECLARE_VIDEO_START(specialp); - DECLARE_MACHINE_START(specimx); - DECLARE_MACHINE_RESET(specimx); - DECLARE_VIDEO_START(specimx); + void video_start_specialp() ATTR_COLD; + void machine_start_specimx() ATTR_COLD; + void machine_reset_specimx(); + void video_start_specimx() ATTR_COLD; DECLARE_PALETTE_INIT(specimx); uint32_t screen_update_special(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_erik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index 015478568ac..d27370207e4 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -160,15 +160,15 @@ public: void init_spectrum(); void init_plus2(); void init_plus3(); - DECLARE_MACHINE_RESET(spectrum); - DECLARE_VIDEO_START(spectrum); + void machine_reset_spectrum(); + void video_start_spectrum() ATTR_COLD; DECLARE_PALETTE_INIT(spectrum); - DECLARE_MACHINE_RESET(tc2048); - DECLARE_VIDEO_START(spectrum_128); - DECLARE_MACHINE_RESET(spectrum_128); - DECLARE_MACHINE_RESET(spectrum_plus3); - DECLARE_MACHINE_RESET(ts2068); - DECLARE_VIDEO_START(ts2068); + void machine_reset_tc2048(); + void video_start_spectrum_128() ATTR_COLD; + void machine_reset_spectrum_128(); + void machine_reset_spectrum_plus3(); + void machine_reset_ts2068(); + void video_start_ts2068() ATTR_COLD; uint32_t screen_update_spectrum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_tc2048(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_ts2068(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index dd9398884f9..06a6f535ce7 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -81,9 +81,9 @@ public: void init_splash(); void init_rebus(); virtual void video_start() override; - DECLARE_MACHINE_START(splash); - DECLARE_MACHINE_START(roldfrog); - DECLARE_MACHINE_RESET(splash); + void machine_start_splash() ATTR_COLD; + void machine_start_roldfrog() ATTR_COLD; + void machine_reset_splash(); TILE_GET_INFO_MEMBER(get_tile_info_tilemap0); TILE_GET_INFO_MEMBER(get_tile_info_tilemap1); diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 011a28ef847..afa2c7cf033 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -61,12 +61,12 @@ public: DECLARE_WRITE8_MEMBER(srmp3_irq_ack_w); virtual void machine_start() override; - DECLARE_MACHINE_START(srmp2); + void machine_start_srmp2() ATTR_COLD; DECLARE_PALETTE_INIT(srmp2); - DECLARE_MACHINE_START(srmp3); + void machine_start_srmp3() ATTR_COLD; DECLARE_PALETTE_INIT(srmp3); - DECLARE_MACHINE_START(rmgoldyh); - DECLARE_MACHINE_START(mjyuugi); + void machine_start_rmgoldyh() ATTR_COLD; + void machine_start_mjyuugi() ATTR_COLD; uint32_t screen_update_srmp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_srmp3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 095243adb99..56207e7d847 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -67,8 +67,8 @@ public: TILE_GET_INFO_MEMBER(get_sslam_md_tile_info); TILE_GET_INFO_MEMBER(get_sslam_bg_tile_info); TILE_GET_INFO_MEMBER(get_powerbls_bg_tile_info); - DECLARE_VIDEO_START(sslam); - DECLARE_VIDEO_START(powerbls); + void video_start_sslam() ATTR_COLD; + void video_start_powerbls() ATTR_COLD; uint32_t screen_update_sslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_powerbls(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(music_playback); diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index dfb3fe1dfe8..12d8db2b306 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -126,8 +126,8 @@ public: void init_mslider(); virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(gdfs); - DECLARE_VIDEO_START(eaglshot); + void video_start_gdfs() ATTR_COLD; + void video_start_eaglshot() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_gdfs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 8379c27af97..ceb430f1b11 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -105,10 +105,10 @@ public: void install_stvbios_speedups( void ); - DECLARE_MACHINE_START(stv); - DECLARE_MACHINE_RESET(stv); + void machine_start_stv() ATTR_COLD; + void machine_reset_stv(); - DECLARE_MACHINE_RESET(batmanfr); + void machine_reset_batmanfr(); DECLARE_WRITE32_MEMBER(batmanfr_sound_comms_w); optional_device<acclaim_rax_device> m_rax; diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index 95dbfde6b0f..7f43401badc 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -72,10 +72,10 @@ public: void init_uballoon(); virtual void video_start() override; - DECLARE_MACHINE_START(bestbest); - DECLARE_MACHINE_START(bssoccer); - DECLARE_MACHINE_START(uballoon); - DECLARE_MACHINE_RESET(uballoon); + void machine_start_bestbest() ATTR_COLD; + void machine_start_bssoccer() ATTR_COLD; + void machine_start_uballoon() ATTR_COLD; + void machine_reset_uballoon(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_bestbest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 71b6c65da34..739d4f195bc 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -157,13 +157,13 @@ public: void init_suna8(); void suna8_vh_start_common(bool has_text, GFXBANK_TYPE_T gfxbank_type); - DECLARE_VIDEO_START(suna8_text); - DECLARE_VIDEO_START(suna8_sparkman); - DECLARE_VIDEO_START(suna8_brickzn); - DECLARE_VIDEO_START(suna8_starfigh); + void video_start_suna8_text() ATTR_COLD; + void video_start_suna8_sparkman() ATTR_COLD; + void video_start_suna8_brickzn() ATTR_COLD; + void video_start_suna8_starfigh() ATTR_COLD; - DECLARE_MACHINE_RESET(brickzn); - DECLARE_MACHINE_RESET(hardhea2); + void machine_reset_brickzn(); + void machine_reset_hardhea2(); uint32_t screen_update_suna8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(hardhea2_interrupt); diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h index bf8997d3786..08e0361bf0f 100644 --- a/src/mame/includes/super80.h +++ b/src/mame/includes/super80.h @@ -80,9 +80,9 @@ public: DECLARE_WRITE8_MEMBER(pio_port_a_w); DECLARE_READ8_MEMBER(pio_port_b_r); void init_super80(); - DECLARE_MACHINE_RESET(super80); - DECLARE_MACHINE_RESET(super80r); - DECLARE_VIDEO_START(super80); + void machine_reset_super80(); + void machine_reset_super80r(); + void video_start_super80() ATTR_COLD; DECLARE_PALETTE_INIT(super80m); DECLARE_QUICKLOAD_LOAD_MEMBER(super80); MC6845_UPDATE_ROW(crtc_update_row); diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 7f374ec778e..19bcaaba1be 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -56,7 +56,7 @@ public: void init_pbillian(); void init_hotsmash(); TILE_GET_INFO_MEMBER(sqix_get_bg_tile_info); - DECLARE_VIDEO_START(superqix); + void video_start_superqix() ATTR_COLD; DECLARE_PALETTE_DECODER(BBGGRRII); uint32_t screen_update_superqix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void superqix_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); @@ -99,8 +99,8 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(frommcu_semaphore_input_r); DECLARE_READ8_MEMBER(bootleg_in0_r); INTERRUPT_GEN_MEMBER(sqix_timer_irq); - DECLARE_MACHINE_START(superqix); - DECLARE_MACHINE_RESET(superqix); + void machine_start_superqix() ATTR_COLD; + void machine_reset_superqix(); void sqix(machine_config &config); void sqix_8031(machine_config &config); @@ -154,8 +154,8 @@ public: TILE_GET_INFO_MEMBER(pb_get_bg_tile_info); - DECLARE_MACHINE_START(pbillian); - DECLARE_VIDEO_START(pbillian); + void machine_start_pbillian() ATTR_COLD; + void video_start_pbillian() ATTR_COLD; u32 screen_update_pbillian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 440a612cfa6..87e70415d19 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -145,11 +145,11 @@ public: virtual void machine_reset() override; virtual void video_start() override; virtual void video_reset() override; - DECLARE_MACHINE_RESET(sknsa); - DECLARE_MACHINE_RESET(sknsj); - DECLARE_MACHINE_RESET(sknsu); - DECLARE_MACHINE_RESET(sknse); - DECLARE_MACHINE_RESET(sknsk); + void machine_reset_sknsa(); + void machine_reset_sknsj(); + void machine_reset_sknsu(); + void machine_reset_sknse(); + void machine_reset_sknsk(); TILE_GET_INFO_MEMBER(get_tilemap_A_tile_info); TILE_GET_INFO_MEMBER(get_tilemap_B_tile_info); diff --git a/src/mame/includes/svision.h b/src/mame/includes/svision.h index 147dd4cc63e..c474f7c40c5 100644 --- a/src/mame/includes/svision.h +++ b/src/mame/includes/svision.h @@ -65,7 +65,7 @@ public: DECLARE_PALETTE_INIT(svision); DECLARE_PALETTE_INIT(svisionp); DECLARE_PALETTE_INIT(svisionn); - DECLARE_MACHINE_RESET(tvlink); + void machine_reset_tvlink(); uint32_t screen_update_svision(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_tvlink(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(svision_frame_int); diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index fc1ddff36ae..e7a1585804f 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -113,9 +113,9 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - DECLARE_MACHINE_START(system2); - DECLARE_VIDEO_START(system2); - DECLARE_MACHINE_START(myherok); + void machine_start_system2() ATTR_COLD; + void video_start_system2() ATTR_COLD; + void machine_start_myherok() ATTR_COLD; uint32_t screen_update_system1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_system2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_system2_rowscroll(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 23747d6d08e..17426ad3e94 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -195,7 +195,7 @@ public: void init_goldnaxeb1(); void init_ddcrewbl(); void init_common(); - DECLARE_MACHINE_RESET(ddcrewbl); + void machine_reset_ddcrewbl(); TILEMAP_MAPPER_MEMBER(sys16_bg_map); TILEMAP_MAPPER_MEMBER(sys16_text_map); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -206,12 +206,12 @@ public: TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_infotxt); TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_info0); TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_info1); - DECLARE_VIDEO_START(system16); - DECLARE_VIDEO_START(system18old); - DECLARE_VIDEO_START(s16a_bootleg_shinobi); - DECLARE_VIDEO_START(s16a_bootleg_passsht); - DECLARE_VIDEO_START(s16a_bootleg_wb3bl); - DECLARE_VIDEO_START(s16a_bootleg); + void video_start_system16() ATTR_COLD; + void video_start_system18old() ATTR_COLD; + void video_start_s16a_bootleg_shinobi() ATTR_COLD; + void video_start_s16a_bootleg_passsht() ATTR_COLD; + void video_start_s16a_bootleg_wb3bl() ATTR_COLD; + void video_start_s16a_bootleg() ATTR_COLD; uint32_t screen_update_system16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_system18old(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_s16a_bootleg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 114f60214b4..0c44ba7c4e4 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -65,13 +65,13 @@ public: DECLARE_WRITE8_MEMBER(mb87078_gain_changed); DECLARE_INPUT_CHANGED_MEMBER(realpunc_sensor); void init_taito_b(); - DECLARE_VIDEO_START(taitob_color_order0); - DECLARE_VIDEO_START(taitob_color_order1); - DECLARE_VIDEO_START(taitob_color_order2); - DECLARE_VIDEO_START(hitice); - DECLARE_VIDEO_RESET(hitice); - DECLARE_VIDEO_START(realpunc); - DECLARE_VIDEO_START(taitob_core); + void video_start_taitob_color_order0() ATTR_COLD; + void video_start_taitob_color_order1() ATTR_COLD; + void video_start_taitob_color_order2() ATTR_COLD; + void video_start_hitice() ATTR_COLD; + void video_reset_hitice(); + void video_start_realpunc() ATTR_COLD; + void video_start_taitob_core() ATTR_COLD; uint32_t screen_update_taitob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_taitob); diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index 9b84c1cba65..580eba40668 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -144,32 +144,32 @@ public: void init_cameltry(); void init_mjnquest(); void init_finalb(); - DECLARE_MACHINE_START(f2); - DECLARE_VIDEO_START(taitof2_default); - DECLARE_MACHINE_START(common); - DECLARE_VIDEO_START(taitof2_dondokod); - DECLARE_VIDEO_START(taitof2_driftout); - DECLARE_VIDEO_START(taitof2_finalb); - DECLARE_VIDEO_START(taitof2_megab); - DECLARE_VIDEO_START(taitof2_thundfox); - DECLARE_VIDEO_START(taitof2_ssi); - DECLARE_VIDEO_START(taitof2_gunfront); - DECLARE_VIDEO_START(taitof2_growl); - DECLARE_VIDEO_START(taitof2_mjnquest); - DECLARE_VIDEO_START(taitof2_footchmp); - DECLARE_VIDEO_START(taitof2_hthero); - DECLARE_VIDEO_START(taitof2_koshien); - DECLARE_VIDEO_START(taitof2_yuyugogo); - DECLARE_VIDEO_START(taitof2_ninjak); - DECLARE_VIDEO_START(taitof2_solfigtr); - DECLARE_VIDEO_START(taitof2_pulirula); - DECLARE_VIDEO_START(taitof2_metalb); - DECLARE_VIDEO_START(taitof2_qzchikyu); - DECLARE_VIDEO_START(taitof2_yesnoj); - DECLARE_VIDEO_START(taitof2_deadconx); - DECLARE_VIDEO_START(taitof2_deadconxj); - DECLARE_VIDEO_START(taitof2_dinorex); - DECLARE_VIDEO_START(taitof2_quiz); + void machine_start_f2() ATTR_COLD; + void video_start_taitof2_default() ATTR_COLD; + void machine_start_common() ATTR_COLD; + void video_start_taitof2_dondokod() ATTR_COLD; + void video_start_taitof2_driftout() ATTR_COLD; + void video_start_taitof2_finalb() ATTR_COLD; + void video_start_taitof2_megab() ATTR_COLD; + void video_start_taitof2_thundfox() ATTR_COLD; + void video_start_taitof2_ssi() ATTR_COLD; + void video_start_taitof2_gunfront() ATTR_COLD; + void video_start_taitof2_growl() ATTR_COLD; + void video_start_taitof2_mjnquest() ATTR_COLD; + void video_start_taitof2_footchmp() ATTR_COLD; + void video_start_taitof2_hthero() ATTR_COLD; + void video_start_taitof2_koshien() ATTR_COLD; + void video_start_taitof2_yuyugogo() ATTR_COLD; + void video_start_taitof2_ninjak() ATTR_COLD; + void video_start_taitof2_solfigtr() ATTR_COLD; + void video_start_taitof2_pulirula() ATTR_COLD; + void video_start_taitof2_metalb() ATTR_COLD; + void video_start_taitof2_qzchikyu() ATTR_COLD; + void video_start_taitof2_yesnoj() ATTR_COLD; + void video_start_taitof2_deadconx() ATTR_COLD; + void video_start_taitof2_deadconxj() ATTR_COLD; + void video_start_taitof2_dinorex() ATTR_COLD; + void video_start_taitof2_quiz() ATTR_COLD; uint32_t screen_update_taitof2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_taitof2_pri_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_taitof2_pri(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index ce24143b28e..ecf8a4d5eae 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -311,8 +311,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_vram); TILE_GET_INFO_MEMBER(get_tile_info_pixel); virtual void machine_start() override; - DECLARE_MACHINE_RESET(f3); - DECLARE_VIDEO_START(f3); + void machine_reset_f3(); + void video_start_f3(); uint32_t screen_update_f3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_f3); INTERRUPT_GEN_MEMBER(f3_interrupt2); diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 3cdc8dd7648..92b97723c0c 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -64,9 +64,9 @@ public: DECLARE_WRITE8_MEMBER(vram_w); template<int Offset> TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); - DECLARE_MACHINE_START(taito_l); - DECLARE_VIDEO_START(taito_l); - DECLARE_MACHINE_RESET(taito_l); + void machine_start_taito_l() ATTR_COLD; + void video_start_taito_l() ATTR_COLD; + void machine_reset_taito_l(); u32 screen_update_taitol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_taitol); TIMER_DEVICE_CALLBACK_MEMBER(vbl_interrupt); @@ -207,10 +207,10 @@ public: void init_plottinga(); - DECLARE_MACHINE_RESET(plotting); - DECLARE_MACHINE_RESET(puzznic); - DECLARE_MACHINE_RESET(palamed); - DECLARE_MACHINE_RESET(cachat); + void machine_reset_plotting(); + void machine_reset_puzznic(); + void machine_reset_palamed(); + void machine_reset_cachat(); void palamed(machine_config &config); void plotting(machine_config &config); @@ -241,7 +241,7 @@ public: DECLARE_WRITE8_MEMBER(bankg_w); - DECLARE_MACHINE_RESET(horshoes); + void machine_start_horshoes(); void horshoes(machine_config &config); void horshoes_map(address_map &map); }; diff --git a/src/mame/includes/taito_x.h b/src/mame/includes/taito_x.h index 046dd3d6f42..ba717767954 100644 --- a/src/mame/includes/taito_x.h +++ b/src/mame/includes/taito_x.h @@ -26,7 +26,7 @@ public: DECLARE_WRITE16_MEMBER(kyustrkr_input_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); void init_kyustrkr(); - DECLARE_MACHINE_START(taitox); + void machine_start_taitox() ATTR_COLD; INTERRUPT_GEN_MEMBER(interrupt); TIMER_DEVICE_CALLBACK_MEMBER(cchip_irq_clear_cb); diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 6b79c8fc58d..dab7c7c7df5 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -114,10 +114,10 @@ private: DECLARE_READ16_MEMBER(sci_spriteframe_r); DECLARE_WRITE16_MEMBER(sci_spriteframe_w); DECLARE_WRITE16_MEMBER(contcirc_out_w); - DECLARE_MACHINE_START(taitoz); - DECLARE_MACHINE_RESET(taitoz); - DECLARE_VIDEO_START(taitoz); - DECLARE_MACHINE_START(bshark); + void machine_start_taitoz() ATTR_COLD; + void machine_reset_taitoz(); + void video_start_taitoz() ATTR_COLD; + void machine_start_bshark() ATTR_COLD; uint32_t screen_update_contcirc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_chasehq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_bshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index ab536791c21..509a641f2bb 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -91,8 +91,8 @@ public: DECLARE_WRITE8_MEMBER(apache3_road_x_w); void init_apache3(); - DECLARE_MACHINE_RESET(apache3); - DECLARE_VIDEO_START(apache3); + void machine_reset_apache3(); + void video_start_apache3() ATTR_COLD; uint32_t screen_update_apache3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(apache3_68000_reset); @@ -145,7 +145,7 @@ public: DECLARE_WRITE16_MEMBER(roundup5_crt_w); void init_roundup5(); - DECLARE_VIDEO_START(roundup5); + void video_start_roundup5() ATTR_COLD; uint32_t screen_update_roundup5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void roundup5(machine_config &config); @@ -193,8 +193,8 @@ public: void init_cyclwarr(); template<int Bank> TILE_GET_INFO_MEMBER(get_tile_info_bigfight); - DECLARE_VIDEO_START(cyclwarr); - DECLARE_VIDEO_START(bigfight); + void video_start_cyclwarr() ATTR_COLD; + void video_start_bigfight() ATTR_COLD; uint32_t screen_update_cyclwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_bigfight(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -212,7 +212,7 @@ private: required_shared_ptr<uint16_t> m_cyclwarr_cpub_ram; required_shared_ptr_array<uint16_t, 2> m_cyclwarr_videoram; required_region_ptr<uint8_t> m_cyclwarr_tileclut; - + std::vector<uint8_t> m_mask; tilemap_t *m_layer[4]; diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 8531ae1ee6b..30691890e87 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -73,8 +73,8 @@ public: TILE_GET_INFO_MEMBER(tx_get_tile_info); virtual void video_start() override; - DECLARE_VIDEO_START(ginkun); - DECLARE_VIDEO_START(riot); + void video_start_ginkun() ATTR_COLD; + void video_start_riot() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index 6a1fd83576c..954d85937c4 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -125,10 +125,10 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_fg); TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_rot); TILE_GET_INFO_MEMBER(stepstag_get_tile_info_fg); - DECLARE_VIDEO_START(tetrisp2); - DECLARE_VIDEO_START(nndmseal); - DECLARE_VIDEO_START(rockntread); - DECLARE_VIDEO_START(rocknms); + void video_start_tetrisp2() ATTR_COLD; + void video_start_nndmseal() ATTR_COLD; + void video_start_rockntread() ATTR_COLD; + void video_start_rocknms() ATTR_COLD; uint32_t screen_update_tetrisp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_rockntread(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_rocknms_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -185,7 +185,7 @@ public: DECLARE_WRITE16_MEMBER(stepstag_button_leds_w); DECLARE_WRITE16_MEMBER( stepstag_palette_w ); void init_stepstag(); - DECLARE_VIDEO_START(stepstag); + void video_start_stepstag() ATTR_COLD; uint32_t screen_update_stepstag_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_stepstag_mid(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_stepstag_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h index 9a8378836f6..83dc7e3b3d4 100644 --- a/src/mame/includes/thomson.h +++ b/src/mame/includes/thomson.h @@ -176,8 +176,8 @@ public: TIMER_CALLBACK_MEMBER( to7_game_update_cb ); DECLARE_READ8_MEMBER( to7_midi_r ); DECLARE_WRITE8_MEMBER( to7_midi_w ); - DECLARE_MACHINE_RESET( to7 ); - DECLARE_MACHINE_START( to7 ); + void machine_reset_to7(); + void machine_start_to7() ATTR_COLD; DECLARE_WRITE_LINE_MEMBER( to770_sys_cb2_out ); DECLARE_READ8_MEMBER( to770_sys_porta_in ); void to7_update_cart_bank_postload(); @@ -186,8 +186,8 @@ public: DECLARE_WRITE8_MEMBER( to770_timer_port_out ); DECLARE_READ8_MEMBER( to770_gatearray_r ); DECLARE_WRITE8_MEMBER( to770_gatearray_w ); - DECLARE_MACHINE_RESET( to770 ); - DECLARE_MACHINE_START( to770 ); + void machine_reset_to770(); + void machine_start_to770() ATTR_COLD; void to7_lightpen_cb( int step ); void mo5_lightpen_cb( int step ); TIMER_CALLBACK_MEMBER( mo5_periodic_cb ); @@ -200,8 +200,8 @@ public: DECLARE_WRITE8_MEMBER( mo5_cartridge_w ); DECLARE_READ8_MEMBER( mo5_cartridge_r ); DECLARE_WRITE8_MEMBER( mo5_ext_w ); - DECLARE_MACHINE_RESET( mo5 ); - DECLARE_MACHINE_START( mo5 ); + void machine_reset_mo5(); + void machine_start_mo5() ATTR_COLD; DECLARE_WRITE8_MEMBER( to9_ieee_w ); DECLARE_READ8_MEMBER( to9_ieee_r ); DECLARE_READ8_MEMBER( to9_gatearray_r ); @@ -219,8 +219,8 @@ public: DECLARE_WRITE8_MEMBER( to9_sys_porta_out ); DECLARE_WRITE8_MEMBER( to9_sys_portb_out ); DECLARE_WRITE8_MEMBER( to9_timer_port_out ); - DECLARE_MACHINE_RESET( to9 ); - DECLARE_MACHINE_START( to9 ); + void machine_reset_to9(); + void machine_start_to9() ATTR_COLD; TIMER_CALLBACK_MEMBER( to8_kbd_timer_cb ); void to8_update_floppy_bank_postload(); void to8_update_ram_bank_postload(); @@ -239,12 +239,12 @@ public: DECLARE_WRITE8_MEMBER( to8_timer_port_out ); DECLARE_WRITE_LINE_MEMBER( to8_timer_cp2_out ); void to8_lightpen_cb( int step ); - DECLARE_MACHINE_RESET( to8 ); - DECLARE_MACHINE_START( to8 ); + void machine_reset_to8(); + void machine_start_to8() ATTR_COLD; DECLARE_READ8_MEMBER( to9p_timer_port_in ); DECLARE_WRITE8_MEMBER( to9p_timer_port_out ); - DECLARE_MACHINE_RESET( to9p ); - DECLARE_MACHINE_START( to9p ); + void machine_reset_to9p(); + void machine_start_to9p() ATTR_COLD; void mo6_update_ram_bank_postload(); void mo6_update_cart_bank_postload(); DECLARE_WRITE8_MEMBER( mo6_cartridge_w ); @@ -262,16 +262,16 @@ public: DECLARE_WRITE8_MEMBER( mo6_gatearray_w ); DECLARE_READ8_MEMBER( mo6_vreg_r ); DECLARE_WRITE8_MEMBER( mo6_vreg_w ); - DECLARE_MACHINE_RESET( mo6 ); - DECLARE_MACHINE_START( mo6 ); + void machine_reset_mo6(); + void machine_start_mo6() ATTR_COLD; DECLARE_READ8_MEMBER( mo5nr_net_r ); DECLARE_WRITE8_MEMBER( mo5nr_net_w ); DECLARE_READ8_MEMBER( mo5nr_prn_r ); DECLARE_WRITE8_MEMBER( mo5nr_prn_w ); DECLARE_READ8_MEMBER( mo5nr_sys_portb_in ); DECLARE_WRITE8_MEMBER( mo5nr_sys_porta_out ); - DECLARE_MACHINE_RESET( mo5nr ); - DECLARE_MACHINE_START( mo5nr ); + void machine_reset_mo5nr(); + void machine_start_mo5nr() ATTR_COLD; TIMER_CALLBACK_MEMBER( thom_lightpen_step ); TIMER_CALLBACK_MEMBER( thom_scanline_start ); @@ -317,7 +317,7 @@ public: void overlayhalf_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); void overlay3_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); DECLARE_WRITE_LINE_MEMBER(thom_vblank); - DECLARE_VIDEO_START( thom ); + void video_start_thom() ATTR_COLD; DECLARE_READ8_MEMBER( to7_5p14_r ); DECLARE_WRITE8_MEMBER( to7_5p14_w ); diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h index 7cbbb239274..3ea93115b9b 100644 --- a/src/mame/includes/ti85.h +++ b/src/mame/includes/ti85.h @@ -171,14 +171,14 @@ public: virtual void machine_start() override; virtual void video_start() override; DECLARE_PALETTE_INIT(ti85); - DECLARE_MACHINE_RESET(ti85); - DECLARE_MACHINE_RESET(ti83p); + void machine_reset_ti85(); + void machine_reset_ti83p(); DECLARE_PALETTE_INIT(ti82); - DECLARE_MACHINE_START(ti86); - DECLARE_MACHINE_START(ti83p); - DECLARE_MACHINE_START(ti83pse); - DECLARE_MACHINE_START(ti84pse); - DECLARE_MACHINE_START(ti84p); + void machine_start_ti86() ATTR_COLD; + void machine_start_ti83p() ATTR_COLD; + void machine_start_ti83pse() ATTR_COLD; + void machine_start_ti84pse() ATTR_COLD; + void machine_start_ti84p() ATTR_COLD; void ti8xpse_init_common(); uint32_t screen_update_ti85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 21164bbea73..17f66776ef1 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -53,7 +53,7 @@ public: TILE_GET_INFO_MEMBER(get_bg2_tile_info); virtual void machine_reset() override; virtual void video_start() override; - DECLARE_VIDEO_START(kot); + void video_start_kot() ATTR_COLD; DECLARE_PALETTE_INIT(tiamc1); uint32_t screen_update_tiamc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_kot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index c1b841dfe45..115efce8b3b 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -74,8 +74,8 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(timeplt); - DECLARE_VIDEO_START(chkun); - DECLARE_VIDEO_START(psurge); + void video_start_chkun() ATTR_COLD; + void video_start_psurge() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index b921a4d7c42..1d7401acde7 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -144,17 +144,17 @@ public: void init_cuebrick(); TILE_GET_INFO_MEMBER(glfgreat_get_roz_tile_info); TILE_GET_INFO_MEMBER(prmrsocr_get_roz_tile_info); - DECLARE_MACHINE_START(common); - DECLARE_MACHINE_RESET(common); - DECLARE_VIDEO_START(cuebrick); - DECLARE_VIDEO_START(mia); - DECLARE_MACHINE_RESET(tmnt); - DECLARE_VIDEO_START(tmnt); - DECLARE_VIDEO_START(lgtnfght); - DECLARE_VIDEO_START(blswhstl); - DECLARE_VIDEO_START(glfgreat); - DECLARE_MACHINE_START(prmrsocr); - DECLARE_VIDEO_START(prmrsocr); + void machine_start_common() ATTR_COLD; + void machine_reset_common(); + void video_start_cuebrick() ATTR_COLD; + void video_start_mia() ATTR_COLD; + void machine_reset_tmnt(); + void video_start_tmnt() ATTR_COLD; + void video_start_lgtnfght() ATTR_COLD; + void video_start_blswhstl() ATTR_COLD; + void video_start_glfgreat() ATTR_COLD; + void machine_start_prmrsocr() ATTR_COLD; + void video_start_prmrsocr() ATTR_COLD; uint32_t screen_update_mia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_tmnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_punkshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index ba15ac91114..85f48cbaf77 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -181,7 +181,7 @@ public: DECLARE_READ8_MEMBER(csport_r); DECLARE_WRITE8_MEMBER(csport_w); - DECLARE_MACHINE_RESET(kageki); + void machine_reset_kageki(); void init_kageki(); SAMPLES_START_CB_MEMBER(init_samples); diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 195d5f47c60..b78de0f279d 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -133,11 +133,11 @@ public: TILE_GET_INFO_MEMBER(get_pf2_tile_info); TILE_GET_INFO_MEMBER(get_pf3_tile_info); TILE_GET_INFO_MEMBER(get_pf4_tile_info); - DECLARE_MACHINE_RESET(toaplan1); - DECLARE_VIDEO_START(toaplan1); - DECLARE_MACHINE_RESET(zerowing); - DECLARE_MACHINE_RESET(demonwld); - DECLARE_MACHINE_RESET(vimana); + void machine_reset_toaplan1(); + void video_start_toaplan1() ATTR_COLD; + void machine_reset_zerowing(); + void machine_reset_demonwld(); + void machine_reset_vimana(); uint32_t screen_update_toaplan1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_toaplan1); @@ -207,7 +207,7 @@ public: DECLARE_WRITE_LINE_MEMBER(coin_lockout_1_w); DECLARE_WRITE_LINE_MEMBER(coin_lockout_2_w); DECLARE_READ16_MEMBER(rallybik_tileram16_r); - DECLARE_VIDEO_START(rallybik); + void video_start_rallybik() ATTR_COLD; uint32_t screen_update_rallybik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_rallybik); diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index bc96b7d3362..584c0500665 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -125,14 +125,14 @@ public: void init_enmadaio(); TILE_GET_INFO_MEMBER(get_text_tile_info); virtual void machine_start() override; - DECLARE_MACHINE_RESET(toaplan2); - DECLARE_VIDEO_START(toaplan2); - DECLARE_MACHINE_RESET(ghox); - DECLARE_VIDEO_START(truxton2); - DECLARE_VIDEO_START(fixeightbl); - DECLARE_VIDEO_START(bgaregga); - DECLARE_VIDEO_START(bgareggabl); - DECLARE_VIDEO_START(batrider); + void machine_reset_toaplan2(); + void video_start_toaplan2() ATTR_COLD; + void machine_reset_ghox(); + void video_start_truxton2() ATTR_COLD; + void video_start_fixeightbl() ATTR_COLD; + void video_start_bgaregga() ATTR_COLD; + void video_start_bgareggabl() ATTR_COLD; + void video_start_batrider() ATTR_COLD; // Teki Paki sound DECLARE_READ8_MEMBER(tekipaki_cmdavailable_r); diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 4986bdee134..ec55f766e06 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -97,11 +97,11 @@ private: DECLARE_WRITE_LINE_MEMBER(flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_MACHINE_START(trackfld); - DECLARE_MACHINE_RESET(trackfld); - DECLARE_VIDEO_START(trackfld); + void machine_start_trackfld() ATTR_COLD; + void machine_reset_trackfld(); + void video_start_trackfld() ATTR_COLD; DECLARE_PALETTE_INIT(trackfld); - DECLARE_VIDEO_START(atlantol); + void video_start_atlantol() ATTR_COLD; uint32_t screen_update_trackfld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); DECLARE_WRITE_LINE_MEMBER(vblank_nmi); diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 699af1e4243..f52c8ea5d9d 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -115,9 +115,9 @@ public: TIMER_CALLBACK_MEMBER(cassette_data_callback); DECLARE_WRITE_LINE_MEMBER(trs80_fdc_intrq_w); DECLARE_QUICKLOAD_LOAD_MEMBER( trs80_cmd ); - DECLARE_MACHINE_RESET(trs80m4); - DECLARE_MACHINE_RESET(lnw80); - DECLARE_MACHINE_RESET(cp500); + void machine_reset_trs80m4(); + void machine_reset_lnw80(); + void machine_reset_cp500(); DECLARE_PALETTE_INIT(lnw80); uint32_t screen_update_trs80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_trs80m4(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index c34255e577d..86731521e41 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -58,12 +58,12 @@ public: DECLARE_READ8_MEMBER(vsgongf_a100_r); DECLARE_WRITE8_MEMBER(vsgongf_sound_command_w); - DECLARE_MACHINE_START(m660); - DECLARE_MACHINE_START(tsamurai); - DECLARE_MACHINE_START(vsgongf); - DECLARE_VIDEO_START(m660); - DECLARE_VIDEO_START(tsamurai); - DECLARE_VIDEO_START(vsgongf); + void machine_start_m660() ATTR_COLD; + void machine_start_tsamurai() ATTR_COLD; + void machine_start_vsgongf() ATTR_COLD; + void video_start_m660() ATTR_COLD; + void video_start_tsamurai() ATTR_COLD; + void video_start_vsgongf() ATTR_COLD; void init_the26thz(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index f1cd24684f5..ef64d116ea7 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -86,13 +86,13 @@ public: DECLARE_WRITE8_MEMBER(ay8910_portB_1_w); DECLARE_WRITE8_MEMBER(ay8910_portA_2_w); DECLARE_WRITE8_MEMBER(ay8910_portB_2_w); - DECLARE_MACHINE_START(tubep); - DECLARE_MACHINE_RESET(tubep); + void machine_start_tubep() ATTR_COLD; + void machine_reset_tubep(); virtual void video_start() override; virtual void video_reset() override; DECLARE_PALETTE_INIT(tubep); - DECLARE_MACHINE_START(rjammer); - DECLARE_MACHINE_RESET(rjammer); + void machine_start_rjammer() ATTR_COLD; + void machine_reset_rjammer(); DECLARE_PALETTE_INIT(rjammer); uint32_t screen_update_tubep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_rjammer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 827a4e55927..1f6e74230ab 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -102,14 +102,14 @@ public: TILE_GET_INFO_MEMBER(pangpang_get_bg1_tile_info); TILE_GET_INFO_MEMBER(pangpang_get_bg2_tile_info); TILE_GET_INFO_MEMBER(pangpang_get_fg_tile_info); - DECLARE_MACHINE_START(tumbleb); - DECLARE_MACHINE_RESET(tumbleb); - DECLARE_VIDEO_START(tumblepb); - DECLARE_VIDEO_START(fncywld); - DECLARE_MACHINE_RESET(htchctch); - DECLARE_VIDEO_START(suprtrio); - DECLARE_VIDEO_START(pangpang); - DECLARE_VIDEO_START(sdfight); + void machine_start_tumbleb() ATTR_COLD; + void machine_reset_tumbleb(); + void video_start_tumblepb() ATTR_COLD; + void video_start_fncywld() ATTR_COLD; + void machine_reset_htchctch(); + void video_start_suprtrio() ATTR_COLD; + void video_start_pangpang() ATTR_COLD; + void video_start_sdfight() ATTR_COLD; uint32_t screen_update_tumblepb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_jumpkids(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_fncywld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index e14e4f89ea1..0e1ed280237 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -164,11 +164,11 @@ public: void init_turbo_enc(); void init_turbo_noenc(); TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_VIDEO_START(turbo); + void video_start_turbo() ATTR_COLD; DECLARE_PALETTE_INIT(turbo); DECLARE_PALETTE_INIT(subroc3d); - DECLARE_MACHINE_RESET(buckrog); - DECLARE_VIDEO_START(buckrog); + void machine_reset_buckrog(); + void video_start_buckrog() ATTR_COLD; DECLARE_PALETTE_INIT(buckrog); uint32_t screen_update_turbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_subroc3d(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 1b989a31c69..9963eacea9c 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -105,8 +105,8 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); - DECLARE_MACHINE_RESET(twincobr); - DECLARE_VIDEO_START(toaplan0); + void machine_reset_twincobr(); + void video_start_toaplan0() ATTR_COLD; uint32_t screen_update_toaplan0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(twincobr_vblank_irq); DECLARE_WRITE_LINE_MEMBER(wardner_vblank_irq); diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index 58e8a081144..1d5d175e6fc 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -195,13 +195,13 @@ public: DECLARE_WRITE8_MEMBER(bb_coin_cnt_w); DECLARE_READ8_MEMBER(tx1_ppi_porta_r); DECLARE_READ8_MEMBER(tx1_ppi_portb_r); - DECLARE_MACHINE_RESET(tx1); - DECLARE_VIDEO_START(tx1); + void machine_reset_tx1(); + void video_start_tx1() ATTR_COLD; DECLARE_PALETTE_INIT(tx1); - DECLARE_MACHINE_RESET(buggyboy); - DECLARE_VIDEO_START(buggyboy); + void machine_reset_buggyboy(); + void video_start_buggyboy() ATTR_COLD; DECLARE_PALETTE_INIT(buggyboy); - DECLARE_VIDEO_START(buggybjr); + void video_start_buggybjr() ATTR_COLD; void tx1_draw_char(uint8_t *bitmap); void tx1_draw_road_pixel(int screen, uint8_t *bmpaddr, diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h index cf55789a581..82318cf8bb0 100644 --- a/src/mame/includes/ut88.h +++ b/src/mame/includes/ut88.h @@ -60,10 +60,10 @@ public: DECLARE_WRITE8_MEMBER(ut88_8255_porta_w); void init_ut88(); void init_ut88mini(); - DECLARE_MACHINE_RESET(ut88); - DECLARE_VIDEO_START(ut88); - DECLARE_MACHINE_START(ut88mini); - DECLARE_MACHINE_RESET(ut88mini); + void machine_reset_ut88(); + void video_start_ut88() ATTR_COLD; + void machine_start_ut88mini() ATTR_COLD; + void machine_reset_ut88mini(); uint32_t screen_update_ut88(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ut88(machine_config &config); diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index e37d4db8e83..51a11cdf5d7 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -86,7 +86,7 @@ public: DECLARE_READ8_MEMBER(headon_io_r); DECLARE_READ8_MEMBER(sspaceat_io_r); DECLARE_WRITE8_MEMBER(headon_io_w); - DECLARE_MACHINE_RESET(headon2); + void machine_reset_headon2(); DECLARE_READ8_MEMBER(headon2_io_r); DECLARE_WRITE8_MEMBER(headon2_io_w); DECLARE_WRITE8_MEMBER(digger_io_w); @@ -147,8 +147,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(clear_coin_status); - DECLARE_MACHINE_START(samurai); - DECLARE_MACHINE_START(frogs_audio); + void machine_start_samurai() ATTR_COLD; + void machine_start_frogs_audio() ATTR_COLD; virtual void machine_start() override; @@ -247,8 +247,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(nsub_coin_pulse); - DECLARE_MACHINE_START(nsub); - DECLARE_MACHINE_RESET(nsub); + void machine_start_nsub() ATTR_COLD; + void machine_reset_nsub(); virtual pen_t choose_pen(uint8_t x, uint8_t y, pen_t back_pen) override; void nsub(machine_config &config); diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index c5c47a1ad98..94295496252 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -77,14 +77,14 @@ public: void init_platoon(); void init_rbibb(); void init_vsdual(); - DECLARE_MACHINE_START(vsnes); - DECLARE_MACHINE_RESET(vsnes); - DECLARE_MACHINE_START(vsdual); - DECLARE_MACHINE_RESET(vsdual); - void v_set_videorom_bank( int start, int count, int vrom_start_bank ); - void mapper4_set_prg( ); - void mapper4_set_chr( ); - void mapper4_irq( int scanline, int vblank, int blanked ); + void machine_start_vsnes() ATTR_COLD; + void machine_reset_vsnes(); + void machine_start_vsdual() ATTR_COLD; + void machine_reset_vsdual(); + void v_set_videorom_bank(int start, int count, int vrom_start_bank); + void mapper4_set_prg(); + void mapper4_set_chr(); + void mapper4_irq(int scanline, int vblank, int blanked); DECLARE_READ8_MEMBER( vsnes_bootleg_z80_latch_r ); DECLARE_WRITE8_MEMBER(bootleg_sound_write); diff --git a/src/mame/includes/vtech2.h b/src/mame/includes/vtech2.h index 0b6f0a3201c..3eabc0c54fd 100644 --- a/src/mame/includes/vtech2.h +++ b/src/mame/includes/vtech2.h @@ -64,8 +64,8 @@ public: virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(vtech2); - DECLARE_MACHINE_RESET(laser500); - DECLARE_MACHINE_RESET(laser700); + void machine_reset_laser500(); + void machine_reset_laser700(); uint32_t screen_update_laser(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vtech2_interrupt); diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 41d5b6bb0ca..7fbd929ecf6 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -74,7 +74,7 @@ public: DECLARE_WRITE8_MEMBER(geebee_videoram_w); virtual void machine_start() override; - DECLARE_MACHINE_RESET(kaitei); + void machine_reset_kaitei(); void init_navarone(); void init_geebee(); void init_kaitein(); @@ -82,11 +82,11 @@ public: void init_sos(); void init_kaitei(); void init_bombbee(); - DECLARE_VIDEO_START(geebee); + void video_start_geebee() ATTR_COLD; DECLARE_PALETTE_INIT(geebee); - DECLARE_VIDEO_START(warpwarp); + void video_start_warpwarp() ATTR_COLD; DECLARE_PALETTE_INIT(warpwarp); - DECLARE_VIDEO_START(navarone); + void video_start_navarone() ATTR_COLD; DECLARE_PALETTE_INIT(navarone); TILEMAP_MAPPER_MEMBER(tilemap_scan); diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 5a9e80cd80c..d4716cb76eb 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -76,7 +76,7 @@ public: virtual void machine_start() override; virtual void video_start() override; - DECLARE_VIDEO_START(wc90t); + void video_start_wc90t() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void wc90t(machine_config &config); diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index a0532cc7335..ef7f6cffb35 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -103,13 +103,13 @@ public: TILE_GET_INFO_MEMBER(wecleman_get_bg_tile_info); TILE_GET_INFO_MEMBER(wecleman_get_fg_tile_info); - DECLARE_MACHINE_START(wecleman); - DECLARE_MACHINE_RESET(wecleman); - DECLARE_VIDEO_START(wecleman); + void machine_start_wecleman() ATTR_COLD; + void machine_reset_wecleman(); + void video_start_wecleman() ATTR_COLD; - DECLARE_MACHINE_START(hotchase); - DECLARE_MACHINE_RESET(hotchase); - DECLARE_VIDEO_START(hotchase); + void machine_start_hotchase() ATTR_COLD; + void machine_reset_hotchase(); + void video_start_hotchase() ATTR_COLD; uint32_t screen_update_wecleman(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_hotchase(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 348912942f2..01807d0426c 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -52,7 +52,7 @@ public: DECLARE_WRITE16_MEMBER(piv_ctrl_word_w); void init_wgp(); void init_wgp2(); - DECLARE_VIDEO_START(wgp2); + void video_start_wgp2() ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cpub_interrupt); diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 0440a80209b..b5c94abed0e 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -86,13 +86,13 @@ public: void init_alienar(); void init_robotron(); void init_bubbles(); - DECLARE_MACHINE_START(defender); - DECLARE_MACHINE_RESET(defender); - DECLARE_VIDEO_START(williams); - DECLARE_MACHINE_START(williams); - DECLARE_MACHINE_RESET(williams); - DECLARE_MACHINE_START(williams_common); - DECLARE_MACHINE_RESET(williams_common); + void machine_start_defender() ATTR_COLD; + void machine_reset_defender(); + void video_start_williams() ATTR_COLD; + void machine_start_williams() ATTR_COLD; + void machine_reset_williams(); + void machine_start_williams_common() ATTR_COLD; + void machine_reset_williams_common(); uint32_t screen_update_williams(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(williams_count240_off_callback); TIMER_CALLBACK_MEMBER(williams_deferred_snd_cmd_w); @@ -169,9 +169,9 @@ public: DECLARE_WRITE_LINE_MEMBER(williams_snd_irq_b); void init_blaster(); - DECLARE_MACHINE_START(blaster); - DECLARE_MACHINE_RESET(blaster); - DECLARE_VIDEO_START(blaster); + void machine_start_blaster() ATTR_COLD; + void machine_reset_blaster(); + void video_start_blaster() ATTR_COLD; uint32_t screen_update_blaster(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); inline void update_blaster_banking(); @@ -222,9 +222,9 @@ public: void init_mysticm(); void init_tshoot(); void init_inferno(); - DECLARE_MACHINE_START(williams2); - DECLARE_MACHINE_RESET(williams2); - DECLARE_VIDEO_START(williams2); + void machine_start_williams2() ATTR_COLD; + void machine_reset_williams2(); + void video_start_williams2() ATTR_COLD; uint32_t screen_update_williams2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void williams2(machine_config &config); void mysticm(machine_config &config); @@ -264,8 +264,8 @@ public: uint16_t m_joust2_current_sound_data; void init_joust2(); - DECLARE_MACHINE_START(joust2); - DECLARE_MACHINE_RESET(joust2); + void machine_start_joust2() ATTR_COLD; + void machine_reset_joust2(); TIMER_CALLBACK_MEMBER(joust2_deferred_snd_cmd_w); DECLARE_WRITE8_MEMBER(joust2_snd_cmd_w); DECLARE_WRITE_LINE_MEMBER(joust2_pia_3_cb1_w); diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h index 7a1235b1446..d0dbc3437f3 100644 --- a/src/mame/includes/x1.h +++ b/src/mame/includes/x1.h @@ -132,11 +132,11 @@ public: DECLARE_WRITE8_MEMBER(x1_portb_w); DECLARE_WRITE8_MEMBER(x1_portc_w); void init_x1_kanji(); - DECLARE_MACHINE_START(x1); - DECLARE_MACHINE_RESET(x1); - DECLARE_VIDEO_START(x1); + void machine_start_x1() ATTR_COLD; + void machine_reset_x1(); + void video_start_x1() ATTR_COLD; DECLARE_PALETTE_INIT(x1); - DECLARE_MACHINE_RESET(x1turbo); + void machine_reset_x1turbo(); uint32_t screen_update_x1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_INPUT_CHANGED_MEMBER(ipl_reset); DECLARE_INPUT_CHANGED_MEMBER(nmi_reset); diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index 6339113c26b..cfea327023a 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -272,7 +272,7 @@ public: TILE_GET_INFO_MEMBER(x68k_get_bg1_tile); TILE_GET_INFO_MEMBER(x68k_get_bg0_tile_16); TILE_GET_INFO_MEMBER(x68k_get_bg1_tile_16); - DECLARE_VIDEO_START(x68000); + void video_start_x68000() ATTR_COLD; DECLARE_PALETTE_INIT(x68000); uint32_t screen_update_x68000(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(x68k_led_callback); diff --git a/src/mame/includes/xevious.h b/src/mame/includes/xevious.h index 6bc6b9235dc..129320f8567 100644 --- a/src/mame/includes/xevious.h +++ b/src/mame/includes/xevious.h @@ -33,10 +33,10 @@ public: void init_battles(); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_VIDEO_START(xevious); + void video_start_xevious() ATTR_COLD; DECLARE_PALETTE_INIT(xevious); - DECLARE_MACHINE_RESET(xevios); - DECLARE_MACHINE_RESET(battles); + void machine_reset_xevios(); + void machine_reset_battles(); uint32_t screen_update_xevious(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(battles_interrupt_4); TIMER_DEVICE_CALLBACK_MEMBER(battles_nmi_generate); diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index ea8afb8f7a3..4bf55c0b37b 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -64,7 +64,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(xmen_frame_r); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_VIDEO_START(xmen6p); + void video_start_xmen6p() ATTR_COLD; uint32_t screen_update_xmen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_xmen6p_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_xmen6p_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 60f74432c84..5ba727f3dd9 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -55,8 +55,8 @@ public: DECLARE_WRITE16_MEMBER(vram_0_w); DECLARE_WRITE16_MEMBER(vram_1_w); void init_magicbub(); - DECLARE_MACHINE_START(shocking); - DECLARE_MACHINE_RESET(shocking); + void machine_start_shocking() ATTR_COLD; + void machine_reset_shocking(); TILEMAP_MAPPER_MEMBER(tilemap_scan_pages); TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index bddb77dc363..0339c9e9d27 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -111,13 +111,13 @@ public: void init_z80net(); void init_z80netb(); void init_z80ne(); - DECLARE_MACHINE_START(z80ne); - DECLARE_MACHINE_RESET(z80ne); - DECLARE_MACHINE_START(z80netb); - DECLARE_MACHINE_RESET(z80netb); - DECLARE_MACHINE_START(z80net); - DECLARE_MACHINE_RESET(z80net); - DECLARE_MACHINE_RESET(z80ne_base); + void machine_start_z80ne() ATTR_COLD; + void machine_reset_z80ne(); + void machine_start_z80netb() ATTR_COLD; + void machine_reset_z80netb(); + void machine_start_z80net() ATTR_COLD; + void machine_reset_z80net(); + void machine_reset_z80ne_base(); DECLARE_INPUT_CHANGED_MEMBER(z80ne_reset); DECLARE_INPUT_CHANGED_MEMBER(z80ne_nmi); TIMER_CALLBACK_MEMBER(z80ne_cassette_tc); @@ -186,8 +186,8 @@ private: void z80netf_io(address_map &map); void z80netf_mem(address_map &map); - DECLARE_MACHINE_START(z80netf); - DECLARE_MACHINE_RESET(z80netf); + void machine_start_z80netf() ATTR_COLD; + void machine_reset_z80netf(); DECLARE_WRITE8_MEMBER(lx390_motor_w); DECLARE_READ8_MEMBER(lx390_reset_bank); diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index e72bd6c2c1d..9b89c587a47 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -87,8 +87,8 @@ public: virtual void machine_start() override; virtual void video_start() override; DECLARE_PALETTE_INIT(zaxxon); - DECLARE_VIDEO_START(razmataz); - DECLARE_VIDEO_START(congo); + void video_start_razmataz() ATTR_COLD; + void video_start_congo() ATTR_COLD; uint32_t screen_update_zaxxon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_futspy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_razmataz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/machine/3do.cpp b/src/mame/machine/3do.cpp index ea3a5a1fa96..15954e1ebe0 100644 --- a/src/mame/machine/3do.cpp +++ b/src/mame/machine/3do.cpp @@ -1030,7 +1030,7 @@ WRITE32_MEMBER(_3do_state::_3do_clio_w) /* 9 -> 5 bits translation */ -VIDEO_START_MEMBER(_3do_state,_3do) +void _3do_state::video_start__3do() { /* We only keep the odd bits and get rid of the even bits */ // for ( int i = 0; i < 512; i++ ) diff --git a/src/mame/machine/aim65.cpp b/src/mame/machine/aim65.cpp index 5f449393fb8..2bfb5204291 100644 --- a/src/mame/machine/aim65.cpp +++ b/src/mame/machine/aim65.cpp @@ -300,7 +300,7 @@ DRIVER_MEMBER(aim65_state, aim65_printer_on), // out CB2 /* From Machine Config - MCFG_VIDEO_START_OVERRIDE(aim65_state,aim65) + set_video_start_cb(config, driver_callback_delegate(&video_start_aim65, this)); MCFG_VIDEO_UPDATE(aim65) */ @@ -371,12 +371,12 @@ WRITE8_MEMBER( aim65_state::aim65_pa_w ) } } -VIDEO_START_MEMBER(aim65_state,aim65) +void aim65_state::video_start_aim65() { m_print_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(aim65_state::aim65_printer_timer),this)); m_printerRAM = std::make_unique<uint16_t[]>((600 * 10 * 2) / 2); memset(m_printerRAM, 0, videoram_size); - VIDEO_START_CALL_MEMBER(generic); + video_start_generic(); m_printer_x = 0; m_printer_y = 0; m_printer_dir = 0; diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp index 0725ab3142e..5ed1e0e7324 100644 --- a/src/mame/machine/amstrad.cpp +++ b/src/mame/machine/amstrad.cpp @@ -1085,7 +1085,7 @@ WRITE_LINE_MEMBER(amstrad_state::amstrad_plus_de_changed) } -VIDEO_START_MEMBER(amstrad_state,amstrad) +void amstrad_state::video_start_amstrad() { amstrad_init_lookups(); @@ -3116,14 +3116,14 @@ TIMER_CALLBACK_MEMBER(amstrad_state::cb_set_resolution) } -MACHINE_START_MEMBER(amstrad_state,amstrad) +void amstrad_state::machine_start_amstrad() { m_system_type = SYSTEM_CPC; m_centronics->write_data7(0); } -MACHINE_RESET_MEMBER(amstrad_state,amstrad) +void amstrad_state::machine_reset_amstrad() { amstrad_common_init(); amstrad_reset_machine(); @@ -3138,7 +3138,7 @@ MACHINE_RESET_MEMBER(amstrad_state,amstrad) } -MACHINE_START_MEMBER(amstrad_state,plus) +void amstrad_state::machine_start_plus() { m_asic.ram = m_region_user1->base(); // 16kB RAM for ASIC, memory-mapped registers. m_system_type = SYSTEM_PLUS; @@ -3153,7 +3153,7 @@ MACHINE_START_MEMBER(amstrad_state,plus) } -MACHINE_RESET_MEMBER(amstrad_state,plus) +void amstrad_state::machine_reset_plus() { address_space &space = m_maincpu->space(AS_PROGRAM); @@ -3185,7 +3185,7 @@ MACHINE_RESET_MEMBER(amstrad_state,plus) timer_set(attotime::zero, TIMER_SET_RESOLUTION); } -MACHINE_START_MEMBER(amstrad_state,gx4000) +void amstrad_state::machine_start_gx4000() { m_asic.ram = m_region_user1->base(); // 16kB RAM for ASIC, memory-mapped registers. m_system_type = SYSTEM_GX4000; @@ -3196,7 +3196,7 @@ MACHINE_START_MEMBER(amstrad_state,gx4000) m_region_cart = memregion("maincpu"); } -MACHINE_RESET_MEMBER(amstrad_state,gx4000) +void amstrad_state::machine_reset_gx4000() { address_space &space = m_maincpu->space(AS_PROGRAM); @@ -3227,7 +3227,7 @@ MACHINE_RESET_MEMBER(amstrad_state,gx4000) timer_set(attotime::zero, TIMER_SET_RESOLUTION); } -MACHINE_START_MEMBER(amstrad_state,kccomp) +void amstrad_state::machine_start_kccomp() { m_system_type = SYSTEM_CPC; m_centronics->write_data7(0); @@ -3241,7 +3241,7 @@ MACHINE_START_MEMBER(amstrad_state,kccomp) } -MACHINE_RESET_MEMBER(amstrad_state,kccomp) +void amstrad_state::machine_reset_kccomp() { amstrad_common_init(); kccomp_reset_machine(); @@ -3256,13 +3256,13 @@ MACHINE_RESET_MEMBER(amstrad_state,kccomp) } -MACHINE_START_MEMBER(amstrad_state,aleste) +void amstrad_state::machine_start_aleste() { m_system_type = SYSTEM_ALESTE; m_centronics->write_data7(0); } -MACHINE_RESET_MEMBER(amstrad_state,aleste) +void amstrad_state::machine_reset_aleste() { amstrad_common_init(); amstrad_reset_machine(); diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index 5087cf81a0d..5bc8c6975a4 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -1190,7 +1190,7 @@ void apollo_state::init_apollo() MLOG1(("driver_init_apollo")); } -MACHINE_START_MEMBER(apollo_state,apollo) +void apollo_state::machine_start_apollo() { MLOG1(("machine_start_apollo")); @@ -1205,7 +1205,7 @@ MACHINE_START_MEMBER(apollo_state,apollo) m_cur_eop = false; } -MACHINE_RESET_MEMBER(apollo_state,apollo) +void apollo_state::machine_reset_apollo() { address_space &space = m_maincpu->space(AS_PROGRAM); uint8_t year = apollo_rtc_r(space, 9); diff --git a/src/mame/machine/apple2.cpp b/src/mame/machine/apple2.cpp index a555b69d9f4..b867c3c3fae 100644 --- a/src/mame/machine/apple2.cpp +++ b/src/mame/machine/apple2.cpp @@ -2186,21 +2186,21 @@ void apple2_state::apple2eplus_init_common(void *apple2cp_ce00_ram) apple2_setup_memory(&mem_cfg); } -MACHINE_START_MEMBER(apple2_state,apple2c) +void apple2_state::machine_start_apple2c() { m_machinetype = APPLE_IIC; apple2eplus_init_common((void *)nullptr); } -MACHINE_START_MEMBER(apple2_state,tk3000) +void apple2_state::machine_start_tk3000() { m_machinetype = TK3000; // enhanced IIe clone with Z80 keyboard scanner subcpu apple2eplus_init_common((void *)nullptr); } -MACHINE_START_MEMBER(apple2_state,apple2cp) +void apple2_state::machine_start_apple2cp() { void *apple2cp_ce00_ram; @@ -2215,7 +2215,7 @@ MACHINE_START_MEMBER(apple2_state,apple2cp) apple2eplus_init_common(apple2cp_ce00_ram); } -MACHINE_START_MEMBER(apple2_state,apple2e) +void apple2_state::machine_start_apple2e() { apple2_memmap_config mem_cfg; @@ -2233,7 +2233,7 @@ MACHINE_START_MEMBER(apple2_state,apple2e) apple2_setup_memory(&mem_cfg); } -MACHINE_START_MEMBER(apple2_state,laser128) +void apple2_state::machine_start_laser128() { apple2_memmap_config mem_cfg; @@ -2264,7 +2264,7 @@ MACHINE_START_MEMBER(apple2_state,laser128) apple2_setup_memory(&mem_cfg); } -MACHINE_START_MEMBER(apple2_state,apple2orig) +void apple2_state::machine_start_apple2orig() { apple2_memmap_config mem_cfg; void *apple2cp_ce00_ram = nullptr; @@ -2284,7 +2284,7 @@ MACHINE_START_MEMBER(apple2_state,apple2orig) apple2_setup_memory(&mem_cfg); } -MACHINE_START_MEMBER(apple2_state,space84) +void apple2_state::machine_start_space84() { apple2_memmap_config mem_cfg; void *apple2cp_ce00_ram = nullptr; @@ -2304,7 +2304,7 @@ MACHINE_START_MEMBER(apple2_state,space84) apple2_setup_memory(&mem_cfg); } -MACHINE_START_MEMBER(apple2_state,laba2p) +void apple2_state::machine_start_laba2p() { apple2_memmap_config mem_cfg; void *apple2cp_ce00_ram = nullptr; @@ -2324,7 +2324,7 @@ MACHINE_START_MEMBER(apple2_state,laba2p) apple2_setup_memory(&mem_cfg); } -MACHINE_START_MEMBER(apple2_state,tk2000) +void apple2_state::machine_start_tk2000() { apple2_memmap_config mem_cfg; diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp index 0da3f10e41d..aa8dfdb3e79 100644 --- a/src/mame/machine/apple2gs.cpp +++ b/src/mame/machine/apple2gs.cpp @@ -1916,7 +1916,7 @@ READ8_MEMBER(apple2gs_state::apple2gs_read_vector) return m_maincpu->space(AS_PROGRAM).read_byte(offset | 0xFFFFE0); } -MACHINE_RESET_MEMBER(apple2gs_state,apple2gs) +void apple2gs_state::machine_reset_apple2gs() { apple2gs_refresh_delegates(); @@ -1971,7 +1971,7 @@ MACHINE_RESET_MEMBER(apple2gs_state,apple2gs) m_last_adb_time = 0; } -MACHINE_START_MEMBER(apple2gs_state,apple2gscommon) +void apple2gs_state::machine_start_apple2gscommon() { apple2gs_refresh_delegates(); @@ -2045,15 +2045,15 @@ MACHINE_START_MEMBER(apple2gs_state,apple2gscommon) m_scanline_timer->adjust(m_screen->time_until_pos(0, 0)); } -MACHINE_START_MEMBER(apple2gs_state,apple2gs) +void apple2gs_state::machine_start_apple2gs() { - MACHINE_START_CALL_MEMBER(apple2gscommon); + machine_start_apple2gscommon(); apple2gs_setup_memory(); } -MACHINE_START_MEMBER(apple2gs_state,apple2gsr1) +void apple2gs_state::machine_start_apple2gsr1() { - MACHINE_START_CALL_MEMBER(apple2gscommon); + machine_start_apple2gscommon(); m_is_rom3 = false; apple2gs_setup_memory(); diff --git a/src/mame/machine/apple3.cpp b/src/mame/machine/apple3.cpp index 43c7bc75581..4be02df88f9 100644 --- a/src/mame/machine/apple3.cpp +++ b/src/mame/machine/apple3.cpp @@ -658,7 +658,7 @@ WRITE_LINE_MEMBER(apple3_state::apple3_via_0_irq_func) apple3_irq_update(); } -MACHINE_RESET_MEMBER(apple3_state,apple3) +void apple3_state::machine_reset_apple3() { m_indir_bank = 0; m_sync = false; diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp index d05e88cb305..f53b87443d0 100644 --- a/src/mame/machine/bbc.cpp +++ b/src/mame/machine/bbc.cpp @@ -1575,14 +1575,14 @@ void bbc_state::bbcm_setup_banks(memory_bank *membank, int banks, uint32_t shift } } -MACHINE_START_MEMBER(bbc_state, bbca) +void bbc_state::machine_start_bbca() { m_machinetype = MODELA; bbc_setup_banks(m_bank4, 4, 0, 0x4000); } -MACHINE_RESET_MEMBER(bbc_state, bbca) +void bbc_state::machine_reset_bbca() { m_monitortype = m_bbcconfig.read_safe(0) & 0x03; m_swramtype = (m_bbcconfig.read_safe(0) & 0x0c) >> 2; @@ -1605,14 +1605,14 @@ MACHINE_RESET_MEMBER(bbc_state, bbca) bbcb_IC32_initialise(this); } -MACHINE_START_MEMBER(bbc_state, bbcb) +void bbc_state::machine_start_bbcb() { m_machinetype = MODELB; m_mc6850_clock = 0; bbc_setup_banks(m_bank4, 16, 0, 0x4000); } -MACHINE_RESET_MEMBER(bbc_state, bbcb) +void bbc_state::machine_reset_bbcb() { m_monitortype = m_bbcconfig.read_safe(0) & 0x03; m_swramtype = (m_bbcconfig.read_safe(0) & 0x0c) >> 2; @@ -1627,16 +1627,16 @@ MACHINE_RESET_MEMBER(bbc_state, bbcb) } -MACHINE_RESET_MEMBER(bbc_state, torch) +void bbc_state::machine_reset_torch() { - MACHINE_RESET_CALL_MEMBER(bbcb); + machine_reset_bbcb(); m_monitortype = monitor_type_t::COLOUR; m_swramtype = 0; } -MACHINE_START_MEMBER(bbc_state, bbcbp) +void bbc_state::machine_start_bbcbp() { m_machinetype = BPLUS; m_mc6850_clock = 0; @@ -1646,7 +1646,7 @@ MACHINE_START_MEMBER(bbc_state, bbcbp) bbc_setup_banks(m_bank6, 16, 0x3000, 0x1000); } -MACHINE_RESET_MEMBER(bbc_state, bbcbp) +void bbc_state::machine_reset_bbcbp() { m_monitortype = m_bbcconfig.read_safe(0) & 0x03; m_swramtype = 0; @@ -1661,7 +1661,7 @@ MACHINE_RESET_MEMBER(bbc_state, bbcbp) } -MACHINE_START_MEMBER(bbc_state, bbcm) +void bbc_state::machine_start_bbcm() { m_machinetype = MASTER; m_mc6850_clock = 0; @@ -1680,7 +1680,7 @@ MACHINE_START_MEMBER(bbc_state, bbcm) output().set_value("power_led", 0); } -MACHINE_RESET_MEMBER(bbc_state, bbcm) +void bbc_state::machine_reset_bbcm() { m_monitortype = m_bbcconfig.read_safe(0) & 0x03; m_swramtype = 0; @@ -1695,39 +1695,39 @@ MACHINE_RESET_MEMBER(bbc_state, bbcm) } -MACHINE_START_MEMBER(bbc_state, bbcmc) +void bbc_state::machine_start_bbcmc() { - MACHINE_START_CALL_MEMBER(bbcm); + machine_start_bbcm(); m_machinetype = COMPACT; } -MACHINE_RESET_MEMBER(bbc_state, bbcmc) +void bbc_state::machine_reset_bbcmc() { - MACHINE_RESET_CALL_MEMBER(bbcm); + machine_reset_bbcm(); } -MACHINE_RESET_MEMBER(bbc_state, ltmpbp) +void bbc_state::machine_reset_ltmpbp() { - MACHINE_RESET_CALL_MEMBER(bbcbp); + machine_reset_bbcbp(); m_monitortype = monitor_type_t::GREEN; m_swramtype = 0; } -MACHINE_RESET_MEMBER(bbc_state, ltmpm) +void bbc_state::machine_reset_ltmpm() { - MACHINE_RESET_CALL_MEMBER(bbcm); + machine_reset_bbcm(); m_monitortype = monitor_type_t::GREEN; m_swramtype = 0; } -MACHINE_START_MEMBER(bbc_state, cfa3000) +void bbc_state::machine_start_cfa3000() { - MACHINE_START_CALL_MEMBER(bbcm); + machine_start_bbcm(); m_lk18_ic41_paged_rom = true; /* Link set for ROM in slots 6 and 7 */ m_lk19_ic37_paged_rom = true; /* Link set for ROM in slots 4 and 5 */ diff --git a/src/mame/machine/dc.cpp b/src/mame/machine/dc.cpp index 0108b7f6187..9d7491d95ee 100644 --- a/src/mame/machine/dc.cpp +++ b/src/mame/machine/dc.cpp @@ -747,7 +747,7 @@ WRITE_LINE_MEMBER(dc_state::sh4_aica_irq) dc_update_interrupt_status(); } -MACHINE_RESET_MEMBER(dc_state,dc_console) +void dc_state::machine_reset_dc_console() { dc_state::machine_reset(); m_maincpu->sh2drc_set_options(SH2DRC_STRICT_VERIFY | SH2DRC_STRICT_PCREL); diff --git a/src/mame/machine/decocass.cpp b/src/mame/machine/decocass.cpp index 140e928e2bd..9cf85d2f9de 100644 --- a/src/mame/machine/decocass.cpp +++ b/src/mame/machine/decocass.cpp @@ -429,7 +429,7 @@ static uint8_t type1_latch_16_pass_3_inv_1_table[8] = { T1PROM,T1LATCHINV,T1PROM static uint8_t type1_map1100[8] = { T1PROM,T1PROM,T1LATCHINV,T1PROM,T1DIRECT,T1PROM,T1LATCH,T1PROM }; -MACHINE_RESET_MEMBER(decocass_type1_state,cocean1a) /* 10 */ +void decocass_type1_state::machine_reset_cocean1a() /* 10 */ { machine_reset(); LOG(0,("dongle type #1 (DP-1100 map)\n")); @@ -460,7 +460,7 @@ MACHINE_RESET_MEMBER(decocass_type1_state,cocean1a) /* 10 */ static uint8_t type1_map1120[8] = { T1PROM,T1PROM,T1LATCHINV,T1DIRECT,T1PROM,T1LATCH,T1PROM,T1PROM }; -MACHINE_RESET_MEMBER(decocass_type1_state,cfboy0a1) /* 12 */ +void decocass_type1_state::machine_reset_cfboy0a1() /* 12 */ { machine_reset(); LOG(0,("dongle type #1 (DP-1120 map)\n")); @@ -489,7 +489,7 @@ TYPE 1 static uint8_t type1_map_clocknchj[8] = { T1PROM,T1PROM,T1DIRECT,T1LATCHINV,T1PROM,T1PROM,T1LATCH,T1PROM }; -MACHINE_RESET_MEMBER(decocass_type1_state,clocknchj) /* 11 */ +void decocass_type1_state::machine_reset_clocknchj() /* 11 */ { machine_reset(); LOG(0,("dongle type #1 (type1_map_clocknchj map)\n")); @@ -1379,28 +1379,28 @@ void decocass_nodong_state::machine_reset() m_dongle_r = read8_delegate(FUNC(decocass_nodong_state::decocass_nodong_r), this); } -MACHINE_RESET_MEMBER(decocass_type1_state,ctsttape) +void decocass_type1_state::machine_reset_ctsttape() { machine_reset(); LOG(0,("dongle type #1 (DE-0061)\n")); m_type1_map = type1_pass_136_table; } -MACHINE_RESET_MEMBER(decocass_type1_state,chwy) +void decocass_type1_state::machine_reset_chwy() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 own PROM)\n")); m_type1_map = type1_latch_27_pass_3_inv_2_table; } -MACHINE_RESET_MEMBER(decocass_type1_state,cdsteljn) +void decocass_type1_state::machine_reset_cdsteljn() { machine_reset(); LOG(0,("dongle type #1 (A-0061)\n")); m_type1_map = type1_latch_27_pass_3_inv_2_table; } -MACHINE_RESET_MEMBER(decocass_type1_state,cterrani) +void decocass_type1_state::machine_reset_cterrani() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 straight)\n")); @@ -1409,14 +1409,14 @@ MACHINE_RESET_MEMBER(decocass_type1_state,cterrani) m_type1_outmap = MAKE_MAP(0,1,2,3,4,5,6,7); } -MACHINE_RESET_MEMBER(decocass_type1_state,castfant) +void decocass_type1_state::machine_reset_castfant() { machine_reset(); LOG(0,("dongle type #1 (DE-0061)\n")); m_type1_map = type1_latch_16_pass_3_inv_1_table; } -MACHINE_RESET_MEMBER(decocass_type1_state,csuperas) +void decocass_type1_state::machine_reset_csuperas() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 flip 4-5)\n")); @@ -1425,14 +1425,14 @@ MACHINE_RESET_MEMBER(decocass_type1_state,csuperas) m_type1_outmap = MAKE_MAP(0,1,2,3,5,4,6,7); } -MACHINE_RESET_MEMBER(decocass_type1_state,cmanhat) +void decocass_type1_state::machine_reset_cmanhat() { machine_reset(); LOG(0,("dongle type #1 (DE-0061)\n")); m_type1_map = type1_latch_xab_pass_x54_table; } -MACHINE_RESET_MEMBER(decocass_type1_state,clocknch) +void decocass_type1_state::machine_reset_clocknch() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 flip 2-3)\n")); @@ -1441,7 +1441,7 @@ MACHINE_RESET_MEMBER(decocass_type1_state,clocknch) m_type1_outmap = MAKE_MAP(0,1,3,2,4,5,6,7); } -MACHINE_RESET_MEMBER(decocass_type1_state,cprogolf) +void decocass_type1_state::machine_reset_cprogolf() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 flip 0-1)\n")); @@ -1450,7 +1450,7 @@ MACHINE_RESET_MEMBER(decocass_type1_state,cprogolf) m_type1_outmap = MAKE_MAP(1,0,2,3,4,5,6,7); } -MACHINE_RESET_MEMBER(decocass_type1_state,cprogolfj) +void decocass_type1_state::machine_reset_cprogolfj() { machine_reset(); LOG(0,("dongle type #1 (A-0061 flip 0-1)\n")); @@ -1459,7 +1459,7 @@ MACHINE_RESET_MEMBER(decocass_type1_state,cprogolfj) m_type1_outmap = MAKE_MAP(1,0,2,3,4,5,6,7); } -MACHINE_RESET_MEMBER(decocass_type1_state,cluckypo) +void decocass_type1_state::machine_reset_cluckypo() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 flip 1-3)\n")); @@ -1468,7 +1468,7 @@ MACHINE_RESET_MEMBER(decocass_type1_state,cluckypo) m_type1_outmap = MAKE_MAP(0,3,2,1,4,5,6,7); } -MACHINE_RESET_MEMBER(decocass_type1_state,ctisland) +void decocass_type1_state::machine_reset_ctisland() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 flip 0-2)\n")); @@ -1477,7 +1477,7 @@ MACHINE_RESET_MEMBER(decocass_type1_state,ctisland) m_type1_outmap = MAKE_MAP(2,1,0,3,4,5,6,7); } -MACHINE_RESET_MEMBER(decocass_type1_state,ctisland3) +void decocass_type1_state::machine_reset_ctisland3() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 custom)\n")); @@ -1486,14 +1486,14 @@ MACHINE_RESET_MEMBER(decocass_type1_state,ctisland3) m_type1_outmap = MAKE_MAP(0,1,2,3,4,5,6,7); // ^ } -MACHINE_RESET_MEMBER(decocass_type1_state,cexplore) +void decocass_type1_state::machine_reset_cexplore() { machine_reset(); LOG(0,("dongle type #1 (DE-0061 own PROM)\n")); m_type1_map = type1_latch_26_pass_5_inv_2_table; } -MACHINE_RESET_MEMBER(decocass_type3_state,cfishing) +void decocass_type3_state::machine_reset_cfishing() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); @@ -1501,7 +1501,7 @@ MACHINE_RESET_MEMBER(decocass_type3_state,cfishing) } -MACHINE_RESET_MEMBER(decocass_type3_state,cbtime) +void decocass_type3_state::machine_reset_cbtime() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); @@ -1509,70 +1509,70 @@ MACHINE_RESET_MEMBER(decocass_type3_state,cbtime) } -MACHINE_RESET_MEMBER(decocass_type3_state,cburnrub) +void decocass_type3_state::machine_reset_cburnrub() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_67; } -MACHINE_RESET_MEMBER(decocass_type3_state,cgraplop) +void decocass_type3_state::machine_reset_cgraplop() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_56; } -MACHINE_RESET_MEMBER(decocass_type3_state,cgraplop2) +void decocass_type3_state::machine_reset_cgraplop2() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_67; } -MACHINE_RESET_MEMBER(decocass_type3_state,clapapa) +void decocass_type3_state::machine_reset_clapapa() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_34_7; } -MACHINE_RESET_MEMBER(decocass_type3_state,cskater) +void decocass_type3_state::machine_reset_cskater() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_45; } -MACHINE_RESET_MEMBER(decocass_type3_state,cprobowl) +void decocass_type3_state::machine_reset_cprobowl() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_34_0; } -MACHINE_RESET_MEMBER(decocass_type3_state,cnightst) +void decocass_type3_state::machine_reset_cnightst() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_13; } -MACHINE_RESET_MEMBER(decocass_type3_state,cpsoccer) +void decocass_type3_state::machine_reset_cpsoccer() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_24; } -MACHINE_RESET_MEMBER(decocass_type3_state,csdtenis) +void decocass_type3_state::machine_reset_csdtenis() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_23_56; } -MACHINE_RESET_MEMBER(decocass_type3_state,czeroize) +void decocass_type3_state::machine_reset_czeroize() { uint8_t *mem = memregion("dongle")->base(); machine_reset(); @@ -1593,14 +1593,14 @@ MACHINE_RESET_MEMBER(decocass_type3_state,czeroize) mem[0x08a1] = 0xf7; } -MACHINE_RESET_MEMBER(decocass_type3_state,cppicf) +void decocass_type3_state::machine_reset_cppicf() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); m_type3_swap = TYPE3_SWAP_01; } -MACHINE_RESET_MEMBER(decocass_type3_state,cfghtice) +void decocass_type3_state::machine_reset_cfghtice() { machine_reset(); LOG(0,("dongle type #3 (PAL)\n")); diff --git a/src/mame/machine/epos.cpp b/src/mame/machine/epos.cpp index da7f5f12326..a18b026b879 100644 --- a/src/mame/machine/epos.cpp +++ b/src/mame/machine/epos.cpp @@ -99,7 +99,7 @@ each IN($xx) command, as opposed to dynamically decrypting every byte. */ -MACHINE_START_MEMBER(pacman_state, theglobp) +void pacman_state::machine_start_theglobp() { /* Note: D2 is inverted and connected to D1, D5 is inverted and connected to D0. The other six data bits are converted by a @@ -127,7 +127,7 @@ MACHINE_START_MEMBER(pacman_state, theglobp) save_item(NAME(m_counter)); } -MACHINE_RESET_MEMBER(pacman_state, theglobp) +void pacman_state::machine_reset_theglobp() { m_counter = 0x0A; membank("bank1")->set_entry(m_counter & 3); @@ -145,7 +145,7 @@ David Widel d_widel@hotmail.com */ -MACHINE_START_MEMBER(pacman_state, acitya) +void pacman_state::machine_start_acitya() { /* Note: D2 is inverted and connected to D1, D5 is inverted and connected to D0. The other six data bits are converted by a @@ -173,14 +173,14 @@ MACHINE_START_MEMBER(pacman_state, acitya) save_item(NAME(m_counter)); } -MACHINE_RESET_MEMBER(pacman_state, acitya) +void pacman_state::machine_reset_acitya() { m_counter = 0x0B; membank("bank1")->set_entry(m_counter & 3); } -MACHINE_START_MEMBER(pacman_state, eeekk) +void pacman_state::machine_start_eeekk() { /* Note: D2 is inverted and connected to D1, D5 is inverted and connected to D0. The other six data bits are converted by a @@ -208,7 +208,7 @@ MACHINE_START_MEMBER(pacman_state, eeekk) save_item(NAME(m_counter)); } -MACHINE_RESET_MEMBER(pacman_state, eeekk) +void pacman_state::machine_reset_eeekk() { m_counter = 0x09; membank("bank1")->set_entry(m_counter & 3); diff --git a/src/mame/machine/galaxold.cpp b/src/mame/machine/galaxold.cpp index a63108c52ec..5d512a62fb1 100644 --- a/src/mame/machine/galaxold.cpp +++ b/src/mame/machine/galaxold.cpp @@ -70,17 +70,17 @@ void galaxold_state::machine_reset_common(int line) int_timer->adjust(m_screen->time_until_pos(0)); } -MACHINE_RESET_MEMBER(galaxold_state,galaxold) +void galaxold_state::machine_reset_galaxold() { machine_reset_common(INPUT_LINE_NMI); } -MACHINE_RESET_MEMBER(galaxold_state,devilfsg) +void galaxold_state::machine_reset_devilfsg() { machine_reset_common(0); } -MACHINE_RESET_MEMBER(galaxold_state,hunchbkg) +void galaxold_state::machine_reset_hunchbkg() { machine_reset_common(0); } diff --git a/src/mame/machine/galaxy.cpp b/src/mame/machine/galaxy.cpp index e5c01dc1f44..d157019dc19 100644 --- a/src/mame/machine/galaxy.cpp +++ b/src/mame/machine/galaxy.cpp @@ -171,7 +171,7 @@ void galaxy_state::init_galaxy() Machine Initialization ***************************************************************************/ -MACHINE_RESET_MEMBER(galaxy_state,galaxy) +void galaxy_state::machine_reset_galaxy() { address_space &space = m_maincpu->space(AS_PROGRAM); @@ -194,7 +194,7 @@ void galaxy_state::init_galaxyp() init_galaxy(); } -MACHINE_RESET_MEMBER(galaxy_state,galaxyp) +void galaxy_state::machine_reset_galaxyp() { uint8_t *ROM = memregion("maincpu")->base(); address_space &space = m_maincpu->space(AS_PROGRAM); diff --git a/src/mame/machine/gb.cpp b/src/mame/machine/gb.cpp index 5c4ff891b7a..2eccae21663 100644 --- a/src/mame/machine/gb.cpp +++ b/src/mame/machine/gb.cpp @@ -174,7 +174,7 @@ void gb_state::machine_start() save_gb_base(); } -MACHINE_START_MEMBER(gb_state,gbc) +void gb_state::machine_start_gbc() { for (int i = 0; i < 8; i++) m_gbc_rammap[i] = m_ram->pointer() + CGB_START_RAM_BANKS + i * 0x1000; @@ -184,7 +184,7 @@ MACHINE_START_MEMBER(gb_state,gbc) } -MACHINE_START_MEMBER(gb_state,sgb) +void gb_state::machine_start_sgb() { m_sgb_packets = -1; @@ -200,7 +200,7 @@ void gb_state::machine_reset() m_bios_disable = false; } -MACHINE_RESET_MEMBER(gb_state,gbc) +void gb_state::machine_reset_gbc() { gb_init(); @@ -213,7 +213,7 @@ MACHINE_RESET_MEMBER(gb_state,gbc) memset(elem, 0, 0x1000); } -MACHINE_RESET_MEMBER(gb_state,sgb) +void gb_state::machine_reset_sgb() { gb_init(); @@ -663,12 +663,12 @@ READ8_MEMBER(gb_state::gbc_io2_r) ****************************************************************************/ -MACHINE_START_MEMBER(megaduck_state,megaduck) +void megaduck_state::machine_start_megaduck() { save_gb_base(); } -MACHINE_RESET_MEMBER(megaduck_state,megaduck) +void megaduck_state::machine_reset_megaduck() { /* We may have to add some more stuff here, if not then it can be merged back into gb */ gb_init(); diff --git a/src/mame/machine/hp48.cpp b/src/mame/machine/hp48.cpp index 5b9c986a5de..a0bc2843ea4 100644 --- a/src/mame/machine/hp48.cpp +++ b/src/mame/machine/hp48.cpp @@ -1031,32 +1031,32 @@ void hp48_state::base_machine_start(hp48_models model) } -MACHINE_START_MEMBER(hp48_state,hp48s) +void hp48_state::machine_start_hp48s() { base_machine_start(HP48_S); } -MACHINE_START_MEMBER(hp48_state,hp48sx) +void hp48_state::machine_start_hp48sx() { base_machine_start(HP48_SX); } -MACHINE_START_MEMBER(hp48_state,hp48g) +void hp48_state::machine_start_hp48g() { base_machine_start(HP48_G); } -MACHINE_START_MEMBER(hp48_state,hp48gx) +void hp48_state::machine_start_hp48gx() { base_machine_start(HP48_GX); } -MACHINE_START_MEMBER(hp48_state,hp48gp) +void hp48_state::machine_start_hp48gp() { base_machine_start(HP48_GP); } -MACHINE_START_MEMBER(hp48_state,hp49g) +void hp48_state::machine_start_hp49g() { base_machine_start(HP49_G); } diff --git a/src/mame/machine/itech8.cpp b/src/mame/machine/itech8.cpp index 2e8b930b94d..b107aa64e51 100644 --- a/src/mame/machine/itech8.cpp +++ b/src/mame/machine/itech8.cpp @@ -514,7 +514,7 @@ WRITE8_MEMBER(itech8_state::slikshot_z80_control_w ) -VIDEO_START_MEMBER(itech8_state,slikshot) +void itech8_state::video_start_slikshot() { itech8_state::video_start(); diff --git a/src/mame/machine/kaypro.cpp b/src/mame/machine/kaypro.cpp index cd93253abc8..fd9f92ce11b 100644 --- a/src/mame/machine/kaypro.cpp +++ b/src/mame/machine/kaypro.cpp @@ -221,12 +221,13 @@ WRITE_LINE_MEMBER( kaypro_state::fdc_drq_w ) Machine ************************************************************/ -MACHINE_START_MEMBER( kaypro_state,kayproii ) + +void kaypro_state::machine_start_kayproii() { m_pio_s->strobe_a(0); } -MACHINE_RESET_MEMBER( kaypro_state,kaypro ) +void kaypro_state::machine_reset_kaypro() { membank("bankr0")->set_entry(1); // point at rom membank("bankw0")->set_entry(0); // always write to ram diff --git a/src/mame/machine/leland.cpp b/src/mame/machine/leland.cpp index 05a33177fa0..628bc3883eb 100644 --- a/src/mame/machine/leland.cpp +++ b/src/mame/machine/leland.cpp @@ -315,7 +315,7 @@ WRITE8_MEMBER(leland_state::indyheat_analog_w) * *************************************/ -MACHINE_START_MEMBER(leland_state,leland) +void leland_state::machine_start_leland() { /* allocate extra stuff */ m_battery_ram = reinterpret_cast<uint8_t *>(memshare("battery")->ptr()); @@ -340,7 +340,7 @@ MACHINE_START_MEMBER(leland_state,leland) } -MACHINE_RESET_MEMBER(leland_state,leland) +void leland_state::machine_reset_leland() { m_master_int_timer->adjust(m_screen->time_until_pos(8), 8); @@ -379,7 +379,7 @@ MACHINE_RESET_MEMBER(leland_state,leland) } -MACHINE_START_MEMBER(leland_state,ataxx) +void leland_state::machine_start_ataxx() { /* set the odd data banks */ m_battery_ram = reinterpret_cast<uint8_t *>(memshare("battery")->ptr()); @@ -399,7 +399,7 @@ MACHINE_START_MEMBER(leland_state,ataxx) } -MACHINE_RESET_MEMBER(leland_state,ataxx) +void leland_state::machine_reset_ataxx() { memset(m_extra_tram.get(), 0, ATAXX_EXTRA_TRAM_SIZE); m_master_int_timer->adjust(m_screen->time_until_pos(8), 8); diff --git a/src/mame/machine/llc.cpp b/src/mame/machine/llc.cpp index 437ef3e52b2..241c4eab4ce 100644 --- a/src/mame/machine/llc.cpp +++ b/src/mame/machine/llc.cpp @@ -98,13 +98,13 @@ void llc_state::init_llc1() { } -MACHINE_RESET_MEMBER(llc_state,llc1) +void llc_state::machine_reset_llc1() { m_term_status = 0; m_llc1_key = 0; } -MACHINE_START_MEMBER(llc_state,llc1) +void llc_state::machine_start_llc1() { m_digits.resolve(); } @@ -115,7 +115,7 @@ void llc_state::init_llc2() m_p_videoram.set_target( m_ram->pointer() + 0xc000,m_p_videoram.bytes()); } -MACHINE_RESET_MEMBER(llc_state,llc2) +void llc_state::machine_reset_llc2() { address_space &space = m_maincpu->space(AS_PROGRAM); diff --git a/src/mame/machine/mbee.cpp b/src/mame/machine/mbee.cpp index fe8efb5d15d..c71d7089908 100644 --- a/src/mame/machine/mbee.cpp +++ b/src/mame/machine/mbee.cpp @@ -453,26 +453,26 @@ void mbee_state::machine_reset_common() m_telcom->set_entry(0); } -MACHINE_RESET_MEMBER( mbee_state, mbee ) +void mbee_state::machine_reset_mbee() { machine_reset_common(); m_maincpu->set_pc(0x8000); } -MACHINE_RESET_MEMBER( mbee_state, mbee56 ) +void mbee_state::machine_reset_mbee56() { machine_reset_common(); m_maincpu->set_pc(0xE000); } -MACHINE_RESET_MEMBER( mbee_state, mbee128 ) +void mbee_state::machine_reset_mbee128() { machine_reset_common(); setup_banks(0, 1, 3); // set banks to default m_maincpu->set_pc(0x8000); } -MACHINE_RESET_MEMBER( mbee_state, mbee256 ) +void mbee_state::machine_reset_mbee256() { m_mbee256_q_pos = 0; machine_reset_common(); @@ -480,7 +480,7 @@ MACHINE_RESET_MEMBER( mbee_state, mbee256 ) m_maincpu->set_pc(0x8000); } -MACHINE_RESET_MEMBER( mbee_state, mbeett ) +void mbee_state::machine_reset_mbeett() { m_mbee256_q_pos = 0; machine_reset_common(); diff --git a/src/mame/machine/mcr68.cpp b/src/mame/machine/mcr68.cpp index ae00aa8ab90..8ce04ef3c86 100644 --- a/src/mame/machine/mcr68.cpp +++ b/src/mame/machine/mcr68.cpp @@ -20,12 +20,12 @@ * *************************************/ -MACHINE_START_MEMBER(mcr68_state,mcr68) +void mcr68_state::machine_start_mcr68() { } -MACHINE_RESET_MEMBER(mcr68_state,mcr68) +void mcr68_state::machine_reset_mcr68() { /* for the most part all MCR/68k games are the same */ m_v493_callback = timer_expired_delegate(FUNC(mcr68_state::mcr68_493_callback),this); diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index 9ce52ce86e0..3b3cc73c3b1 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -773,11 +773,11 @@ uint32_t md_base_state::screen_update_megadriv(screen_device &screen, bitmap_rgb /*****************************************************************************************/ -VIDEO_START_MEMBER(md_base_state,megadriv) +void md_base_state::video_start_megadriv() { } -MACHINE_START_MEMBER(md_base_state,megadriv) +void md_base_state::machine_start_megadriv() { m_io_pad_3b[0] = ioport("PAD1"); m_io_pad_3b[1] = ioport("PAD2"); @@ -790,7 +790,7 @@ MACHINE_START_MEMBER(md_base_state,megadriv) save_item(NAME(m_megadrive_io_tx_regs)); } -MACHINE_RESET_MEMBER(md_base_state,megadriv) +void md_base_state::machine_reset_megadriv() { /* default state of z80 = reset, with bus */ osd_printf_debug("Resetting Megadrive / Genesis\n"); @@ -894,8 +894,8 @@ MACHINE_CONFIG_START(md_base_state::md_ntsc) MCFG_DEVICE_IO_MAP(megadriv_z80_io_map) /* IRQ handled via the timers */ - MCFG_MACHINE_START_OVERRIDE(md_base_state,megadriv) - MCFG_MACHINE_RESET_OVERRIDE(md_base_state,megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_megadriv, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megadriv, this)); megadriv_timers(config); @@ -914,7 +914,7 @@ MACHINE_CONFIG_START(md_base_state::md_ntsc) MCFG_SCREEN_UPDATE_DRIVER(md_base_state, screen_update_megadriv) /* Copies a bitmap */ 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) + set_video_start_cb(config, driver_callback_delegate(&video_start_megadriv, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -951,8 +951,8 @@ MACHINE_CONFIG_START(md_base_state::md_pal) MCFG_DEVICE_IO_MAP(megadriv_z80_io_map) /* IRQ handled via the timers */ - MCFG_MACHINE_START_OVERRIDE(md_base_state,megadriv) - MCFG_MACHINE_RESET_OVERRIDE(md_base_state,megadriv) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_megadriv, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megadriv, this)); megadriv_timers(config); @@ -971,7 +971,7 @@ MACHINE_CONFIG_START(md_base_state::md_pal) MCFG_SCREEN_UPDATE_DRIVER(md_base_state, screen_update_megadriv) /* Copies a bitmap */ 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) + set_video_start_cb(config, driver_callback_delegate(&video_start_megadriv, this)); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/machine/midtunit.cpp b/src/mame/machine/midtunit.cpp index 23cfb4130d2..7cc346dd69d 100644 --- a/src/mame/machine/midtunit.cpp +++ b/src/mame/machine/midtunit.cpp @@ -483,7 +483,7 @@ void midtunit_state::init_mk2() * *************************************/ -MACHINE_RESET_MEMBER(midtunit_state,midtunit) +void midtunit_state::machine_reset_midtunit() { /* reset sound */ switch (m_chip_type) diff --git a/src/mame/machine/midwunit.cpp b/src/mame/machine/midwunit.cpp index 0104178554e..62db55384fd 100644 --- a/src/mame/machine/midwunit.cpp +++ b/src/mame/machine/midwunit.cpp @@ -338,7 +338,7 @@ void midwunit_state::init_rmpgwt() * *************************************/ -MACHINE_RESET_MEMBER(midwunit_state,midwunit) +void midwunit_state::machine_reset_midwunit() { int i; diff --git a/src/mame/machine/midxunit.cpp b/src/mame/machine/midxunit.cpp index 57299d2162a..6658a30dc7b 100644 --- a/src/mame/machine/midxunit.cpp +++ b/src/mame/machine/midxunit.cpp @@ -265,7 +265,7 @@ void midxunit_state::init_revx() * *************************************/ -MACHINE_RESET_MEMBER(midxunit_state,midxunit) +void midxunit_state::machine_reset_midxunit() { int i; diff --git a/src/mame/machine/midyunit.cpp b/src/mame/machine/midyunit.cpp index 5391a883fad..1af70871aa3 100644 --- a/src/mame/machine/midyunit.cpp +++ b/src/mame/machine/midyunit.cpp @@ -530,7 +530,7 @@ void midyunit_state::init_totcarn() * *************************************/ -MACHINE_RESET_MEMBER(midyunit_state,midyunit) +void midyunit_state::machine_reset_midyunit() { /* reset sound */ switch (m_chip_type) diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp index fc8af68c93e..ba82f93195e 100644 --- a/src/mame/machine/model1.cpp +++ b/src/mame/machine/model1.cpp @@ -1723,7 +1723,7 @@ void model1_state::copro_hle_swa() } } -MACHINE_START_MEMBER(model1_state,model1) +void model1_state::machine_start_model1() { m_digits.resolve(); m_copro_ram_data = std::make_unique<u32[]>(0x8000); diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp index 16525fc4a3d..c3f0b9bfe15 100644 --- a/src/mame/machine/mpu4.cpp +++ b/src/mame/machine/mpu4.cpp @@ -442,7 +442,7 @@ void mpu4_state::update_meters() } /* called if board is reset */ -MACHINE_RESET_MEMBER(mpu4_state,mpu4) +void mpu4_state::machine_reset_mpu4() { m_vfd->reset(); @@ -2163,7 +2163,7 @@ void mpu4_state::mpu4_config_common() m_lamp_strobe_ext_persistence = 0; } -MACHINE_START_MEMBER(mpu4_state,mod2) +void mpu4_state::machine_start_mod2() { mpu4_config_common(); @@ -2171,7 +2171,7 @@ MACHINE_START_MEMBER(mpu4_state,mod2) m_mod_number=2; } -MACHINE_START_MEMBER(mpu4_state,mpu4yam) +void mpu4_state::machine_start_mpu4yam() { address_space &space = m_maincpu->space(AS_PROGRAM); mpu4_config_common(); @@ -2181,7 +2181,7 @@ MACHINE_START_MEMBER(mpu4_state,mpu4yam) mpu4_install_mod4yam_space(space); } -MACHINE_START_MEMBER(mpu4_state,mpu4oki) +void mpu4_state::machine_start_mpu4oki() { address_space &space = m_maincpu->space(AS_PROGRAM); mpu4_config_common(); @@ -2191,7 +2191,7 @@ MACHINE_START_MEMBER(mpu4_state,mpu4oki) mpu4_install_mod4oki_space(space); } -MACHINE_START_MEMBER(mpu4_state,mpu4bwb) +void mpu4_state::machine_start_mpu4bwb() { address_space &space = m_maincpu->space(AS_PROGRAM); mpu4_config_common(); @@ -2201,7 +2201,7 @@ MACHINE_START_MEMBER(mpu4_state,mpu4bwb) mpu4_install_mod4bwb_space(space); } -MACHINE_START_MEMBER(mpu4_state,mpu4cry) +void mpu4_state::machine_start_mpu4cry() { mpu4_config_common(); @@ -3089,8 +3089,8 @@ MACHINE_CONFIG_END /* machine driver for MOD 2 board */ MACHINE_CONFIG_START(mpu4_state::mpu4base) - MCFG_MACHINE_START_OVERRIDE(mpu4_state,mod2 ) - MCFG_MACHINE_RESET_OVERRIDE(mpu4_state,mpu4) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mod2, this)); + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mpu4, this)); MCFG_DEVICE_ADD("maincpu", MC6809, MPU4_MASTER_CLOCK) // MC68B09P MCFG_DEVICE_PROGRAM_MAP(mpu4_memmap) @@ -3129,7 +3129,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mod4yam) mpu4base(config); - MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4yam) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4yam, this)); mpu4_std_6reel(config); @@ -3140,7 +3140,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mod4oki) mpu4base(config); - MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4oki, this)); mpu4_common2(config); mpu4_std_6reel(config); @@ -3152,7 +3152,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mod4oki_alt) mpu4base(config); - MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4oki, this)); mpu4_common2(config); mpu4_type2_6reel(config); @@ -3164,7 +3164,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mod4oki_5r) mpu4base(config); - MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4oki, this)); mpu4_common2(config); mpu4_std_5reel(config); @@ -3176,7 +3176,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::bwboki) mpu4base(config); - MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4bwb) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4bwb, this)); mpu4_common2(config); mpu4_bwb_5reel(config); @@ -3187,7 +3187,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpu4_state::mpu4crys) mod2(config); - MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4cry) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4cry, this)); MCFG_DEVICE_ADD("upd", UPD7759) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) diff --git a/src/mame/machine/mtx.cpp b/src/mame/machine/mtx.cpp index 5c081036b0a..a00e489f36e 100644 --- a/src/mame/machine/mtx.cpp +++ b/src/mame/machine/mtx.cpp @@ -511,7 +511,7 @@ SNAPSHOT_LOAD_MEMBER( mtx_state, mtx ) MACHINE_START( mtx512 ) -------------------------------------------------*/ -MACHINE_START_MEMBER(mtx_state, mtx512) +void mtx_state::machine_start_mtx512() { address_space &program = m_maincpu->space(AS_PROGRAM); @@ -544,7 +544,7 @@ MACHINE_START_MEMBER(mtx_state, mtx512) program.install_ram(0xc000, 0xffff, m_ram->pointer()); } -MACHINE_RESET_MEMBER(mtx_state, mtx512) +void mtx_state::machine_reset_mtx512() { /* bank switching */ bankswitch(0); diff --git a/src/mame/machine/mw8080bw.cpp b/src/mame/machine/mw8080bw.cpp index 1d081aa551f..85ae8e10bf6 100644 --- a/src/mame/machine/mw8080bw.cpp +++ b/src/mame/machine/mw8080bw.cpp @@ -94,7 +94,7 @@ void mw8080bw_state::mw8080bw_start_interrupt_timer( ) * *************************************/ -MACHINE_START_MEMBER(mw8080bw_state,mw8080bw) +void mw8080bw_state::machine_start_mw8080bw() { mw8080bw_create_interrupt_timer(); } @@ -106,7 +106,7 @@ MACHINE_START_MEMBER(mw8080bw_state,mw8080bw) * *************************************/ -MACHINE_RESET_MEMBER(mw8080bw_state,mw8080bw) +void mw8080bw_state::machine_reset_mw8080bw() { mw8080bw_start_interrupt_timer(); } diff --git a/src/mame/machine/mz700.cpp b/src/mame/machine/mz700.cpp index e7db1cb4cbe..e3b3088281c 100644 --- a/src/mame/machine/mz700.cpp +++ b/src/mame/machine/mz700.cpp @@ -93,7 +93,7 @@ void mz_state::machine_start() mz700_bank_4_w(m_maincpu->space(AS_IO), 0, 0); } -MACHINE_RESET_MEMBER( mz_state, mz700 ) +void mz_state::machine_reset_mz700() { membank("bankr0")->set_entry(1); //rom membank("bankw0")->set_entry(0); //ram @@ -101,7 +101,7 @@ MACHINE_RESET_MEMBER( mz_state, mz700 ) m_banke->set_bank(1); //devices } -MACHINE_RESET_MEMBER( mz_state, mz800 ) +void mz_state::machine_reset_mz800() { // default to mz700 mode or mz1500 won't start. membank("bankr0")->set_entry(1); //rom diff --git a/src/mame/machine/namcos2.cpp b/src/mame/machine/namcos2.cpp index b9db00d2950..02e2adba212 100644 --- a/src/mame/machine/namcos2.cpp +++ b/src/mame/machine/namcos2.cpp @@ -132,14 +132,14 @@ void namcos2_shared_state::reset_all_subcpus(int state) } } -MACHINE_START_MEMBER(namcos2_shared_state,namcos2) +void namcos2_shared_state::machine_start_namcos2() { namcos2_kickstart = nullptr; m_eeprom = std::make_unique<uint8_t[]>(m_eeprom_size); machine().device<nvram_device>("nvram")->set_base(m_eeprom.get(), m_eeprom_size); } -MACHINE_RESET_MEMBER(namcos2_shared_state, namcos2) +void namcos2_shared_state::machine_reset_namcos2() { // address_space &space = m_maincpu->space(AS_PROGRAM); address_space &audio_space = m_audiocpu->space(AS_PROGRAM); diff --git a/src/mame/machine/orion.cpp b/src/mame/machine/orion.cpp index 16902c6c17d..611a105d6c1 100644 --- a/src/mame/machine/orion.cpp +++ b/src/mame/machine/orion.cpp @@ -42,7 +42,7 @@ WRITE8_MEMBER(orion_state::orion_romdisk_portc_w) m_romdisk_msb = data; } -MACHINE_START_MEMBER(orion_state,orion128) +void orion_state::machine_start_orion128() { m_video_mode_mask = 7; } @@ -139,7 +139,7 @@ WRITE8_MEMBER(orion_state::orion128_memory_page_w) } } -MACHINE_RESET_MEMBER(orion_state,orion128) +void orion_state::machine_reset_orion128() { m_orion128_video_page = 0; m_orion128_video_mode = 0; @@ -219,7 +219,7 @@ WRITE8_MEMBER(orion_state::orionz80_floppy_rtc_w) } -MACHINE_START_MEMBER(orion_state,orionz80) +void orion_state::machine_start_orionz80() { m_video_mode_mask = 7; } @@ -306,7 +306,7 @@ WRITE8_MEMBER(orion_state::orionz80_dispatcher_w) orionz80_switch_bank(); } -MACHINE_RESET_MEMBER(orion_state,orionz80) +void orion_state::machine_reset_orionz80() { address_space &space = m_maincpu->space(AS_PROGRAM); @@ -496,7 +496,7 @@ WRITE8_MEMBER(orion_state::orionpro_memory_page_w) orionpro_bank_switch(); } -MACHINE_RESET_MEMBER(orion_state,orionpro) +void orion_state::machine_reset_orionpro() { radio86_init_keyboard(); diff --git a/src/mame/machine/partner.cpp b/src/mame/machine/partner.cpp index 6cb36b7f304..f4ae11d2fff 100644 --- a/src/mame/machine/partner.cpp +++ b/src/mame/machine/partner.cpp @@ -348,7 +348,7 @@ I8275_DRAW_CHARACTER_MEMBER(partner_state::display_pixels) } } -MACHINE_RESET_MEMBER(partner_state,partner) +void partner_state::machine_reset_partner() { m_mem_page = 0; m_win_mem_page = 0; diff --git a/src/mame/machine/pc1251.cpp b/src/mame/machine/pc1251.cpp index 8249a970b3e..22efe26edb9 100644 --- a/src/mame/machine/pc1251.cpp +++ b/src/mame/machine/pc1251.cpp @@ -96,7 +96,7 @@ void pc1251_state::machine_start() machine().device<nvram_device>("ram_nvram")->set_base(ram, 0x4800); } -MACHINE_START_MEMBER(pc1251_state,pc1260 ) +void pc1251_state::machine_start_pc1260() { uint8_t *ram = memregion("maincpu")->base() + 0x4000; uint8_t *cpu = m_maincpu->internal_ram(); diff --git a/src/mame/machine/pce.cpp b/src/mame/machine/pce.cpp index f68d185e81f..3b8749a7251 100644 --- a/src/mame/machine/pce.cpp +++ b/src/mame/machine/pce.cpp @@ -94,7 +94,7 @@ void pce_state::init_sgx() m_io_port_options = PCE_JOY_SIG | CONST_SIG; } -MACHINE_START_MEMBER(pce_state,pce) +void pce_state::machine_start_pce() { if (m_cd) m_cd->late_setup(); @@ -108,7 +108,7 @@ MACHINE_START_MEMBER(pce_state,pce) save_item(NAME(m_joy_6b_packet)); } -MACHINE_RESET_MEMBER(pce_state,mess_pce) +void pce_state::machine_reset_mess_pce() { for (auto & elem : m_joy_6b_packet) elem = 0; diff --git a/src/mame/machine/pgmprot_igs025_igs012.cpp b/src/mame/machine/pgmprot_igs025_igs012.cpp index 617b6c70f11..d598e3e6ca1 100644 --- a/src/mame/machine/pgmprot_igs025_igs012.cpp +++ b/src/mame/machine/pgmprot_igs025_igs012.cpp @@ -106,11 +106,9 @@ static const uint8_t drgw2_source_data[0x08][0xec] = { 0, } // Region 7, not used }; -MACHINE_RESET_MEMBER(pgm_012_025_state,drgw2) +void pgm_012_025_state::machine_reset_drgw2() { - MACHINE_RESET_CALL_MEMBER(pgm); - - + machine_reset_pgm(); } void pgm_012_025_state::drgw2_common_init() @@ -142,7 +140,7 @@ MACHINE_CONFIG_START(pgm_012_025_state::pgm_012_025_drgw2) MCFG_DEVICE_ADD("igs025", IGS025, 0) //MCFG_IGS025_SET_EXTERNAL_EXECUTE( pgm_022_025_state, igs025_to_igs012_callback ) - MCFG_MACHINE_RESET_OVERRIDE(pgm_012_025_state,drgw2) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_drgw2, this)); MACHINE_CONFIG_END diff --git a/src/mame/machine/pgmprot_igs025_igs012.h b/src/mame/machine/pgmprot_igs025_igs012.h index b8844c202ef..24ee79e603b 100644 --- a/src/mame/machine/pgmprot_igs025_igs012.h +++ b/src/mame/machine/pgmprot_igs025_igs012.h @@ -22,7 +22,7 @@ public: void init_drgw2j(); void init_drgw2hk(); - DECLARE_MACHINE_RESET(drgw2); + void machine_reset_drgw2(); void pgm_012_025_drgw2(machine_config &config); void drgw2_mem(address_map &map); }; diff --git a/src/mame/machine/pgmprot_igs025_igs022.cpp b/src/mame/machine/pgmprot_igs025_igs022.cpp index e1f485ad9cf..411d60a52ab 100644 --- a/src/mame/machine/pgmprot_igs025_igs022.cpp +++ b/src/mame/machine/pgmprot_igs025_igs022.cpp @@ -313,24 +313,24 @@ static const uint8_t dw3_source_data[0x08][0xec] = } }; -MACHINE_RESET_MEMBER(pgm_022_025_state,killbld) +void pgm_022_025_state::machine_reset_killbld() { int region = (ioport(":Region")->read()) & 0xff; m_igs025->m_kb_region = region - 0x16; m_igs025->m_kb_game_id = 0x89911400 | region; - MACHINE_RESET_CALL_MEMBER(pgm); + machine_reset_pgm(); } -MACHINE_RESET_MEMBER(pgm_022_025_state, dw3) +void pgm_022_025_state::machine_reset_dw3() { int region = (ioport(":Region")->read()) & 0xff; m_igs025->m_kb_region = region; m_igs025->m_kb_game_id = 0x00060000 | region; - MACHINE_RESET_CALL_MEMBER(pgm); + machine_reset_pgm(); } @@ -390,12 +390,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pgm_022_025_state::pgm_022_025_dw3) pgm_022_025(config); - MCFG_MACHINE_RESET_OVERRIDE(pgm_022_025_state, dw3) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dw3, this)); MACHINE_CONFIG_END MACHINE_CONFIG_START(pgm_022_025_state::pgm_022_025_killbld) pgm_022_025(config); - MCFG_MACHINE_RESET_OVERRIDE(pgm_022_025_state, killbld) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_killbld, this)); MACHINE_CONFIG_END diff --git a/src/mame/machine/pgmprot_igs025_igs022.h b/src/mame/machine/pgmprot_igs025_igs022.h index 70ea6da1117..025c6069e71 100644 --- a/src/mame/machine/pgmprot_igs025_igs022.h +++ b/src/mame/machine/pgmprot_igs025_igs022.h @@ -19,8 +19,8 @@ public: void init_killbld(); void init_drgw3(); - DECLARE_MACHINE_RESET(killbld); - DECLARE_MACHINE_RESET(dw3); + void machine_reset_killbld(); + void machine_reset_dw3(); void igs025_to_igs022_callback( void ); diff --git a/src/mame/machine/pgmprot_igs025_igs028.cpp b/src/mame/machine/pgmprot_igs025_igs028.cpp index 1577a627897..3815297cea6 100644 --- a/src/mame/machine/pgmprot_igs025_igs028.cpp +++ b/src/mame/machine/pgmprot_igs025_igs028.cpp @@ -152,14 +152,14 @@ static const uint8_t m_olds_source_data[8][0xec] = // table addresses $2951CA } }; -MACHINE_RESET_MEMBER(pgm_028_025_state,olds) +void pgm_028_025_state::machine_reset_olds() { int region = (ioport(":Region")->read()) & 0xff; m_igs025->m_kb_region = region; m_igs025->m_kb_game_id = 0x00900000 | region; - MACHINE_RESET_CALL_MEMBER(pgm); + machine_reset_pgm(); } void pgm_028_025_state::init_olds() @@ -197,7 +197,7 @@ MACHINE_CONFIG_START(pgm_028_025_state::pgm_028_025_ol) MCFG_DEVICE_ADD("igs028", IGS028, 0) - MCFG_MACHINE_RESET_OVERRIDE(pgm_028_025_state,olds) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_olds, this)); MACHINE_CONFIG_END diff --git a/src/mame/machine/pgmprot_igs025_igs028.h b/src/mame/machine/pgmprot_igs025_igs028.h index ceb746d5ca4..d6ed68a080c 100644 --- a/src/mame/machine/pgmprot_igs025_igs028.h +++ b/src/mame/machine/pgmprot_igs025_igs028.h @@ -20,7 +20,7 @@ public: void igs025_to_igs028_callback( void ); void init_olds(); - DECLARE_MACHINE_RESET(olds); + void machine_reset_olds(); void pgm_028_025_ol(machine_config &config); void olds_mem(address_map &map); }; diff --git a/src/mame/machine/pgmprot_igs027a_type1.cpp b/src/mame/machine/pgmprot_igs027a_type1.cpp index b19856c3015..0c6ca2e6ad9 100644 --- a/src/mame/machine/pgmprot_igs027a_type1.cpp +++ b/src/mame/machine/pgmprot_igs027a_type1.cpp @@ -204,9 +204,9 @@ void pgm_arm_type1_state::cavepgm_mem(address_map &map) } -MACHINE_START_MEMBER(pgm_arm_type1_state,pgm_arm_type1) +void pgm_arm_type1_state::machine_start_pgm_arm_type1() { - MACHINE_START_CALL_MEMBER(pgm); + machine_start_pgm(); save_item(NAME(m_value0)); save_item(NAME(m_value1)); save_item(NAME(m_valuekey)); @@ -221,7 +221,7 @@ MACHINE_CONFIG_START(pgm_arm_type1_state::pgm_arm_type1_cave) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(cavepgm_mem) - MCFG_MACHINE_START_OVERRIDE(pgm_arm_type1_state, pgm_arm_type1 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pgm_arm_type1, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(59.17) // verified on pcb diff --git a/src/mame/machine/pgmprot_igs027a_type1.h b/src/mame/machine/pgmprot_igs027a_type1.h index 86134ba8968..9fdbcc027fc 100644 --- a/src/mame/machine/pgmprot_igs027a_type1.h +++ b/src/mame/machine/pgmprot_igs027a_type1.h @@ -64,7 +64,7 @@ public: void init_kov(); void init_kovboot(); void init_oldsplus(); - DECLARE_MACHINE_START(pgm_arm_type1); + void machine_start_pgm_arm_type1() ATTR_COLD; DECLARE_READ32_MEMBER( pgm_arm7_type1_protlatch_r ); DECLARE_WRITE32_MEMBER( pgm_arm7_type1_protlatch_w ); diff --git a/src/mame/machine/pgmprot_igs027a_type2.cpp b/src/mame/machine/pgmprot_igs027a_type2.cpp index 64793d3b445..91744ab570d 100644 --- a/src/mame/machine/pgmprot_igs027a_type2.cpp +++ b/src/mame/machine/pgmprot_igs027a_type2.cpp @@ -124,9 +124,9 @@ void pgm_arm_type2_state::_55857F_arm7_map(address_map &map) map(0x50000000, 0x500003ff).ram(); } -MACHINE_START_MEMBER(pgm_arm_type2_state,pgm_arm_type2) +void pgm_arm_type2_state::machine_start_pgm_arm_type2() { - MACHINE_START_CALL_MEMBER(pgm); + machine_start_pgm(); /* register type specific Save State stuff here */ } @@ -135,7 +135,7 @@ MACHINE_START_MEMBER(pgm_arm_type2_state,pgm_arm_type2) MACHINE_CONFIG_START(pgm_arm_type2_state::pgm_arm_type2) pgmbase(config); - MCFG_MACHINE_START_OVERRIDE(pgm_arm_type2_state, pgm_arm_type2 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pgm_arm_type2, this)); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(kov2_mem) diff --git a/src/mame/machine/pgmprot_igs027a_type2.h b/src/mame/machine/pgmprot_igs027a_type2.h index f6af465e21c..67081b08678 100644 --- a/src/mame/machine/pgmprot_igs027a_type2.h +++ b/src/mame/machine/pgmprot_igs027a_type2.h @@ -25,7 +25,7 @@ public: void init_ddp2(); void init_dw2001(); void init_dwpc(); - DECLARE_MACHINE_START(pgm_arm_type2); + void machine_start_pgm_arm_type2() ATTR_COLD; DECLARE_READ32_MEMBER( arm7_latch_arm_r ); DECLARE_WRITE32_MEMBER( arm7_latch_arm_w ); DECLARE_READ32_MEMBER( arm7_shareram_r ); diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp index dbbdd0f793d..6c50df04368 100644 --- a/src/mame/machine/pgmprot_igs027a_type3.cpp +++ b/src/mame/machine/pgmprot_igs027a_type3.cpp @@ -152,9 +152,7 @@ void pgm_arm_type3_state::_55857G_arm7_map(address_map &map) } - - -MACHINE_RESET_MEMBER(pgm_arm_type3_state, pgm_arm_type3_reset) +void pgm_arm_type3_state::machine_reset_pgm_arm_type3_reset() { // internal roms aren't fully dumped uint16_t *temp16 = (uint16_t *)memregion("prot")->base(); @@ -178,12 +176,12 @@ MACHINE_RESET_MEMBER(pgm_arm_type3_state, pgm_arm_type3_reset) temp16[(base) / 2] = regionhack; base += 2; } } - MACHINE_RESET_CALL_MEMBER(pgm); + machine_reset_pgm(); } -MACHINE_START_MEMBER(pgm_arm_type3_state,pgm_arm_type3) +void pgm_arm_type3_state::machine_start_pgm_arm_type3() { - MACHINE_START_CALL_MEMBER(pgm); + machine_start_pgm(); /* register type specific Save State stuff here */ } @@ -193,7 +191,7 @@ MACHINE_START_MEMBER(pgm_arm_type3_state,pgm_arm_type3) MACHINE_CONFIG_START(pgm_arm_type3_state::pgm_arm_type3) pgmbase(config); - MCFG_MACHINE_START_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3 ) + set_machine_start_cb(config, driver_callback_delegate(&machine_start_pgm_arm_type3, this)); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(svg_68k_mem) @@ -202,7 +200,7 @@ MACHINE_CONFIG_START(pgm_arm_type3_state::pgm_arm_type3) MCFG_DEVICE_ADD("prot", ARM7, XTAL(33'000'000)) // 55857G - 33Mhz Xtal, at least on SVG MCFG_DEVICE_PROGRAM_MAP(_55857G_arm7_map) - MCFG_MACHINE_RESET_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3_reset) + set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pgm_arm_type3_reset, this)); MACHINE_CONFIG_END diff --git a/src/mame/machine/pgmprot_igs027a_type3.h b/src/mame/machine/pgmprot_igs027a_type3.h index a6582b7acb1..af10f0cc88e 100644 --- a/src/mame/machine/pgmprot_igs027a_type3.h +++ b/src/mame/machine/pgmprot_igs027a_type3.h @@ -30,7 +30,7 @@ public: void init_killbldp(); void init_dmnfrnt(); void init_happy6(); - DECLARE_MACHINE_START(pgm_arm_type3); + void machine_start_pgm_arm_type3() ATTR_COLD; DECLARE_WRITE32_MEMBER( svg_arm7_ram_sel_w ); DECLARE_READ32_MEMBER( svg_arm7_shareram_r ); DECLARE_WRITE32_MEMBER( svg_arm7_shareram_w ); @@ -56,7 +56,7 @@ public: DECLARE_READ32_MEMBER( happy6_speedup_r ); DECLARE_READ32_MEMBER( svg_speedup_r ); DECLARE_READ32_MEMBER( svgpcb_speedup_r ); - DECLARE_MACHINE_RESET(pgm_arm_type3_reset); + void machine_reset_pgm_arm_type3_reset(); void pgm_arm_type3(machine_config &config); void _55857G_arm7_map(address_map &map); void svg_68k_mem(address_map &map); diff --git a/src/mame/machine/playch10.cpp b/src/mame/machine/playch10.cpp index 5f9981562ef..83e21fcdad2 100644 --- a/src/mame/machine/playch10.cpp +++ b/src/mame/machine/playch10.cpp @@ -57,7 +57,7 @@ void playch10_state::machine_start() nvram->set_base(memregion("cart")->base() + 0x6000, 0x1000); } -MACHINE_START_MEMBER(playch10_state,playch10_hboard) +void playch10_state::machine_start_playch10_hboard() { m_vrom = (m_vrom_region != nullptr) ? m_vrom_region->base() : nullptr; diff --git a/src/mame/machine/primo.cpp b/src/mame/machine/primo.cpp index f81b5ef7fcc..d3e654015f5 100644 --- a/src/mame/machine/primo.cpp +++ b/src/mame/machine/primo.cpp @@ -249,7 +249,7 @@ void primo_state::machine_reset() primo_common_machine_init(); } -MACHINE_RESET_MEMBER(primo_state,primob) +void primo_state::machine_reset_primob() { primo_common_machine_init(); diff --git a/src/mame/machine/qix.cpp b/src/mame/machine/qix.cpp index 33cf61b511f..947853b615b 100644 --- a/src/mame/machine/qix.cpp +++ b/src/mame/machine/qix.cpp @@ -26,7 +26,7 @@ void qix_state::machine_reset() } -MACHINE_START_MEMBER(qix_state,qixmcu) +void qix_state::machine_start_qixmcu() { /* set up save states */ save_item(NAME(m_68705_portA_out)); diff --git a/src/mame/machine/radio86.cpp b/src/mame/machine/radio86.cpp index 2cfbd396880..8fb7bbd5356 100644 --- a/src/mame/machine/radio86.cpp +++ b/src/mame/machine/radio86.cpp @@ -143,7 +143,7 @@ WRITE8_MEMBER(radio86_state::radio_io_w) m_maincpu->space(AS_PROGRAM).write_byte((offset << 8) + offset,data); } -MACHINE_RESET_MEMBER(radio86_state,radio86) +void radio86_state::machine_reset_radio86() { timer_set(attotime::from_usec(10), TIMER_RESET); m_bank1->set_entry(1); diff --git a/src/mame/machine/rm380z.cpp b/src/mame/machine/rm380z.cpp index 966eaf61590..9237b372c9e 100644 --- a/src/mame/machine/rm380z.cpp +++ b/src/mame/machine/rm380z.cpp @@ -311,6 +311,6 @@ void rm380z_state::config_memory_map() } } -MACHINE_RESET_MEMBER( rm380z_state, rm480z ) +void rm380z_state::machine_reset_rm480z() { } diff --git a/src/mame/machine/scramble.cpp b/src/mame/machine/scramble.cpp index 8027984f599..af175512649 100644 --- a/src/mame/machine/scramble.cpp +++ b/src/mame/machine/scramble.cpp @@ -15,20 +15,20 @@ #include "includes/scramble.h" -MACHINE_RESET_MEMBER(scramble_state,scramble) +void scramble_state::machine_reset_scramble() { - MACHINE_RESET_CALL_MEMBER(galaxold); + machine_reset_galaxold(); if (m_audiocpu != nullptr) sh_init(); } -MACHINE_RESET_MEMBER(scramble_state,explorer) +void scramble_state::machine_reset_explorer() { uint8_t *RAM = memregion("maincpu")->base(); RAM[0x47ff] = 0; /* If not set, it doesn't reset after the 1st time */ - MACHINE_RESET_CALL_MEMBER(galaxold); + machine_reset_galaxold(); } diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp index f517dc343b4..6d40a5ca360 100644 --- a/src/mame/machine/sms.cpp +++ b/src/mame/machine/sms.cpp @@ -1023,7 +1023,7 @@ void sms_state::setup_bios() } } -MACHINE_START_MEMBER(sms_state,sms) +void sms_state::machine_start_sms() { m_led_pwr.resolve(); @@ -1119,7 +1119,7 @@ MACHINE_START_MEMBER(sms_state,sms) m_cartslot->save_ram(); } -MACHINE_RESET_MEMBER(sms_state,sms) +void sms_state::machine_reset_sms() { if (m_is_smsj) { @@ -1326,7 +1326,7 @@ void sms_state::init_gamegeaj() } -VIDEO_START_MEMBER(sms_state,sms1) +void sms_state::video_start_sms1() { m_left_lcd = machine().device("left_lcd"); m_right_lcd = machine().device("right_lcd"); @@ -1343,7 +1343,7 @@ VIDEO_START_MEMBER(sms_state,sms1) } -VIDEO_RESET_MEMBER(sms_state,sms1) +void sms_state::video_reset_sms1() { if (m_port_scope->read()) { @@ -1473,7 +1473,7 @@ uint32_t sms_state::screen_update_sms(screen_device &screen, bitmap_rgb32 &bitma return 0; } -VIDEO_START_MEMBER(sms_state,gamegear) +void sms_state::video_start_gamegear() { m_prev_bitmap_copied = false; m_main_scr->register_screen_bitmap(m_prev_bitmap); @@ -1486,7 +1486,7 @@ VIDEO_START_MEMBER(sms_state,gamegear) save_pointer(NAME(m_line_buffer.get()), 160 * 4); } -VIDEO_RESET_MEMBER(sms_state,gamegear) +void sms_state::video_reset_gamegear() { if (m_prev_bitmap_copied) { diff --git a/src/mame/machine/sorcerer.cpp b/src/mame/machine/sorcerer.cpp index 55131d120a6..e2647e7c9a3 100644 --- a/src/mame/machine/sorcerer.cpp +++ b/src/mame/machine/sorcerer.cpp @@ -354,7 +354,7 @@ void sorcerer_state::machine_start() space.install_read_handler(0xc000, 0xdfff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart)); } -MACHINE_START_MEMBER(sorcerer_state,sorcererd) +void sorcerer_state::machine_start_sorcererd() { m_cassette_timer = timer_alloc(TIMER_CASSETTE); m_serial_timer = timer_alloc(TIMER_SERIAL); diff --git a/src/mame/machine/special.cpp b/src/mame/machine/special.cpp index 8dd904ceb7d..a3fa0306ad7 100644 --- a/src/mame/machine/special.cpp +++ b/src/mame/machine/special.cpp @@ -145,7 +145,7 @@ void special_state::device_timer(emu_timer &timer, device_timer_id id, int param } -MACHINE_RESET_MEMBER(special_state,special) +void special_state::machine_reset_special() { timer_set(attotime::from_usec(10), TIMER_RESET); m_bank1->set_entry(1); @@ -218,12 +218,12 @@ WRITE8_MEMBER( special_state::specimx_select_bank ) specimx_set_bank(offset, data); } -MACHINE_START_MEMBER(special_state,specimx) +void special_state::machine_start_specimx() { m_drive = 0; } -MACHINE_RESET_MEMBER(special_state,specimx) +void special_state::machine_reset_specimx() { specimx_set_bank(2, 0); // Initiali load ROM disk timer_set(attotime::zero, TIMER_PIT8253_GATES); @@ -350,7 +350,7 @@ void special_state::init_erik() m_erik_background = 0; } -MACHINE_RESET_MEMBER(special_state,erik) +void special_state::machine_reset_erik() { m_RR_register = 0x00; m_RC_register = 0x00; diff --git a/src/mame/machine/super80.cpp b/src/mame/machine/super80.cpp index b09d0c39c41..cdc0697433b 100644 --- a/src/mame/machine/super80.cpp +++ b/src/mame/machine/super80.cpp @@ -206,7 +206,7 @@ WRITE8_MEMBER( super80_state::super80r_f0_w ) /**************************** BASIC MACHINE CONSTRUCTION ***********************************************************/ -MACHINE_RESET_MEMBER( super80_state, super80 ) +void super80_state::machine_reset_super80() { m_portf0 = 0; // must be 0 like real machine, or banking breaks on 32-col systems m_keylatch = 0xff; @@ -216,7 +216,7 @@ MACHINE_RESET_MEMBER( super80_state, super80 ) membank("boot")->set_entry(1); } -MACHINE_RESET_MEMBER( super80_state, super80r ) +void super80_state::machine_reset_super80r() { m_portf0 = 0x14; m_keylatch = 0xff; diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index 7245b86867f..2a28be427d9 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -955,7 +955,7 @@ void thomson_state::to7_midi_init() -MACHINE_RESET_MEMBER( thomson_state, to7 ) +void thomson_state::machine_reset_to7() { LOG (( "to7: machine reset called\n" )); @@ -986,7 +986,7 @@ MACHINE_RESET_MEMBER( thomson_state, to7 ) -MACHINE_START_MEMBER( thomson_state, to7 ) +void thomson_state::machine_start_to7() { address_space& space = m_maincpu->space(AS_PROGRAM); uint8_t* mem = memregion("maincpu")->base(); @@ -1177,7 +1177,7 @@ WRITE8_MEMBER( thomson_state::to770_gatearray_w ) -MACHINE_RESET_MEMBER( thomson_state, to770 ) +void thomson_state::machine_reset_to770() { LOG (( "to770: machine reset called\n" )); @@ -1210,7 +1210,7 @@ MACHINE_RESET_MEMBER( thomson_state, to770 ) -MACHINE_START_MEMBER( thomson_state, to770 ) +void thomson_state::machine_start_to770() { uint8_t* mem = memregion("maincpu")->base(); uint8_t* ram = m_ram->pointer(); @@ -1557,7 +1557,7 @@ WRITE8_MEMBER( thomson_state::mo5_ext_w ) -MACHINE_RESET_MEMBER( thomson_state, mo5 ) +void thomson_state::machine_reset_mo5() { LOG (( "mo5: machine reset called\n" )); @@ -1590,7 +1590,7 @@ MACHINE_RESET_MEMBER( thomson_state, mo5 ) -MACHINE_START_MEMBER( thomson_state, mo5 ) +void thomson_state::machine_start_mo5() { uint8_t* mem = memregion("maincpu")->base(); uint8_t* ram = m_ram->pointer(); @@ -2497,7 +2497,7 @@ WRITE8_MEMBER( thomson_state::to9_timer_port_out ) -MACHINE_RESET_MEMBER( thomson_state, to9 ) +void thomson_state::machine_reset_to9() { LOG (( "to9: machine reset called\n" )); @@ -2532,7 +2532,7 @@ MACHINE_RESET_MEMBER( thomson_state, to9 ) -MACHINE_START_MEMBER( thomson_state, to9 ) +void thomson_state::machine_start_to9() { uint8_t* mem = memregion("maincpu")->base(); uint8_t* ram = m_ram->pointer(); @@ -3494,7 +3494,7 @@ void thomson_state::to8_lightpen_cb( int step ) -MACHINE_RESET_MEMBER( thomson_state, to8 ) +void thomson_state::machine_reset_to8() { LOG (( "to8: machine reset called\n" )); @@ -3542,7 +3542,7 @@ MACHINE_RESET_MEMBER( thomson_state, to8 ) -MACHINE_START_MEMBER( thomson_state, to8 ) +void thomson_state::machine_start_to8() { uint8_t* mem = memregion("maincpu")->base(); uint8_t* ram = m_ram->pointer(); @@ -3645,7 +3645,7 @@ WRITE8_MEMBER( thomson_state::to9p_timer_port_out ) /* ------------ init / reset ------------ */ -MACHINE_RESET_MEMBER( thomson_state, to9p ) +void thomson_state::machine_reset_to9p() { LOG (( "to9p: machine reset called\n" )); @@ -3692,7 +3692,7 @@ MACHINE_RESET_MEMBER( thomson_state, to9p ) -MACHINE_START_MEMBER( thomson_state, to9p ) +void thomson_state::machine_start_to9p() { uint8_t* mem = memregion("maincpu")->base(); uint8_t* ram = m_ram->pointer(); @@ -4335,7 +4335,7 @@ WRITE8_MEMBER( thomson_state::mo6_vreg_w ) -MACHINE_RESET_MEMBER( thomson_state, mo6 ) +void thomson_state::machine_reset_mo6() { LOG (( "mo6: machine reset called\n" )); @@ -4377,7 +4377,7 @@ MACHINE_RESET_MEMBER( thomson_state, mo6 ) -MACHINE_START_MEMBER( thomson_state, mo6 ) +void thomson_state::machine_start_mo6() { uint8_t* mem = memregion("maincpu")->base(); uint8_t* ram = m_ram->pointer(); @@ -4558,7 +4558,7 @@ void thomson_state::mo5nr_game_reset() -MACHINE_RESET_MEMBER( thomson_state, mo5nr ) +void thomson_state::machine_reset_mo5nr() { LOG (( "mo5nr: machine reset called\n" )); @@ -4600,7 +4600,7 @@ MACHINE_RESET_MEMBER( thomson_state, mo5nr ) -MACHINE_START_MEMBER( thomson_state, mo5nr ) +void thomson_state::machine_start_mo5nr() { uint8_t* mem = memregion("maincpu")->base(); uint8_t* ram = m_ram->pointer(); diff --git a/src/mame/machine/ti85.cpp b/src/mame/machine/ti85.cpp index bb7bdb18136..6cf7c89ec41 100644 --- a/src/mame/machine/ti85.cpp +++ b/src/mame/machine/ti85.cpp @@ -264,7 +264,7 @@ void ti85_state::machine_start() membank("bank2")->set_base(m_bios + 0x04000); } -MACHINE_RESET_MEMBER(ti85_state,ti85) +void ti85_state::machine_reset_ti85() { m_PCR = 0xc0; } @@ -312,7 +312,7 @@ READ8_MEMBER(ti85_state::ti83p_membank3_r) return m_membank3->read8(space, offset); } -MACHINE_RESET_MEMBER(ti85_state,ti83p) +void ti85_state::machine_reset_ti83p() { m_PCR = 0x00; @@ -332,7 +332,7 @@ MACHINE_RESET_MEMBER(ti85_state,ti83p) } } -MACHINE_START_MEMBER(ti85_state,ti83p) +void ti85_state::machine_start_ti83p() { m_model = TI83P; //address_space &space = m_maincpu->space(AS_PROGRAM); @@ -419,28 +419,28 @@ void ti85_state::ti8xpse_init_common() } -MACHINE_START_MEMBER(ti85_state,ti83pse) +void ti85_state::machine_start_ti83pse() { m_model = TI84PSE; ti8xpse_init_common(); } -MACHINE_START_MEMBER(ti85_state,ti84pse) +void ti85_state::machine_start_ti84pse() { m_model = TI83PSE; ti8xpse_init_common(); } -MACHINE_START_MEMBER(ti85_state,ti84p) +void ti85_state::machine_start_ti84p() { m_model = TI84P; ti8xpse_init_common(); } -MACHINE_START_MEMBER(ti85_state,ti86) +void ti85_state::machine_start_ti86() { address_space &space = m_maincpu->space(AS_PROGRAM); m_bios = memregion("bios")->base(); diff --git a/src/mame/machine/toaplan1.cpp b/src/mame/machine/toaplan1.cpp index 6de67320533..1a3538bbfb3 100644 --- a/src/mame/machine/toaplan1.cpp +++ b/src/mame/machine/toaplan1.cpp @@ -250,30 +250,30 @@ WRITE_LINE_MEMBER(toaplan1_state::toaplan1_reset_callback) toaplan1_reset_sound(); } -MACHINE_RESET_MEMBER(toaplan1_state,toaplan1) +void toaplan1_state::machine_reset_toaplan1() { m_intenable = 0; machine().bookkeeping().coin_lockout_global_w(0); } /* zerowing, fireshrk, outzone */ -MACHINE_RESET_MEMBER(toaplan1_state,zerowing) +void toaplan1_state::machine_reset_zerowing() { - MACHINE_RESET_CALL_MEMBER(toaplan1); + machine_reset_toaplan1(); m_maincpu->set_reset_callback(write_line_delegate(FUNC(toaplan1_state::toaplan1_reset_callback),this)); } -MACHINE_RESET_MEMBER(toaplan1_state,demonwld) +void toaplan1_state::machine_reset_demonwld() { - MACHINE_RESET_CALL_MEMBER(toaplan1); + machine_reset_toaplan1(); m_dsp_addr_w = 0; m_main_ram_seg = 0; m_dsp_execute = 0; } -MACHINE_RESET_MEMBER(toaplan1_state,vimana) +void toaplan1_state::machine_reset_vimana() { - MACHINE_RESET_CALL_MEMBER(toaplan1); + machine_reset_toaplan1(); m_maincpu->set_reset_callback(write_line_delegate(FUNC(toaplan1_state::toaplan1_reset_callback),this)); } diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp index 331f20f592e..c7cdbe5747b 100644 --- a/src/mame/machine/trs80.cpp +++ b/src/mame/machine/trs80.cpp @@ -790,7 +790,7 @@ void trs80_state::machine_reset() m_cassette_data = 0; } -MACHINE_RESET_MEMBER(trs80_state,trs80m4) +void trs80_state::machine_reset_trs80m4() { address_space &mem = m_maincpu->space(AS_PROGRAM); m_cassette_data = 0; @@ -836,7 +836,7 @@ MACHINE_RESET_MEMBER(trs80_state,trs80m4) trs80m4_84_w(mem, 0, 0); /* switch in devices at power-on */ } -MACHINE_RESET_MEMBER(trs80_state,lnw80) +void trs80_state::machine_reset_lnw80() { address_space &space = m_maincpu->space(AS_PROGRAM); m_cassette_data = 0; @@ -844,10 +844,10 @@ MACHINE_RESET_MEMBER(trs80_state,lnw80) lnw80_fe_w(space, 0, 0); } -MACHINE_RESET_MEMBER(trs80_state,cp500) +void trs80_state::machine_reset_cp500() { m_a11_flipflop = 0; - MACHINE_RESET_CALL_MEMBER( trs80m4 ); + machine_reset_trs80m4(); } diff --git a/src/mame/machine/twincobr.cpp b/src/mame/machine/twincobr.cpp index 2a081806c11..e1dae83d6bb 100644 --- a/src/mame/machine/twincobr.cpp +++ b/src/mame/machine/twincobr.cpp @@ -243,7 +243,7 @@ WRITE16_MEMBER(twincobr_state::twincobr_sharedram_w) } -MACHINE_RESET_MEMBER(twincobr_state,twincobr) +void twincobr_state::machine_reset_twincobr() { m_dsp_addr_w = 0; m_main_ram_seg = 0; diff --git a/src/mame/machine/tx1.cpp b/src/mame/machine/tx1.cpp index 4521e4fcb5d..ac294c3db76 100644 --- a/src/mame/machine/tx1.cpp +++ b/src/mame/machine/tx1.cpp @@ -1404,7 +1404,7 @@ READ16_MEMBER(tx1_state::buggyboy_spcs_ram_r) * *************************************/ -MACHINE_RESET_MEMBER(tx1_state,buggyboy) +void tx1_state::machine_reset_buggyboy() { // TODO: This is connected to the /BUSACK line of the Z80 m_maincpu->set_input_line(INPUT_LINE_TEST, ASSERT_LINE); @@ -1412,7 +1412,7 @@ MACHINE_RESET_MEMBER(tx1_state,buggyboy) memset(&m_math, 0, sizeof(m_math)); } -MACHINE_RESET_MEMBER(tx1_state,tx1) +void tx1_state::machine_reset_tx1() { // TODO: This is connected to the /BUSACK line of the Z80 m_maincpu->set_input_line(INPUT_LINE_TEST, ASSERT_LINE); diff --git a/src/mame/machine/ut88.cpp b/src/mame/machine/ut88.cpp index 1ac29589dd9..658e9f89a63 100644 --- a/src/mame/machine/ut88.cpp +++ b/src/mame/machine/ut88.cpp @@ -87,7 +87,7 @@ WRITE8_MEMBER( ut88_state::ut88_8255_porta_w ) m_keyboard_mask = data ^ 0xff; } -MACHINE_RESET_MEMBER(ut88_state,ut88) +void ut88_state::machine_reset_ut88() { timer_set(attotime::from_usec(10), TIMER_RESET); m_bank1->set_entry(1); @@ -165,13 +165,13 @@ void ut88_state::init_ut88mini() { } -MACHINE_START_MEMBER(ut88_state,ut88mini) +void ut88_state::machine_start_ut88mini() { m_digits.resolve(); timer_set(attotime::from_hz(60), TIMER_UPDATE_DISPLAY); } -MACHINE_RESET_MEMBER(ut88_state,ut88mini) +void ut88_state::machine_reset_ut88mini() { m_lcd_digit[0] = m_lcd_digit[1] = m_lcd_digit[2] = 0; m_lcd_digit[3] = m_lcd_digit[4] = m_lcd_digit[5] = 0; diff --git a/src/mame/machine/vsnes.cpp b/src/mame/machine/vsnes.cpp index db00020acea..ab2cd49271f 100644 --- a/src/mame/machine/vsnes.cpp +++ b/src/mame/machine/vsnes.cpp @@ -137,7 +137,7 @@ READ8_MEMBER(vsnes_state::vsnes_in1_1_r) * *************************************/ -MACHINE_RESET_MEMBER(vsnes_state,vsnes) +void vsnes_state::machine_reset_vsnes() { m_last_bank = 0xff; m_sound_fix = 0; @@ -152,7 +152,7 @@ MACHINE_RESET_MEMBER(vsnes_state,vsnes) * *************************************/ -MACHINE_RESET_MEMBER(vsnes_state,vsdual) +void vsnes_state::machine_reset_vsdual() { m_input_latch[0] = m_input_latch[1] = 0; m_input_latch[2] = m_input_latch[3] = 0; @@ -182,7 +182,7 @@ void vsnes_state::v_set_videorom_bank( int start, int count, int vrom_start_ban } } -MACHINE_START_MEMBER(vsnes_state,vsnes) +void vsnes_state::machine_start_vsnes() { address_space &ppu1_space = machine().device("ppu1")->memory().space(AS_PROGRAM); int i; @@ -228,7 +228,7 @@ MACHINE_START_MEMBER(vsnes_state,vsnes) } } -MACHINE_START_MEMBER(vsnes_state,vsdual) +void vsnes_state::machine_start_vsdual() { m_vrom[0] = memregion("gfx1")->base(); m_vrom[1] = memregion("gfx2")->base(); diff --git a/src/mame/machine/vtech2.cpp b/src/mame/machine/vtech2.cpp index f88ce25742b..4de4bbb750c 100644 --- a/src/mame/machine/vtech2.cpp +++ b/src/mame/machine/vtech2.cpp @@ -100,13 +100,13 @@ void vtech2_state::machine_reset() laser_machine_init(0x00f, 3); } -MACHINE_RESET_MEMBER(vtech2_state,laser500) +void vtech2_state::machine_reset_laser500() { /* banks 0 to 2, and 4-7 only, optional ROM extension */ laser_machine_init(0x0f7, 7); } -MACHINE_RESET_MEMBER(vtech2_state,laser700) +void vtech2_state::machine_reset_laser700() { /* all banks except #3 */ laser_machine_init(0xff7, 7); diff --git a/src/mame/machine/williams.cpp b/src/mame/machine/williams.cpp index c39904c3e3b..e9e49f47ada 100644 --- a/src/mame/machine/williams.cpp +++ b/src/mame/machine/williams.cpp @@ -115,7 +115,7 @@ WRITE_LINE_MEMBER(williams2_state::tshoot_main_irq) * *************************************/ -MACHINE_START_MEMBER(williams_state,williams_common) +void williams_state::machine_start_williams_common() { /* configure the memory bank */ membank("bank1")->configure_entry(1, memregion("maincpu")->base() + 0x10000); @@ -123,7 +123,7 @@ MACHINE_START_MEMBER(williams_state,williams_common) } -MACHINE_RESET_MEMBER(williams_state,williams_common) +void williams_state::machine_reset_williams_common() { /* set a timer to go off every 16 scanlines, to toggle the VA11 line and update the screen */ timer_device *scan_timer = machine().device<timer_device>("scan_timer"); @@ -135,15 +135,15 @@ MACHINE_RESET_MEMBER(williams_state,williams_common) } -MACHINE_START_MEMBER(williams_state,williams) +void williams_state::machine_start_williams() { - MACHINE_START_CALL_MEMBER(williams_common); + machine_start_williams_common(); } -MACHINE_RESET_MEMBER(williams_state,williams) +void williams_state::machine_reset_williams() { - MACHINE_RESET_CALL_MEMBER(williams_common); + machine_reset_williams_common(); } @@ -196,7 +196,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(williams2_state::williams2_endscreen_callback) * *************************************/ -MACHINE_START_MEMBER(williams2_state,williams2) +void williams2_state::machine_start_williams2() { /* configure memory banks */ membank("bank1")->configure_entries(1, 4, memregion("maincpu")->base() + 0x10000, 0x10000); @@ -205,7 +205,7 @@ MACHINE_START_MEMBER(williams2_state,williams2) } -MACHINE_RESET_MEMBER(williams2_state,williams2) +void williams2_state::machine_reset_williams2() { address_space &space = m_maincpu->space(AS_PROGRAM); @@ -426,16 +426,16 @@ WRITE8_MEMBER(williams2_state::williams2_7segment_w) * *************************************/ -MACHINE_START_MEMBER(williams_state,defender) +void williams_state::machine_start_defender() { } -MACHINE_RESET_MEMBER(williams_state,defender) +void williams_state::machine_reset_defender() { address_space &space = m_maincpu->space(AS_PROGRAM); - MACHINE_RESET_CALL_MEMBER(williams_common); + machine_reset_williams_common(); defender_bank_select_w(space, 0, 0); } @@ -495,7 +495,7 @@ WRITE8_MEMBER(williams_state::sinistar_vram_select_w) * *************************************/ -MACHINE_START_MEMBER(blaster_state,blaster) +void blaster_state::machine_start_blaster() { /* banking is different for blaster */ membank("bank1")->configure_entries(1, 16, memregion("maincpu")->base() + 0x18000, 0x4000); @@ -510,9 +510,9 @@ MACHINE_START_MEMBER(blaster_state,blaster) } -MACHINE_RESET_MEMBER(blaster_state,blaster) +void blaster_state::machine_reset_blaster() { - MACHINE_RESET_CALL_MEMBER(williams_common); + machine_reset_williams_common(); } @@ -614,16 +614,16 @@ WRITE8_MEMBER(tshoot_state::lamp_w) * *************************************/ -MACHINE_START_MEMBER(joust2_state,joust2) +void joust2_state::machine_start_joust2() { - MACHINE_START_CALL_MEMBER(williams2); + machine_start_williams2(); save_item(NAME(m_joust2_current_sound_data)); } -MACHINE_RESET_MEMBER(joust2_state,joust2) +void joust2_state::machine_reset_joust2() { - MACHINE_RESET_CALL_MEMBER(williams2); + machine_reset_williams2(); } diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp index 847a8d91f2d..e5ff01986f3 100644 --- a/src/mame/machine/z80ne.cpp +++ b/src/mame/machine/z80ne.cpp @@ -234,7 +234,7 @@ void z80netf_state::reset_lx390_banking() */ } -MACHINE_RESET_MEMBER(z80ne_state,z80ne_base) +void z80ne_state::machine_reset_z80ne_base() { int i; @@ -286,32 +286,32 @@ MACHINE_RESET_MEMBER(z80ne_state,z80ne_base) } -MACHINE_RESET_MEMBER(z80ne_state,z80ne) +void z80ne_state::machine_reset_z80ne() { LOG("In machine_reset z80ne\n"); reset_lx382_banking(); - MACHINE_RESET_CALL_MEMBER( z80ne_base ); + machine_reset_z80ne_base(); } -MACHINE_RESET_MEMBER(z80ne_state,z80net) +void z80ne_state::machine_reset_z80net() { LOG("In machine_reset z80net\n"); - MACHINE_RESET_CALL_MEMBER( z80ne ); + machine_reset_z80ne(); reset_lx387(); } -MACHINE_RESET_MEMBER(z80ne_state,z80netb) +void z80ne_state::machine_reset_z80netb() { LOG("In machine_reset z80netb\n"); - MACHINE_RESET_CALL_MEMBER( z80ne_base ); + machine_reset_z80ne_base(); reset_lx387(); } -MACHINE_RESET_MEMBER(z80netf_state,z80netf) +void z80netf_state::machine_reset_z80netf() { LOG("In machine_reset z80netf\n"); reset_lx390_banking(); - MACHINE_RESET_CALL_MEMBER( z80ne_base ); + machine_reset_z80ne_base(); reset_lx387(); } @@ -337,7 +337,7 @@ INPUT_CHANGED_MEMBER(z80ne_state::z80ne_nmi) } } -MACHINE_START_MEMBER(z80ne_state,z80ne) +void z80ne_state::machine_start_z80ne() { LOG("In MACHINE_START z80ne\n"); @@ -355,21 +355,21 @@ MACHINE_START_MEMBER(z80ne_state,z80ne) m_kbd_timer->adjust(attotime::from_hz(1000), 0, attotime::from_hz(1000)); } -MACHINE_START_MEMBER(z80ne_state,z80net) +void z80ne_state::machine_start_z80net() { - MACHINE_START_CALL_MEMBER( z80ne ); + machine_start_z80ne(); LOG("In MACHINE_START z80net\n"); } -MACHINE_START_MEMBER(z80ne_state,z80netb) +void z80ne_state::machine_start_z80netb() { - MACHINE_START_CALL_MEMBER( z80net ); + machine_start_z80net(); LOG("In MACHINE_START z80netb\n"); } -MACHINE_START_MEMBER(z80netf_state,z80netf) +void z80netf_state::machine_start_z80netf() { - MACHINE_START_CALL_MEMBER( z80net ); + machine_start_z80net(); LOG("In MACHINE_START z80netf\n"); m_drv_led.resolve(); diff --git a/src/mame/video/8080bw.cpp b/src/mame/video/8080bw.cpp index 4f213e05648..c8c49c9a613 100644 --- a/src/mame/video/8080bw.cpp +++ b/src/mame/video/8080bw.cpp @@ -13,7 +13,7 @@ #include "includes/8080bw.h" -MACHINE_START_MEMBER(_8080bw_state,extra_8080bw_vh) +void _8080bw_state::machine_start_extra_8080bw_vh() { save_item(NAME(m_flip_screen)); save_item(NAME(m_color_map)); diff --git a/src/mame/video/aerofgt.cpp b/src/mame/video/aerofgt.cpp index 7b39d8d9181..fd04bdeead4 100644 --- a/src/mame/video/aerofgt.cpp +++ b/src/mame/video/aerofgt.cpp @@ -71,7 +71,7 @@ void aerofgt_state::aerofgt_register_state_globals( ) save_item(NAME(m_spritepalettebank)); } -VIDEO_START_MEMBER(aerofgt_state,pspikes) +void aerofgt_state::video_start_pspikes() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); /* no bg2 in this game */ @@ -82,7 +82,7 @@ VIDEO_START_MEMBER(aerofgt_state,pspikes) save_item(NAME(m_spikes91_lookup)); } -VIDEO_START_MEMBER(aerofgt_state,karatblz) +void aerofgt_state::video_start_karatblz() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_tile_info<0>),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_tile_info<1>),this),TILEMAP_SCAN_ROWS,8,8,64,64); @@ -94,7 +94,7 @@ VIDEO_START_MEMBER(aerofgt_state,karatblz) aerofgt_register_state_globals(); } -VIDEO_START_MEMBER(aerofgt_state,spinlbrk) +void aerofgt_state::video_start_spinlbrk() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::spinlbrk_tile_info<0>),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::karatblz_tile_info<1>),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -109,7 +109,7 @@ VIDEO_START_MEMBER(aerofgt_state,spinlbrk) aerofgt_register_state_globals(); } -VIDEO_START_MEMBER(aerofgt_state,turbofrc) +void aerofgt_state::video_start_turbofrc() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_tile_info<0>),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_tile_info<1>),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -365,7 +365,7 @@ uint32_t aerofgt_state::screen_update_aerofgt(screen_device &screen, bitmap_ind1 ***************************************************************************/ // BOOTLEG -VIDEO_START_MEMBER(aerofgt_state,wbbc97) +void aerofgt_state::video_start_wbbc97() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(aerofgt_state::get_pspikes_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); /* no bg2 in this game */ diff --git a/src/mame/video/alpha68k.cpp b/src/mame/video/alpha68k.cpp index 9fbfc853229..5fa130a8eab 100644 --- a/src/mame/video/alpha68k.cpp +++ b/src/mame/video/alpha68k.cpp @@ -40,7 +40,7 @@ WRITE16_MEMBER(alpha68k_state::alpha68k_videoram_w) m_fix_tilemap->mark_tile_dirty(offset / 2); } -VIDEO_START_MEMBER(alpha68k_state,alpha68k) +void alpha68k_state::video_start_alpha68k() { m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(alpha68k_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp index 15aa9319a7d..6521e501352 100644 --- a/src/mame/video/amiga.cpp +++ b/src/mame/video/amiga.cpp @@ -124,12 +124,10 @@ PALETTE_INIT_MEMBER(amiga_state,amiga) * *************************************/ -VIDEO_START_MEMBER( amiga_state, amiga ) +void amiga_state::video_start_amiga() { - int j; - /* generate tables that produce the correct playfield color for dual playfield mode */ - for (j = 0; j < 64; j++) + for (int j = 0; j < 64; j++) { int pf1pix = ((j >> 0) & 1) | ((j >> 1) & 2) | ((j >> 2) & 4); int pf2pix = ((j >> 1) & 1) | ((j >> 2) & 2) | ((j >> 3) & 4); diff --git a/src/mame/video/amigaaga.cpp b/src/mame/video/amigaaga.cpp index d73a1f4c373..1aacb91b8d4 100644 --- a/src/mame/video/amigaaga.cpp +++ b/src/mame/video/amigaaga.cpp @@ -76,9 +76,9 @@ void amiga_state::aga_palette_write(int color_reg, uint16_t data) * *************************************/ -VIDEO_START_MEMBER(amiga_state,amiga_aga) +void amiga_state::video_start_amiga_aga() { - VIDEO_START_CALL_MEMBER( amiga ); + video_start_amiga(); m_aga_diwhigh_written = 0; m_screen->register_screen_bitmap(m_flickerfixer32); diff --git a/src/mame/video/ampoker2.cpp b/src/mame/video/ampoker2.cpp index 686e3618715..1d7fb1c5b91 100644 --- a/src/mame/video/ampoker2.cpp +++ b/src/mame/video/ampoker2.cpp @@ -153,7 +153,7 @@ void ampoker2_state::video_start() 8, 8, 64, 32); } -VIDEO_START_MEMBER(ampoker2_state,sigma2k) +void ampoker2_state::video_start_sigma2k() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ampoker2_state::s2k_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp index 180ee08aaa0..6062e178d61 100644 --- a/src/mame/video/apple2.cpp +++ b/src/mame/video/apple2.cpp @@ -561,7 +561,7 @@ void apple2_state::apple2_video_start(const uint8_t *vram, const uint8_t *aux_vr -VIDEO_START_MEMBER(apple2_state,apple2) +void apple2_state::video_start_apple2() { apple2_video_start(m_ram->pointer(), m_ram->pointer()+0x10000, VAR_80COL | VAR_ALTCHARSET | VAR_DHIRES, 4); @@ -573,7 +573,7 @@ VIDEO_START_MEMBER(apple2_state,apple2) } -VIDEO_START_MEMBER(apple2_state,apple2p) +void apple2_state::video_start_apple2p() { apple2_video_start(m_ram->pointer(), m_ram->pointer(), VAR_80COL | VAR_ALTCHARSET | VAR_DHIRES, 8); @@ -585,7 +585,7 @@ VIDEO_START_MEMBER(apple2_state,apple2p) } -VIDEO_START_MEMBER(apple2_state,apple2e) +void apple2_state::video_start_apple2e() { device_a2eauxslot_card_interface *auxslotdevice = m_a2eauxslot->get_a2eauxslot_card(); if (auxslotdevice) @@ -599,7 +599,7 @@ VIDEO_START_MEMBER(apple2_state,apple2e) } -VIDEO_START_MEMBER(apple2_state,apple2c) +void apple2_state::video_start_apple2c() { apple2_video_start(m_ram->pointer(), m_ram->pointer()+0x10000, 0, 8); } diff --git a/src/mame/video/apple2gs.cpp b/src/mame/video/apple2gs.cpp index 2f10133e7e3..6f39ea2d8b0 100644 --- a/src/mame/video/apple2gs.cpp +++ b/src/mame/video/apple2gs.cpp @@ -15,7 +15,7 @@ -VIDEO_START_MEMBER(apple2gs_state,apple2gs) +void apple2gs_state::video_start_apple2gs() { m_bordercolor = 0; apple2_video_start(m_slowmem.get(), m_slowmem.get()+0x10000, 0, 8); diff --git a/src/mame/video/apple3.cpp b/src/mame/video/apple3.cpp index 724907d6c23..21bdbe6ef6b 100644 --- a/src/mame/video/apple3.cpp +++ b/src/mame/video/apple3.cpp @@ -118,7 +118,7 @@ void apple3_state::apple3_write_charmem() -VIDEO_START_MEMBER(apple3_state,apple3) +void apple3_state::video_start_apple3() { int i, j; uint32_t v; diff --git a/src/mame/video/argus.cpp b/src/mame/video/argus.cpp index 90a80b8e183..a35cfe2f794 100644 --- a/src/mame/video/argus.cpp +++ b/src/mame/video/argus.cpp @@ -259,7 +259,7 @@ void argus_state::reset_common() m_palette_intensity = 0; } -VIDEO_START_MEMBER(argus_state,argus) +void argus_state::video_start_argus() { /* info offset w h col row */ m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); @@ -280,7 +280,7 @@ VIDEO_START_MEMBER(argus_state,argus) save_item(NAME(m_prvscrollx)); } -VIDEO_RESET_MEMBER(argus_state,argus) +void argus_state::video_reset_argus() { m_lowbitscroll = 0; m_prvscrollx = 0; @@ -290,7 +290,7 @@ VIDEO_RESET_MEMBER(argus_state,argus) reset_common(); } -VIDEO_START_MEMBER(argus_state,valtric) +void argus_state::video_start_valtric() { /* info offset w h col row */ m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::valtric_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); @@ -308,13 +308,13 @@ VIDEO_START_MEMBER(argus_state,valtric) save_item(NAME(m_mosaic)); } -VIDEO_RESET_MEMBER(argus_state,valtric) +void argus_state::video_reset_valtric() { m_valtric_mosaic = 0x0f; reset_common(); } -VIDEO_START_MEMBER(argus_state,butasan) +void argus_state::video_start_butasan() { /* info offset w h col row */ m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::butasan_get_bg0_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -342,7 +342,7 @@ VIDEO_START_MEMBER(argus_state,butasan) save_item(NAME(m_butasan_unknown)); } -VIDEO_RESET_MEMBER(argus_state,butasan) +void argus_state::video_reset_butasan() { m_butasan_page_latch = 0; m_butasan_bg1_status = 0x01; diff --git a/src/mame/video/armedf.cpp b/src/mame/video/armedf.cpp index e68f4cf98ac..a6056e00ce8 100644 --- a/src/mame/video/armedf.cpp +++ b/src/mame/video/armedf.cpp @@ -111,7 +111,7 @@ TILE_GET_INFO_MEMBER(armedf_state::get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(armedf_state,terraf) +void armedf_state::video_start_terraf() { m_sprite_offy = (m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ @@ -134,7 +134,7 @@ VIDEO_START_MEMBER(armedf_state,terraf) save_pointer(NAME(m_text_videoram.get()), 0x1000); } -VIDEO_START_MEMBER(armedf_state,armedf) +void armedf_state::video_start_armedf() { m_sprite_offy = (m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ diff --git a/src/mame/video/astrocde.cpp b/src/mame/video/astrocde.cpp index cc53ca0cf1a..2e383501505 100644 --- a/src/mame/video/astrocde.cpp +++ b/src/mame/video/astrocde.cpp @@ -179,7 +179,7 @@ void astrocde_state::video_start() } -VIDEO_START_MEMBER(astrocde_state,profpac) +void astrocde_state::video_start_profpac() { /* allocate timers */ m_scanline_timer = timer_alloc(TIMER_SCANLINE); diff --git a/src/mame/video/atarig1.cpp b/src/mame/video/atarig1.cpp index 7f769a77a4e..2563051e852 100644 --- a/src/mame/video/atarig1.cpp +++ b/src/mame/video/atarig1.cpp @@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(atarig1_state::get_playfield_tile_info) * *************************************/ -VIDEO_START_MEMBER(atarig1_state,atarig1) +void atarig1_state::video_start_atarig1() { /* blend the playfields and free the temporary one */ blend_gfx(0, 2, 0x0f, 0x10); diff --git a/src/mame/video/atarig42.cpp b/src/mame/video/atarig42.cpp index b553cc0f512..f196d7edc39 100644 --- a/src/mame/video/atarig42.cpp +++ b/src/mame/video/atarig42.cpp @@ -67,7 +67,7 @@ TILEMAP_MAPPER_MEMBER(atarig42_state::atarig42_playfield_scan) * *************************************/ -VIDEO_START_MEMBER(atarig42_state,atarig42) +void atarig42_state::video_start_atarig42() { /* blend the playfields and free the temporary one */ blend_gfx(0, 2, 0x0f, 0x30); diff --git a/src/mame/video/atarigt.cpp b/src/mame/video/atarigt.cpp index 6f1808b797f..aba6ad65d2f 100644 --- a/src/mame/video/atarigt.cpp +++ b/src/mame/video/atarigt.cpp @@ -76,7 +76,7 @@ TILEMAP_MAPPER_MEMBER(atarigt_state::atarigt_playfield_scan) * *************************************/ -VIDEO_START_MEMBER(atarigt_state,atarigt) +void atarigt_state::video_start_atarigt() { /* blend the playfields and free the temporary one */ blend_gfx(0, 2, 0x0f, 0x30); diff --git a/src/mame/video/atarisy1.cpp b/src/mame/video/atarisy1.cpp index be249e8e873..0fb6723c126 100644 --- a/src/mame/video/atarisy1.cpp +++ b/src/mame/video/atarisy1.cpp @@ -143,7 +143,7 @@ const atari_motion_objects_config atarisy1_state::s_mob_config = 0xffff /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(atarisy1_state,atarisy1) +void atarisy1_state::video_start_atarisy1() { /* first decode the graphics */ uint16_t motable[256]; diff --git a/src/mame/video/atarisy2.cpp b/src/mame/video/atarisy2.cpp index 0c735cccc4f..d040767f014 100644 --- a/src/mame/video/atarisy2.cpp +++ b/src/mame/video/atarisy2.cpp @@ -77,7 +77,7 @@ const atari_motion_objects_config atarisy2_state::s_mob_config = 0 /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(atarisy2_state,atarisy2) +void atarisy2_state::video_start_atarisy2() { /* reset the statics */ m_yscroll_reset_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(atarisy2_state::reset_yscroll_callback),this)); diff --git a/src/mame/video/badlands.cpp b/src/mame/video/badlands.cpp index c8c0a955b99..b6f7b28823b 100644 --- a/src/mame/video/badlands.cpp +++ b/src/mame/video/badlands.cpp @@ -68,7 +68,7 @@ const atari_motion_objects_config badlands_state::s_mob_config = 0, /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(badlands_state,badlands) +void badlands_state::video_start_badlands() { /* save states */ save_item(NAME(m_playfield_tile_bank)); diff --git a/src/mame/video/bbc.cpp b/src/mame/video/bbc.cpp index 96e53a0e380..5d3e34e9969 100644 --- a/src/mame/video/bbc.cpp +++ b/src/mame/video/bbc.cpp @@ -298,7 +298,7 @@ void bbc_state::setvideoshadow(int vdusel) * Initialize the BBC video emulation ************************************************************************/ -VIDEO_START_MEMBER(bbc_state, bbc) +void bbc_state::video_start_bbc() { m_cursor_size = 1; diff --git a/src/mame/video/bbusters.cpp b/src/mame/video/bbusters.cpp index 19092dfd82d..36344f66657 100644 --- a/src/mame/video/bbusters.cpp +++ b/src/mame/video/bbusters.cpp @@ -70,7 +70,7 @@ WRITE16_MEMBER(bbusters_state::pf2_w) /******************************************************************************/ -VIDEO_START_MEMBER(bbusters_state,bbuster) +void bbusters_state::video_start_bbuster() { m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); @@ -82,7 +82,7 @@ VIDEO_START_MEMBER(bbusters_state,bbuster) save_item(NAME(m_scale_line_count)); } -VIDEO_START_MEMBER(bbusters_state,mechatt) +void bbusters_state::video_start_mechatt() { m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); diff --git a/src/mame/video/blstroid.cpp b/src/mame/video/blstroid.cpp index af8c6b9a12e..7c716113524 100644 --- a/src/mame/video/blstroid.cpp +++ b/src/mame/video/blstroid.cpp @@ -69,7 +69,7 @@ const atari_motion_objects_config blstroid_state::s_mob_config = 0 /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(blstroid_state,blstroid) +void blstroid_state::video_start_blstroid() { m_irq_off_timer = timer_alloc(TIMER_IRQ_OFF); m_irq_on_timer = timer_alloc(TIMER_IRQ_ON); diff --git a/src/mame/video/blueprnt.cpp b/src/mame/video/blueprnt.cpp index 756a7db1abd..3e6666e6805 100644 --- a/src/mame/video/blueprnt.cpp +++ b/src/mame/video/blueprnt.cpp @@ -116,7 +116,7 @@ TILE_GET_INFO_MEMBER(blueprnt_state::get_bg_tile_info) -VIDEO_START_MEMBER(blueprnt_state,blueprnt) +void blueprnt_state::video_start_blueprnt() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(blueprnt_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/bosco.cpp b/src/mame/video/bosco.cpp index 2936382386e..463955f109b 100644 --- a/src/mame/video/bosco.cpp +++ b/src/mame/video/bosco.cpp @@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(bosco_state::fg_get_tile_info ) ***************************************************************************/ -VIDEO_START_MEMBER(bosco_state,bosco) +void bosco_state::video_start_bosco() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bosco_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(bosco_state::fg_get_tile_info),this),tilemap_mapper_delegate(FUNC(bosco_state::fg_tilemap_scan),this), 8,8, 8,32); diff --git a/src/mame/video/btime.cpp b/src/mame/video/btime.cpp index f0341bb9c6a..266ded94ccd 100644 --- a/src/mame/video/btime.cpp +++ b/src/mame/video/btime.cpp @@ -116,14 +116,14 @@ Start the video hardware emulation. ***************************************************************************/ -VIDEO_START_MEMBER(btime_state,disco) +void btime_state::video_start_disco() { // graphics are in RAM m_gfxdecode->gfx(0)->set_source(m_deco_charram); m_gfxdecode->gfx(1)->set_source(m_deco_charram); } -VIDEO_START_MEMBER(btime_state,bnj) +void btime_state::video_start_bnj() { /* the background area is twice as wide as the screen */ int width = 256; diff --git a/src/mame/video/cave.cpp b/src/mame/video/cave.cpp index 4850caf1e1b..f4ee8cfe192 100644 --- a/src/mame/video/cave.cpp +++ b/src/mame/video/cave.cpp @@ -388,13 +388,13 @@ void cave_state::cave_vh_start( int num ) } } -VIDEO_START_MEMBER(cave_state,cave_1_layer){ cave_vh_start(1); } -VIDEO_START_MEMBER(cave_state,cave_2_layers){ cave_vh_start(2); } -VIDEO_START_MEMBER(cave_state,cave_3_layers){ cave_vh_start(3); } -VIDEO_START_MEMBER(cave_state,cave_4_layers){ cave_vh_start(4); } +void cave_state::video_start_cave_1_layer() { cave_vh_start(1); } +void cave_state::video_start_cave_2_layers() { cave_vh_start(2); } +void cave_state::video_start_cave_3_layers() { cave_vh_start(3); } +void cave_state::video_start_cave_4_layers() { cave_vh_start(4); } -VIDEO_START_MEMBER(cave_state,sailormn_3_layers) +void cave_state::video_start_sailormn_3_layers() { cave_vh_start(2); diff --git a/src/mame/video/cclimber.cpp b/src/mame/video/cclimber.cpp index f2aeac11cfe..1322e1a05cc 100644 --- a/src/mame/video/cclimber.cpp +++ b/src/mame/video/cclimber.cpp @@ -452,7 +452,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::toproller_get_bg_tile_info) } -VIDEO_START_MEMBER(cclimber_state,cclimber) +void cclimber_state::video_start_cclimber() { m_pf_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::cclimber_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); @@ -469,7 +469,7 @@ VIDEO_START_MEMBER(cclimber_state,cclimber) } -VIDEO_START_MEMBER(cclimber_state,swimmer) +void cclimber_state::video_start_swimmer() { m_pf_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::swimmer_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); @@ -488,7 +488,7 @@ VIDEO_START_MEMBER(cclimber_state,swimmer) } -VIDEO_START_MEMBER(cclimber_state,toprollr) +void cclimber_state::video_start_toprollr() { m_pf_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cclimber_state::toprollr_get_pf_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/centiped.cpp b/src/mame/video/centiped.cpp index 0918e4df3bd..16b25029100 100644 --- a/src/mame/video/centiped.cpp +++ b/src/mame/video/centiped.cpp @@ -92,7 +92,7 @@ void centiped_state::init_common() } -VIDEO_START_MEMBER(centiped_state,centiped) +void centiped_state::video_start_centiped() { init_common(); init_penmask(); @@ -101,7 +101,7 @@ VIDEO_START_MEMBER(centiped_state,centiped) } -VIDEO_START_MEMBER(centiped_state,warlords) +void centiped_state::video_start_warlords() { init_common(); @@ -109,7 +109,7 @@ VIDEO_START_MEMBER(centiped_state,warlords) } -VIDEO_START_MEMBER(centiped_state,milliped) +void centiped_state::video_start_milliped() { init_common(); init_penmask(); @@ -118,7 +118,7 @@ VIDEO_START_MEMBER(centiped_state,milliped) } -VIDEO_START_MEMBER(centiped_state,bullsdrt) +void centiped_state::video_start_bullsdrt() { init_common(); init_penmask(); diff --git a/src/mame/video/champbas.cpp b/src/mame/video/champbas.cpp index 6ce7f968f01..67bd88ab6f6 100644 --- a/src/mame/video/champbas.cpp +++ b/src/mame/video/champbas.cpp @@ -159,12 +159,12 @@ TILE_GET_INFO_MEMBER(champbas_state::exctsccr_get_bg_tile_info) * *************************************/ -VIDEO_START_MEMBER(champbas_state,champbas) +void champbas_state::video_start_champbas() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(champbas_state::champbas_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } -VIDEO_START_MEMBER(champbas_state,exctsccr) +void champbas_state::video_start_exctsccr() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(champbas_state::exctsccr_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/cinemat.cpp b/src/mame/video/cinemat.cpp index cd7e7a28793..92177e35ab9 100644 --- a/src/mame/video/cinemat.cpp +++ b/src/mame/video/cinemat.cpp @@ -168,25 +168,25 @@ void cinemat_state::video_start() } -VIDEO_START_MEMBER(cinemat_state,cinemat_16level) +void cinemat_state::video_start_cinemat_16level() { m_color_mode = COLOR_16LEVEL; } -VIDEO_START_MEMBER(cinemat_state,cinemat_64level) +void cinemat_state::video_start_cinemat_64level() { m_color_mode = COLOR_64LEVEL; } -VIDEO_START_MEMBER(cinemat_state,cinemat_color) +void cinemat_state::video_start_cinemat_color() { m_color_mode = COLOR_RGB; } -VIDEO_START_MEMBER(cinemat_state,cinemat_qb3color) +void cinemat_state::video_start_cinemat_qb3color() { m_color_mode = COLOR_QB3; } diff --git a/src/mame/video/clshroad.cpp b/src/mame/video/clshroad.cpp index 6e6e14b5730..fbdde418cc1 100644 --- a/src/mame/video/clshroad.cpp +++ b/src/mame/video/clshroad.cpp @@ -199,7 +199,7 @@ WRITE8_MEMBER(clshroad_state::vram_1_w) } -VIDEO_START_MEMBER(clshroad_state,firebatl) +void clshroad_state::video_start_firebatl() { /* These 2 use the graphics and scroll value */ m_tilemap_0a = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); @@ -217,7 +217,7 @@ VIDEO_START_MEMBER(clshroad_state,firebatl) m_tilemap_1->configure_groups(*m_gfxdecode->gfx(2), 0x0f); } -VIDEO_START_MEMBER(clshroad_state,clshroad) +void clshroad_state::video_start_clshroad() { /* These 2 use the graphics and scroll value */ m_tilemap_0a = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(clshroad_state::get_tile_info_0a),this),TILEMAP_SCAN_ROWS,16,16,0x20,0x10); diff --git a/src/mame/video/cninja.cpp b/src/mame/video/cninja.cpp index aede19bd9c0..38db38ede0b 100644 --- a/src/mame/video/cninja.cpp +++ b/src/mame/video/cninja.cpp @@ -11,7 +11,7 @@ /******************************************************************************/ -VIDEO_START_MEMBER(cninja_state,stoneage) +void cninja_state::video_start_stoneage() { /* The bootleg has broken scroll registers */ m_deco_tilegen[0]->set_scrolldx(3, 0, -10, -10); /* pf4 16x16 tilemap */ @@ -251,7 +251,7 @@ uint32_t cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind1 return 0; } -VIDEO_START_MEMBER(cninja_state,mutantf) +void cninja_state::video_start_mutantf() { m_sprgen[0]->alloc_sprite_bitmap(); m_sprgen[1]->alloc_sprite_bitmap(); diff --git a/src/mame/video/combatsc.cpp b/src/mame/video/combatsc.cpp index 3fcbbabedeb..883f27f4a1e 100644 --- a/src/mame/video/combatsc.cpp +++ b/src/mame/video/combatsc.cpp @@ -252,7 +252,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_text_info_bootleg) ***************************************************************************/ -VIDEO_START_MEMBER(combatsc_state,combatsc) +void combatsc_state::video_start_combatsc() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -271,7 +271,7 @@ VIDEO_START_MEMBER(combatsc_state,combatsc) save_pointer(NAME(m_spriteram[1].get()), 0x800); } -VIDEO_START_MEMBER(combatsc_state,combatscb) +void combatsc_state::video_start_combatscb() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp index 24420e6d8dc..c34647ec0f6 100644 --- a/src/mame/video/cps1.cpp +++ b/src/mame/video/cps1.cpp @@ -1683,7 +1683,7 @@ CPS1 VIDEO RENDERER #define CPS2_OBJ_YOFFS 0x0a /* Y offset (always 0x0010) */ -MACHINE_RESET_MEMBER(cps_state,cps) +void cps_state::machine_reset_cps() { const char *gamename = machine().system().name; const struct CPS1config *pCFG = &cps1_config_table[0]; @@ -2243,11 +2243,11 @@ void cps_state::cps1_update_transmasks() } } -VIDEO_START_MEMBER(cps_state,cps) +void cps_state::video_start_cps() { int i; - MACHINE_RESET_CALL_MEMBER(cps); + machine_reset_cps(); /* Put in some const */ m_scroll_size = 0x4000; /* scroll1, scroll2, scroll3 */ @@ -2340,16 +2340,16 @@ VIDEO_START_MEMBER(cps_state,cps) machine().save().register_postload(save_prepost_delegate(FUNC(cps_state::cps1_get_video_base), this)); } -VIDEO_START_MEMBER(cps_state,cps1) +void cps_state::video_start_cps1() { m_cps_version = 1; - VIDEO_START_CALL_MEMBER(cps); + video_start_cps(); } -VIDEO_START_MEMBER(cps_state,cps2) +void cps_state::video_start_cps2() { m_cps_version = 2; - VIDEO_START_CALL_MEMBER(cps); + video_start_cps(); } /*************************************************************************** diff --git a/src/mame/video/cvs.cpp b/src/mame/video/cvs.cpp index 824573f2ccc..ff13e91e749 100644 --- a/src/mame/video/cvs.cpp +++ b/src/mame/video/cvs.cpp @@ -117,7 +117,7 @@ WRITE8_MEMBER(cvs_state::cvs_scroll_w) } -VIDEO_START_MEMBER(cvs_state,cvs) +void cvs_state::video_start_cvs() { cvs_init_stars(); diff --git a/src/mame/video/ddragon.cpp b/src/mame/video/ddragon.cpp index 6c4f33f454b..415f8189f84 100644 --- a/src/mame/video/ddragon.cpp +++ b/src/mame/video/ddragon.cpp @@ -92,7 +92,7 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_fg_16color_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(ddragon_state,ddragon) +void ddragon_state::video_start_ddragon() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ddragon_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(ddragon_state::background_scan),this), 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ddragon_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/ddragon3.cpp b/src/mame/video/ddragon3.cpp index cdb40e0e3d3..9a5b4a9200f 100644 --- a/src/mame/video/ddragon3.cpp +++ b/src/mame/video/ddragon3.cpp @@ -144,7 +144,7 @@ void wwfwfest_state::video_start() } -VIDEO_START_MEMBER(wwfwfest_state,wwfwfstb) +void wwfwfest_state::video_start_wwfwfstb() { wwfwfest_state::video_start(); diff --git a/src/mame/video/dec0.cpp b/src/mame/video/dec0.cpp index f89f85c3148..0c7677b80f7 100644 --- a/src/mame/video/dec0.cpp +++ b/src/mame/video/dec0.cpp @@ -373,14 +373,14 @@ WRITE16_MEMBER(dec0_state::dec0_priority_w) COMBINE_DATA(&m_pri); } -VIDEO_START_MEMBER(dec0_state,dec0_nodma) +void dec0_state::video_start_dec0_nodma() { save_item(NAME(m_pri)); m_buffered_spriteram = m_spriteram; save_pointer(NAME(m_buffered_spriteram), 0x800/2); } -VIDEO_START_MEMBER(dec0_state,dec0) +void dec0_state::video_start_dec0() { save_item(NAME(m_pri)); m_buffered_spriteram = auto_alloc_array(machine(), uint16_t, 0x800/2); diff --git a/src/mame/video/dec8.cpp b/src/mame/video/dec8.cpp index fed8235b07f..cd8f3c49cdd 100644 --- a/src/mame/video/dec8.cpp +++ b/src/mame/video/dec8.cpp @@ -238,7 +238,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_cobracom_fix_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,cobracom) +void dec8_state::video_start_cobracom() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_cobracom_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -272,7 +272,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_ghostb_fix_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,ghostb) +void dec8_state::video_start_ghostb() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_ghostb_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -314,7 +314,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_oscar_fix_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,oscar) +void dec8_state::video_start_oscar() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_oscar_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -387,7 +387,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_lastmisn_fix_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,lastmisn) +void dec8_state::video_start_lastmisn() { allocate_buffered_spriteram16(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_tile_info),this), tilemap_mapper_delegate(FUNC(dec8_state::lastmisn_scan_rows),this), 16, 16, 32, 32); @@ -397,7 +397,7 @@ VIDEO_START_MEMBER(dec8_state,lastmisn) m_game_uses_priority = 0; } -VIDEO_START_MEMBER(dec8_state,shackled) +void dec8_state::video_start_shackled() { allocate_buffered_spriteram16(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_lastmisn_tile_info),this), tilemap_mapper_delegate(FUNC(dec8_state::lastmisn_scan_rows),this), 16, 16, 32, 32); @@ -451,7 +451,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_srdarwin_tile_info) tileinfo.group = color; } -VIDEO_START_MEMBER(dec8_state,srdarwin) +void dec8_state::video_start_srdarwin() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_srdarwin_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 16); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_srdarwin_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -519,7 +519,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_gondo_tile_info) 0); } -VIDEO_START_MEMBER(dec8_state,gondo) +void dec8_state::video_start_gondo() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -530,7 +530,7 @@ VIDEO_START_MEMBER(dec8_state,gondo) m_game_uses_priority = 0; } -VIDEO_START_MEMBER(dec8_state,garyoret) +void dec8_state::video_start_garyoret() { allocate_buffered_spriteram16(); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(dec8_state::get_gondo_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/deco32.cpp b/src/mame/video/deco32.cpp index fe7c2fd097d..98d7686cf29 100644 --- a/src/mame/video/deco32.cpp +++ b/src/mame/video/deco32.cpp @@ -83,14 +83,14 @@ void deco32_state::allocate_rowscroll(int size1, int size2, int size3, int size4 save_pointer(NAME(m_pf_rowscroll[3].get()), size4); } -VIDEO_START_MEMBER( captaven_state, captaven ) +void captaven_state::video_start_captaven() { deco32_state::allocate_spriteram(0); deco32_state::allocate_rowscroll(0x4000/4, 0x2000/4, 0x4000/4, 0x2000/4); deco32_state::video_start(); } -VIDEO_START_MEMBER( fghthist_state, fghthist ) +void fghthist_state::video_start_fghthist() { m_sprgen[0]->alloc_sprite_bitmap(); deco32_state::allocate_spriteram(0); @@ -99,11 +99,10 @@ VIDEO_START_MEMBER( fghthist_state, fghthist ) deco32_state::video_start(); } -VIDEO_START_MEMBER( nslasher_state, nslasher ) +void nslasher_state::video_start_nslasher() { - int width, height; - width = m_screen->width(); - height = m_screen->height(); + int width = m_screen->width(); + int height = m_screen->height(); m_tilemap_alpha_bitmap=std::make_unique<bitmap_ind16>(width, height ); for (int chip = 0; chip < 2; chip++) { @@ -114,7 +113,7 @@ VIDEO_START_MEMBER( nslasher_state, nslasher ) deco32_state::video_start(); } -VIDEO_START_MEMBER( dragngun_state, dragngun ) +void dragngun_state::video_start_dragngun() { m_screen->register_screen_bitmap(m_temp_render_bitmap); deco32_state::allocate_rowscroll(0x4000/4, 0x2000/4, 0x4000/4, 0x2000/4); diff --git a/src/mame/video/deco_mlc.cpp b/src/mame/video/deco_mlc.cpp index 85f066de120..00f226a562f 100644 --- a/src/mame/video/deco_mlc.cpp +++ b/src/mame/video/deco_mlc.cpp @@ -17,7 +17,7 @@ /******************************************************************************/ -VIDEO_START_MEMBER(deco_mlc_state,mlc) +void deco_mlc_state::video_start_mlc() { int max_color = (0x800 / m_gfxdecode->gfx(0)->granularity()); m_colour_mask=max_color - 1; diff --git a/src/mame/video/digdug.cpp b/src/mame/video/digdug.cpp index bfd31abe377..72b5f1840c5 100644 --- a/src/mame/video/digdug.cpp +++ b/src/mame/video/digdug.cpp @@ -140,7 +140,7 @@ TILE_GET_INFO_MEMBER(digdug_state::tx_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(digdug_state,digdug) +void digdug_state::video_start_digdug() { m_bg_select = 0; m_tx_color_mode = 0; diff --git a/src/mame/video/divebomb.cpp b/src/mame/video/divebomb.cpp index c1b58941930..3fa5288f43d 100644 --- a/src/mame/video/divebomb.cpp +++ b/src/mame/video/divebomb.cpp @@ -132,7 +132,7 @@ PALETTE_INIT_MEMBER(divebomb_state, divebomb) } -VIDEO_START_MEMBER(divebomb_state,divebomb) +void divebomb_state::video_start_divebomb() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(divebomb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/dkong.cpp b/src/mame/video/dkong.cpp index 9db63239907..a0e69876274 100644 --- a/src/mame/video/dkong.cpp +++ b/src/mame/video/dkong.cpp @@ -908,7 +908,7 @@ void dkong_state::check_palette() } } -VIDEO_START_MEMBER(dkong_state,dkong_base) +void dkong_state::video_start_dkong_base() { m_cd4049_b = (log(0.0 - log(cd4049_al)) - log(0.0 - log((1.0-cd4049_al))) ) / log(cd4049_vh/cd4049_vl); m_cd4049_a = log(0.0 - log(cd4049_al)) - m_cd4049_b * log(cd4049_vh); @@ -948,9 +948,9 @@ VIDEO_START_MEMBER(dkong_state,dkong_base) } -VIDEO_START_MEMBER(dkong_state,dkong) +void dkong_state::video_start_dkong() { - VIDEO_START_CALL_MEMBER(dkong_base); + video_start_dkong_base(); m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(dkong_state::scanline_callback),this)); m_scanline_timer->adjust(m_screen->time_until_pos(0)); diff --git a/src/mame/video/docastle.cpp b/src/mame/video/docastle.cpp index 38ed7995853..ef6069a5caf 100644 --- a/src/mame/video/docastle.cpp +++ b/src/mame/video/docastle.cpp @@ -114,7 +114,7 @@ void docastle_state::video_start() video_start_common(0x00ff); } -VIDEO_START_MEMBER(docastle_state,dorunrun) +void docastle_state::video_start_dorunrun() { video_start_common(0xff00); } diff --git a/src/mame/video/dynax.cpp b/src/mame/video/dynax.cpp index 6177c371c92..ed484338348 100644 --- a/src/mame/video/dynax.cpp +++ b/src/mame/video/dynax.cpp @@ -885,7 +885,7 @@ void dynax_state::dynax_common_reset() save_item(NAME(m_hanamai_priority)); } -VIDEO_START_MEMBER(dynax_state,hanamai) +void dynax_state::video_start_hanamai() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[0][1] = std::make_unique<uint8_t[]>(256 * 256); @@ -909,7 +909,7 @@ VIDEO_START_MEMBER(dynax_state,hanamai) save_pointer(NAME(m_pixmap[3][1].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,hnoridur) +void dynax_state::video_start_hnoridur() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[0][1] = std::make_unique<uint8_t[]>(256 * 256); @@ -935,13 +935,13 @@ VIDEO_START_MEMBER(dynax_state,hnoridur) save_pointer(NAME(m_pixmap[3][1].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,mcnpshnt) +void dynax_state::video_start_mcnpshnt() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); m_priority_table = priority_mcnpshnt; } -VIDEO_START_MEMBER(dynax_state,sprtmtch) +void dynax_state::video_start_sprtmtch() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[0][1] = std::make_unique<uint8_t[]>(256 * 256); @@ -961,7 +961,7 @@ VIDEO_START_MEMBER(dynax_state,sprtmtch) save_pointer(NAME(m_pixmap[2][1].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,jantouki) +void dynax_state::video_start_jantouki() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[0][1] = std::make_unique<uint8_t[]>(256 * 256); @@ -1002,7 +1002,7 @@ VIDEO_START_MEMBER(dynax_state,jantouki) save_pointer(NAME(m_pixmap[7][1].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,mjdialq2) +void dynax_state::video_start_mjdialq2() { m_pixmap[0][0] = std::make_unique<uint8_t[]>(256 * 256); m_pixmap[1][0] = std::make_unique<uint8_t[]>(256 * 256); @@ -1015,33 +1015,33 @@ VIDEO_START_MEMBER(dynax_state,mjdialq2) save_pointer(NAME(m_pixmap[1][0].get()), 256 * 256); } -VIDEO_START_MEMBER(dynax_state,mjelctrn) +void dynax_state::video_start_mjelctrn() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); m_priority_table = priority_mjelctrn; m_update_irq_func = &dynax_state::mjelctrn_update_irq; } -VIDEO_START_MEMBER(dynax_state,mjembase) +void dynax_state::video_start_mjembase() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); m_priority_table = priority_mjembase; m_update_irq_func = &dynax_state::mjelctrn_update_irq; } -VIDEO_START_MEMBER(dynax_state,neruton) +void dynax_state::video_start_neruton() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); // m_priority_table = priority_mjelctrn; m_update_irq_func = &dynax_state::mjelctrn_update_irq; } -VIDEO_START_MEMBER(dynax_state,tenkai) +void dynax_state::video_start_tenkai() { - VIDEO_START_CALL_MEMBER(hnoridur); + video_start_hnoridur(); m_priority_table = priority_mjelctrn; m_update_irq_func = &dynax_state::tenkai_update_irq; diff --git a/src/mame/video/eolith.cpp b/src/mame/video/eolith.cpp index 2df768faaef..4a7005dbe32 100644 --- a/src/mame/video/eolith.cpp +++ b/src/mame/video/eolith.cpp @@ -21,7 +21,7 @@ READ16_MEMBER(eolith_state::eolith_vram_r) return m_vram[offset+(0x40000/2)*m_buffer]; } -VIDEO_START_MEMBER(eolith_state,eolith) +void eolith_state::video_start_eolith() { m_vram = std::make_unique<uint16_t[]>(0x40000); save_pointer(NAME(m_vram.get()), 0x40000); diff --git a/src/mame/video/eprom.cpp b/src/mame/video/eprom.cpp index 6fbb6e34657..8c409b40e94 100644 --- a/src/mame/video/eprom.cpp +++ b/src/mame/video/eprom.cpp @@ -122,7 +122,7 @@ const atari_motion_objects_config eprom_state::s_mob_config = 0 /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(eprom_state,eprom) +void eprom_state::video_start_eprom() { /* save states */ save_item(NAME(m_screen_intensity)); @@ -164,7 +164,7 @@ const atari_motion_objects_config eprom_state::s_guts_mob_config = 0 /* resulting value to indicate "special" */ }; -VIDEO_START_MEMBER(eprom_state,guts) +void eprom_state::video_start_guts() { /* save states */ save_item(NAME(m_screen_intensity)); diff --git a/src/mame/video/equites.cpp b/src/mame/video/equites.cpp index 66e366a9632..10bdbd0a401 100644 --- a/src/mame/video/equites.cpp +++ b/src/mame/video/equites.cpp @@ -117,7 +117,7 @@ TILE_GET_INFO_MEMBER(splndrbt_state::splndrbt_bg_info) * *************************************/ -VIDEO_START_MEMBER(equites_state,equites) +void equites_state::video_start_equites() { m_fg_videoram = std::make_unique<uint8_t[]>(0x800); save_pointer(NAME(m_fg_videoram.get()), 0x800); @@ -130,7 +130,7 @@ VIDEO_START_MEMBER(equites_state,equites) m_bg_tilemap->set_scrolldx(0, -10); } -VIDEO_START_MEMBER(splndrbt_state,splndrbt) +void splndrbt_state::video_start_splndrbt() { assert(m_screen->format() == BITMAP_FORMAT_IND16); diff --git a/src/mame/video/espial.cpp b/src/mame/video/espial.cpp index 1a969eb45d7..6d56fa15dfd 100644 --- a/src/mame/video/espial.cpp +++ b/src/mame/video/espial.cpp @@ -95,7 +95,7 @@ void espial_state::video_start() save_item(NAME(m_flipscreen)); } -VIDEO_START_MEMBER(espial_state,netwars) +void espial_state::video_start_netwars() { /* Net Wars has a tile map that's twice as big as Espial's */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(espial_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); diff --git a/src/mame/video/f1gp.cpp b/src/mame/video/f1gp.cpp index a28a6f12874..f1860266a33 100644 --- a/src/mame/video/f1gp.cpp +++ b/src/mame/video/f1gp.cpp @@ -44,9 +44,7 @@ TILE_GET_INFO_MEMBER(f1gp_state::get_fg_tile_info) ***************************************************************************/ - - -VIDEO_START_MEMBER(f1gp_state,f1gp) +void f1gp_state::video_start_f1gp() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -60,7 +58,7 @@ VIDEO_START_MEMBER(f1gp_state,f1gp) } -VIDEO_START_MEMBER(f1gp_state,f1gpb) +void f1gp_state::video_start_f1gpb() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -92,7 +90,7 @@ uint32_t f1gp_state::f1gp_ol2_tile_callback( uint32_t code ) -VIDEO_START_MEMBER(f1gp_state,f1gp2) +void f1gp_state::video_start_f1gp2() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::f1gp2_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/fastfred.cpp b/src/mame/video/fastfred.cpp index c32c7eefe1c..291a0d24bc6 100644 --- a/src/mame/video/fastfred.cpp +++ b/src/mame/video/fastfred.cpp @@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(fastfred_state::get_tile_info) * *************************************/ -VIDEO_START_MEMBER(fastfred_state,fastfred) +void fastfred_state::video_start_fastfred() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -325,7 +325,7 @@ WRITE_LINE_MEMBER(fastfred_state::imago_charbank_w) } } -VIDEO_START_MEMBER(fastfred_state,imago) +void fastfred_state::video_start_imago() { m_web_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_web),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fastfred_state::imago_get_tile_info_bg),this), TILEMAP_SCAN_ROWS,8,8,32,32); diff --git a/src/mame/video/firetrk.cpp b/src/mame/video/firetrk.cpp index c19477615ee..c82c990629c 100644 --- a/src/mame/video/firetrk.cpp +++ b/src/mame/video/firetrk.cpp @@ -219,7 +219,7 @@ void firetrk_state::video_start() } -VIDEO_START_MEMBER(firetrk_state,superbug) +void firetrk_state::video_start_superbug() { m_screen->register_screen_bitmap(m_helper1); m_screen->register_screen_bitmap(m_helper2); @@ -229,7 +229,7 @@ VIDEO_START_MEMBER(firetrk_state,superbug) } -VIDEO_START_MEMBER(firetrk_state,montecar) +void firetrk_state::video_start_montecar() { m_screen->register_screen_bitmap(m_helper1); m_screen->register_screen_bitmap(m_helper2); diff --git a/src/mame/video/flstory.cpp b/src/mame/video/flstory.cpp index be695acd92a..55bcfd77292 100644 --- a/src/mame/video/flstory.cpp +++ b/src/mame/video/flstory.cpp @@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(flstory_state::get_rumba_tile_info) 0); } -VIDEO_START_MEMBER(flstory_state,flstory) +void flstory_state::video_start_flstory() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); // m_bg_tilemap->set_transparent_pen(15); @@ -70,7 +70,7 @@ VIDEO_START_MEMBER(flstory_state,flstory) save_item(NAME(m_paletteram_ext)); } -VIDEO_START_MEMBER(flstory_state,rumba) +void flstory_state::video_start_rumba() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::get_rumba_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); // m_bg_tilemap->set_transparent_pen(15); @@ -87,7 +87,7 @@ VIDEO_START_MEMBER(flstory_state,rumba) save_item(NAME(m_paletteram_ext)); } -VIDEO_START_MEMBER(flstory_state,victnine) +void flstory_state::video_start_victnine() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(flstory_state::victnine_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/fromanc2.cpp b/src/mame/video/fromanc2.cpp index 2eac256be6b..3073e93ea6d 100644 --- a/src/mame/video/fromanc2.cpp +++ b/src/mame/video/fromanc2.cpp @@ -255,7 +255,7 @@ WRITE16_MEMBER(fromanc2_state::fromanc4_gfxreg_2_w) ******************************************************************************/ -VIDEO_START_MEMBER(fromanc2_state,fromanc2) +void fromanc2_state::video_start_fromanc2() { m_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromanc2_get_tile_info<0, 0>, "v0_l0", this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromanc2_get_tile_info<0, 1>, "v0_l1", this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -293,7 +293,7 @@ VIDEO_START_MEMBER(fromanc2_state,fromanc2) save_item(NAME(m_gfxbank[1])); } -VIDEO_START_MEMBER(fromanc2_state,fromancr) +void fromanc2_state::video_start_fromancr() { m_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromancr_get_tile_info<0, 0>, "v0_l0", this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromancr_get_tile_info<0, 1>, "v0_l1", this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -329,7 +329,7 @@ VIDEO_START_MEMBER(fromanc2_state,fromancr) save_item(NAME(m_gfxbank[1])); } -VIDEO_START_MEMBER(fromanc2_state,fromanc4) +void fromanc2_state::video_start_fromanc4() { m_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromancr_get_tile_info<0, 0>, "v0_l0", this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); m_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(&fromanc2_state::fromancr_get_tile_info<0, 1>, "v0_l1", this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); diff --git a/src/mame/video/fromance.cpp b/src/mame/video/fromance.cpp index 06ffec1c4e2..7490bc9cbc3 100644 --- a/src/mame/video/fromance.cpp +++ b/src/mame/video/fromance.cpp @@ -85,7 +85,7 @@ void fromance_state::init_common( ) save_pointer(NAME(m_local_paletteram.get()), 0x800 * 2); } -VIDEO_START_MEMBER(fromance_state,fromance) +void fromance_state::video_start_fromance() { /* allocate tilemaps */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fromance_state::get_fromance_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); @@ -94,7 +94,7 @@ VIDEO_START_MEMBER(fromance_state,fromance) init_common(); } -VIDEO_START_MEMBER(fromance_state,nekkyoku) +void fromance_state::video_start_nekkyoku() { /* allocate tilemaps */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(fromance_state::get_nekkyoku_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); @@ -103,15 +103,15 @@ VIDEO_START_MEMBER(fromance_state,nekkyoku) init_common(); } -VIDEO_START_MEMBER(fromance_state,pipedrm) +void fromance_state::video_start_pipedrm() { - VIDEO_START_CALL_MEMBER(fromance); + video_start_fromance(); m_scrolly_ofs = 0x00; } -VIDEO_START_MEMBER(fromance_state,hatris) +void fromance_state::video_start_hatris() { - VIDEO_START_CALL_MEMBER(fromance); + video_start_fromance(); m_scrollx_ofs = 0xB9; m_scrolly_ofs = 0x00; } diff --git a/src/mame/video/funworld.cpp b/src/mame/video/funworld.cpp index 4c390c42e9a..7a3300bd2f7 100644 --- a/src/mame/video/funworld.cpp +++ b/src/mame/video/funworld.cpp @@ -125,17 +125,17 @@ TILE_GET_INFO_MEMBER(funworld_state::get_bg_tile_info) } -VIDEO_START_MEMBER(funworld_state, funworld) +void funworld_state::video_start_funworld() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 29); } -VIDEO_START_MEMBER(funworld_state, magicrd2) +void funworld_state::video_start_magicrd2() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 112, 34); } -VIDEO_START_MEMBER(funworld_state, chinatow) +void funworld_state::video_start_chinatow() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(funworld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 96, 31); } diff --git a/src/mame/video/gaelco.cpp b/src/mame/video/gaelco.cpp index 6e1b93899e7..e753deef09b 100644 --- a/src/mame/video/gaelco.cpp +++ b/src/mame/video/gaelco.cpp @@ -75,7 +75,7 @@ WRITE16_MEMBER(gaelco_state::gaelco_vram_w) ***************************************************************************/ -VIDEO_START_MEMBER(gaelco_state,bigkarnk) +void gaelco_state::video_start_bigkarnk() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -84,7 +84,7 @@ VIDEO_START_MEMBER(gaelco_state,bigkarnk) m_tilemap[1]->set_transmask(0, 0xff01, 0x00ff); /* pens 1-7 opaque, pens 0, 8-15 transparent */ } -VIDEO_START_MEMBER(gaelco_state,maniacsq) +void gaelco_state::video_start_maniacsq() { m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaelco_state::get_tile_info_gaelco_screen1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); diff --git a/src/mame/video/gaelco2.cpp b/src/mame/video/gaelco2.cpp index 5632581de32..27baa999618 100644 --- a/src/mame/video/gaelco2.cpp +++ b/src/mame/video/gaelco2.cpp @@ -259,7 +259,7 @@ WRITE16_MEMBER(gaelco2_state::gaelco2_palette_w) ***************************************************************************/ -VIDEO_START_MEMBER(gaelco2_state,gaelco2) +void gaelco2_state::video_start_gaelco2() { m_videoram = m_spriteram->live(); @@ -279,7 +279,7 @@ VIDEO_START_MEMBER(gaelco2_state,gaelco2) m_dual_monitor = 0; } -VIDEO_START_MEMBER(gaelco2_state,gaelco2_dual) +void gaelco2_state::video_start_gaelco2_dual() { m_videoram = m_spriteram->live(); diff --git a/src/mame/video/gaiden.cpp b/src/mame/video/gaiden.cpp index d66dc509bf2..bdc8a08b7ff 100644 --- a/src/mame/video/gaiden.cpp +++ b/src/mame/video/gaiden.cpp @@ -69,7 +69,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_tx_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(gaiden_state,gaiden) +void gaiden_state::video_start_gaiden() { /* set up tile layers */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); @@ -92,7 +92,7 @@ VIDEO_START_MEMBER(gaiden_state,gaiden) } -VIDEO_START_MEMBER(gaiden_state,raiga) +void gaiden_state::video_start_raiga() { /* set up tile layers */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); @@ -110,7 +110,7 @@ VIDEO_START_MEMBER(gaiden_state,raiga) m_screen->register_screen_bitmap(m_sprite_bitmap); } -VIDEO_START_MEMBER(gaiden_state,drgnbowl) +void gaiden_state::video_start_drgnbowl() { /* set up tile layers */ m_background = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gaiden_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); diff --git a/src/mame/video/galaga.cpp b/src/mame/video/galaga.cpp index e86c2350e98..d1893441f4a 100644 --- a/src/mame/video/galaga.cpp +++ b/src/mame/video/galaga.cpp @@ -428,7 +428,7 @@ TILE_GET_INFO_MEMBER(galaga_state::get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(galaga_state,galaga) +void galaga_state::video_start_galaga() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaga_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(galaga_state::tilemap_scan),this),8,8,36,28); m_fg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0x1f); diff --git a/src/mame/video/galaxia.cpp b/src/mame/video/galaxia.cpp index 94b6c423c61..2d5d6a56939 100644 --- a/src/mame/video/galaxia.cpp +++ b/src/mame/video/galaxia.cpp @@ -83,7 +83,7 @@ void galaxia_state::init_common() cvs_init_stars(); } -VIDEO_START_MEMBER(galaxia_state,galaxia) +void galaxia_state::video_start_galaxia() { init_common(); @@ -93,7 +93,7 @@ VIDEO_START_MEMBER(galaxia_state,galaxia) } -VIDEO_START_MEMBER(galaxia_state,astrowar) +void galaxia_state::video_start_astrowar() { init_common(); diff --git a/src/mame/video/galaxold.cpp b/src/mame/video/galaxold.cpp index b8787b288c5..29b92a463e0 100644 --- a/src/mame/video/galaxold.cpp +++ b/src/mame/video/galaxold.cpp @@ -425,7 +425,7 @@ void galaxold_state::video_start_common() state_save_register(); } -VIDEO_START_MEMBER(galaxold_state,galaxold_plain) +void galaxold_state::video_start_galaxold_plain() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -436,18 +436,18 @@ VIDEO_START_MEMBER(galaxold_state,galaxold_plain) m_color_mask = (m_gfxdecode->gfx(0)->granularity() == 4) ? 7 : 3; } -VIDEO_START_MEMBER(galaxold_state,galaxold) +void galaxold_state::video_start_galaxold() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_draw_stars = &galaxold_state::galaxold_draw_stars; m_draw_bullets = &galaxold_state::galaxold_draw_bullets; } -VIDEO_START_MEMBER(galaxold_state,scrambold) +void galaxold_state::video_start_scrambold() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); /* FIXME: This most probably needs to be adjusted * again when RAW video params are added to scramble @@ -461,57 +461,57 @@ VIDEO_START_MEMBER(galaxold_state,scrambold) m_draw_background = &galaxold_state::scrambold_draw_background; } -VIDEO_START_MEMBER(galaxold_state, newsin7) +void galaxold_state::video_start_newsin7() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_leftclip = 0; } -VIDEO_START_MEMBER(galaxold_state,darkplnt) +void galaxold_state::video_start_darkplnt() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_bg_tilemap->set_scrolldx(0, 0); m_draw_bullets = &galaxold_state::darkplnt_draw_bullets; } -VIDEO_START_MEMBER(galaxold_state,rescue) +void galaxold_state::video_start_rescue() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_draw_stars = &galaxold_state::rescue_draw_stars; m_draw_background = &galaxold_state::rescue_draw_background; } -VIDEO_START_MEMBER(galaxold_state,minefld) +void galaxold_state::video_start_minefld() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_draw_stars = &galaxold_state::rescue_draw_stars; m_draw_background = &galaxold_state::minefld_draw_background; } -VIDEO_START_MEMBER(galaxold_state,stratgyx) +void galaxold_state::video_start_stratgyx() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_draw_background = &galaxold_state::stratgyx_draw_background; } -VIDEO_START_MEMBER(galaxold_state,ckongs) +void galaxold_state::video_start_ckongs() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_modify_spritecode = &galaxold_state::mshuttle_modify_spritecode; } -VIDEO_START_MEMBER(galaxold_state,mariner) +void galaxold_state::video_start_mariner() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_draw_stars = &galaxold_state::mariner_draw_stars; @@ -522,17 +522,17 @@ VIDEO_START_MEMBER(galaxold_state,mariner) m_modify_charcode = &galaxold_state::mariner_modify_charcode; } -VIDEO_START_MEMBER(galaxold_state,mimonkey) +void galaxold_state::video_start_mimonkey() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_modify_charcode = &galaxold_state::mimonkey_modify_charcode; m_modify_spritecode = &galaxold_state::mimonkey_modify_spritecode; } -VIDEO_START_MEMBER(galaxold_state,dkongjrm) +void galaxold_state::video_start_dkongjrm() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_modify_charcode = &galaxold_state::pisces_modify_charcode; m_modify_spritecode = &galaxold_state::dkongjrm_modify_spritecode; @@ -540,17 +540,17 @@ VIDEO_START_MEMBER(galaxold_state,dkongjrm) m_spriteram2_present= 1; } -VIDEO_START_MEMBER(galaxold_state,dkongjrmc) +void galaxold_state::video_start_dkongjrmc() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_modify_charcode = &galaxold_state::pisces_modify_charcode; m_modify_spritecode = &galaxold_state::dkongjrmc_modify_spritecode; } -VIDEO_START_MEMBER(galaxold_state,scorpion) +void galaxold_state::video_start_scorpion() { - VIDEO_START_CALL_MEMBER(scrambold); + video_start_scrambold(); m_modify_spritecode = &galaxold_state::batman2_modify_spritecode; } @@ -560,9 +560,9 @@ void galaxold_state::pisces_modify_spritecode(uint8_t *spriteram, int *code, int *code |= (m_gfxbank[0] << 6); } -VIDEO_START_MEMBER(galaxold_state,pisces) +void galaxold_state::video_start_pisces() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_modify_charcode = &galaxold_state::pisces_modify_charcode; m_modify_spritecode = &galaxold_state::pisces_modify_spritecode; @@ -584,9 +584,9 @@ void galaxold_state::theend_draw_bullets(bitmap_ind16 &bitmap, const rectangle & } } -VIDEO_START_MEMBER(galaxold_state,theend) +void galaxold_state::video_start_theend() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_draw_bullets = &galaxold_state::theend_draw_bullets; } @@ -600,9 +600,9 @@ void galaxold_state::mooncrst_modify_spritecode(uint8_t *spriteram, int *code, i } } -VIDEO_START_MEMBER(galaxold_state,mooncrst) +void galaxold_state::video_start_mooncrst() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_modify_charcode = &galaxold_state::mooncrst_modify_charcode; m_modify_spritecode = &galaxold_state::mooncrst_modify_spritecode; @@ -618,9 +618,9 @@ void galaxold_state::rockclim_modify_spritecode(uint8_t *spriteram, int *code, i if (m_gfxbank[2]) *code|=0x40; } -VIDEO_START_MEMBER(galaxold_state,rockclim) +void galaxold_state::video_start_rockclim() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_rockclim_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::rockclim_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_draw_background = &galaxold_state::rockclim_draw_background; @@ -645,7 +645,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::drivfrcg_get_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(galaxold_state,drivfrcg) +void galaxold_state::video_start_drivfrcg() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::drivfrcg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -659,7 +659,7 @@ VIDEO_START_MEMBER(galaxold_state,drivfrcg) m_color_mask = 0xff; } -VIDEO_START_MEMBER(galaxold_state,ad2083) +void galaxold_state::video_start_ad2083() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::drivfrcg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -695,7 +695,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::racknrol_get_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(galaxold_state,racknrol) +void galaxold_state::video_start_racknrol() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::racknrol_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -726,7 +726,7 @@ void galaxold_state::harem_modify_spritecode(uint8_t *spriteram, int *code, int *code |= (m_gfxbank[0] << 7) | 0x40; } -VIDEO_START_MEMBER(galaxold_state,harem) +void galaxold_state::video_start_harem() { video_start_common(); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galaxold_state::harem_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -739,16 +739,16 @@ VIDEO_START_MEMBER(galaxold_state,harem) m_modify_spritecode = &galaxold_state::harem_modify_spritecode; } -VIDEO_START_MEMBER(galaxold_state,ozon1) +void galaxold_state::video_start_ozon1() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_bg_tilemap->set_scrolldx(0, 384-256); } -VIDEO_START_MEMBER(galaxold_state,bongo) +void galaxold_state::video_start_bongo() { - VIDEO_START_CALL_MEMBER(galaxold_plain); + video_start_galaxold_plain(); m_bg_tilemap->set_scrolldx(0, 384-256); @@ -775,9 +775,9 @@ TILE_GET_INFO_MEMBER(galaxold_state::dambustr_get_tile_info2) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(galaxold_state,dambustr) +void galaxold_state::video_start_dambustr() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_dambustr_bg_split_line = 0; m_dambustr_bg_color_1 = 0; @@ -1797,9 +1797,9 @@ void galaxold_state::bagmanmc_modify_spritecode(uint8_t *spriteram, int *code, i *code |= (m_gfxbank[0] << 7) | 0x40; } -VIDEO_START_MEMBER(galaxold_state,bagmanmc) +void galaxold_state::video_start_bagmanmc() { - VIDEO_START_CALL_MEMBER(galaxold); + video_start_galaxold(); m_modify_charcode = &galaxold_state::bagmanmc_modify_charcode; m_modify_spritecode = &galaxold_state::bagmanmc_modify_spritecode; diff --git a/src/mame/video/galivan.cpp b/src/mame/video/galivan.cpp index a5ccf0ad347..b64e3231933 100644 --- a/src/mame/video/galivan.cpp +++ b/src/mame/video/galivan.cpp @@ -174,7 +174,7 @@ TILE_GET_INFO_MEMBER(galivan_state::ninjemak_get_tx_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(galivan_state,galivan) +void galivan_state::video_start_galivan() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -182,7 +182,7 @@ VIDEO_START_MEMBER(galivan_state,galivan) m_tx_tilemap->set_transparent_pen(15); } -VIDEO_START_MEMBER(galivan_state,ninjemak) +void galivan_state::video_start_ninjemak() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 512, 32); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/galspnbl.cpp b/src/mame/video/galspnbl.cpp index 9b442a3b0bf..31556de9cc4 100644 --- a/src/mame/video/galspnbl.cpp +++ b/src/mame/video/galspnbl.cpp @@ -30,7 +30,7 @@ void galspnbl_state::draw_background( bitmap_ind16 &bitmap, const rectangle &cli } } -VIDEO_START_MEMBER(galspnbl_state,galspnbl) +void galspnbl_state::video_start_galspnbl() { /* allocate bitmaps */ m_screen->register_screen_bitmap(m_sprite_bitmap); diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index 6f15aad5be3..da21e239b86 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -265,7 +265,7 @@ TIMER_CALLBACK_MEMBER(gameplan_state::via_0_ca1_timer_callback) * *************************************/ -VIDEO_START_MEMBER(gameplan_state,common) +void gameplan_state::video_start() { m_videoram_size = (HBSTART - HBEND) * (VBSTART - VBEND); m_videoram = std::make_unique<uint8_t[]>(m_videoram_size); @@ -277,32 +277,13 @@ VIDEO_START_MEMBER(gameplan_state,common) } -VIDEO_START_MEMBER(gameplan_state,gameplan) -{ - VIDEO_START_CALL_MEMBER(common); -} - - -VIDEO_START_MEMBER(gameplan_state,leprechn) -{ - VIDEO_START_CALL_MEMBER(common); -} - - -VIDEO_START_MEMBER(gameplan_state,trvquest) -{ - VIDEO_START_CALL_MEMBER(common); -} - - - /************************************* * * Reset * *************************************/ -VIDEO_RESET_MEMBER(gameplan_state,gameplan) +void gameplan_state::video_reset_gameplan() { m_via_0_ca1_timer->adjust(m_screen->time_until_pos(VBSTART)); } @@ -316,8 +297,7 @@ VIDEO_RESET_MEMBER(gameplan_state,gameplan) *************************************/ MACHINE_CONFIG_START(gameplan_state::gameplan_video) - MCFG_VIDEO_START_OVERRIDE(gameplan_state,gameplan) - MCFG_VIDEO_RESET_OVERRIDE(gameplan_state,gameplan) + set_video_reset_cb(config, driver_callback_delegate(&video_reset_gameplan, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(GAMEPLAN_PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) @@ -326,7 +306,6 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(gameplan_state::leprechn_video) - MCFG_VIDEO_START_OVERRIDE(gameplan_state,leprechn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gameplan_state, screen_update_leprechn) MACHINE_CONFIG_END @@ -334,7 +313,6 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(gameplan_state::trvquest_video) gameplan_video(config); - MCFG_VIDEO_START_OVERRIDE(gameplan_state,trvquest) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gameplan_state, screen_update_gameplan) MACHINE_CONFIG_END diff --git a/src/mame/video/gberet.cpp b/src/mame/video/gberet.cpp index 37b5a1e999a..d9c72f67edf 100644 --- a/src/mame/video/gberet.cpp +++ b/src/mame/video/gberet.cpp @@ -117,7 +117,7 @@ TILE_GET_INFO_MEMBER(gberet_state::get_bg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, flags); } -VIDEO_START_MEMBER(gberet_state,gberet) +void gberet_state::video_start_gberet() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gberet_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0x10); diff --git a/src/mame/video/gladiatr.cpp b/src/mame/video/gladiatr.cpp index 03702a38cb9..0ad9ff4f251 100644 --- a/src/mame/video/gladiatr.cpp +++ b/src/mame/video/gladiatr.cpp @@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(gladiatr_state_base::fg_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(ppking_state,ppking) +void ppking_state::video_start_ppking() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ppking_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ppking_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); @@ -59,7 +59,7 @@ VIDEO_START_MEMBER(ppking_state,ppking) save_item(NAME(m_fg_tile_bank)); } -VIDEO_START_MEMBER(gladiatr_state,gladiatr) +void gladiatr_state::video_start_gladiatr() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); diff --git a/src/mame/video/goldstar.cpp b/src/mame/video/goldstar.cpp index 369c6f89de1..5274c5f0d31 100644 --- a/src/mame/video/goldstar.cpp +++ b/src/mame/video/goldstar.cpp @@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel3_tile_info) 0); } -VIDEO_START_MEMBER(goldstar_state, goldstar) +void goldstar_state::video_start_goldstar() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -120,7 +120,7 @@ VIDEO_START_MEMBER(goldstar_state, goldstar) m_cm_enable_reg = 0x0b; } -VIDEO_START_MEMBER(goldstar_state, cherrym) +void goldstar_state::video_start_cherrym() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -345,7 +345,7 @@ TILE_GET_INFO_MEMBER(wingco_state::get_magical_fg_tile_info) } -VIDEO_START_MEMBER(wingco_state, bingowng) +void wingco_state::video_start_bingowng() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wingco_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -358,7 +358,7 @@ VIDEO_START_MEMBER(wingco_state, bingowng) m_cm_enable_reg = 0x0b; } -VIDEO_START_MEMBER(wingco_state, magical) +void wingco_state::video_start_magical() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wingco_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wingco_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -599,7 +599,7 @@ TILE_GET_INFO_MEMBER(sanghopm_state::get_reel3_tile_info) } -VIDEO_START_MEMBER(sanghopm_state, sangho) +void sanghopm_state::video_start_sangho() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sanghopm_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8); @@ -704,7 +704,7 @@ TILE_GET_INFO_MEMBER(unkch_state::get_reel3_tile_info) } -VIDEO_START_MEMBER(unkch_state, unkch) +void unkch_state::video_start_unkch() { m_reel1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(unkch_state::get_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(unkch_state::get_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); diff --git a/src/mame/video/gottlieb.cpp b/src/mame/video/gottlieb.cpp index 0186340942a..1bacddb2902 100644 --- a/src/mame/video/gottlieb.cpp +++ b/src/mame/video/gottlieb.cpp @@ -157,7 +157,7 @@ void gottlieb_state::video_start() save_item(NAME(m_transparent0)); } -VIDEO_START_MEMBER(gottlieb_state,screwloo) +void gottlieb_state::video_start_screwloo() { static const int resistances[4] = { 2000, 1000, 470, 240 }; diff --git a/src/mame/video/hec2hrp.cpp b/src/mame/video/hec2hrp.cpp index fcc874726e1..7309705a389 100644 --- a/src/mame/video/hec2hrp.cpp +++ b/src/mame/video/hec2hrp.cpp @@ -111,7 +111,7 @@ void hec2hrp_state::hector_80c(bitmap_ind16 &bitmap, uint8_t *page, int ymax, in } -VIDEO_START_MEMBER(hec2hrp_state,hec2hrp) +void hec2hrp_state::video_start_hec2hrp() { Init_Hector_Palette(); } diff --git a/src/mame/video/hnayayoi.cpp b/src/mame/video/hnayayoi.cpp index 3de4f445f74..fd85b75e16f 100644 --- a/src/mame/video/hnayayoi.cpp +++ b/src/mame/video/hnayayoi.cpp @@ -28,7 +28,7 @@ void hnayayoi_state::video_start() common_vh_start(4); /* 4 bitmaps -> 2 layers */ } -VIDEO_START_MEMBER(hnayayoi_state,untoucha) +void hnayayoi_state::video_start_untoucha() { common_vh_start(8); /* 8 bitmaps -> 4 layers */ } diff --git a/src/mame/video/holeland.cpp b/src/mame/video/holeland.cpp index 3000a758edb..043a5d0519b 100644 --- a/src/mame/video/holeland.cpp +++ b/src/mame/video/holeland.cpp @@ -55,7 +55,7 @@ TILE_GET_INFO_MEMBER(holeland_state::crzrally_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(holeland_state,holeland) +void holeland_state::video_start_holeland() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(holeland_state::holeland_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -65,7 +65,7 @@ VIDEO_START_MEMBER(holeland_state,holeland) save_item(NAME(m_palette_offset)); } -VIDEO_START_MEMBER(holeland_state,crzrally) +void holeland_state::video_start_crzrally() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(holeland_state::crzrally_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/homedata.cpp b/src/mame/video/homedata.cpp index 7ef82a6564e..0e2b3546fa8 100644 --- a/src/mame/video/homedata.cpp +++ b/src/mame/video/homedata.cpp @@ -618,7 +618,7 @@ TILE_GET_INFO_MEMBER(homedata_state::mirderby_get_info1_1) ***************************************************************************/ -VIDEO_START_MEMBER(homedata_state,mrokumei) +void homedata_state::video_start_mrokumei() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mrokumei_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); @@ -629,7 +629,7 @@ VIDEO_START_MEMBER(homedata_state,mrokumei) m_bg_tilemap[1][1]->set_transparent_pen(0); } -VIDEO_START_MEMBER(homedata_state,reikaids) +void homedata_state::video_start_reikaids() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::reikaids_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -650,7 +650,7 @@ VIDEO_START_MEMBER(homedata_state,reikaids) m_bg_tilemap[1][3]->set_transparent_pen(0xff); } -VIDEO_START_MEMBER(homedata_state,pteacher) +void homedata_state::video_start_pteacher() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::pteacher_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -661,7 +661,7 @@ VIDEO_START_MEMBER(homedata_state,pteacher) m_bg_tilemap[1][1]->set_transparent_pen(0xff); } -VIDEO_START_MEMBER(homedata_state,lemnangl) +void homedata_state::video_start_lemnangl() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::lemnangl_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -672,7 +672,7 @@ VIDEO_START_MEMBER(homedata_state,lemnangl) m_bg_tilemap[1][1]->set_transparent_pen(0x0f); } -VIDEO_START_MEMBER(homedata_state,mirderby) +void homedata_state::video_start_mirderby() { m_bg_tilemap[0][0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info0_0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); m_bg_tilemap[0][1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(homedata_state::mirderby_get_info0_1),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32 ); diff --git a/src/mame/video/hyperspt.cpp b/src/mame/video/hyperspt.cpp index 6b268069dc7..dbe2c638798 100644 --- a/src/mame/video/hyperspt.cpp +++ b/src/mame/video/hyperspt.cpp @@ -186,7 +186,7 @@ TILE_GET_INFO_MEMBER(hyperspt_state::roadf_get_bg_tile_info) SET_TILE_INFO_MEMBER(1, code, color, flags); } -VIDEO_START_MEMBER(hyperspt_state,roadf) +void hyperspt_state::video_start_roadf() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(hyperspt_state::roadf_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); diff --git a/src/mame/video/ironhors.cpp b/src/mame/video/ironhors.cpp index 16434bbdf86..51e61200d0a 100644 --- a/src/mame/video/ironhors.cpp +++ b/src/mame/video/ironhors.cpp @@ -254,7 +254,7 @@ TILE_GET_INFO_MEMBER(ironhors_state::farwest_get_bg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, flags); } -VIDEO_START_MEMBER(ironhors_state,farwest) +void ironhors_state::video_start_farwest() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ironhors_state::farwest_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/jack.cpp b/src/mame/video/jack.cpp index 745dd151df6..348804bf69e 100644 --- a/src/mame/video/jack.cpp +++ b/src/mame/video/jack.cpp @@ -174,7 +174,7 @@ TILE_GET_INFO_MEMBER(jack_state::joinem_get_bg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(jack_state,joinem) +void jack_state::video_start_joinem() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(jack_state::joinem_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(jack_state::tilemap_scan_cols_flipy),this), 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); diff --git a/src/mame/video/jpmimpct.cpp b/src/mame/video/jpmimpct.cpp index 8d68a44bd49..bf6e87390e0 100644 --- a/src/mame/video/jpmimpct.cpp +++ b/src/mame/video/jpmimpct.cpp @@ -127,7 +127,7 @@ TMS340X0_SCANLINE_RGB32_CB_MEMBER(jpmimpct_state::scanline_update) * *************************************/ -VIDEO_START_MEMBER(jpmimpct_state,jpmimpct) +void jpmimpct_state::video_start_jpmimpct() { memset(&m_bt477, 0, sizeof(m_bt477)); diff --git a/src/mame/video/kaneko16.cpp b/src/mame/video/kaneko16.cpp index 20fefcb1f56..594f06f377c 100644 --- a/src/mame/video/kaneko16.cpp +++ b/src/mame/video/kaneko16.cpp @@ -18,7 +18,7 @@ WRITE16_MEMBER(kaneko16_state::kaneko16_display_enable) COMBINE_DATA(&m_disp_enable); } -VIDEO_START_MEMBER(kaneko16_state,kaneko16) +void kaneko16_state::video_start_kaneko16() { m_disp_enable = 1; // default enabled for games not using it save_item(NAME(m_disp_enable)); @@ -113,7 +113,7 @@ PALETTE_INIT_MEMBER(kaneko16_berlwall_state,berlwall) palette.set_pen_color(i,pal5bit(i >> 5),pal5bit(i >> 10),pal5bit(i >> 0)); } -VIDEO_START_MEMBER(kaneko16_berlwall_state,berlwall) +void kaneko16_berlwall_state::video_start_berlwall() { uint8_t *RAM = memregion("gfx3")->base(); @@ -160,15 +160,11 @@ VIDEO_START_MEMBER(kaneko16_berlwall_state,berlwall) } } - VIDEO_START_CALL_MEMBER(kaneko16); + video_start_kaneko16(); } - - - - /* Select the high color background image (out of 32 in the ROMs) */ READ16_MEMBER(kaneko16_berlwall_state::kaneko16_bg15_select_r) { diff --git a/src/mame/video/karnov.cpp b/src/mame/video/karnov.cpp index b9f6443bd26..753e8876996 100644 --- a/src/mame/video/karnov.cpp +++ b/src/mame/video/karnov.cpp @@ -99,7 +99,7 @@ WRITE16_MEMBER(karnov_state::karnov_playfield_swap_w) /******************************************************************************/ -VIDEO_START_MEMBER(karnov_state,karnov) +void karnov_state::video_start_karnov() { /* Allocate bitmap & tilemap */ m_bitmap_f = std::make_unique<bitmap_ind16>(512, 512); @@ -110,7 +110,7 @@ VIDEO_START_MEMBER(karnov_state,karnov) m_fix_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(karnov_state,wndrplnt) +void karnov_state::video_start_wndrplnt() { /* Allocate bitmap & tilemap */ m_bitmap_f = std::make_unique<bitmap_ind16>(512, 512); diff --git a/src/mame/video/kaypro.cpp b/src/mame/video/kaypro.cpp index 86ca79a7506..f67bbec61ed 100644 --- a/src/mame/video/kaypro.cpp +++ b/src/mame/video/kaypro.cpp @@ -307,7 +307,7 @@ WRITE8_MEMBER( kaypro_state::kaypro484_videoram_w ) m_p_videoram[m_mc6845_video_address] = data; } -VIDEO_START_MEMBER(kaypro_state,kaypro) +void kaypro_state::video_start_kaypro() { m_p_videoram = memregion("roms")->base()+0x3000; } diff --git a/src/mame/video/kickgoal.cpp b/src/mame/video/kickgoal.cpp index 71aa4f2f7c4..ac479affc00 100644 --- a/src/mame/video/kickgoal.cpp +++ b/src/mame/video/kickgoal.cpp @@ -117,7 +117,7 @@ void kickgoal_state::kickgoal_draw_sprites(bitmap_ind16 &bitmap,const rectangle } -VIDEO_START_MEMBER(kickgoal_state,kickgoal) +void kickgoal_state::video_start_kickgoal() { m_sprbase = 0x0000; @@ -137,7 +137,7 @@ VIDEO_START_MEMBER(kickgoal_state,kickgoal) m_bgtm->set_transparent_pen(15); } -VIDEO_START_MEMBER(kickgoal_state,actionhw) +void kickgoal_state::video_start_actionhw() { m_sprbase = 0x4000; m_fg_base = 0x7000 * 2; diff --git a/src/mame/video/kingobox.cpp b/src/mame/video/kingobox.cpp index 9a81d46f9d1..34da91d38c3 100644 --- a/src/mame/video/kingobox.cpp +++ b/src/mame/video/kingobox.cpp @@ -193,7 +193,7 @@ TILE_GET_INFO_MEMBER(kingofb_state::get_fg_tile_info) SET_TILE_INFO_MEMBER(bank, code, color, 0); } -VIDEO_START_MEMBER(kingofb_state,kingofb) +void kingofb_state::video_start_kingofb() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 16, 16, 16, 16); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); @@ -257,7 +257,7 @@ TILE_GET_INFO_MEMBER(kingofb_state::ringking_get_bg_tile_info) SET_TILE_INFO_MEMBER(4, code, color, 0); } -VIDEO_START_MEMBER(kingofb_state,ringking) +void kingofb_state::video_start_ringking() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::ringking_get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 16, 16, 16, 16); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(kingofb_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_Y, 8, 8, 32, 32); diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp index 205a0c1da87..aecf917fafd 100644 --- a/src/mame/video/konamigx.cpp +++ b/src/mame/video/konamigx.cpp @@ -1133,7 +1133,7 @@ void konamigx_state::common_init() } -VIDEO_START_MEMBER(konamigx_state, konamigx_5bpp) +void konamigx_state::video_start_konamigx_5bpp() { common_init(); @@ -1145,7 +1145,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_5bpp) konamigx_mixer_primode(4); } -VIDEO_START_MEMBER(konamigx_state, dragoonj) +void konamigx_state::video_start_dragoonj() { common_init(); @@ -1155,20 +1155,20 @@ VIDEO_START_MEMBER(konamigx_state, dragoonj) m_k056832->set_layer_offs(3, 3+1, 0); } -VIDEO_START_MEMBER(konamigx_state, le2) +void konamigx_state::video_start_le2() { common_init(); konamigx_mixer_primode(-1); // swapped layer B and C priorities? } -VIDEO_START_MEMBER(konamigx_state, konamigx_6bpp) +void konamigx_state::video_start_konamigx_6bpp() { common_init(); konamigx_mixer_primode(5); } -VIDEO_START_MEMBER(konamigx_state, konamigx_type3) +void konamigx_state::video_start_konamigx_type3() { int width = m_screen->width(); int height = m_screen->height(); @@ -1204,7 +1204,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_type3) m_konamigx_palformat = 1; } -VIDEO_START_MEMBER(konamigx_state, konamigx_type4) +void konamigx_state::video_start_konamigx_type4() { int width = m_screen->width(); int height = m_screen->height(); @@ -1232,7 +1232,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_type4) } -VIDEO_START_MEMBER(konamigx_state, konamigx_type4_vsn) +void konamigx_state::video_start_konamigx_type4_vsn() { int width = m_screen->width(); int height = m_screen->height(); @@ -1259,7 +1259,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_type4_vsn) m_konamigx_palformat = 0; } -VIDEO_START_MEMBER(konamigx_state, konamigx_type4_sd2) +void konamigx_state::video_start_konamigx_type4_sd2() { int width = m_screen->width(); int height = m_screen->height(); @@ -1289,7 +1289,7 @@ VIDEO_START_MEMBER(konamigx_state, konamigx_type4_sd2) } -VIDEO_START_MEMBER(konamigx_state, opengolf) +void konamigx_state::video_start_opengolf() { common_init(); @@ -1324,7 +1324,7 @@ VIDEO_START_MEMBER(konamigx_state, opengolf) } -VIDEO_START_MEMBER(konamigx_state, racinfrc) +void konamigx_state::video_start_racinfrc() { common_init(); diff --git a/src/mame/video/ladyfrog.cpp b/src/mame/video/ladyfrog.cpp index 3dae84121f8..08381c91616 100644 --- a/src/mame/video/ladyfrog.cpp +++ b/src/mame/video/ladyfrog.cpp @@ -124,7 +124,7 @@ void ladyfrog_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre } } -VIDEO_START_MEMBER(ladyfrog_state,ladyfrog_common) +void ladyfrog_state::video_start_ladyfrog_common() { m_spriteram = std::make_unique<uint8_t[]>(160); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ladyfrog_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -146,13 +146,13 @@ void ladyfrog_state::video_start() { // weird, there are sprite tiles at 0x000 and 0x400, but they don't contain all the sprites! m_spritetilebase = 0x800; - VIDEO_START_CALL_MEMBER(ladyfrog_common); + video_start_ladyfrog_common(); } -VIDEO_START_MEMBER(ladyfrog_state,toucheme) +void ladyfrog_state::video_start_toucheme() { m_spritetilebase = 0x000; - VIDEO_START_CALL_MEMBER(ladyfrog_common); + video_start_ladyfrog_common(); } diff --git a/src/mame/video/lasso.cpp b/src/mame/video/lasso.cpp index ab49ebd86da..66141f52308 100644 --- a/src/mame/video/lasso.cpp +++ b/src/mame/video/lasso.cpp @@ -170,7 +170,7 @@ void lasso_state::video_start() m_bg_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(lasso_state,wwjgtin) +void lasso_state::video_start_wwjgtin() { /* create tilemaps */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lasso_state::lasso_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -179,7 +179,7 @@ VIDEO_START_MEMBER(lasso_state,wwjgtin) m_bg_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(lasso_state,pinbo) +void lasso_state::video_start_pinbo() { /* create tilemap */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lasso_state::pinbo_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/lastduel.cpp b/src/mame/video/lastduel.cpp index 62cbfb3a905..0e777f78e79 100644 --- a/src/mame/video/lastduel.cpp +++ b/src/mame/video/lastduel.cpp @@ -76,7 +76,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fix_info) ***************************************************************************/ -VIDEO_START_MEMBER(lastduel_state,lastduel) +void lastduel_state::video_start_lastduel() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::ld_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); @@ -91,7 +91,7 @@ VIDEO_START_MEMBER(lastduel_state,lastduel) m_tilemap_priority = 0; } -VIDEO_START_MEMBER(lastduel_state,madgear) +void lastduel_state::video_start_madgear() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lastduel_state::get_fg_tile_info),this),TILEMAP_SCAN_COLS,16,16,64,32); diff --git a/src/mame/video/legionna.cpp b/src/mame/video/legionna.cpp index 89bfe3c6302..b86fcdf38a6 100644 --- a/src/mame/video/legionna.cpp +++ b/src/mame/video/legionna.cpp @@ -256,7 +256,7 @@ void legionna_state::common_video_start() m_text_layer->set_transparent_pen(15); } -VIDEO_START_MEMBER(legionna_state,legionna) +void legionna_state::video_start_legionna() { common_video_start(); @@ -266,7 +266,7 @@ VIDEO_START_MEMBER(legionna_state,legionna) m_sprite_pri_mask[3] = 0xfffe; } -VIDEO_START_MEMBER(legionna_state,heatbrl) +void legionna_state::video_start_heatbrl() { common_video_start(); @@ -277,9 +277,9 @@ VIDEO_START_MEMBER(legionna_state,heatbrl) m_sprite_pri_mask[3] = 0xffff; } -VIDEO_START_MEMBER(legionna_state,godzilla) +void legionna_state::video_start_godzilla() { - VIDEO_START_CALL_MEMBER(legionna); + video_start_legionna(); m_has_extended_banking = 1; m_has_extended_priority = 0; @@ -291,7 +291,7 @@ VIDEO_START_MEMBER(legionna_state,godzilla) m_sprite_pri_mask[3] = 0xffff; } -VIDEO_START_MEMBER(legionna_state,denjinmk) +void legionna_state::video_start_denjinmk() { common_video_allocate_ptr(); @@ -314,7 +314,7 @@ VIDEO_START_MEMBER(legionna_state,denjinmk) m_text_layer->set_transparent_pen(7);//? } -VIDEO_START_MEMBER(legionna_state,cupsoc) +void legionna_state::video_start_cupsoc() { common_video_allocate_ptr(); @@ -332,9 +332,9 @@ VIDEO_START_MEMBER(legionna_state,cupsoc) m_text_layer->set_transparent_pen(15); } -VIDEO_START_MEMBER(legionna_state,grainbow) +void legionna_state::video_start_grainbow() { - VIDEO_START_CALL_MEMBER(legionna); + video_start_legionna(); m_sprite_xoffs = m_sprite_yoffs = 16; m_has_extended_banking = 0; diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp index 33f0d3590bd..7878adad9ec 100644 --- a/src/mame/video/leland.cpp +++ b/src/mame/video/leland.cpp @@ -56,7 +56,7 @@ TIMER_CALLBACK_MEMBER(leland_state::scanline_callback) * *************************************/ -VIDEO_START_MEMBER(leland_state,leland) +void leland_state::video_start_leland() { /* allocate memory */ m_video_ram = make_unique_clear<uint8_t[]>(VRAM_SIZE); @@ -78,7 +78,7 @@ VIDEO_START_MEMBER(leland_state,leland) } } -VIDEO_START_MEMBER(leland_state,ataxx) +void leland_state::video_start_ataxx() { /* first do the standard stuff */ m_video_ram = make_unique_clear<uint8_t[]>(VRAM_SIZE); @@ -532,7 +532,7 @@ uint32_t leland_state::screen_update_ataxx(screen_device &screen, bitmap_ind16 & MACHINE_CONFIG_START(leland_state::leland_video) - MCFG_VIDEO_START_OVERRIDE(leland_state,leland) + set_video_start_cb(config, driver_callback_delegate(&video_start_leland, this)); MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(BBGGGRRR) @@ -548,7 +548,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(leland_state::ataxx_video) leland_video(config); - MCFG_VIDEO_START_OVERRIDE(leland_state,ataxx) + set_video_start_cb(config, driver_callback_delegate(&video_start_ataxx, this)); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(leland_state, screen_update_ataxx) diff --git a/src/mame/video/liberate.cpp b/src/mame/video/liberate.cpp index a0b55e4eb12..f270a21ca18 100644 --- a/src/mame/video/liberate.cpp +++ b/src/mame/video/liberate.cpp @@ -202,7 +202,7 @@ WRITE8_MEMBER(liberate_state::prosport_bg_vram_w) /***************************************************************************/ -VIDEO_START_MEMBER(liberate_state,prosoccr) +void liberate_state::video_start_prosoccr() { m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); @@ -216,7 +216,7 @@ VIDEO_START_MEMBER(liberate_state,prosoccr) save_pointer(NAME(m_fg_gfx), 0x6000); } -VIDEO_START_MEMBER(liberate_state,boomrang) +void liberate_state::video_start_boomrang() { m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); @@ -225,7 +225,7 @@ VIDEO_START_MEMBER(liberate_state,boomrang) m_fix_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(liberate_state,liberate) +void liberate_state::video_start_liberate() { m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); @@ -233,7 +233,7 @@ VIDEO_START_MEMBER(liberate_state,liberate) m_fix_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(liberate_state,prosport) +void liberate_state::video_start_prosport() { m_back_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::prosport_get_back_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::back_scan),this), 16, 16, 32, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(liberate_state::get_fix_tile_info),this), tilemap_mapper_delegate(FUNC(liberate_state::fix_scan),this), 8, 8, 32, 32); diff --git a/src/mame/video/lwings.cpp b/src/mame/video/lwings.cpp index acda77e9590..ebcaf8b5059 100644 --- a/src/mame/video/lwings.cpp +++ b/src/mame/video/lwings.cpp @@ -79,18 +79,19 @@ TILE_GET_INFO_MEMBER(lwings_state::get_bg2_tile_info) void lwings_state::video_start() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_bg1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::lwings_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); - m_fg_tilemap->set_transparent_pen(3); + + m_bg1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::lwings_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); } -VIDEO_START_MEMBER(lwings_state,trojan) +void lwings_state::video_start_trojan() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); + m_fg_tilemap->set_transparent_pen(3); + m_bg1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::trojan_get_bg1_tile_info),this),TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_bg2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(lwings_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(lwings_state::get_bg2_memory_offset),this), 16, 16, 32, 16); - m_fg_tilemap->set_transparent_pen(3); m_bg1_tilemap->set_transmask(0, 0xffff, 0x0001); /* split type 0 is totally transparent in front half */ m_bg1_tilemap->set_transmask(1, 0xf07f, 0x0f81); /* split type 1 has pens 7-11 opaque in front half */ @@ -98,16 +99,16 @@ VIDEO_START_MEMBER(lwings_state,trojan) m_spr_avenger_hw = 0; } -VIDEO_START_MEMBER(lwings_state,avengers) +void lwings_state::video_start_avengers() { - VIDEO_START_CALL_MEMBER(trojan); + video_start_trojan(); m_bg2_avenger_hw = 1; m_spr_avenger_hw = 1; } -VIDEO_START_MEMBER(lwings_state,avengersb) +void lwings_state::video_start_avengersb() { - VIDEO_START_CALL_MEMBER(trojan); + video_start_trojan(); m_bg2_avenger_hw = 0; m_spr_avenger_hw = 1; } diff --git a/src/mame/video/m10.cpp b/src/mame/video/m10.cpp index e3d2fda7e9a..dd37e8cc507 100644 --- a/src/mame/video/m10.cpp +++ b/src/mame/video/m10.cpp @@ -95,7 +95,7 @@ inline void m10_state::plot_pixel_m10( bitmap_ind16 &bm, int x, int y, int col ) (IREMM10_HBSTART - 1) - (x - IREMM10_HBEND)) = col; // only when flip_screen(?) } -VIDEO_START_MEMBER(m10_state,m10) +void m10_state::video_start_m10() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m10_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(m10_state::tilemap_scan),this), 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(0); @@ -105,7 +105,7 @@ VIDEO_START_MEMBER(m10_state,m10) return ; } -VIDEO_START_MEMBER(m10_state,m15) +void m10_state::video_start_m15() { m_gfxdecode->set_gfx(0,std::make_unique<gfx_element>(m_palette, charlayout, m_chargen, 0, 8, 0)); diff --git a/src/mame/video/m62.cpp b/src/mame/video/m62.cpp index e250bd8c1ac..f5948c47fd9 100644 --- a/src/mame/video/m62.cpp +++ b/src/mame/video/m62.cpp @@ -388,7 +388,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kungfum_bg_tile_info) tileinfo.category = 0; } -VIDEO_START_MEMBER(m62_state,kungfum) +void m62_state::video_start_kungfum() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_kungfum_bg_tile_info),this), 32, 0, 8, 8, 64, 32); } @@ -468,7 +468,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun2_bg_tile_info) tileinfo.group = 0; } -VIDEO_START_MEMBER(m62_state,ldrun2) +void m62_state::video_start_ldrun2() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_ldrun2_bg_tile_info),this), 1, 1, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ @@ -530,7 +530,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_battroad_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, 0); } -VIDEO_START_MEMBER(m62_state,battroad) +void m62_state::video_start_battroad() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_battroad_bg_tile_info),this), 1, 1, 8, 8, 64, 32); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_battroad_fg_tile_info),this), 1, 1, 8, 8, 32, 32); @@ -566,7 +566,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun4_bg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0); } -VIDEO_START_MEMBER(m62_state,ldrun4) +void m62_state::video_start_ldrun4() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_ldrun4_bg_tile_info),this), 1, 0, 8, 8, 64, 32); } @@ -605,7 +605,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_lotlot_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, 0); } -VIDEO_START_MEMBER(m62_state,lotlot) +void m62_state::video_start_lotlot() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_lotlot_bg_tile_info),this), 1, 1, 12, 10, 32, 64); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_lotlot_fg_tile_info),this), 1, 1, 12, 10, 32, 64); @@ -664,7 +664,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kidniki_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ( ( color & 0xc0 ) << 2 ), color & 0x1f, 0); } -VIDEO_START_MEMBER(m62_state,kidniki) +void m62_state::video_start_kidniki() { m_bg_tilemap = &machine().tilemap().create(*m_chr_decode, tilemap_get_info_delegate(FUNC(m62_state::get_kidniki_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ @@ -719,7 +719,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunkr_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0x10) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0); } -VIDEO_START_MEMBER(m62_state,spelunkr) +void m62_state::video_start_spelunkr() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_spelunkr_bg_tile_info),this), 1, 1, 8, 8, 64, 64); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_spelunkr_fg_tile_info),this), 1, 1, 12, 8, 32, 32); @@ -761,7 +761,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunk2_bg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0xf0) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0 ); } -VIDEO_START_MEMBER(m62_state,spelunk2) +void m62_state::video_start_spelunk2() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_spelunk2_bg_tile_info),this), 1, 1, 8, 8, 64, 64); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_spelunkr_fg_tile_info),this), 1, 1, 12, 8, 32, 32); @@ -804,7 +804,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_youjyudn_fg_tile_info) SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), (color & 0x0f), 0); } -VIDEO_START_MEMBER(m62_state,youjyudn) +void m62_state::video_start_youjyudn() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_youjyudn_bg_tile_info),this), 1, 0, 8, 16, 64, 16); m62_textlayer(tilemap_get_info_delegate(FUNC(m62_state::get_youjyudn_fg_tile_info),this), 1, 1, 12, 8, 32, 32); @@ -846,7 +846,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_horizon_bg_tile_info) tileinfo.group = 0; } -VIDEO_START_MEMBER(m62_state,horizon) +void m62_state::video_start_horizon() { m62_start(tilemap_get_info_delegate(FUNC(m62_state::get_horizon_bg_tile_info),this), 32, 0, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ diff --git a/src/mame/video/m72.cpp b/src/mame/video/m72.cpp index 4fd2c3498b3..7cabb13d583 100644 --- a/src/mame/video/m72.cpp +++ b/src/mame/video/m72.cpp @@ -110,7 +110,7 @@ void m72_state::register_savestate() } -VIDEO_START_MEMBER(m72_state,m72) +void m72_state::video_start_m72() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); @@ -144,9 +144,9 @@ VIDEO_START_MEMBER(m72_state,m72) register_savestate(); } -VIDEO_START_MEMBER(m72_state,xmultipl) +void m72_state::video_start_xmultipl() { - VIDEO_START_CALL_MEMBER(m72); + video_start_m72(); m_fg_tilemap->set_scrolldx(4,64); m_fg_tilemap->set_scrolldy(-128, 0); @@ -157,9 +157,9 @@ VIDEO_START_MEMBER(m72_state,xmultipl) } -VIDEO_START_MEMBER(m72_state,hharry) +void m72_state::video_start_hharry() { - VIDEO_START_CALL_MEMBER(m72); + video_start_m72(); m_bg_tilemap->set_transmask(2,0x0001,0xfffe); // ? maybe the standard logic is ok. @@ -181,7 +181,7 @@ TILEMAP_MAPPER_MEMBER(m72_state::m82_scan_rows) return row*256 + col; } -VIDEO_START_MEMBER(m72_state,m82) +void m72_state::video_start_m82() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); @@ -220,7 +220,7 @@ VIDEO_START_MEMBER(m72_state,m82) // M84 -VIDEO_START_MEMBER(m72_state,rtype2) +void m72_state::video_start_rtype2() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(m72_state::rtype2_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); @@ -247,9 +247,9 @@ VIDEO_START_MEMBER(m72_state,rtype2) } -VIDEO_START_MEMBER(m72_state,hharryu) +void m72_state::video_start_hharryu() { - VIDEO_START_CALL_MEMBER(rtype2); + video_start_rtype2(); m_fg_tilemap->set_scrolldx(4,3); m_bg_tilemap->set_scrolldx(6,0); @@ -258,9 +258,9 @@ VIDEO_START_MEMBER(m72_state,hharryu) } // m85 -VIDEO_START_MEMBER(m72_state,poundfor) +void m72_state::video_start_poundfor() { - VIDEO_START_CALL_MEMBER(rtype2); + video_start_rtype2(); m_fg_tilemap->set_scrolldx(6,0); m_bg_tilemap->set_scrolldx(6,0); diff --git a/src/mame/video/m90.cpp b/src/mame/video/m90.cpp index 6b581241b26..b45bb21fe30 100644 --- a/src/mame/video/m90.cpp +++ b/src/mame/video/m90.cpp @@ -73,7 +73,7 @@ void m90_state::video_start() m_last_pf[1] = 2; } -VIDEO_START_MEMBER(m90_state,bomblord) +void m90_state::video_start_bomblord() { common_tilemap_init(); @@ -83,7 +83,7 @@ VIDEO_START_MEMBER(m90_state,bomblord) m_pf_layer[0][1]->set_transparent_pen(0); } -VIDEO_START_MEMBER(m90_state,dynablsb) +void m90_state::video_start_dynablsb() { common_tilemap_init(); diff --git a/src/mame/video/m92.cpp b/src/mame/video/m92.cpp index 62efdbc1a85..89ce838feaf 100644 --- a/src/mame/video/m92.cpp +++ b/src/mame/video/m92.cpp @@ -246,7 +246,7 @@ WRITE16_MEMBER(m92_state::m92_master_control_w) /*****************************************************************************/ -VIDEO_START_MEMBER(m92_state,m92) +void m92_state::video_start_m92() { m_spritebuffer_timer = timer_alloc(TIMER_SPRITEBUFFER); @@ -300,9 +300,9 @@ VIDEO_START_MEMBER(m92_state,m92) save_item(NAME(m_paletteram)); } -VIDEO_START_MEMBER(m92_state,ppan) +void m92_state::video_start_ppan() { - VIDEO_START_CALL_MEMBER(m92); + video_start_m92(); for (int laynum = 0; laynum < 3; laynum++) { diff --git a/src/mame/video/mac.cpp b/src/mame/video/mac.cpp index 5883d7f102d..e2735b80445 100644 --- a/src/mame/video/mac.cpp +++ b/src/mame/video/mac.cpp @@ -74,7 +74,7 @@ PALETTE_INIT_MEMBER(mac_state,macgsc) palette.set_pen_color(3, 0x00, 0x00, 0x00); } -VIDEO_START_MEMBER(mac_state,mac) +void mac_state::video_start_mac() { } @@ -213,18 +213,18 @@ uint32_t mac_state::screen_update_macpb160(screen_device &screen, bitmap_ind16 & // IIci/IIsi RAM-Based Video (RBV) and children: V8, Eagle, Spice, VASP, Sonora -VIDEO_START_MEMBER(mac_state,macrbv) +void mac_state::video_start_macrbv() { } -VIDEO_RESET_MEMBER(mac_state,maceagle) +void mac_state::video_reset_maceagle() { m_rbv_montype = 32; m_rbv_palette[0xfe] = 0xffffff; m_rbv_palette[0xff] = 0; } -VIDEO_RESET_MEMBER(mac_state,macrbv) +void mac_state::video_reset_macrbv() { rectangle visarea; int htotal, vtotal; @@ -282,7 +282,7 @@ VIDEO_RESET_MEMBER(mac_state,macrbv) target->set_view(view); } -VIDEO_RESET_MEMBER(mac_state,macsonora) +void mac_state::video_reset_macsonora() { rectangle visarea; int htotal, vtotal; @@ -339,7 +339,7 @@ VIDEO_RESET_MEMBER(mac_state,macsonora) target->set_view(view); } -VIDEO_START_MEMBER(mac_state,macsonora) +void mac_state::video_start_macsonora() { memset(m_rbv_regs, 0, sizeof(m_rbv_regs)); @@ -359,7 +359,7 @@ VIDEO_START_MEMBER(mac_state,macsonora) m_rbv_type = RBV_TYPE_SONORA; } -VIDEO_START_MEMBER(mac_state,macv8) +void mac_state::video_start_macv8() { memset(m_rbv_regs, 0, sizeof(m_rbv_regs)); @@ -885,7 +885,7 @@ TIMER_CALLBACK_MEMBER(mac_state::dafb_cursor_tick) m_cursor_timer->adjust(m_screen->time_until_pos(m_cursor_line, 0), 0); } -VIDEO_START_MEMBER(mac_state,macdafb) +void mac_state::video_start_macdafb() { m_vbl_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mac_state::dafb_vbl_tick),this)); m_cursor_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mac_state::dafb_cursor_tick),this)); @@ -894,7 +894,7 @@ VIDEO_START_MEMBER(mac_state,macdafb) m_cursor_timer->adjust(attotime::never); } -VIDEO_RESET_MEMBER(mac_state,macdafb) +void mac_state::video_reset_macdafb() { m_rbv_count = 0; m_rbv_clutoffs = 0; diff --git a/src/mame/video/madalien.cpp b/src/mame/video/madalien.cpp index f07b9badfcf..7247e6cf78d 100644 --- a/src/mame/video/madalien.cpp +++ b/src/mame/video/madalien.cpp @@ -117,7 +117,7 @@ WRITE8_MEMBER(madalien_state::madalien_videoram_w) } -VIDEO_START_MEMBER(madalien_state,madalien) +void madalien_state::video_start_madalien() { int i; @@ -378,7 +378,7 @@ MACHINE_CONFIG_START(madalien_state::madalien_video) MCFG_PALETTE_ADD("palette", 0x30) MCFG_PALETTE_INDIRECT_ENTRIES(0x20) MCFG_PALETTE_INIT_OWNER(madalien_state,madalien) - MCFG_VIDEO_START_OVERRIDE(madalien_state,madalien) + set_video_start_cb(config, driver_callback_delegate(&video_start_madalien, this)); MCFG_MC6845_ADD("crtc", MC6845, "screen", PIXEL_CLOCK / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/video/mappy.cpp b/src/mame/video/mappy.cpp index fafc84915ad..95883e83f22 100644 --- a/src/mame/video/mappy.cpp +++ b/src/mame/video/mappy.cpp @@ -308,7 +308,7 @@ TILE_GET_INFO_MEMBER(mappy_state::mappy_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(mappy_state,superpac) +void mappy_state::video_start_superpac() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::superpac_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); m_screen->register_screen_bitmap(m_sprite_bitmap); @@ -316,14 +316,14 @@ VIDEO_START_MEMBER(mappy_state,superpac) m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 31); } -VIDEO_START_MEMBER(mappy_state,phozon) +void mappy_state::video_start_phozon() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::phozon_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 15); } -VIDEO_START_MEMBER(mappy_state,mappy) +void mappy_state::video_start_mappy() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mappy_state::mappy_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::mappy_tilemap_scan),this),8,8,36,60); diff --git a/src/mame/video/mbee.cpp b/src/mame/video/mbee.cpp index deba6df738e..708e354f146 100644 --- a/src/mame/video/mbee.cpp +++ b/src/mame/video/mbee.cpp @@ -285,7 +285,7 @@ WRITE8_MEMBER ( mbee_state::m6545_data_w ) ************************************************************/ -VIDEO_START_MEMBER( mbee_state, mono ) +void mbee_state::video_start_mono() { m_p_videoram = memregion("videoram")->base(); m_p_gfxram = memregion("gfx")->base()+0x1000; @@ -294,7 +294,7 @@ VIDEO_START_MEMBER( mbee_state, mono ) m_is_premium = 0; } -VIDEO_START_MEMBER( mbee_state, standard ) +void mbee_state::video_start_standard() { m_p_videoram = memregion("videoram")->base(); m_p_gfxram = memregion("gfx")->base()+0x1000; @@ -303,7 +303,7 @@ VIDEO_START_MEMBER( mbee_state, standard ) m_is_premium = 0; } -VIDEO_START_MEMBER( mbee_state, premium ) +void mbee_state::video_start_premium() { m_p_videoram = memregion("videoram")->base(); m_p_colorram = memregion("colorram")->base(); diff --git a/src/mame/video/mcr3.cpp b/src/mame/video/mcr3.cpp index f8b36f4d27c..27e32467a49 100644 --- a/src/mame/video/mcr3.cpp +++ b/src/mame/video/mcr3.cpp @@ -95,7 +95,7 @@ void mcr3_state::video_start() } -VIDEO_START_MEMBER(mcr3_state,spyhunt) +void mcr3_state::video_start_spyhunt() { // initialize the background tilemap m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(mcr3_state::spyhunt_bg_scan),this), 64,32, 64,32); diff --git a/src/mame/video/mcr68.cpp b/src/mame/video/mcr68.cpp index 10479d10075..c15db91f8ad 100644 --- a/src/mame/video/mcr68.cpp +++ b/src/mame/video/mcr68.cpp @@ -38,7 +38,7 @@ TILE_GET_INFO_MEMBER(mcr68_state::get_bg_tile_info) * *************************************/ -VIDEO_START_MEMBER(mcr68_state,mcr68) +void mcr68_state::video_start_mcr68() { /* initialize the background tilemap */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr68_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16,16, 32,32); diff --git a/src/mame/video/megasys1.cpp b/src/mame/video/megasys1.cpp index 13b99f9fd2f..7dd5ed50e38 100644 --- a/src/mame/video/megasys1.cpp +++ b/src/mame/video/megasys1.cpp @@ -198,7 +198,7 @@ actual code sent to the hardware. -VIDEO_START_MEMBER(megasys1_state,megasys1) +void megasys1_state::video_start_megasys1() { m_spriteram = &m_ram[0x8000/2]; diff --git a/src/mame/video/metro.cpp b/src/mame/video/metro.cpp index cd223c00496..b32d3c0a2fc 100644 --- a/src/mame/video/metro.cpp +++ b/src/mame/video/metro.cpp @@ -49,14 +49,14 @@ TILEMAP_MAPPER_MEMBER(metro_state::tilemap_scan_gstrik2) return val; } -VIDEO_START_MEMBER(metro_state,blzntrnd) +void metro_state::video_start_blzntrnd() { m_k053936_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(metro_state::metro_k053936_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 512); m_screen->register_screen_bitmap(m_vdp_bitmap); } -VIDEO_START_MEMBER(metro_state,gstrik2) +void metro_state::video_start_gstrik2() { m_k053936_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(metro_state::metro_k053936_gstrik2_get_tile_info),this), tilemap_mapper_delegate(FUNC(metro_state::tilemap_scan_gstrik2),this), 16, 16, 128, 256); diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp index e060100015d..6d4ebf86fb7 100644 --- a/src/mame/video/midtunit.cpp +++ b/src/mame/video/midtunit.cpp @@ -88,7 +88,7 @@ static struct * *************************************/ -VIDEO_START_MEMBER(midtunit_state,midtunit) +void midtunit_state::video_start_midtunit() { /* allocate memory */ local_videoram = std::make_unique<uint16_t[]>(0x100000/2); @@ -112,16 +112,16 @@ VIDEO_START_MEMBER(midtunit_state,midtunit) } -VIDEO_START_MEMBER(midwunit_state,midwunit) +void midwunit_state::video_start_midwunit() { - VIDEO_START_CALL_MEMBER(midtunit); + video_start_midtunit(); m_gfx_rom_large = 1; } -VIDEO_START_MEMBER(midxunit_state,midxunit) +void midxunit_state::video_start_midxunit() { - VIDEO_START_CALL_MEMBER(midtunit); + video_start_midtunit(); m_gfx_rom_large = 1; videobank_select = 1; } diff --git a/src/mame/video/midyunit.cpp b/src/mame/video/midyunit.cpp index 5c409dab39e..2faf4fa741e 100644 --- a/src/mame/video/midyunit.cpp +++ b/src/mame/video/midyunit.cpp @@ -39,7 +39,7 @@ enum * *************************************/ -VIDEO_START_MEMBER(midyunit_state,common) +void midyunit_state::video_start_common() { /* allocate memory */ m_cmos_ram = std::make_unique<uint16_t[]>((0x2000 * 4)/2); @@ -69,47 +69,41 @@ VIDEO_START_MEMBER(midyunit_state,common) } -VIDEO_START_MEMBER(midyunit_state,midyunit_4bit) +void midyunit_state::video_start_midyunit_4bit() { - int i; - - VIDEO_START_CALL_MEMBER(common); + video_start_common(); /* init for 4-bit */ - for (i = 0; i < 65536; i++) + for (int i = 0; i < 65536; i++) m_pen_map[i] = ((i & 0xf000) >> 8) | (i & 0x000f); m_palette_mask = 0x00ff; } -VIDEO_START_MEMBER(midyunit_state,midyunit_6bit) +void midyunit_state::video_start_midyunit_6bit() { - int i; - - VIDEO_START_CALL_MEMBER(common); + video_start_common(); /* init for 6-bit */ - for (i = 0; i < 65536; i++) + for (int i = 0; i < 65536; i++) m_pen_map[i] = ((i & 0xc000) >> 8) | (i & 0x0f3f); m_palette_mask = 0x0fff; } -VIDEO_START_MEMBER(midyunit_state,mkyawdim) +void midyunit_state::video_start_mkyawdim() { - VIDEO_START_CALL_MEMBER(midyunit_6bit); + video_start_midyunit_6bit(); m_yawdim_dma = 1; } -VIDEO_START_MEMBER(midyunit_state,midzunit) +void midyunit_state::video_start_midzunit() { - int i; - - VIDEO_START_CALL_MEMBER(common); + video_start_common(); /* init for 8-bit */ - for (i = 0; i < 65536; i++) + for (int i = 0; i < 65536; i++) m_pen_map[i] = i & 0x1fff; m_palette_mask = 0x1fff; } diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp index 6032119a7bd..ef874f9e66b 100644 --- a/src/mame/video/midzeus.cpp +++ b/src/mame/video/midzeus.cpp @@ -276,7 +276,7 @@ midzeus_renderer::midzeus_renderer(midzeus_state &state) m_state(state) {} -VIDEO_START_MEMBER(midzeus_state,midzeus) +void midzeus_state::video_start_midzeus() { int i; diff --git a/src/mame/video/mitchell.cpp b/src/mame/video/mitchell.cpp index b92a66dd096..c46d87e3f5f 100644 --- a/src/mame/video/mitchell.cpp +++ b/src/mame/video/mitchell.cpp @@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(mitchell_state::get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(mitchell_state,pang) +void mitchell_state::video_start_pang() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mitchell_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transparent_pen(15); diff --git a/src/mame/video/model1.cpp b/src/mame/video/model1.cpp index 65fe8bed3e6..b10c4e3640c 100644 --- a/src/mame/video/model1.cpp +++ b/src/mame/video/model1.cpp @@ -1562,7 +1562,7 @@ void model1_state::tgp_scan() m_render_done = 0; } -VIDEO_START_MEMBER(model1_state, model1) +void model1_state::video_start_model1() { m_view = std::make_unique<model1_state::view_t>(); diff --git a/src/mame/video/moo.cpp b/src/mame/video/moo.cpp index 9d9327a2c1b..95a3075bce5 100644 --- a/src/mame/video/moo.cpp +++ b/src/mame/video/moo.cpp @@ -34,7 +34,7 @@ K056832_CB_MEMBER(moo_state::tile_callback) *color = m_layer_colorbase[layer] | (*color >> 2 & 0x0f); } -VIDEO_START_MEMBER(moo_state,moo) +void moo_state::video_start_moo() { assert(m_screen->format() == BITMAP_FORMAT_RGB32); @@ -48,7 +48,7 @@ VIDEO_START_MEMBER(moo_state,moo) m_k056832->set_layer_offs(3, 6 + 1, 0); } -VIDEO_START_MEMBER(moo_state,bucky) +void moo_state::video_start_bucky() { assert(m_screen->format() == BITMAP_FORMAT_RGB32); diff --git a/src/mame/video/ms32.cpp b/src/mame/video/ms32.cpp index 214f2998e16..d70ffe34e16 100644 --- a/src/mame/video/ms32.cpp +++ b/src/mame/video/ms32.cpp @@ -113,7 +113,7 @@ void ms32_state::video_start() save_item(NAME(m_brt_b)); } -VIDEO_START_MEMBER(ms32_state,f1superb) +void ms32_state::video_start_f1superb() { ms32_state::video_start(); diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp index 564b9ca6ce0..ce6a5cfcc72 100644 --- a/src/mame/video/mystston.cpp +++ b/src/mame/video/mystston.cpp @@ -213,7 +213,7 @@ void mystston_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec * *************************************/ -VIDEO_START_MEMBER(mystston_state,mystston) +void mystston_state::video_start_mystston() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(mystston_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 32); @@ -232,7 +232,7 @@ VIDEO_START_MEMBER(mystston_state,mystston) * *************************************/ -VIDEO_RESET_MEMBER(mystston_state,mystston) +void mystston_state::video_reset_mystston() { m_interrupt_timer->adjust(m_screen->time_until_pos(FIRST_INT_VPOS - 1, INT_HPOS), FIRST_INT_VPOS); } @@ -311,8 +311,8 @@ GFXDECODE_END *************************************/ MACHINE_CONFIG_START(mystston_state::mystston_video) - MCFG_VIDEO_START_OVERRIDE(mystston_state,mystston) - MCFG_VIDEO_RESET_OVERRIDE(mystston_state,mystston) + set_video_start_cb(config, driver_callback_delegate(&video_start_mystston, this)); + set_video_reset_cb(config, driver_callback_delegate(&video_reset_mystston, this)); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mystston) MCFG_PALETTE_ADD("palette", 0x40) diff --git a/src/mame/video/mystwarr.cpp b/src/mame/video/mystwarr.cpp index d7de9635b94..b36a01b8355 100644 --- a/src/mame/video/mystwarr.cpp +++ b/src/mame/video/mystwarr.cpp @@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(mystwarr_state::get_gai_936_tile_info) SET_TILE_INFO_MEMBER(0, tileno, colour, 0); } -VIDEO_START_MEMBER(mystwarr_state, gaiapols) +void mystwarr_state::video_start_gaiapols() { m_gametype = 0; @@ -181,7 +181,7 @@ TILE_GET_INFO_MEMBER(mystwarr_state::get_ult_936_tile_info) SET_TILE_INFO_MEMBER(0, tileno, colour, (dat1[tile_index]&0x40) ? TILE_FLIPX : 0); } -VIDEO_START_MEMBER(mystwarr_state, dadandrn) +void mystwarr_state::video_start_dadandrn() { m_gametype = 1; @@ -203,7 +203,7 @@ VIDEO_START_MEMBER(mystwarr_state, dadandrn) m_ult_936_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(mystwarr_state, mystwarr) +void mystwarr_state::video_start_mystwarr() { m_gametype = 0; @@ -219,7 +219,7 @@ VIDEO_START_MEMBER(mystwarr_state, mystwarr) m_cbparam = 0; } -VIDEO_START_MEMBER(mystwarr_state, metamrph) +void mystwarr_state::video_start_metamrph() { m_gametype = 0; @@ -234,7 +234,7 @@ VIDEO_START_MEMBER(mystwarr_state, metamrph) m_k056832->set_layer_offs(3, 3+4, 0); // attract sky background to sea } -VIDEO_START_MEMBER(mystwarr_state, viostorm) +void mystwarr_state::video_start_viostorm() { m_gametype = 0; @@ -248,7 +248,7 @@ VIDEO_START_MEMBER(mystwarr_state, viostorm) m_k056832->set_layer_offs(3, 3+1, 0); } -VIDEO_START_MEMBER(mystwarr_state, martchmp) +void mystwarr_state::video_start_martchmp() { m_gametype = 0; diff --git a/src/mame/video/n8080.cpp b/src/mame/video/n8080.cpp index eab68ba12ca..641686ca647 100644 --- a/src/mame/video/n8080.cpp +++ b/src/mame/video/n8080.cpp @@ -83,7 +83,7 @@ void n8080_state::helifire_next_line( ) } -VIDEO_START_MEMBER(n8080_state,spacefev) +void n8080_state::video_start_spacefev() { m_cannon_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::spacefev_stop_red_cannon),this)); @@ -94,7 +94,7 @@ VIDEO_START_MEMBER(n8080_state,spacefev) } -VIDEO_START_MEMBER(n8080_state,sheriff) +void n8080_state::video_start_sheriff() { flip_screen_set(0); @@ -103,17 +103,15 @@ VIDEO_START_MEMBER(n8080_state,sheriff) } -VIDEO_START_MEMBER(n8080_state,helifire) +void n8080_state::video_start_helifire() { - uint8_t data = 0; - int i; - save_item(NAME(m_helifire_mv)); save_item(NAME(m_helifire_sc)); save_item(NAME(m_helifire_flash)); save_item(NAME(m_helifire_LSFR)); - for (i = 0; i < 63; i++) + uint8_t data = 0; + for (int i = 0; i < 63; i++) { int bit = (data >> 6) ^ diff --git a/src/mame/video/namcofl.cpp b/src/mame/video/namcofl.cpp index f23c3648f33..dc2d126ead6 100644 --- a/src/mame/video/namcofl.cpp +++ b/src/mame/video/namcofl.cpp @@ -88,7 +88,7 @@ int namcofl_state::FLobjcode2tile(int code) return code; } -VIDEO_START_MEMBER(namcofl_state,namcofl) +void namcofl_state::video_start_namcofl() { c123_tilemap_init(NAMCOFL_TILEGFX, memregion(NAMCOFL_TILEMASKREGION)->base(), namcos2_shared_state::c123_tilemap_delegate(&namcofl_state::TilemapCB, this)); c355_obj_init(NAMCOFL_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&namcofl_state::FLobjcode2tile, this)); diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp index ae13ed4e4b5..32b362013e4 100644 --- a/src/mame/video/namconb1.cpp +++ b/src/mame/video/namconb1.cpp @@ -124,7 +124,7 @@ int namconb1_state::NB1objcode2tile( int code ) return (code&0x7ff) + bank*0x800; } -VIDEO_START_MEMBER(namconb1_state,namconb1) +void namconb1_state::video_start_namconb1() { c123_tilemap_init(NAMCONB1_TILEGFX, memregion(NAMCONB1_TILEMASKREGION)->base(), namcos2_shared_state::c123_tilemap_delegate(&namconb1_state::NB1TilemapCB, this)); c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&namconb1_state::NB1objcode2tile, this)); @@ -182,7 +182,7 @@ int namconb1_state::NB2objcode2tile( int code ) return code; } /* NB2objcode2tile */ -VIDEO_START_MEMBER(namconb1_state,namconb2) +void namconb1_state::video_start_namconb2() { c123_tilemap_init(NAMCONB1_TILEGFX, memregion(NAMCONB1_TILEMASKREGION)->base(), namcos2_shared_state::c123_tilemap_delegate(&namconb1_state::NB2TilemapCB, this)); c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&namconb1_state::NB2objcode2tile, this)); diff --git a/src/mame/video/namcos21.cpp b/src/mame/video/namcos21.cpp index 5fdb1deda54..e3de189abaf 100644 --- a/src/mame/video/namcos21.cpp +++ b/src/mame/video/namcos21.cpp @@ -360,7 +360,7 @@ void namcos21_state::draw_quad(int sx[4], int sy[4], int zcode[4], int color) rendertri(&c, &d, &a, color, depthcueenable); } -VIDEO_START_MEMBER(namcos21_state,namcos21) +void namcos21_state::video_start_namcos21() { if( m_gametype == NAMCOS21_WINRUN91 ) { diff --git a/src/mame/video/nbmj8688.cpp b/src/mame/video/nbmj8688.cpp index 7e42b075668..18d7e73df1a 100644 --- a/src/mame/video/nbmj8688.cpp +++ b/src/mame/video/nbmj8688.cpp @@ -582,37 +582,37 @@ void nbmj8688_state::postload() m_screen_refresh = 1; } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_8bit) +void nbmj8688_state::video_start_mbmj8688_8bit() { m_gfxmode = GFXTYPE_8BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_hybrid_12bit) +void nbmj8688_state::video_start_mbmj8688_hybrid_12bit() { m_gfxmode = GFXTYPE_HYBRID_12BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_pure_12bit) +void nbmj8688_state::video_start_mbmj8688_pure_12bit() { m_gfxmode = GFXTYPE_PURE_12BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_hybrid_16bit) +void nbmj8688_state::video_start_mbmj8688_hybrid_16bit() { m_gfxmode = GFXTYPE_HYBRID_16BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_pure_16bit) +void nbmj8688_state::video_start_mbmj8688_pure_16bit() { m_gfxmode = GFXTYPE_PURE_16BIT; common_video_start(); } -VIDEO_START_MEMBER(nbmj8688_state,mbmj8688_pure_16bit_LCD) +void nbmj8688_state::video_start_mbmj8688_pure_16bit_LCD() { m_gfxmode = GFXTYPE_PURE_16BIT; common_video_start(); diff --git a/src/mame/video/nbmj8891.cpp b/src/mame/video/nbmj8891.cpp index f941d6c61bf..64c62ddb17b 100644 --- a/src/mame/video/nbmj8891.cpp +++ b/src/mame/video/nbmj8891.cpp @@ -480,7 +480,7 @@ void nbmj8891_state::gfxdraw() ******************************************************************************/ -VIDEO_START_MEMBER( nbmj8891_state, _1layer ) +void nbmj8891_state::video_start__1layer() { int width = m_screen->width(); int height = m_screen->height(); diff --git a/src/mame/video/nbmj9195.cpp b/src/mame/video/nbmj9195.cpp index 828f18e646c..8de3ce8f24f 100644 --- a/src/mame/video/nbmj9195.cpp +++ b/src/mame/video/nbmj9195.cpp @@ -368,7 +368,7 @@ WRITE8_MEMBER(nbmj9195_state::clut_1_w){ clut_w(offset, data, 1); } ******************************************************************************/ -VIDEO_START_MEMBER(nbmj9195_state,_1layer) +void nbmj9195_state::video_start__1layer() { int width = m_screen->width(); int height = m_screen->height(); @@ -457,7 +457,7 @@ void nbmj9195_state::postload() m_screen_refresh = 1; } -VIDEO_START_MEMBER(nbmj9195_state,nb22090) +void nbmj9195_state::video_start_nb22090() { nbmj9195_state::video_start(); diff --git a/src/mame/video/ninjakd2.cpp b/src/mame/video/ninjakd2.cpp index 67f8d547475..e6282435509 100644 --- a/src/mame/video/ninjakd2.cpp +++ b/src/mame/video/ninjakd2.cpp @@ -154,7 +154,7 @@ void ninjakd2_state::video_start() m_stencil_compare_function = stencil_ninjakd2; } -VIDEO_START_MEMBER(ninjakd2_state,mnight) +void ninjakd2_state::video_start_mnight() { video_init_common(0); @@ -163,7 +163,7 @@ VIDEO_START_MEMBER(ninjakd2_state,mnight) m_stencil_compare_function = stencil_mnight; } -VIDEO_START_MEMBER(ninjakd2_state,arkarea) +void ninjakd2_state::video_start_arkarea() { video_init_common(0); @@ -172,7 +172,7 @@ VIDEO_START_MEMBER(ninjakd2_state,arkarea) m_stencil_compare_function = stencil_arkarea; } -VIDEO_START_MEMBER(ninjakd2_state,robokid) +void ninjakd2_state::video_start_robokid() { video_init_common(0x0800); m_vram_bank_mask = 1; @@ -188,7 +188,7 @@ VIDEO_START_MEMBER(ninjakd2_state,robokid) m_stencil_compare_function = stencil_robokid; } -VIDEO_START_MEMBER(ninjakd2_state,omegaf) +void ninjakd2_state::video_start_omegaf() { video_init_common(0x2000); m_vram_bank_mask = 7; diff --git a/src/mame/video/nmk16.cpp b/src/mame/video/nmk16.cpp index 6416edaf964..9d82f63caff 100644 --- a/src/mame/video/nmk16.cpp +++ b/src/mame/video/nmk16.cpp @@ -101,7 +101,7 @@ void nmk16_state::nmk16_video_init() } -VIDEO_START_MEMBER(nmk16_state,bioship) +void nmk16_state::video_start_bioship() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); @@ -116,7 +116,7 @@ VIDEO_START_MEMBER(nmk16_state,bioship) } -VIDEO_START_MEMBER(nmk16_state,strahl) +void nmk16_state::video_start_strahl() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::strahl_get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); @@ -130,7 +130,7 @@ VIDEO_START_MEMBER(nmk16_state,strahl) nmk16_video_init(); } -VIDEO_START_MEMBER(nmk16_state,macross) +void nmk16_state::video_start_macross() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,32,32); @@ -140,7 +140,7 @@ VIDEO_START_MEMBER(nmk16_state,macross) nmk16_video_init(); } -VIDEO_START_MEMBER(nmk16_state,gunnail) +void nmk16_state::video_start_gunnail() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_tx_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); @@ -154,7 +154,7 @@ VIDEO_START_MEMBER(nmk16_state,gunnail) m_simple_scroll = 0; } -VIDEO_START_MEMBER(nmk16_state,macross2) +void nmk16_state::video_start_macross2() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<0>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::common_get_bg_tile_info<1>),this), tilemap_mapper_delegate(FUNC(nmk16_state::tilemap_scan_pages),this),16,16,TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); @@ -170,13 +170,13 @@ VIDEO_START_MEMBER(nmk16_state,macross2) /* from the other side of the tilemap (!) */ } -VIDEO_START_MEMBER(nmk16_state,raphero) +void nmk16_state::video_start_raphero() { - VIDEO_START_CALL_MEMBER( macross2 ); + video_start_macross2(); m_simple_scroll = 0; } -VIDEO_START_MEMBER(nmk16_state,bjtwin) +void nmk16_state::video_start_bjtwin() { m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nmk16_state::bjtwin_get_bg_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,32); @@ -722,7 +722,7 @@ uint32_t nmk16_state::screen_update_bjtwin(screen_device &screen, bitmap_ind16 & ***************************************************************************/ -VIDEO_START_MEMBER(nmk16_state,afega) +void nmk16_state::video_start_afega() { m_spriteram_old = make_unique_clear<uint16_t[]>(0x1000/2); m_spriteram_old2 = make_unique_clear<uint16_t[]>(0x1000/2); @@ -743,7 +743,7 @@ VIDEO_START_MEMBER(nmk16_state,afega) } -VIDEO_START_MEMBER(nmk16_state,grdnstrm) +void nmk16_state::video_start_grdnstrm() { m_spriteram_old = make_unique_clear<uint16_t[]>(0x1000/2); m_spriteram_old2 = make_unique_clear<uint16_t[]>(0x1000/2); @@ -765,7 +765,7 @@ VIDEO_START_MEMBER(nmk16_state,grdnstrm) } -VIDEO_START_MEMBER(nmk16_state,firehawk) +void nmk16_state::video_start_firehawk() { m_spriteram_old = make_unique_clear<uint16_t[]>(0x1000/2); m_spriteram_old2 = make_unique_clear<uint16_t[]>(0x1000/2); diff --git a/src/mame/video/nova2001.cpp b/src/mame/video/nova2001.cpp index c39c7db04e8..3ee7d318473 100644 --- a/src/mame/video/nova2001.cpp +++ b/src/mame/video/nova2001.cpp @@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_fg_tile_info) * *************************************/ -VIDEO_START_MEMBER(nova2001_state,nova2001) +void nova2001_state::video_start_nova2001() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::nova2001_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::nova2001_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -172,13 +172,13 @@ VIDEO_START_MEMBER(nova2001_state,nova2001) m_bg_tilemap->set_scrolldx(0, -7); } -VIDEO_START_MEMBER(nova2001_state,pkunwar) +void nova2001_state::video_start_pkunwar() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::pkunwar_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(nova2001_state,ninjakun) +void nova2001_state::video_start_ninjakun() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::ninjakun_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::ninjakun_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -186,7 +186,7 @@ VIDEO_START_MEMBER(nova2001_state,ninjakun) m_bg_tilemap->set_scrolldx(7, 0); } -VIDEO_START_MEMBER(nova2001_state,raiders5) +void nova2001_state::video_start_raiders5() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::raiders5_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(nova2001_state::raiders5_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/ojankohs.cpp b/src/mame/video/ojankohs.cpp index 8e3fa06c6c8..6d27a04a4cb 100644 --- a/src/mame/video/ojankohs.cpp +++ b/src/mame/video/ojankohs.cpp @@ -254,7 +254,7 @@ WRITE8_MEMBER(ojankohs_state::ojankoc_videoram_w) ******************************************************************************/ -VIDEO_START_MEMBER(ojankohs_state,ojankohs) +void ojankohs_state::video_start_ojankohs() { m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ojankohs_state::ojankohs_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); // m_videoram = std::make_unique<uint8_t[]>(0x1000); @@ -262,20 +262,20 @@ VIDEO_START_MEMBER(ojankohs_state,ojankohs) // m_paletteram = std::make_unique<uint8_t[]>(0x800); } -VIDEO_START_MEMBER(ojankohs_state,ojankoy) +void ojankohs_state::video_start_ojankoy() { m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ojankohs_state::ojankoy_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); // m_videoram = std::make_unique<uint8_t[]>(0x2000); // m_colorram = std::make_unique<uint8_t[]>(0x1000); } -VIDEO_START_MEMBER(ojankohs_state,ccasino) +void ojankohs_state::video_start_ccasino() { - VIDEO_START_CALL_MEMBER(ojankoy); + video_start_ojankoy(); m_paletteram.allocate(0x800); } -VIDEO_START_MEMBER(ojankohs_state,ojankoc) +void ojankohs_state::video_start_ojankoc() { m_screen->register_screen_bitmap(m_tmpbitmap); m_videoram.allocate(0x8000); diff --git a/src/mame/video/orion.cpp b/src/mame/video/orion.cpp index a6d9148dd3c..40f422560d7 100644 --- a/src/mame/video/orion.cpp +++ b/src/mame/video/orion.cpp @@ -13,7 +13,7 @@ #include "emu.h" #include "includes/orion.h" -VIDEO_START_MEMBER(orion_state,orion128) +void orion_state::video_start_orion128() { } diff --git a/src/mame/video/pacman.cpp b/src/mame/video/pacman.cpp index e46ae8cbb75..49fbea6d140 100644 --- a/src/mame/video/pacman.cpp +++ b/src/mame/video/pacman.cpp @@ -157,7 +157,7 @@ void pacman_state::init_save_state() } -VIDEO_START_MEMBER(pacman_state,pacman) +void pacman_state::video_start_pacman() { init_save_state(); @@ -176,9 +176,9 @@ VIDEO_START_MEMBER(pacman_state,pacman) m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(pacman_state::pacman_get_tile_info),this), tilemap_mapper_delegate(FUNC(pacman_state::pacman_scan_rows),this), 8, 8, 36, 28 ); } -VIDEO_START_MEMBER(pacman_state,birdiy) +void pacman_state::video_start_birdiy() { - VIDEO_START_CALL_MEMBER( pacman ); + video_start_pacman(); m_xoffsethack = 0; m_inv_spr = 1; // sprites are mirrored in X-axis compared to normal behaviour } @@ -309,7 +309,7 @@ uint32_t pacman_state::screen_update_pacman(screen_device &screen, bitmap_ind16 **************************************************************************/ -VIDEO_START_MEMBER(pacman_state,pengo) +void pacman_state::video_start_pengo() { init_save_state(); @@ -363,7 +363,7 @@ TILE_GET_INFO_MEMBER(pacman_state::s2650_get_tile_info) SET_TILE_INFO_MEMBER(0,code,attr & 0x1f,0); } -VIDEO_START_MEMBER(pacman_state,s2650games) +void pacman_state::video_start_s2650games() { init_save_state(); @@ -531,7 +531,7 @@ void pacman_state::jrpacman_mark_tile_dirty( int offset ) } } -VIDEO_START_MEMBER(pacman_state,jrpacman) +void pacman_state::video_start_jrpacman() { init_save_state(); diff --git a/src/mame/video/pgm.cpp b/src/mame/video/pgm.cpp index f655e48c1b4..97d1a1313c6 100644 --- a/src/mame/video/pgm.cpp +++ b/src/mame/video/pgm.cpp @@ -611,7 +611,7 @@ TILE_GET_INFO_MEMBER(pgm_state::get_pgm_bg_tilemap_tile_info) /*** Video - Start / Update ****************************************************/ -VIDEO_START_MEMBER(pgm_state,pgm) +void pgm_state::video_start_pgm() { int i; diff --git a/src/mame/video/phoenix.cpp b/src/mame/video/phoenix.cpp index 9407302810e..aaffc95198e 100644 --- a/src/mame/video/phoenix.cpp +++ b/src/mame/video/phoenix.cpp @@ -166,7 +166,7 @@ TILE_GET_INFO_MEMBER(phoenix_state::get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(phoenix_state,phoenix) +void phoenix_state::video_start_phoenix() { m_videoram_pg[0] = std::make_unique<uint8_t[]>(0x1000); memset(m_videoram_pg[0].get(), 0x00, 0x1000 * sizeof(uint8_t)); diff --git a/src/mame/video/playch10.cpp b/src/mame/video/playch10.cpp index 80e38fe7a07..7402da322ef 100644 --- a/src/mame/video/playch10.cpp +++ b/src/mame/video/playch10.cpp @@ -82,7 +82,7 @@ void playch10_state::video_start() 8, 8, 32, 32); } -VIDEO_START_MEMBER(playch10_state,playch10_hboard) +void playch10_state::video_start_playch10_hboard() { const uint8_t *bios = memregion("maincpu")->base(); m_pc10_bios = (bios[3] == 0x2a) ? 1 : 2; diff --git a/src/mame/video/playmark.cpp b/src/mame/video/playmark.cpp index 4601f6d4fa9..210970e59cb 100644 --- a/src/mame/video/playmark.cpp +++ b/src/mame/video/playmark.cpp @@ -90,7 +90,7 @@ TILE_GET_INFO_MEMBER(playmark_state::bigtwinb_get_tx_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(playmark_state,bigtwin) +void playmark_state::video_start_bigtwin() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -106,7 +106,7 @@ VIDEO_START_MEMBER(playmark_state,bigtwin) } -VIDEO_START_MEMBER(playmark_state,bigtwinb) +void playmark_state::video_start_bigtwinb() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwinb_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -126,7 +126,7 @@ VIDEO_START_MEMBER(playmark_state,bigtwinb) } -VIDEO_START_MEMBER(playmark_state,wbeachvl) +void playmark_state::video_start_wbeachvl() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); @@ -143,7 +143,7 @@ VIDEO_START_MEMBER(playmark_state,wbeachvl) m_pri_masks[2] = 0; } -VIDEO_START_MEMBER(playmark_state,excelsr) +void playmark_state::video_start_excelsr() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -158,7 +158,7 @@ VIDEO_START_MEMBER(playmark_state,excelsr) m_pri_masks[2] = 0xfff0; } -VIDEO_START_MEMBER(playmark_state,hotmind) +void playmark_state::video_start_hotmind() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -179,7 +179,7 @@ VIDEO_START_MEMBER(playmark_state,hotmind) m_pri_masks[2] = 0; } -VIDEO_START_MEMBER(playmark_state,luckboomh) +void playmark_state::video_start_luckboomh() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -219,7 +219,7 @@ TILEMAP_MAPPER_MEMBER(playmark_state::playmark_tilemap_scan_pages) // theres enough ram for 64*128 on each tilemap.. -VIDEO_START_MEMBER(playmark_state,hrdtimes) +void playmark_state::video_start_hrdtimes() { m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),tilemap_mapper_delegate(FUNC(playmark_state::playmark_tilemap_scan_pages),this), 16, 16, 128, 32); diff --git a/src/mame/video/polepos.cpp b/src/mame/video/polepos.cpp index 355af8b52dc..14488ea32d5 100644 --- a/src/mame/video/polepos.cpp +++ b/src/mame/video/polepos.cpp @@ -187,7 +187,7 @@ TILE_GET_INFO_MEMBER(polepos_state::tx_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(polepos_state,polepos) +void polepos_state::video_start_polepos() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(polepos_state::bg_get_tile_info),this),TILEMAP_SCAN_COLS,8,8,64,16); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(polepos_state::tx_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); diff --git a/src/mame/video/psikyo.cpp b/src/mame/video/psikyo.cpp index 2f9c27ec83e..3aa088a4cda 100644 --- a/src/mame/video/psikyo.cpp +++ b/src/mame/video/psikyo.cpp @@ -94,7 +94,7 @@ void psikyo_state::psikyo_switch_banks( int tmap, int bank ) } -VIDEO_START_MEMBER(psikyo_state,psikyo) +void psikyo_state::video_start_psikyo() { /* The Hardware is Capable of Changing the Dimensions of the Tilemaps, its safer to create the various sized tilemaps now as opposed to later */ @@ -119,9 +119,9 @@ VIDEO_START_MEMBER(psikyo_state,psikyo) save_item(NAME(m_old_linescroll)); } -VIDEO_START_MEMBER(psikyo_state,sngkace) +void psikyo_state::video_start_sngkace() { - VIDEO_START_CALL_MEMBER( psikyo ); + video_start_psikyo(); psikyo_switch_banks(0, 0); // sngkace / samuraia don't use banking psikyo_switch_banks(1, 1); // They share "gfx2" to save memory on other boards diff --git a/src/mame/video/psychic5.cpp b/src/mame/video/psychic5.cpp index fedcf72dd3f..9d9398f4f71 100644 --- a/src/mame/video/psychic5.cpp +++ b/src/mame/video/psychic5.cpp @@ -187,7 +187,7 @@ void psychic5_state::video_start() } -VIDEO_START_MEMBER(psychic5_state,psychic5) +void psychic5_state::video_start_psychic5() { video_start(); @@ -199,7 +199,7 @@ VIDEO_START_MEMBER(psychic5_state,psychic5) } -VIDEO_START_MEMBER(psychic5_state,bombsa) +void psychic5_state::video_start_bombsa() { video_start(); @@ -210,7 +210,7 @@ VIDEO_START_MEMBER(psychic5_state,bombsa) save_item(NAME(m_bombsa_unknown)); } -VIDEO_RESET_MEMBER(psychic5_state,psychic5) +void psychic5_state::video_reset_psychic5() { m_bg_clip_mode = 0; m_ps5_vram_page = 0; diff --git a/src/mame/video/punchout.cpp b/src/mame/video/punchout.cpp index 8d64b464376..c217aefb7c5 100644 --- a/src/mame/video/punchout.cpp +++ b/src/mame/video/punchout.cpp @@ -110,7 +110,7 @@ void punchout_state::video_start() } -VIDEO_START_MEMBER(punchout_state,armwrest) +void punchout_state::video_start_armwrest() { m_bg_top_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::armwrest_top_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); m_bg_bot_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(punchout_state::armwrest_bot_get_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); diff --git a/src/mame/video/qdrmfgp.cpp b/src/mame/video/qdrmfgp.cpp index 8eb80c74aca..f48b0f9fdec 100644 --- a/src/mame/video/qdrmfgp.cpp +++ b/src/mame/video/qdrmfgp.cpp @@ -26,7 +26,7 @@ K056832_CB_MEMBER(qdrmfgp_state::qdrmfgp2_tile_callback) ***************************************************************************/ -VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp) +void qdrmfgp_state::video_start_qdrmfgp() { m_k056832->set_layer_association(0); @@ -36,7 +36,7 @@ VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp) m_k056832->set_layer_offs(3, 8, 0); } -VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp2) +void qdrmfgp_state::video_start_qdrmfgp2() { m_k056832->set_layer_association(0); diff --git a/src/mame/video/qix.cpp b/src/mame/video/qix.cpp index 6963e14c003..e2f9bed2142 100644 --- a/src/mame/video/qix.cpp +++ b/src/mame/video/qix.cpp @@ -19,7 +19,7 @@ * *************************************/ -VIDEO_START_MEMBER(qix_state,qix) +void qix_state::video_start_qix() { /* allocate memory for the full video RAM */ m_videoram.allocate(256 * 256); @@ -384,7 +384,7 @@ MACHINE_CONFIG_START(qix_state::qix_video) MCFG_DEVICE_ADD("videocpu", MC6809E, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ MCFG_DEVICE_PROGRAM_MAP(qix_video_map) - MCFG_VIDEO_START_OVERRIDE(qix_state,qix) + set_video_start_cb(config, driver_callback_delegate(&video_start_qix, this)); MCFG_MC6845_ADD("vid_u18", MC6845, "screen", QIX_CHARACTER_CLOCK) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/video/quasar.cpp b/src/mame/video/quasar.cpp index 86377605bd7..30d995b8aef 100644 --- a/src/mame/video/quasar.cpp +++ b/src/mame/video/quasar.cpp @@ -89,7 +89,7 @@ PALETTE_INIT_MEMBER(quasar_state,quasar) } -VIDEO_START_MEMBER(quasar_state,quasar) +void quasar_state::video_start_quasar() { m_effectram = std::make_unique<uint8_t[]>(0x400); diff --git a/src/mame/video/raiden.cpp b/src/mame/video/raiden.cpp index 2b55df6e67d..178103e2e3a 100644 --- a/src/mame/video/raiden.cpp +++ b/src/mame/video/raiden.cpp @@ -238,7 +238,7 @@ void raiden_state::video_start() save_item(NAME(m_flipscreen)); } -VIDEO_START_MEMBER(raiden_state,raidenb) +void raiden_state::video_start_raidenb() { m_bg_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_back_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); m_fg_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(raiden_state::get_fore_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32); diff --git a/src/mame/video/rallyx.cpp b/src/mame/video/rallyx.cpp index b41a5e74a4a..6fca095a0b8 100644 --- a/src/mame/video/rallyx.cpp +++ b/src/mame/video/rallyx.cpp @@ -330,7 +330,7 @@ void rallyx_state::rallyx_video_start_common( ) m_drawmode_table[3] = DRAWMODE_NONE; } -VIDEO_START_MEMBER(rallyx_state,rallyx) +void rallyx_state::video_start_rallyx() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -344,7 +344,7 @@ VIDEO_START_MEMBER(rallyx_state,rallyx) } -VIDEO_START_MEMBER(rallyx_state,jungler) +void rallyx_state::video_start_jungler() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -356,7 +356,7 @@ VIDEO_START_MEMBER(rallyx_state,jungler) } -VIDEO_START_MEMBER(rallyx_state,locomotn) +void rallyx_state::video_start_locomotn() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -368,7 +368,7 @@ VIDEO_START_MEMBER(rallyx_state,locomotn) } -VIDEO_START_MEMBER(rallyx_state,commsega) +void rallyx_state::video_start_commsega() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); diff --git a/src/mame/video/rbisland.cpp b/src/mame/video/rbisland.cpp index c326b856f01..21103c3d0dd 100644 --- a/src/mame/video/rbisland.cpp +++ b/src/mame/video/rbisland.cpp @@ -69,7 +69,7 @@ the Y settings are active low. */ -VIDEO_START_MEMBER(rbisland_state,jumping) +void rbisland_state::video_start_jumping() { m_pc080sn->set_trans_pen(1, 15); diff --git a/src/mame/video/redalert.cpp b/src/mame/video/redalert.cpp index 609794abbdb..0ba20bed2fb 100644 --- a/src/mame/video/redalert.cpp +++ b/src/mame/video/redalert.cpp @@ -162,7 +162,7 @@ void redalert_state::get_panther_pens(pen_t *pens) * *************************************/ -VIDEO_START_MEMBER(redalert_state,redalert) +void redalert_state::video_start_redalert() { m_bitmap_colorram = std::make_unique<uint8_t[]>(0x0400); @@ -171,9 +171,9 @@ VIDEO_START_MEMBER(redalert_state,redalert) m_control_xor = 0x00; } -VIDEO_START_MEMBER(redalert_state,ww3) +void redalert_state::video_start_ww3() { - VIDEO_START_CALL_MEMBER( redalert ); + video_start_redalert(); m_control_xor = 0x04; } @@ -413,14 +413,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(redalert_state::redalert_video) - MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) + set_video_start_cb(config, driver_callback_delegate(&video_start_redalert, this)); redalert_video_common(config); MACHINE_CONFIG_END MACHINE_CONFIG_START(redalert_state::ww3_video) - MCFG_VIDEO_START_OVERRIDE(redalert_state, ww3 ) + set_video_start_cb(config, driver_callback_delegate(&video_start_ww3, this)); redalert_video_common(config); MACHINE_CONFIG_END @@ -433,7 +433,7 @@ MACHINE_CONFIG_END *************************************/ MACHINE_CONFIG_START(redalert_state::demoneye_video) - MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) + set_video_start_cb(config, driver_callback_delegate(&video_start_redalert, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -446,7 +446,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(redalert_state::panther_video) - MCFG_VIDEO_START_OVERRIDE(redalert_state,ww3) + set_video_start_cb(config, driver_callback_delegate(&video_start_ww3, this)); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/video/rohga.cpp b/src/mame/video/rohga.cpp index e1e6da0e055..36bc1df2a9c 100644 --- a/src/mame/video/rohga.cpp +++ b/src/mame/video/rohga.cpp @@ -74,7 +74,7 @@ uint32_t rohga_state::screen_update_rohga(screen_device &screen, bitmap_ind16 &b -VIDEO_START_MEMBER(rohga_state,wizdfire) +void rohga_state::video_start_wizdfire() { m_sprgen[0]->alloc_sprite_bitmap(); m_sprgen[1]->alloc_sprite_bitmap(); diff --git a/src/mame/video/rpunch.cpp b/src/mame/video/rpunch.cpp index b3a072db267..f5287369276 100644 --- a/src/mame/video/rpunch.cpp +++ b/src/mame/video/rpunch.cpp @@ -66,7 +66,7 @@ TIMER_CALLBACK_MEMBER(rpunch_state::crtc_interrupt_gen) } -VIDEO_START_MEMBER(rpunch_state,rpunch) +void rpunch_state::video_start_rpunch() { m_sprite_xoffs = 0; @@ -85,9 +85,9 @@ VIDEO_START_MEMBER(rpunch_state,rpunch) } -VIDEO_START_MEMBER(rpunch_state,svolley) +void rpunch_state::video_start_svolley() { - VIDEO_START_CALL_MEMBER(rpunch); + video_start_rpunch(); m_background[0]->set_scrolldx(8, 0); // aligns middle net sprite with bg as shown in reference m_sprite_xoffs = -4; } diff --git a/src/mame/video/runaway.cpp b/src/mame/video/runaway.cpp index 65a4dd9a4c6..807ad43533a 100644 --- a/src/mame/video/runaway.cpp +++ b/src/mame/video/runaway.cpp @@ -76,7 +76,7 @@ void runaway_state::video_start() } -VIDEO_START_MEMBER(runaway_state,qwak) +void runaway_state::video_start_qwak() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(runaway_state::qwak_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 30); diff --git a/src/mame/video/sauro.cpp b/src/mame/video/sauro.cpp index c6b7965e3e8..81cad77a68f 100644 --- a/src/mame/video/sauro.cpp +++ b/src/mame/video/sauro.cpp @@ -91,7 +91,7 @@ WRITE8_MEMBER(sauro_state::sauro_scroll_fg_w) m_fg_tilemap->set_scrollx(0, scroll); } -VIDEO_START_MEMBER(sauro_state,sauro) +void sauro_state::video_start_sauro() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -162,7 +162,7 @@ uint32_t sauro_state::screen_update_sauro(screen_device &screen, bitmap_ind16 &b /* Tricky Doc */ -VIDEO_START_MEMBER(sauro_state,trckydoc) +void sauro_state::video_start_trckydoc() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/seibuspi.cpp b/src/mame/video/seibuspi.cpp index e393e87b870..a3a288e4cf5 100644 --- a/src/mame/video/seibuspi.cpp +++ b/src/mame/video/seibuspi.cpp @@ -791,14 +791,14 @@ void seibuspi_state::video_start() register_video_state(); } -VIDEO_START_MEMBER(seibuspi_state,ejanhs) +void seibuspi_state::video_start_ejanhs() { video_start(); memset(m_alpha_table, 0, 0x2000); // no alpha blending } -VIDEO_START_MEMBER(seibuspi_state,sys386f) +void seibuspi_state::video_start_sys386f() { m_video_dma_length = 0; m_video_dma_address = 0; diff --git a/src/mame/video/seta.cpp b/src/mame/video/seta.cpp index 9999b8927b2..7276e6e3a7d 100644 --- a/src/mame/video/seta.cpp +++ b/src/mame/video/seta.cpp @@ -420,9 +420,9 @@ WRITE16_MEMBER(seta_state::twineagl_tilebank_w) /* 2 layers */ -VIDEO_START_MEMBER(seta_state,seta_2_layers) +void seta_state::video_start_seta_2_layers() { - VIDEO_START_CALL_MEMBER( seta_no_layers ); + video_start_seta_no_layers(); /* Each layer consists of 2 tilemaps: only one can be displayed at any given time */ @@ -454,9 +454,9 @@ VIDEO_START_MEMBER(seta_state,seta_2_layers) m_tilemap[layer][bank]->set_transparent_pen(0); } -VIDEO_START_MEMBER(seta_state,oisipuzl_2_layers) +void seta_state::video_start_oisipuzl_2_layers() { - VIDEO_START_CALL_MEMBER(seta_2_layers); + video_start_seta_2_layers(); m_tilemaps_flip = 1; // position kludges @@ -465,9 +465,9 @@ VIDEO_START_MEMBER(seta_state,oisipuzl_2_layers) /* 1 layer */ -VIDEO_START_MEMBER(seta_state,seta_1_layer) +void seta_state::video_start_seta_1_layer() { - VIDEO_START_CALL_MEMBER( seta_no_layers ); + video_start_seta_no_layers(); /* Each layer consists of 2 tilemaps: only one can be displayed at any given time */ @@ -487,26 +487,26 @@ VIDEO_START_MEMBER(seta_state,seta_1_layer) m_tilemap[0][bank]->set_transparent_pen(0); } -VIDEO_START_MEMBER(setaroul_state,setaroul_1_layer) +void setaroul_state::video_start_setaroul_1_layer() { - VIDEO_START_CALL_MEMBER(seta_1_layer); + video_start_seta_1_layer(); // position kludges m_seta001->set_bg_yoffsets( 0, -0x1 ); m_seta001->set_bg_xoffsets( 0, 0x2 ); } -VIDEO_START_MEMBER(jockeyc_state,jockeyc_1_layer) +void jockeyc_state::video_start_jockeyc_1_layer() { - VIDEO_START_CALL_MEMBER(seta_1_layer); + video_start_seta_1_layer(); // position kludges m_seta001->set_fg_yoffsets( -0x12+8, 0x0e ); } -VIDEO_START_MEMBER(seta_state,twineagl_1_layer) +void seta_state::video_start_twineagl_1_layer() { - VIDEO_START_CALL_MEMBER( seta_no_layers ); + video_start_seta_no_layers(); /* Each layer consists of 2 tilemaps: only one can be displayed at any given time */ @@ -533,7 +533,7 @@ SETA001_SPRITE_GFXBANK_CB_MEMBER(seta_state::setac_gfxbank_callback) } /* NO layers, only sprites */ -VIDEO_START_MEMBER(seta_state,seta_no_layers) +void seta_state::video_start_seta_no_layers() { m_tilemap[0][0] = nullptr; m_tilemap[0][1] = nullptr; @@ -553,9 +553,9 @@ VIDEO_START_MEMBER(seta_state,seta_no_layers) m_seta001->set_bg_yoffsets( 0x1, -0x1 ); } -VIDEO_START_MEMBER(seta_state,kyustrkr_no_layers) +void seta_state::video_start_kyustrkr_no_layers() { - VIDEO_START_CALL_MEMBER(seta_no_layers); + video_start_seta_no_layers(); // position kludges m_seta001->set_fg_yoffsets( -0x0a, 0x0e ); diff --git a/src/mame/video/seta2.cpp b/src/mame/video/seta2.cpp index 1ba670cc770..149f563ce35 100644 --- a/src/mame/video/seta2.cpp +++ b/src/mame/video/seta2.cpp @@ -457,21 +457,21 @@ void seta2_state::video_start() m_yoffset = 0; } -VIDEO_START_MEMBER(seta2_state,xoffset) +void seta2_state::video_start_xoffset() { video_start(); m_xoffset = 0x200; } -VIDEO_START_MEMBER(seta2_state,xoffset1) +void seta2_state::video_start_xoffset1() { video_start(); m_xoffset = 0x1; } -VIDEO_START_MEMBER(seta2_state,yoffset) +void seta2_state::video_start_yoffset() { video_start(); diff --git a/src/mame/video/shangkid.cpp b/src/mame/video/shangkid.cpp index 03356df4951..ffa07e54e37 100644 --- a/src/mame/video/shangkid.cpp +++ b/src/mame/video/shangkid.cpp @@ -43,7 +43,7 @@ TILE_GET_INFO_MEMBER(shangkid_state::get_bg_tile_info){ (memregion( "proms" )->base()[0x800+color*4]==2)?1:0; } -VIDEO_START_MEMBER(shangkid_state,shangkid) +void shangkid_state::video_start_shangkid() { m_background = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(shangkid_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); } diff --git a/src/mame/video/slapfght.cpp b/src/mame/video/slapfght.cpp index cd1ef5465e9..0106ccd1338 100644 --- a/src/mame/video/slapfght.cpp +++ b/src/mame/video/slapfght.cpp @@ -51,14 +51,14 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_fix_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(slapfght_state, perfrman) +void slapfght_state::video_start_perfrman() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_pf_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(slapfght_state, slapfight) +void slapfght_state::video_start_slapfight() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_pf1_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(slapfght_state::get_fix_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/snk.cpp b/src/mame/video/snk.cpp index b15fe0b0c04..15359c799da 100644 --- a/src/mame/video/snk.cpp +++ b/src/mame/video/snk.cpp @@ -184,7 +184,7 @@ TILE_GET_INFO_MEMBER(snk_state::gwar_get_bg_tile_info) /**************************************************************************************/ -VIDEO_START_MEMBER(snk_state,snk_3bpp_shadow) +void snk_state::video_start_snk_3bpp_shadow() { int i; @@ -200,7 +200,7 @@ VIDEO_START_MEMBER(snk_state,snk_3bpp_shadow) m_palette->shadow_table()[i] = i | 0x200; } -VIDEO_START_MEMBER(snk_state,snk_4bpp_shadow) +void snk_state::video_start_snk_4bpp_shadow() { int i; @@ -221,9 +221,9 @@ VIDEO_START_MEMBER(snk_state,snk_4bpp_shadow) } -VIDEO_START_MEMBER(snk_state,marvins) +void snk_state::video_start_marvins() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); @@ -242,9 +242,9 @@ VIDEO_START_MEMBER(snk_state,marvins) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,jcross) +void snk_state::video_start_jcross() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::aso_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 64); @@ -261,9 +261,9 @@ VIDEO_START_MEMBER(snk_state,jcross) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,sgladiat) +void snk_state::video_start_sgladiat() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::aso_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 32); @@ -280,9 +280,9 @@ VIDEO_START_MEMBER(snk_state,sgladiat) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,hal21) +void snk_state::video_start_hal21() { - VIDEO_START_CALL_MEMBER(jcross); + video_start_jcross(); m_bg_tilemap->set_scrolldy(8, -32+256); @@ -290,9 +290,9 @@ VIDEO_START_MEMBER(snk_state,hal21) m_yscroll_mask = 0x1ff; } -VIDEO_START_MEMBER(snk_state,aso) +void snk_state::video_start_aso() { - VIDEO_START_CALL_MEMBER(jcross); + video_start_jcross(); m_bg_tilemap->set_scrolldx(15+256, 24+256); @@ -301,9 +301,9 @@ VIDEO_START_MEMBER(snk_state,aso) } -VIDEO_START_MEMBER(snk_state,tnk3) +void snk_state::video_start_tnk3() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::tnk3_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 64, 64); @@ -319,9 +319,9 @@ VIDEO_START_MEMBER(snk_state,tnk3) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,ikari) +void snk_state::video_start_ikari() { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); + video_start_snk_3bpp_shadow(); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::ikari_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk_state::ikari_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); @@ -335,12 +335,10 @@ VIDEO_START_MEMBER(snk_state,ikari) m_tx_tile_offset = 0; } -VIDEO_START_MEMBER(snk_state,gwar) +void snk_state::video_start_gwar() { - int i; - /* prepare drawmode table */ - for(i = 0; i <= 14; i++) m_drawmode_table[i] = DRAWMODE_SOURCE; + for (int i = 0; i <= 14; i++) m_drawmode_table[i] = DRAWMODE_SOURCE; m_drawmode_table[15] = DRAWMODE_NONE; memset(m_empty_tile, 0xf, sizeof(m_empty_tile)); @@ -358,16 +356,16 @@ VIDEO_START_MEMBER(snk_state,gwar) m_is_psychos = 0; } -VIDEO_START_MEMBER(snk_state,psychos) +void snk_state::video_start_psychos() { - VIDEO_START_CALL_MEMBER(gwar); + video_start_gwar(); m_is_psychos = 1; } -VIDEO_START_MEMBER(snk_state,tdfever) +void snk_state::video_start_tdfever() { - VIDEO_START_CALL_MEMBER(gwar); - VIDEO_START_CALL_MEMBER(snk_4bpp_shadow); + video_start_gwar(); + video_start_snk_4bpp_shadow(); } /**************************************************************************************/ diff --git a/src/mame/video/snk6502.cpp b/src/mame/video/snk6502.cpp index 46f6a8107a8..a4cd713758b 100644 --- a/src/mame/video/snk6502.cpp +++ b/src/mame/video/snk6502.cpp @@ -170,7 +170,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::get_fg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(snk6502_state,snk6502) +void snk6502_state::video_start_snk6502() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -186,9 +186,9 @@ void snk6502_state::postload() m_gfxdecode->gfx(0)->mark_all_dirty(); } -VIDEO_START_MEMBER(snk6502_state,pballoon) +void snk6502_state::video_start_pballoon() { - VIDEO_START_CALL_MEMBER( snk6502 ); + video_start_snk6502(); m_bg_tilemap->set_scrolldy(-16, -16); m_fg_tilemap->set_scrolldy(-16, -16); @@ -301,7 +301,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_fg_tile_info) SET_TILE_INFO_MEMBER(0, code, color, 0); } -VIDEO_START_MEMBER(snk6502_state,satansat) +void snk6502_state::video_start_satansat() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/snk68.cpp b/src/mame/video/snk68.cpp index 597b36d00fd..ea29e5f557e 100644 --- a/src/mame/video/snk68.cpp +++ b/src/mame/video/snk68.cpp @@ -66,7 +66,7 @@ void snk68_state::video_start() save_item(NAME(m_fg_tile_offset)); } -VIDEO_START_MEMBER(snk68_state,searchar) +void snk68_state::video_start_searchar() { m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snk68_state::get_searchar_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/snookr10.cpp b/src/mame/video/snookr10.cpp index fb854d72d07..94d7560abd8 100644 --- a/src/mame/video/snookr10.cpp +++ b/src/mame/video/snookr10.cpp @@ -246,12 +246,12 @@ void snookr10_state::video_start() m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } -VIDEO_START_MEMBER(snookr10_state, apple10) +void snookr10_state::video_start_apple10() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::apple10_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } -VIDEO_START_MEMBER(snookr10_state, crystalc) +void snookr10_state::video_start_crystalc() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(snookr10_state::crystalc_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 128, 30); } diff --git a/src/mame/video/spbactn.cpp b/src/mame/video/spbactn.cpp index 11e386c5184..297b2aa9435 100644 --- a/src/mame/video/spbactn.cpp +++ b/src/mame/video/spbactn.cpp @@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_fg_tile_info) -VIDEO_START_MEMBER(spbactn_state,spbactn) +void spbactn_state::video_start_spbactn() { /* allocate bitmaps */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); @@ -55,9 +55,9 @@ VIDEO_START_MEMBER(spbactn_state,spbactn) m_fg_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(spbactn_state,spbactnp) +void spbactn_state::video_start_spbactnp() { - VIDEO_START_CALL_MEMBER(spbactn); + video_start_spbactn(); // no idea.. m_extra_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(spbactn_state::get_extra_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 16, 16); } diff --git a/src/mame/video/special.cpp b/src/mame/video/special.cpp index c343d7df3ca..e5143b0eae5 100644 --- a/src/mame/video/special.cpp +++ b/src/mame/video/special.cpp @@ -13,7 +13,7 @@ #include "includes/special.h" -VIDEO_START_MEMBER(special_state,special) +void special_state::video_start_special() { m_palette->set_pen_color(0, rgb_t::black()); m_palette->set_pen_color(1, rgb_t::white()); @@ -35,7 +35,8 @@ uint32_t special_state::screen_update_special(screen_device &screen, bitmap_ind1 } return 0; } -VIDEO_START_MEMBER(special_state,specialp) + +void special_state::video_start_specialp() { } @@ -82,7 +83,7 @@ PALETTE_INIT_MEMBER(special_state,specimx) } -VIDEO_START_MEMBER(special_state,specimx) +void special_state::video_start_specimx() { m_specimx_colorram = std::make_unique<uint8_t[]>(0x3000); } @@ -122,7 +123,7 @@ PALETTE_INIT_MEMBER(special_state,erik) } -VIDEO_START_MEMBER(special_state,erik) +void special_state::video_start_erik() { } diff --git a/src/mame/video/spectrum.cpp b/src/mame/video/spectrum.cpp index 9f475d94c45..6da3e961cba 100644 --- a/src/mame/video/spectrum.cpp +++ b/src/mame/video/spectrum.cpp @@ -22,7 +22,7 @@ /*************************************************************************** Start the video hardware emulation. ***************************************************************************/ -VIDEO_START_MEMBER(spectrum_state,spectrum) +void spectrum_state::video_start_spectrum() { m_frame_invert_count = 16; m_frame_number = 0; @@ -43,7 +43,7 @@ VIDEO_START_MEMBER(spectrum_state,spectrum) } -VIDEO_START_MEMBER(spectrum_state,spectrum_128) +void spectrum_state::video_start_spectrum_128() { m_frame_invert_count = 16; m_frame_number = 0; diff --git a/src/mame/video/sslam.cpp b/src/mame/video/sslam.cpp index 77cbfc0d2e3..28268c6d5d6 100644 --- a/src/mame/video/sslam.cpp +++ b/src/mame/video/sslam.cpp @@ -137,7 +137,7 @@ WRITE16_MEMBER(sslam_state::powerbls_bg_tileram_w) m_bg_tilemap->mark_tile_dirty(offset>>1); } -VIDEO_START_MEMBER(sslam_state,sslam) +void sslam_state::video_start_sslam() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_md_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_md_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -150,7 +150,7 @@ VIDEO_START_MEMBER(sslam_state,sslam) save_item(NAME(m_sprites_x_offset)); } -VIDEO_START_MEMBER(sslam_state,powerbls) +void sslam_state::video_start_powerbls() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(sslam_state::get_powerbls_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); diff --git a/src/mame/video/ssv.cpp b/src/mame/video/ssv.cpp index ed500fd9c3e..77b5660b0ed 100644 --- a/src/mame/video/ssv.cpp +++ b/src/mame/video/ssv.cpp @@ -200,7 +200,7 @@ void ssv_state::video_start() save_item(NAME(m_shadow_pen_shift)); } -VIDEO_START_MEMBER(ssv_state,eaglshot) +void ssv_state::video_start_eaglshot() { ssv_state::video_start(); @@ -225,7 +225,7 @@ WRITE16_MEMBER(ssv_state::gdfs_tmapram_w) m_gdfs_tmap->mark_tile_dirty(offset); } -VIDEO_START_MEMBER(ssv_state,gdfs) +void ssv_state::video_start_gdfs() { ssv_state::video_start(); diff --git a/src/mame/video/suna8.cpp b/src/mame/video/suna8.cpp index c12dbeb9d85..277314ea4a5 100644 --- a/src/mame/video/suna8.cpp +++ b/src/mame/video/suna8.cpp @@ -163,10 +163,10 @@ void suna8_state::suna8_vh_start_common(bool has_text, GFXBANK_TYPE_T gfxbank_ty #endif } -VIDEO_START_MEMBER(suna8_state,suna8_text) { suna8_vh_start_common( true, GFXBANK_TYPE_SPARKMAN); } -VIDEO_START_MEMBER(suna8_state,suna8_sparkman) { suna8_vh_start_common( false, GFXBANK_TYPE_SPARKMAN); } -VIDEO_START_MEMBER(suna8_state,suna8_brickzn) { suna8_vh_start_common( false, GFXBANK_TYPE_BRICKZN); } -VIDEO_START_MEMBER(suna8_state,suna8_starfigh) { suna8_vh_start_common( false, GFXBANK_TYPE_STARFIGH); } +void suna8_state::video_start_suna8_text() { suna8_vh_start_common( true, GFXBANK_TYPE_SPARKMAN); } +void suna8_state::video_start_suna8_sparkman() { suna8_vh_start_common( false, GFXBANK_TYPE_SPARKMAN); } +void suna8_state::video_start_suna8_brickzn() { suna8_vh_start_common( false, GFXBANK_TYPE_BRICKZN); } +void suna8_state::video_start_suna8_starfigh() { suna8_vh_start_common( false, GFXBANK_TYPE_STARFIGH); } /*************************************************************************** diff --git a/src/mame/video/super80.cpp b/src/mame/video/super80.cpp index b88b4f4c064..62e098f3e8c 100644 --- a/src/mame/video/super80.cpp +++ b/src/mame/video/super80.cpp @@ -282,7 +282,7 @@ uint32_t super80_state::screen_update_super80m(screen_device &screen, bitmap_ind return 0; } -VIDEO_START_MEMBER(super80_state,super80) +void super80_state::video_start_super80() { m_vidpg = 0xfe00; } diff --git a/src/mame/video/superqix.cpp b/src/mame/video/superqix.cpp index b153246381a..4a2233a23a7 100644 --- a/src/mame/video/superqix.cpp +++ b/src/mame/video/superqix.cpp @@ -49,12 +49,12 @@ TILE_GET_INFO_MEMBER(superqix_state_base::sqix_get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(hotsmash_state, pbillian) +void hotsmash_state::video_start_pbillian() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(hotsmash_state::pb_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8,32,32); } -VIDEO_START_MEMBER(superqix_state_base, superqix) +void superqix_state_base::video_start_superqix() { m_fg_bitmap[0] = std::make_unique<bitmap_ind16>(256, 256); m_fg_bitmap[1] = std::make_unique<bitmap_ind16>(256, 256); diff --git a/src/mame/video/system1.cpp b/src/mame/video/system1.cpp index 890a7498778..f12ad2d7e64 100644 --- a/src/mame/video/system1.cpp +++ b/src/mame/video/system1.cpp @@ -156,7 +156,7 @@ void system1_state::video_start() } -VIDEO_START_MEMBER(system1_state,system2) +void system1_state::video_start_system2() { video_start_common(8); } diff --git a/src/mame/video/system16.cpp b/src/mame/video/system16.cpp index d7e66cf9c21..be4fd505b3b 100644 --- a/src/mame/video/system16.cpp +++ b/src/mame/video/system16.cpp @@ -348,7 +348,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys16_textram_w) /***************************************************************************/ -VIDEO_START_MEMBER(segas1x_bootleg_state,system16) +void segas1x_bootleg_state::video_start_system16() { /* Normal colors */ compute_resistor_weights(0, 255, -1.0, @@ -415,9 +415,9 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,system16) setup_system16_bootleg_spritebanking(); } -VIDEO_START_MEMBER(segas1x_bootleg_state,system18old) +void segas1x_bootleg_state::video_start_system18old() { - VIDEO_START_CALL_MEMBER(system16); + video_start_system16(); m_bg1_trans = 1; @@ -539,7 +539,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w) } -VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg) +void segas1x_bootleg_state::video_start_s16a_bootleg() { /* Normal colors */ compute_resistor_weights(0, 255, -1.0, @@ -568,21 +568,21 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg) m_bg_tilemaps[1]->set_transparent_pen(0); } -VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg_wb3bl) +void segas1x_bootleg_state::video_start_s16a_bootleg_wb3bl() { - VIDEO_START_CALL_MEMBER(s16a_bootleg); + video_start_s16a_bootleg(); setup_system16_bootleg_spritebanking(); } -VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg_shinobi) +void segas1x_bootleg_state::video_start_s16a_bootleg_shinobi() { - VIDEO_START_CALL_MEMBER(s16a_bootleg); + video_start_s16a_bootleg(); setup_system16_bootleg_spritebanking(); } -VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg_passsht) +void segas1x_bootleg_state::video_start_s16a_bootleg_passsht() { - VIDEO_START_CALL_MEMBER(s16a_bootleg); + video_start_s16a_bootleg(); setup_system16_bootleg_spritebanking(); } diff --git a/src/mame/video/taito_b.cpp b/src/mame/video/taito_b.cpp index caf0590af34..87b870e437f 100644 --- a/src/mame/video/taito_b.cpp +++ b/src/mame/video/taito_b.cpp @@ -37,7 +37,7 @@ WRITE16_MEMBER(taitob_state::realpunc_video_ctrl_w) COMBINE_DATA(&m_realpunc_video_ctrl); } -VIDEO_START_MEMBER(taitob_state,taitob_core) +void taitob_state::video_start_taitob_core() { m_framebuffer[0] = std::make_unique<bitmap_ind16>(512, 256); m_framebuffer[1] = std::make_unique<bitmap_ind16>(512, 256); @@ -49,7 +49,7 @@ VIDEO_START_MEMBER(taitob_state,taitob_core) save_item(NAME(*m_framebuffer[1])); } -VIDEO_START_MEMBER(taitob_state,taitob_color_order0) +void taitob_state::video_start_taitob_color_order0() { /*graphics are shared, only that they use different palette*/ /*this is the basic layout used in: Nastar, Ashura Blaster, Hit the Ice, Rambo3, Tetris*/ @@ -60,29 +60,29 @@ VIDEO_START_MEMBER(taitob_state,taitob_color_order0) /* bg, fg, tx color_base are set in the tc0180vcu interface */ - VIDEO_START_CALL_MEMBER(taitob_core); + video_start_taitob_core(); } -VIDEO_START_MEMBER(taitob_state,taitob_color_order1) +void taitob_state::video_start_taitob_color_order1() { /* this is the reversed layout used in: Crime City, Puzzle Bobble */ m_b_sp_color_base = 0x80 * 16; - VIDEO_START_CALL_MEMBER(taitob_core); + video_start_taitob_core(); } -VIDEO_START_MEMBER(taitob_state,taitob_color_order2) +void taitob_state::video_start_taitob_color_order2() { /*this is used in: rambo3a, masterw, silentd, selfeena, ryujin */ m_b_sp_color_base = 0x10 * 16; - VIDEO_START_CALL_MEMBER(taitob_core); + video_start_taitob_core(); } -VIDEO_START_MEMBER(taitob_state,hitice) +void taitob_state::video_start_hitice() { - VIDEO_START_CALL_MEMBER(taitob_color_order0); + video_start_taitob_color_order0(); m_b_fg_color_base = 0x80; /* hitice also uses this for the pixel_bitmap */ @@ -91,18 +91,18 @@ VIDEO_START_MEMBER(taitob_state,hitice) save_item(NAME(*m_pixel_bitmap)); } -VIDEO_RESET_MEMBER(taitob_state,hitice) +void taitob_state::video_reset_hitice() { /* kludge: clear the bitmap on startup */ hitice_clear_pixel_bitmap(); } -VIDEO_START_MEMBER(taitob_state,realpunc) +void taitob_state::video_start_realpunc() { m_realpunc_bitmap = std::make_unique<bitmap_ind16>(m_screen->width(), m_screen->height()); - VIDEO_START_CALL_MEMBER(taitob_color_order0); + video_start_taitob_color_order0(); } diff --git a/src/mame/video/taito_f2.cpp b/src/mame/video/taito_f2.cpp index eb6ac55efcf..c8fcbc1b98f 100644 --- a/src/mame/video/taito_f2.cpp +++ b/src/mame/video/taito_f2.cpp @@ -76,132 +76,132 @@ void taitof2_state::taitof2_core_vh_start (int sprite_type, int hide, int flip_h /* ( spritetype, hide, hideflip, xoffs, yoffs, flipx, flipy, textflipx, textflipy) */ /**************************************************************************************/ -VIDEO_START_MEMBER(taitof2_state,taitof2_default) +void taitof2_state::video_start_taitof2_default() { taitof2_core_vh_start(0, 0, 0); } -VIDEO_START_MEMBER(taitof2_state,taitof2_megab)/* Megab, Liquidk */ +void taitof2_state::video_start_taitof2_megab()/* Megab, Liquidk */ { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_quiz)/* Quiz Crayons, Quiz Jinsei */ +void taitof2_state::video_start_taitof2_quiz()/* Quiz Crayons, Quiz Jinsei */ { taitof2_core_vh_start(3, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_finalb) +void taitof2_state::video_start_taitof2_finalb() { taitof2_core_vh_start(0, 1, 1); } -VIDEO_START_MEMBER(taitof2_state,taitof2_ssi) +void taitof2_state::video_start_taitof2_ssi() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_growl) +void taitof2_state::video_start_taitof2_growl() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_ninjak) +void taitof2_state::video_start_taitof2_ninjak() { taitof2_core_vh_start(0, 0, 0); } -VIDEO_START_MEMBER(taitof2_state,taitof2_qzchikyu) +void taitof2_state::video_start_taitof2_qzchikyu() { taitof2_core_vh_start(0, 0, 4); } -VIDEO_START_MEMBER(taitof2_state,taitof2_solfigtr) +void taitof2_state::video_start_taitof2_solfigtr() { taitof2_core_vh_start(0, 3, -3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_koshien) +void taitof2_state::video_start_taitof2_koshien() { taitof2_core_vh_start(0, 1, - 1); } -VIDEO_START_MEMBER(taitof2_state,taitof2_gunfront) +void taitof2_state::video_start_taitof2_gunfront() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_thundfox) +void taitof2_state::video_start_taitof2_thundfox() { taitof2_core_vh_start(0, 3, -3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_mjnquest) +void taitof2_state::video_start_taitof2_mjnquest() { taitof2_core_vh_start(0, 0, 0); m_tc0100scn->set_bg_tilemask(0x7fff); } -VIDEO_START_MEMBER(taitof2_state,taitof2_footchmp) +void taitof2_state::video_start_taitof2_footchmp() { taitof2_core_vh_start(0, 3, 3); m_game = FOOTCHMP; } -VIDEO_START_MEMBER(taitof2_state,taitof2_hthero) +void taitof2_state::video_start_taitof2_hthero() { taitof2_core_vh_start(0, 3, 3); m_game = FOOTCHMP; } -VIDEO_START_MEMBER(taitof2_state,taitof2_deadconx) +void taitof2_state::video_start_taitof2_deadconx() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_deadconxj) +void taitof2_state::video_start_taitof2_deadconxj() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_metalb) +void taitof2_state::video_start_taitof2_metalb() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_yuyugogo) +void taitof2_state::video_start_taitof2_yuyugogo() { taitof2_core_vh_start(1, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_yesnoj) +void taitof2_state::video_start_taitof2_yesnoj() { taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_dinorex) +void taitof2_state::video_start_taitof2_dinorex() { taitof2_core_vh_start(3, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_dondokod)/* dondokod, cameltry */ +void taitof2_state::video_start_taitof2_dondokod()/* dondokod, cameltry */ { m_pivot_xdisp = -16; m_pivot_ydisp = 0; taitof2_core_vh_start(0, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_pulirula) +void taitof2_state::video_start_taitof2_pulirula() { m_pivot_xdisp = -10; /* alignment seems correct (see level 2, falling */ m_pivot_ydisp = 16; /* block of ice after armour man) */ taitof2_core_vh_start(2, 3, 3); } -VIDEO_START_MEMBER(taitof2_state,taitof2_driftout) +void taitof2_state::video_start_taitof2_driftout() { m_pivot_xdisp = -16; m_pivot_ydisp = 16; diff --git a/src/mame/video/taito_f3.cpp b/src/mame/video/taito_f3.cpp index 842b02863d5..ae0108d10fc 100644 --- a/src/mame/video/taito_f3.cpp +++ b/src/mame/video/taito_f3.cpp @@ -530,7 +530,7 @@ WRITE_LINE_MEMBER(taito_f3_state::screen_vblank_f3) } } -VIDEO_START_MEMBER(taito_f3_state,f3) +void taito_f3_state::video_start_f3() { const struct F3config *pCFG=&f3_config_table[0]; int i; diff --git a/src/mame/video/taito_l.cpp b/src/mame/video/taito_l.cpp index 908697ddda1..1380b7f35d8 100644 --- a/src/mame/video/taito_l.cpp +++ b/src/mame/video/taito_l.cpp @@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(taitol_state::get_tx_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(taitol_state, taito_l) +void taitol_state::video_start_taito_l() { m_buff_spriteram = make_unique_clear<u8[]>(SPRITERAM_SIZE); int i; diff --git a/src/mame/video/taito_z.cpp b/src/mame/video/taito_z.cpp index 67be80bf41a..7b52d2d688b 100644 --- a/src/mame/video/taito_z.cpp +++ b/src/mame/video/taito_z.cpp @@ -6,7 +6,7 @@ /**********************************************************/ -VIDEO_START_MEMBER(taitoz_state,taitoz) +void taitoz_state::video_start_taitoz() { m_road_palbank = 3; m_sci_spriteframe = 0; diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp index 71154bd763b..16e7bc20261 100644 --- a/src/mame/video/tatsumi.cpp +++ b/src/mame/video/tatsumi.cpp @@ -131,7 +131,7 @@ void cyclwarr_state::tile_expand() /********************************************************************/ -VIDEO_START_MEMBER(apache3_state,apache3) +void apache3_state::video_start_apache3() { m_tx_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_shadow_pen_array = make_unique_clear<uint8_t[]>(8192); @@ -141,7 +141,7 @@ VIDEO_START_MEMBER(apache3_state,apache3) m_tx_layer->set_transparent_pen(0); } -VIDEO_START_MEMBER(roundup5_state,roundup5) +void roundup5_state::video_start_roundup5() { m_tx_layer = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tatsumi_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_shadow_pen_array = make_unique_clear<uint8_t[]>(8192); @@ -152,7 +152,7 @@ VIDEO_START_MEMBER(roundup5_state,roundup5) m_gfxdecode->gfx(1)->set_source((uint8_t *)m_roundup5_vram.get()); } -VIDEO_START_MEMBER(cyclwarr_state,cyclwarr) +void cyclwarr_state::video_start_cyclwarr() { tile_expand(); m_layer[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cyclwarr_state::get_tile_info_bigfight<0>),this),TILEMAP_SCAN_ROWS,8,8,64,512); @@ -164,7 +164,7 @@ VIDEO_START_MEMBER(cyclwarr_state,cyclwarr) m_shadow_pen_array = make_unique_clear<uint8_t[]>(8192); } -VIDEO_START_MEMBER(cyclwarr_state,bigfight) +void cyclwarr_state::video_start_bigfight() { tile_expand(); m_layer[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cyclwarr_state::get_tile_info_bigfight<0>),this),TILEMAP_SCAN_ROWS,8,8,128,256); diff --git a/src/mame/video/tecmo16.cpp b/src/mame/video/tecmo16.cpp index e256f9b1fc2..c3106f71075 100644 --- a/src/mame/video/tecmo16.cpp +++ b/src/mame/video/tecmo16.cpp @@ -88,7 +88,7 @@ void tecmo16_state::video_start() save_state(); } -VIDEO_START_MEMBER(tecmo16_state,ginkun) +void tecmo16_state::video_start_ginkun() { /* set up tile layers */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); @@ -110,7 +110,7 @@ VIDEO_START_MEMBER(tecmo16_state,ginkun) save_state(); } -VIDEO_START_MEMBER(tecmo16_state,riot) +void tecmo16_state::video_start_riot() { /* set up tile layers */ m_screen->register_screen_bitmap(m_tile_bitmap_bg); diff --git a/src/mame/video/tetrisp2.cpp b/src/mame/video/tetrisp2.cpp index 7c8ab3befd2..42157d0ed32 100644 --- a/src/mame/video/tetrisp2.cpp +++ b/src/mame/video/tetrisp2.cpp @@ -216,8 +216,7 @@ WRITE16_MEMBER(tetrisp2_state::rocknms_sub_vram_rot_w) } - -VIDEO_START_MEMBER(tetrisp2_state,tetrisp2) +void tetrisp2_state::video_start_tetrisp2() { m_flipscreen_old = -1; @@ -236,13 +235,13 @@ VIDEO_START_MEMBER(tetrisp2_state,tetrisp2) save_pointer(NAME(m_priority.get()), 0x40000); } -VIDEO_START_MEMBER(tetrisp2_state,nndmseal) +void tetrisp2_state::video_start_nndmseal() { - VIDEO_START_CALL_MEMBER( tetrisp2 ); + video_start_tetrisp2(); m_tilemap_bg->set_scrolldx(-4,-4); } -VIDEO_START_MEMBER(tetrisp2_state,rockntread) +void tetrisp2_state::video_start_rockntread() { m_flipscreen_old = -1; @@ -263,9 +262,9 @@ VIDEO_START_MEMBER(tetrisp2_state,rockntread) } -VIDEO_START_MEMBER(tetrisp2_state,rocknms) +void tetrisp2_state::video_start_rocknms() { - VIDEO_START_CALL_MEMBER( rockntread ); + video_start_rockntread(); m_tilemap_sub_bg = &machine().tilemap().create(*m_sub_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_bg),this),TILEMAP_SCAN_ROWS,16, 16, 32, 256); // rockn ms(sub) m_tilemap_sub_fg = &machine().tilemap().create(*m_sub_gfxdecode, tilemap_get_info_delegate(FUNC(tetrisp2_state::get_tile_info_rocknms_sub_fg),this),TILEMAP_SCAN_ROWS,8, 8, 64, 64); @@ -722,7 +721,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::stepstag_get_tile_info_fg) 0); } -VIDEO_START_MEMBER(stepstag_state,stepstag) +void stepstag_state::video_start_stepstag() { m_flipscreen_old = -1; diff --git a/src/mame/video/thomson.cpp b/src/mame/video/thomson.cpp index 697c4744a20..81819c5616a 100644 --- a/src/mame/video/thomson.cpp +++ b/src/mame/video/thomson.cpp @@ -1118,7 +1118,7 @@ static const uint16_t mo5_pal_init[16] = }; -VIDEO_START_MEMBER( thomson_state, thom ) +void thomson_state::video_start_thom() { LOG (( "thom: video start called\n" )); diff --git a/src/mame/video/tiamc1.cpp b/src/mame/video/tiamc1.cpp index 93ff43af73f..38979334c07 100644 --- a/src/mame/video/tiamc1.cpp +++ b/src/mame/video/tiamc1.cpp @@ -188,7 +188,7 @@ void tiamc1_state::video_start() m_gfxdecode->gfx(0)->set_source(m_charram); } -VIDEO_START_MEMBER(tiamc1_state, kot) +void tiamc1_state::video_start_kot() { m_charram = memregion("gfx2")->base(); diff --git a/src/mame/video/timeplt.cpp b/src/mame/video/timeplt.cpp index f2c80dd4b62..47d9735bfdb 100644 --- a/src/mame/video/timeplt.cpp +++ b/src/mame/video/timeplt.cpp @@ -130,13 +130,13 @@ void timeplt_state::video_start() save_item(NAME(m_video_enable)); } -VIDEO_START_MEMBER(timeplt_state,psurge) +void timeplt_state::video_start_psurge() { video_start(); m_video_enable = 1; //psurge doesn't seem to have the video enable } -VIDEO_START_MEMBER(timeplt_state,chkun) +void timeplt_state::video_start_chkun() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(timeplt_state::get_chkun_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_video_enable = 0; diff --git a/src/mame/video/timex.cpp b/src/mame/video/timex.cpp index 2f4a657cfc2..4db76598a84 100644 --- a/src/mame/video/timex.cpp +++ b/src/mame/video/timex.cpp @@ -26,7 +26,7 @@ inline void spectrum_state::spectrum_plot_pixel(bitmap_ind16 &bitmap, int x, int } /* Update FLASH status for ts2068. Assumes flash update every 1/2s. */ -VIDEO_START_MEMBER(spectrum_state,ts2068) +void spectrum_state::video_start_ts2068() { m_frame_invert_count = 30; diff --git a/src/mame/video/tmnt.cpp b/src/mame/video/tmnt.cpp index 7da27c28eee..e1cb469d712 100644 --- a/src/mame/video/tmnt.cpp +++ b/src/mame/video/tmnt.cpp @@ -206,7 +206,7 @@ K05324X_CB_MEMBER(tmnt_state::prmrsocr_sprite_callback) ***************************************************************************/ -VIDEO_START_MEMBER(tmnt_state,cuebrick) +void tmnt_state::video_start_cuebrick() { m_layer_colorbase[0] = 0; m_layer_colorbase[1] = 32; @@ -214,7 +214,7 @@ VIDEO_START_MEMBER(tmnt_state,cuebrick) m_sprite_colorbase = 16; } -VIDEO_START_MEMBER(tmnt_state,mia) +void tmnt_state::video_start_mia() { m_layer_colorbase[0] = 0; m_layer_colorbase[1] = 32; @@ -225,7 +225,7 @@ VIDEO_START_MEMBER(tmnt_state,mia) save_item(NAME(m_tmnt_priorityflag)); } -VIDEO_START_MEMBER(tmnt_state,tmnt) +void tmnt_state::video_start_tmnt() { m_layer_colorbase[0] = 0; m_layer_colorbase[1] = 32; @@ -238,7 +238,7 @@ VIDEO_START_MEMBER(tmnt_state,tmnt) m_palette->set_shadow_factor(0.75); } -VIDEO_START_MEMBER(tmnt_state,lgtnfght)/* also tmnt2, ssriders */ +void tmnt_state::video_start_lgtnfght()/* also tmnt2, ssriders */ { m_k053245->set_z_rejection(0); @@ -250,7 +250,7 @@ VIDEO_START_MEMBER(tmnt_state,lgtnfght)/* also tmnt2, ssriders */ save_item(NAME(m_lasten)); } -VIDEO_START_MEMBER(tmnt_state,glfgreat) +void tmnt_state::video_start_glfgreat() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tmnt_state::glfgreat_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); m_roz_tilemap->set_transparent_pen(0); @@ -263,7 +263,7 @@ VIDEO_START_MEMBER(tmnt_state,glfgreat) save_item(NAME(m_glfgreat_roz_rom_mode)); } -VIDEO_START_MEMBER(tmnt_state,prmrsocr) +void tmnt_state::video_start_prmrsocr() { m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tmnt_state::prmrsocr_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 256); m_roz_tilemap->set_transparent_pen(0); @@ -274,7 +274,7 @@ VIDEO_START_MEMBER(tmnt_state,prmrsocr) save_item(NAME(m_glfgreat_roz_char_bank)); } -VIDEO_START_MEMBER(tmnt_state,blswhstl) +void tmnt_state::video_start_blswhstl() { m_blswhstl_rombank = -1; save_item(NAME(m_blswhstl_rombank)); diff --git a/src/mame/video/toaplan1.cpp b/src/mame/video/toaplan1.cpp index 190b0a5c6f5..0fc3e7e2706 100644 --- a/src/mame/video/toaplan1.cpp +++ b/src/mame/video/toaplan1.cpp @@ -286,7 +286,7 @@ void toaplan1_state::register_common() } -VIDEO_START_MEMBER(toaplan1_rallybik_state,rallybik) +void toaplan1_rallybik_state::video_start_rallybik() { m_spritegen->alloc_sprite_bitmap(*m_screen); m_spritegen->gfx(0)->set_colorbase(64*16); @@ -312,7 +312,7 @@ VIDEO_START_MEMBER(toaplan1_rallybik_state,rallybik) register_common(); } -VIDEO_START_MEMBER(toaplan1_state,toaplan1) +void toaplan1_state::video_start_toaplan1() { toaplan1_create_tilemaps(); toaplan1_vram_alloc(); diff --git a/src/mame/video/toaplan2.cpp b/src/mame/video/toaplan2.cpp index 86bddaec96f..91b84325581 100644 --- a/src/mame/video/toaplan2.cpp +++ b/src/mame/video/toaplan2.cpp @@ -71,7 +71,7 @@ void toaplan2_state::truxton2_postload() m_gfxdecode->gfx(0)->mark_all_dirty(); } -VIDEO_START_MEMBER(toaplan2_state,toaplan2) +void toaplan2_state::video_start_toaplan2() { /* our current VDP implementation needs this bitmap to work with */ m_screen->register_screen_bitmap(m_custom_priority_bitmap); @@ -89,9 +89,9 @@ VIDEO_START_MEMBER(toaplan2_state,toaplan2) } } -VIDEO_START_MEMBER(toaplan2_state,truxton2) +void toaplan2_state::video_start_truxton2() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); /* Create the Text tilemap for this game */ m_gfxdecode->gfx(0)->set_source(reinterpret_cast<uint8_t *>(m_tx_gfxram16.target())); @@ -100,9 +100,9 @@ VIDEO_START_MEMBER(toaplan2_state,truxton2) create_tx_tilemap(0x1d5, 0x16a); } -VIDEO_START_MEMBER(toaplan2_state,fixeightbl) +void toaplan2_state::video_start_fixeightbl() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); /* Create the Text tilemap for this game */ create_tx_tilemap(); @@ -116,25 +116,25 @@ VIDEO_START_MEMBER(toaplan2_state,fixeightbl) m_vdp0->init_scroll_regs(); } -VIDEO_START_MEMBER(toaplan2_state,bgaregga) +void toaplan2_state::video_start_bgaregga() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); /* Create the Text tilemap for this game */ create_tx_tilemap(0x1d4, 0x16b); } -VIDEO_START_MEMBER(toaplan2_state,bgareggabl) +void toaplan2_state::video_start_bgareggabl() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); /* Create the Text tilemap for this game */ create_tx_tilemap(4, 4); } -VIDEO_START_MEMBER(toaplan2_state,batrider) +void toaplan2_state::video_start_batrider() { - VIDEO_START_CALL_MEMBER( toaplan2 ); + video_start_toaplan2(); m_vdp0->disable_sprite_buffer(); // disable buffering on this game diff --git a/src/mame/video/trackfld.cpp b/src/mame/video/trackfld.cpp index e4531d3a140..f697fb82872 100644 --- a/src/mame/video/trackfld.cpp +++ b/src/mame/video/trackfld.cpp @@ -167,7 +167,7 @@ TILE_GET_INFO_MEMBER(trackfld_state::get_bg_tile_info) SET_TILE_INFO_MEMBER(1, code, color, flags); } -VIDEO_START_MEMBER(trackfld_state,trackfld) +void trackfld_state::video_start_trackfld() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(trackfld_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); @@ -175,9 +175,9 @@ VIDEO_START_MEMBER(trackfld_state,trackfld) } -VIDEO_START_MEMBER(trackfld_state,atlantol) +void trackfld_state::video_start_atlantol() { - VIDEO_START_CALL_MEMBER( trackfld ); + video_start_trackfld(); m_sprites_gfx_banked = 1; } diff --git a/src/mame/video/tsamurai.cpp b/src/mame/video/tsamurai.cpp index 9b59bcd4d8a..8617aca95eb 100644 --- a/src/mame/video/tsamurai.cpp +++ b/src/mame/video/tsamurai.cpp @@ -50,7 +50,7 @@ void tsamurai_state::video_start() save_item(NAME(m_textbank1)); } -VIDEO_START_MEMBER(tsamurai_state, tsamurai) +void tsamurai_state::video_start_tsamurai() { m_background = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_foreground = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -62,9 +62,9 @@ VIDEO_START_MEMBER(tsamurai_state, tsamurai) video_start(); } -VIDEO_START_MEMBER(tsamurai_state, m660) +void tsamurai_state::video_start_m660() { - VIDEO_START_CALL_MEMBER(tsamurai); + video_start_tsamurai(); save_item(NAME(m_textbank2)); } @@ -249,7 +249,7 @@ TILE_GET_INFO_MEMBER(tsamurai_state::get_vsgongf_tile_info) 0); } -VIDEO_START_MEMBER(tsamurai_state,vsgongf) +void tsamurai_state::video_start_vsgongf() { m_foreground = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_vsgongf_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); diff --git a/src/mame/video/tumbleb.cpp b/src/mame/video/tumbleb.cpp index a515f219f7d..249bff7ea3b 100644 --- a/src/mame/video/tumbleb.cpp +++ b/src/mame/video/tumbleb.cpp @@ -220,7 +220,7 @@ void tumbleb_state::tumbleb_tilemap_redraw() m_pf2_alt_tilemap->mark_all_dirty(); } -VIDEO_START_MEMBER(tumbleb_state,pangpang) +void tumbleb_state::video_start_pangpang() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -233,7 +233,7 @@ VIDEO_START_MEMBER(tumbleb_state,pangpang) } -VIDEO_START_MEMBER(tumbleb_state,tumblepb) +void tumbleb_state::video_start_tumblepb() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -245,7 +245,7 @@ VIDEO_START_MEMBER(tumbleb_state,tumblepb) machine().save().register_postload(save_prepost_delegate(FUNC(tumbleb_state::tumbleb_tilemap_redraw), this)); } -VIDEO_START_MEMBER(tumbleb_state,sdfight) +void tumbleb_state::video_start_sdfight() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); // 64*64 to prevent bad tilemap wrapping? - check real behavior m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -257,7 +257,7 @@ VIDEO_START_MEMBER(tumbleb_state,sdfight) machine().save().register_postload(save_prepost_delegate(FUNC(tumbleb_state::tumbleb_tilemap_redraw), this)); } -VIDEO_START_MEMBER(tumbleb_state,fncywld) +void tumbleb_state::video_start_fncywld() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -270,7 +270,7 @@ VIDEO_START_MEMBER(tumbleb_state,fncywld) } -VIDEO_START_MEMBER(tumbleb_state,suprtrio) +void tumbleb_state::video_start_suprtrio() { m_pf1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); diff --git a/src/mame/video/turbo.cpp b/src/mame/video/turbo.cpp index 0f043545483..3ac5965666b 100644 --- a/src/mame/video/turbo.cpp +++ b/src/mame/video/turbo.cpp @@ -160,14 +160,14 @@ TILE_GET_INFO_MEMBER(turbo_state::get_fg_tile_info) } -VIDEO_START_MEMBER(turbo_state,turbo) +void turbo_state::video_start_turbo() { /* initialize the foreground tilemap */ m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); } -VIDEO_START_MEMBER(turbo_state,buckrog) +void turbo_state::video_start_buckrog() { /* initialize the foreground tilemap */ m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); diff --git a/src/mame/video/twincobr.cpp b/src/mame/video/twincobr.cpp index dafed1b7c30..4c02a7b0d7c 100644 --- a/src/mame/video/twincobr.cpp +++ b/src/mame/video/twincobr.cpp @@ -82,7 +82,7 @@ void twincobr_state::twincobr_create_tilemaps() m_tx_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(twincobr_state,toaplan0) +void twincobr_state::video_start_toaplan0() { m_spritegen->alloc_sprite_bitmap(*m_screen); diff --git a/src/mame/video/tx1.cpp b/src/mame/video/tx1.cpp index dabfc0a9ae3..93193d0d6c0 100644 --- a/src/mame/video/tx1.cpp +++ b/src/mame/video/tx1.cpp @@ -1096,7 +1096,7 @@ void tx1_state::tx1_draw_objects(uint8_t *bitmap) * *************************************/ -VIDEO_START_MEMBER(tx1_state,tx1) +void tx1_state::video_start_tx1() { /* Allocate a large bitmap that covers the three screens */ m_bitmap = std::make_unique<bitmap_ind16>(768, 256); @@ -2989,7 +2989,7 @@ void tx1_state::bb_combine_layers(bitmap_ind16 &bitmap, int screen) } } -VIDEO_START_MEMBER(tx1_state,buggyboy) +void tx1_state::video_start_buggyboy() { /* Allocate some bitmaps */ m_chr_bmp = std::make_unique<uint8_t[]>(3 * 256 * 240); @@ -3003,7 +3003,7 @@ VIDEO_START_MEMBER(tx1_state,buggyboy) m_interrupt_timer->adjust(m_screen->time_until_pos(CURSOR_YPOS, CURSOR_XPOS)); } -VIDEO_START_MEMBER(tx1_state,buggybjr) +void tx1_state::video_start_buggybjr() { /* Allocate some bitmaps */ m_chr_bmp = std::make_unique<uint8_t[]>(256 * 240); diff --git a/src/mame/video/ut88.cpp b/src/mame/video/ut88.cpp index f8c8bd7b4ba..5892844b62d 100644 --- a/src/mame/video/ut88.cpp +++ b/src/mame/video/ut88.cpp @@ -24,7 +24,7 @@ const gfx_layout ut88_charlayout = 8*8 /* size of one char */ }; -VIDEO_START_MEMBER(ut88_state,ut88) +void ut88_state::video_start_ut88() { } diff --git a/src/mame/video/warpwarp.cpp b/src/mame/video/warpwarp.cpp index 593956231cf..d0d9f91540e 100644 --- a/src/mame/video/warpwarp.cpp +++ b/src/mame/video/warpwarp.cpp @@ -40,7 +40,7 @@ PALETTE_INIT_MEMBER(warpwarp_state,navarone) palette.set_pen_color(3, geebee_palette[0]); } -MACHINE_RESET_MEMBER(warpwarp_state,kaitei) +void warpwarp_state::machine_reset_kaitei() { // Some PCB videos/images shows a b&w arrangement, others a full colorized one. // This is due of the monitor type used, cfr. http://news.livedoor.com/article/detail/5604337/ @@ -193,17 +193,17 @@ TILE_GET_INFO_MEMBER(warpwarp_state::warpwarp_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(warpwarp_state,geebee) +void warpwarp_state::video_start_geebee() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::geebee_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } -VIDEO_START_MEMBER(warpwarp_state,navarone) +void warpwarp_state::video_start_navarone() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::navarone_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } -VIDEO_START_MEMBER(warpwarp_state,warpwarp) +void warpwarp_state::video_start_warpwarp() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(warpwarp_state::warpwarp_get_tile_info),this),tilemap_mapper_delegate(FUNC(warpwarp_state::tilemap_scan),this),8,8,34,28); } diff --git a/src/mame/video/wc90.cpp b/src/mame/video/wc90.cpp index 84aff9903c9..36f3478caad 100644 --- a/src/mame/video/wc90.cpp +++ b/src/mame/video/wc90.cpp @@ -79,7 +79,7 @@ void wc90_state::video_start() m_tx_tilemap->set_transparent_pen(0); } -VIDEO_START_MEMBER(wc90_state,wc90t) +void wc90_state::video_start_wc90t() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::track_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16,16,64,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(wc90_state::track_get_fg_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64,32); diff --git a/src/mame/video/wecleman.cpp b/src/mame/video/wecleman.cpp index 4bb6c0c1120..807891055ee 100644 --- a/src/mame/video/wecleman.cpp +++ b/src/mame/video/wecleman.cpp @@ -859,7 +859,7 @@ WRITE16_MEMBER(wecleman_state::wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w) Initializations ***************************************************************************/ -VIDEO_START_MEMBER(wecleman_state,wecleman) +void wecleman_state::video_start_wecleman() { /* Sprite banking - each bank is 0x20000 bytes (we support 0x40 bank codes) @@ -961,7 +961,7 @@ K051316_CB_MEMBER(wecleman_state::hotchase_zoom_callback_2) } -VIDEO_START_MEMBER(wecleman_state,hotchase) +void wecleman_state::video_start_hotchase() { /* Sprite banking - each bank is 0x20000 bytes (we support 0x40 bank codes) diff --git a/src/mame/video/wgp.cpp b/src/mame/video/wgp.cpp index d0e162fc463..9d12fb3d3f8 100644 --- a/src/mame/video/wgp.cpp +++ b/src/mame/video/wgp.cpp @@ -70,7 +70,7 @@ void wgp_state::video_start() core_vh_start(32, 16); } -VIDEO_START_MEMBER(wgp_state,wgp2) +void wgp_state::video_start_wgp2() { core_vh_start(32, 16); } diff --git a/src/mame/video/williams.cpp b/src/mame/video/williams.cpp index 52ef8a61356..19f1c25ebd7 100644 --- a/src/mame/video/williams.cpp +++ b/src/mame/video/williams.cpp @@ -167,7 +167,7 @@ void williams_state::state_save_register() } -VIDEO_START_MEMBER(williams_state,williams) +void williams_state::video_start_williams() { blitter_init(m_blitter_config, nullptr); create_palette_lookup(); @@ -175,7 +175,7 @@ VIDEO_START_MEMBER(williams_state,williams) } -VIDEO_START_MEMBER(blaster_state,blaster) +void blaster_state::video_start_blaster() { blitter_init(m_blitter_config, memregion("proms")->base()); create_palette_lookup(); @@ -185,7 +185,7 @@ VIDEO_START_MEMBER(blaster_state,blaster) } -VIDEO_START_MEMBER(williams2_state,williams2) +void williams2_state::video_start_williams2() { blitter_init(m_blitter_config, nullptr); diff --git a/src/mame/video/x1.cpp b/src/mame/video/x1.cpp index dc872754dd8..141d9bc900a 100644 --- a/src/mame/video/x1.cpp +++ b/src/mame/video/x1.cpp @@ -19,7 +19,7 @@ * *************************************/ -VIDEO_START_MEMBER(x1_state,x1) +void x1_state::video_start_x1() { m_gfx_bitmap_ram = make_unique_clear<uint8_t[]>(0xc000*2); m_bitmapbank->configure_entries(0, 2, m_gfx_bitmap_ram.get(), 0xc000); diff --git a/src/mame/video/x68k.cpp b/src/mame/video/x68k.cpp index 7a8912a80b0..54a18233e5c 100644 --- a/src/mame/video/x68k.cpp +++ b/src/mame/video/x68k.cpp @@ -1084,7 +1084,7 @@ TILE_GET_INFO_MEMBER(x68k_state::x68k_get_bg1_tile_16) SET_TILE_INFO_MEMBER(1,code,colour,flags); } -VIDEO_START_MEMBER(x68k_state,x68000) +void x68k_state::video_start_x68000() { int gfx_index; diff --git a/src/mame/video/xevious.cpp b/src/mame/video/xevious.cpp index 9d336b437f2..e88ce76fa55 100644 --- a/src/mame/video/xevious.cpp +++ b/src/mame/video/xevious.cpp @@ -138,7 +138,7 @@ TILE_GET_INFO_MEMBER(xevious_state::get_bg_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(xevious_state,xevious) +void xevious_state::video_start_xevious() { m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(xevious_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(xevious_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); diff --git a/src/mame/video/xmen.cpp b/src/mame/video/xmen.cpp index e3592f4f678..70190803777 100644 --- a/src/mame/video/xmen.cpp +++ b/src/mame/video/xmen.cpp @@ -49,7 +49,7 @@ K053246_CB_MEMBER(xmen_state::sprite_callback) ***************************************************************************/ -VIDEO_START_MEMBER(xmen_state,xmen6p) +void xmen_state::video_start_xmen6p() { m_k053246->k053247_get_ram( &m_k053247_ram); diff --git a/src/mame/video/zaxxon.cpp b/src/mame/video/zaxxon.cpp index 04323f11742..f863737bc1a 100644 --- a/src/mame/video/zaxxon.cpp +++ b/src/mame/video/zaxxon.cpp @@ -150,13 +150,13 @@ void zaxxon_state::video_start() } -VIDEO_START_MEMBER(zaxxon_state,razmataz) +void zaxxon_state::video_start_razmataz() { video_start_common(tilemap_get_info_delegate(FUNC(zaxxon_state::razmataz_get_fg_tile_info),this)); } -VIDEO_START_MEMBER(zaxxon_state,congo) +void zaxxon_state::video_start_congo() { /* allocate our own spriteram since it is not accessible by the main CPU */ m_spriteram.allocate(0x100); |