From 115bb9936c5cd3faf955d7eb1e251a94e4744b7b Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Tue, 13 Mar 2018 07:36:43 +0100 Subject: Address maps macros removal, pass 1 [O. Galibert] --- src/mame/drivers/compc.cpp | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'src/mame/drivers/compc.cpp') diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp index 7c3f0f7e9ff..3a4a88c3c55 100644 --- a/src/mame/drivers/compc.cpp +++ b/src/mame/drivers/compc.cpp @@ -172,22 +172,25 @@ static INPUT_PORTS_START(compc) PORT_INCLUDE(pc_keyboard) INPUT_PORTS_END -ADDRESS_MAP_START(compc_state::compc_map) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0xf0000, 0xfffff) AM_ROM AM_REGION("bios", 0) -ADDRESS_MAP_END - -ADDRESS_MAP_START(compc_state::compc_io) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x00ff) AM_DEVICE("mb", pc_noppi_mb_device, map) - AM_RANGE(0x0060, 0x0063) AM_READWRITE(pio_r, pio_w) -ADDRESS_MAP_END - -ADDRESS_MAP_START(compc_state::compciii_io) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x00ff) AM_DEVICE("mb", pc_noppi_mb_device, map) - AM_RANGE(0x0060, 0x0063) AM_READWRITE(pioiii_r, pioiii_w) -ADDRESS_MAP_END +void compc_state::compc_map(address_map &map) +{ + map.unmap_value_high(); + map(0xf0000, 0xfffff).rom().region("bios", 0); +} + +void compc_state::compc_io(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map)); + map(0x0060, 0x0063).rw(this, FUNC(compc_state::pio_r), FUNC(compc_state::pio_w)); +} + +void compc_state::compciii_io(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0x00ff).m(m_mb, FUNC(pc_noppi_mb_device::map)); + map(0x0060, 0x0063).rw(this, FUNC(compc_state::pioiii_r), FUNC(compc_state::pioiii_w)); +} MACHINE_CONFIG_START(compc_state::compc) MCFG_CPU_ADD("maincpu", I8088, 4772720*2) -- cgit v1.2.3-70-g09d2