summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/kaneko16.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/kaneko16.cpp')
-rw-r--r--src/mame/drivers/kaneko16.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp
index 6e621570089..ead915916b1 100644
--- a/src/mame/drivers/kaneko16.cpp
+++ b/src/mame/drivers/kaneko16.cpp
@@ -306,7 +306,7 @@ WRITE16_MEMBER(kaneko16_berlwall_state::berlwall_spriteregs_w)
m_kaneko_spr->kaneko16_sprites_regs_w(space, offset, data, mem_mask);
}
-static ADDRESS_MAP_START( berlwall, AS_PROGRAM, 16, kaneko16_berlwall_state )
+ADDRESS_MAP_START(kaneko16_berlwall_state::berlwall)
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // Work RAM
AM_RANGE(0x30e000, 0x30ffff) AM_READWRITE(berlwall_spriteram_r, berlwall_spriteram_w) AM_SHARE("spriteram") // Sprites (scrambled RAM)
@@ -346,7 +346,7 @@ WRITE16_MEMBER(kaneko16_state::bakubrkr_oki_bank_w)
}
}
-static ADDRESS_MAP_START( bakubrkr, AS_PROGRAM, 16, kaneko16_state )
+ADDRESS_MAP_START(kaneko16_state::bakubrkr)
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x400000, 0x40001f) AM_READ(kaneko16_ay1_YM2149_r) // Sound
@@ -374,7 +374,7 @@ ADDRESS_MAP_END
Blaze On
***************************************************************************/
-static ADDRESS_MAP_START( blazeon, AS_PROGRAM, 16, kaneko16_state )
+ADDRESS_MAP_START(kaneko16_state::blazeon)
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x30ffff) AM_RAM // Work RAM
AM_RANGE(0x500000, 0x500fff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette") // Palette
@@ -428,7 +428,7 @@ WRITE16_MEMBER(kaneko16_gtmr_state::bloodwar_coin_lockout_w)
}
}
-static ADDRESS_MAP_START( bloodwar, AS_PROGRAM, 16, kaneko16_gtmr_state )
+ADDRESS_MAP_START(kaneko16_gtmr_state::bloodwar)
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("mcuram")
@@ -482,7 +482,7 @@ WRITE16_MEMBER(kaneko16_gtmr_state::bonkadv_oki_1_bank_w)
}
-static ADDRESS_MAP_START( bonkadv, AS_PROGRAM, 16, kaneko16_gtmr_state )
+ADDRESS_MAP_START(kaneko16_gtmr_state::bonkadv)
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("mcuram") // Shared With MCU
@@ -550,7 +550,7 @@ WRITE16_MEMBER(kaneko16_gtmr_state::gtmr_oki_1_bank_w)
}
}
-static ADDRESS_MAP_START( gtmr_map, AS_PROGRAM, 16, kaneko16_gtmr_state )
+ADDRESS_MAP_START(kaneko16_gtmr_state::gtmr_map)
AM_RANGE(0x000000, 0x0ffffd) AM_ROM // ROM
AM_RANGE(0x0ffffe, 0x0fffff) AM_READ(gtmr_wheel_r) // Wheel Value
@@ -619,7 +619,7 @@ READ16_MEMBER(kaneko16_gtmr_state::gtmr2_IN1_r)
return (ioport("P2")->read() & (ioport("FAKE")->read() | ~0x7100));
}
-static ADDRESS_MAP_START( gtmr2_map, AS_PROGRAM, 16, kaneko16_gtmr_state )
+ADDRESS_MAP_START(kaneko16_gtmr_state::gtmr2_map)
AM_RANGE(0x000000, 0x0ffffd) AM_ROM // ROM
AM_RANGE(0x0ffffe, 0x0fffff) AM_READ(gtmr2_wheel_r) // Wheel Value
@@ -665,7 +665,7 @@ ADDRESS_MAP_END
Magical Crystal
***************************************************************************/
-static ADDRESS_MAP_START( mgcrystl, AS_PROGRAM, 16, kaneko16_state )
+ADDRESS_MAP_START(kaneko16_state::mgcrystl)
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x30ffff) AM_RAM // Work RAM
AM_RANGE(0x400000, 0x40001f) AM_READWRITE(kaneko16_ay1_YM2149_r, kaneko16_ay1_YM2149_w) // Sound
@@ -724,7 +724,7 @@ WRITE16_MEMBER(kaneko16_shogwarr_state::brapboys_oki_bank_w)
}
-static ADDRESS_MAP_START( shogwarr, AS_PROGRAM, 16, kaneko16_shogwarr_state )
+ADDRESS_MAP_START(kaneko16_shogwarr_state::shogwarr)
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_SHARE("mainram") // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("mcuram")
@@ -763,13 +763,13 @@ ADDRESS_MAP_END
Blaze On
***************************************************************************/
-static ADDRESS_MAP_START( blazeon_soundmem, AS_PROGRAM, 8, kaneko16_state )
+ADDRESS_MAP_START(kaneko16_state::blazeon_soundmem)
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM // ROM (supposed to be banked?)
AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blazeon_soundport, AS_IO, 8, kaneko16_state )
+ADDRESS_MAP_START(kaneko16_state::blazeon_soundport)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write)
AM_RANGE(0x06, 0x06) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
@@ -787,7 +787,7 @@ WRITE8_MEMBER(kaneko16_state::wingforc_oki_bank_w)
logerror("%s: unknown OKI bank %02X\n", machine().describe_context(), data);
}
-static ADDRESS_MAP_START( wingforc_soundport, AS_IO, 8, kaneko16_state )
+ADDRESS_MAP_START(kaneko16_state::wingforc_soundport)
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x00) // 02 written at boot
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write)
@@ -2364,12 +2364,12 @@ static const uint16_t shogwarr_default_eeprom[64] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, 0xFFFF
};
-static ADDRESS_MAP_START( shogwarr_oki1_map, 0, 8, kaneko16_shogwarr_state )
+ADDRESS_MAP_START(kaneko16_shogwarr_state::shogwarr_oki1_map)
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("bank10")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shogwarr_oki2_map, 0, 8, kaneko16_shogwarr_state )
+ADDRESS_MAP_START(kaneko16_shogwarr_state::shogwarr_oki2_map)
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank11")
ADDRESS_MAP_END
@@ -2444,7 +2444,7 @@ static const uint16_t brapboys_default_eeprom[64] = {
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0035, 0xFFFF, 0xFFFF, 0xFFFF
};
-static ADDRESS_MAP_START( brapboys_oki2_map, 0, 8, kaneko16_shogwarr_state )
+ADDRESS_MAP_START(kaneko16_shogwarr_state::brapboys_oki2_map)
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank11")
ADDRESS_MAP_END