summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cabaret.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cabaret.cpp')
-rw-r--r--src/mame/drivers/cabaret.cpp40
1 files changed, 21 insertions, 19 deletions
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index 83587feb178..ec1b1323451 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -189,33 +189,35 @@ WRITE8_MEMBER(cabaret_state::ppi2_c_w)
-ADDRESS_MAP_START(cabaret_state::cabaret_map)
- AM_RANGE( 0x00000, 0x0efff ) AM_ROM
- AM_RANGE( 0x0f000, 0x0ffff ) AM_RAM AM_REGION("maincpu", 0xf000)
-ADDRESS_MAP_END
+void cabaret_state::cabaret_map(address_map &map)
+{
+ map(0x00000, 0x0efff).rom();
+ map(0x0f000, 0x0ffff).ram().region("maincpu", 0xf000);
+}
-ADDRESS_MAP_START(cabaret_state::cabaret_portmap)
- AM_RANGE( 0x0000, 0x003f ) AM_RAM // Z180 internal regs
+void cabaret_state::cabaret_portmap(address_map &map)
+{
+ map(0x0000, 0x003f).ram(); // Z180 internal regs
- AM_RANGE( 0x0080, 0x0083 ) AM_DEVREADWRITE("ppi1", i8255_device, read, write)
- AM_RANGE( 0x0090, 0x0093 ) AM_DEVREADWRITE("ppi2", i8255_device, read, write)
- AM_RANGE( 0x00a0, 0x00a3 ) AM_DEVREADWRITE("ppi3", i8255_device, read, write)
+ map(0x0080, 0x0083).rw("ppi1", FUNC(i8255_device::read), FUNC(i8255_device::write));
+ map(0x0090, 0x0093).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write));
+ map(0x00a0, 0x00a3).rw("ppi3", FUNC(i8255_device::read), FUNC(i8255_device::write));
- AM_RANGE( 0x00b0, 0x00b0 ) AM_READ_PORT("DSW3") /* DSW3 */
+ map(0x00b0, 0x00b0).portr("DSW3"); /* DSW3 */
- AM_RANGE( 0x00e0, 0x00e1 ) AM_DEVWRITE("ymsnd", ym2413_device, write)
+ map(0x00e0, 0x00e1).w("ymsnd", FUNC(ym2413_device::write));
- AM_RANGE( 0x2000, 0x27ff ) AM_RAM_WRITE(fg_tile_w ) AM_SHARE("fg_tile_ram")
- AM_RANGE( 0x2800, 0x2fff ) AM_RAM_WRITE(fg_color_w ) AM_SHARE("fg_color_ram")
+ map(0x2000, 0x27ff).ram().w(this, FUNC(cabaret_state::fg_tile_w)).share("fg_tile_ram");
+ map(0x2800, 0x2fff).ram().w(this, FUNC(cabaret_state::fg_color_w)).share("fg_color_ram");
- AM_RANGE( 0x3000, 0x37ff ) AM_RAM_DEVWRITE("palette", palette_device, write8) AM_SHARE("palette")
- AM_RANGE( 0x3800, 0x3fff ) AM_RAM_DEVWRITE("palette", palette_device, write8_ext) AM_SHARE("palette_ext")
+ map(0x3000, 0x37ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
+ map(0x3800, 0x3fff).ram().w(m_palette, FUNC(palette_device::write8_ext)).share("palette_ext");
- AM_RANGE( 0x1000, 0x103f ) AM_RAM_WRITE(bg_scroll_w ) AM_SHARE("bg_scroll")
+ map(0x1000, 0x103f).ram().w(this, FUNC(cabaret_state::bg_scroll_w)).share("bg_scroll");
- AM_RANGE( 0x1800, 0x19ff ) AM_RAM_WRITE(bg_tile_w ) AM_SHARE("bg_tile_ram")
- AM_RANGE( 0x8000, 0xffff ) AM_ROM AM_REGION("gfx3", 0)
-ADDRESS_MAP_END
+ map(0x1800, 0x19ff).ram().w(this, FUNC(cabaret_state::bg_tile_w)).share("bg_tile_ram");
+ map(0x8000, 0xffff).rom().region("gfx3", 0);
+}
/***************************************************************************