diff options
Diffstat (limited to 'src/mame/drivers/sigmab52.cpp')
-rw-r--r-- | src/mame/drivers/sigmab52.cpp | 83 |
1 files changed, 43 insertions, 40 deletions
diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp index 1ccacc7282e..fe592cd52e5 100644 --- a/src/mame/drivers/sigmab52.cpp +++ b/src/mame/drivers/sigmab52.cpp @@ -318,44 +318,45 @@ WRITE8_MEMBER(sigmab52_state::palette_bank_w) * Memory Maps * *************************/ -ADDRESS_MAP_START(sigmab52_state::jwildb52_map) - AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("nvram") - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") +void sigmab52_state::jwildb52_map(address_map &map) +{ + map(0x0000, 0x3fff).ram().share("nvram"); + map(0x4000, 0x7fff).bankr("bank1"); - AM_RANGE(0x8000, 0xf6ff) AM_ROM + map(0x8000, 0xf6ff).rom(); - AM_RANGE(0xf700, 0xf700) AM_READ(unk_f700_r) // ACIA ??? - AM_RANGE(0xf710, 0xf710) AM_WRITE(bank1_w) + map(0xf700, 0xf700).r(this, FUNC(sigmab52_state::unk_f700_r)); // ACIA ??? + map(0xf710, 0xf710).w(this, FUNC(sigmab52_state::bank1_w)); - AM_RANGE(0xf720, 0xf727) AM_DEVREADWRITE("6840ptm_1", ptm6840_device, read, write) + map(0xf720, 0xf727).rw("6840ptm_1", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); - AM_RANGE(0xf730, 0xf730) AM_DEVREADWRITE("hd63484", hd63484_device, status8_r, address8_w) - AM_RANGE(0xf731, 0xf731) AM_DEVREADWRITE("hd63484", hd63484_device, data8_r, data8_w) + map(0xf730, 0xf730).rw("hd63484", FUNC(hd63484_device::status8_r), FUNC(hd63484_device::address8_w)); + map(0xf731, 0xf731).rw("hd63484", FUNC(hd63484_device::data8_r), FUNC(hd63484_device::data8_w)); - AM_RANGE(0xf740, 0xf740) AM_READ(in0_r) - AM_RANGE(0xf741, 0xf741) AM_READ_PORT("IN1") - AM_RANGE(0xf742, 0xf742) AM_READ_PORT("IN2") - AM_RANGE(0xf743, 0xf743) AM_READ_PORT("DSW1") - AM_RANGE(0xf744, 0xf744) AM_READ_PORT("DSW2") - AM_RANGE(0xf745, 0xf745) AM_READ_PORT("DSW3") - AM_RANGE(0xf746, 0xf746) AM_READ_PORT("DSW4") - AM_RANGE(0xf747, 0xf747) AM_READ_PORT("IN3") - AM_RANGE(0xf750, 0xf750) AM_WRITE(palette_bank_w) + map(0xf740, 0xf740).r(this, FUNC(sigmab52_state::in0_r)); + map(0xf741, 0xf741).portr("IN1"); + map(0xf742, 0xf742).portr("IN2"); + map(0xf743, 0xf743).portr("DSW1"); + map(0xf744, 0xf744).portr("DSW2"); + map(0xf745, 0xf745).portr("DSW3"); + map(0xf746, 0xf746).portr("DSW4"); + map(0xf747, 0xf747).portr("IN3"); + map(0xf750, 0xf750).w(this, FUNC(sigmab52_state::palette_bank_w)); - AM_RANGE(0xf760, 0xf760) AM_READ(unk_f760_r) + map(0xf760, 0xf760).r(this, FUNC(sigmab52_state::unk_f760_r)); // AM_RANGE(0xf770, 0xf77f) Bill validator - AM_RANGE(0xf780, 0xf780) AM_WRITE(audiocpu_cmd_irq_w) - AM_RANGE(0xf790, 0xf790) AM_DEVWRITE("soundlatch", generic_latch_8_device, write) + map(0xf780, 0xf780).w(this, FUNC(sigmab52_state::audiocpu_cmd_irq_w)); + map(0xf790, 0xf790).w("soundlatch", FUNC(generic_latch_8_device::write)); - AM_RANGE(0xf7b0, 0xf7b0) AM_WRITE(coin_enable_w) - AM_RANGE(0xf7d5, 0xf7d5) AM_WRITE(hopper_w) - AM_RANGE(0xf7b2, 0xf7b7) AM_WRITE(lamps1_w) - AM_RANGE(0xf7c0, 0xf7c3) AM_WRITE(lamps2_w) - AM_RANGE(0xf7d6, 0xf7d7) AM_WRITE(tower_lamps_w) - AM_RANGE(0xf800, 0xffff) AM_ROM -ADDRESS_MAP_END + map(0xf7b0, 0xf7b0).w(this, FUNC(sigmab52_state::coin_enable_w)); + map(0xf7d5, 0xf7d5).w(this, FUNC(sigmab52_state::hopper_w)); + map(0xf7b2, 0xf7b7).w(this, FUNC(sigmab52_state::lamps1_w)); + map(0xf7c0, 0xf7c3).w(this, FUNC(sigmab52_state::lamps2_w)); + map(0xf7d6, 0xf7d7).w(this, FUNC(sigmab52_state::tower_lamps_w)); + map(0xf800, 0xffff).rom(); +} /* Unknown R/W: @@ -369,24 +370,26 @@ ADDRESS_MAP_END */ -ADDRESS_MAP_START(sigmab52_state::sound_prog_map) - AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x6020, 0x6027) AM_DEVREADWRITE("6840ptm_2", ptm6840_device, read, write) - AM_RANGE(0x6030, 0x6030) AM_WRITE(audiocpu_irq_ack_w) - AM_RANGE(0x6050, 0x6050) AM_DEVREAD("soundlatch", generic_latch_8_device, read) - AM_RANGE(0x6060, 0x6061) AM_DEVREADWRITE("ymsnd", ym3812_device, read, write) - AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("audiocpu", 0) -ADDRESS_MAP_END +void sigmab52_state::sound_prog_map(address_map &map) +{ + map(0x0000, 0x1fff).ram(); + map(0x6020, 0x6027).rw(m_6840ptm_2, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); + map(0x6030, 0x6030).w(this, FUNC(sigmab52_state::audiocpu_irq_ack_w)); + map(0x6050, 0x6050).r("soundlatch", FUNC(generic_latch_8_device::read)); + map(0x6060, 0x6061).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x8000, 0xffff).rom().region("audiocpu", 0); +} /* Unknown R/W: */ -ADDRESS_MAP_START(sigmab52_state::jwildb52_hd63484_map) - AM_RANGE(0x00000, 0x1ffff) AM_RAM - AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("gfx1", 0) -ADDRESS_MAP_END +void sigmab52_state::jwildb52_hd63484_map(address_map &map) +{ + map(0x00000, 0x1ffff).ram(); + map(0x20000, 0x3ffff).rom().region("gfx1", 0); +} INPUT_CHANGED_MEMBER( sigmab52_state::coin_drop_start ) { |