diff options
author | 2018-03-13 07:36:43 +0100 | |
---|---|---|
committer | 2018-03-14 14:07:14 +0100 | |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/bitgraph.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/bitgraph.cpp')
-rw-r--r-- | src/mame/drivers/bitgraph.cpp | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index 274c95ce397..d4e87b632a2 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -170,40 +170,42 @@ private: uint8_t m_ppu[4]; }; -ADDRESS_MAP_START(bitgraph_state::bitgrapha_mem) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x007fff) AM_ROM - AM_RANGE(0x010000, 0x010001) AM_DEVREADWRITE8(ACIA0_TAG, acia6850_device, data_r, data_w, 0xff00) // HOST - AM_RANGE(0x010002, 0x010003) AM_DEVREADWRITE8(ACIA0_TAG, acia6850_device, status_r, control_w, 0xff00) - AM_RANGE(0x010008, 0x010009) AM_DEVREADWRITE8(ACIA1_TAG, acia6850_device, data_r, data_w, 0x00ff) // KEYBOARD - AM_RANGE(0x01000a, 0x01000b) AM_DEVREADWRITE8(ACIA1_TAG, acia6850_device, status_r, control_w, 0x00ff) - AM_RANGE(0x010010, 0x010011) AM_DEVREADWRITE8(ACIA2_TAG, acia6850_device, data_r, data_w, 0x00ff) // DEBUGGER - AM_RANGE(0x010012, 0x010013) AM_DEVREADWRITE8(ACIA2_TAG, acia6850_device, status_r, control_w, 0x00ff) - AM_RANGE(0x010018, 0x010019) AM_DEVREADWRITE8(ACIA3_TAG, acia6850_device, data_r, data_w, 0x00ff) // POINTER - AM_RANGE(0x01001a, 0x01001b) AM_DEVREADWRITE8(ACIA3_TAG, acia6850_device, status_r, control_w, 0x00ff) - AM_RANGE(0x010020, 0x010027) AM_READWRITE8(adlc_r, adlc_w, 0xff00) - AM_RANGE(0x010028, 0x01002f) AM_READWRITE8(pia_r, pia_w, 0xff00) // EAROM, PSG - AM_RANGE(0x010030, 0x010031) AM_WRITE(baud_write) - AM_RANGE(0x3e0000, 0x3fffff) AM_RAM -ADDRESS_MAP_END +void bitgraph_state::bitgrapha_mem(address_map &map) +{ + map.unmap_value_high(); + map(0x000000, 0x007fff).rom(); + map(0x010000, 0x010000).rw(m_acia0, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // HOST + map(0x010002, 0x010002).rw(m_acia0, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); + map(0x010009, 0x010009).rw(m_acia1, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // KEYBOARD + map(0x01000b, 0x01000b).rw(m_acia1, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); + map(0x010011, 0x010011).rw(m_acia2, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // DEBUGGER + map(0x010013, 0x010013).rw(m_acia2, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); + map(0x010019, 0x010019).rw(m_acia3, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // POINTER + map(0x01001b, 0x01001b).rw(m_acia3, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); + map(0x010020, 0x010027).rw(this, FUNC(bitgraph_state::adlc_r), FUNC(bitgraph_state::adlc_w)).umask16(0xff00); + map(0x010028, 0x01002f).rw(this, FUNC(bitgraph_state::pia_r), FUNC(bitgraph_state::pia_w)).umask16(0xff00); // EAROM, PSG + map(0x010030, 0x010031).w(this, FUNC(bitgraph_state::baud_write)); + map(0x3e0000, 0x3fffff).ram(); +} -ADDRESS_MAP_START(bitgraph_state::bitgraphb_mem) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x007fff) AM_ROM - AM_RANGE(0x010000, 0x010001) AM_DEVREADWRITE8(ACIA0_TAG, acia6850_device, data_r, data_w, 0xff00) // HOST - AM_RANGE(0x010002, 0x010003) AM_DEVREADWRITE8(ACIA0_TAG, acia6850_device, status_r, control_w, 0xff00) - AM_RANGE(0x010008, 0x010009) AM_DEVREADWRITE8(ACIA1_TAG, acia6850_device, data_r, data_w, 0x00ff) // KEYBOARD - AM_RANGE(0x01000a, 0x01000b) AM_DEVREADWRITE8(ACIA1_TAG, acia6850_device, status_r, control_w, 0x00ff) - AM_RANGE(0x010010, 0x010011) AM_DEVREADWRITE8(ACIA2_TAG, acia6850_device, data_r, data_w, 0x00ff) // DEBUGGER - AM_RANGE(0x010012, 0x010013) AM_DEVREADWRITE8(ACIA2_TAG, acia6850_device, status_r, control_w, 0x00ff) - AM_RANGE(0x01001a, 0x01001b) AM_WRITE8(misccr_write, 0x00ff) - AM_RANGE(0x010020, 0x010027) AM_READWRITE8(adlc_r, adlc_w, 0xff00) - AM_RANGE(0x010028, 0x01002f) AM_READWRITE8(pia_r, pia_w, 0xff00) // EAROM, PSG - AM_RANGE(0x010030, 0x010031) AM_WRITE(baud_write) +void bitgraph_state::bitgraphb_mem(address_map &map) +{ + map.unmap_value_high(); + map(0x000000, 0x007fff).rom(); + map(0x010000, 0x010000).rw(m_acia0, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // HOST + map(0x010002, 0x010002).rw(m_acia0, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); + map(0x010009, 0x010009).rw(m_acia1, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // KEYBOARD + map(0x01000b, 0x01000b).rw(m_acia1, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); + map(0x010011, 0x010011).rw(m_acia2, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w)); // DEBUGGER + map(0x010013, 0x010013).rw(m_acia2, FUNC(acia6850_device::status_r), FUNC(acia6850_device::control_w)); + map(0x01001b, 0x01001b).w(this, FUNC(bitgraph_state::misccr_write)); + map(0x010020, 0x010027).rw(this, FUNC(bitgraph_state::adlc_r), FUNC(bitgraph_state::adlc_w)).umask16(0xff00); + map(0x010028, 0x01002f).rw(this, FUNC(bitgraph_state::pia_r), FUNC(bitgraph_state::pia_w)).umask16(0xff00); // EAROM, PSG + map(0x010030, 0x010031).w(this, FUNC(bitgraph_state::baud_write)); // AM_RANGE(0x010030, 0x010037) AM_READ8(ppu_read, 0x00ff) - AM_RANGE(0x010038, 0x01003f) AM_WRITE8(ppu_write, 0x00ff) - AM_RANGE(0x380000, 0x3fffff) AM_RAM -ADDRESS_MAP_END + map(0x010038, 0x01003f).w(this, FUNC(bitgraph_state::ppu_write)).umask16(0x00ff); + map(0x380000, 0x3fffff).ram(); +} static INPUT_PORTS_START(bitgraph) INPUT_PORTS_END |