diff options
Diffstat (limited to 'src/mame/drivers/circus.cpp')
-rw-r--r-- | src/mame/drivers/circus.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp index 764631bfbac..79f5c261639 100644 --- a/src/mame/drivers/circus.cpp +++ b/src/mame/drivers/circus.cpp @@ -63,18 +63,19 @@ READ8_MEMBER(circus_state::circus_paddle_r) return ioport("PADDLE")->read(); } -ADDRESS_MAP_START(circus_state::circus_map) - AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x1000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x2000) AM_WRITE(circus_clown_x_w) - AM_RANGE(0x3000, 0x3000) AM_WRITE(circus_clown_y_w) - AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(circus_videoram_w) AM_SHARE("videoram") - AM_RANGE(0x8000, 0x8000) AM_RAM_WRITE(circus_clown_z_w) - AM_RANGE(0xa000, 0xa000) AM_READ_PORT("INPUTS") - AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW") - AM_RANGE(0xd000, 0xd000) AM_READ(circus_paddle_r) - AM_RANGE(0xf000, 0xffff) AM_ROM -ADDRESS_MAP_END +void circus_state::circus_map(address_map &map) +{ + map(0x0000, 0x01ff).ram(); + map(0x1000, 0x1fff).rom(); + map(0x2000, 0x2000).w(this, FUNC(circus_state::circus_clown_x_w)); + map(0x3000, 0x3000).w(this, FUNC(circus_state::circus_clown_y_w)); + map(0x4000, 0x43ff).ram().w(this, FUNC(circus_state::circus_videoram_w)).share("videoram"); + map(0x8000, 0x8000).ram().w(this, FUNC(circus_state::circus_clown_z_w)); + map(0xa000, 0xa000).portr("INPUTS"); + map(0xc000, 0xc000).portr("DSW"); + map(0xd000, 0xd000).r(this, FUNC(circus_state::circus_paddle_r)); + map(0xf000, 0xffff).rom(); +} static INPUT_PORTS_START( circus ) |