summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/atarig42.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/atarig42.cpp')
-rw-r--r--src/mame/drivers/atarig42.cpp43
1 files changed, 20 insertions, 23 deletions
diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp
index 3040e683320..3e639b4fdef 100644
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@@ -39,7 +39,7 @@ void atarig42_state::update_interrupts()
}
-MACHINE_START_MEMBER(atarig42_state,atarig42)
+void atarig42_state::machine_start()
{
atarigen_state::machine_start();
@@ -51,7 +51,7 @@ MACHINE_START_MEMBER(atarig42_state,atarig42)
}
-MACHINE_RESET_MEMBER(atarig42_state,atarig42)
+void atarig42_state::machine_reset()
{
atarigen_state::machine_reset();
scanline_timer_reset(*m_screen, 8);
@@ -128,7 +128,7 @@ WRITE16_MEMBER(atarig42_state::mo_command_w)
*
*************************************/
-void atarig42_state::roadriot_sloop_tweak(int offset)
+void atarig42_0x200_state::roadriot_sloop_tweak(int offset)
{
/*
sequence 1:
@@ -240,7 +240,7 @@ void atarig42_state::roadriot_sloop_tweak(int offset)
}
-READ16_MEMBER(atarig42_state::roadriot_sloop_data_r)
+READ16_MEMBER(atarig42_0x200_state::roadriot_sloop_data_r)
{
roadriot_sloop_tweak(offset);
if (offset < 0x78000/2)
@@ -250,7 +250,7 @@ READ16_MEMBER(atarig42_state::roadriot_sloop_data_r)
}
-WRITE16_MEMBER(atarig42_state::roadriot_sloop_data_w)
+WRITE16_MEMBER(atarig42_0x200_state::roadriot_sloop_data_w)
{
roadriot_sloop_tweak(offset);
}
@@ -263,7 +263,7 @@ WRITE16_MEMBER(atarig42_state::roadriot_sloop_data_w)
*
*************************************/
-void atarig42_state::guardians_sloop_tweak(int offset)
+void atarig42_0x400_state::guardians_sloop_tweak(int offset)
{
uint32_t *last_accesses = m_last_accesses;
@@ -297,7 +297,7 @@ void atarig42_state::guardians_sloop_tweak(int offset)
}
-READ16_MEMBER(atarig42_state::guardians_sloop_data_r)
+READ16_MEMBER(atarig42_0x400_state::guardians_sloop_data_r)
{
guardians_sloop_tweak(offset);
if (offset < 0x78000/2)
@@ -307,7 +307,7 @@ READ16_MEMBER(atarig42_state::guardians_sloop_data_r)
}
-WRITE16_MEMBER(atarig42_state::guardians_sloop_data_w)
+WRITE16_MEMBER(atarig42_0x400_state::guardians_sloop_data_w)
{
guardians_sloop_tweak(offset);
}
@@ -527,10 +527,7 @@ MACHINE_CONFIG_START(atarig42_state::atarig42)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atarigen_state, video_int_gen)
-
- MCFG_MACHINE_START_OVERRIDE(atarig42_state,atarig42)
- MCFG_MACHINE_RESET_OVERRIDE(atarig42_state,atarig42)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atarig42_state, video_int_gen)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -558,12 +555,12 @@ MACHINE_CONFIG_START(atarig42_state::atarig42)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
+ MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(atarig42_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN2", 6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(atarig42_state::atarig42_0x200)
+MACHINE_CONFIG_START(atarig42_0x200_state::atarig42_0x200)
atarig42(config);
MCFG_ATARIRLE_ADD("rle", modesc_0x200)
@@ -571,7 +568,7 @@ MACHINE_CONFIG_START(atarig42_state::atarig42_0x200)
MCFG_ASIC65_ADD("asic65", ASIC65_ROMBASED)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(atarig42_state::atarig42_0x400)
+MACHINE_CONFIG_START(atarig42_0x400_state::atarig42_0x400)
atarig42(config);
MCFG_ATARIRLE_ADD("rle", modesc_0x400)
@@ -826,12 +823,12 @@ ROM_END
*
*************************************/
-DRIVER_INIT_MEMBER(atarig42_state,roadriot)
+DRIVER_INIT_MEMBER(atarig42_0x200_state,roadriot)
{
m_playfield_base = 0x400;
address_space &main = m_maincpu->space(AS_PROGRAM);
- main.install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(FUNC(atarig42_state::roadriot_sloop_data_r),this), write16_delegate(FUNC(atarig42_state::roadriot_sloop_data_w),this));
+ main.install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(FUNC(atarig42_0x200_state::roadriot_sloop_data_r),this), write16_delegate(FUNC(atarig42_0x200_state::roadriot_sloop_data_w),this));
m_sloop_base = (uint16_t *)memregion("maincpu")->base();
/*
@@ -857,7 +854,7 @@ DRIVER_INIT_MEMBER(atarig42_state,roadriot)
}
-DRIVER_INIT_MEMBER(atarig42_state,guardian)
+DRIVER_INIT_MEMBER(atarig42_0x400_state,guardian)
{
m_playfield_base = 0x000;
@@ -866,7 +863,7 @@ DRIVER_INIT_MEMBER(atarig42_state,guardian)
*(uint16_t *)&memregion("maincpu")->base()[0x80000] = 0x4E75;
address_space &main = m_maincpu->space(AS_PROGRAM);
- main.install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(FUNC(atarig42_state::guardians_sloop_data_r),this), write16_delegate(FUNC(atarig42_state::guardians_sloop_data_w),this));
+ main.install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(FUNC(atarig42_0x400_state::guardians_sloop_data_r),this), write16_delegate(FUNC(atarig42_0x400_state::guardians_sloop_data_w),this));
m_sloop_base = (uint16_t *)memregion("maincpu")->base();
/*
@@ -899,7 +896,7 @@ DRIVER_INIT_MEMBER(atarig42_state,guardian)
*
*************************************/
-GAME( 1991, roadriot, 0, atarig42_0x200, roadriot, atarig42_state, roadriot, ROT0, "Atari Games", "Road Riot 4WD (set 1, 04 Dec 1991)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1991, roadriota, roadriot, atarig42_0x200, roadriot, atarig42_state, roadriot, ROT0, "Atari Games", "Road Riot 4WD (set 2, 13 Nov 1991)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1991, roadriotb, roadriot, atarig42_0x200, roadriot, atarig42_state, roadriot, ROT0, "Atari Games", "Road Riot 4WD (set 3, 04 Jun 1991)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1992, guardian, 0, atarig42_0x400, guardian, atarig42_state, guardian, ROT0, "Atari Games", "Guardians of the 'Hood", 0 )
+GAME( 1991, roadriot, 0, atarig42_0x200, roadriot, atarig42_0x200_state, roadriot, ROT0, "Atari Games", "Road Riot 4WD (set 1, 04 Dec 1991)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1991, roadriota, roadriot, atarig42_0x200, roadriot, atarig42_0x200_state, roadriot, ROT0, "Atari Games", "Road Riot 4WD (set 2, 13 Nov 1991)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1991, roadriotb, roadriot, atarig42_0x200, roadriot, atarig42_0x200_state, roadriot, ROT0, "Atari Games", "Road Riot 4WD (set 3, 04 Jun 1991)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1992, guardian, 0, atarig42_0x400, guardian, atarig42_0x400_state, guardian, ROT0, "Atari Games", "Guardians of the 'Hood", 0 )