diff options
author | 2018-03-13 07:36:43 +0100 | |
---|---|---|
committer | 2018-03-14 14:07:14 +0100 | |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/itech8.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/itech8.cpp')
-rw-r--r-- | src/mame/drivers/itech8.cpp | 196 |
1 files changed, 103 insertions, 93 deletions
diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index b5cb20b991b..65fc7571968 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -857,67 +857,71 @@ WRITE8_MEMBER(itech8_state::ninclown_palette_w) *************************************/ /*------ common layout with TMS34061 at 0000 ------*/ -ADDRESS_MAP_START(itech8_state::tmslo_map) - AM_RANGE(0x0000, 0x0fff) AM_READWRITE(tms34061_r, tms34061_w) - AM_RANGE(0x1100, 0x1100) AM_WRITENOP - AM_RANGE(0x1120, 0x1120) AM_WRITE(sound_data_w) - AM_RANGE(0x1140, 0x1140) AM_READ_PORT("40") AM_WRITE(grom_bank_w) - AM_RANGE(0x1160, 0x1160) AM_READ_PORT("60") AM_WRITE(page_w) - AM_RANGE(0x1180, 0x1180) AM_READ_PORT("80") AM_DEVWRITE("tms34061", tms34061_device, latch_w) - AM_RANGE(0x11a0, 0x11a0) AM_WRITE(nmi_ack_w) - AM_RANGE(0x11c0, 0x11df) AM_READ(blitter_r) AM_WRITE(blitter_bank_w) - AM_RANGE(0x11e0, 0x11ff) AM_WRITE(palette_w) - AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("nvram") - AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1") -ADDRESS_MAP_END +void itech8_state::tmslo_map(address_map &map) +{ + map(0x0000, 0x0fff).rw(this, FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); + map(0x1100, 0x1100).nopw(); + map(0x1120, 0x1120).w(this, FUNC(itech8_state::sound_data_w)); + map(0x1140, 0x1140).portr("40").w(this, FUNC(itech8_state::grom_bank_w)); + map(0x1160, 0x1160).portr("60").w(this, FUNC(itech8_state::page_w)); + map(0x1180, 0x1180).portr("80").w(m_tms34061, FUNC(tms34061_device::latch_w)); + map(0x11a0, 0x11a0).w(this, FUNC(itech8_state::nmi_ack_w)); + map(0x11c0, 0x11df).r(this, FUNC(itech8_state::blitter_r)).w(this, FUNC(itech8_state::blitter_bank_w)); + map(0x11e0, 0x11ff).w(this, FUNC(itech8_state::palette_w)); + map(0x2000, 0x3fff).ram().share("nvram"); + map(0x4000, 0xffff).bankr("bank1"); +} /*------ common layout with TMS34061 at 1000 ------*/ -ADDRESS_MAP_START(itech8_state::tmshi_map) - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(tms34061_r, tms34061_w) - AM_RANGE(0x0100, 0x0100) AM_WRITENOP - AM_RANGE(0x0120, 0x0120) AM_WRITE(sound_data_w) - AM_RANGE(0x0140, 0x0140) AM_READ_PORT("40") AM_WRITE(grom_bank_w) - AM_RANGE(0x0160, 0x0160) AM_READ_PORT("60") AM_WRITE(page_w) - AM_RANGE(0x0180, 0x0180) AM_READ_PORT("80") AM_DEVWRITE("tms34061", tms34061_device, latch_w) - AM_RANGE(0x01a0, 0x01a0) AM_WRITE(nmi_ack_w) - AM_RANGE(0x01c0, 0x01df) AM_READ(blitter_r) AM_WRITE(blitter_bank_w) - AM_RANGE(0x01e0, 0x01ff) AM_WRITE(palette_w) - AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("nvram") - AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1") -ADDRESS_MAP_END +void itech8_state::tmshi_map(address_map &map) +{ + map(0x1000, 0x1fff).rw(this, FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); + map(0x0100, 0x0100).nopw(); + map(0x0120, 0x0120).w(this, FUNC(itech8_state::sound_data_w)); + map(0x0140, 0x0140).portr("40").w(this, FUNC(itech8_state::grom_bank_w)); + map(0x0160, 0x0160).portr("60").w(this, FUNC(itech8_state::page_w)); + map(0x0180, 0x0180).portr("80").w(m_tms34061, FUNC(tms34061_device::latch_w)); + map(0x01a0, 0x01a0).w(this, FUNC(itech8_state::nmi_ack_w)); + map(0x01c0, 0x01df).r(this, FUNC(itech8_state::blitter_r)).w(this, FUNC(itech8_state::blitter_bank_w)); + map(0x01e0, 0x01ff).w(this, FUNC(itech8_state::palette_w)); + map(0x2000, 0x3fff).ram().share("nvram"); + map(0x4000, 0xffff).bankr("bank1"); +} /*------ Golden Tee Golf II 1992 layout ------*/ -ADDRESS_MAP_START(itech8_state::gtg2_map) - AM_RANGE(0x0100, 0x0100) AM_READ_PORT("40") AM_WRITE(nmi_ack_w) - AM_RANGE(0x0120, 0x0120) AM_READ_PORT("60") AM_WRITE(page_w) - AM_RANGE(0x0140, 0x015f) AM_WRITE(palette_w) - AM_RANGE(0x0140, 0x0140) AM_READ_PORT("80") - AM_RANGE(0x0160, 0x0160) AM_WRITE(grom_bank_w) - AM_RANGE(0x0180, 0x019f) AM_READ(blitter_r) AM_WRITE(blitter_bank_w) - AM_RANGE(0x01c0, 0x01c0) AM_WRITE(gtg2_sound_data_w) - AM_RANGE(0x01e0, 0x01e0) AM_DEVWRITE("tms34061", tms34061_device, latch_w) - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(tms34061_r, tms34061_w) - AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("nvram") - AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1") -ADDRESS_MAP_END +void itech8_state::gtg2_map(address_map &map) +{ + map(0x0100, 0x0100).portr("40").w(this, FUNC(itech8_state::nmi_ack_w)); + map(0x0120, 0x0120).portr("60").w(this, FUNC(itech8_state::page_w)); + map(0x0140, 0x015f).w(this, FUNC(itech8_state::palette_w)); + map(0x0140, 0x0140).portr("80"); + map(0x0160, 0x0160).w(this, FUNC(itech8_state::grom_bank_w)); + map(0x0180, 0x019f).r(this, FUNC(itech8_state::blitter_r)).w(this, FUNC(itech8_state::blitter_bank_w)); + map(0x01c0, 0x01c0).w(this, FUNC(itech8_state::gtg2_sound_data_w)); + map(0x01e0, 0x01e0).w(m_tms34061, FUNC(tms34061_device::latch_w)); + map(0x1000, 0x1fff).rw(this, FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); + map(0x2000, 0x3fff).ram().share("nvram"); + map(0x4000, 0xffff).bankr("bank1"); +} /*------ Ninja Clowns layout ------*/ -ADDRESS_MAP_START(itech8_state::ninclown_map) - AM_RANGE(0x000000, 0x00007f) AM_RAM AM_REGION("maincpu", 0) - AM_RANGE(0x000080, 0x003fff) AM_RAM AM_SHARE("nvram") - AM_RANGE(0x004000, 0x03ffff) AM_ROM - AM_RANGE(0x040000, 0x07ffff) AM_READ(rom_constant_r) - AM_RANGE(0x100080, 0x100081) AM_WRITE8(sound_data_w, 0xff00) - AM_RANGE(0x100100, 0x100101) AM_READ_PORT("40") AM_WRITE(grom_bank16_w) - AM_RANGE(0x100180, 0x100181) AM_READ_PORT("60") AM_WRITE(display_page16_w) - AM_RANGE(0x100240, 0x100241) AM_DEVWRITE8("tms34061", tms34061_device, latch_w, 0xff00) - AM_RANGE(0x100280, 0x100281) AM_READ_PORT("80") AM_WRITENOP - AM_RANGE(0x100300, 0x10031f) AM_READWRITE8(blitter_r, blitter_w, 0xffff) - AM_RANGE(0x100380, 0x1003ff) AM_READWRITE8(ninclown_palette_r, ninclown_palette_w, 0xff00) - AM_RANGE(0x110000, 0x110fff) AM_READWRITE8(tms34061_r, tms34061_w, 0xffff) -ADDRESS_MAP_END +void itech8_state::ninclown_map(address_map &map) +{ + map(0x000000, 0x00007f).ram().region("maincpu", 0); + map(0x000080, 0x003fff).ram().share("nvram"); + map(0x004000, 0x03ffff).rom(); + map(0x040000, 0x07ffff).r(this, FUNC(itech8_state::rom_constant_r)); + map(0x100080, 0x100080).w(this, FUNC(itech8_state::sound_data_w)); + map(0x100100, 0x100101).portr("40").w(this, FUNC(itech8_state::grom_bank16_w)); + map(0x100180, 0x100181).portr("60").w(this, FUNC(itech8_state::display_page16_w)); + map(0x100240, 0x100240).w(m_tms34061, FUNC(tms34061_device::latch_w)); + map(0x100280, 0x100281).portr("80").nopw(); + map(0x100300, 0x10031f).rw(this, FUNC(itech8_state::blitter_r), FUNC(itech8_state::blitter_w)); + map(0x100380, 0x1003ff).rw(this, FUNC(itech8_state::ninclown_palette_r), FUNC(itech8_state::ninclown_palette_w)).umask16(0xff00); + map(0x110000, 0x110fff).rw(this, FUNC(itech8_state::tms34061_r), FUNC(itech8_state::tms34061_w)); +} @@ -928,48 +932,52 @@ ADDRESS_MAP_END *************************************/ /*------ YM2203-based sound ------*/ -ADDRESS_MAP_START(itech8_state::sound2203_map) - AM_RANGE(0x0000, 0x0000) AM_WRITENOP - AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0002) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) - AM_RANGE(0x3000, 0x37ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_device, read, write) - AM_RANGE(0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END +void itech8_state::sound2203_map(address_map &map) +{ + map(0x0000, 0x0000).nopw(); + map(0x1000, 0x1000).r(this, FUNC(itech8_state::sound_data_r)); + map(0x2000, 0x2001).mirror(0x0002).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); + map(0x3000, 0x37ff).ram(); + map(0x4000, 0x4000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0x8000, 0xffff).rom(); +} /*------ YM2608B-based sound ------*/ -ADDRESS_MAP_START(itech8_state::sound2608b_map) - AM_RANGE(0x1000, 0x1000) AM_WRITENOP - AM_RANGE(0x2000, 0x2000) AM_READ(sound_data_r) - AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ymsnd", ym2608_device, read, write) - AM_RANGE(0x6000, 0x67ff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END +void itech8_state::sound2608b_map(address_map &map) +{ + map(0x1000, 0x1000).nopw(); + map(0x2000, 0x2000).r(this, FUNC(itech8_state::sound_data_r)); + map(0x4000, 0x4003).rw("ymsnd", FUNC(ym2608_device::read), FUNC(ym2608_device::write)); + map(0x6000, 0x67ff).ram(); + map(0x8000, 0xffff).rom(); +} /*------ YM3812-based sound ------*/ -ADDRESS_MAP_START(itech8_state::sound3812_map) - AM_RANGE(0x0000, 0x0000) AM_WRITENOP - AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym3812_device, read, write) - AM_RANGE(0x3000, 0x37ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_device, read, write) - AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("pia", pia6821_device, read, write) - AM_RANGE(0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END +void itech8_state::sound3812_map(address_map &map) +{ + map(0x0000, 0x0000).nopw(); + map(0x1000, 0x1000).r(this, FUNC(itech8_state::sound_data_r)); + map(0x2000, 0x2001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x3000, 0x37ff).ram(); + map(0x4000, 0x4000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0x5000, 0x5003).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x8000, 0xffff).rom(); +} /*------ external YM3812-based sound board ------*/ -ADDRESS_MAP_START(itech8_state::sound3812_external_map) - AM_RANGE(0x0000, 0x0000) AM_WRITENOP - AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym3812_device, read, write) - AM_RANGE(0x3000, 0x37ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_device, read, write) - AM_RANGE(0x5000, 0x500f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) - AM_RANGE(0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END +void itech8_state::sound3812_external_map(address_map &map) +{ + map(0x0000, 0x0000).nopw(); + map(0x1000, 0x1000).r(this, FUNC(itech8_state::sound_data_r)); + map(0x2000, 0x2001).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x3000, 0x37ff).ram(); + map(0x4000, 0x4000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0x5000, 0x500f).rw("via6522_0", FUNC(via6522_device::read), FUNC(via6522_device::write)); + map(0x8000, 0xffff).rom(); +} @@ -979,15 +987,17 @@ ADDRESS_MAP_END * *************************************/ -ADDRESS_MAP_START(itech8_state::slikz80_mem_map) - AM_RANGE(0x0000, 0x7ff) AM_ROM -ADDRESS_MAP_END +void itech8_state::slikz80_mem_map(address_map &map) +{ + map(0x0000, 0x7ff).rom(); +} -ADDRESS_MAP_START(itech8_state::slikz80_io_map) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READWRITE(slikz80_port_r, slikz80_port_w) -ADDRESS_MAP_END +void itech8_state::slikz80_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0x00).rw(this, FUNC(itech8_state::slikz80_port_r), FUNC(itech8_state::slikz80_port_w)); +} |