summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Olivier Galibert <galibert@pobox.com>2019-07-07 17:14:51 +0200
committerGravatarGravatar Olivier Galibert <galibert@pobox.com>2019-07-07 17:15:17 +0200
commitf9bcdcbbc91a553cd5fa72996eeac84daacb99db (patch) (github)
tree4bca22c7bfc9c2a6927d1b2156f0af953e4c144b
parent4bfe2c29315d664f1cf433cdee4a8a45d911c1da (diff)
downloadmame-f9bcdcbbc91a553cd5fa72996eeac84daacb99db.tar.bz2
mame-f9bcdcbbc91a553cd5fa72996eeac84daacb99db.zip
via6522: Change most mappings into m() [O. Galibert]
-rw-r--r--3rdparty/asio/include/asio/detail/config.hpp2
-rw-r--r--src/devices/bus/acorn/cms/4080term.cpp2
-rw-r--r--src/devices/bus/acorn/system/vib.cpp3
-rw-r--r--src/devices/bus/bbc/tube/tube_casper.cpp2
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp12
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp4
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp6
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp4
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp2
-rw-r--r--src/devices/bus/econet/e01.cpp2
-rw-r--r--src/devices/bus/ieee488/c2031.cpp4
-rw-r--r--src/devices/bus/ieee488/d9060.cpp2
-rw-r--r--src/devices/machine/6522via.h44
-rw-r--r--src/mame/drivers/accomm.cpp2
-rw-r--r--src/mame/drivers/aci_ggm.cpp2
-rw-r--r--src/mame/drivers/acrnsys.cpp4
-rw-r--r--src/mame/drivers/aim65.cpp4
-rw-r--r--src/mame/drivers/aim65_40.cpp6
-rw-r--r--src/mame/drivers/applix.cpp2
-rw-r--r--src/mame/drivers/aristmk4.cpp4
-rw-r--r--src/mame/drivers/atarisy1.cpp2
-rw-r--r--src/mame/drivers/atom.cpp6
-rw-r--r--src/mame/drivers/ave_arb.cpp4
-rw-r--r--src/mame/drivers/bbc.cpp16
-rw-r--r--src/mame/drivers/beezer.cpp4
-rw-r--r--src/mame/drivers/bmcbowl.cpp2
-rw-r--r--src/mame/drivers/chexx.cpp4
-rw-r--r--src/mame/drivers/clcd.cpp4
-rw-r--r--src/mame/drivers/cms.cpp2
-rw-r--r--src/mame/drivers/cops.cpp8
-rw-r--r--src/mame/drivers/ec65.cpp4
-rw-r--r--src/mame/drivers/emma2.cpp2
-rw-r--r--src/mame/drivers/enmirage.cpp2
-rw-r--r--src/mame/drivers/epic14e.cpp2
-rw-r--r--src/mame/drivers/esprit.cpp2
-rw-r--r--src/mame/drivers/gameplan.cpp6
-rw-r--r--src/mame/drivers/goupil.cpp12
-rw-r--r--src/mame/drivers/gts3.cpp4
-rw-r--r--src/mame/drivers/gts3a.cpp4
-rw-r--r--src/mame/drivers/itech32.cpp2
-rw-r--r--src/mame/drivers/itech8.cpp2
-rw-r--r--src/mame/drivers/jr100.cpp2
-rw-r--r--src/mame/drivers/jvh.cpp2
-rw-r--r--src/mame/drivers/lwriter.cpp2
-rw-r--r--src/mame/drivers/microtan.cpp4
-rw-r--r--src/mame/drivers/nsg6809.cpp2
-rw-r--r--src/mame/drivers/oric.cpp6
-rw-r--r--src/mame/drivers/pntnpuzl.cpp2
-rw-r--r--src/mame/drivers/prodigy.cpp2
-rw-r--r--src/mame/drivers/rmnimbus.cpp2
-rw-r--r--src/mame/drivers/shine.cpp4
-rw-r--r--src/mame/drivers/ssystem3.cpp2
-rw-r--r--src/mame/drivers/swtpc09.cpp2
-rw-r--r--src/mame/drivers/sym1.cpp6
-rw-r--r--src/mame/drivers/textelcomp.cpp8
-rw-r--r--src/mame/drivers/trvquest.cpp6
-rw-r--r--src/mame/drivers/tv950.cpp2
-rw-r--r--src/mame/drivers/victor9k.cpp6
58 files changed, 134 insertions, 133 deletions
diff --git a/3rdparty/asio/include/asio/detail/config.hpp b/3rdparty/asio/include/asio/detail/config.hpp
index 64a80abdb3a..0c651bed71d 100644
--- a/3rdparty/asio/include/asio/detail/config.hpp
+++ b/3rdparty/asio/include/asio/detail/config.hpp
@@ -709,7 +709,7 @@
# if defined(__clang__)
# if (__cplusplus >= 201103)
# ifdef _LIBCPP_VERSION
-# if _LIBCPP_VERSION >= 9000
+# if _LIBCPP_VERSION >= 8000
# define ASIO_HAS_STD_STRING_VIEW 1
# endif
# endif
diff --git a/src/devices/bus/acorn/cms/4080term.cpp b/src/devices/bus/acorn/cms/4080term.cpp
index 7bb64493481..629b4915fdd 100644
--- a/src/devices/bus/acorn/cms/4080term.cpp
+++ b/src/devices/bus/acorn/cms/4080term.cpp
@@ -148,7 +148,7 @@ void cms_4080term_device::device_start()
address_space &space = m_bus->memspace();
space.install_readwrite_handler(0xfd20, 0xfd2f, read8sm_delegate(FUNC(ef9345_device::data_r), m_ef9345.target()), write8sm_delegate(FUNC(ef9345_device::data_w), m_ef9345.target()));
- space.install_readwrite_handler(0xfd30, 0xfd3f, read8sm_delegate(FUNC(via6522_device::read), m_via.target()), write8sm_delegate(FUNC(via6522_device::write), m_via.target()));
+ space.install_device(0xfd30, 0xfd3f, *m_via, &via6522_device::map);
space.install_readwrite_handler(0xfd40, 0xfd4f, read8sm_delegate(FUNC(mos6551_device::read), m_acia.target()), write8sm_delegate(FUNC(mos6551_device::write), m_acia.target()));
uint8_t *FNT = memregion("ef9345")->base();
diff --git a/src/devices/bus/acorn/system/vib.cpp b/src/devices/bus/acorn/system/vib.cpp
index e392225f1e0..48e08bd4088 100644
--- a/src/devices/bus/acorn/system/vib.cpp
+++ b/src/devices/bus/acorn/system/vib.cpp
@@ -95,7 +95,8 @@ void acorn_vib_device::device_reset()
{
address_space &space = m_bus->memspace();
- space.install_readwrite_handler(0x0c00, 0x0c0f, 0, 0x10, 0, read8sm_delegate(FUNC(via6522_device::read), m_via6522.target()), write8sm_delegate(FUNC(via6522_device::write), m_via6522.target()));
+ space.install_device(0x0c00, 0x0c0f, *m_via6522, &via6522_device::map);
+ space.install_device(0x0c10, 0x0c1f, *m_via6522, &via6522_device::map);
space.install_readwrite_handler(0x0c20, 0x0c21, 0, 0x1e, 0, read8sm_delegate(FUNC(acia6850_device::read), m_acia.target()), write8sm_delegate(FUNC(acia6850_device::write), m_acia.target()));
space.install_readwrite_handler(0x0c40, 0x0c43, 0, 0x1c, 0, read8sm_delegate(FUNC(i8255_device::read), m_ppi8255.target()), write8sm_delegate(FUNC(i8255_device::write), m_ppi8255.target()));
}
diff --git a/src/devices/bus/bbc/tube/tube_casper.cpp b/src/devices/bus/bbc/tube/tube_casper.cpp
index f6bb4bdce84..c01f80487e2 100644
--- a/src/devices/bus/bbc/tube/tube_casper.cpp
+++ b/src/devices/bus/bbc/tube/tube_casper.cpp
@@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(BBC_TUBE_CASPER, bbc_tube_casper_device, "bbc_tube_casper", "
void bbc_tube_casper_device::tube_casper_mem(address_map &map)
{
map(0x00000, 0x03fff).rom().region("casper_rom", 0);
- map(0x10000, 0x1001f).rw("via6522_1", FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0x00ff);
+ map(0x10000, 0x1001f).m("via6522_1", FUNC(via6522_device::map)).umask16(0x00ff);
map(0x20000, 0x3ffff).ram();
}
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));
}
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index fca4c189033..ffb29dbe53e 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -222,7 +222,7 @@ void econet_e01_device::e01_mem(address_map &map)
map(0xfc04, 0xfc04).mirror(0x00c3).rw(FUNC(econet_e01_device::rtc_data_r), FUNC(econet_e01_device::rtc_data_w));
map(0xfc08, 0xfc08).mirror(0x00c0).r(FUNC(econet_e01_device::ram_select_r)).w(FUNC(econet_e01_device::floppy_w));
map(0xfc0c, 0xfc0f).mirror(0x00c0).rw(WD2793_TAG, FUNC(wd2793_device::read), FUNC(wd2793_device::write));
- map(0xfc10, 0xfc1f).mirror(0x00c0).rw(R6522_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xfc10, 0xfc1f).mirror(0x00c0).m(R6522_TAG, FUNC(via6522_device::map));
map(0xfc20, 0xfc23).mirror(0x00c0).rw(MC6854_TAG, FUNC(mc6854_device::read), FUNC(mc6854_device::write));
map(0xfc24, 0xfc24).mirror(0x00c3).rw(FUNC(econet_e01_device::network_irq_disable_r), FUNC(econet_e01_device::network_irq_disable_w));
map(0xfc28, 0xfc28).mirror(0x00c3).rw(FUNC(econet_e01_device::network_irq_enable_r), FUNC(econet_e01_device::network_irq_enable_w));
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index e80c25ff1eb..fe488bde1f4 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -64,8 +64,8 @@ const tiny_rom_entry *c2031_device::device_rom_region() const
void c2031_device::c2031_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);
}
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 0005220c1e3..58a34acae64 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -123,7 +123,7 @@ void d9060_device_base::hdc_mem(address_map &map)
{
map.global_mask(0x1fff);
map(0x0000, 0x007f).mirror(0x300).ram();
- map(0x0080, 0x008f).mirror(0x370).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x0080, 0x008f).mirror(0x370).m(m_via, FUNC(via6522_device::map));
map(0x0400, 0x07ff).ram().share("share1");
map(0x0800, 0x0bff).ram().share("share2");
map(0x0c00, 0x0fff).ram().share("share3");
diff --git a/src/devices/machine/6522via.h b/src/devices/machine/6522via.h
index 4727b51435f..c79f0fa5903 100644
--- a/src/devices/machine/6522via.h
+++ b/src/devices/machine/6522via.h
@@ -64,34 +64,34 @@ public:
auto cb2_handler() { return m_cb2_handler.bind(); }
auto irq_handler() { return m_irq_handler.bind(); }
- virtual void map(address_map &map);
+ void map(address_map &map);
u8 read(offs_t offset);
void write(offs_t offset, u8 data);
- DECLARE_WRITE_LINE_MEMBER( write_pa0 ) { set_pa_line(0, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pa1 ) { set_pa_line(1, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pa2 ) { set_pa_line(2, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pa3 ) { set_pa_line(3, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pa4 ) { set_pa_line(4, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pa5 ) { set_pa_line(5, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pa6 ) { set_pa_line(6, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pa7 ) { set_pa_line(7, state); }
+ void write_pa0(int state) { set_pa_line(0, state); }
+ void write_pa1(int state) { set_pa_line(1, state); }
+ void write_pa2(int state) { set_pa_line(2, state); }
+ void write_pa3(int state) { set_pa_line(3, state); }
+ void write_pa4(int state) { set_pa_line(4, state); }
+ void write_pa5(int state) { set_pa_line(5, state); }
+ void write_pa6(int state) { set_pa_line(6, state); }
+ void write_pa7(int state) { set_pa_line(7, state); }
void write_pa( u8 data );
- DECLARE_WRITE_LINE_MEMBER( write_ca1 );
- DECLARE_WRITE_LINE_MEMBER( write_ca2 );
-
- DECLARE_WRITE_LINE_MEMBER( write_pb0 ) { set_pb_line(0, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pb1 ) { set_pb_line(1, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pb2 ) { set_pb_line(2, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pb3 ) { set_pb_line(3, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pb4 ) { set_pb_line(4, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pb5 ) { set_pb_line(5, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pb6 ) { set_pb_line(6, state); }
- DECLARE_WRITE_LINE_MEMBER( write_pb7 ) { set_pb_line(7, state); }
+ void write_ca1(int state);
+ void write_ca2(int state);
+
+ void write_pb0(int state) { set_pb_line(0, state); }
+ void write_pb1(int state) { set_pb_line(1, state); }
+ void write_pb2(int state) { set_pb_line(2, state); }
+ void write_pb3(int state) { set_pb_line(3, state); }
+ void write_pb4(int state) { set_pb_line(4, state); }
+ void write_pb5(int state) { set_pb_line(5, state); }
+ void write_pb6(int state) { set_pb_line(6, state); }
+ void write_pb7(int state) { set_pb_line(7, state); }
void write_pb( u8 data );
- DECLARE_WRITE_LINE_MEMBER( write_cb1 );
- DECLARE_WRITE_LINE_MEMBER( write_cb2 );
+ void write_cb1(int state);
+ void write_cb2(int state);
protected:
// device-level overrides
diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp
index a2d2f1e2f79..37ed8a7c919 100644
--- a/src/mame/drivers/accomm.cpp
+++ b/src/mame/drivers/accomm.cpp
@@ -626,7 +626,7 @@ void accomm_state::main_map(address_map &map)
map(0x200000, 0x3fffff).noprw(); /* External expansion RAM */
map(0x400000, 0x400000).noprw(); /* MODEM */
map(0x410000, 0x410000).ram(); /* Econet ID */
- map(0x420000, 0x42000f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* 6522 VIA (printer etc) */
+ map(0x420000, 0x42000f).m(m_via, FUNC(via6522_device::map)); /* 6522 VIA (printer etc) */
map(0x430000, 0x430001).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); /* 2641 ACIA (RS423) */
map(0x440000, 0x44ffff).w(FUNC(accomm_state::ch00switch_w)); /* CH00SWITCH */
map(0x450000, 0x457fff).ram().share("vram"); /* Video RAM */
diff --git a/src/mame/drivers/aci_ggm.cpp b/src/mame/drivers/aci_ggm.cpp
index 0bb68a6d5c2..d8e70940952 100644
--- a/src/mame/drivers/aci_ggm.cpp
+++ b/src/mame/drivers/aci_ggm.cpp
@@ -252,7 +252,7 @@ void ggm_state::main_map(address_map &map)
// external slot has potential bus conflict with RAM/VIA
map(0x0000, 0x7fff).mirror(0x8000).r(FUNC(ggm_state::cartridge_r));
map(0x0000, 0x07ff).ram().share("nvram");
- map(0x8000, 0x800f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x8000, 0x800f).m(m_via, FUNC(via6522_device::map));
}
diff --git a/src/mame/drivers/acrnsys.cpp b/src/mame/drivers/acrnsys.cpp
index 2eaa8aca2eb..777aa6c0b0b 100644
--- a/src/mame/drivers/acrnsys.cpp
+++ b/src/mame/drivers/acrnsys.cpp
@@ -131,7 +131,7 @@ void acrnsys_state::a6809_mem(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x03ff).ram();
- map(0x0900, 0x090f).mirror(0xf0).rw(m_via6522, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x0900, 0x090f).mirror(0xf0).m(m_via6522, FUNC(via6522_device::map));
map(0xf800, 0xffff).rom().region("maincpu", 0);
}
@@ -139,7 +139,7 @@ void acrnsys_state::a6502a_mem(address_map &map)
{
map.unmap_value_low();
map(0x0000, 0x07ff).ram();
- map(0x0e00, 0x0e0f).mirror(0x1f0).rw(m_via6522, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x0e00, 0x0e0f).mirror(0x1f0).m(m_via6522, FUNC(via6522_device::map));
map(0xe000, 0xffff).rom().region("maincpu", 0);
}
diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp
index 4efb9c5f9c1..04f0357cd2c 100644
--- a/src/mame/drivers/aim65.cpp
+++ b/src/mame/drivers/aim65.cpp
@@ -41,11 +41,11 @@ void aim65_state::mem_map(address_map &map)
map(0x1000, 0x3fff).noprw(); /* User available expansions */
map(0x4000, 0x7fff).rom(); /* 4 ROM sockets in 16K PROM/ROM module */
map(0x8000, 0x9fff).noprw(); /* User available expansions */
- map(0xa000, 0xa00f).mirror(0x3f0).rw(m_via1, FUNC(via6522_device::read), FUNC(via6522_device::write)); // user via
+ map(0xa000, 0xa00f).mirror(0x3f0).m(m_via1, FUNC(via6522_device::map)); // user via
map(0xa400, 0xa47f).m(m_riot, FUNC(mos6532_new_device::ram_map));
map(0xa480, 0xa497).m(m_riot, FUNC(mos6532_new_device::io_map));
map(0xa498, 0xa7ff).noprw(); /* Not available */
- map(0xa800, 0xa80f).mirror(0x3f0).rw(m_via0, FUNC(via6522_device::read), FUNC(via6522_device::write)); // system via
+ map(0xa800, 0xa80f).mirror(0x3f0).m(m_via0, FUNC(via6522_device::map)); // system via
map(0xac00, 0xac03).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0xac04, 0xac43).ram(); /* PIA RAM */
map(0xac44, 0xafff).noprw(); /* Not available */
diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp
index e4f05c5d97c..92c3c103a88 100644
--- a/src/mame/drivers/aim65_40.cpp
+++ b/src/mame/drivers/aim65_40.cpp
@@ -106,9 +106,9 @@ void aim65_40_state::mem_map(address_map &map)
map(0x0000, 0x3fff).ram();
map(0xa000, 0xcfff).rom().region("roms", 0);
map(0xf000, 0xffff).rom().region("roms", 0x3000);
- map(0xffa0, 0xffaf).rw(M6522_0_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0xffb0, 0xffbf).rw(M6522_1_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0xffc0, 0xffcf).rw(M6522_2_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xffa0, 0xffaf).m(M6522_0_TAG, FUNC(via6522_device::map));
+ map(0xffb0, 0xffbf).m(M6522_1_TAG, FUNC(via6522_device::map));
+ map(0xffc0, 0xffcf).m(M6522_2_TAG, FUNC(via6522_device::map));
map(0xffd0, 0xffd3).rw(M6551_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
}
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index b05d1abe1d2..bd6cfe83eef 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -469,7 +469,7 @@ void applix_state::applix_mem(address_map &map)
map(0x600180, 0x6001ff).w(FUNC(applix_state::analog_latch_w));
map(0x700000, 0x700007).mirror(0x78).rw("scc", FUNC(scc8530_device::ab_dc_r), FUNC(scc8530_device::ab_dc_w)).umask16(0xff00).cswidth(16);
map(0x700080, 0x7000ff).r(FUNC(applix_state::applix_inputs_r));
- map(0x700100, 0x70011f).mirror(0x60).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0xff00).cswidth(16);
+ map(0x700100, 0x70011f).mirror(0x60).m(m_via, FUNC(via6522_device::map)).umask16(0xff00).cswidth(16);
map(0x700180, 0x700180).mirror(0x7c).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w)).cswidth(16);
map(0x700182, 0x700182).mirror(0x7c).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w)).cswidth(16);
map(0xffffc0, 0xffffc1).rw(FUNC(applix_state::fdc_data_r), FUNC(applix_state::fdc_data_w));
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index d7215a0d620..434531d1d29 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -1043,7 +1043,7 @@ void aristmk4_state::slots_mem(address_map &map)
map(0x500d, 0x500d).portr("500d");
map(0x500e, 0x500e).portr("500e");
map(0x500f, 0x500f).portr("500f");
- map(0x5010, 0x501f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x5010, 0x501f).m("via6522_0", FUNC(via6522_device::map));
map(0x5200, 0x5200).r(FUNC(aristmk4_state::cashcade_r));
map(0x5201, 0x5201).portr("5201");
map(0x52c0, 0x52c0).r(FUNC(aristmk4_state::bv_p0));
@@ -1087,7 +1087,7 @@ void aristmk4_state::poker_mem(address_map &map)
map(0x500d, 0x500d).portr("500d");
map(0x500e, 0x500e).portr("500e");
map(0x500f, 0x500f).portr("500f");
- map(0x5010, 0x501f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x5010, 0x501f).m("via6522_0", FUNC(via6522_device::map));
map(0x5200, 0x5200).r(FUNC(aristmk4_state::cashcade_r));
map(0x5201, 0x5201).portr("5201");
map(0x52c0, 0x52c0).r(FUNC(aristmk4_state::bv_p0));
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp
index 7c9b8fbff0b..07cf5d0abc9 100644
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@@ -463,7 +463,7 @@ void atarisy1_state::main_map(address_map &map)
void atarisy1_state::sound_map(address_map &map)
{
map(0x0000, 0x0fff).ram();
- map(0x1000, 0x100f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x1000, 0x100f).m("via6522_0", FUNC(via6522_device::map));
map(0x1800, 0x1801).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0x1810, 0x1810).rw(m_soundcomm, FUNC(atari_sound_comm_device::sound_command_r), FUNC(atari_sound_comm_device::sound_response_w));
map(0x1820, 0x1820).r(FUNC(atarisy1_state::switch_6502_r));
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index b223762feb8..b07c5aa858b 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -260,7 +260,7 @@ void atom_state::atom_mem(address_map &map)
map(0xb000, 0xb003).mirror(0x3fc).rw(INS8255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
// map(0xb400, 0xb403) AM_DEVREADWRITE(MC6854_TAG, mc6854_device, read, write)
// map(0xb404, 0xb404) AM_READ_PORT("ECONET")
- map(0xb800, 0xb80f).mirror(0x3f0).rw(R6522_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xb800, 0xb80f).mirror(0x3f0).m(R6522_TAG, FUNC(via6522_device::map));
map(0xc000, 0xffff).rom().region(SY6502_TAG, 0);
}
@@ -285,7 +285,7 @@ void atom_state::atombb_mem(address_map &map)
map(0x0000, 0x3fff).ram();
map(0x4000, 0x57ff).ram().share("video_ram");
map(0x7000, 0x7003).mirror(0x3fc).rw(INS8255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
- map(0x7800, 0x780f).mirror(0x3f0).rw(R6522_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x7800, 0x780f).mirror(0x3f0).m(R6522_TAG, FUNC(via6522_device::map));
map(0x8000, 0xbfff).rom().region("basic", 0);
map(0xf000, 0xffff).rom().region(SY6502_TAG, 0);
}
@@ -302,7 +302,7 @@ void atom_state::prophet_mem(address_map &map)
map(0x9800, 0x9fff).ram();
map(0xa000, 0xafff).rom().region("ic24", 0);
map(0xb000, 0xb003).mirror(0x3fc).rw(INS8255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
- map(0xb800, 0xb80f).mirror(0x3f0).rw(R6522_TAG, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xb800, 0xb80f).mirror(0x3f0).m(R6522_TAG, FUNC(via6522_device::map));
map(0xc000, 0xffff).rom().region(SY6502_TAG, 0);
}
diff --git a/src/mame/drivers/ave_arb.cpp b/src/mame/drivers/ave_arb.cpp
index e242e004094..36e4524ed5b 100644
--- a/src/mame/drivers/ave_arb.cpp
+++ b/src/mame/drivers/ave_arb.cpp
@@ -222,13 +222,13 @@ void arb_state::main_map(address_map &map)
// external slot is A0-A14, potential bus conflict with RAM/VIA
map(0x0000, 0x7fff).mirror(0x8000).r(FUNC(arb_state::cartridge_r));
map(0x0000, 0x07ff).mirror(0x1000).ram().share("nvram");
- map(0x8000, 0x800f).mirror(0x1ff0).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x8000, 0x800f).mirror(0x1ff0).m(m_via, FUNC(via6522_device::map));
}
void arb_state::v2_map(address_map &map)
{
map(0x0000, 0x7fff).ram().share("nvram"); // BS62LV256
- map(0x8000, 0x800f).mirror(0x1ff0).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x8000, 0x800f).mirror(0x1ff0).m(m_via, FUNC(via6522_device::map));
map(0xa000, 0xffff).rom();
}
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index 8d45735ea56..8440ba4287d 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -138,7 +138,7 @@ void bbc_state::bbca_mem(address_map &map)
map(0xfe10, 0xfe17).w(FUNC(bbc_state::serial_ula_w)); // fe10-fe17 Serial ULA Serial system chip
map(0xfe20, 0xfe2f).w(FUNC(bbc_state::video_ula_w)); // W: fe20-fe2f Video ULA Video system chip
map(0xfe30, 0xfe3f).w(FUNC(bbc_state::bbc_romsel_w)); // W: fe30-fe3f 74LS161 Paged ROM selector
- map(0xfe40, 0xfe5f).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe40-fe5f 6522 VIA SYSTEM VIA
+ map(0xfe40, 0xfe5f).m(m_via6522_0, FUNC(via6522_device::map)); // fe40-fe5f 6522 VIA SYSTEM VIA
}
@@ -155,8 +155,8 @@ void bbc_state::bbc_base(address_map &map)
map(0xfe10, 0xfe17).w(FUNC(bbc_state::serial_ula_w)); // fe10-fe17 Serial ULA Serial system chip
map(0xfe18, 0xfe1f).portr("STATID"); // fe18-fe1f INTOFF/STATID ECONET Interrupt Off / ID No.
map(0xfe20, 0xfe2f).w(FUNC(bbc_state::video_ula_w)); // W: fe20-fe2f Video ULA Video system chip
- map(0xfe40, 0xfe5f).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe40-fe5f 6522 VIA SYSTEM VIA
- map(0xfe60, 0xfe7f).rw(m_via6522_1, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe60-fe7f 6522 VIA USER VIA
+ map(0xfe40, 0xfe5f).m(m_via6522_0, FUNC(via6522_device::map)); // fe40-fe5f 6522 VIA SYSTEM VIA
+ map(0xfe60, 0xfe7f).m(m_via6522_1, FUNC(via6522_device::map)); // fe60-fe7f 6522 VIA USER VIA
map(0xfea0, 0xfebf).rw(m_adlc, FUNC(mc6854_device::read), FUNC(mc6854_device::write)); // fea0-febf 68B54 ADLC ECONET controller
map(0xfec0, 0xfedf).rw(m_upd7002, FUNC(upd7002_device::read), FUNC(upd7002_device::write)); // fec0-fedf uPD7002 Analogue to digital converter
map(0xfee0, 0xfeff).rw(m_tube, FUNC(bbc_tube_slot_device::host_r), FUNC(bbc_tube_slot_device::host_w)); // fee0-feff Tube ULA Tube system interface
@@ -251,8 +251,8 @@ void bbcm_state::bbcm_bankdev(address_map &map)
map(0x0234, 0x0237).mirror(0x400).rw(FUNC(bbc_state::bbcm_acccon_r), FUNC(bbc_state::bbcm_acccon_w)); // fe34-fe37 ACCCON ACCCON select register
map(0x0238, 0x023b).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe38-fe3b INTOFF
map(0x023c, 0x023f).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe3c-fe3f INTON
- map(0x0240, 0x025f).mirror(0x400).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe40-fe5f 6522 VIA SYSTEM VIA
- map(0x0260, 0x027f).mirror(0x400).rw(m_via6522_1, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe60-fe7f 6522 VIA USER VIA
+ map(0x0240, 0x025f).mirror(0x400).m(m_via6522_0, FUNC(via6522_device::map)); // fe40-fe5f 6522 VIA SYSTEM VIA
+ map(0x0260, 0x027f).mirror(0x400).m(m_via6522_1, FUNC(via6522_device::map)); // fe60-fe7f 6522 VIA USER VIA
map(0x0280, 0x029f).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe80-fe9f Int. Modem Int. Modem
map(0x02a0, 0x02bf).mirror(0x400).rw(m_adlc, FUNC(mc6854_device::read), FUNC(mc6854_device::write)); // fea0-febf 68B54 ADLC ECONET controller
map(0x02e0, 0x02ff).mirror(0x400).rw(FUNC(bbc_state::bbcm_tube_r), FUNC(bbc_state::bbcm_tube_w)); // fee0-feff Tube ULA Tube system interface
@@ -281,7 +281,7 @@ void bbcm_state::bbcmet_bankdev(address_map &map)
map(0x0234, 0x0237).mirror(0x400).rw(FUNC(bbc_state::bbcm_acccon_r), FUNC(bbc_state::bbcm_acccon_w)); // fe34-fe37 ACCCON ACCCON select register
map(0x0238, 0x023b).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe38-fe3b INTOFF
map(0x023c, 0x023f).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe3c-fe3f INTON
- map(0x0240, 0x025f).mirror(0x400).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe40-fe5f 6522 VIA SYSTEM VIA
+ map(0x0240, 0x025f).mirror(0x400).m(m_via6522_0, FUNC(via6522_device::map)); // fe40-fe5f 6522 VIA SYSTEM VIA
map(0x0260, 0x027f).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe60-fe7f 6522 VIA USER VIA
map(0x0280, 0x029f).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe80-fe9f Int. Modem Int. Modem
map(0x02a0, 0x02bf).mirror(0x400).rw(m_adlc, FUNC(mc6854_device::read), FUNC(mc6854_device::write)); // fea0-febf 68B54 ADLC ECONET controller
@@ -310,8 +310,8 @@ void bbcm_state::bbcmc_bankdev(address_map &map)
map(0x0234, 0x0237).mirror(0x400).rw(FUNC(bbc_state::bbcm_acccon_r), FUNC(bbc_state::bbcm_acccon_w)); // fe34-fe37 ACCCON ACCCON select register
map(0x0238, 0x023b).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe38-fe3b INTOFF
map(0x023c, 0x023f).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe3c-fe3f INTON
- map(0x0240, 0x025f).mirror(0x400).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe40-fe5f 6522 VIA SYSTEM VIA
- map(0x0260, 0x027f).mirror(0x400).rw(m_via6522_1, FUNC(via6522_device::read), FUNC(via6522_device::write)); // fe60-fe7f 6522 VIA USER VIA
+ map(0x0240, 0x025f).mirror(0x400).m(m_via6522_0, FUNC(via6522_device::map)); // fe40-fe5f 6522 VIA SYSTEM VIA
+ map(0x0260, 0x027f).mirror(0x400).m(m_via6522_1, FUNC(via6522_device::map)); // fe60-fe7f 6522 VIA USER VIA
map(0x0280, 0x029f).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fe80-fe9f Int. Modem Int. Modem
map(0x02a0, 0x02bf).mirror(0x400).rw(m_adlc, FUNC(mc6854_device::read), FUNC(mc6854_device::write)); // fea0-febf 68B54 ADLC ECONET controller
map(0x02e0, 0x02ff).mirror(0x400).r(FUNC(bbc_state::bbc_fe_r)); // fee0-feff Tube ULA Tube system interface
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index c8c7b38e165..9796313388f 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -158,7 +158,7 @@ void beezer_state::banked_map(address_map &map)
map(0x0600, 0x0600).mirror(0x1ff).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0x0800, 0x080f).mirror(0x1f0).w(FUNC(beezer_state::palette_w));
map(0x0a00, 0x0a00).mirror(0x1ff).r(FUNC(beezer_state::line_r));
- map(0x0e00, 0x0e0f).mirror(0x1f0).rw("via_u6", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x0e00, 0x0e0f).mirror(0x1f0).m("via_u6", FUNC(via6522_device::map));
map(0x1000, 0x1fff).bankr("rombank_f1");
map(0x2000, 0x2fff).bankr("rombank_f3");
map(0x3000, 0x3fff).bankr("rombank_e1");
@@ -173,7 +173,7 @@ void beezer_state::sound_map(address_map &map)
map(0x0000, 0x07ff).ram(); // 0d
map(0x0800, 0x0fff).ram(); // 2d, optional (can be rom)
map(0x1000, 0x1007).mirror(0x07f8).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write));
- map(0x1800, 0x180f).mirror(0x07f0).rw(m_via_audio, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x1800, 0x180f).mirror(0x07f0).m(m_via_audio, FUNC(via6522_device::map));
map(0x8000, 0x8003).mirror(0x1ffc).w(FUNC(beezer_state::dac_w));
// AM_RANGE(0xa000, 0xbfff) AM_ROM // 2d (can be ram, unpopulated)
// AM_RANGE(0xc000, 0xdfff) AM_ROM // 4d (unpopulated)
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index 87455c10793..643ce768ab9 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -337,7 +337,7 @@ void bmcbowl_state::main_mem(address_map &map)
map(0x091000, 0x091001).nopw();
map(0x091800, 0x091801).w(FUNC(bmcbowl_state::scroll_w));
- map(0x092000, 0x09201f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0x00ff);
+ map(0x092000, 0x09201f).m("via6522_0", FUNC(via6522_device::map)).umask16(0x00ff);
map(0x093000, 0x093003).w("ymsnd", FUNC(ym2413_device::write)).umask16(0x00ff);
map(0x092800, 0x092803).w("aysnd", FUNC(ay8910_device::data_address_w)).umask16(0xff00);
diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp
index a7b9ee27d3a..549e1d83afb 100644
--- a/src/mame/drivers/chexx.cpp
+++ b/src/mame/drivers/chexx.cpp
@@ -217,7 +217,7 @@ READ8_MEMBER(chexx_state::input_r)
void chexx_state::mem(address_map &map)
{
map(0x0000, 0x007f).ram().mirror(0x100); // 6810 - 128 x 8 static RAM
- map(0x4000, 0x400f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x4000, 0x400f).m(m_via, FUNC(via6522_device::map));
map(0x8000, 0x8000).r(FUNC(chexx_state::input_r));
map(0xf800, 0xffff).rom().region("maincpu", 0);
}
@@ -244,7 +244,7 @@ WRITE8_MEMBER(chexx_state::lamp_w)
void faceoffh_state::mem(address_map &map)
{
map(0x0000, 0x007f).ram().mirror(0x100); // M58725P - 2KB
- map(0x4000, 0x400f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x4000, 0x400f).m(m_via, FUNC(via6522_device::map));
map(0x8000, 0x8000).r(FUNC(faceoffh_state::input_r));
map(0xa000, 0xa001).w(FUNC(faceoffh_state::ay_w));
map(0xc000, 0xc000).w(FUNC(faceoffh_state::lamp_w));
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 4e2f60a1795..4535395e18f 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -543,8 +543,8 @@ void clcd_state::clcd_mem(address_map &map)
map(0x4000, 0x7fff).rw(m_bankdev[1], FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
map(0x8000, 0xbfff).rw(m_bankdev[2], FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
map(0xc000, 0xf7ff).rw(m_bankdev[3], FUNC(address_map_bank_device::read8), FUNC(address_map_bank_device::write8));
- map(0xf800, 0xf80f).mirror(0x70).rw(m_via0, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0xf880, 0xf88f).mirror(0x70).rw("via1", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xf800, 0xf80f).mirror(0x70).m(m_via0, FUNC(via6522_device::map));
+ map(0xf880, 0xf88f).mirror(0x70).m("via1", FUNC(via6522_device::map));
map(0xf980, 0xf983).mirror(0x7c).rw(m_acia, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
map(0xfa00, 0xffff).rom().region("maincpu", 0x1fa00);
map(0xfa00, 0xfa00).mirror(0x7f).w(FUNC(clcd_state::mmu_mode_kern_w));
diff --git a/src/mame/drivers/cms.cpp b/src/mame/drivers/cms.cpp
index 02283669b7d..3f83032791c 100644
--- a/src/mame/drivers/cms.cpp
+++ b/src/mame/drivers/cms.cpp
@@ -93,7 +93,7 @@ void cms_state::cms6502_mem(address_map &map)
map(0x0000, 0x7fff).ram(); /* socket M1 43256C-12 32K RAM */
map(0x8000, 0xbfff).bankr("bank1").w(FUNC(cms_state::page_select_w));
map(0xc000, 0xffff).rom().region("mos", 0);
- map(0xfc00, 0xfc0f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xfc00, 0xfc0f).m(m_via, FUNC(via6522_device::map));
map(0xfc30, 0xfc3f).rw(FUNC(cms_state::cms_rtc_r), FUNC(cms_state::cms_rtc_w));
map(0xfc70, 0xfc7f).w(FUNC(cms_state::map_select_w));
}
diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp
index 7dcb02ab709..f27f2e9f957 100644
--- a/src/mame/drivers/cops.cpp
+++ b/src/mame/drivers/cops.cpp
@@ -808,11 +808,11 @@ void cops_state::cops_map(address_map &map)
map(0x0000, 0x1fff).ram();
map(0x2000, 0x9fff).rom().region("program", 0);
map(0xa000, 0xafff).rw(FUNC(cops_state::io1_r), FUNC(cops_state::io1_w));
- map(0xb000, 0xb00f).rw("via6522_1", FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 1 */
- map(0xb800, 0xb80f).rw("via6522_2", FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 2 */
+ map(0xb000, 0xb00f).m("via6522_1", FUNC(via6522_device::map)); /* VIA 1 */
+ map(0xb800, 0xb80f).m("via6522_2", FUNC(via6522_device::map)); /* VIA 2 */
map(0xc000, 0xcfff).rw(FUNC(cops_state::io2_r), FUNC(cops_state::io2_w));
map(0xd000, 0xd007).rw(FUNC(cops_state::dacia_r), FUNC(cops_state::dacia_w));
- map(0xd800, 0xd80f).rw("via6522_3", FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 3 */
+ map(0xd800, 0xd80f).m("via6522_3", FUNC(via6522_device::map)); /* VIA 3 */
map(0xe000, 0xffff).bankr("sysbank1");
}
@@ -821,7 +821,7 @@ void cops_state::revlatns_map(address_map &map)
map(0x0000, 0x1fff).ram();
map(0x2000, 0x9fff).rom().region("program", 0);
map(0xa000, 0xafff).rw(FUNC(cops_state::io1_lm_r), FUNC(cops_state::io1_w));
- map(0xb000, 0xb00f).rw("via6522_1", FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 1 */
+ map(0xb000, 0xb00f).m("via6522_1", FUNC(via6522_device::map)); /* VIA 1 */
map(0xc000, 0xc00f).rw("rtc", FUNC(msm6242_device::read), FUNC(msm6242_device::write));
map(0xd000, 0xd007).rw(FUNC(cops_state::dacia_r), FUNC(cops_state::dacia_w));
map(0xe000, 0xffff).bankr("sysbank1");
diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp
index 0b3c7751239..2dd004ce7a0 100644
--- a/src/mame/drivers/ec65.cpp
+++ b/src/mame/drivers/ec65.cpp
@@ -74,8 +74,8 @@ void ec65_state::ec65_mem(address_map &map)
map(0x0000, 0xdfff).ram();
map(0xe000, 0xe003).rw(PIA6821_TAG, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0xe010, 0xe011).rw(ACIA6850_TAG, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
- map(0xe100, 0xe10f).rw(m_via_0, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0xe110, 0xe11f).rw(m_via_1, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xe100, 0xe10f).m(m_via_0, FUNC(via6522_device::map));
+ map(0xe110, 0xe11f).m(m_via_1, FUNC(via6522_device::map));
map(0xe130, 0xe133).rw(ACIA6551_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
map(0xe140, 0xe140).w(MC6845_TAG, FUNC(mc6845_device::address_w));
map(0xe141, 0xe141).rw(MC6845_TAG, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
diff --git a/src/mame/drivers/emma2.cpp b/src/mame/drivers/emma2.cpp
index 5741041f8e8..e348dd17dc8 100644
--- a/src/mame/drivers/emma2.cpp
+++ b/src/mame/drivers/emma2.cpp
@@ -93,7 +93,7 @@ void emma2_state::mem_map(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x03ff).ram();
- map(0x0900, 0x090f).mirror(0x02f0).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x0900, 0x090f).mirror(0x02f0).m(m_via, FUNC(via6522_device::map));
map(0x0a00, 0x0a03).mirror(0x00fc).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x0c00, 0x0fff).ram();
map(0xd800, 0xdfff).mirror(0x2000).rom();
diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp
index 5550ee2dd28..a03e24c239c 100644
--- a/src/mame/drivers/enmirage.cpp
+++ b/src/mame/drivers/enmirage.cpp
@@ -126,7 +126,7 @@ void enmirage_state::mirage_map(address_map &map)
map(0x8000, 0xbfff).ram(); // main RAM
map(0xc000, 0xdfff).ram(); // expansion RAM
map(0xe100, 0xe101).rw("acia6850", FUNC(acia6850_device::read), FUNC(acia6850_device::write));
- map(0xe200, 0xe2ff).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xe200, 0xe2ff).m(m_via, FUNC(via6522_device::map));
map(0xe400, 0xe4ff).noprw();
map(0xe800, 0xe803).rw(m_fdc, FUNC(wd1772_device::read), FUNC(wd1772_device::write));
map(0xec00, 0xecef).rw("es5503", FUNC(es5503_device::read), FUNC(es5503_device::write));
diff --git a/src/mame/drivers/epic14e.cpp b/src/mame/drivers/epic14e.cpp
index a3531d3c2b2..a32884f75ee 100644
--- a/src/mame/drivers/epic14e.cpp
+++ b/src/mame/drivers/epic14e.cpp
@@ -84,7 +84,7 @@ void epic14e_state::cpu_map(address_map &map)
map(0x6000, 0x6007).rw("pvtc", FUNC(scn2672_device::read), FUNC(scn2672_device::write));
map(0x8000, 0x8003).rw("acia1", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
map(0x9000, 0x9003).rw("acia2", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
- map(0xa010, 0xa01f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xa010, 0xa01f).m(m_via, FUNC(via6522_device::map));
map(0xe000, 0xffff).rom().region("program", 0);
}
diff --git a/src/mame/drivers/esprit.cpp b/src/mame/drivers/esprit.cpp
index 6edd039ce38..e1c079ffa2e 100644
--- a/src/mame/drivers/esprit.cpp
+++ b/src/mame/drivers/esprit.cpp
@@ -73,7 +73,7 @@ void esprit_state::mem3_map(address_map &map)
map(0x93c0, 0x93c1).rw("acia", FUNC(acia6850_device::read), FUNC(acia6850_device::write));
map(0x95c0, 0x95c3).rw("acia1", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
map(0x99c0, 0x99c3).rw("acia2", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
- map(0xb1c0, 0xb1cf).rw("via", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xb1c0, 0xb1cf).m("via", FUNC(via6522_device::map));
map(0xe000, 0xffff).rom().region("roms", 0);
}
diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp
index b663151fc37..3d7ffd75385 100644
--- a/src/mame/drivers/gameplan.cpp
+++ b/src/mame/drivers/gameplan.cpp
@@ -180,9 +180,9 @@ WRITE8_MEMBER(gameplan_state::r6532_soundlatch_w)
void gameplan_state::gameplan_main_map(address_map &map)
{
map(0x0000, 0x03ff).mirror(0x1c00).ram();
- map(0x2000, 0x200f).mirror(0x07f0).rw(m_via_0, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 1 */
- map(0x2800, 0x280f).mirror(0x07f0).rw(m_via_1, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 2 */
- map(0x3000, 0x300f).mirror(0x07f0).rw(m_via_2, FUNC(via6522_device::read), FUNC(via6522_device::write)); /* VIA 3 */
+ map(0x2000, 0x200f).mirror(0x07f0).m(m_via_0, FUNC(via6522_device::map)); /* VIA 1 */
+ map(0x2800, 0x280f).mirror(0x07f0).m(m_via_1, FUNC(via6522_device::map)); /* VIA 2 */
+ map(0x3000, 0x300f).mirror(0x07f0).m(m_via_2, FUNC(via6522_device::map)); /* VIA 3 */
map(0x8000, 0xffff).rom();
}
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index 13a1c103dfd..fdc0a5e924e 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -187,7 +187,7 @@ void goupil_g1_state::mem(address_map &map)
map(0xE400, 0xE7FF).ram();
map(0xE800, 0xE80F).rw(m_acia, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w));
- map(0xE810, 0xE81F).rw(m_via_video, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xE810, 0xE81F).m(m_via_video, FUNC(via6522_device::map));
map(0xE820, 0xE820).rw("i8279_kb1", FUNC(i8279_device::data_r), FUNC(i8279_device::data_w));
map(0xE821, 0xE821).rw("i8279_kb1", FUNC(i8279_device::status_r), FUNC(i8279_device::cmd_w));
@@ -195,9 +195,9 @@ void goupil_g1_state::mem(address_map &map)
map(0xE830, 0xE830).rw("i8279_kb2", FUNC(i8279_device::data_r), FUNC(i8279_device::data_w));
map(0xE831, 0xE831).rw("i8279_kb2", FUNC(i8279_device::status_r), FUNC(i8279_device::cmd_w));
- map(0xE840, 0xE84F).rw(m_via_keyb, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xE840, 0xE84F).m(m_via_keyb, FUNC(via6522_device::map));
- map(0xE860, 0xE86F).rw(m_via_modem, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xE860, 0xE86F).m(m_via_modem, FUNC(via6522_device::map));
map(0xE8F0, 0xE8FF).rw(m_fdc, FUNC(fd1791_device::read), FUNC(fd1791_device::write));
@@ -216,7 +216,7 @@ void goupil_g2_state::mem(address_map &map)
map(0xE400, 0xE7FF).ram();
map(0xE800, 0xE80F).rw(m_acia, FUNC(acia6850_device::data_r), FUNC(acia6850_device::data_w));
- map(0xE810, 0xE81F).rw(m_via_video, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xE810, 0xE81F).m(m_via_video, FUNC(via6522_device::map));
map(0xE820, 0xE820).rw("i8279_kb1", FUNC(i8279_device::data_r), FUNC(i8279_device::data_w));
map(0xE821, 0xE821).rw("i8279_kb1", FUNC(i8279_device::status_r), FUNC(i8279_device::cmd_w));
@@ -224,9 +224,9 @@ void goupil_g2_state::mem(address_map &map)
map(0xE830, 0xE830).rw("i8279_kb2", FUNC(i8279_device::data_r), FUNC(i8279_device::data_w));
map(0xE831, 0xE831).rw("i8279_kb2", FUNC(i8279_device::status_r), FUNC(i8279_device::cmd_w));
- map(0xE840, 0xE84F).rw(m_via_keyb, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xE840, 0xE84F).m(m_via_keyb, FUNC(via6522_device::map));
- map(0xE860, 0xE86F).rw(m_via_modem, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xE860, 0xE86F).m(m_via_modem, FUNC(via6522_device::map));
map(0xE870, 0xE870).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w));
map(0xE871, 0xE871).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp
index 839b3cec390..313274242fc 100644
--- a/src/mame/drivers/gts3.cpp
+++ b/src/mame/drivers/gts3.cpp
@@ -81,8 +81,8 @@ private:
void gts3_state::gts3_map(address_map &map)
{
map(0x0000, 0x1fff).ram().share("nvram");
- map(0x2000, 0x200f).rw(m_u4, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0x2010, 0x201f).rw(m_u5, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x2000, 0x200f).m(m_u4, FUNC(via6522_device::map));
+ map(0x2010, 0x201f).m(m_u5, FUNC(via6522_device::map));
map(0x2020, 0x2023).mirror(0x0c).w(FUNC(gts3_state::segbank_w));
map(0x4000, 0xffff).rom();
}
diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp
index 78b69325723..3b4a40f1709 100644
--- a/src/mame/drivers/gts3a.cpp
+++ b/src/mame/drivers/gts3a.cpp
@@ -83,8 +83,8 @@ private:
void gts3a_state::gts3a_map(address_map &map)
{
map(0x0000, 0x1fff).ram().share("nvram");
- map(0x2000, 0x200f).rw(m_u4, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0x2010, 0x201f).rw(m_u5, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x2000, 0x200f).m(m_u4, FUNC(via6522_device::map));
+ map(0x2010, 0x201f).m(m_u5, FUNC(via6522_device::map));
map(0x2020, 0x2023).mirror(0x0c).w(FUNC(gts3a_state::segbank_w));
map(0x4000, 0xffff).rom();
}
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index 23b1348ca77..23dfe433d47 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -1038,7 +1038,7 @@ void itech32_state::sound_map(address_map &map)
map(0x0800, 0x083f).mirror(0x80).rw("ensoniq", FUNC(es5506_device::read), FUNC(es5506_device::write));
map(0x0c00, 0x0c00).w(FUNC(itech32_state::sound_bank_w));
map(0x1000, 0x1000).nopw(); /* noisy */
- map(0x1400, 0x140f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x1400, 0x140f).m("via6522_0", FUNC(via6522_device::map));
map(0x2000, 0x3fff).ram();
map(0x4000, 0x7fff).bankr("soundbank");
map(0x8000, 0xffff).rom();
diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp
index 79886c8b5f3..d0499cb7785 100644
--- a/src/mame/drivers/itech8.cpp
+++ b/src/mame/drivers/itech8.cpp
@@ -1022,7 +1022,7 @@ void itech8_state::sound3812_external_map(address_map &map)
map(0x2000, 0x2001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write));
map(0x3000, 0x37ff).ram();
map(0x4000, 0x4000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
- map(0x5000, 0x500f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x5000, 0x500f).m("via6522_0", FUNC(via6522_device::map));
map(0x8000, 0xffff).rom();
}
diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp
index a14515b6880..2d444617639 100644
--- a/src/mame/drivers/jr100.cpp
+++ b/src/mame/drivers/jr100.cpp
@@ -120,7 +120,7 @@ void jr100_state::mem_map(address_map &map)
//map(0x8000, 0xbfff).rom(); expansion rom
map(0xc000, 0xc0ff).ram().share("pcg").region("maincpu", 0xc000);
map(0xc100, 0xc3ff).ram().share("vram");
- map(0xc800, 0xc80f).r(m_via, FUNC(via6522_device::read)).w(m_via, FUNC(via6522_device::write));
+ map(0xc800, 0xc80f).m(m_via, FUNC(via6522_device::map));
//map(0xcc00, 0xcfff).; expansion i/o
//map(0xd000, 0xd7ff).rom(); expansion rom for printer control
//map(0xd800, 0xdfff).rom(); expansion rom
diff --git a/src/mame/drivers/jvh.cpp b/src/mame/drivers/jvh.cpp
index d0acac1d6d9..e481f15d7c5 100644
--- a/src/mame/drivers/jvh.cpp
+++ b/src/mame/drivers/jvh.cpp
@@ -105,7 +105,7 @@ void jvh_state::movmastr_io(address_map &map)
void jvh_state::jvh_sub_map(address_map &map)
{
map(0x0000, 0x007f).ram();
- map(0x0080, 0x008f).rw("via", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x0080, 0x008f).m("via", FUNC(via6522_device::map));
map(0xc000, 0xdfff).mirror(0x2000).rom();
}
diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp
index f317c7a7b72..d57bf05e488 100644
--- a/src/mame/drivers/lwriter.cpp
+++ b/src/mame/drivers/lwriter.cpp
@@ -226,7 +226,7 @@ void lwriter_state::maincpu_map(address_map &map)
#if TPI
map(0xe00010, 0xe0001f).rw("tpi", FUNC(tpi6523_device::read), FUNC(tpi6523_device::write)).umask16(0x00ff).mirror(0x17ffe0); // Used on older boards, needs proper mapping
#else
- map(0xe00000, 0xe0001f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0x00ff).mirror(0x17ffe0);
+ map(0xe00000, 0xe0001f).m(m_via, FUNC(via6522_device::map)).umask16(0x00ff).mirror(0x17ffe0);
#endif
}
diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp
index bfa0bc48087..abe2cf58402 100644
--- a/src/mame/drivers/microtan.cpp
+++ b/src/mame/drivers/microtan.cpp
@@ -74,9 +74,9 @@ void microtan_state::main_map(address_map &map)
map(0xbc01, 0xbc01).rw(m_ay8910[0], FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));
map(0xbc02, 0xbc02).w(m_ay8910[1], FUNC(ay8910_device::address_w));
map(0xbc03, 0xbc03).rw(m_ay8910[1], FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));
- map(0xbfc0, 0xbfcf).rw(m_via6522[0], FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xbfc0, 0xbfcf).m(m_via6522[0], FUNC(via6522_device::map));
map(0xbfd0, 0xbfd3).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
- map(0xbfe0, 0xbfef).rw(m_via6522[1], FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xbfe0, 0xbfef).m(m_via6522[1], FUNC(via6522_device::map));
map(0xbff0, 0xbfff).rw(FUNC(microtan_state::bffx_r), FUNC(microtan_state::bffx_w));
map(0xc000, 0xe7ff).rom();
map(0xf000, 0xffff).rom();
diff --git a/src/mame/drivers/nsg6809.cpp b/src/mame/drivers/nsg6809.cpp
index 32904a6bef1..17b89691a70 100644
--- a/src/mame/drivers/nsg6809.cpp
+++ b/src/mame/drivers/nsg6809.cpp
@@ -62,7 +62,7 @@ private:
void nsg6809_state::main_map(address_map &map)
{
map(0x0000, 0x1fff).ram();
- map(0x2800, 0x280f).rw("via", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x2800, 0x280f).m("via", FUNC(via6522_device::map));
map(0x3000, 0x3003).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
map(0x3e00, 0x3e00).w("deadman", FUNC(watchdog_timer_device::reset_w));
map(0x8000, 0xffff).rom().region("maincpu", 0);
diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp
index fb42f47ac17..5451f6e1dd9 100644
--- a/src/mame/drivers/oric.cpp
+++ b/src/mame/drivers/oric.cpp
@@ -199,7 +199,7 @@ protected:
void oric_state::oric_mem(address_map &map)
{
map(0x0000, 0xffff).ram().share("ram");
- map(0x0300, 0x030f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)).mirror(0xf0);
+ map(0x0300, 0x030f).m(m_via, FUNC(via6522_device::map)).mirror(0xf0);
map(0xc000, 0xdfff).bankr("bank_c000_r").bankw("bank_c000_w");
map(0xe000, 0xf7ff).bankr("bank_e000_r").bankw("bank_e000_w");
map(0xf800, 0xffff).bankr("bank_f800_r").bankw("bank_f800_w");
@@ -211,12 +211,12 @@ Memory region &c000-&ffff can be ram or rom. */
void telestrat_state::telestrat_mem(address_map &map)
{
map(0x0000, 0xffff).ram().share("ram");
- map(0x0300, 0x030f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x0300, 0x030f).m(m_via, FUNC(via6522_device::map));
map(0x0310, 0x0313).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
map(0x0314, 0x0314).rw(FUNC(telestrat_state::port_314_r), FUNC(telestrat_state::port_314_w));
map(0x0318, 0x0318).r(FUNC(telestrat_state::port_318_r));
map(0x031c, 0x031f).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
- map(0x0320, 0x032f).rw(m_via2, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x0320, 0x032f).m(m_via2, FUNC(via6522_device::map));
map(0xc000, 0xffff).bankr("bank_c000_r").bankw("bank_c000_w");
}
diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp
index bd4695a2963..e1b80d0e292 100644
--- a/src/mame/drivers/pntnpuzl.cpp
+++ b/src/mame/drivers/pntnpuzl.cpp
@@ -292,7 +292,7 @@ void pntnpuzl_state::pntnpuzl_map(address_map &map)
map(0x100000, 0x100001).r(FUNC(pntnpuzl_state::irq2_ack_r));
map(0x180000, 0x180001).r(FUNC(pntnpuzl_state::irq4_ack_r));
map(0x200000, 0x200001).w(FUNC(pntnpuzl_state::pntnpuzl_200000_w));
- map(0x280000, 0x28001f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0xff00);
+ map(0x280000, 0x28001f).m(m_via, FUNC(via6522_device::map)).umask16(0xff00);
map(0x280014, 0x280015).r(FUNC(pntnpuzl_state::pntnpuzl_280014_r));
map(0x280018, 0x280019).w(FUNC(pntnpuzl_state::pntnpuzl_280018_w));
map(0x28001a, 0x28001b).r(FUNC(pntnpuzl_state::pntnpuzl_28001a_r));
diff --git a/src/mame/drivers/prodigy.cpp b/src/mame/drivers/prodigy.cpp
index acfc76e4902..d4504ff2217 100644
--- a/src/mame/drivers/prodigy.cpp
+++ b/src/mame/drivers/prodigy.cpp
@@ -577,7 +577,7 @@ void prodigy_state::update_bcd()
void prodigy_state::maincpu_map(address_map &map)
{
map(0x0000, 0x07ff).ram();
- map(0x2000, 0x200f).rw("via", FUNC(via6522_device::read),FUNC(via6522_device::write));
+ map(0x2000, 0x200f).m("via", FUNC(via6522_device::map));
map(0x6000, 0x7fff).rom().region("roms", 0).mirror(0x8000);
}
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index 5c9c3cffe24..e7eea4b5780 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -63,7 +63,7 @@ void rmnimbus_state::nimbus_io(address_map &map)
map(0x0400, 0x0400).w(FUNC(rmnimbus_state::fdc_ctl_w));
map(0x0408, 0x040f).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write)).umask16(0x00ff);
map(0x0410, 0x041f).rw(FUNC(rmnimbus_state::scsi_r), FUNC(rmnimbus_state::scsi_w)).umask16(0x00ff);
- map(0x0480, 0x049f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write)).umask16(0x00ff);
+ map(0x0480, 0x049f).m(m_via, FUNC(via6522_device::map)).umask16(0x00ff);
}
diff --git a/src/mame/drivers/shine.cpp b/src/mame/drivers/shine.cpp
index 39a3dfa035a..54a66979d46 100644
--- a/src/mame/drivers/shine.cpp
+++ b/src/mame/drivers/shine.cpp
@@ -80,8 +80,8 @@ void shine_state::shine_mem(address_map &map)
map.unmap_value_high();
map(0x0000, 0x67ff).ram();
map(0x6800, 0x7fff).ram().share(m_video_ram);
- map(0x9400, 0x940f).rw(m_via[0], FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0x9800, 0x980f).rw(m_via[1], FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x9400, 0x940f).m(m_via[0], FUNC(via6522_device::map));
+ map(0x9800, 0x980f).m(m_via[1], FUNC(via6522_device::map));
map(0x9c00, 0x9c03).rw(m_fdc, FUNC(fd1771_device::read), FUNC(fd1771_device::write));
map(0x9d00, 0x9d00).w(FUNC(shine_state::floppy_w));
map(0xb000, 0xffff).rom();
diff --git a/src/mame/drivers/ssystem3.cpp b/src/mame/drivers/ssystem3.cpp
index 737536a1caf..00597b39ffb 100644
--- a/src/mame/drivers/ssystem3.cpp
+++ b/src/mame/drivers/ssystem3.cpp
@@ -222,7 +222,7 @@ void ssystem3_state::ssystem3_map(address_map &map)
probably zusatzger??t memory (battery powered ram 256x4? at 0x4000)
$40ff low nibble ram if playfield module (else init with normal playfield)
*/
- map(0x6000, 0x600f).rw(m_via6522_0, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x6000, 0x600f).m(m_via6522_0, FUNC(via6522_device::map));
map(0xc000, 0xdfff).rom();
map(0xf000, 0xffff).rom();
}
diff --git a/src/mame/drivers/swtpc09.cpp b/src/mame/drivers/swtpc09.cpp
index b40975c4be5..5e7f3fd0c72 100644
--- a/src/mame/drivers/swtpc09.cpp
+++ b/src/mame/drivers/swtpc09.cpp
@@ -133,7 +133,7 @@ void swtpc09_state::uniflex_dmf3_mem(address_map &map)
map(0xf024, 0xf024).mirror(0xf0000).rw(FUNC(swtpc09_state::dmf3_control_reg_r), FUNC(swtpc09_state::dmf3_control_reg_w));
map(0xf025, 0xf025).mirror(0xf0000).rw(FUNC(swtpc09_state::dmf3_dma_address_reg_r), FUNC(swtpc09_state::dmf3_dma_address_reg_w));
//AM_RANGE(0xf030, 0xf03f) AM_MIRROR(0xf0000) AM_NOP
- map(0xf040, 0xf04f).mirror(0xf0000).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xf040, 0xf04f).mirror(0xf0000).m(m_via, FUNC(via6522_device::map));
//AM_RANGE(0xf050, 0xf7ff) AM_MIRROR(0xf0000) AM_NOP
map(0xf800, 0xffff).mirror(0xf0000).rom().region("maincpu", 0xf800);
}
diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp
index fd7a53ae953..009ddc32314 100644
--- a/src/mame/drivers/sym1.cpp
+++ b/src/mame/drivers/sym1.cpp
@@ -314,11 +314,11 @@ void sym1_state::sym1_map(address_map &map)
map(0x0800, 0x0bff).bankrw("bank3").share("ram_2k");
map(0x0c00, 0x0fff).bankrw("bank4").share("ram_3k");
map(0x8000, 0x8fff).rom().share("monitor"); // U20 Monitor ROM
- map(0xa000, 0xa00f).rw("via1", FUNC(via6522_device::read), FUNC(via6522_device::write)); // U25 VIA #1
+ map(0xa000, 0xa00f).m("via1", FUNC(via6522_device::map)); // U25 VIA #1
map(0xa400, 0xa41f).m("riot", FUNC(mos6532_new_device::io_map)); // U27 RIOT
map(0xa600, 0xa67f).bankrw("bank5").share("riot_ram"); // U27 RIOT RAM
- map(0xa800, 0xa80f).rw("via2", FUNC(via6522_device::read), FUNC(via6522_device::write)); // U28 VIA #2
- map(0xac00, 0xac0f).rw("via3", FUNC(via6522_device::read), FUNC(via6522_device::write)); // U29 VIA #3
+ map(0xa800, 0xa80f).m("via2", FUNC(via6522_device::map)); // U28 VIA #2
+ map(0xac00, 0xac0f).m("via3", FUNC(via6522_device::map)); // U29 VIA #3
map(0xb000, 0xefff).rom();
}
diff --git a/src/mame/drivers/textelcomp.cpp b/src/mame/drivers/textelcomp.cpp
index 886ada26074..b9c09dc8ecd 100644
--- a/src/mame/drivers/textelcomp.cpp
+++ b/src/mame/drivers/textelcomp.cpp
@@ -71,10 +71,10 @@ void textelcomp_state::rtc_w(u8 data)
void textelcomp_state::mem_map(address_map &map)
{
map(0x0000, 0x1eff).ram(); // MB8464A-10L (battery backed?)
- map(0x1f00, 0x1f0f).rw("via0", FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0x1f10, 0x1f1f).rw("via1", FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0x1f20, 0x1f2f).rw("via2", FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0x1f30, 0x1f3f).rw("via3", FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x1f00, 0x1f0f).m("via0", FUNC(via6522_device::map));
+ map(0x1f10, 0x1f1f).m("via1", FUNC(via6522_device::map));
+ map(0x1f20, 0x1f2f).m("via2", FUNC(via6522_device::map));
+ map(0x1f30, 0x1f3f).m("via3", FUNC(via6522_device::map));
map(0x1f40, 0x1f43).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
map(0x1f70, 0x1f70).noprw();//rw("lcdc", FUNC(sed1330_device::status_r), FUNC(sed1330_device::data_w));
map(0x1f71, 0x1f71).noprw();//rw("lcdc", FUNC(sed1330_device::data_r), FUNC(sed1330_device::command_w));
diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp
index 31f3c82c119..adbbd0cf2f2 100644
--- a/src/mame/drivers/trvquest.cpp
+++ b/src/mame/drivers/trvquest.cpp
@@ -65,9 +65,9 @@ void gameplan_state::cpu_map(address_map &map)
{
map(0x0000, 0x1fff).ram().share("nvram"); // cmos ram
map(0x2000, 0x27ff).ram(); // main ram
- map(0x3800, 0x380f).rw(m_via_1, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0x3810, 0x381f).rw(m_via_2, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0x3820, 0x382f).rw(m_via_0, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0x3800, 0x380f).m(m_via_1, FUNC(via6522_device::map));
+ map(0x3810, 0x381f).m(m_via_2, FUNC(via6522_device::map));
+ map(0x3820, 0x382f).m(m_via_0, FUNC(via6522_device::map));
map(0x3830, 0x3831).w("ay1", FUNC(ay8910_device::address_data_w));
map(0x3840, 0x3841).w("ay2", FUNC(ay8910_device::address_data_w));
map(0x3850, 0x3850).nopr(); //watchdog_reset_r ?
diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp
index 92240e44e96..75c5721fbed 100644
--- a/src/mame/drivers/tv950.cpp
+++ b/src/mame/drivers/tv950.cpp
@@ -117,7 +117,7 @@ void tv950_state::tv950_mem(address_map &map)
map(0x9300, 0x9303).rw(m_uart[0], FUNC(mos6551_device::read), FUNC(mos6551_device::write)); // CS0 = AB9
map(0x9500, 0x9503).rw(m_uart[2], FUNC(mos6551_device::read), FUNC(mos6551_device::write)); // CS0 = AB10
map(0x9900, 0x9903).rw(m_uart[1], FUNC(mos6551_device::read), FUNC(mos6551_device::write)); // CS0 = AB11
- map(0xb100, 0xb10f).rw(m_via, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xb100, 0xb10f).m(m_via, FUNC(via6522_device::map));
map(0xe000, 0xffff).rom().region("maincpu", 0);
}
diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp
index 8d32c46a950..c65e55331b8 100644
--- a/src/mame/drivers/victor9k.cpp
+++ b/src/mame/drivers/victor9k.cpp
@@ -202,10 +202,10 @@ void victor9k_state::victor9k_mem(address_map &map)
map(0xe0040, 0xe0043).mirror(0x7f00).rw(m_upd7201, FUNC(upd7201_device::cd_ba_r), FUNC(upd7201_device::cd_ba_w));
map(0xe8000, 0xe8000).mirror(0x7f00).rw(m_crtc, FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w));
map(0xe8001, 0xe8001).mirror(0x7f00).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
- map(0xe8020, 0xe802f).mirror(0x7f00).rw(m_via1, FUNC(via6522_device::read), FUNC(via6522_device::write));
- map(0xe8040, 0xe804f).mirror(0x7f00).rw(m_via2, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xe8020, 0xe802f).mirror(0x7f00).m(m_via1, FUNC(via6522_device::map));
+ map(0xe8040, 0xe804f).mirror(0x7f00).m(m_via2, FUNC(via6522_device::map));
map(0xe8060, 0xe8061).mirror(0x7f00).rw(m_ssda, FUNC(mc6852_device::read), FUNC(mc6852_device::write));
- map(0xe8080, 0xe808f).mirror(0x7f00).rw(m_via3, FUNC(via6522_device::read), FUNC(via6522_device::write));
+ map(0xe8080, 0xe808f).mirror(0x7f00).m(m_via3, FUNC(via6522_device::map));
map(0xe80a0, 0xe80af).mirror(0x7f00).rw(m_fdc, FUNC(victor_9000_fdc_device::cs5_r), FUNC(victor_9000_fdc_device::cs5_w));
map(0xe80c0, 0xe80cf).mirror(0x7f00).rw(m_fdc, FUNC(victor_9000_fdc_device::cs6_r), FUNC(victor_9000_fdc_device::cs6_w));
map(0xe80e0, 0xe80ef).mirror(0x7f00).rw(m_fdc, FUNC(victor_9000_fdc_device::cs7_r), FUNC(victor_9000_fdc_device::cs7_w));