summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/flstory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/flstory.cpp')
-rw-r--r--src/mame/drivers/flstory.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp
index 32eeadf939c..1b0ef8c3004 100644
--- a/src/mame/drivers/flstory.cpp
+++ b/src/mame/drivers/flstory.cpp
@@ -32,7 +32,7 @@ WRITE8_MEMBER(flstory_state::snd_reset_w)
m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 1 ) ? ASSERT_LINE : CLEAR_LINE);
}
-static ADDRESS_MAP_START( base_map, AS_PROGRAM, 8, flstory_state )
+ADDRESS_MAP_START(flstory_state::base_map)
AM_RANGE(0x0000, 0xbfff) AM_ROM
// rumba lumber reads area 0xc800-0xcfff
@@ -63,7 +63,7 @@ static ADDRESS_MAP_START( base_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0xe000, 0xe7ff) AM_MIRROR(0x1800) AM_RAM AM_SHARE("workram") /* work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flstory_map, AS_PROGRAM, 8, flstory_state )
+ADDRESS_MAP_START(flstory_state::flstory_map)
AM_IMPORT_FROM(base_map)
AM_RANGE(0xd000, 0xd000) AM_DEVREADWRITE("bmcu", taito68705_mcu_device, data_r, data_w)
@@ -73,7 +73,7 @@ static ADDRESS_MAP_START( flstory_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0xdf03, 0xdf03) AM_WRITE(flstory_gfxctrl_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( onna34ro_map, AS_PROGRAM, 8, flstory_state )
+ADDRESS_MAP_START(flstory_state::onna34ro_map)
AM_IMPORT_FROM(base_map)
// AM_RANGE(0xd000, 0xd000) AM_DEVREADWRITE("bmcu", taito68705_mcu_device, data_r, data_w)
// AM_RANGE(0xd805, 0xd805) AM_READ(flstory_mcu_status_r)
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( onna34ro_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0xdf03, 0xdf03) AM_WRITE(flstory_gfxctrl_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( onna34ro_mcu_map, AS_PROGRAM, 8, flstory_state )
+ADDRESS_MAP_START(flstory_state::onna34ro_mcu_map)
AM_IMPORT_FROM(onna34ro_map)
AM_RANGE(0xd000, 0xd000) AM_DEVREADWRITE("bmcu", taito68705_mcu_device, data_r, data_w)
AM_RANGE(0xd805, 0xd805) AM_READ(flstory_mcu_status_r)
@@ -95,7 +95,7 @@ CUSTOM_INPUT_MEMBER(flstory_state::victnine_mcu_status_bit01_r)
return (victnine_mcu_status_r(space, 0) & 3);
}
-static ADDRESS_MAP_START( victnine_map, AS_PROGRAM, 8, flstory_state )
+ADDRESS_MAP_START(flstory_state::victnine_map)
AM_IMPORT_FROM(base_map)
AM_RANGE(0xd000, 0xd000) AM_READWRITE(victnine_mcu_r, victnine_mcu_w)
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( victnine_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0xdce1, 0xdce1) AM_WRITENOP /* unknown */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rumba_map, AS_PROGRAM, 8, flstory_state )
+ADDRESS_MAP_START(flstory_state::rumba_map)
AM_IMPORT_FROM(base_map)
AM_RANGE(0xd000, 0xd000) AM_DEVREADWRITE("bmcu", taito68705_mcu_device, data_r, data_w)
@@ -162,7 +162,7 @@ WRITE8_MEMBER(flstory_state::sound_control_3_w)
}
-static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, flstory_state )
+ADDRESS_MAP_START(flstory_state::sound_map)
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("aysnd", ym2149_device, address_data_w)