diff options
Diffstat (limited to 'src/mame/drivers/dacholer.cpp')
-rw-r--r-- | src/mame/drivers/dacholer.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index bc076a603a1..163c21d8675 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -107,6 +107,13 @@ public: DECLARE_WRITE_LINE_MEMBER(adpcm_int); void itaten(machine_config &config); void dacholer(machine_config &config); + void itaten_main_map(address_map &map); + void itaten_snd_io_map(address_map &map); + void itaten_snd_map(address_map &map); + void main_io_map(address_map &map); + void main_map(address_map &map); + void snd_io_map(address_map &map); + void snd_map(address_map &map); }; TILE_GET_INFO_MEMBER(dacholer_state::get_bg_tile_info) @@ -226,7 +233,7 @@ WRITE8_MEMBER(dacholer_state::main_irq_ack_w) } -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, dacholer_state ) +ADDRESS_MAP_START(dacholer_state::main_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8800, 0x97ff) AM_RAM AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x400) AM_RAM_WRITE(background_w) AM_SHARE("bgvideoram") @@ -234,13 +241,13 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, dacholer_state ) AM_RANGE(0xe000, 0xe0ff) AM_RAM AM_SHARE("spriteram") ADDRESS_MAP_END -static ADDRESS_MAP_START( itaten_main_map, AS_PROGRAM, 8, dacholer_state ) +ADDRESS_MAP_START(dacholer_state::itaten_main_map) AM_IMPORT_FROM( main_map ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xb7ff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( main_io_map, AS_IO, 8, dacholer_state ) +ADDRESS_MAP_START(dacholer_state::main_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") @@ -257,13 +264,13 @@ static ADDRESS_MAP_START( main_io_map, AS_IO, 8, dacholer_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( snd_map, AS_PROGRAM, 8, dacholer_state ) +ADDRESS_MAP_START(dacholer_state::snd_map) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0xd000, 0xe7ff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( itaten_snd_map, AS_PROGRAM, 8, dacholer_state ) +ADDRESS_MAP_START(dacholer_state::itaten_snd_map) AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0xe000, 0xe7ff) AM_RAM ADDRESS_MAP_END @@ -295,7 +302,7 @@ WRITE8_MEMBER(dacholer_state::music_irq_w) m_music_interrupt_enable = data; } -static ADDRESS_MAP_START( snd_io_map, AS_IO, 8, dacholer_state ) +ADDRESS_MAP_START(dacholer_state::snd_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("soundlatch", generic_latch_8_device, read, acknowledge_w) AM_RANGE(0x04, 0x04) AM_WRITE(music_irq_w) @@ -307,7 +314,7 @@ static ADDRESS_MAP_START( snd_io_map, AS_IO, 8, dacholer_state ) AM_RANGE(0x8e, 0x8f) AM_DEVWRITE("ay3", ay8910_device, data_address_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( itaten_snd_io_map, AS_IO, 8, dacholer_state ) +ADDRESS_MAP_START(dacholer_state::itaten_snd_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("soundlatch", generic_latch_8_device, read, acknowledge_w) AM_RANGE(0x86, 0x87) AM_DEVWRITE("ay1", ay8910_device, data_address_w) |