diff options
author | Olivier Galibert <galibert@pobox.com> | 2018-03-13 07:36:43 +0100 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2018-03-14 14:07:14 +0100 |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/balsente.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/balsente.cpp')
-rw-r--r-- | src/mame/drivers/balsente.cpp | 89 |
1 files changed, 48 insertions, 41 deletions
diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp index 8514c197632..bbd06810313 100644 --- a/src/mame/drivers/balsente.cpp +++ b/src/mame/drivers/balsente.cpp @@ -246,27 +246,31 @@ DIP locations verified for: * *************************************/ -ADDRESS_MAP_START(balsente_state::cpu1_map) - AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("spriteram") - AM_RANGE(0x0800, 0x7fff) AM_RAM_WRITE(balsente_videoram_w) AM_SHARE("videoram") - AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(balsente_paletteram_w) AM_SHARE("paletteram") - AM_RANGE(0x9000, 0x9007) AM_WRITE(balsente_adc_select_w) - AM_RANGE(0x9400, 0x9401) AM_READ(balsente_adc_data_r) - ;map(0x9800, 0x981f).mirror(0x0060).lw8("outlatch_w", [this](address_space &space, offs_t offset, u8 data, u8 mem_mask){ m_outlatch->write_d7(space, offset >> 2, data, mem_mask); }); - AM_RANGE(0x9880, 0x989f) AM_WRITE(balsente_random_reset_w) - AM_RANGE(0x98a0, 0x98bf) AM_WRITE(balsente_rombank_select_w) - AM_RANGE(0x98c0, 0x98df) AM_WRITE(balsente_palette_select_w) - AM_RANGE(0x98e0, 0x98ff) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w) - AM_RANGE(0x9900, 0x9900) AM_READ_PORT("SWH") - AM_RANGE(0x9901, 0x9901) AM_READ_PORT("SWG") - AM_RANGE(0x9902, 0x9902) AM_READ_PORT("IN0") - AM_RANGE(0x9903, 0x9903) AM_READ_PORT("IN1") AM_WRITENOP - AM_RANGE(0x9a00, 0x9a03) AM_READ(balsente_random_num_r) - AM_RANGE(0x9a04, 0x9a05) AM_READWRITE(balsente_m6850_r, balsente_m6850_w) - AM_RANGE(0x9b00, 0x9cff) AM_RAM AM_SHARE("nvram") /* system+cart NOVRAM */ - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") - AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank2") -ADDRESS_MAP_END +void balsente_state::cpu1_map(address_map &map) +{ + map(0x0000, 0x07ff).ram().share("spriteram"); + map(0x0800, 0x7fff).ram().w(this, FUNC(balsente_state::balsente_videoram_w)).share("videoram"); + map(0x8000, 0x8fff).ram().w(this, FUNC(balsente_state::balsente_paletteram_w)).share("paletteram"); + map(0x9000, 0x9007).w(this, FUNC(balsente_state::balsente_adc_select_w)); + map(0x9400, 0x9401).r(this, FUNC(balsente_state::balsente_adc_data_r)); + map(0x9800, 0x981f).mirror(0x0060).lw8("outlatch_w", + [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { + m_outlatch->write_d7(space, offset >> 2, data, mem_mask); + }); + map(0x9880, 0x989f).w(this, FUNC(balsente_state::balsente_random_reset_w)); + map(0x98a0, 0x98bf).w(this, FUNC(balsente_state::balsente_rombank_select_w)); + map(0x98c0, 0x98df).w(this, FUNC(balsente_state::balsente_palette_select_w)); + map(0x98e0, 0x98ff).w("watchdog", FUNC(watchdog_timer_device::reset_w)); + map(0x9900, 0x9900).portr("SWH"); + map(0x9901, 0x9901).portr("SWG"); + map(0x9902, 0x9902).portr("IN0"); + map(0x9903, 0x9903).portr("IN1").nopw(); + map(0x9a00, 0x9a03).r(this, FUNC(balsente_state::balsente_random_num_r)); + map(0x9a04, 0x9a05).rw(this, FUNC(balsente_state::balsente_m6850_r), FUNC(balsente_state::balsente_m6850_w)); + map(0x9b00, 0x9cff).ram().share("nvram"); /* system+cart NOVRAM */ + map(0xa000, 0xbfff).bankr("bank1"); + map(0xc000, 0xffff).bankr("bank2"); +} @@ -276,23 +280,25 @@ ADDRESS_MAP_END * *************************************/ -ADDRESS_MAP_START(balsente_state::cpu2_map) - AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x5fff) AM_RAM - AM_RANGE(0x6000, 0x7fff) AM_WRITE(balsente_m6850_sound_w) - AM_RANGE(0xe000, 0xffff) AM_READ(balsente_m6850_sound_r) -ADDRESS_MAP_END +void balsente_state::cpu2_map(address_map &map) +{ + map(0x0000, 0x1fff).rom(); + map(0x2000, 0x5fff).ram(); + map(0x6000, 0x7fff).w(this, FUNC(balsente_state::balsente_m6850_sound_w)); + map(0xe000, 0xffff).r(this, FUNC(balsente_state::balsente_m6850_sound_r)); +} -ADDRESS_MAP_START(balsente_state::cpu2_io_map) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_READWRITE(balsente_counter_8253_r, balsente_counter_8253_w) - AM_RANGE(0x08, 0x0f) AM_READ(balsente_counter_state_r) - AM_RANGE(0x08, 0x09) AM_WRITE(balsente_counter_control_w) - AM_RANGE(0x0a, 0x0b) AM_WRITE(balsente_dac_data_w) - AM_RANGE(0x0c, 0x0d) AM_WRITE(balsente_register_addr_w) - AM_RANGE(0x0e, 0x0f) AM_WRITE(balsente_chip_select_w) -ADDRESS_MAP_END +void balsente_state::cpu2_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0x03).rw(this, FUNC(balsente_state::balsente_counter_8253_r), FUNC(balsente_state::balsente_counter_8253_w)); + map(0x08, 0x0f).r(this, FUNC(balsente_state::balsente_counter_state_r)); + map(0x08, 0x09).w(this, FUNC(balsente_state::balsente_counter_control_w)); + map(0x0a, 0x0b).w(this, FUNC(balsente_state::balsente_dac_data_w)); + map(0x0c, 0x0d).w(this, FUNC(balsente_state::balsente_register_addr_w)); + map(0x0e, 0x0f).w(this, FUNC(balsente_state::balsente_chip_select_w)); +} @@ -303,11 +309,12 @@ ADDRESS_MAP_END *************************************/ /* CPU 1 read addresses */ -ADDRESS_MAP_START(balsente_state::shrike68k_map) - AM_RANGE(0x000000, 0x003fff) AM_ROM - AM_RANGE(0x010000, 0x01001f) AM_RAM AM_SHARE("shrike_io") - AM_RANGE(0x018000, 0x018fff) AM_RAM AM_SHARE("shrike_shared") -ADDRESS_MAP_END +void balsente_state::shrike68k_map(address_map &map) +{ + map(0x000000, 0x003fff).rom(); + map(0x010000, 0x01001f).ram().share("shrike_io"); + map(0x018000, 0x018fff).ram().share("shrike_shared"); +} |