diff options
Diffstat (limited to 'src/mame/drivers/aerofgt.cpp')
-rw-r--r-- | src/mame/drivers/aerofgt.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 5e59706a838..778b80f3614 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -128,7 +128,7 @@ WRITE8_MEMBER(aerofgt_state::karatblzbl_d7759_reset_w) m_upd7759->reset_w(data & 0x80); } -static ADDRESS_MAP_START( pspikes_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::pspikes_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("spriteram1") @@ -143,7 +143,7 @@ static ADDRESS_MAP_START( pspikes_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( pspikesb_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::pspikesb_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("spriteram1") @@ -161,7 +161,7 @@ static ADDRESS_MAP_START( pspikesb_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( spikes91_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::spikes91_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("spriteram1") @@ -181,7 +181,7 @@ static ADDRESS_MAP_START( spikes91_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff008, 0xfff009) AM_WRITE(spikes91_lookup_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( pspikesc_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::pspikesc_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("spriteram1") @@ -197,7 +197,7 @@ static ADDRESS_MAP_START( pspikesc_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( kickball_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::kickball_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("spriteram1") @@ -212,7 +212,7 @@ static ADDRESS_MAP_START( kickball_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::karatblz_map) ADDRESS_MAP_GLOBAL_MASK(0xfffff) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -234,7 +234,7 @@ static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff400, 0x0ff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( karatblzbl_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::karatblzbl_map) ADDRESS_MAP_GLOBAL_MASK(0xfffff) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -256,7 +256,7 @@ static ADDRESS_MAP_START( karatblzbl_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff400, 0x0ff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::spinlbrk_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_SHARE("bg2videoram") @@ -274,7 +274,7 @@ static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::turbofrc_map) ADDRESS_MAP_GLOBAL_MASK(0xfffff) AM_RANGE(0x000000, 0x0bffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ @@ -297,7 +297,7 @@ static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff400, 0x0ff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( aerofgtb_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerofgtb_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -318,7 +318,7 @@ static ADDRESS_MAP_START( aerofgtb_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_SHARE("rasterram") /* used only for the scroll registers */ ADDRESS_MAP_END -static ADDRESS_MAP_START( aerofgt_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerofgt_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette") AM_RANGE(0x1b0000, 0x1b07ff) AM_RAM AM_SHARE("rasterram") /* used only for the scroll registers */ @@ -336,7 +336,7 @@ static ADDRESS_MAP_START( aerofgt_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xffffc0, 0xffffc1) AM_DEVWRITE8("soundlatch", generic_latch_8_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerfboot_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -364,7 +364,7 @@ static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x10c000, 0x117fff) AM_WRITENOP ADDRESS_MAP_END -static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerfboo2_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -391,7 +391,7 @@ static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_SHARE("rasterram") /* used only for the scroll registers */ ADDRESS_MAP_END -static ADDRESS_MAP_START( wbbc97_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::wbbc97_map) AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_RANGE(0x500000, 0x50ffff) AM_RAM /* work RAM */ AM_RANGE(0x600000, 0x605fff) AM_RAM AM_SHARE("spriteram1") @@ -408,27 +408,27 @@ static ADDRESS_MAP_START( wbbc97_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::sound_map) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM AM_RANGE(0x8000, 0xffff) AM_ROMBANK("soundbank") ADDRESS_MAP_END -static ADDRESS_MAP_START( spinlbrk_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::spinlbrk_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(spinlbrk_sh_bankswitch_w) AM_RANGE(0x14, 0x14) AM_DEVREADWRITE("soundlatch", generic_latch_8_device, read, acknowledge_w) AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) ADDRESS_MAP_END -static ADDRESS_MAP_START( turbofrc_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::turbofrc_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(aerofgt_sh_bankswitch_w) AM_RANGE(0x14, 0x14) AM_DEVREADWRITE("soundlatch", generic_latch_8_device, read, acknowledge_w) AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) ADDRESS_MAP_END -static ADDRESS_MAP_START( aerofgt_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerofgt_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) AM_RANGE(0x04, 0x04) AM_WRITE(aerofgt_sh_bankswitch_w) @@ -436,7 +436,7 @@ static ADDRESS_MAP_START( aerofgt_sound_portmap, AS_IO, 8, aerofgt_state ) AM_RANGE(0x0c, 0x0c) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( aerfboot_sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerfboot_sound_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(aerfboot_okim6295_banking_w) @@ -444,7 +444,7 @@ static ADDRESS_MAP_START( aerfboot_sound_map, AS_PROGRAM, 8, aerofgt_state ) AM_RANGE(0xa000, 0xa000) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( wbbc97_sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::wbbc97_sound_map) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE("oki", okim6295_device, read, write) @@ -453,13 +453,13 @@ static ADDRESS_MAP_START( wbbc97_sound_map, AS_PROGRAM, 8, aerofgt_state ) AM_RANGE(0xfc20, 0xfc20) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( karatblzbl_sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::karatblzbl_sound_map) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREAD("soundlatch", generic_latch_8_device, read) //AM_DEVWRITE("soundlatch2", generic_latch_8_device, write) ADDRESS_MAP_END -static ADDRESS_MAP_START( karatblzbl_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::karatblzbl_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_device, status_port_r, control_port_w) AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_device, write_port_w) @@ -467,13 +467,13 @@ static ADDRESS_MAP_START( karatblzbl_sound_portmap, AS_IO, 8, aerofgt_state ) AM_RANGE(0x80, 0x80) AM_WRITE(karatblzbl_d7759_reset_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( kickball_sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::kickball_sound_map) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( kickball_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::kickball_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_device, status_port_r, control_port_w) AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_device, write_port_w) @@ -482,7 +482,7 @@ static ADDRESS_MAP_START( kickball_sound_portmap, AS_IO, 8, aerofgt_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( oki_map, 0, 8, aerofgt_state ) //only for aerfboot for now +ADDRESS_MAP_START(aerofgt_state::oki_map) //only for aerfboot for now AM_RANGE(0x00000, 0x1ffff) AM_ROM AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank") ADDRESS_MAP_END |