summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/taitosj.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/taitosj.cpp')
-rw-r--r--src/mame/drivers/taitosj.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp
index d38234f4746..16c48a2dfe6 100644
--- a/src/mame/drivers/taitosj.cpp
+++ b/src/mame/drivers/taitosj.cpp
@@ -207,9 +207,9 @@ void taitosj_state::taitosj_main_nomcu_map(address_map &map)
map(0x0000, 0x5fff).rom();
map(0x6000, 0x7fff).bankr("bank1");
map(0x8000, 0x87ff).ram();
- map(0x8800, 0x8800).mirror(0x07fe).rw(this, FUNC(taitosj_state::taitosj_fake_data_r), FUNC(taitosj_state::taitosj_fake_data_w));
- map(0x8801, 0x8801).mirror(0x07fe).r(this, FUNC(taitosj_state::taitosj_fake_status_r));
- map(0x9000, 0xbfff).w(this, FUNC(taitosj_state::taitosj_characterram_w)).share("characterram");
+ map(0x8800, 0x8800).mirror(0x07fe).rw(FUNC(taitosj_state::taitosj_fake_data_r), FUNC(taitosj_state::taitosj_fake_data_w));
+ map(0x8801, 0x8801).mirror(0x07fe).r(FUNC(taitosj_state::taitosj_fake_status_r));
+ map(0x9000, 0xbfff).w(FUNC(taitosj_state::taitosj_characterram_w)).share("characterram");
map(0xc000, 0xc3ff).ram();
map(0xc400, 0xc7ff).ram().share("videoram_1");
map(0xc800, 0xcbff).ram().share("videoram_2");
@@ -219,7 +219,7 @@ void taitosj_state::taitosj_main_nomcu_map(address_map &map)
map(0xd200, 0xd27f).mirror(0x0080).ram().share("paletteram");
map(0xd300, 0xd300).mirror(0x00ff).writeonly().share("video_priority");
map(0xd400, 0xd403).mirror(0x00f0).readonly().share("collision_reg");
- map(0xd404, 0xd404).mirror(0x00f3).r(this, FUNC(taitosj_state::taitosj_gfxrom_r));
+ map(0xd404, 0xd404).mirror(0x00f3).r(FUNC(taitosj_state::taitosj_gfxrom_r));
map(0xd408, 0xd408).mirror(0x00f0).portr("IN0");
map(0xd409, 0xd409).mirror(0x00f0).portr("IN1");
map(0xd40a, 0xd40a).mirror(0x00f0).portr("DSW1"); /* DSW1 */
@@ -230,12 +230,12 @@ void taitosj_state::taitosj_main_nomcu_map(address_map &map)
map(0xd40f, 0xd40f).mirror(0x00f0).r(m_ay1, FUNC(ay8910_device::data_r)); /* DSW2 and DSW3 */
map(0xd500, 0xd505).mirror(0x00f0).writeonly().share("scroll");
map(0xd506, 0xd507).mirror(0x00f0).writeonly().share("colorbank");
- map(0xd508, 0xd508).mirror(0x00f0).w(this, FUNC(taitosj_state::taitosj_collision_reg_clear_w));
+ map(0xd508, 0xd508).mirror(0x00f0).w(FUNC(taitosj_state::taitosj_collision_reg_clear_w));
map(0xd509, 0xd50a).mirror(0x00f0).writeonly().share("gfxpointer");
- map(0xd50b, 0xd50b).mirror(0x00f0).w(this, FUNC(taitosj_state::soundlatch_w));
- map(0xd50c, 0xd50c).mirror(0x00f0).w(this, FUNC(taitosj_state::sound_semaphore2_w));
+ map(0xd50b, 0xd50b).mirror(0x00f0).w(FUNC(taitosj_state::soundlatch_w));
+ map(0xd50c, 0xd50c).mirror(0x00f0).w(FUNC(taitosj_state::sound_semaphore2_w));
map(0xd50d, 0xd50d).mirror(0x00f0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0xd50e, 0xd50e).mirror(0x00f0).w(this, FUNC(taitosj_state::taitosj_bankswitch_w));
+ map(0xd50e, 0xd50e).mirror(0x00f0).w(FUNC(taitosj_state::taitosj_bankswitch_w));
map(0xd50f, 0xd50f).mirror(0x00f0).nopw();
map(0xd600, 0xd600).mirror(0x00ff).writeonly().share("video_mode");
map(0xd700, 0xdfff).noprw();
@@ -282,7 +282,7 @@ void taitosj_state::kikstart_main_map(address_map &map)
map(0x8800, 0x8801).rw(m_mcu, FUNC(taito_sj_security_mcu_device::data_r), FUNC(taito_sj_security_mcu_device::data_w));
map(0x8802, 0x8802).noprw();
map(0x8a00, 0x8a5f).writeonly().share("colscrolly");
- map(0x9000, 0xbfff).w(this, FUNC(taitosj_state::taitosj_characterram_w)).share("characterram");
+ map(0x9000, 0xbfff).w(FUNC(taitosj_state::taitosj_characterram_w)).share("characterram");
map(0xc000, 0xc3ff).ram();
map(0xc400, 0xc7ff).ram().share("videoram_1");
map(0xc800, 0xcbff).ram().share("videoram_2");
@@ -293,7 +293,7 @@ void taitosj_state::kikstart_main_map(address_map &map)
map(0xd200, 0xd27f).ram().share("paletteram");
map(0xd300, 0xd300).writeonly().share("video_priority");
map(0xd400, 0xd403).readonly().share("collision_reg");
- map(0xd404, 0xd404).r(this, FUNC(taitosj_state::taitosj_gfxrom_r));
+ map(0xd404, 0xd404).r(FUNC(taitosj_state::taitosj_gfxrom_r));
map(0xd408, 0xd408).mirror(0x00f0).portr("IN0");
map(0xd409, 0xd409).mirror(0x00f0).portr("IN1");
map(0xd40a, 0xd40a).mirror(0x00f0).portr("DSW1"); /* DSW1 */
@@ -302,12 +302,12 @@ void taitosj_state::kikstart_main_map(address_map &map)
map(0xd40d, 0xd40d).mirror(0x00f0).portr("IN4");
map(0xd40e, 0xd40f).w(m_ay1, FUNC(ay8910_device::address_data_w));
map(0xd40f, 0xd40f).r(m_ay1, FUNC(ay8910_device::data_r)); /* DSW2 and DSW3 */
- map(0xd508, 0xd508).w(this, FUNC(taitosj_state::taitosj_collision_reg_clear_w));
+ map(0xd508, 0xd508).w(FUNC(taitosj_state::taitosj_collision_reg_clear_w));
map(0xd509, 0xd50a).writeonly().share("gfxpointer");
- map(0xd50b, 0xd50b).w(this, FUNC(taitosj_state::soundlatch_w));
- map(0xd50c, 0xd50c).w(this, FUNC(taitosj_state::sound_semaphore2_w));
+ map(0xd50b, 0xd50b).w(FUNC(taitosj_state::soundlatch_w));
+ map(0xd50c, 0xd50c).w(FUNC(taitosj_state::sound_semaphore2_w));
map(0xd50d, 0xd50d).w("watchdog", FUNC(watchdog_timer_device::reset_w));
- map(0xd50e, 0xd50e).w(this, FUNC(taitosj_state::taitosj_bankswitch_w));
+ map(0xd50e, 0xd50e).w(FUNC(taitosj_state::taitosj_bankswitch_w));
map(0xd600, 0xd600).writeonly().share("video_mode");
map(0xd800, 0xdfff).ram().share("kikstart_scroll");// scroll ram + ???
map(0xe000, 0xefff).rom();
@@ -381,8 +381,8 @@ void taitosj_state::taitosj_audio_map(address_map &map)
map(0x4803, 0x4803).mirror(0x07f8).r(m_ay3, FUNC(ay8910_device::data_r));
map(0x4804, 0x4805).mirror(0x07fa).w(m_ay4, FUNC(ay8910_device::address_data_w));
map(0x4805, 0x4805).mirror(0x07fa).r(m_ay4, FUNC(ay8910_device::data_r));
- map(0x5000, 0x5000).mirror(0x07fc).rw(this, FUNC(taitosj_state::soundlatch_r), FUNC(taitosj_state::soundlatch_clear7_w));
- map(0x5001, 0x5001).mirror(0x07fc).rw(this, FUNC(taitosj_state::soundlatch_flags_r), FUNC(taitosj_state::sound_semaphore2_clear_w));
+ map(0x5000, 0x5000).mirror(0x07fc).rw(FUNC(taitosj_state::soundlatch_r), FUNC(taitosj_state::soundlatch_clear7_w));
+ map(0x5001, 0x5001).mirror(0x07fc).rw(FUNC(taitosj_state::soundlatch_flags_r), FUNC(taitosj_state::sound_semaphore2_clear_w));
map(0xe000, 0xefff).rom(); /* space for diagnostic ROM */
}
@@ -1801,7 +1801,7 @@ MACHINE_CONFIG_START(taitosj_state::nomcu)
MCFG_DEVICE_ADD("ay2", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC51
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, data_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, taitosj_state, taitosj_dacvol_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)