summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/namcos21.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/namcos21.cpp')
-rw-r--r--src/mame/drivers/namcos21.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp
index 2f15b932afd..cd832de261f 100644
--- a/src/mame/drivers/namcos21.cpp
+++ b/src/mame/drivers/namcos21.cpp
@@ -978,17 +978,17 @@ WRITE16_MEMBER(namcos21_state::dsp_xf_w)
if (ENABLE_LOGGING) logerror("xf(%d)\n",data);
}
-static ADDRESS_MAP_START( master_dsp_program, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::master_dsp_program)
AM_RANGE(0x0000, 0x0fff) AM_ROM /* BIOS */
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_SHARE("master_dsp_code")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_dsp_data, AS_DATA, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::master_dsp_data)
AM_RANGE(0x2000, 0x200f) AM_READWRITE(dspcuskey_r,dspcuskey_w)
AM_RANGE(0x8000, 0xffff) AM_READWRITE(dspram16_r,dspram16_w<false>) /* 0x8000 words */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_dsp_io, AS_IO, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::master_dsp_io)
AM_RANGE(0x00,0x00) AM_READWRITE(dsp_port0_r,dsp_port0_w)
AM_RANGE(0x01,0x01) AM_READWRITE(dsp_port1_r,dsp_port1_w)
AM_RANGE(0x02,0x02) AM_READWRITE(dsp_port2_r,dsp_port2_w)
@@ -1101,16 +1101,16 @@ READ16_MEMBER(namcos21_state::slave_portf_r)
return 1;
}
-static ADDRESS_MAP_START( slave_dsp_program, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::slave_dsp_program)
AM_RANGE(0x0000, 0x0fff) AM_ROM /* BIOS */
AM_RANGE(0x8000, 0x8fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_dsp_data, AS_DATA, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::slave_dsp_data)
/* no external data memory */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_dsp_io, AS_IO, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::slave_dsp_io)
AM_RANGE(0x00,0x00) AM_READWRITE(slave_port0_r,slave_port0_w)
AM_RANGE(0x02,0x02) AM_READ(slave_port2_r)
AM_RANGE(0x03,0x03) AM_READWRITE(slave_port3_r,slave_port3_w)
@@ -1235,7 +1235,7 @@ WRITE8_MEMBER(namcos21_state::namcos2_dualportram_byte_w)
/* MASTER 68000 CPU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( common_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::common_map)
AM_RANGE(0x280000, 0x280001) AM_WRITENOP /* written once on startup */
AM_RANGE(0x400000, 0x400001) AM_WRITE(pointram_control_w)
AM_RANGE(0x440000, 0x440001) AM_READWRITE(pointram_data_r,pointram_data_w)
@@ -1254,7 +1254,7 @@ static ADDRESS_MAP_START( common_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0xc00000, 0xcfffff) AM_ROM AM_MIRROR(0x100000) AM_REGION("edata", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::master_map)
AM_IMPORT_FROM( common_map )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */
@@ -1263,7 +1263,7 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0x200000, 0x20ffff) AM_READWRITE(dspram16_r,dspram16_w<true>) AM_SHARE("dspram16")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::slave_map)
AM_IMPORT_FROM( common_map )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAM /* private work RAM */
@@ -1407,17 +1407,17 @@ READ16_MEMBER(namcos21_state::winrun_table_r)
return m_winrun_polydata[offset];
}
-static ADDRESS_MAP_START( winrun_dsp_program, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::winrun_dsp_program)
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winrun_dsp_data, AS_DATA, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::winrun_dsp_data)
AM_RANGE( 0x2000, 0x200f ) AM_READWRITE(winrun_cuskey_r,winrun_cuskey_w)
AM_RANGE( 0x4000, 0x4fff ) AM_READWRITE(winrun_dspcomram_r,winrun_dspcomram_w)
AM_RANGE( 0x8000, 0xffff ) AM_READ(winrun_table_r )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winrun_dsp_io, AS_IO, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::winrun_dsp_io)
AM_RANGE(0x08,0x09) AM_READWRITE(winrun_dsp_pointrom_data_r,winrun_dsp_pointrom_addr_w)
AM_RANGE(0x0a,0x0a) AM_WRITE(winrun_dsp_render_w)
AM_RANGE(0x0b,0x0b) AM_WRITENOP
@@ -1464,7 +1464,7 @@ WRITE16_MEMBER(namcos21_state::winrun_dspcomram_control_w)
COMBINE_DATA( &m_winrun_dspcomram_control[offset] );
}
-static ADDRESS_MAP_START( winrun_master_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::winrun_master_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff)
@@ -1484,7 +1484,7 @@ static ADDRESS_MAP_START( winrun_master_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winrun_slave_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::winrun_slave_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAM
AM_RANGE(0x1c0000, 0x1fffff) AM_DEVICE("slave_intc", namco_c148_device, map)
@@ -1497,7 +1497,7 @@ static ADDRESS_MAP_START( winrun_slave_map, AS_PROGRAM, 16, namcos21_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winrun_gpu_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::winrun_gpu_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READWRITE(winrun_gpu_color_r,winrun_gpu_color_w) /* ? */
AM_RANGE(0x180000, 0x19ffff) AM_RAM /* work RAM */
@@ -1516,7 +1516,7 @@ ADDRESS_MAP_END
/* SOUND 6809 CPU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::sound_map)
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank6") /* banked */
AM_RANGE(0x3000, 0x3003) AM_WRITENOP /* ? */
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_device,read,write)
@@ -1536,7 +1536,7 @@ ADDRESS_MAP_END
/* I/O HD63705 MCU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::mcu_map)
AM_RANGE(0x0000, 0x003f) AM_RAM
AM_RANGE(0x0000, 0x0000) AM_READNOP
AM_RANGE(0x0001, 0x0001) AM_READ_PORT("PORTB") /* p1,p2 start */
@@ -1563,7 +1563,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( driveyes_common_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::driveyes_common_map)
AM_RANGE(0x700000, 0x71ffff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w)
AM_RANGE(0x720000, 0x720007) AM_READWRITE(c355_obj_position_r,c355_obj_position_w)
AM_RANGE(0x740000, 0x74ffff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette")
@@ -1576,7 +1576,7 @@ static ADDRESS_MAP_START( driveyes_common_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( driveyes_master_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::driveyes_master_map)
AM_IMPORT_FROM( driveyes_common_map )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */
@@ -1590,7 +1590,7 @@ static ADDRESS_MAP_START( driveyes_master_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0x440000, 0x440001) AM_READWRITE(pointram_data_r,pointram_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( driveyes_slave_map, AS_PROGRAM, 16, namcos21_state )
+ADDRESS_MAP_START(namcos21_state::driveyes_slave_map)
AM_IMPORT_FROM( driveyes_common_map )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */