From 52cfc6896e8c90d4fc6f75e23b7cfe4b2cf38e62 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sat, 3 Aug 2019 00:32:49 +1000 Subject: [PATCH] (nw) coin fixes for various gaelco games. --- src/mame/drivers/gaelco.cpp | 6 +++--- src/mame/drivers/splash.cpp | 4 ++-- src/mame/drivers/thoop2.cpp | 2 +- src/mame/drivers/wrally.cpp | 2 +- src/mame/machine/gaelco2.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp index 1b88da911cf..1a4ab66322a 100644 --- a/src/mame/drivers/gaelco.cpp +++ b/src/mame/drivers/gaelco.cpp @@ -117,7 +117,7 @@ void gaelco_state::bigkarnk_map(address_map &map) map(0x700004, 0x700005).portr("P1"); map(0x700006, 0x700007).portr("P2"); map(0x700008, 0x700009).portr("SERVICE"); - map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 3, data); }); + map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 4, data); }); map(0x70000f, 0x70000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); /* Triggers a FIRQ on the sound CPU */ map(0xff8000, 0xffffff).ram(); /* Work RAM */ } @@ -163,7 +163,7 @@ void gaelco_state::squash_map(address_map &map) map(0x700002, 0x700003).portr("DSW1"); map(0x700004, 0x700005).portr("P1"); map(0x700006, 0x700007).portr("P2"); - map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 3, data); }); + map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 4, data); }); map(0x70000d, 0x70000d).w(FUNC(gaelco_state::oki_bankswitch_w)); map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 status register */ map(0xff0000, 0xffffff).ram(); /* Work RAM */ @@ -182,7 +182,7 @@ void gaelco_state::thoop_map(address_map &map) map(0x700002, 0x700003).portr("DSW1"); map(0x700004, 0x700005).portr("P1"); map(0x700006, 0x700007).portr("P2"); - map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 3, data); }); + map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 4, data); }); map(0x70000d, 0x70000d).w(FUNC(gaelco_state::oki_bankswitch_w)); map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 status register */ map(0xff0000, 0xffffff).ram(); /* Work RAM */ diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index ab234e62498..e039b222fc2 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -81,7 +81,7 @@ void splash_state::splash_map(address_map &map) map(0x840002, 0x840003).portr("DSW2"); map(0x840004, 0x840005).portr("P1"); map(0x840006, 0x840007).portr("P2"); - map(0x84000a, 0x84000a).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 3, data); }); + map(0x84000a, 0x84000a).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 4, data); }); map(0x84000f, 0x84000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x880000, 0x8817ff).ram().w(FUNC(splash_state::vram_w)).share("videoram"); /* Video RAM */ map(0x881800, 0x881803).ram().share("vregs"); /* Scroll registers */ @@ -161,7 +161,7 @@ void splash_state::roldfrog_map(address_map &map) map(0x840002, 0x840003).portr("DSW2"); map(0x840004, 0x840005).portr("P1"); map(0x840006, 0x840007).portr("P2"); - map(0x84000a, 0x84000a).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 3, data); }); + map(0x84000a, 0x84000a).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 4, data); }); map(0x84000f, 0x84000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x880000, 0x8817ff).ram().w(FUNC(splash_state::vram_w)).share("videoram"); /* Video RAM */ map(0x881800, 0x881803).ram().share("vregs"); /* Scroll registers */ diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp index 1ce80565935..cba4dbedf11 100644 --- a/src/mame/drivers/thoop2.cpp +++ b/src/mame/drivers/thoop2.cpp @@ -135,7 +135,7 @@ void thoop2_state::thoop2_map(address_map &map) map(0x700004, 0x700005).portr("P1"); map(0x700006, 0x700007).portr("P2"); map(0x700008, 0x700009).portr("SYSTEM"); - map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 3, data); }); + map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 4, data); }); map(0x70000d, 0x70000d).w(FUNC(thoop2_state::oki_bankswitch_w)); /* OKI6295 bankswitch */ map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 data register */ map(0xfe0000, 0xfe7fff).ram(); /* Work RAM */ diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp index f269e07d4c1..e0435567e01 100644 --- a/src/mame/drivers/wrally.cpp +++ b/src/mame/drivers/wrally.cpp @@ -156,7 +156,7 @@ void wrally_state::wrally_map(address_map &map) map(0x700002, 0x700003).portr("P1_P2"); map(0x700004, 0x700005).portr("WHEEL"); map(0x700008, 0x700009).portr("SYSTEM"); - map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 3, data); }); + map(0x70000b, 0x70000b).select(0x000070).lw8("outlatch_w", [this](offs_t offset, u8 data) { m_outlatch->write_d0(offset >> 4, data); }); map(0x70000d, 0x70000d).w(FUNC(wrally_state::okim6295_bankswitch_w)); /* OKI6295 bankswitch */ map(0x70000f, 0x70000f).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); /* OKI6295 status/data register */ map(0xfec000, 0xfeffff).ram().share("shareram"); /* Work RAM (shared with DS5002FP) */ diff --git a/src/mame/machine/gaelco2.cpp b/src/mame/machine/gaelco2.cpp index 672afa9d51e..99afde75ec8 100644 --- a/src/mame/machine/gaelco2.cpp +++ b/src/mame/machine/gaelco2.cpp @@ -186,7 +186,7 @@ u8 gaelco2_state::shareram_r(offs_t offset) void gaelco2_state::wrally2_latch_w(offs_t offset, u16 data) { - m_mainlatch->write_bit(offset >> 2, BIT(data, 0)); + m_mainlatch->write_bit(offset >> 3, BIT(data, 0)); } WRITE_LINE_MEMBER(gaelco2_state::coin1_counter_w)