diff options
Diffstat (limited to 'src/mame/drivers/seibuspi.cpp')
-rw-r--r-- | src/mame/drivers/seibuspi.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index 91e99e7d862..c5f78177031 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -996,7 +996,7 @@ WRITE32_MEMBER(seibuspi_state::ejsakura_input_select_w) } -static ADDRESS_MAP_START( base_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::base_map) AM_RANGE(0x00000000, 0x0003ffff) AM_RAM AM_SHARE("mainram") AM_RANGE(0x00000400, 0x0000043f) AM_DEVREADWRITE16("crtc", seibu_crtc_device, read, write, 0xffffffff) AM_RANGE(0x00000480, 0x00000483) AM_WRITE(tilemap_dma_start_w) @@ -1012,7 +1012,7 @@ static ADDRESS_MAP_START( base_map, AS_PROGRAM, 32, seibuspi_state ) AM_RANGE(0xffe00000, 0xffffffff) AM_ROM AM_REGION("maincpu", 0) AM_SHARE("share1") // ROM location in real-mode ADDRESS_MAP_END -static ADDRESS_MAP_START( sei252_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::sei252_map) //AM_RANGE(0x00000500, 0x0000057f) AM_DEVREADWRITE16("obj", sei252_device, read_xor, write_xor, 0xffffffff) AM_RANGE(0x0000050c, 0x0000050f) AM_WRITE16(sprite_dma_start_w, 0xffff0000) AM_RANGE(0x00000524, 0x00000527) AM_WRITENOP // SEI252 sprite decryption key, see machine/spisprit.c @@ -1022,13 +1022,13 @@ static ADDRESS_MAP_START( sei252_map, AS_PROGRAM, 32, seibuspi_state ) AM_RANGE(0x0000053c, 0x0000053f) AM_WRITENOP // SEI252 sprite decryption table index, see machine/spisprit.c ADDRESS_MAP_END -static ADDRESS_MAP_START( rise_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::rise_map) //AM_RANGE(0x00000500, 0x0000057f) AM_DEVREADWRITE16("obj", seibu_encrypted_sprite_device, read, write, 0xffffffff) AM_RANGE(0x0000054c, 0x0000054f) AM_WRITENOP // RISE10/11 sprite decryption key, see machine/seibuspi.c AM_RANGE(0x00000560, 0x00000563) AM_WRITE16(sprite_dma_start_w, 0xffff0000) ADDRESS_MAP_END -static ADDRESS_MAP_START( spi_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::spi_map) AM_IMPORT_FROM( base_map ) AM_IMPORT_FROM( sei252_map ) AM_RANGE(0x00000600, 0x00000603) AM_WRITENOP // ? @@ -1046,7 +1046,7 @@ static ADDRESS_MAP_START( spi_map, AS_PROGRAM, 32, seibuspi_state ) AM_RANGE(0x00a00000, 0x013fffff) AM_ROM AM_REGION("sound01", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START( rdft2_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::rdft2_map) AM_IMPORT_FROM( base_map ) AM_IMPORT_FROM( rise_map ) AM_RANGE(0x00000600, 0x00000603) AM_WRITENOP // ? @@ -1064,7 +1064,7 @@ static ADDRESS_MAP_START( rdft2_map, AS_PROGRAM, 32, seibuspi_state ) AM_RANGE(0x00a00000, 0x013fffff) AM_ROM AM_REGION("sound01", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START( sxx2e_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::sxx2e_map) AM_IMPORT_FROM( base_map ) AM_IMPORT_FROM( sei252_map ) AM_RANGE(0x00000680, 0x00000683) AM_READ8(sb_coin_r, 0x000000ff) @@ -1079,7 +1079,7 @@ static ADDRESS_MAP_START( sxx2e_map, AS_PROGRAM, 32, seibuspi_state ) AM_RANGE(0x000006dc, 0x000006df) AM_READ8(spi_ds2404_unknown_r, 0x0000ff00) ADDRESS_MAP_END -static ADDRESS_MAP_START( sxx2f_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::sxx2f_map) AM_IMPORT_FROM( base_map ) AM_IMPORT_FROM( rise_map ) AM_RANGE(0x00000680, 0x00000683) AM_READ8(sb_coin_r, 0x000000ff) @@ -1090,7 +1090,7 @@ static ADDRESS_MAP_START( sxx2f_map, AS_PROGRAM, 32, seibuspi_state ) AM_RANGE(0x00000690, 0x00000693) AM_WRITENOP // ? ADDRESS_MAP_END -static ADDRESS_MAP_START( sys386i_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::sys386i_map) AM_IMPORT_FROM( base_map ) AM_IMPORT_FROM( rise_map ) AM_RANGE(0x0000068c, 0x0000068f) AM_WRITE8(spi_layerbanks_eeprom_w, 0x00ff0000) @@ -1099,7 +1099,7 @@ static ADDRESS_MAP_START( sys386i_map, AS_PROGRAM, 32, seibuspi_state ) AM_RANGE(0x01200004, 0x01200007) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x000000ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( sys386f_map, AS_PROGRAM, 32, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::sys386f_map) AM_RANGE(0x00000000, 0x0003ffff) AM_RAM AM_SHARE("mainram") AM_IMPORT_FROM( rise_map ) AM_RANGE(0x00000010, 0x00000013) AM_READ8(spi_status_r, 0x000000ff) @@ -1154,7 +1154,7 @@ WRITE8_MEMBER(seibuspi_state::spi_coin_w) } -static ADDRESS_MAP_START( sxx2e_soundmap, AS_PROGRAM, 8, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::sxx2e_soundmap) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_RANGE(0x4002, 0x4002) AM_WRITENOP // ? @@ -1170,7 +1170,7 @@ static ADDRESS_MAP_START( sxx2e_soundmap, AS_PROGRAM, 8, seibuspi_state ) AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END -static ADDRESS_MAP_START( spi_soundmap, AS_PROGRAM, 8, seibuspi_state ) +ADDRESS_MAP_START(seibuspi_state::spi_soundmap) AM_IMPORT_FROM( sxx2e_soundmap ) AM_RANGE(0x4008, 0x4008) AM_DEVWRITE("soundfifo2", fifo7200_device, data_byte_w) AM_RANGE(0x400a, 0x400a) AM_READ_PORT("JUMPERS") // TO DO: get these to actually work |