summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/model2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/model2.cpp')
-rw-r--r--src/mame/drivers/model2.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index 7ee07b12800..aa826e11909 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -1441,7 +1441,7 @@ READ32_MEMBER(model2_state::polygon_count_r)
}
/* common map for all Model 2 versions */
-static ADDRESS_MAP_START( model2_base_mem, AS_PROGRAM, 32, model2_state )
+ADDRESS_MAP_START(model2_state::model2_base_mem)
AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_WRITENOP
AM_RANGE(0x00500000, 0x005fffff) AM_RAM AM_SHARE("workram")
@@ -1546,7 +1546,7 @@ READ8_MEMBER(model2_state::model2o_in_r)
}
/* original Model 2 overrides */
-static ADDRESS_MAP_START( model2o_mem, AS_PROGRAM, 32, model2_state )
+ADDRESS_MAP_START(model2_state::model2o_mem)
AM_IMPORT_FROM(model2_base_mem)
AM_RANGE(0x00200000, 0x0021ffff) AM_RAM
@@ -1582,7 +1582,7 @@ READ32_MEMBER(model2_state::copro_status_r)
}
/* 2A-CRX overrides */
-static ADDRESS_MAP_START( model2a_crx_mem, AS_PROGRAM, 32, model2_state )
+ADDRESS_MAP_START(model2_state::model2a_crx_mem)
AM_IMPORT_FROM(model2_base_mem)
AM_RANGE(0x00200000, 0x0023ffff) AM_RAM
@@ -1610,7 +1610,7 @@ static ADDRESS_MAP_START( model2a_crx_mem, AS_PROGRAM, 32, model2_state )
ADDRESS_MAP_END
/* 2B-CRX overrides */
-static ADDRESS_MAP_START( model2b_crx_mem, AS_PROGRAM, 32, model2_state )
+ADDRESS_MAP_START(model2_state::model2b_crx_mem)
AM_IMPORT_FROM(model2_base_mem)
AM_RANGE(0x00200000, 0x0023ffff) AM_RAM
@@ -1647,7 +1647,7 @@ static ADDRESS_MAP_START( model2b_crx_mem, AS_PROGRAM, 32, model2_state )
ADDRESS_MAP_END
/* 2C-CRX overrides */
-static ADDRESS_MAP_START( model2c_crx_mem, AS_PROGRAM, 32, model2_state )
+ADDRESS_MAP_START(model2_state::model2c_crx_mem)
AM_IMPORT_FROM(model2_base_mem)
AM_RANGE(0x00200000, 0x0023ffff) AM_RAM
@@ -2055,7 +2055,7 @@ WRITE16_MEMBER(model2_state::model2snd_ctrl)
}
}
-static ADDRESS_MAP_START( model2_snd, AS_PROGRAM, 16, model2_state )
+ADDRESS_MAP_START(model2_state::model2_snd)
AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_REGION("audiocpu", 0) AM_SHARE("soundram")
AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp", scsp_device, read, write)
AM_RANGE(0x400000, 0x400001) AM_WRITE(model2snd_ctrl)
@@ -2102,7 +2102,7 @@ WRITE32_MEMBER(model2_state::copro_sharc_buffer_w)
m_bufferram[offset & 0x7fff] = data;
}
-static ADDRESS_MAP_START( copro_sharc_map, AS_DATA, 32, model2_state )
+ADDRESS_MAP_START(model2_state::copro_sharc_map)
AM_RANGE(0x0400000, 0x0bfffff) AM_READ(copro_sharc_input_fifo_r)
AM_RANGE(0x0c00000, 0x13fffff) AM_WRITE(copro_sharc_output_fifo_w)
AM_RANGE(0x1400000, 0x1bfffff) AM_READWRITE(copro_sharc_buffer_r, copro_sharc_buffer_w)
@@ -2111,7 +2111,7 @@ static ADDRESS_MAP_START( copro_sharc_map, AS_DATA, 32, model2_state )
ADDRESS_MAP_END
#if 0
-static ADDRESS_MAP_START( geo_sharc_map, AS_DATA, 32, model2_state )
+ADDRESS_MAP_START(model2_state::geo_sharc_map)
ADDRESS_MAP_END
#endif
@@ -2128,7 +2128,7 @@ WRITE32_MEMBER(model2_state::copro_tgp_buffer_w)
m_bufferram[offset&0x7fff] = data;
}
-static ADDRESS_MAP_START( copro_tgp_map, AS_PROGRAM, 32, model2_state )
+ADDRESS_MAP_START(model2_state::copro_tgp_map)
AM_RANGE(0x00000000, 0x00007fff) AM_RAM AM_SHARE("tgp_program")
AM_RANGE(0x00400000, 0x00407fff) AM_READWRITE(copro_tgp_buffer_r, copro_tgp_buffer_w)
AM_RANGE(0x00800000, 0x009fffff) AM_ROM AM_REGION("tgp", 0)
@@ -2217,12 +2217,12 @@ WRITE8_MEMBER(model2_state::driveio_port_w)
// popmessage("%02x",data);
}
-static ADDRESS_MAP_START( drive_map, AS_PROGRAM, 8, model2_state )
+ADDRESS_MAP_START(model2_state::drive_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drive_io_map, AS_IO, 8, model2_state )
+ADDRESS_MAP_START(model2_state::drive_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP //watchdog
AM_RANGE(0x20, 0x2f) AM_DEVREADWRITE("driveio1", sega_315_5296_device, read, write)
@@ -2384,12 +2384,12 @@ MACHINE_CONFIG_DERIVED(model2_state::indy500, model2b)
MACHINE_CONFIG_END
-static ADDRESS_MAP_START( rchase2_iocpu_map, AS_PROGRAM, 8, model2_state )
+ADDRESS_MAP_START(model2_state::rchase2_iocpu_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rchase2_ioport_map, AS_IO, 8, model2_state )
+ADDRESS_MAP_START(model2_state::rchase2_ioport_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x07) AM_DEVREADWRITE("ioexp", cxd1095_device, read, write)
ADDRESS_MAP_END
@@ -2403,7 +2403,7 @@ MACHINE_CONFIG_DERIVED(model2_state::rchase2, model2b)
MACHINE_CONFIG_END
-static ADDRESS_MAP_START( copro_tgpx4_map, AS_PROGRAM, 64, model2_state )
+ADDRESS_MAP_START(model2_state::copro_tgpx4_map)
AM_RANGE(0x00000000, 0x00007fff) AM_RAM AM_SHARE("tgpx4_program")
ADDRESS_MAP_END