From f9bcdcbbc91a553cd5fa72996eeac84daacb99db Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 7 Jul 2019 17:14:51 +0200 Subject: via6522: Change most mappings into m() [O. Galibert] --- src/devices/bus/cbmiec/c1541.cpp | 12 ++++++------ src/devices/bus/cbmiec/c1571.cpp | 4 ++-- src/devices/bus/cbmiec/cmdhd.cpp | 6 +++--- src/devices/bus/cbmiec/fd2000.cpp | 4 ++-- src/devices/bus/cbmiec/interpod.cpp | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/devices/bus/cbmiec') diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 04fefe3f096..925014ac803 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -656,8 +656,8 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_t::write ) void c1541_base_t::c1541_mem(address_map &map) { map(0x0000, 0x07ff).mirror(0x6000).ram(); - map(0x1800, 0x180f).mirror(0x63f0).rw(M6522_0_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x1c00, 0x1c0f).mirror(0x63f0).rw(M6522_1_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x1800, 0x180f).mirror(0x63f0).m(M6522_0_TAG, FUNC(via6522_device::map)); + map(0x1c00, 0x1c0f).mirror(0x63f0).m(M6522_1_TAG, FUNC(via6522_device::map)); map(0x8000, 0xbfff).mirror(0x4000).rom().region(M6502_TAG, 0); } @@ -669,8 +669,8 @@ void c1541_base_t::c1541_mem(address_map &map) void c1541_base_t::c1541dd_mem(address_map &map) { map(0x0000, 0x07ff).mirror(0x6000).ram(); - map(0x1800, 0x180f).mirror(0x63f0).rw(M6522_0_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x1c00, 0x1c0f).mirror(0x63f0).rw(M6522_1_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x1800, 0x180f).mirror(0x63f0).m(M6522_0_TAG, FUNC(via6522_device::map)); + map(0x1c00, 0x1c0f).mirror(0x63f0).m(M6522_1_TAG, FUNC(via6522_device::map)); map(0x8000, 0x9fff).ram(); map(0xa000, 0xffff).rom().region(M6502_TAG, 0x2000); } @@ -683,8 +683,8 @@ void c1541_base_t::c1541dd_mem(address_map &map) void c1541_base_t::c1541pd_mem(address_map &map) { map(0x0000, 0x07ff).mirror(0x6000).ram(); - map(0x1800, 0x180f).mirror(0x63f0).rw(M6522_0_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); - map(0x1c00, 0x1c0f).mirror(0x63f0).rw(M6522_1_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x1800, 0x180f).mirror(0x63f0).m(M6522_0_TAG, FUNC(via6522_device::map)); + map(0x1c00, 0x1c0f).mirror(0x63f0).m(M6522_1_TAG, FUNC(via6522_device::map)); map(0x8000, 0x9fff).rom().region(M6502_TAG, 0x4000); map(0xa000, 0xbfff).ram(); map(0xc000, 0xffff).rom().region(M6502_TAG, 0x0000); diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index 568cd646fe7..0b4112ffd3e 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -147,7 +147,7 @@ const tiny_rom_entry *mini_chief_device::device_rom_region() const void c1571_device::c1571_mem(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x1800, 0x180f).mirror(0x03f0).rw(M6522_0_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x1800, 0x180f).mirror(0x03f0).m(M6522_0_TAG, FUNC(via6522_device::map)); map(0x1c00, 0x1c0f).mirror(0x03f0).rw(FUNC(c1571_device::via1_r), FUNC(c1571_device::via1_w)); map(0x2000, 0x2003).mirror(0x1ffc).rw(WD1770_TAG, FUNC(wd1770_device::read), FUNC(wd1770_device::write)); map(0x4000, 0x400f).mirror(0x3ff0).rw(M6526_TAG, FUNC(mos6526_device::read), FUNC(mos6526_device::write)); @@ -162,7 +162,7 @@ void c1571_device::c1571_mem(address_map &map) void mini_chief_device::mini_chief_mem(address_map &map) { map(0x0000, 0x07ff).ram(); - map(0x1800, 0x180f).mirror(0x03f0).rw(M6522_0_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x1800, 0x180f).mirror(0x03f0).m(M6522_0_TAG, FUNC(via6522_device::map)); map(0x1c00, 0x1c0f).mirror(0x03f0).rw(FUNC(mini_chief_device::via1_r), FUNC(mini_chief_device::via1_w)); map(0x2000, 0x2003).mirror(0x1ffc).rw(WD1770_TAG, FUNC(wd1770_device::read), FUNC(wd1770_device::write)); map(0x4000, 0x400f).mirror(0xff0).rw(M6526_TAG, FUNC(mos6526_device::read), FUNC(mos6526_device::write)); diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp index 13d8004445b..91d92bddc2a 100644 --- a/src/devices/bus/cbmiec/cmdhd.cpp +++ b/src/devices/bus/cbmiec/cmdhd.cpp @@ -60,12 +60,12 @@ const tiny_rom_entry *cmd_hd_device::device_rom_region() const void cmd_hd_device::mem_map(address_map &map) { map(0x0000, 0x7fff).ram(); - map(0x8000, 0xffff).rom().region(M6502_TAG, 0); - map(0x8000, 0x800f).mirror(0x1f0).w(M6522_1_TAG, FUNC(via6522_device::write)); - map(0x8400, 0x840f).mirror(0x1f0).w(M6522_2_TAG, FUNC(via6522_device::write)); + map(0x8000, 0x800f).mirror(0x1f0).m(M6522_1_TAG, FUNC(via6522_device::map)); + map(0x8400, 0x840f).mirror(0x1f0).m(M6522_2_TAG, FUNC(via6522_device::map)); map(0x8800, 0x8803).mirror(0x1fc).w(I8255A_TAG, FUNC(i8255_device::write)); map(0x8c00, 0x8c0f).mirror(0x1f0).w(RTC72421A_TAG, FUNC(rtc72421_device::write)); map(0x8f00, 0x8f00).mirror(0xff).w(FUNC(cmd_hd_device::led_w)); + map(0x8000, 0xffff).rom().region(M6502_TAG, 0); } diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index 002c9a64dc7..3136d991593 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -92,7 +92,7 @@ const tiny_rom_entry *fd4000_device::device_rom_region() const void fd2000_device::fd2000_mem(address_map &map) { map(0x0000, 0x3fff).ram(); - map(0x4000, 0x400f).mirror(0xbf0).rw(G65SC22P2_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x4000, 0x400f).mirror(0xbf0).m(G65SC22P2_TAG, FUNC(via6522_device::map)); map(0x4e00, 0x4e07).mirror(0x1f8).m(DP8473V_TAG, FUNC(dp8473_device::map)); map(0x5000, 0x7fff).ram(); map(0x8000, 0xffff).rom().region(G65SC02PI2_TAG, 0); @@ -106,7 +106,7 @@ void fd2000_device::fd2000_mem(address_map &map) void fd4000_device::fd4000_mem(address_map &map) { map(0x0000, 0x3fff).ram(); - map(0x4000, 0x400f).mirror(0xbf0).rw(G65SC22P2_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x4000, 0x400f).mirror(0xbf0).m(G65SC22P2_TAG, FUNC(via6522_device::map)); map(0x4e00, 0x4e07).mirror(0x1f8).m(PC8477AV1_TAG, FUNC(pc8477a_device::map)); map(0x5000, 0x7fff).ram(); map(0x8000, 0xffff).rom().region(R65C02P4_TAG, 0); diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp index ad2c7388476..aa70ca015cc 100644 --- a/src/devices/bus/cbmiec/interpod.cpp +++ b/src/devices/bus/cbmiec/interpod.cpp @@ -119,7 +119,7 @@ void interpod_t::interpod_mem(address_map &map) map(0x0400, 0x041f).mirror(0x3be0).m(R6532_TAG, FUNC(mos6532_new_device::io_map)); map(0x2000, 0x2001).mirror(0x9ffe).rw(MC6850_TAG, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); map(0x4000, 0x47ff).mirror(0xb800).rom().region(R6502_TAG, 0); - map(0x8000, 0x800f).mirror(0x5ff0).rw(R6522_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x8000, 0x800f).mirror(0x5ff0).m(R6522_TAG, FUNC(via6522_device::map)); } -- cgit v1.2.3-70-g09d2