summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/kyugo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/kyugo.cpp')
-rw-r--r--src/mame/drivers/kyugo.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp
index a6e36adc364..4c179c841b0 100644
--- a/src/mame/drivers/kyugo.cpp
+++ b/src/mame/drivers/kyugo.cpp
@@ -40,7 +40,7 @@
*
*************************************/
-static ADDRESS_MAP_START( kyugo_main_map, AS_PROGRAM, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::kyugo_main_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(bgvideoram_w) AM_SHARE("bgvideoram")
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(bgattribram_w) AM_SHARE("bgattribram")
@@ -53,7 +53,7 @@ static ADDRESS_MAP_START( kyugo_main_map, AS_PROGRAM, 8, kyugo_state )
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("shared_ram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gyrodine_main_map, AS_PROGRAM, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::gyrodine_main_map)
AM_IMPORT_FROM(kyugo_main_map)
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w)
ADDRESS_MAP_END
@@ -71,7 +71,7 @@ WRITE_LINE_MEMBER(kyugo_state::nmi_mask_w)
m_nmi_mask = state;
}
-static ADDRESS_MAP_START( kyugo_main_portmap, AS_IO, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::kyugo_main_portmap)
ADDRESS_MAP_GLOBAL_MASK(0x07)
AM_RANGE(0x00, 0x07) AM_DEVWRITE("mainlatch", ls259_device, write_d0)
ADDRESS_MAP_END
@@ -85,7 +85,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( gyrodine_sub_map, AS_PROGRAM, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::gyrodine_sub_map)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("shared_ram")
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("P2")
@@ -94,7 +94,7 @@ static ADDRESS_MAP_START( gyrodine_sub_map, AS_PROGRAM, 8, kyugo_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( repulse_sub_map, AS_PROGRAM, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::repulse_sub_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("shared_ram")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P2")
@@ -103,7 +103,7 @@ static ADDRESS_MAP_START( repulse_sub_map, AS_PROGRAM, 8, kyugo_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( srdmissn_sub_map, AS_PROGRAM, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::srdmissn_sub_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("shared_ram")
AM_RANGE(0xf400, 0xf400) AM_READ_PORT("SYSTEM")
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( srdmissn_sub_map, AS_PROGRAM, 8, kyugo_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( legend_sub_map, AS_PROGRAM, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::legend_sub_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("shared_ram")
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("SYSTEM")
@@ -121,7 +121,7 @@ static ADDRESS_MAP_START( legend_sub_map, AS_PROGRAM, 8, kyugo_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flashgala_sub_map, AS_PROGRAM, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::flashgala_sub_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc040, 0xc040) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc080, 0xc080) AM_READ_PORT("P1")
@@ -142,7 +142,7 @@ WRITE8_MEMBER(kyugo_state::coin_counter_w)
machine().bookkeeping().coin_counter_w(offset, data & 1);
}
-static ADDRESS_MAP_START( gyrodine_sub_portmap, AS_IO, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::gyrodine_sub_portmap)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_device, address_data_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD("ay1", ay8910_device, data_r)
@@ -150,7 +150,7 @@ static ADDRESS_MAP_START( gyrodine_sub_portmap, AS_IO, 8, kyugo_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( repulse_sub_portmap, AS_IO, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::repulse_sub_portmap)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_device, address_data_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD("ay1", ay8910_device, data_r)
@@ -159,7 +159,7 @@ static ADDRESS_MAP_START( repulse_sub_portmap, AS_IO, 8, kyugo_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flashgala_sub_portmap, AS_IO, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::flashgala_sub_portmap)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay1", ay8910_device, address_data_w)
AM_RANGE(0x42, 0x42) AM_DEVREAD("ay1", ay8910_device, data_r)
@@ -168,7 +168,7 @@ static ADDRESS_MAP_START( flashgala_sub_portmap, AS_IO, 8, kyugo_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( srdmissn_sub_portmap, AS_IO, 8, kyugo_state )
+ADDRESS_MAP_START(kyugo_state::srdmissn_sub_portmap)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay1", ay8910_device, address_data_w)
AM_RANGE(0x82, 0x82) AM_DEVREAD("ay1", ay8910_device, data_r)