From 7427f8ea4b22a3d6c3896f8068703635d48e7f93 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 29 Jul 2019 00:06:26 +1000 Subject: fix clang build (nw) --- src/devices/bus/tanbus/tanex.h | 2 +- src/mame/drivers/1943.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/devices/bus/tanbus/tanex.h b/src/devices/bus/tanbus/tanex.h index 12f59d567ee..757e75f0224 100644 --- a/src/devices/bus/tanbus/tanex.h +++ b/src/devices/bus/tanbus/tanex.h @@ -75,7 +75,7 @@ private: required_ioport m_config; std::unique_ptr m_ram; - emu_timer *m_read_cassette_timer; + //emu_timer *m_read_cassette_timer; }; diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp index 522ab3b0bad..c903e24e500 100644 --- a/src/mame/drivers/1943.cpp +++ b/src/mame/drivers/1943.cpp @@ -106,7 +106,7 @@ void _1943_state::c1943b_map(address_map &map) // the bootleg expects 0x00 to be returned from the protection reads // because the protection has been patched out - map(0xc007, 0xc007).lr8("mcu_r", [this]() -> u8 { return 0x00; }); + map(0xc007, 0xc007).lr8("mcu_r", []() -> u8 { return 0x00; }); map(0xc807, 0xc807).noprw(); } -- cgit v1.2.3 From 3eff688ad0ef30accc9bd7a8565be393307d525e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 31 Jul 2019 02:07:13 +1000 Subject: spectrum_cass.xml: fix some botched titles (nw) --- hash/spectrum_cass.xml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index 9a9ee530d4d..a031c53f87e 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -17684,7 +17684,7 @@ - Ping Pong (set 5, Erbe, small case)) + Ping Pong (set 5, Erbe, small case) 19?? <unknown> @@ -52108,7 +52108,7 @@ - Cricket Captain (D_H Games) + Cricket Captain (D&H Games) 19?? <unknown> @@ -64334,7 +64334,7 @@ - Fantasy (R_n_H Microtec) + Fantasy (R'n'H Microtec) 19?? <unknown> @@ -66983,7 +66983,7 @@ - Frogger (A _n_ F) + Frogger (A 'n' F) 19?? <unknown> @@ -75430,7 +75430,7 @@ - Hoppin_ Mad + Hoppin' Mad 19?? <unknown> @@ -80015,7 +80015,7 @@ - Jet Set Willy - Dup Moor en t_ Panat + Jet Set Willy - Dup Moor en t' Panat 19?? <unknown> @@ -80224,7 +80224,7 @@ - Jet Set Willy - Madam Blavskja_s Carnival Macabre + Jet Set Willy - Madam Blavskja's Carnival Macabre 19?? <unknown> @@ -81552,7 +81552,7 @@ - Journey To The Centre Of Eddie Smith;s Head + Journey To The Centre Of Eddie Smith's Head 19?? <unknown> @@ -83098,7 +83098,7 @@ - Kobyashi Ag_Kwo + Kobyashi Ag'Kwo 19?? <unknown> @@ -91840,7 +91840,7 @@ - Mexico _86 - Finals + Mexico '86 - Finals 19?? <unknown> @@ -91851,7 +91851,7 @@ - Mexico _86 - Qualifiers + Mexico '86 - Qualifiers 19?? <unknown> @@ -103789,7 +103789,7 @@ - Poker v3.1 (V_M Soft) + Poker v3.1 (V&M Soft) 19?? <unknown> @@ -128258,7 +128258,7 @@ - The Test (The Guild) (set 2) + The Test (The Guild) (set 2) 1992 The Guild @@ -128810,12 +128810,12 @@ - Theory Of Music Questions And Exercices - 48k + Theory Of Music Questions And Exercises - 48k 19?? <unknown> - + @@ -132118,7 +132118,7 @@ - Trouble Brewin_ + Trouble Brewin' 19?? <unknown> -- cgit v1.2.3 From a15d4684aa69f5ea5c8012345efbed23c1543267 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 1 Aug 2019 12:28:24 +1000 Subject: microtan.cpp: dedicated game on similar architecture is logically a different thing, hence not a clone (nw) --- src/mame/drivers/microtan.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp index 3871fb88f8f..1675b2b5c50 100644 --- a/src/mame/drivers/microtan.cpp +++ b/src/mame/drivers/microtan.cpp @@ -474,5 +474,5 @@ ROM_END // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1979, mt65, 0, 0, mt65, microtan, microtan_state, init_microtan, "Tangerine", "Microtan 65", MACHINE_NO_SOUND_HW ) COMP( 1980, micron, mt65, 0, micron, microtan, microtan_state, init_microtan, "Tangerine", "Micron", MACHINE_NO_SOUND_HW ) -COMP( 1980, spinveti, mt65, 0, spinveti, spinveti, microtan_state, init_gfx2, "Tangerine/ETI", "Space Invasion (ETI)", MACHINE_NO_SOUND ) +COMP( 1980, spinveti, 0, 0, spinveti, spinveti, microtan_state, init_gfx2, "Tangerine/ETI", "Space Invasion (ETI)", MACHINE_NO_SOUND ) COMP( 1984, mt6809, mt65, 0, mt6809, microtan, mt6809_state, empty_init, "Tangerine", "Microtan 6809 System", MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING ) -- cgit v1.2.3 From 7928cce2c63b1bd066ed7a4c7eebbf6d6681e3ff Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 2 Aug 2019 23:48:39 +1000 Subject: cybiko: fix image file extensions (nw) wrally: fix output latch addressing (MT07385) (nw) --- src/mame/drivers/cybiko.cpp | 2 +- src/mame/drivers/wrally.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp index f3e574e30c2..88d9ab50770 100644 --- a/src/mame/drivers/cybiko.cpp +++ b/src/mame/drivers/cybiko.cpp @@ -497,7 +497,7 @@ void cybiko_state::cybikoxt(machine_config &config) subdevice("maincpu:sci2")->tx_handler().set("debug_serial", FUNC(rs232_port_device::write_txd)); // quickload - QUICKLOAD(config.replace(), "quickload", "bin,nb").set_load_callback(FUNC(cybiko_state::quickload_cybikoxt), this); + QUICKLOAD(config.replace(), "quickload", "bin,nv").set_load_callback(FUNC(cybiko_state::quickload_cybikoxt), this); } ///////// 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) */ -- cgit v1.2.3 From 132afac58c1ee6ced64553ad4d627601e258a136 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sat, 3 Aug 2019 00:32:49 +1000 Subject: (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/machine/gaelco2.cpp | 2 +- 4 files changed, 7 insertions(+), 7 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/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) -- cgit v1.2.3