diff options
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 |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/myvision.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/myvision.cpp')
-rw-r--r-- | src/mame/drivers/myvision.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp index e5db2e67973..2e1a795dfa3 100644 --- a/src/mame/drivers/myvision.cpp +++ b/src/mame/drivers/myvision.cpp @@ -71,22 +71,24 @@ private: }; -ADDRESS_MAP_START(myvision_state::myvision_mem) - ADDRESS_MAP_UNMAP_HIGH +void myvision_state::myvision_mem(address_map &map) +{ + map.unmap_value_high(); //AM_RANGE(0x0000, 0x5fff) // mapped by the cartslot - AM_RANGE(0xa000, 0xa7ff) AM_RAM - AM_RANGE(0xe000, 0xe000) AM_DEVREADWRITE("tms9918", tms9918a_device, vram_read, vram_write) - AM_RANGE(0xe002, 0xe002) AM_DEVREADWRITE("tms9918", tms9918a_device, register_read, register_write) -ADDRESS_MAP_END - - -ADDRESS_MAP_START(myvision_state::myvision_io) - ADDRESS_MAP_UNMAP_HIGH - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay8910", ay8910_device, address_w) - AM_RANGE(0x01, 0x01) AM_DEVWRITE("ay8910", ay8910_device, data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD("ay8910", ay8910_device, data_r) -ADDRESS_MAP_END + map(0xa000, 0xa7ff).ram(); + map(0xe000, 0xe000).rw("tms9918", FUNC(tms9918a_device::vram_read), FUNC(tms9918a_device::vram_write)); + map(0xe002, 0xe002).rw("tms9918", FUNC(tms9918a_device::register_read), FUNC(tms9918a_device::register_write)); +} + + +void myvision_state::myvision_io(address_map &map) +{ + map.unmap_value_high(); + map.global_mask(0xff); + map(0x00, 0x00).w("ay8910", FUNC(ay8910_device::address_w)); + map(0x01, 0x01).w("ay8910", FUNC(ay8910_device::data_w)); + map(0x02, 0x02).r("ay8910", FUNC(ay8910_device::data_r)); +} /* Input ports */ |