summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-05-16 21:56:39 +1000
committer Vas Crabb <vas@vastheman.com>2018-05-16 21:56:39 +1000
commit166638ce8093e04884166296469bda82882890fd (patch)
tree6dedcf3bde5d05843695efaf4949ab285d3193f1 /src/mame/machine
parent8e796a2075415427491a541b75884aea6e21f6a9 (diff)
Revert "- Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much"
This reverts commit c83e2a853d4e1643fcc85b68ada3c6f7f33adea4. Revert "fix compile. (nw)" This reverts commit a259ba3e366f442a22a9341755ff58163869860c. GCC is being bad and allowing invalid C++ that other compilers reject.
Diffstat (limited to 'src/mame/machine')
-rw-r--r--src/mame/machine/3do.cpp2
-rw-r--r--src/mame/machine/aim65.cpp6
-rw-r--r--src/mame/machine/amstrad.cpp22
-rw-r--r--src/mame/machine/apollo.cpp4
-rw-r--r--src/mame/machine/apple2.cpp18
-rw-r--r--src/mame/machine/apple2gs.cpp12
-rw-r--r--src/mame/machine/apple3.cpp2
-rw-r--r--src/mame/machine/bbc.cpp40
-rw-r--r--src/mame/machine/dc.cpp2
-rw-r--r--src/mame/machine/decocass.cpp62
-rw-r--r--src/mame/machine/epos.cpp12
-rw-r--r--src/mame/machine/galaxold.cpp6
-rw-r--r--src/mame/machine/galaxy.cpp4
-rw-r--r--src/mame/machine/gb.cpp12
-rw-r--r--src/mame/machine/hp48.cpp12
-rw-r--r--src/mame/machine/itech8.cpp2
-rw-r--r--src/mame/machine/kaypro.cpp5
-rw-r--r--src/mame/machine/leland.cpp8
-rw-r--r--src/mame/machine/llc.cpp6
-rw-r--r--src/mame/machine/mbee.cpp10
-rw-r--r--src/mame/machine/mcr68.cpp4
-rw-r--r--src/mame/machine/megadriv.cpp18
-rw-r--r--src/mame/machine/midtunit.cpp2
-rw-r--r--src/mame/machine/midwunit.cpp2
-rw-r--r--src/mame/machine/midxunit.cpp2
-rw-r--r--src/mame/machine/midyunit.cpp2
-rw-r--r--src/mame/machine/model1.cpp2
-rw-r--r--src/mame/machine/mpu4.cpp28
-rw-r--r--src/mame/machine/mtx.cpp4
-rw-r--r--src/mame/machine/mw8080bw.cpp4
-rw-r--r--src/mame/machine/mz700.cpp4
-rw-r--r--src/mame/machine/namcos2.cpp4
-rw-r--r--src/mame/machine/orion.cpp10
-rw-r--r--src/mame/machine/partner.cpp2
-rw-r--r--src/mame/machine/pc1251.cpp2
-rw-r--r--src/mame/machine/pce.cpp4
-rw-r--r--src/mame/machine/pgmprot_igs025_igs012.cpp8
-rw-r--r--src/mame/machine/pgmprot_igs025_igs012.h2
-rw-r--r--src/mame/machine/pgmprot_igs025_igs022.cpp12
-rw-r--r--src/mame/machine/pgmprot_igs025_igs022.h4
-rw-r--r--src/mame/machine/pgmprot_igs025_igs028.cpp6
-rw-r--r--src/mame/machine/pgmprot_igs025_igs028.h2
-rw-r--r--src/mame/machine/pgmprot_igs027a_type1.cpp6
-rw-r--r--src/mame/machine/pgmprot_igs027a_type1.h2
-rw-r--r--src/mame/machine/pgmprot_igs027a_type2.cpp6
-rw-r--r--src/mame/machine/pgmprot_igs027a_type2.h2
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.cpp14
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.h4
-rw-r--r--src/mame/machine/playch10.cpp2
-rw-r--r--src/mame/machine/primo.cpp2
-rw-r--r--src/mame/machine/qix.cpp2
-rw-r--r--src/mame/machine/radio86.cpp2
-rw-r--r--src/mame/machine/rm380z.cpp2
-rw-r--r--src/mame/machine/scramble.cpp8
-rw-r--r--src/mame/machine/sms.cpp12
-rw-r--r--src/mame/machine/sorcerer.cpp2
-rw-r--r--src/mame/machine/special.cpp8
-rw-r--r--src/mame/machine/super80.cpp4
-rw-r--r--src/mame/machine/thomson.cpp32
-rw-r--r--src/mame/machine/ti85.cpp14
-rw-r--r--src/mame/machine/toaplan1.cpp14
-rw-r--r--src/mame/machine/trs80.cpp8
-rw-r--r--src/mame/machine/twincobr.cpp2
-rw-r--r--src/mame/machine/tx1.cpp4
-rw-r--r--src/mame/machine/ut88.cpp6
-rw-r--r--src/mame/machine/vsnes.cpp8
-rw-r--r--src/mame/machine/vtech2.cpp4
-rw-r--r--src/mame/machine/williams.cpp36
-rw-r--r--src/mame/machine/z80ne.cpp32
69 files changed, 308 insertions, 305 deletions
diff --git a/src/mame/machine/3do.cpp b/src/mame/machine/3do.cpp
index 15954e1ebe0..ea3a5a1fa96 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 */
-void _3do_state::video_start__3do()
+VIDEO_START_MEMBER(_3do_state,_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 2bfb5204291..5f449393fb8 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
- set_video_start_cb(config, driver_callback_delegate(&video_start_aim65, this));
+ MCFG_VIDEO_START_OVERRIDE(aim65_state,aim65)
MCFG_VIDEO_UPDATE(aim65)
*/
@@ -371,12 +371,12 @@ WRITE8_MEMBER( aim65_state::aim65_pa_w )
}
}
-void aim65_state::video_start_aim65()
+VIDEO_START_MEMBER(aim65_state,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_generic();
+ VIDEO_START_CALL_MEMBER(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 5ed1e0e7324..0725ab3142e 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)
}
-void amstrad_state::video_start_amstrad()
+VIDEO_START_MEMBER(amstrad_state,amstrad)
{
amstrad_init_lookups();
@@ -3116,14 +3116,14 @@ TIMER_CALLBACK_MEMBER(amstrad_state::cb_set_resolution)
}
-void amstrad_state::machine_start_amstrad()
+MACHINE_START_MEMBER(amstrad_state,amstrad)
{
m_system_type = SYSTEM_CPC;
m_centronics->write_data7(0);
}
-void amstrad_state::machine_reset_amstrad()
+MACHINE_RESET_MEMBER(amstrad_state,amstrad)
{
amstrad_common_init();
amstrad_reset_machine();
@@ -3138,7 +3138,7 @@ void amstrad_state::machine_reset_amstrad()
}
-void amstrad_state::machine_start_plus()
+MACHINE_START_MEMBER(amstrad_state,plus)
{
m_asic.ram = m_region_user1->base(); // 16kB RAM for ASIC, memory-mapped registers.
m_system_type = SYSTEM_PLUS;
@@ -3153,7 +3153,7 @@ void amstrad_state::machine_start_plus()
}
-void amstrad_state::machine_reset_plus()
+MACHINE_RESET_MEMBER(amstrad_state,plus)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
@@ -3185,7 +3185,7 @@ void amstrad_state::machine_reset_plus()
timer_set(attotime::zero, TIMER_SET_RESOLUTION);
}
-void amstrad_state::machine_start_gx4000()
+MACHINE_START_MEMBER(amstrad_state,gx4000)
{
m_asic.ram = m_region_user1->base(); // 16kB RAM for ASIC, memory-mapped registers.
m_system_type = SYSTEM_GX4000;
@@ -3196,7 +3196,7 @@ void amstrad_state::machine_start_gx4000()
m_region_cart = memregion("maincpu");
}
-void amstrad_state::machine_reset_gx4000()
+MACHINE_RESET_MEMBER(amstrad_state,gx4000)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
@@ -3227,7 +3227,7 @@ void amstrad_state::machine_reset_gx4000()
timer_set(attotime::zero, TIMER_SET_RESOLUTION);
}
-void amstrad_state::machine_start_kccomp()
+MACHINE_START_MEMBER(amstrad_state,kccomp)
{
m_system_type = SYSTEM_CPC;
m_centronics->write_data7(0);
@@ -3241,7 +3241,7 @@ void amstrad_state::machine_start_kccomp()
}
-void amstrad_state::machine_reset_kccomp()
+MACHINE_RESET_MEMBER(amstrad_state,kccomp)
{
amstrad_common_init();
kccomp_reset_machine();
@@ -3256,13 +3256,13 @@ void amstrad_state::machine_reset_kccomp()
}
-void amstrad_state::machine_start_aleste()
+MACHINE_START_MEMBER(amstrad_state,aleste)
{
m_system_type = SYSTEM_ALESTE;
m_centronics->write_data7(0);
}
-void amstrad_state::machine_reset_aleste()
+MACHINE_RESET_MEMBER(amstrad_state,aleste)
{
amstrad_common_init();
amstrad_reset_machine();
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 5bc8c6975a4..5087cf81a0d 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"));
}
-void apollo_state::machine_start_apollo()
+MACHINE_START_MEMBER(apollo_state,apollo)
{
MLOG1(("machine_start_apollo"));
@@ -1205,7 +1205,7 @@ void apollo_state::machine_start_apollo()
m_cur_eop = false;
}
-void apollo_state::machine_reset_apollo()
+MACHINE_RESET_MEMBER(apollo_state,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 b867c3c3fae..a555b69d9f4 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);
}
-void apple2_state::machine_start_apple2c()
+MACHINE_START_MEMBER(apple2_state,apple2c)
{
m_machinetype = APPLE_IIC;
apple2eplus_init_common((void *)nullptr);
}
-void apple2_state::machine_start_tk3000()
+MACHINE_START_MEMBER(apple2_state,tk3000)
{
m_machinetype = TK3000; // enhanced IIe clone with Z80 keyboard scanner subcpu
apple2eplus_init_common((void *)nullptr);
}
-void apple2_state::machine_start_apple2cp()
+MACHINE_START_MEMBER(apple2_state,apple2cp)
{
void *apple2cp_ce00_ram;
@@ -2215,7 +2215,7 @@ void apple2_state::machine_start_apple2cp()
apple2eplus_init_common(apple2cp_ce00_ram);
}
-void apple2_state::machine_start_apple2e()
+MACHINE_START_MEMBER(apple2_state,apple2e)
{
apple2_memmap_config mem_cfg;
@@ -2233,7 +2233,7 @@ void apple2_state::machine_start_apple2e()
apple2_setup_memory(&mem_cfg);
}
-void apple2_state::machine_start_laser128()
+MACHINE_START_MEMBER(apple2_state,laser128)
{
apple2_memmap_config mem_cfg;
@@ -2264,7 +2264,7 @@ void apple2_state::machine_start_laser128()
apple2_setup_memory(&mem_cfg);
}
-void apple2_state::machine_start_apple2orig()
+MACHINE_START_MEMBER(apple2_state,apple2orig)
{
apple2_memmap_config mem_cfg;
void *apple2cp_ce00_ram = nullptr;
@@ -2284,7 +2284,7 @@ void apple2_state::machine_start_apple2orig()
apple2_setup_memory(&mem_cfg);
}
-void apple2_state::machine_start_space84()
+MACHINE_START_MEMBER(apple2_state,space84)
{
apple2_memmap_config mem_cfg;
void *apple2cp_ce00_ram = nullptr;
@@ -2304,7 +2304,7 @@ void apple2_state::machine_start_space84()
apple2_setup_memory(&mem_cfg);
}
-void apple2_state::machine_start_laba2p()
+MACHINE_START_MEMBER(apple2_state,laba2p)
{
apple2_memmap_config mem_cfg;
void *apple2cp_ce00_ram = nullptr;
@@ -2324,7 +2324,7 @@ void apple2_state::machine_start_laba2p()
apple2_setup_memory(&mem_cfg);
}
-void apple2_state::machine_start_tk2000()
+MACHINE_START_MEMBER(apple2_state,tk2000)
{
apple2_memmap_config mem_cfg;
diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp
index aa8dfdb3e79..0da3f10e41d 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);
}
-void apple2gs_state::machine_reset_apple2gs()
+MACHINE_RESET_MEMBER(apple2gs_state,apple2gs)
{
apple2gs_refresh_delegates();
@@ -1971,7 +1971,7 @@ void apple2gs_state::machine_reset_apple2gs()
m_last_adb_time = 0;
}
-void apple2gs_state::machine_start_apple2gscommon()
+MACHINE_START_MEMBER(apple2gs_state,apple2gscommon)
{
apple2gs_refresh_delegates();
@@ -2045,15 +2045,15 @@ void apple2gs_state::machine_start_apple2gscommon()
m_scanline_timer->adjust(m_screen->time_until_pos(0, 0));
}
-void apple2gs_state::machine_start_apple2gs()
+MACHINE_START_MEMBER(apple2gs_state,apple2gs)
{
- machine_start_apple2gscommon();
+ MACHINE_START_CALL_MEMBER(apple2gscommon);
apple2gs_setup_memory();
}
-void apple2gs_state::machine_start_apple2gsr1()
+MACHINE_START_MEMBER(apple2gs_state,apple2gsr1)
{
- machine_start_apple2gscommon();
+ MACHINE_START_CALL_MEMBER(apple2gscommon);
m_is_rom3 = false;
apple2gs_setup_memory();
diff --git a/src/mame/machine/apple3.cpp b/src/mame/machine/apple3.cpp
index 4be02df88f9..43c7bc75581 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();
}
-void apple3_state::machine_reset_apple3()
+MACHINE_RESET_MEMBER(apple3_state,apple3)
{
m_indir_bank = 0;
m_sync = false;
diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp
index f53b87443d0..d05e88cb305 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
}
}
-void bbc_state::machine_start_bbca()
+MACHINE_START_MEMBER(bbc_state, bbca)
{
m_machinetype = MODELA;
bbc_setup_banks(m_bank4, 4, 0, 0x4000);
}
-void bbc_state::machine_reset_bbca()
+MACHINE_RESET_MEMBER(bbc_state, bbca)
{
m_monitortype = m_bbcconfig.read_safe(0) & 0x03;
m_swramtype = (m_bbcconfig.read_safe(0) & 0x0c) >> 2;
@@ -1605,14 +1605,14 @@ void bbc_state::machine_reset_bbca()
bbcb_IC32_initialise(this);
}
-void bbc_state::machine_start_bbcb()
+MACHINE_START_MEMBER(bbc_state, bbcb)
{
m_machinetype = MODELB;
m_mc6850_clock = 0;
bbc_setup_banks(m_bank4, 16, 0, 0x4000);
}
-void bbc_state::machine_reset_bbcb()
+MACHINE_RESET_MEMBER(bbc_state, bbcb)
{
m_monitortype = m_bbcconfig.read_safe(0) & 0x03;
m_swramtype = (m_bbcconfig.read_safe(0) & 0x0c) >> 2;
@@ -1627,16 +1627,16 @@ void bbc_state::machine_reset_bbcb()
}
-void bbc_state::machine_reset_torch()
+MACHINE_RESET_MEMBER(bbc_state, torch)
{
- machine_reset_bbcb();
+ MACHINE_RESET_CALL_MEMBER(bbcb);
m_monitortype = monitor_type_t::COLOUR;
m_swramtype = 0;
}
-void bbc_state::machine_start_bbcbp()
+MACHINE_START_MEMBER(bbc_state, bbcbp)
{
m_machinetype = BPLUS;
m_mc6850_clock = 0;
@@ -1646,7 +1646,7 @@ void bbc_state::machine_start_bbcbp()
bbc_setup_banks(m_bank6, 16, 0x3000, 0x1000);
}
-void bbc_state::machine_reset_bbcbp()
+MACHINE_RESET_MEMBER(bbc_state, bbcbp)
{
m_monitortype = m_bbcconfig.read_safe(0) & 0x03;
m_swramtype = 0;
@@ -1661,7 +1661,7 @@ void bbc_state::machine_reset_bbcbp()
}
-void bbc_state::machine_start_bbcm()
+MACHINE_START_MEMBER(bbc_state, bbcm)
{
m_machinetype = MASTER;
m_mc6850_clock = 0;
@@ -1680,7 +1680,7 @@ void bbc_state::machine_start_bbcm()
output().set_value("power_led", 0);
}
-void bbc_state::machine_reset_bbcm()
+MACHINE_RESET_MEMBER(bbc_state, bbcm)
{
m_monitortype = m_bbcconfig.read_safe(0) & 0x03;
m_swramtype = 0;
@@ -1695,39 +1695,39 @@ void bbc_state::machine_reset_bbcm()
}
-void bbc_state::machine_start_bbcmc()
+MACHINE_START_MEMBER(bbc_state, bbcmc)
{
- machine_start_bbcm();
+ MACHINE_START_CALL_MEMBER(bbcm);
m_machinetype = COMPACT;
}
-void bbc_state::machine_reset_bbcmc()
+MACHINE_RESET_MEMBER(bbc_state, bbcmc)
{
- machine_reset_bbcm();
+ MACHINE_RESET_CALL_MEMBER(bbcm);
}
-void bbc_state::machine_reset_ltmpbp()
+MACHINE_RESET_MEMBER(bbc_state, ltmpbp)
{
- machine_reset_bbcbp();
+ MACHINE_RESET_CALL_MEMBER(bbcbp);
m_monitortype = monitor_type_t::GREEN;
m_swramtype = 0;
}
-void bbc_state::machine_reset_ltmpm()
+MACHINE_RESET_MEMBER(bbc_state, ltmpm)
{
- machine_reset_bbcm();
+ MACHINE_RESET_CALL_MEMBER(bbcm);
m_monitortype = monitor_type_t::GREEN;
m_swramtype = 0;
}
-void bbc_state::machine_start_cfa3000()
+MACHINE_START_MEMBER(bbc_state, cfa3000)
{
- machine_start_bbcm();
+ MACHINE_START_CALL_MEMBER(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 9d7491d95ee..0108b7f6187 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();
}
-void dc_state::machine_reset_dc_console()
+MACHINE_RESET_MEMBER(dc_state,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 9cf85d2f9de..140e928e2bd 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 };
-void decocass_type1_state::machine_reset_cocean1a() /* 10 */
+MACHINE_RESET_MEMBER(decocass_type1_state,cocean1a) /* 10 */
{
machine_reset();
LOG(0,("dongle type #1 (DP-1100 map)\n"));
@@ -460,7 +460,7 @@ void decocass_type1_state::machine_reset_cocean1a() /* 10 */
static uint8_t type1_map1120[8] = { T1PROM,T1PROM,T1LATCHINV,T1DIRECT,T1PROM,T1LATCH,T1PROM,T1PROM };
-void decocass_type1_state::machine_reset_cfboy0a1() /* 12 */
+MACHINE_RESET_MEMBER(decocass_type1_state,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 };
-void decocass_type1_state::machine_reset_clocknchj() /* 11 */
+MACHINE_RESET_MEMBER(decocass_type1_state,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);
}
-void decocass_type1_state::machine_reset_ctsttape()
+MACHINE_RESET_MEMBER(decocass_type1_state,ctsttape)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061)\n"));
m_type1_map = type1_pass_136_table;
}
-void decocass_type1_state::machine_reset_chwy()
+MACHINE_RESET_MEMBER(decocass_type1_state,chwy)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 own PROM)\n"));
m_type1_map = type1_latch_27_pass_3_inv_2_table;
}
-void decocass_type1_state::machine_reset_cdsteljn()
+MACHINE_RESET_MEMBER(decocass_type1_state,cdsteljn)
{
machine_reset();
LOG(0,("dongle type #1 (A-0061)\n"));
m_type1_map = type1_latch_27_pass_3_inv_2_table;
}
-void decocass_type1_state::machine_reset_cterrani()
+MACHINE_RESET_MEMBER(decocass_type1_state,cterrani)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 straight)\n"));
@@ -1409,14 +1409,14 @@ void decocass_type1_state::machine_reset_cterrani()
m_type1_outmap = MAKE_MAP(0,1,2,3,4,5,6,7);
}
-void decocass_type1_state::machine_reset_castfant()
+MACHINE_RESET_MEMBER(decocass_type1_state,castfant)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061)\n"));
m_type1_map = type1_latch_16_pass_3_inv_1_table;
}
-void decocass_type1_state::machine_reset_csuperas()
+MACHINE_RESET_MEMBER(decocass_type1_state,csuperas)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 flip 4-5)\n"));
@@ -1425,14 +1425,14 @@ void decocass_type1_state::machine_reset_csuperas()
m_type1_outmap = MAKE_MAP(0,1,2,3,5,4,6,7);
}
-void decocass_type1_state::machine_reset_cmanhat()
+MACHINE_RESET_MEMBER(decocass_type1_state,cmanhat)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061)\n"));
m_type1_map = type1_latch_xab_pass_x54_table;
}
-void decocass_type1_state::machine_reset_clocknch()
+MACHINE_RESET_MEMBER(decocass_type1_state,clocknch)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 flip 2-3)\n"));
@@ -1441,7 +1441,7 @@ void decocass_type1_state::machine_reset_clocknch()
m_type1_outmap = MAKE_MAP(0,1,3,2,4,5,6,7);
}
-void decocass_type1_state::machine_reset_cprogolf()
+MACHINE_RESET_MEMBER(decocass_type1_state,cprogolf)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 flip 0-1)\n"));
@@ -1450,7 +1450,7 @@ void decocass_type1_state::machine_reset_cprogolf()
m_type1_outmap = MAKE_MAP(1,0,2,3,4,5,6,7);
}
-void decocass_type1_state::machine_reset_cprogolfj()
+MACHINE_RESET_MEMBER(decocass_type1_state,cprogolfj)
{
machine_reset();
LOG(0,("dongle type #1 (A-0061 flip 0-1)\n"));
@@ -1459,7 +1459,7 @@ void decocass_type1_state::machine_reset_cprogolfj()
m_type1_outmap = MAKE_MAP(1,0,2,3,4,5,6,7);
}
-void decocass_type1_state::machine_reset_cluckypo()
+MACHINE_RESET_MEMBER(decocass_type1_state,cluckypo)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 flip 1-3)\n"));
@@ -1468,7 +1468,7 @@ void decocass_type1_state::machine_reset_cluckypo()
m_type1_outmap = MAKE_MAP(0,3,2,1,4,5,6,7);
}
-void decocass_type1_state::machine_reset_ctisland()
+MACHINE_RESET_MEMBER(decocass_type1_state,ctisland)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 flip 0-2)\n"));
@@ -1477,7 +1477,7 @@ void decocass_type1_state::machine_reset_ctisland()
m_type1_outmap = MAKE_MAP(2,1,0,3,4,5,6,7);
}
-void decocass_type1_state::machine_reset_ctisland3()
+MACHINE_RESET_MEMBER(decocass_type1_state,ctisland3)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 custom)\n"));
@@ -1486,14 +1486,14 @@ void decocass_type1_state::machine_reset_ctisland3()
m_type1_outmap = MAKE_MAP(0,1,2,3,4,5,6,7); // ^
}
-void decocass_type1_state::machine_reset_cexplore()
+MACHINE_RESET_MEMBER(decocass_type1_state,cexplore)
{
machine_reset();
LOG(0,("dongle type #1 (DE-0061 own PROM)\n"));
m_type1_map = type1_latch_26_pass_5_inv_2_table;
}
-void decocass_type3_state::machine_reset_cfishing()
+MACHINE_RESET_MEMBER(decocass_type3_state,cfishing)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
@@ -1501,7 +1501,7 @@ void decocass_type3_state::machine_reset_cfishing()
}
-void decocass_type3_state::machine_reset_cbtime()
+MACHINE_RESET_MEMBER(decocass_type3_state,cbtime)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
@@ -1509,70 +1509,70 @@ void decocass_type3_state::machine_reset_cbtime()
}
-void decocass_type3_state::machine_reset_cburnrub()
+MACHINE_RESET_MEMBER(decocass_type3_state,cburnrub)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_67;
}
-void decocass_type3_state::machine_reset_cgraplop()
+MACHINE_RESET_MEMBER(decocass_type3_state,cgraplop)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_56;
}
-void decocass_type3_state::machine_reset_cgraplop2()
+MACHINE_RESET_MEMBER(decocass_type3_state,cgraplop2)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_67;
}
-void decocass_type3_state::machine_reset_clapapa()
+MACHINE_RESET_MEMBER(decocass_type3_state,clapapa)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_34_7;
}
-void decocass_type3_state::machine_reset_cskater()
+MACHINE_RESET_MEMBER(decocass_type3_state,cskater)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_45;
}
-void decocass_type3_state::machine_reset_cprobowl()
+MACHINE_RESET_MEMBER(decocass_type3_state,cprobowl)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_34_0;
}
-void decocass_type3_state::machine_reset_cnightst()
+MACHINE_RESET_MEMBER(decocass_type3_state,cnightst)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_13;
}
-void decocass_type3_state::machine_reset_cpsoccer()
+MACHINE_RESET_MEMBER(decocass_type3_state,cpsoccer)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_24;
}
-void decocass_type3_state::machine_reset_csdtenis()
+MACHINE_RESET_MEMBER(decocass_type3_state,csdtenis)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_23_56;
}
-void decocass_type3_state::machine_reset_czeroize()
+MACHINE_RESET_MEMBER(decocass_type3_state,czeroize)
{
uint8_t *mem = memregion("dongle")->base();
machine_reset();
@@ -1593,14 +1593,14 @@ void decocass_type3_state::machine_reset_czeroize()
mem[0x08a1] = 0xf7;
}
-void decocass_type3_state::machine_reset_cppicf()
+MACHINE_RESET_MEMBER(decocass_type3_state,cppicf)
{
machine_reset();
LOG(0,("dongle type #3 (PAL)\n"));
m_type3_swap = TYPE3_SWAP_01;
}
-void decocass_type3_state::machine_reset_cfghtice()
+MACHINE_RESET_MEMBER(decocass_type3_state,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 a18b026b879..da7f5f12326 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.
*/
-void pacman_state::machine_start_theglobp()
+MACHINE_START_MEMBER(pacman_state, 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 @@ void pacman_state::machine_start_theglobp()
save_item(NAME(m_counter));
}
-void pacman_state::machine_reset_theglobp()
+MACHINE_RESET_MEMBER(pacman_state, theglobp)
{
m_counter = 0x0A;
membank("bank1")->set_entry(m_counter & 3);
@@ -145,7 +145,7 @@ David Widel d_widel@hotmail.com
*/
-void pacman_state::machine_start_acitya()
+MACHINE_START_MEMBER(pacman_state, 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 @@ void pacman_state::machine_start_acitya()
save_item(NAME(m_counter));
}
-void pacman_state::machine_reset_acitya()
+MACHINE_RESET_MEMBER(pacman_state, acitya)
{
m_counter = 0x0B;
membank("bank1")->set_entry(m_counter & 3);
}
-void pacman_state::machine_start_eeekk()
+MACHINE_START_MEMBER(pacman_state, 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 @@ void pacman_state::machine_start_eeekk()
save_item(NAME(m_counter));
}
-void pacman_state::machine_reset_eeekk()
+MACHINE_RESET_MEMBER(pacman_state, 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 5d512a62fb1..a63108c52ec 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));
}
-void galaxold_state::machine_reset_galaxold()
+MACHINE_RESET_MEMBER(galaxold_state,galaxold)
{
machine_reset_common(INPUT_LINE_NMI);
}
-void galaxold_state::machine_reset_devilfsg()
+MACHINE_RESET_MEMBER(galaxold_state,devilfsg)
{
machine_reset_common(0);
}
-void galaxold_state::machine_reset_hunchbkg()
+MACHINE_RESET_MEMBER(galaxold_state,hunchbkg)
{
machine_reset_common(0);
}
diff --git a/src/mame/machine/galaxy.cpp b/src/mame/machine/galaxy.cpp
index d157019dc19..e5c01dc1f44 100644
--- a/src/mame/machine/galaxy.cpp
+++ b/src/mame/machine/galaxy.cpp
@@ -171,7 +171,7 @@ void galaxy_state::init_galaxy()
Machine Initialization
***************************************************************************/
-void galaxy_state::machine_reset_galaxy()
+MACHINE_RESET_MEMBER(galaxy_state,galaxy)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
@@ -194,7 +194,7 @@ void galaxy_state::init_galaxyp()
init_galaxy();
}
-void galaxy_state::machine_reset_galaxyp()
+MACHINE_RESET_MEMBER(galaxy_state,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 2eccae21663..5c4ff891b7a 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();
}
-void gb_state::machine_start_gbc()
+MACHINE_START_MEMBER(gb_state,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 @@ void gb_state::machine_start_gbc()
}
-void gb_state::machine_start_sgb()
+MACHINE_START_MEMBER(gb_state,sgb)
{
m_sgb_packets = -1;
@@ -200,7 +200,7 @@ void gb_state::machine_reset()
m_bios_disable = false;
}
-void gb_state::machine_reset_gbc()
+MACHINE_RESET_MEMBER(gb_state,gbc)
{
gb_init();
@@ -213,7 +213,7 @@ void gb_state::machine_reset_gbc()
memset(elem, 0, 0x1000);
}
-void gb_state::machine_reset_sgb()
+MACHINE_RESET_MEMBER(gb_state,sgb)
{
gb_init();
@@ -663,12 +663,12 @@ READ8_MEMBER(gb_state::gbc_io2_r)
****************************************************************************/
-void megaduck_state::machine_start_megaduck()
+MACHINE_START_MEMBER(megaduck_state,megaduck)
{
save_gb_base();
}
-void megaduck_state::machine_reset_megaduck()
+MACHINE_RESET_MEMBER(megaduck_state,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 a0bc2843ea4..5b9c986a5de 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)
}
-void hp48_state::machine_start_hp48s()
+MACHINE_START_MEMBER(hp48_state,hp48s)
{
base_machine_start(HP48_S);
}
-void hp48_state::machine_start_hp48sx()
+MACHINE_START_MEMBER(hp48_state,hp48sx)
{
base_machine_start(HP48_SX);
}
-void hp48_state::machine_start_hp48g()
+MACHINE_START_MEMBER(hp48_state,hp48g)
{
base_machine_start(HP48_G);
}
-void hp48_state::machine_start_hp48gx()
+MACHINE_START_MEMBER(hp48_state,hp48gx)
{
base_machine_start(HP48_GX);
}
-void hp48_state::machine_start_hp48gp()
+MACHINE_START_MEMBER(hp48_state,hp48gp)
{
base_machine_start(HP48_GP);
}
-void hp48_state::machine_start_hp49g()
+MACHINE_START_MEMBER(hp48_state,hp49g)
{
base_machine_start(HP49_G);
}
diff --git a/src/mame/machine/itech8.cpp b/src/mame/machine/itech8.cpp
index b107aa64e51..2e8b930b94d 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 )
-void itech8_state::video_start_slikshot()
+VIDEO_START_MEMBER(itech8_state,slikshot)
{
itech8_state::video_start();
diff --git a/src/mame/machine/kaypro.cpp b/src/mame/machine/kaypro.cpp
index fd9f92ce11b..cd93253abc8 100644
--- a/src/mame/machine/kaypro.cpp
+++ b/src/mame/machine/kaypro.cpp
@@ -221,13 +221,12 @@ WRITE_LINE_MEMBER( kaypro_state::fdc_drq_w )
Machine
************************************************************/
-
-void kaypro_state::machine_start_kayproii()
+MACHINE_START_MEMBER( kaypro_state,kayproii )
{
m_pio_s->strobe_a(0);
}
-void kaypro_state::machine_reset_kaypro()
+MACHINE_RESET_MEMBER( kaypro_state,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 628bc3883eb..05a33177fa0 100644
--- a/src/mame/machine/leland.cpp
+++ b/src/mame/machine/leland.cpp
@@ -315,7 +315,7 @@ WRITE8_MEMBER(leland_state::indyheat_analog_w)
*
*************************************/
-void leland_state::machine_start_leland()
+MACHINE_START_MEMBER(leland_state,leland)
{
/* allocate extra stuff */
m_battery_ram = reinterpret_cast<uint8_t *>(memshare("battery")->ptr());
@@ -340,7 +340,7 @@ void leland_state::machine_start_leland()
}
-void leland_state::machine_reset_leland()
+MACHINE_RESET_MEMBER(leland_state,leland)
{
m_master_int_timer->adjust(m_screen->time_until_pos(8), 8);
@@ -379,7 +379,7 @@ void leland_state::machine_reset_leland()
}
-void leland_state::machine_start_ataxx()
+MACHINE_START_MEMBER(leland_state,ataxx)
{
/* set the odd data banks */
m_battery_ram = reinterpret_cast<uint8_t *>(memshare("battery")->ptr());
@@ -399,7 +399,7 @@ void leland_state::machine_start_ataxx()
}
-void leland_state::machine_reset_ataxx()
+MACHINE_RESET_MEMBER(leland_state,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 241c4eab4ce..437ef3e52b2 100644
--- a/src/mame/machine/llc.cpp
+++ b/src/mame/machine/llc.cpp
@@ -98,13 +98,13 @@ void llc_state::init_llc1()
{
}
-void llc_state::machine_reset_llc1()
+MACHINE_RESET_MEMBER(llc_state,llc1)
{
m_term_status = 0;
m_llc1_key = 0;
}
-void llc_state::machine_start_llc1()
+MACHINE_START_MEMBER(llc_state,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());
}
-void llc_state::machine_reset_llc2()
+MACHINE_RESET_MEMBER(llc_state,llc2)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
diff --git a/src/mame/machine/mbee.cpp b/src/mame/machine/mbee.cpp
index c71d7089908..fe8efb5d15d 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);
}
-void mbee_state::machine_reset_mbee()
+MACHINE_RESET_MEMBER( mbee_state, mbee )
{
machine_reset_common();
m_maincpu->set_pc(0x8000);
}
-void mbee_state::machine_reset_mbee56()
+MACHINE_RESET_MEMBER( mbee_state, mbee56 )
{
machine_reset_common();
m_maincpu->set_pc(0xE000);
}
-void mbee_state::machine_reset_mbee128()
+MACHINE_RESET_MEMBER( mbee_state, mbee128 )
{
machine_reset_common();
setup_banks(0, 1, 3); // set banks to default
m_maincpu->set_pc(0x8000);
}
-void mbee_state::machine_reset_mbee256()
+MACHINE_RESET_MEMBER( mbee_state, mbee256 )
{
m_mbee256_q_pos = 0;
machine_reset_common();
@@ -480,7 +480,7 @@ void mbee_state::machine_reset_mbee256()
m_maincpu->set_pc(0x8000);
}
-void mbee_state::machine_reset_mbeett()
+MACHINE_RESET_MEMBER( mbee_state, mbeett )
{
m_mbee256_q_pos = 0;
machine_reset_common();
diff --git a/src/mame/machine/mcr68.cpp b/src/mame/machine/mcr68.cpp
index 8ce04ef3c86..ae00aa8ab90 100644
--- a/src/mame/machine/mcr68.cpp
+++ b/src/mame/machine/mcr68.cpp
@@ -20,12 +20,12 @@
*
*************************************/
-void mcr68_state::machine_start_mcr68()
+MACHINE_START_MEMBER(mcr68_state,mcr68)
{
}
-void mcr68_state::machine_reset_mcr68()
+MACHINE_RESET_MEMBER(mcr68_state,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 3b3cc73c3b1..9ce52ce86e0 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
/*****************************************************************************************/
-void md_base_state::video_start_megadriv()
+VIDEO_START_MEMBER(md_base_state,megadriv)
{
}
-void md_base_state::machine_start_megadriv()
+MACHINE_START_MEMBER(md_base_state,megadriv)
{
m_io_pad_3b[0] = ioport("PAD1");
m_io_pad_3b[1] = ioport("PAD2");
@@ -790,7 +790,7 @@ void md_base_state::machine_start_megadriv()
save_item(NAME(m_megadrive_io_tx_regs));
}
-void md_base_state::machine_reset_megadriv()
+MACHINE_RESET_MEMBER(md_base_state,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 */
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_megadriv, this));
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megadriv, this));
+ MCFG_MACHINE_START_OVERRIDE(md_base_state,megadriv)
+ MCFG_MACHINE_RESET_OVERRIDE(md_base_state,megadriv)
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 */
- set_video_start_cb(config, driver_callback_delegate(&video_start_megadriv, this));
+ MCFG_VIDEO_START_OVERRIDE(md_base_state, megadriv)
/* 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 */
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_megadriv, this));
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_megadriv, this));
+ MCFG_MACHINE_START_OVERRIDE(md_base_state,megadriv)
+ MCFG_MACHINE_RESET_OVERRIDE(md_base_state,megadriv)
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 */
- set_video_start_cb(config, driver_callback_delegate(&video_start_megadriv, this));
+ MCFG_VIDEO_START_OVERRIDE(md_base_state, megadriv)
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();
diff --git a/src/mame/machine/midtunit.cpp b/src/mame/machine/midtunit.cpp
index 7cc346dd69d..23cfb4130d2 100644
--- a/src/mame/machine/midtunit.cpp
+++ b/src/mame/machine/midtunit.cpp
@@ -483,7 +483,7 @@ void midtunit_state::init_mk2()
*
*************************************/
-void midtunit_state::machine_reset_midtunit()
+MACHINE_RESET_MEMBER(midtunit_state,midtunit)
{
/* reset sound */
switch (m_chip_type)
diff --git a/src/mame/machine/midwunit.cpp b/src/mame/machine/midwunit.cpp
index 62db55384fd..0104178554e 100644
--- a/src/mame/machine/midwunit.cpp
+++ b/src/mame/machine/midwunit.cpp
@@ -338,7 +338,7 @@ void midwunit_state::init_rmpgwt()
*
*************************************/
-void midwunit_state::machine_reset_midwunit()
+MACHINE_RESET_MEMBER(midwunit_state,midwunit)
{
int i;
diff --git a/src/mame/machine/midxunit.cpp b/src/mame/machine/midxunit.cpp
index 6658a30dc7b..57299d2162a 100644
--- a/src/mame/machine/midxunit.cpp
+++ b/src/mame/machine/midxunit.cpp
@@ -265,7 +265,7 @@ void midxunit_state::init_revx()
*
*************************************/
-void midxunit_state::machine_reset_midxunit()
+MACHINE_RESET_MEMBER(midxunit_state,midxunit)
{
int i;
diff --git a/src/mame/machine/midyunit.cpp b/src/mame/machine/midyunit.cpp
index 1af70871aa3..5391a883fad 100644
--- a/src/mame/machine/midyunit.cpp
+++ b/src/mame/machine/midyunit.cpp
@@ -530,7 +530,7 @@ void midyunit_state::init_totcarn()
*
*************************************/
-void midyunit_state::machine_reset_midyunit()
+MACHINE_RESET_MEMBER(midyunit_state,midyunit)
{
/* reset sound */
switch (m_chip_type)
diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp
index ba82f93195e..fc8af68c93e 100644
--- a/src/mame/machine/model1.cpp
+++ b/src/mame/machine/model1.cpp
@@ -1723,7 +1723,7 @@ void model1_state::copro_hle_swa()
}
}
-void model1_state::machine_start_model1()
+MACHINE_START_MEMBER(model1_state,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 c3f0b9bfe15..16525fc4a3d 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 */
-void mpu4_state::machine_reset_mpu4()
+MACHINE_RESET_MEMBER(mpu4_state,mpu4)
{
m_vfd->reset();
@@ -2163,7 +2163,7 @@ void mpu4_state::mpu4_config_common()
m_lamp_strobe_ext_persistence = 0;
}
-void mpu4_state::machine_start_mod2()
+MACHINE_START_MEMBER(mpu4_state,mod2)
{
mpu4_config_common();
@@ -2171,7 +2171,7 @@ void mpu4_state::machine_start_mod2()
m_mod_number=2;
}
-void mpu4_state::machine_start_mpu4yam()
+MACHINE_START_MEMBER(mpu4_state,mpu4yam)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
mpu4_config_common();
@@ -2181,7 +2181,7 @@ void mpu4_state::machine_start_mpu4yam()
mpu4_install_mod4yam_space(space);
}
-void mpu4_state::machine_start_mpu4oki()
+MACHINE_START_MEMBER(mpu4_state,mpu4oki)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
mpu4_config_common();
@@ -2191,7 +2191,7 @@ void mpu4_state::machine_start_mpu4oki()
mpu4_install_mod4oki_space(space);
}
-void mpu4_state::machine_start_mpu4bwb()
+MACHINE_START_MEMBER(mpu4_state,mpu4bwb)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
mpu4_config_common();
@@ -2201,7 +2201,7 @@ void mpu4_state::machine_start_mpu4bwb()
mpu4_install_mod4bwb_space(space);
}
-void mpu4_state::machine_start_mpu4cry()
+MACHINE_START_MEMBER(mpu4_state,mpu4cry)
{
mpu4_config_common();
@@ -3089,8 +3089,8 @@ MACHINE_CONFIG_END
/* machine driver for MOD 2 board */
MACHINE_CONFIG_START(mpu4_state::mpu4base)
- 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_MACHINE_START_OVERRIDE(mpu4_state,mod2 )
+ MCFG_MACHINE_RESET_OVERRIDE(mpu4_state,mpu4)
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);
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4yam, this));
+ MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4yam)
mpu4_std_6reel(config);
@@ -3140,7 +3140,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mod4oki)
mpu4base(config);
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4oki, this));
+ MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki)
mpu4_common2(config);
mpu4_std_6reel(config);
@@ -3152,7 +3152,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mod4oki_alt)
mpu4base(config);
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4oki, this));
+ MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki)
mpu4_common2(config);
mpu4_type2_6reel(config);
@@ -3164,7 +3164,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mod4oki_5r)
mpu4base(config);
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4oki, this));
+ MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki)
mpu4_common2(config);
mpu4_std_5reel(config);
@@ -3176,7 +3176,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::bwboki)
mpu4base(config);
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4bwb, this));
+ MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4bwb)
mpu4_common2(config);
mpu4_bwb_5reel(config);
@@ -3187,7 +3187,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4crys)
mod2(config);
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_mpu4cry, this));
+ MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4cry)
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 a00e489f36e..5c081036b0a 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 )
-------------------------------------------------*/
-void mtx_state::machine_start_mtx512()
+MACHINE_START_MEMBER(mtx_state, mtx512)
{
address_space &program = m_maincpu->space(AS_PROGRAM);
@@ -544,7 +544,7 @@ void mtx_state::machine_start_mtx512()
program.install_ram(0xc000, 0xffff, m_ram->pointer());
}
-void mtx_state::machine_reset_mtx512()
+MACHINE_RESET_MEMBER(mtx_state, mtx512)
{
/* bank switching */
bankswitch(0);
diff --git a/src/mame/machine/mw8080bw.cpp b/src/mame/machine/mw8080bw.cpp
index 85ae8e10bf6..1d081aa551f 100644
--- a/src/mame/machine/mw8080bw.cpp
+++ b/src/mame/machine/mw8080bw.cpp
@@ -94,7 +94,7 @@ void mw8080bw_state::mw8080bw_start_interrupt_timer( )
*
*************************************/
-void mw8080bw_state::machine_start_mw8080bw()
+MACHINE_START_MEMBER(mw8080bw_state,mw8080bw)
{
mw8080bw_create_interrupt_timer();
}
@@ -106,7 +106,7 @@ void mw8080bw_state::machine_start_mw8080bw()
*
*************************************/
-void mw8080bw_state::machine_reset_mw8080bw()
+MACHINE_RESET_MEMBER(mw8080bw_state,mw8080bw)
{
mw8080bw_start_interrupt_timer();
}
diff --git a/src/mame/machine/mz700.cpp b/src/mame/machine/mz700.cpp
index e3b3088281c..e7db1cb4cbe 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);
}
-void mz_state::machine_reset_mz700()
+MACHINE_RESET_MEMBER( mz_state, mz700 )
{
membank("bankr0")->set_entry(1); //rom
membank("bankw0")->set_entry(0); //ram
@@ -101,7 +101,7 @@ void mz_state::machine_reset_mz700()
m_banke->set_bank(1); //devices
}
-void mz_state::machine_reset_mz800()
+MACHINE_RESET_MEMBER( mz_state, 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 02e2adba212..b9db00d2950 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)
}
}
-void namcos2_shared_state::machine_start_namcos2()
+MACHINE_START_MEMBER(namcos2_shared_state,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);
}
-void namcos2_shared_state::machine_reset_namcos2()
+MACHINE_RESET_MEMBER(namcos2_shared_state, 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 611a105d6c1..16902c6c17d 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;
}
-void orion_state::machine_start_orion128()
+MACHINE_START_MEMBER(orion_state,orion128)
{
m_video_mode_mask = 7;
}
@@ -139,7 +139,7 @@ WRITE8_MEMBER(orion_state::orion128_memory_page_w)
}
}
-void orion_state::machine_reset_orion128()
+MACHINE_RESET_MEMBER(orion_state,orion128)
{
m_orion128_video_page = 0;
m_orion128_video_mode = 0;
@@ -219,7 +219,7 @@ WRITE8_MEMBER(orion_state::orionz80_floppy_rtc_w)
}
-void orion_state::machine_start_orionz80()
+MACHINE_START_MEMBER(orion_state,orionz80)
{
m_video_mode_mask = 7;
}
@@ -306,7 +306,7 @@ WRITE8_MEMBER(orion_state::orionz80_dispatcher_w)
orionz80_switch_bank();
}
-void orion_state::machine_reset_orionz80()
+MACHINE_RESET_MEMBER(orion_state,orionz80)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
@@ -496,7 +496,7 @@ WRITE8_MEMBER(orion_state::orionpro_memory_page_w)
orionpro_bank_switch();
}
-void orion_state::machine_reset_orionpro()
+MACHINE_RESET_MEMBER(orion_state,orionpro)
{
radio86_init_keyboard();
diff --git a/src/mame/machine/partner.cpp b/src/mame/machine/partner.cpp
index f4ae11d2fff..6cb36b7f304 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)
}
}
-void partner_state::machine_reset_partner()
+MACHINE_RESET_MEMBER(partner_state,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 22efe26edb9..8249a970b3e 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);
}
-void pc1251_state::machine_start_pc1260()
+MACHINE_START_MEMBER(pc1251_state,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 3b8749a7251..f68d185e81f 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;
}
-void pce_state::machine_start_pce()
+MACHINE_START_MEMBER(pce_state,pce)
{
if (m_cd)
m_cd->late_setup();
@@ -108,7 +108,7 @@ void pce_state::machine_start_pce()
save_item(NAME(m_joy_6b_packet));
}
-void pce_state::machine_reset_mess_pce()
+MACHINE_RESET_MEMBER(pce_state,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 d598e3e6ca1..617b6c70f11 100644
--- a/src/mame/machine/pgmprot_igs025_igs012.cpp
+++ b/src/mame/machine/pgmprot_igs025_igs012.cpp
@@ -106,9 +106,11 @@ static const uint8_t drgw2_source_data[0x08][0xec] =
{ 0, } // Region 7, not used
};
-void pgm_012_025_state::machine_reset_drgw2()
+MACHINE_RESET_MEMBER(pgm_012_025_state,drgw2)
{
- machine_reset_pgm();
+ MACHINE_RESET_CALL_MEMBER(pgm);
+
+
}
void pgm_012_025_state::drgw2_common_init()
@@ -140,7 +142,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 )
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_drgw2, this));
+ MCFG_MACHINE_RESET_OVERRIDE(pgm_012_025_state,drgw2)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pgmprot_igs025_igs012.h b/src/mame/machine/pgmprot_igs025_igs012.h
index 24ee79e603b..b8844c202ef 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();
- void machine_reset_drgw2();
+ DECLARE_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 411d60a52ab..e1f485ad9cf 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] =
}
};
-void pgm_022_025_state::machine_reset_killbld()
+MACHINE_RESET_MEMBER(pgm_022_025_state,killbld)
{
int region = (ioport(":Region")->read()) & 0xff;
m_igs025->m_kb_region = region - 0x16;
m_igs025->m_kb_game_id = 0x89911400 | region;
- machine_reset_pgm();
+ MACHINE_RESET_CALL_MEMBER(pgm);
}
-void pgm_022_025_state::machine_reset_dw3()
+MACHINE_RESET_MEMBER(pgm_022_025_state, dw3)
{
int region = (ioport(":Region")->read()) & 0xff;
m_igs025->m_kb_region = region;
m_igs025->m_kb_game_id = 0x00060000 | region;
- machine_reset_pgm();
+ MACHINE_RESET_CALL_MEMBER(pgm);
}
@@ -390,12 +390,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pgm_022_025_state::pgm_022_025_dw3)
pgm_022_025(config);
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dw3, this));
+ MCFG_MACHINE_RESET_OVERRIDE(pgm_022_025_state, dw3)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pgm_022_025_state::pgm_022_025_killbld)
pgm_022_025(config);
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_killbld, this));
+ MCFG_MACHINE_RESET_OVERRIDE(pgm_022_025_state, killbld)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pgmprot_igs025_igs022.h b/src/mame/machine/pgmprot_igs025_igs022.h
index 025c6069e71..70ea6da1117 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();
- void machine_reset_killbld();
- void machine_reset_dw3();
+ DECLARE_MACHINE_RESET(killbld);
+ DECLARE_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 3815297cea6..1577a627897 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
}
};
-void pgm_028_025_state::machine_reset_olds()
+MACHINE_RESET_MEMBER(pgm_028_025_state,olds)
{
int region = (ioport(":Region")->read()) & 0xff;
m_igs025->m_kb_region = region;
m_igs025->m_kb_game_id = 0x00900000 | region;
- machine_reset_pgm();
+ MACHINE_RESET_CALL_MEMBER(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)
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_olds, this));
+ MCFG_MACHINE_RESET_OVERRIDE(pgm_028_025_state,olds)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pgmprot_igs025_igs028.h b/src/mame/machine/pgmprot_igs025_igs028.h
index d6ed68a080c..ceb746d5ca4 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();
- void machine_reset_olds();
+ DECLARE_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 0c6ca2e6ad9..b19856c3015 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)
}
-void pgm_arm_type1_state::machine_start_pgm_arm_type1()
+MACHINE_START_MEMBER(pgm_arm_type1_state,pgm_arm_type1)
{
- machine_start_pgm();
+ MACHINE_START_CALL_MEMBER(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)
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_pgm_arm_type1, this));
+ MCFG_MACHINE_START_OVERRIDE(pgm_arm_type1_state, pgm_arm_type1 )
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 9fdbcc027fc..86134ba8968 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();
- void machine_start_pgm_arm_type1() ATTR_COLD;
+ DECLARE_MACHINE_START(pgm_arm_type1);
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 91744ab570d..64793d3b445 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();
}
-void pgm_arm_type2_state::machine_start_pgm_arm_type2()
+MACHINE_START_MEMBER(pgm_arm_type2_state,pgm_arm_type2)
{
- machine_start_pgm();
+ MACHINE_START_CALL_MEMBER(pgm);
/* register type specific Save State stuff here */
}
@@ -135,7 +135,7 @@ void pgm_arm_type2_state::machine_start_pgm_arm_type2()
MACHINE_CONFIG_START(pgm_arm_type2_state::pgm_arm_type2)
pgmbase(config);
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_pgm_arm_type2, this));
+ MCFG_MACHINE_START_OVERRIDE(pgm_arm_type2_state, pgm_arm_type2 )
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 67081b08678..f6af465e21c 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();
- void machine_start_pgm_arm_type2() ATTR_COLD;
+ DECLARE_MACHINE_START(pgm_arm_type2);
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 6c50df04368..dbbdd0f793d 100644
--- a/src/mame/machine/pgmprot_igs027a_type3.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type3.cpp
@@ -152,7 +152,9 @@ void pgm_arm_type3_state::_55857G_arm7_map(address_map &map)
}
-void pgm_arm_type3_state::machine_reset_pgm_arm_type3_reset()
+
+
+MACHINE_RESET_MEMBER(pgm_arm_type3_state, pgm_arm_type3_reset)
{
// internal roms aren't fully dumped
uint16_t *temp16 = (uint16_t *)memregion("prot")->base();
@@ -176,12 +178,12 @@ void pgm_arm_type3_state::machine_reset_pgm_arm_type3_reset()
temp16[(base) / 2] = regionhack; base += 2;
}
}
- machine_reset_pgm();
+ MACHINE_RESET_CALL_MEMBER(pgm);
}
-void pgm_arm_type3_state::machine_start_pgm_arm_type3()
+MACHINE_START_MEMBER(pgm_arm_type3_state,pgm_arm_type3)
{
- machine_start_pgm();
+ MACHINE_START_CALL_MEMBER(pgm);
/* register type specific Save State stuff here */
}
@@ -191,7 +193,7 @@ void pgm_arm_type3_state::machine_start_pgm_arm_type3()
MACHINE_CONFIG_START(pgm_arm_type3_state::pgm_arm_type3)
pgmbase(config);
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_pgm_arm_type3, this));
+ MCFG_MACHINE_START_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3 )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(svg_68k_mem)
@@ -200,7 +202,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)
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pgm_arm_type3_reset, this));
+ MCFG_MACHINE_RESET_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3_reset)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pgmprot_igs027a_type3.h b/src/mame/machine/pgmprot_igs027a_type3.h
index af10f0cc88e..a6582b7acb1 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();
- void machine_start_pgm_arm_type3() ATTR_COLD;
+ DECLARE_MACHINE_START(pgm_arm_type3);
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 );
- void machine_reset_pgm_arm_type3_reset();
+ DECLARE_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 83e21fcdad2..5f9981562ef 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);
}
-void playch10_state::machine_start_playch10_hboard()
+MACHINE_START_MEMBER(playch10_state,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 d3e654015f5..f81b5ef7fcc 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();
}
-void primo_state::machine_reset_primob()
+MACHINE_RESET_MEMBER(primo_state,primob)
{
primo_common_machine_init();
diff --git a/src/mame/machine/qix.cpp b/src/mame/machine/qix.cpp
index 947853b615b..33cf61b511f 100644
--- a/src/mame/machine/qix.cpp
+++ b/src/mame/machine/qix.cpp
@@ -26,7 +26,7 @@ void qix_state::machine_reset()
}
-void qix_state::machine_start_qixmcu()
+MACHINE_START_MEMBER(qix_state,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 8fb7bbd5356..2cfbd396880 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);
}
-void radio86_state::machine_reset_radio86()
+MACHINE_RESET_MEMBER(radio86_state,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 9237b372c9e..966eaf61590 100644
--- a/src/mame/machine/rm380z.cpp
+++ b/src/mame/machine/rm380z.cpp
@@ -311,6 +311,6 @@ void rm380z_state::config_memory_map()
}
}
-void rm380z_state::machine_reset_rm480z()
+MACHINE_RESET_MEMBER( rm380z_state, rm480z )
{
}
diff --git a/src/mame/machine/scramble.cpp b/src/mame/machine/scramble.cpp
index af175512649..8027984f599 100644
--- a/src/mame/machine/scramble.cpp
+++ b/src/mame/machine/scramble.cpp
@@ -15,20 +15,20 @@
#include "includes/scramble.h"
-void scramble_state::machine_reset_scramble()
+MACHINE_RESET_MEMBER(scramble_state,scramble)
{
- machine_reset_galaxold();
+ MACHINE_RESET_CALL_MEMBER(galaxold);
if (m_audiocpu != nullptr)
sh_init();
}
-void scramble_state::machine_reset_explorer()
+MACHINE_RESET_MEMBER(scramble_state,explorer)
{
uint8_t *RAM = memregion("maincpu")->base();
RAM[0x47ff] = 0; /* If not set, it doesn't reset after the 1st time */
- machine_reset_galaxold();
+ MACHINE_RESET_CALL_MEMBER(galaxold);
}
diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp
index 6d40a5ca360..f517dc343b4 100644
--- a/src/mame/machine/sms.cpp
+++ b/src/mame/machine/sms.cpp
@@ -1023,7 +1023,7 @@ void sms_state::setup_bios()
}
}
-void sms_state::machine_start_sms()
+MACHINE_START_MEMBER(sms_state,sms)
{
m_led_pwr.resolve();
@@ -1119,7 +1119,7 @@ void sms_state::machine_start_sms()
m_cartslot->save_ram();
}
-void sms_state::machine_reset_sms()
+MACHINE_RESET_MEMBER(sms_state,sms)
{
if (m_is_smsj)
{
@@ -1326,7 +1326,7 @@ void sms_state::init_gamegeaj()
}
-void sms_state::video_start_sms1()
+VIDEO_START_MEMBER(sms_state,sms1)
{
m_left_lcd = machine().device("left_lcd");
m_right_lcd = machine().device("right_lcd");
@@ -1343,7 +1343,7 @@ void sms_state::video_start_sms1()
}
-void sms_state::video_reset_sms1()
+VIDEO_RESET_MEMBER(sms_state,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;
}
-void sms_state::video_start_gamegear()
+VIDEO_START_MEMBER(sms_state,gamegear)
{
m_prev_bitmap_copied = false;
m_main_scr->register_screen_bitmap(m_prev_bitmap);
@@ -1486,7 +1486,7 @@ void sms_state::video_start_gamegear()
save_pointer(NAME(m_line_buffer.get()), 160 * 4);
}
-void sms_state::video_reset_gamegear()
+VIDEO_RESET_MEMBER(sms_state,gamegear)
{
if (m_prev_bitmap_copied)
{
diff --git a/src/mame/machine/sorcerer.cpp b/src/mame/machine/sorcerer.cpp
index e2647e7c9a3..55131d120a6 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));
}
-void sorcerer_state::machine_start_sorcererd()
+MACHINE_START_MEMBER(sorcerer_state,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 a3fa0306ad7..8dd904ceb7d 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
}
-void special_state::machine_reset_special()
+MACHINE_RESET_MEMBER(special_state,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);
}
-void special_state::machine_start_specimx()
+MACHINE_START_MEMBER(special_state,specimx)
{
m_drive = 0;
}
-void special_state::machine_reset_specimx()
+MACHINE_RESET_MEMBER(special_state,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;
}
-void special_state::machine_reset_erik()
+MACHINE_RESET_MEMBER(special_state,erik)
{
m_RR_register = 0x00;
m_RC_register = 0x00;
diff --git a/src/mame/machine/super80.cpp b/src/mame/machine/super80.cpp
index cdc0697433b..b09d0c39c41 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 ***********************************************************/
-void super80_state::machine_reset_super80()
+MACHINE_RESET_MEMBER( super80_state, super80 )
{
m_portf0 = 0; // must be 0 like real machine, or banking breaks on 32-col systems
m_keylatch = 0xff;
@@ -216,7 +216,7 @@ void super80_state::machine_reset_super80()
membank("boot")->set_entry(1);
}
-void super80_state::machine_reset_super80r()
+MACHINE_RESET_MEMBER( super80_state, super80r )
{
m_portf0 = 0x14;
m_keylatch = 0xff;
diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp
index 2a28be427d9..7245b86867f 100644
--- a/src/mame/machine/thomson.cpp
+++ b/src/mame/machine/thomson.cpp
@@ -955,7 +955,7 @@ void thomson_state::to7_midi_init()
-void thomson_state::machine_reset_to7()
+MACHINE_RESET_MEMBER( thomson_state, to7 )
{
LOG (( "to7: machine reset called\n" ));
@@ -986,7 +986,7 @@ void thomson_state::machine_reset_to7()
-void thomson_state::machine_start_to7()
+MACHINE_START_MEMBER( thomson_state, 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 )
-void thomson_state::machine_reset_to770()
+MACHINE_RESET_MEMBER( thomson_state, to770 )
{
LOG (( "to770: machine reset called\n" ));
@@ -1210,7 +1210,7 @@ void thomson_state::machine_reset_to770()
-void thomson_state::machine_start_to770()
+MACHINE_START_MEMBER( thomson_state, to770 )
{
uint8_t* mem = memregion("maincpu")->base();
uint8_t* ram = m_ram->pointer();
@@ -1557,7 +1557,7 @@ WRITE8_MEMBER( thomson_state::mo5_ext_w )
-void thomson_state::machine_reset_mo5()
+MACHINE_RESET_MEMBER( thomson_state, mo5 )
{
LOG (( "mo5: machine reset called\n" ));
@@ -1590,7 +1590,7 @@ void thomson_state::machine_reset_mo5()
-void thomson_state::machine_start_mo5()
+MACHINE_START_MEMBER( thomson_state, 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 )
-void thomson_state::machine_reset_to9()
+MACHINE_RESET_MEMBER( thomson_state, to9 )
{
LOG (( "to9: machine reset called\n" ));
@@ -2532,7 +2532,7 @@ void thomson_state::machine_reset_to9()
-void thomson_state::machine_start_to9()
+MACHINE_START_MEMBER( thomson_state, 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 )
-void thomson_state::machine_reset_to8()
+MACHINE_RESET_MEMBER( thomson_state, to8 )
{
LOG (( "to8: machine reset called\n" ));
@@ -3542,7 +3542,7 @@ void thomson_state::machine_reset_to8()
-void thomson_state::machine_start_to8()
+MACHINE_START_MEMBER( thomson_state, 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 ------------ */
-void thomson_state::machine_reset_to9p()
+MACHINE_RESET_MEMBER( thomson_state, to9p )
{
LOG (( "to9p: machine reset called\n" ));
@@ -3692,7 +3692,7 @@ void thomson_state::machine_reset_to9p()
-void thomson_state::machine_start_to9p()
+MACHINE_START_MEMBER( thomson_state, to9p )
{
uint8_t* mem = memregion("maincpu")->base();
uint8_t* ram = m_ram->pointer();
@@ -4335,7 +4335,7 @@ WRITE8_MEMBER( thomson_state::mo6_vreg_w )
-void thomson_state::machine_reset_mo6()
+MACHINE_RESET_MEMBER( thomson_state, mo6 )
{
LOG (( "mo6: machine reset called\n" ));
@@ -4377,7 +4377,7 @@ void thomson_state::machine_reset_mo6()
-void thomson_state::machine_start_mo6()
+MACHINE_START_MEMBER( thomson_state, mo6 )
{
uint8_t* mem = memregion("maincpu")->base();
uint8_t* ram = m_ram->pointer();
@@ -4558,7 +4558,7 @@ void thomson_state::mo5nr_game_reset()
-void thomson_state::machine_reset_mo5nr()
+MACHINE_RESET_MEMBER( thomson_state, mo5nr )
{
LOG (( "mo5nr: machine reset called\n" ));
@@ -4600,7 +4600,7 @@ void thomson_state::machine_reset_mo5nr()
-void thomson_state::machine_start_mo5nr()
+MACHINE_START_MEMBER( thomson_state, 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 6cf7c89ec41..bb7bdb18136 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);
}
-void ti85_state::machine_reset_ti85()
+MACHINE_RESET_MEMBER(ti85_state,ti85)
{
m_PCR = 0xc0;
}
@@ -312,7 +312,7 @@ READ8_MEMBER(ti85_state::ti83p_membank3_r)
return m_membank3->read8(space, offset);
}
-void ti85_state::machine_reset_ti83p()
+MACHINE_RESET_MEMBER(ti85_state,ti83p)
{
m_PCR = 0x00;
@@ -332,7 +332,7 @@ void ti85_state::machine_reset_ti83p()
}
}
-void ti85_state::machine_start_ti83p()
+MACHINE_START_MEMBER(ti85_state,ti83p)
{
m_model = TI83P;
//address_space &space = m_maincpu->space(AS_PROGRAM);
@@ -419,28 +419,28 @@ void ti85_state::ti8xpse_init_common()
}
-void ti85_state::machine_start_ti83pse()
+MACHINE_START_MEMBER(ti85_state,ti83pse)
{
m_model = TI84PSE;
ti8xpse_init_common();
}
-void ti85_state::machine_start_ti84pse()
+MACHINE_START_MEMBER(ti85_state,ti84pse)
{
m_model = TI83PSE;
ti8xpse_init_common();
}
-void ti85_state::machine_start_ti84p()
+MACHINE_START_MEMBER(ti85_state,ti84p)
{
m_model = TI84P;
ti8xpse_init_common();
}
-void ti85_state::machine_start_ti86()
+MACHINE_START_MEMBER(ti85_state,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 1a3538bbfb3..6de67320533 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();
}
-void toaplan1_state::machine_reset_toaplan1()
+MACHINE_RESET_MEMBER(toaplan1_state,toaplan1)
{
m_intenable = 0;
machine().bookkeeping().coin_lockout_global_w(0);
}
/* zerowing, fireshrk, outzone */
-void toaplan1_state::machine_reset_zerowing()
+MACHINE_RESET_MEMBER(toaplan1_state,zerowing)
{
- machine_reset_toaplan1();
+ MACHINE_RESET_CALL_MEMBER(toaplan1);
m_maincpu->set_reset_callback(write_line_delegate(FUNC(toaplan1_state::toaplan1_reset_callback),this));
}
-void toaplan1_state::machine_reset_demonwld()
+MACHINE_RESET_MEMBER(toaplan1_state,demonwld)
{
- machine_reset_toaplan1();
+ MACHINE_RESET_CALL_MEMBER(toaplan1);
m_dsp_addr_w = 0;
m_main_ram_seg = 0;
m_dsp_execute = 0;
}
-void toaplan1_state::machine_reset_vimana()
+MACHINE_RESET_MEMBER(toaplan1_state,vimana)
{
- machine_reset_toaplan1();
+ MACHINE_RESET_CALL_MEMBER(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 c7cdbe5747b..331f20f592e 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;
}
-void trs80_state::machine_reset_trs80m4()
+MACHINE_RESET_MEMBER(trs80_state,trs80m4)
{
address_space &mem = m_maincpu->space(AS_PROGRAM);
m_cassette_data = 0;
@@ -836,7 +836,7 @@ void trs80_state::machine_reset_trs80m4()
trs80m4_84_w(mem, 0, 0); /* switch in devices at power-on */
}
-void trs80_state::machine_reset_lnw80()
+MACHINE_RESET_MEMBER(trs80_state,lnw80)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
m_cassette_data = 0;
@@ -844,10 +844,10 @@ void trs80_state::machine_reset_lnw80()
lnw80_fe_w(space, 0, 0);
}
-void trs80_state::machine_reset_cp500()
+MACHINE_RESET_MEMBER(trs80_state,cp500)
{
m_a11_flipflop = 0;
- machine_reset_trs80m4();
+ MACHINE_RESET_CALL_MEMBER( trs80m4 );
}
diff --git a/src/mame/machine/twincobr.cpp b/src/mame/machine/twincobr.cpp
index e1dae83d6bb..2a081806c11 100644
--- a/src/mame/machine/twincobr.cpp
+++ b/src/mame/machine/twincobr.cpp
@@ -243,7 +243,7 @@ WRITE16_MEMBER(twincobr_state::twincobr_sharedram_w)
}
-void twincobr_state::machine_reset_twincobr()
+MACHINE_RESET_MEMBER(twincobr_state,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 ac294c3db76..4521e4fcb5d 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)
*
*************************************/
-void tx1_state::machine_reset_buggyboy()
+MACHINE_RESET_MEMBER(tx1_state,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 @@ void tx1_state::machine_reset_buggyboy()
memset(&m_math, 0, sizeof(m_math));
}
-void tx1_state::machine_reset_tx1()
+MACHINE_RESET_MEMBER(tx1_state,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 658e9f89a63..1ac29589dd9 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;
}
-void ut88_state::machine_reset_ut88()
+MACHINE_RESET_MEMBER(ut88_state,ut88)
{
timer_set(attotime::from_usec(10), TIMER_RESET);
m_bank1->set_entry(1);
@@ -165,13 +165,13 @@ void ut88_state::init_ut88mini()
{
}
-void ut88_state::machine_start_ut88mini()
+MACHINE_START_MEMBER(ut88_state,ut88mini)
{
m_digits.resolve();
timer_set(attotime::from_hz(60), TIMER_UPDATE_DISPLAY);
}
-void ut88_state::machine_reset_ut88mini()
+MACHINE_RESET_MEMBER(ut88_state,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 ab2cd49271f..db00020acea 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)
*
*************************************/
-void vsnes_state::machine_reset_vsnes()
+MACHINE_RESET_MEMBER(vsnes_state,vsnes)
{
m_last_bank = 0xff;
m_sound_fix = 0;
@@ -152,7 +152,7 @@ void vsnes_state::machine_reset_vsnes()
*
*************************************/
-void vsnes_state::machine_reset_vsdual()
+MACHINE_RESET_MEMBER(vsnes_state,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
}
}
-void vsnes_state::machine_start_vsnes()
+MACHINE_START_MEMBER(vsnes_state,vsnes)
{
address_space &ppu1_space = machine().device("ppu1")->memory().space(AS_PROGRAM);
int i;
@@ -228,7 +228,7 @@ void vsnes_state::machine_start_vsnes()
}
}
-void vsnes_state::machine_start_vsdual()
+MACHINE_START_MEMBER(vsnes_state,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 4de4bbb750c..f88ce25742b 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);
}
-void vtech2_state::machine_reset_laser500()
+MACHINE_RESET_MEMBER(vtech2_state,laser500)
{
/* banks 0 to 2, and 4-7 only, optional ROM extension */
laser_machine_init(0x0f7, 7);
}
-void vtech2_state::machine_reset_laser700()
+MACHINE_RESET_MEMBER(vtech2_state,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 e9e49f47ada..c39904c3e3b 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)
*
*************************************/
-void williams_state::machine_start_williams_common()
+MACHINE_START_MEMBER(williams_state,williams_common)
{
/* configure the memory bank */
membank("bank1")->configure_entry(1, memregion("maincpu")->base() + 0x10000);
@@ -123,7 +123,7 @@ void williams_state::machine_start_williams_common()
}
-void williams_state::machine_reset_williams_common()
+MACHINE_RESET_MEMBER(williams_state,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 @@ void williams_state::machine_reset_williams_common()
}
-void williams_state::machine_start_williams()
+MACHINE_START_MEMBER(williams_state,williams)
{
- machine_start_williams_common();
+ MACHINE_START_CALL_MEMBER(williams_common);
}
-void williams_state::machine_reset_williams()
+MACHINE_RESET_MEMBER(williams_state,williams)
{
- machine_reset_williams_common();
+ MACHINE_RESET_CALL_MEMBER(williams_common);
}
@@ -196,7 +196,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(williams2_state::williams2_endscreen_callback)
*
*************************************/
-void williams2_state::machine_start_williams2()
+MACHINE_START_MEMBER(williams2_state,williams2)
{
/* configure memory banks */
membank("bank1")->configure_entries(1, 4, memregion("maincpu")->base() + 0x10000, 0x10000);
@@ -205,7 +205,7 @@ void williams2_state::machine_start_williams2()
}
-void williams2_state::machine_reset_williams2()
+MACHINE_RESET_MEMBER(williams2_state,williams2)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
@@ -426,16 +426,16 @@ WRITE8_MEMBER(williams2_state::williams2_7segment_w)
*
*************************************/
-void williams_state::machine_start_defender()
+MACHINE_START_MEMBER(williams_state,defender)
{
}
-void williams_state::machine_reset_defender()
+MACHINE_RESET_MEMBER(williams_state,defender)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
- machine_reset_williams_common();
+ MACHINE_RESET_CALL_MEMBER(williams_common);
defender_bank_select_w(space, 0, 0);
}
@@ -495,7 +495,7 @@ WRITE8_MEMBER(williams_state::sinistar_vram_select_w)
*
*************************************/
-void blaster_state::machine_start_blaster()
+MACHINE_START_MEMBER(blaster_state,blaster)
{
/* banking is different for blaster */
membank("bank1")->configure_entries(1, 16, memregion("maincpu")->base() + 0x18000, 0x4000);
@@ -510,9 +510,9 @@ void blaster_state::machine_start_blaster()
}
-void blaster_state::machine_reset_blaster()
+MACHINE_RESET_MEMBER(blaster_state,blaster)
{
- machine_reset_williams_common();
+ MACHINE_RESET_CALL_MEMBER(williams_common);
}
@@ -614,16 +614,16 @@ WRITE8_MEMBER(tshoot_state::lamp_w)
*
*************************************/
-void joust2_state::machine_start_joust2()
+MACHINE_START_MEMBER(joust2_state,joust2)
{
- machine_start_williams2();
+ MACHINE_START_CALL_MEMBER(williams2);
save_item(NAME(m_joust2_current_sound_data));
}
-void joust2_state::machine_reset_joust2()
+MACHINE_RESET_MEMBER(joust2_state,joust2)
{
- machine_reset_williams2();
+ MACHINE_RESET_CALL_MEMBER(williams2);
}
diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index e5ff01986f3..847a8d91f2d 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -234,7 +234,7 @@ void z80netf_state::reset_lx390_banking()
*/
}
-void z80ne_state::machine_reset_z80ne_base()
+MACHINE_RESET_MEMBER(z80ne_state,z80ne_base)
{
int i;
@@ -286,32 +286,32 @@ void z80ne_state::machine_reset_z80ne_base()
}
-void z80ne_state::machine_reset_z80ne()
+MACHINE_RESET_MEMBER(z80ne_state,z80ne)
{
LOG("In machine_reset z80ne\n");
reset_lx382_banking();
- machine_reset_z80ne_base();
+ MACHINE_RESET_CALL_MEMBER( z80ne_base );
}
-void z80ne_state::machine_reset_z80net()
+MACHINE_RESET_MEMBER(z80ne_state,z80net)
{
LOG("In machine_reset z80net\n");
- machine_reset_z80ne();
+ MACHINE_RESET_CALL_MEMBER( z80ne );
reset_lx387();
}
-void z80ne_state::machine_reset_z80netb()
+MACHINE_RESET_MEMBER(z80ne_state,z80netb)
{
LOG("In machine_reset z80netb\n");
- machine_reset_z80ne_base();
+ MACHINE_RESET_CALL_MEMBER( z80ne_base );
reset_lx387();
}
-void z80netf_state::machine_reset_z80netf()
+MACHINE_RESET_MEMBER(z80netf_state,z80netf)
{
LOG("In machine_reset z80netf\n");
reset_lx390_banking();
- machine_reset_z80ne_base();
+ MACHINE_RESET_CALL_MEMBER( z80ne_base );
reset_lx387();
}
@@ -337,7 +337,7 @@ INPUT_CHANGED_MEMBER(z80ne_state::z80ne_nmi)
}
}
-void z80ne_state::machine_start_z80ne()
+MACHINE_START_MEMBER(z80ne_state,z80ne)
{
LOG("In MACHINE_START z80ne\n");
@@ -355,21 +355,21 @@ void z80ne_state::machine_start_z80ne()
m_kbd_timer->adjust(attotime::from_hz(1000), 0, attotime::from_hz(1000));
}
-void z80ne_state::machine_start_z80net()
+MACHINE_START_MEMBER(z80ne_state,z80net)
{
- machine_start_z80ne();
+ MACHINE_START_CALL_MEMBER( z80ne );
LOG("In MACHINE_START z80net\n");
}
-void z80ne_state::machine_start_z80netb()
+MACHINE_START_MEMBER(z80ne_state,z80netb)
{
- machine_start_z80net();
+ MACHINE_START_CALL_MEMBER( z80net );
LOG("In MACHINE_START z80netb\n");
}
-void z80netf_state::machine_start_z80netf()
+MACHINE_START_MEMBER(z80netf_state,z80netf)
{
- machine_start_z80net();
+ MACHINE_START_CALL_MEMBER( z80net );
LOG("In MACHINE_START z80netf\n");
m_drv_led.resolve();