From 494b7ef63fafe62b27eb9e81dfad0db0f5c6cd65 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Thu, 12 Nov 2020 18:09:36 +0100 Subject: taito_f3: fixed regression --- src/mame/drivers/taito_f3.cpp | 24 ++++++++++++------------ src/mame/includes/taito_f3.h | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index f4c720d8ab9..0acb5c449aa 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -190,12 +190,12 @@ void taito_f3_state::f3_map(address_map &map) map(0x440000, 0x447fff).ram().w(FUNC(taito_f3_state::palette_24bit_w)).share("paletteram"); map(0x4a0000, 0x4a001f).rw(FUNC(taito_f3_state::f3_control_r), FUNC(taito_f3_state::f3_control_w)); map(0x4c0000, 0x4c0003).w(FUNC(taito_f3_state::f3_unk_w)); - map(0x600000, 0x60ffff).rw(FUNC(taito_f3_state::spriteram_r), FUNC(taito_f3_state::spriteram_w)).share("spriteram"); - map(0x610000, 0x61bfff).rw(FUNC(taito_f3_state::pf_ram_r), FUNC(taito_f3_state::pf_ram_w)).share("pf_ram"); - map(0x61c000, 0x61dfff).rw(FUNC(taito_f3_state::textram_r), FUNC(taito_f3_state::textram_w)).share("textram"); - map(0x61e000, 0x61ffff).rw(FUNC(taito_f3_state::charram_r), FUNC(taito_f3_state::charram_w)).share("charram"); - map(0x620000, 0x62ffff).rw(FUNC(taito_f3_state::lineram_r), FUNC(taito_f3_state::lineram_w)).share("line_ram"); - map(0x630000, 0x63ffff).rw(FUNC(taito_f3_state::pivot_r), FUNC(taito_f3_state::pivot_w)).share("pivot_ram"); + map(0x600000, 0x60ffff).rw(FUNC(taito_f3_state::spriteram_r), FUNC(taito_f3_state::spriteram_w)); + map(0x610000, 0x61bfff).rw(FUNC(taito_f3_state::pf_ram_r), FUNC(taito_f3_state::pf_ram_w)); + map(0x61c000, 0x61dfff).rw(FUNC(taito_f3_state::textram_r), FUNC(taito_f3_state::textram_w)); + map(0x61e000, 0x61ffff).rw(FUNC(taito_f3_state::charram_r), FUNC(taito_f3_state::charram_w)); + map(0x620000, 0x62ffff).rw(FUNC(taito_f3_state::lineram_r), FUNC(taito_f3_state::lineram_w)); + map(0x630000, 0x63ffff).rw(FUNC(taito_f3_state::pivot_r), FUNC(taito_f3_state::pivot_w)); map(0x660000, 0x66000f).w(FUNC(taito_f3_state::control_0_w)); map(0x660010, 0x66001f).w(FUNC(taito_f3_state::control_1_w)); map(0xc00000, 0xc007ff).rw("taito_en:dpram", FUNC(mb8421_device::left_r), FUNC(mb8421_device::left_w)); @@ -228,12 +228,12 @@ void taito_f3_state::bubsympb_map(address_map &map) map(0x4a001d, 0x4a001d).w(FUNC(taito_f3_state::bubsympb_oki_w)); map(0x4a001f, 0x4a001f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0x4c0000, 0x4c0003).w(FUNC(taito_f3_state::f3_unk_w)); - map(0x600000, 0x60ffff).rw(FUNC(taito_f3_state::spriteram_r), FUNC(taito_f3_state::spriteram_w)).share("spriteram"); - map(0x610000, 0x61bfff).rw(FUNC(taito_f3_state::pf_ram_r), FUNC(taito_f3_state::pf_ram_w)).share("pf_ram"); - map(0x61c000, 0x61dfff).rw(FUNC(taito_f3_state::textram_r), FUNC(taito_f3_state::textram_w)).share("textram"); - map(0x61e000, 0x61ffff).rw(FUNC(taito_f3_state::charram_r), FUNC(taito_f3_state::charram_w)).share("charram"); - map(0x620000, 0x62ffff).rw(FUNC(taito_f3_state::lineram_r), FUNC(taito_f3_state::lineram_w)).share("line_ram"); - map(0x630000, 0x63ffff).rw(FUNC(taito_f3_state::pivot_r), FUNC(taito_f3_state::pivot_w)).share("pivot_ram"); + map(0x600000, 0x60ffff).rw(FUNC(taito_f3_state::spriteram_r), FUNC(taito_f3_state::spriteram_w)); + map(0x610000, 0x61bfff).rw(FUNC(taito_f3_state::pf_ram_r), FUNC(taito_f3_state::pf_ram_w)); + map(0x61c000, 0x61dfff).rw(FUNC(taito_f3_state::textram_r), FUNC(taito_f3_state::textram_w)); + map(0x61e000, 0x61ffff).rw(FUNC(taito_f3_state::charram_r), FUNC(taito_f3_state::charram_w)); + map(0x620000, 0x62ffff).rw(FUNC(taito_f3_state::lineram_r), FUNC(taito_f3_state::lineram_w)); + map(0x630000, 0x63ffff).rw(FUNC(taito_f3_state::pivot_r), FUNC(taito_f3_state::pivot_w)); map(0x660000, 0x66000f).w(FUNC(taito_f3_state::control_0_w)); map(0x660010, 0x66001f).w(FUNC(taito_f3_state::control_1_w)); map(0xc00000, 0xc007ff).ram(); diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 9e127281b9c..6270229881a 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -68,12 +68,12 @@ public: m_screen(*this, "screen"), m_palette(*this, "palette"), m_eeprom(*this, "eeprom"), - m_textram(*this, "textram"), - m_spriteram(*this, "spriteram"), - m_charram(*this, "charram"), - m_line_ram(*this, "line_ram"), - m_pf_ram(*this, "pf_ram"), - m_pivot_ram(*this, "pivot_ram"), + m_textram(*this, "textram", 0x2000, ENDIANNESS_LITTLE), + m_spriteram(*this, "spriteram", 0x10000, ENDIANNESS_LITTLE), + m_charram(*this, "charram", 0x2000, ENDIANNESS_LITTLE), + m_line_ram(*this, "line_ram", 0x10000, ENDIANNESS_LITTLE), + m_pf_ram(*this, "pf_ram", 0xc000, ENDIANNESS_LITTLE), + m_pivot_ram(*this, "pivot_ram", 0x10000, ENDIANNESS_LITTLE), m_input(*this, "IN.%u", 0), m_dial(*this, "DIAL.%u", 0), m_eepromin(*this, "EEPROMIN"), @@ -155,12 +155,12 @@ protected: required_device m_palette; optional_device m_eeprom; - required_shared_ptr m_textram; - required_shared_ptr m_spriteram; - required_shared_ptr m_charram; - required_shared_ptr m_line_ram; - required_shared_ptr m_pf_ram; - required_shared_ptr m_pivot_ram; + memory_share_creator m_textram; + memory_share_creator m_spriteram; + memory_share_creator m_charram; + memory_share_creator m_line_ram; + memory_share_creator m_pf_ram; + memory_share_creator m_pivot_ram; optional_ioport_array<6> m_input; optional_ioport_array<2> m_dial; -- cgit v1.2.3