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/pangofun.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/pangofun.cpp')
-rw-r--r-- | src/mame/drivers/pangofun.cpp | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/mame/drivers/pangofun.cpp b/src/mame/drivers/pangofun.cpp index d984735ae3e..5a49388de5a 100644 --- a/src/mame/drivers/pangofun.cpp +++ b/src/mame/drivers/pangofun.cpp @@ -115,26 +115,28 @@ public: }; -ADDRESS_MAP_START(pangofun_state::pcat_map) - AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) - AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0) - AM_RANGE(0x000e0000, 0x000effff) AM_ROM AM_REGION("game_prg", 0) - AM_RANGE(0x000f0000, 0x000fffff) AM_ROM AM_REGION("bios", 0 ) +void pangofun_state::pcat_map(address_map &map) +{ + map(0x00000000, 0x0009ffff).ram(); + map(0x000a0000, 0x000bffff).rw("vga", FUNC(vga_device::mem_r), FUNC(vga_device::mem_w)); + map(0x000c0000, 0x000c7fff).rom().region("video_bios", 0); + map(0x000e0000, 0x000effff).rom().region("game_prg", 0); + map(0x000f0000, 0x000fffff).rom().region("bios", 0); /* TODO: correct RAM mapping/size? */ - AM_RANGE(0x00100000, 0x00ffffff) AM_NOP - AM_RANGE(0x01000000, 0x01ffffff) AM_RAM - AM_RANGE(0x02000000, 0xfffeffff) AM_NOP - AM_RANGE(0xffff0000, 0xffffffff) AM_ROM AM_REGION("bios", 0 ) -ADDRESS_MAP_END - -ADDRESS_MAP_START(pangofun_state::pcat_io) - AM_IMPORT_FROM(pcat32_io_common) - AM_RANGE(0x00e0, 0x00e3) AM_WRITENOP - AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) -ADDRESS_MAP_END + map(0x00100000, 0x00ffffff).noprw(); + map(0x01000000, 0x01ffffff).ram(); + map(0x02000000, 0xfffeffff).noprw(); + map(0xffff0000, 0xffffffff).rom().region("bios", 0); +} + +void pangofun_state::pcat_io(address_map &map) +{ + pcat32_io_common(map); + map(0x00e0, 0x00e3).nopw(); + map(0x03b0, 0x03bf).rw("vga", FUNC(vga_device::port_03b0_r), FUNC(vga_device::port_03b0_w)); + map(0x03c0, 0x03cf).rw("vga", FUNC(vga_device::port_03c0_r), FUNC(vga_device::port_03c0_w)); + map(0x03d0, 0x03df).rw("vga", FUNC(vga_device::port_03d0_r), FUNC(vga_device::port_03d0_w)); +} #define AT_KEYB_HELPER(bit, text, key1) \ PORT_BIT( bit, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(text) PORT_CODE(key1) |