diff options
Diffstat (limited to 'src/mame/drivers/seta.cpp')
-rw-r--r-- | src/mame/drivers/seta.cpp | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index b33b9dc8c33..4845622f6da 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -1782,8 +1782,8 @@ void seta_state::calibr50_map(address_map &map) map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xd00600, 0xd00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); map(0xe00000, 0xe03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr - map(0xb00001, 0xb00001).r("soundlatch2", FUNC(generic_latch_8_device::read)); // From Sub CPU - map(0xb00001, 0xb00001).w("soundlatch1", FUNC(generic_latch_8_device::write)); // To Sub CPU + map(0xb00001, 0xb00001).r(m_soundlatch[1], FUNC(generic_latch_8_device::read)); // From Sub CPU + map(0xb00001, 0xb00001).w(m_soundlatch[0], FUNC(generic_latch_8_device::write)); // To Sub CPU map(0xc00000, 0xc00001).ram(); // ? $4000 map(0xff0000, 0xffffff).ram(); // RAM @@ -1848,7 +1848,7 @@ void seta_state::usclssic_map(address_map &map) map(0xb40001, 0xb40001).w(FUNC(seta_state::usclssic_lockout_w)); // Coin Lockout + Tiles Banking map(0xb4000a, 0xb4000b).w(FUNC(seta_state::ipl1_ack_w)); map(0xb40010, 0xb40011).portr("COINS"); // Coins - map(0xb40011, 0xb40011).w("soundlatch1", FUNC(generic_latch_8_device::write)); // To Sub CPU + map(0xb40011, 0xb40011).w(m_soundlatch[0], FUNC(generic_latch_8_device::write)); // To Sub CPU map(0xb40018, 0xb4001f).r(FUNC(seta_state::usclssic_dsw_r)); // 2 DSWs map(0xb40018, 0xb40019).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0xb80000, 0xb80001).r(FUNC(seta_state::ipl2_ack_r)); @@ -2957,7 +2957,7 @@ void seta_state::thunderlbl_map(address_map &map) map(0xb00004, 0xb00005).portr("COINS"); // Coins map(0xb0000c, 0xb0000d).w(m_seta001, FUNC(seta001_device::spritectrl_w8)).umask16(0xff00); // the bootleg is modified to write the first byte of spritectrl here, rather than the usual address map(0xb00008, 0xb00009).portr("P3"); // P3 (wits) - map(0xb00008, 0xb00008).w("soundlatch1", FUNC(generic_latch_8_device::write)); + map(0xb00008, 0xb00008).w(m_soundlatch[0], FUNC(generic_latch_8_device::write)); map(0xb0000a, 0xb0000b).portr("P4"); // P4 (wits) map(0xc00000, 0xc00001).ram(); // ? 0x4000 map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y @@ -2986,7 +2986,7 @@ void seta_state::wiggie_map(address_map &map) map(0xb00004, 0xb00005).portr("COINS"); // Coins map(0xb0000c, 0xb0000d).r(FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits) map(0xb00008, 0xb00009).portr("P3"); // P3 (wits) - map(0xb00008, 0xb00008).w("soundlatch1", FUNC(generic_latch_8_device::write)); + map(0xb00008, 0xb00008).w(m_soundlatch[0], FUNC(generic_latch_8_device::write)); map(0xb0000a, 0xb0000b).portr("P4"); // P4 (wits) map(0xc00000, 0xc00001).ram(); // ? 0x4000 map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y @@ -3000,7 +3000,7 @@ void seta_state::wiggie_sound_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0x9800, 0x9800).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xa000, 0xa000).r("soundlatch1", FUNC(generic_latch_8_device::read)); + map(0xa000, 0xa000).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)); } @@ -3059,7 +3059,7 @@ void seta_state::utoukond_map(address_map &map) map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y map(0xa00600, 0xa00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16)); map(0xb00000, 0xb03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr - map(0xc00001, 0xc00001).w("soundlatch1", FUNC(generic_latch_8_device::write)); + map(0xc00001, 0xc00001).w(m_soundlatch[0], FUNC(generic_latch_8_device::write)); map(0xe00000, 0xe00001).nopw(); // ? ack } @@ -3439,8 +3439,8 @@ void seta_state::tndrcade_sub_map(address_map &map) { map(0x0000, 0x01ff).ram(); // RAM map(0x0800, 0x0800).r(FUNC(seta_state::ff_r)); // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom) - //AM_RANGE(0x0800, 0x0800) AM_DEVREAD("soundlatch1", generic_latch_8_device, read) // - //AM_RANGE(0x0801, 0x0801) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) // + //AM_RANGE(0x0800, 0x0800) AM_DEVREAD(m_soundlatch[0], generic_latch_8_device, read) // + //AM_RANGE(0x0801, 0x0801) AM_DEVREAD(m_soundlatch[1], generic_latch_8_device, read) // map(0x1000, 0x1000).portr("P1"); // P1 map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout map(0x1001, 0x1001).portr("P2"); // P2 @@ -3461,8 +3461,8 @@ void seta_state::tndrcade_sub_map(address_map &map) void seta_state::twineagl_sub_map(address_map &map) { map(0x0000, 0x01ff).ram(); // RAM - map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); // - map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); // + map(0x0800, 0x0800).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)); // + map(0x0801, 0x0801).r(m_soundlatch[1], FUNC(generic_latch_8_device::read)); // map(0x1000, 0x1000).portr("P1"); // P1 map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout map(0x1001, 0x1001).portr("P2"); // P2 @@ -3504,8 +3504,8 @@ READ8_MEMBER(seta_state::downtown_ip_r) void seta_state::downtown_sub_map(address_map &map) { map(0x0000, 0x01ff).ram(); // RAM - map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); // - map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); // + map(0x0800, 0x0800).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)); // + map(0x0801, 0x0801).r(m_soundlatch[1], FUNC(generic_latch_8_device::read)); // map(0x1000, 0x1007).r(FUNC(seta_state::downtown_ip_r)); // Input Ports map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout map(0x5000, 0x57ff).ram().share("sharedram"); // Shared RAM @@ -3553,7 +3553,7 @@ void seta_state::calibr50_sub_map(address_map &map) map(0x0000, 0x1fff).lrw8("x1_soundram_rw", [this](offs_t offset) { return m_x1->read(offset ^ 0x1000); }, [this](offs_t offset, u8 data) { m_x1->write(offset ^ 0x1000, data); }); // Sound - map(0x4000, 0x4000).r("soundlatch1", FUNC(generic_latch_8_device::read)); // From Main CPU + map(0x4000, 0x4000).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)); // From Main CPU map(0x4000, 0x4000).w(FUNC(seta_state::calibr50_sub_bankswitch_w)); // Bankswitching map(0x8000, 0xbfff).bankr("subbank"); // Banked ROM map(0xc000, 0xffff).rom(); // ROM @@ -3568,8 +3568,8 @@ void seta_state::calibr50_sub_map(address_map &map) void seta_state::metafox_sub_map(address_map &map) { map(0x0000, 0x01ff).ram(); // RAM - map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); // - map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); // + map(0x0800, 0x0800).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)); // + map(0x0801, 0x0801).r(m_soundlatch[1], FUNC(generic_latch_8_device::read)); // map(0x1000, 0x1000).portr("COINS"); // Coins map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout map(0x1002, 0x1002).portr("P1"); // P1 @@ -3598,7 +3598,7 @@ void seta_state::utoukond_sound_io_map(address_map &map) map.global_mask(0xff); map(0x00, 0x03).rw("ymsnd", FUNC(ym3438_device::read), FUNC(ym3438_device::write)); map(0x80, 0x80).w(FUNC(seta_state::utoukond_sound_control_w)); - map(0xc0, 0xc0).r("soundlatch1", FUNC(generic_latch_8_device::read)); + map(0xc0, 0xc0).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)); } @@ -7934,8 +7934,8 @@ MACHINE_CONFIG_START(seta_state::twineagl) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_GENERIC_LATCH_8_ADD("soundlatch1") - MCFG_GENERIC_LATCH_8_ADD("soundlatch2") + GENERIC_LATCH_8(config, m_soundlatch[0]); + GENERIC_LATCH_8(config, m_soundlatch[1]); MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -7980,8 +7980,8 @@ MACHINE_CONFIG_START(seta_state::downtown) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_GENERIC_LATCH_8_ADD("soundlatch1") - MCFG_GENERIC_LATCH_8_ADD("soundlatch2") + GENERIC_LATCH_8(config, m_soundlatch[0]); + GENERIC_LATCH_8(config, m_soundlatch[1]); MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -8065,9 +8065,9 @@ MACHINE_CONFIG_START(seta_state::usclssic) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_GENERIC_LATCH_8_ADD("soundlatch1") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("sub", INPUT_LINE_NMI)) - MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) + GENERIC_LATCH_8(config, m_soundlatch[0]); + m_soundlatch[0]->data_pending_callback().set_inputline(m_subcpu, INPUT_LINE_NMI); + m_soundlatch[0]->set_separate_acknowledge(true); MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -8125,11 +8125,11 @@ MACHINE_CONFIG_START(seta_state::calibr50) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_GENERIC_LATCH_8_ADD("soundlatch1") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("sub", INPUT_LINE_NMI)) - MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) + GENERIC_LATCH_8(config, m_soundlatch[0]); + m_soundlatch[0]->data_pending_callback().set_inputline(m_subcpu, INPUT_LINE_NMI); + m_soundlatch[0]->set_separate_acknowledge(true); - MCFG_GENERIC_LATCH_8_ADD("soundlatch2") + GENERIC_LATCH_8(config, m_soundlatch[1]); MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -8174,8 +8174,8 @@ MACHINE_CONFIG_START(seta_state::metafox) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_GENERIC_LATCH_8_ADD("soundlatch1") - MCFG_GENERIC_LATCH_8_ADD("soundlatch2") + GENERIC_LATCH_8(config, m_soundlatch[0]); + GENERIC_LATCH_8(config, m_soundlatch[1]); MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -8356,7 +8356,7 @@ void seta_state::blockcarb_sound_portmap(address_map &map) map.unmap_value_high(); map.global_mask(0xff); // AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) -// AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_DEVREAD("soundlatch1", generic_latch_8_device, read) +// AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_DEVREAD(m_soundlatch[0], generic_latch_8_device, read) } MACHINE_CONFIG_START(seta_state::blockcarb) @@ -9388,7 +9388,7 @@ void seta_state::thunderlbl_sound_portmap(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x01).mirror(0x3e).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xc0, 0xc0).mirror(0x3f).r("soundlatch1", FUNC(generic_latch_8_device::read)); + map(0xc0, 0xc0).mirror(0x3f).r(m_soundlatch[0], FUNC(generic_latch_8_device::read)); } @@ -9410,8 +9410,8 @@ MACHINE_CONFIG_START(seta_state::thunderlbl) MCFG_DEVICE_ADD("ymsnd", YM2151, 10000000/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_GENERIC_LATCH_8_ADD("soundlatch1") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) + GENERIC_LATCH_8(config, m_soundlatch[0]); + m_soundlatch[0]->data_pending_callback().set_inputline(m_audiocpu, 0); MACHINE_CONFIG_END @@ -9449,8 +9449,8 @@ MACHINE_CONFIG_START(seta_state::wiggie) MCFG_DEVICE_ADD("oki", OKIM6295, 1000000, okim6295_device::PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_GENERIC_LATCH_8_ADD("soundlatch1") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) + GENERIC_LATCH_8(config, m_soundlatch[0]); + m_soundlatch[0]->data_pending_callback().set_inputline(m_audiocpu, 0); MACHINE_CONFIG_END MACHINE_CONFIG_START(seta_state::superbar) @@ -9566,9 +9566,9 @@ MACHINE_CONFIG_START(seta_state::utoukond) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_GENERIC_LATCH_8_ADD("soundlatch1") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) + GENERIC_LATCH_8(config, m_soundlatch[0]); + m_soundlatch[0]->data_pending_callback().set_inputline(m_audiocpu, 0); + m_soundlatch[0]->set_separate_acknowledge(true); MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) |