summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/dmv.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-03-13 07:36:43 +0100
committer Olivier Galibert <galibert@pobox.com>2018-03-14 14:07:14 +0100
commit115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch)
treef0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/dmv.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/dmv.cpp')
-rw-r--r--src/mame/drivers/dmv.cpp67
1 files changed, 35 insertions, 32 deletions
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index e31c9f11632..9da496c0f82 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -513,34 +513,36 @@ uint8_t dmv_state::program_read(address_space &space, int cas, offs_t offset)
return data;
}
-ADDRESS_MAP_START(dmv_state::dmv_mem)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE( 0x0000, 0xffff ) AM_READWRITE(program_r, program_w)
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(dmv_state::dmv_io)
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE(leds_w)
- AM_RANGE(0x10, 0x10) AM_READWRITE(ramsel_r, ramsel_w)
- AM_RANGE(0x11, 0x11) AM_READWRITE(romsel_r, romsel_w)
- AM_RANGE(0x12, 0x12) AM_WRITE(tc_set_w)
- AM_RANGE(0x13, 0x13) AM_READ(sys_status_r)
- AM_RANGE(0x14, 0x14) AM_WRITE(fdd_motor_w)
- AM_RANGE(0x20, 0x2f) AM_DEVREADWRITE("dma8237", am9517a_device, read, write)
- AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("kb_ctrl_mcu", upi41_cpu_device, upi41_master_r, upi41_master_w)
- AM_RANGE(0x50, 0x51) AM_DEVICE("i8272", i8272a_device, map)
- AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("pit8253", pit8253_device, read, write)
- AM_RANGE(0xa0, 0xa1) AM_DEVREADWRITE("upd7220", upd7220_device, read, write)
- AM_RANGE(0xd0, 0xd7) AM_WRITE(switch16_w)
- AM_RANGE(0xe0, 0xe7) AM_WRITE(rambank_w)
-
- AM_RANGE(0x60, 0x6f) AM_READWRITE(ifsel0_r, ifsel0_w)
- AM_RANGE(0x70, 0x7f) AM_READWRITE(ifsel1_r, ifsel1_w)
- AM_RANGE(0x30, 0x3f) AM_READWRITE(ifsel2_r, ifsel2_w)
- AM_RANGE(0xb0, 0xbf) AM_READWRITE(ifsel3_r, ifsel3_w)
- AM_RANGE(0xc0, 0xcf) AM_READWRITE(ifsel4_r, ifsel4_w)
-ADDRESS_MAP_END
+void dmv_state::dmv_mem(address_map &map)
+{
+ map.unmap_value_high();
+ map(0x0000, 0xffff).rw(this, FUNC(dmv_state::program_r), FUNC(dmv_state::program_w));
+}
+
+void dmv_state::dmv_io(address_map &map)
+{
+ map.unmap_value_high();
+ map.global_mask(0xff);
+ map(0x00, 0x00).w(this, FUNC(dmv_state::leds_w));
+ map(0x10, 0x10).rw(this, FUNC(dmv_state::ramsel_r), FUNC(dmv_state::ramsel_w));
+ map(0x11, 0x11).rw(this, FUNC(dmv_state::romsel_r), FUNC(dmv_state::romsel_w));
+ map(0x12, 0x12).w(this, FUNC(dmv_state::tc_set_w));
+ map(0x13, 0x13).r(this, FUNC(dmv_state::sys_status_r));
+ map(0x14, 0x14).w(this, FUNC(dmv_state::fdd_motor_w));
+ map(0x20, 0x2f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write));
+ map(0x40, 0x41).rw("kb_ctrl_mcu", FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w));
+ map(0x50, 0x51).m(m_fdc, FUNC(i8272a_device::map));
+ map(0x80, 0x83).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+ map(0xa0, 0xa1).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write));
+ map(0xd0, 0xd7).w(this, FUNC(dmv_state::switch16_w));
+ map(0xe0, 0xe7).w(this, FUNC(dmv_state::rambank_w));
+
+ map(0x60, 0x6f).rw(this, FUNC(dmv_state::ifsel0_r), FUNC(dmv_state::ifsel0_w));
+ map(0x70, 0x7f).rw(this, FUNC(dmv_state::ifsel1_r), FUNC(dmv_state::ifsel1_w));
+ map(0x30, 0x3f).rw(this, FUNC(dmv_state::ifsel2_r), FUNC(dmv_state::ifsel2_w));
+ map(0xb0, 0xbf).rw(this, FUNC(dmv_state::ifsel3_r), FUNC(dmv_state::ifsel3_w));
+ map(0xc0, 0xcf).rw(this, FUNC(dmv_state::ifsel4_r), FUNC(dmv_state::ifsel4_w));
+}
READ8_MEMBER(dmv_state::kb_mcu_port1_r)
{
@@ -560,10 +562,11 @@ WRITE8_MEMBER(dmv_state::kb_mcu_port2_w)
m_slot7->keyint_w(BIT(data, 4));
}
-ADDRESS_MAP_START(dmv_state::upd7220_map)
- ADDRESS_MAP_GLOBAL_MASK(0x1ffff)
- AM_RANGE(0x00000, 0x1ffff) AM_RAM AM_SHARE("video_ram")
-ADDRESS_MAP_END
+void dmv_state::upd7220_map(address_map &map)
+{
+ map.global_mask(0x1ffff);
+ map(0x00000, 0x1ffff).ram().share("video_ram");
+}
/* Input ports */
INPUT_PORTS_START( dmv )