summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cdi.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cdi.cpp')
-rw-r--r--src/mame/drivers/cdi.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index 8a5d4da4c4f..a7de95fb5b6 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -67,7 +67,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, co
* Memory maps *
*************************/
-static ADDRESS_MAP_START( cdimono1_mem, AS_PROGRAM, 16, cdi_state )
+ADDRESS_MAP_START(cdi_state::cdimono1_mem)
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_SHARE("planea")
AM_RANGE(0x00200000, 0x0027ffff) AM_RAM AM_SHARE("planeb")
AM_RANGE(0x00300000, 0x00303bff) AM_DEVREADWRITE("cdic", cdicdic_device, ram_r, ram_w)
@@ -86,7 +86,7 @@ static ADDRESS_MAP_START( cdimono1_mem, AS_PROGRAM, 16, cdi_state )
AM_RANGE(0x80000000, 0x8000807f) AM_DEVREADWRITE("scc68070", cdi68070_device, periphs_r, periphs_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cdimono2_mem, AS_PROGRAM, 16, cdi_state )
+ADDRESS_MAP_START(cdi_state::cdimono2_mem)
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_SHARE("planea")
AM_RANGE(0x00200000, 0x0027ffff) AM_RAM AM_SHARE("planeb")
#if ENABLE_UART_PRINTING
@@ -105,7 +105,7 @@ static ADDRESS_MAP_START( cdimono2_mem, AS_PROGRAM, 16, cdi_state )
AM_RANGE(0x80000000, 0x8000807f) AM_DEVREADWRITE("scc68070", cdi68070_device, periphs_r, periphs_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cdi910_mem, AS_PROGRAM, 16, cdi_state )
+ADDRESS_MAP_START(cdi_state::cdi910_mem)
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_SHARE("planea")
AM_RANGE(0x00180000, 0x001fffff) AM_ROM AM_REGION("maincpu", 0) // boot vectors point here
@@ -126,13 +126,13 @@ static ADDRESS_MAP_START( cdi910_mem, AS_PROGRAM, 16, cdi_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cdimono2_servo_mem, AS_PROGRAM, 8, cdi_state )
+ADDRESS_MAP_START(cdi_state::cdimono2_servo_mem)
AM_RANGE(0x0000, 0x001f) AM_READWRITE(servo_io_r, servo_io_w)
AM_RANGE(0x0050, 0x00ff) AM_RAM
AM_RANGE(0x0100, 0x1fff) AM_ROM AM_REGION("servo", 0x100)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cdimono2_slave_mem, AS_PROGRAM, 8, cdi_state )
+ADDRESS_MAP_START(cdi_state::cdimono2_slave_mem)
AM_RANGE(0x0000, 0x001f) AM_READWRITE(slave_io_r, slave_io_w)
AM_RANGE(0x0050, 0x00ff) AM_RAM
AM_RANGE(0x0100, 0x1fff) AM_ROM AM_REGION("slave", 0x100)
@@ -946,7 +946,7 @@ READ8_MEMBER( cdi_state::quizard_mcu_p1_r )
return machine().rand();
}
-static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, cdi_state )
+ADDRESS_MAP_START(cdi_state::mcu_io_map)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READ(quizard_mcu_p1_r)
ADDRESS_MAP_END