From 49b9a4c8917dd62f220c9502ac894c2545a02905 Mon Sep 17 00:00:00 2001 From: arbee Date: Sun, 5 Dec 2021 19:07:07 -0500 Subject: apple2.cpp: convert bank_device usage to memory_view. [R. Belmont] --- src/mame/drivers/apple2.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 699edc41482..335e8db10ed 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -135,8 +135,8 @@ public: m_sysconfig(*this, "a2_config"), m_speaker(*this, A2_SPEAKER_TAG), m_cassette(*this, A2_CASSETTE_TAG), - m_upperbank(*this, A2_UPPERBANK_TAG), - m_softlatch(*this, "softlatch") + m_softlatch(*this, "softlatch"), + m_upperbank(*this, A2_UPPERBANK_TAG) { } required_device m_maincpu; @@ -154,8 +154,8 @@ public: required_ioport m_sysconfig; required_device m_speaker; required_device m_cassette; - required_device m_upperbank; required_device m_softlatch; + memory_view m_upperbank; TIMER_DEVICE_CALLBACK_MEMBER(apple2_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(ay3600_repeat); @@ -285,7 +285,7 @@ WRITE_LINE_MEMBER(apple2_state::a2bus_inh_w) { if (m_inh_bank != 1) { - m_upperbank->set_bank(1); + m_upperbank.select(1); m_inh_bank = 1; } } @@ -293,7 +293,7 @@ WRITE_LINE_MEMBER(apple2_state::a2bus_inh_w) { if (m_inh_bank != 0) { - m_upperbank->set_bank(0); + m_upperbank.select(0); m_inh_bank = 0; } } @@ -307,7 +307,7 @@ WRITE_LINE_MEMBER(apple2_state::a2bus_inh_w) // if no slots are inhibiting, make sure ROM is fully switched in if ((m_inh_slot == -1) && (m_inh_bank != 0)) { - m_upperbank->set_bank(0); + m_upperbank.select(0); m_inh_bank = 0; } } @@ -325,7 +325,7 @@ void apple2_state::machine_start() m_speaker->level_w(m_speaker_state); m_cassette_state = 0; m_cassette->output(-1.0f); - m_upperbank->set_bank(0); + m_upperbank.select(0); m_inh_bank = 0; m_strobe = 0; m_transchar = 0; @@ -976,7 +976,9 @@ void apple2_state::apple2_map(address_map &map) map(0xc080, 0xc0ff).rw(FUNC(apple2_state::c080_r), FUNC(apple2_state::c080_w)); map(0xc100, 0xc7ff).rw(FUNC(apple2_state::c100_r), FUNC(apple2_state::c100_w)); map(0xc800, 0xcfff).rw(FUNC(apple2_state::c800_r), FUNC(apple2_state::c800_w)); - map(0xd000, 0xffff).m(m_upperbank, FUNC(address_map_bank_device::amap8)); + map(0xd000, 0xffff).view(m_upperbank); + m_upperbank[0](0xd000, 0xffff).rom().region("maincpu", 0x1000).w(FUNC(apple2_state::inh_w)); + m_upperbank[1](0xd000, 0xffff).rw(FUNC(apple2_state::inh_r), FUNC(apple2_state::inh_w)); } void apple2_state::inhbank_map(address_map &map) -- cgit v1.2.3