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/c900.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/c900.cpp')
-rw-r--r-- | src/mame/drivers/c900.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp index b1942c3e1bd..65ba9a95074 100644 --- a/src/mame/drivers/c900.cpp +++ b/src/mame/drivers/c900.cpp @@ -56,22 +56,25 @@ private: required_device<generic_terminal_device> m_terminal; }; -ADDRESS_MAP_START(c900_state::mem_map) - AM_RANGE(0x00000, 0x07fff) AM_ROM AM_REGION("roms", 0) -ADDRESS_MAP_END +void c900_state::mem_map(address_map &map) +{ + map(0x00000, 0x07fff).rom().region("roms", 0); +} -ADDRESS_MAP_START(c900_state::data_map) - AM_RANGE(0x00000, 0x07fff) AM_ROM AM_REGION("roms", 0) - AM_RANGE(0x08000, 0x6ffff) AM_RAM -ADDRESS_MAP_END +void c900_state::data_map(address_map &map) +{ + map(0x00000, 0x07fff).rom().region("roms", 0); + map(0x08000, 0x6ffff).ram(); +} -ADDRESS_MAP_START(c900_state::io_map) - AM_RANGE(0x0000, 0x007f) AM_DEVREADWRITE8("cio", z8036_device, read, write, 0x00ff) +void c900_state::io_map(address_map &map) +{ + map(0x0000, 0x007f).rw("cio", FUNC(z8036_device::read), FUNC(z8036_device::write)).umask16(0x00ff); //AM_RANGE(0x0100, 0x011f) AM_DEVREADWRITE8("scc", scc8030_device, zbus_r, zbus_w, 0x00ff) // range for one channel - AM_RANGE(0x0100, 0x0101) AM_READ(stat_r) - AM_RANGE(0x0110, 0x0111) AM_READ(key_r) - AM_RANGE(0x0110, 0x0111) AM_DEVWRITE8("terminal", generic_terminal_device, write, 0x00ff) -ADDRESS_MAP_END + map(0x0100, 0x0101).r(this, FUNC(c900_state::stat_r)); + map(0x0110, 0x0111).r(this, FUNC(c900_state::key_r)); + map(0x0111, 0x0111).w(m_terminal, FUNC(generic_terminal_device::write)); +} static INPUT_PORTS_START( c900 ) INPUT_PORTS_END |