summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/r2dx_v33.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/r2dx_v33.cpp')
-rw-r--r--src/mame/drivers/r2dx_v33.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp
index 5def6015cbb..eaf8ec43382 100644
--- a/src/mame/drivers/r2dx_v33.cpp
+++ b/src/mame/drivers/r2dx_v33.cpp
@@ -126,6 +126,11 @@ public:
void nzerotea(machine_config &config);
void rdx_v33(machine_config &config);
void zerotm2k(machine_config &config);
+ void nzerotea_map(address_map &map);
+ void nzeroteam_base_map(address_map &map);
+ void r2dx_oki_map(address_map &map);
+ void rdx_v33_map(address_map &map);
+ void zerotm2k_map(address_map &map);
protected:
virtual void machine_start() override;
@@ -378,7 +383,7 @@ READ16_MEMBER(r2dx_v33_state::r2dx_debug_r)
return 0xffff;
}
-static ADDRESS_MAP_START( rdx_v33_map, AS_PROGRAM, 16, r2dx_v33_state )
+ADDRESS_MAP_START(r2dx_v33_state::rdx_v33_map)
AM_RANGE(0x00000, 0x003ff) AM_RAM // vectors copied here
AM_RANGE(0x00400, 0x00401) AM_WRITE(r2dx_tilemapdma_w) // tilemaps to private buffer
@@ -446,7 +451,7 @@ static ADDRESS_MAP_START( rdx_v33_map, AS_PROGRAM, 16, r2dx_v33_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nzeroteam_base_map, AS_PROGRAM, 16, r2dx_v33_state )
+ADDRESS_MAP_START(r2dx_v33_state::nzeroteam_base_map)
AM_RANGE(0x00000, 0x003ff) AM_RAM //stack area
AM_RANGE(0x00400, 0x00401) AM_WRITE(r2dx_tilemapdma_w) // tilemaps to private buffer
@@ -482,7 +487,7 @@ static ADDRESS_MAP_START( nzeroteam_base_map, AS_PROGRAM, 16, r2dx_v33_state )
// AM_RANGE(0x00762, 0x00763) AM_READ(nzerotea_unknown_r)
- AM_RANGE(0x00780, 0x0079f) AM_DEVREADWRITE8_MOD("seibu_sound", seibu_sound_device, main_r, main_w, rshift<1>, 0x00ff)
+ ;map(0x00780, 0x0079f).lrw8("seibu_sound_rw", [this](address_space &space, offs_t offset, u8 mem_mask){ return m_seibu_sound->main_r(space, offset >> 1, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask){ m_seibu_sound->main_w(space, offset >> 1, data, mem_mask); }).umask16(0x00ff);
AM_RANGE(0x00800, 0x00fff) AM_RAM
AM_RANGE(0x01000, 0x0bfff) AM_RAM
@@ -500,7 +505,7 @@ static ADDRESS_MAP_START( nzeroteam_base_map, AS_PROGRAM, 16, r2dx_v33_state )
AM_RANGE(0x20000, 0xfffff) AM_ROM AM_REGION("maincpu", 0x20000 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nzerotea_map, AS_PROGRAM, 16, r2dx_v33_state )
+ADDRESS_MAP_START(r2dx_v33_state::nzerotea_map)
AM_IMPORT_FROM( nzeroteam_base_map )
AM_RANGE(0x00740, 0x00741) AM_READ_PORT("DSW")
AM_RANGE(0x00744, 0x00745) AM_READ_PORT("INPUT")
@@ -516,7 +521,7 @@ WRITE16_MEMBER(r2dx_v33_state::zerotm2k_eeprom_w)
m_eeprom->cs_write((data & 0x01) ? ASSERT_LINE : CLEAR_LINE);
}
-static ADDRESS_MAP_START( zerotm2k_map, AS_PROGRAM, 16, r2dx_v33_state )
+ADDRESS_MAP_START(r2dx_v33_state::zerotm2k_map)
AM_IMPORT_FROM( nzeroteam_base_map )
AM_RANGE(0x00740, 0x00741) AM_READ_PORT("P3_P4")
AM_RANGE(0x00744, 0x00745) AM_READ_PORT("INPUT")
@@ -764,7 +769,7 @@ MACHINE_RESET_MEMBER(r2dx_v33_state,nzeroteam)
mid_bank = 1;
}
-static ADDRESS_MAP_START( r2dx_oki_map, 0, 8, r2dx_v33_state )
+ADDRESS_MAP_START(r2dx_v33_state::r2dx_oki_map)
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END