Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 09:20:02 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

general: Don't attach memory maps to driver_device [O. Galibert]

Browse Source
This commit is contained in:
Olivier Galibert 2016-11-10 11:01:53 +01:00
parent 762b6b9793
commit 9d18411999
15 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/audio/cinemat.cpp
View File

@ -1280,7 +1280,7 @@ SOUND_RESET_MEMBER( cinemat_state, demon )
}
static ADDRESS_MAP_START( demon_sound_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( demon_sound_map, AS_PROGRAM, 8, cinemat_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x3000, 0x33ff) AM_RAM
AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ay1", ay8910_device, data_r)
@ -1293,7 +1293,7 @@ static ADDRESS_MAP_START( demon_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_END
static ADDRESS_MAP_START( demon_sound_ports, AS_IO, 8, driver_device )
static ADDRESS_MAP_START( demon_sound_ports, AS_IO, 8, cinemat_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVWRITE("ctc", z80ctc_device, write)
AM_RANGE(0x1c, 0x1f) AM_DEVWRITE("ctc", z80ctc_device, write)

8
src/mame/audio/exidy.cpp
View File

@ -742,7 +742,7 @@ void venture_sound_device::sound_stream_update(sound_stream &stream, stream_samp
static ADDRESS_MAP_START( venture_audio_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( venture_audio_map, AS_PROGRAM, 8, venture_sound_device )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0780) AM_RAM
AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0780) AM_DEVREADWRITE("riot", riot6532_device, read, write)
@ -822,13 +822,13 @@ READ8_MEMBER( venture_sound_device::mtrap_voiceio_r )
}
static ADDRESS_MAP_START( cvsd_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( cvsd_map, AS_PROGRAM, 8, venture_sound_device )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( cvsd_iomap, AS_IO, 8, driver_device )
static ADDRESS_MAP_START( cvsd_iomap, AS_IO, 8, venture_sound_device )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_DEVREADWRITE("custom", venture_sound_device, mtrap_voiceio_r, mtrap_voiceio_w)
ADDRESS_MAP_END
@ -1006,7 +1006,7 @@ void victory_sound_device::sound_stream_update(sound_stream &stream, stream_samp
static ADDRESS_MAP_START( victory_audio_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( victory_audio_map, AS_PROGRAM, 8, venture_sound_device )
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0f00) AM_RAM
AM_RANGE(0x1000, 0x107f) AM_MIRROR(0x0f80) AM_DEVREADWRITE("riot", riot6532_device, read, write)
AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x0ffc) AM_DEVREADWRITE("pia1", pia6821_device, read, write)

2
src/mame/audio/exidy440.cpp
View File

@ -859,7 +859,7 @@ void exidy440_sound_device::sound_stream_update(sound_stream &stream, stream_sam
*
*************************************/
static ADDRESS_MAP_START( exidy440_audio_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( exidy440_audio_map, AS_PROGRAM, 8, exidy440_sound_device )
AM_RANGE(0x0000, 0x7fff) AM_NOP
AM_RANGE(0x8000, 0x801f) AM_MIRROR(0x03e0) AM_DEVREADWRITE("custom", exidy440_sound_device, m6844_r, m6844_w)
AM_RANGE(0x8400, 0x840f) AM_MIRROR(0x03f0) AM_DEVREADWRITE("custom", exidy440_sound_device, sound_volume_r, sound_volume_w)

2
src/mame/audio/hyprolyb.cpp
View File

@ -76,7 +76,7 @@ READ8_MEMBER( hyprolyb_adpcm_device::data_r )
return m_soundlatch2->read(*m_space, offset);
}
static ADDRESS_MAP_START( hyprolyb_adpcm_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( hyprolyb_adpcm_map, AS_PROGRAM, 8, hyprolyb_adpcm_device )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, data_r)
AM_RANGE(0x1001, 0x1001) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, ready_r)

8
src/mame/audio/leland.cpp
View File

@ -861,20 +861,20 @@ WRITE8_MEMBER( leland_80186_sound_device::ataxx_80186_control_w )
*
*************************************/
ADDRESS_MAP_START( leland_80186_map_program, AS_PROGRAM, 16, driver_device )
ADDRESS_MAP_START( leland_80186_map_program, AS_PROGRAM, 16, leland_80186_sound_device )
AM_RANGE(0x00000, 0x03fff) AM_MIRROR(0x1c000) AM_RAM
AM_RANGE(0x20000, 0xfffff) AM_ROM
ADDRESS_MAP_END
ADDRESS_MAP_START( ataxx_80186_map_io, AS_IO, 16, driver_device )
ADDRESS_MAP_START( ataxx_80186_map_io, AS_IO, 16, leland_80186_sound_device )
ADDRESS_MAP_END
ADDRESS_MAP_START( redline_80186_map_io, AS_IO, 16, driver_device )
ADDRESS_MAP_START( redline_80186_map_io, AS_IO, 16, leland_80186_sound_device )
AM_RANGE(0x0000, 0xffff) AM_DEVWRITE("custom", redline_80186_sound_device, redline_dac_w)
ADDRESS_MAP_END
ADDRESS_MAP_START( leland_80186_map_io, AS_IO, 16, driver_device )
ADDRESS_MAP_START( leland_80186_map_io, AS_IO, 16, leland_80186_sound_device )
AM_RANGE(0x0000, 0xffff) AM_DEVWRITE("custom", leland_80186_sound_device, dac_w)
ADDRESS_MAP_END

2
src/mame/audio/qix.cpp
View File

@ -153,7 +153,7 @@ WRITE_LINE_MEMBER(qix_state::qix_pia_sint)
*
*************************************/
static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, qix_state )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x5ffc) AM_DEVREADWRITE("sndpia2", pia6821_device, read, write)
AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x3ffc) AM_DEVREADWRITE("sndpia1", pia6821_device, read, write)

4
src/mame/audio/segasnd.cpp
View File

@ -196,12 +196,12 @@ void speech_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
*
*************************************/
static ADDRESS_MAP_START( speech_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( speech_map, AS_PROGRAM, 8, speech_sound_device )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x0800) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( speech_portmap, AS_IO, 8, driver_device )
static ADDRESS_MAP_START( speech_portmap, AS_IO, 8, speech_sound_device )
AM_RANGE(0x00, 0xff) AM_DEVREAD("segaspeech", speech_sound_device, rom_r)
AM_RANGE(0x00, 0xff) AM_DEVWRITE("speech", sp0250_device, write)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVREADWRITE("segaspeech", speech_sound_device, p1_r, p1_w)

16
src/mame/audio/seibu.cpp
View File

@ -358,12 +358,12 @@ WRITE16_MEMBER( seibu_sound_device::main_mustb_w )
/***************************************************************************/
ADDRESS_MAP_START( seibu_sound_decrypted_opcodes_map, AS_DECRYPTED_OPCODES, 8, driver_device )
ADDRESS_MAP_START( seibu_sound_decrypted_opcodes_map, AS_DECRYPTED_OPCODES, 8, seibu_sound_device )
AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("seibu_bank0d")
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1d")
ADDRESS_MAP_END
ADDRESS_MAP_START( seibu_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_START( seibu_sound_map, AS_PROGRAM, 8, seibu_sound_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w)
@ -381,7 +381,7 @@ ADDRESS_MAP_START( seibu_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1")
ADDRESS_MAP_END
ADDRESS_MAP_START( seibu2_airraid_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_START( seibu2_airraid_sound_map, AS_PROGRAM, 8, seibu_sound_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w)
@ -399,7 +399,7 @@ ADDRESS_MAP_START( seibu2_airraid_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1")
ADDRESS_MAP_END
ADDRESS_MAP_START( seibu2_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_START( seibu2_sound_map, AS_PROGRAM, 8, seibu_sound_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w)
@ -417,7 +417,7 @@ ADDRESS_MAP_START( seibu2_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1")
ADDRESS_MAP_END
ADDRESS_MAP_START( seibu2_raiden2_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_START( seibu2_raiden2_sound_map, AS_PROGRAM, 8, seibu_sound_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w)
@ -438,7 +438,7 @@ ADDRESS_MAP_START( seibu2_raiden2_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x401a, 0x401a) AM_NOP
ADDRESS_MAP_END
ADDRESS_MAP_START( seibu_newzeroteam_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_START( seibu_newzeroteam_sound_map, AS_PROGRAM, 8, seibu_sound_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w)
@ -456,7 +456,7 @@ ADDRESS_MAP_START( seibu_newzeroteam_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1")
ADDRESS_MAP_END
ADDRESS_MAP_START( seibu3_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_START( seibu3_sound_map, AS_PROGRAM, 8, seibu_sound_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w)
@ -474,7 +474,7 @@ ADDRESS_MAP_START( seibu3_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("seibu_bank1")
ADDRESS_MAP_END
ADDRESS_MAP_START( seibu3_adpcm_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_START( seibu3_adpcm_sound_map, AS_PROGRAM, 8, seibu_sound_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w)

2
src/mame/audio/taito_zm.cpp
View File

@ -106,7 +106,7 @@ WRITE8_MEMBER(taito_zoom_device::tms_ctrl_w)
}
ADDRESS_MAP_START( taitozoom_mn_map, AS_PROGRAM, 16, driver_device )
ADDRESS_MAP_START( taitozoom_mn_map, AS_PROGRAM, 16, taito_zoom_device )
AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("mn10200", 0)
AM_RANGE(0x400000, 0x41ffff) AM_RAM
AM_RANGE(0x800000, 0x8007ff) AM_DEVREADWRITE("zsg2", zsg2_device, read, write)

4
src/mame/audio/timeplt.cpp
View File

@ -149,7 +149,7 @@ WRITE8_MEMBER( timeplt_audio_device::sh_irqtrigger_w )
*
*************************************/
static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, timeplt_audio_device )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_device, data_r, data_w)
@ -160,7 +160,7 @@ static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_END
static ADDRESS_MAP_START( locomotn_sound_map, AS_PROGRAM, 8, driver_device )
static ADDRESS_MAP_START( locomotn_sound_map, AS_PROGRAM, 8, timeplt_audio_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM
AM_RANGE(0x3000, 0x3fff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w)

2
src/mame/drivers/anzterm.cpp
View File

@ -398,7 +398,7 @@ GFXDECODE_START( anzterm )
GFXDECODE_END
ADDRESS_MAP_START( anzterm, AS_PROGRAM, 8, driver_device )
ADDRESS_MAP_START( anzterm, AS_PROGRAM, 8, anzterm_state )
// There are two battery-backed 2kB SRAM chips with a 4kb SRAM chip for parity
// There are two 64kB DRAM banks (with parity)
// There's also a whole lot of ROM

2
src/mame/drivers/taitopjc.cpp
View File

@ -627,7 +627,7 @@ static ADDRESS_MAP_START( tlcs900h_mem, AS_PROGRAM, 16, taitopjc_state )
AM_RANGE(0xfc0000, 0xffffff) AM_ROM AM_REGION("io_cpu", 0)
ADDRESS_MAP_END
ADDRESS_MAP_START( mn10200_map, AS_PROGRAM, 16, driver_device )
ADDRESS_MAP_START( mn10200_map, AS_PROGRAM, 16, taitopjc_state )
AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("mn10200", 0)
ADDRESS_MAP_END

4
src/mame/video/cidelsa.cpp
View File

@ -103,12 +103,12 @@ WRITE_LINE_MEMBER( cidelsa_state::prd_w )
/* Page RAM */
static ADDRESS_MAP_START( cidelsa_page_ram, AS_0, 8, driver_device )
static ADDRESS_MAP_START( cidelsa_page_ram, AS_0, 8, cidelsa_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0x3ff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( draco_page_ram, AS_0, 8, driver_device )
static ADDRESS_MAP_START( draco_page_ram, AS_0, 8, draco_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0x7ff) AM_RAM
ADDRESS_MAP_END

2
src/mame/video/comx35.cpp
View File

@ -38,7 +38,7 @@ WRITE8_MEMBER( comx35_state::cdp1869_w )
/* CDP1869 */
static ADDRESS_MAP_START( cdp1869_page_ram, AS_0, 8, driver_device )
static ADDRESS_MAP_START( cdp1869_page_ram, AS_0, 8, comx35_state )
AM_RANGE(0x000, 0x7ff) AM_RAM
ADDRESS_MAP_END

2
src/mame/video/pecom.cpp
View File

@ -42,7 +42,7 @@ WRITE8_MEMBER(pecom_state::pecom_cdp1869_w)
}
}
static ADDRESS_MAP_START( cdp1869_page_ram, AS_0, 8, driver_device )
static ADDRESS_MAP_START( cdp1869_page_ram, AS_0, 8, pecom_state )
AM_RANGE(0x000, 0x3ff) AM_MIRROR(0x400) AM_RAM
ADDRESS_MAP_END