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/abc80x.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/abc80x.cpp')
-rw-r--r-- | src/mame/drivers/abc80x.cpp | 147 |
1 files changed, 76 insertions, 71 deletions
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index 307bef397c6..1b9a6060945 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -429,13 +429,14 @@ WRITE8_MEMBER( abc806_state::mao_w ) // ADDRESS_MAP( abc800c_mem ) //------------------------------------------------- -ADDRESS_MAP_START(abc800c_state::abc800c_mem) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("video_ram") - AM_RANGE(0x4000, 0x7bff) AM_ROM - AM_RANGE(0x7c00, 0x7fff) AM_RAM AM_SHARE("char_ram") - AM_RANGE(0x8000, 0xffff) AM_RAM -ADDRESS_MAP_END +void abc800c_state::abc800c_mem(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0x3fff).ram().share("video_ram"); + map(0x4000, 0x7bff).rom(); + map(0x7c00, 0x7fff).ram().share("char_ram"); + map(0x8000, 0xffff).ram(); +} //------------------------------------------------- @@ -489,88 +490,92 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc802_mem ) //------------------------------------------------- -ADDRESS_MAP_START(abc802_state::abc802_mem) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x77ff) AM_ROM - AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("char_ram") - AM_RANGE(0x8000, 0xffff) AM_RAM -ADDRESS_MAP_END +void abc802_state::abc802_mem(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0x77ff).rom(); + map(0x7800, 0x7fff).ram().share("char_ram"); + map(0x8000, 0xffff).ram(); +} //------------------------------------------------- // ADDRESS_MAP( abc802_io ) //------------------------------------------------- -ADDRESS_MAP_START(abc802_state::abc802_io) - ADDRESS_MAP_UNMAP_HIGH - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w) - AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, stat_r, cs_w) - AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c1_w) - AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c2_w) - AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c3_w) - AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c4_w) - AM_RANGE(0x05, 0x05) AM_MIRROR(0x08) AM_READ(pling_r) - AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_device, rst_r) - AM_RANGE(0x20, 0x23) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_device, ba_cd_r, ba_cd_w) - AM_RANGE(0x31, 0x31) AM_MIRROR(0x06) AM_DEVREAD(MC6845_TAG, mc6845_device, register_r) - AM_RANGE(0x38, 0x38) AM_MIRROR(0x06) AM_DEVWRITE(MC6845_TAG, mc6845_device, address_w) - AM_RANGE(0x39, 0x39) AM_MIRROR(0x06) AM_DEVWRITE(MC6845_TAG, mc6845_device, register_w) - AM_RANGE(0x40, 0x43) AM_MIRROR(0x1c) AM_DEVREADWRITE(Z80SIO_TAG, z80sio2_device, ba_cd_r, ba_cd_w) - AM_RANGE(0x60, 0x63) AM_MIRROR(0x1c) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write) -ADDRESS_MAP_END +void abc802_state::abc802_io(address_map &map) +{ + map.unmap_value_high(); + map.global_mask(0xff); + map(0x00, 0x00).mirror(0x18).rw(ABCBUS_TAG, FUNC(abcbus_slot_device::inp_r), FUNC(abcbus_slot_device::out_w)); + map(0x01, 0x01).mirror(0x18).rw(ABCBUS_TAG, FUNC(abcbus_slot_device::stat_r), FUNC(abcbus_slot_device::cs_w)); + map(0x02, 0x02).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c1_w)); + map(0x03, 0x03).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c2_w)); + map(0x04, 0x04).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c3_w)); + map(0x05, 0x05).mirror(0x18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c4_w)); + map(0x05, 0x05).mirror(0x08).r(this, FUNC(abc802_state::pling_r)); + map(0x07, 0x07).mirror(0x18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)); + map(0x20, 0x23).mirror(0x0c).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); + map(0x31, 0x31).mirror(0x06).r(m_crtc, FUNC(mc6845_device::register_r)); + map(0x38, 0x38).mirror(0x06).w(m_crtc, FUNC(mc6845_device::address_w)); + map(0x39, 0x39).mirror(0x06).w(m_crtc, FUNC(mc6845_device::register_w)); + map(0x40, 0x43).mirror(0x1c).rw(m_sio, FUNC(z80sio2_device::ba_cd_r), FUNC(z80sio2_device::ba_cd_w)); + map(0x60, 0x63).mirror(0x1c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); +} //------------------------------------------------- // ADDRESS_MAP( abc806_mem ) //------------------------------------------------- -ADDRESS_MAP_START(abc806_state::abc806_mem) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x0fff) AM_RAMBANK("bank1") - AM_RANGE(0x1000, 0x1fff) AM_RAMBANK("bank2") - AM_RANGE(0x2000, 0x2fff) AM_RAMBANK("bank3") - AM_RANGE(0x3000, 0x3fff) AM_RAMBANK("bank4") - AM_RANGE(0x4000, 0x4fff) AM_RAMBANK("bank5") - AM_RANGE(0x5000, 0x5fff) AM_RAMBANK("bank6") - AM_RANGE(0x6000, 0x6fff) AM_RAMBANK("bank7") - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank8") - AM_RANGE(0x8000, 0x8fff) AM_RAMBANK("bank9") - AM_RANGE(0x9000, 0x9fff) AM_RAMBANK("bank10") - AM_RANGE(0xa000, 0xafff) AM_RAMBANK("bank11") - AM_RANGE(0xb000, 0xbfff) AM_RAMBANK("bank12") - AM_RANGE(0xc000, 0xcfff) AM_RAMBANK("bank13") - AM_RANGE(0xd000, 0xdfff) AM_RAMBANK("bank14") - AM_RANGE(0xe000, 0xefff) AM_RAMBANK("bank15") - AM_RANGE(0xf000, 0xffff) AM_RAMBANK("bank16") -ADDRESS_MAP_END +void abc806_state::abc806_mem(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0x0fff).bankrw("bank1"); + map(0x1000, 0x1fff).bankrw("bank2"); + map(0x2000, 0x2fff).bankrw("bank3"); + map(0x3000, 0x3fff).bankrw("bank4"); + map(0x4000, 0x4fff).bankrw("bank5"); + map(0x5000, 0x5fff).bankrw("bank6"); + map(0x6000, 0x6fff).bankrw("bank7"); + map(0x7000, 0x7fff).bankrw("bank8"); + map(0x8000, 0x8fff).bankrw("bank9"); + map(0x9000, 0x9fff).bankrw("bank10"); + map(0xa000, 0xafff).bankrw("bank11"); + map(0xb000, 0xbfff).bankrw("bank12"); + map(0xc000, 0xcfff).bankrw("bank13"); + map(0xd000, 0xdfff).bankrw("bank14"); + map(0xe000, 0xefff).bankrw("bank15"); + map(0xf000, 0xffff).bankrw("bank16"); +} //------------------------------------------------- // ADDRESS_MAP( abc806_io ) //------------------------------------------------- -ADDRESS_MAP_START(abc806_state::abc806_io) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00, 0x00) AM_MIRROR(0xff18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w) - AM_RANGE(0x01, 0x01) AM_MIRROR(0xff18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, stat_r, cs_w) - AM_RANGE(0x02, 0x02) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c1_w) - AM_RANGE(0x03, 0x03) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c2_w) - AM_RANGE(0x04, 0x04) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c3_w) - AM_RANGE(0x05, 0x05) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c4_w) - AM_RANGE(0x06, 0x06) AM_MIRROR(0xff18) AM_WRITE(hrs_w) - AM_RANGE(0x07, 0x07) AM_MIRROR(0xff18) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_device, rst_r) AM_WRITE(hrc_w) - AM_RANGE(0x20, 0x23) AM_MIRROR(0xff0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_device, ba_cd_r, ba_cd_w) - AM_RANGE(0x31, 0x31) AM_MIRROR(0xff00) AM_DEVREAD(MC6845_TAG, mc6845_device, register_r) - AM_RANGE(0x34, 0x34) AM_SELECT(0xff00) AM_READWRITE(mai_r, mao_w) - AM_RANGE(0x35, 0x35) AM_MIRROR(0xff00) AM_READWRITE(ami_r, amo_w) - AM_RANGE(0x36, 0x36) AM_MIRROR(0xff00) AM_READWRITE(sti_r, sto_w) - AM_RANGE(0x37, 0x37) AM_SELECT(0xff00) AM_READWRITE(cli_r, sso_w) - AM_RANGE(0x38, 0x38) AM_MIRROR(0xff00) AM_DEVWRITE(MC6845_TAG, mc6845_device, address_w) - AM_RANGE(0x39, 0x39) AM_MIRROR(0xff00) AM_DEVWRITE(MC6845_TAG, mc6845_device, register_w) - AM_RANGE(0x40, 0x43) AM_MIRROR(0xff1c) AM_DEVREADWRITE(Z80SIO_TAG, z80sio2_device, ba_cd_r, ba_cd_w) - AM_RANGE(0x60, 0x63) AM_MIRROR(0xff1c) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write) -ADDRESS_MAP_END +void abc806_state::abc806_io(address_map &map) +{ + map.unmap_value_high(); + map(0x00, 0x00).mirror(0xff18).rw(ABCBUS_TAG, FUNC(abcbus_slot_device::inp_r), FUNC(abcbus_slot_device::out_w)); + map(0x01, 0x01).mirror(0xff18).rw(ABCBUS_TAG, FUNC(abcbus_slot_device::stat_r), FUNC(abcbus_slot_device::cs_w)); + map(0x02, 0x02).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c1_w)); + map(0x03, 0x03).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c2_w)); + map(0x04, 0x04).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c3_w)); + map(0x05, 0x05).mirror(0xff18).w(ABCBUS_TAG, FUNC(abcbus_slot_device::c4_w)); + map(0x06, 0x06).mirror(0xff18).w(this, FUNC(abc806_state::hrs_w)); + map(0x07, 0x07).mirror(0xff18).r(ABCBUS_TAG, FUNC(abcbus_slot_device::rst_r)).w(this, FUNC(abc806_state::hrc_w)); + map(0x20, 0x23).mirror(0xff0c).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w)); + map(0x31, 0x31).mirror(0xff00).r(m_crtc, FUNC(mc6845_device::register_r)); + map(0x34, 0x34).select(0xff00).rw(this, FUNC(abc806_state::mai_r), FUNC(abc806_state::mao_w)); + map(0x35, 0x35).mirror(0xff00).rw(this, FUNC(abc806_state::ami_r), FUNC(abc806_state::amo_w)); + map(0x36, 0x36).mirror(0xff00).rw(this, FUNC(abc806_state::sti_r), FUNC(abc806_state::sto_w)); + map(0x37, 0x37).select(0xff00).rw(this, FUNC(abc806_state::cli_r), FUNC(abc806_state::sso_w)); + map(0x38, 0x38).mirror(0xff00).w(m_crtc, FUNC(mc6845_device::address_w)); + map(0x39, 0x39).mirror(0xff00).w(m_crtc, FUNC(mc6845_device::register_w)); + map(0x40, 0x43).mirror(0xff1c).rw(m_sio, FUNC(z80sio2_device::ba_cd_r), FUNC(z80sio2_device::ba_cd_w)); + map(0x60, 0x63).mirror(0xff1c).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); +} |