summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/olibochu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/olibochu.cpp')
-rw-r--r--src/mame/drivers/olibochu.cpp56
1 files changed, 29 insertions, 27 deletions
diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp
index 64c3d3d7159..dc256e266c7 100644
--- a/src/mame/drivers/olibochu.cpp
+++ b/src/mame/drivers/olibochu.cpp
@@ -270,33 +270,35 @@ WRITE8_MEMBER(olibochu_state::sound_command_w)
}
-ADDRESS_MAP_START(olibochu_state::olibochu_map)
- AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(olibochu_videoram_w) AM_SHARE("videoram")
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(olibochu_colorram_w) AM_SHARE("colorram")
- AM_RANGE(0x9000, 0x903f) AM_RAM //???
- AM_RANGE(0x9800, 0x983f) AM_RAM //???
- AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
- AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1")
- AM_RANGE(0xa002, 0xa002) AM_READ_PORT("IN2")
- AM_RANGE(0xa003, 0xa003) AM_READ_PORT("DSW0")
- AM_RANGE(0xa004, 0xa004) AM_READ_PORT("DSW1")
- AM_RANGE(0xa005, 0xa005) AM_READ_PORT("DSW2")
- AM_RANGE(0xa800, 0xa801) AM_WRITE(sound_command_w)
- AM_RANGE(0xa802, 0xa802) AM_WRITE(olibochu_flipscreen_w) /* bit 6 = enable sound? */
- AM_RANGE(0xf000, 0xffff) AM_RAM
- AM_RANGE(0xf400, 0xf41f) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xf440, 0xf47f) AM_RAM AM_SHARE("spriteram2")
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(olibochu_state::olibochu_sound_map)
- AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x6000, 0x63ff) AM_RAM
- AM_RANGE(0x7000, 0x7000) AM_DEVREAD("soundlatch", generic_latch_8_device, read) /* likely ay8910 input port, not direct */
- AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
- AM_RANGE(0x7004, 0x7004) AM_WRITENOP //sound filter?
- AM_RANGE(0x7006, 0x7006) AM_WRITENOP //irq ack?
-ADDRESS_MAP_END
+void olibochu_state::olibochu_map(address_map &map)
+{
+ map(0x0000, 0x7fff).rom();
+ map(0x8000, 0x83ff).ram().w(this, FUNC(olibochu_state::olibochu_videoram_w)).share("videoram");
+ map(0x8400, 0x87ff).ram().w(this, FUNC(olibochu_state::olibochu_colorram_w)).share("colorram");
+ map(0x9000, 0x903f).ram(); //???
+ map(0x9800, 0x983f).ram(); //???
+ map(0xa000, 0xa000).portr("IN0");
+ map(0xa001, 0xa001).portr("IN1");
+ map(0xa002, 0xa002).portr("IN2");
+ map(0xa003, 0xa003).portr("DSW0");
+ map(0xa004, 0xa004).portr("DSW1");
+ map(0xa005, 0xa005).portr("DSW2");
+ map(0xa800, 0xa801).w(this, FUNC(olibochu_state::sound_command_w));
+ map(0xa802, 0xa802).w(this, FUNC(olibochu_state::olibochu_flipscreen_w)); /* bit 6 = enable sound? */
+ map(0xf000, 0xffff).ram();
+ map(0xf400, 0xf41f).ram().share("spriteram");
+ map(0xf440, 0xf47f).ram().share("spriteram2");
+}
+
+void olibochu_state::olibochu_sound_map(address_map &map)
+{
+ map(0x0000, 0x1fff).rom();
+ map(0x6000, 0x63ff).ram();
+ map(0x7000, 0x7000).r(m_soundlatch, FUNC(generic_latch_8_device::read)); /* likely ay8910 input port, not direct */
+ map(0x7000, 0x7001).w("aysnd", FUNC(ay8910_device::address_data_w));
+ map(0x7004, 0x7004).nopw(); //sound filter?
+ map(0x7006, 0x7006).nopw(); //irq ack?
+}
static INPUT_PORTS_START( olibochu )