summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/sys9002.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/sys9002.cpp
parentf155992daab88ad024cec995428a67108218b51d (diff)
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/sys9002.cpp')
-rw-r--r--src/mame/drivers/sys9002.cpp36
1 files changed, 19 insertions, 17 deletions
diff --git a/src/mame/drivers/sys9002.cpp b/src/mame/drivers/sys9002.cpp
index 6c30d8296e5..d90851fe426 100644
--- a/src/mame/drivers/sys9002.cpp
+++ b/src/mame/drivers/sys9002.cpp
@@ -48,25 +48,27 @@ private:
};
-ADDRESS_MAP_START(sys9002_state::sys9002_mem)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0000, 0x7fff) AM_ROM // 4 * 4K ROM
- AM_RANGE(0x8000, 0x9fff) AM_RAM // 4 * 2k RAM
- AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("videoram") // 2k RAM
- AM_RANGE(0xc000, 0xc07f) AM_RAM // ??
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(sys9002_state::sys9002_io)
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK(0xff)
+void sys9002_state::sys9002_mem(address_map &map)
+{
+ map.unmap_value_high();
+ map(0x0000, 0x7fff).rom(); // 4 * 4K ROM
+ map(0x8000, 0x9fff).ram(); // 4 * 2k RAM
+ map(0xa000, 0xa7ff).ram().share("videoram"); // 2k RAM
+ map(0xc000, 0xc07f).ram(); // ??
+}
+
+void sys9002_state::sys9002_io(address_map &map)
+{
+ map.unmap_value_high();
+ map.global_mask(0xff);
//AM_RANGE(0x04, 0x04) AM_DEVREADWRITE("crtc", mc6845_device, status_r, address_w) // left commented out as mame freezes after about 2 seconds
//AM_RANGE(0x05, 0x05) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
- AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("uart1", i8251_device, data_r, data_w)
- AM_RANGE(0x09, 0x09) AM_DEVREADWRITE("uart1", i8251_device, status_r, control_w) // 7 bits even parity, x64
- AM_RANGE(0x11, 0x11) AM_READNOP // continuous read
- AM_RANGE(0x1c, 0x1c) AM_DEVREADWRITE("uart2", i8251_device, data_r, data_w)
- AM_RANGE(0x1d, 0x1d) AM_DEVREADWRITE("uart2", i8251_device, status_r, control_w) // enabled for transmit only, 8 bits odd parity, x64
-ADDRESS_MAP_END
+ map(0x08, 0x08).rw("uart1", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
+ map(0x09, 0x09).rw("uart1", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); // 7 bits even parity, x64
+ map(0x11, 0x11).nopr(); // continuous read
+ map(0x1c, 0x1c).rw("uart2", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
+ map(0x1d, 0x1d).rw("uart2", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); // enabled for transmit only, 8 bits odd parity, x64
+}
/* Input ports */
static INPUT_PORTS_START( sys9002 )