diff options
Diffstat (limited to 'src/mame/drivers/marineb.cpp')
-rw-r--r-- | src/mame/drivers/marineb.cpp | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp index 4d24b032f99..ded73a301e0 100644 --- a/src/mame/drivers/marineb.cpp +++ b/src/mame/drivers/marineb.cpp @@ -65,33 +65,36 @@ WRITE_LINE_MEMBER(marineb_state::irq_mask_w) m_irq_mask = state; } -ADDRESS_MAP_START(marineb_state::marineb_map) - AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(marineb_videoram_w) AM_SHARE("videoram") - AM_RANGE(0x8c00, 0x8c3f) AM_RAM AM_SHARE("spriteram") /* Hoccer only */ - AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(marineb_colorram_w) AM_SHARE("colorram") - AM_RANGE(0x9800, 0x9800) AM_WRITE(marineb_column_scroll_w) - AM_RANGE(0x9a00, 0x9a00) AM_WRITE(marineb_palette_bank_0_w) - AM_RANGE(0x9c00, 0x9c00) AM_WRITE(marineb_palette_bank_1_w) - AM_RANGE(0xa000, 0xa007) AM_DEVWRITE("outlatch", ls259_device, write_d0) - AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P2") - AM_RANGE(0xa800, 0xa800) AM_READ_PORT("P1") - AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW") - AM_RANGE(0xb800, 0xb800) AM_READ_PORT("SYSTEM") AM_WRITENOP /* also watchdog */ -ADDRESS_MAP_END - - -ADDRESS_MAP_START(marineb_state::marineb_io_map) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay1", ay8910_device, address_data_w) -ADDRESS_MAP_END - -ADDRESS_MAP_START(marineb_state::wanted_io_map) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8912_device, address_data_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8912_device, address_data_w) -ADDRESS_MAP_END +void marineb_state::marineb_map(address_map &map) +{ + map(0x0000, 0x7fff).rom(); + map(0x8000, 0x87ff).ram(); + map(0x8800, 0x8bff).ram().w(this, FUNC(marineb_state::marineb_videoram_w)).share("videoram"); + map(0x8c00, 0x8c3f).ram().share("spriteram"); /* Hoccer only */ + map(0x9000, 0x93ff).ram().w(this, FUNC(marineb_state::marineb_colorram_w)).share("colorram"); + map(0x9800, 0x9800).w(this, FUNC(marineb_state::marineb_column_scroll_w)); + map(0x9a00, 0x9a00).w(this, FUNC(marineb_state::marineb_palette_bank_0_w)); + map(0x9c00, 0x9c00).w(this, FUNC(marineb_state::marineb_palette_bank_1_w)); + map(0xa000, 0xa007).w("outlatch", FUNC(ls259_device::write_d0)); + map(0xa000, 0xa000).portr("P2"); + map(0xa800, 0xa800).portr("P1"); + map(0xb000, 0xb000).portr("DSW"); + map(0xb800, 0xb800).portr("SYSTEM").nopw(); /* also watchdog */ +} + + +void marineb_state::marineb_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x08, 0x09).w("ay1", FUNC(ay8910_device::address_data_w)); +} + +void marineb_state::wanted_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0x01).w("ay1", FUNC(ay8912_device::address_data_w)); + map(0x02, 0x03).w("ay2", FUNC(ay8912_device::address_data_w)); +} static INPUT_PORTS_START( marineb ) |