diff options
author | Olivier Galibert <galibert@pobox.com> | 2018-02-01 10:04:01 +0100 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2018-02-12 10:04:52 +0100 |
commit | c5219643162cb7d2a8688425a09008d28c8e2437 (patch) | |
tree | f2775ca3b1770ab0d3fb568f0bdd6d9212c68bf6 /src/mame/drivers/astrocde.cpp | |
parent | 09b6ce46873b38de9030a3c0378ff327f17af881 (diff) |
API change: Memory maps are now methods of the owner class [O. Galibert]
Also, a lot more freedom happened, that's going to be more visible
soon.
Diffstat (limited to 'src/mame/drivers/astrocde.cpp')
-rw-r--r-- | src/mame/drivers/astrocde.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index 311d333aeac..8d61fd4df12 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -530,7 +530,7 @@ CUSTOM_INPUT_MEMBER( astrocde_state::votrax_speech_status_r ) * *************************************/ -static ADDRESS_MAP_START( seawolf2_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::seawolf2_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w) AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("videoram") @@ -538,14 +538,14 @@ static ADDRESS_MAP_START( seawolf2_map, AS_PROGRAM, 8, astrocde_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( ebases_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::ebases_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w) AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("videoram") ADDRESS_MAP_END -static ADDRESS_MAP_START( spacezap_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::spacezap_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w) AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("videoram") @@ -554,7 +554,7 @@ static ADDRESS_MAP_START( spacezap_map, AS_PROGRAM, 8, astrocde_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( wow_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::wow_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w) AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("videoram") @@ -564,7 +564,7 @@ static ADDRESS_MAP_START( wow_map, AS_PROGRAM, 8, astrocde_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( robby_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::robby_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w) AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("videoram") @@ -575,7 +575,7 @@ static ADDRESS_MAP_START( robby_map, AS_PROGRAM, 8, astrocde_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( demndrgn_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::demndrgn_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w) AM_RANGE(0x4000, 0x7fff) AM_DEVREAD("bank4000", address_map_bank_device, read8) AM_WRITE(profpac_videoram_w) @@ -586,13 +586,13 @@ static ADDRESS_MAP_START( demndrgn_map, AS_PROGRAM, 8, astrocde_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( profpac_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::profpac_map) AM_IMPORT_FROM(demndrgn_map) AM_RANGE(0xe000, 0xe1ff) AM_READWRITE(protected_ram_r, protected_ram_w) AM_SHARE("protected_ram") ADDRESS_MAP_END -static ADDRESS_MAP_START( bank4000_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::bank4000_map) AM_RANGE(0x0000, 0x3fff) AM_READ(profpac_videoram_r) AM_RANGE(0x4000, 0x7fff) AM_ROM AM_REGION("banks", 0x08000) AM_RANGE(0x8000, 0xbfff) AM_ROM AM_REGION("banks", 0x10000) @@ -600,14 +600,14 @@ static ADDRESS_MAP_START( bank4000_map, AS_PROGRAM, 8, astrocde_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( profpac_bank4000_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::profpac_bank4000_map) AM_IMPORT_FROM(bank4000_map) AM_RANGE(0x10000, 0xaffff) AM_ROM AM_REGION("epromboard", 0) AM_RANGE(0xb0000, 0xb3fff) AM_READNOP ADDRESS_MAP_END -static ADDRESS_MAP_START( tenpin_sub_map, AS_PROGRAM, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::tenpin_sub_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xc000, 0xc7ff) AM_RAM @@ -621,19 +621,19 @@ ADDRESS_MAP_END * *************************************/ -static ADDRESS_MAP_START( port_map, AS_IO, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::port_map) AM_RANGE(0x0000, 0x0019) AM_SELECT(0xff00) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( port_map_mono_pattern, AS_IO, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::port_map_mono_pattern) AM_RANGE(0x0000, 0x0019) AM_SELECT(0xff00) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w) AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w) AM_RANGE(0xa55b, 0xa55b) AM_WRITE(protected_ram_enable_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( port_map_stereo_pattern, AS_IO, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::port_map_stereo_pattern) AM_RANGE(0x0000, 0x0019) AM_SELECT(0xff00) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w) AM_RANGE(0x0050, 0x0058) AM_SELECT(0xff00) AM_DEVWRITE("astrocade2", astrocade_device, astrocade_sound_w) AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w) @@ -641,7 +641,7 @@ static ADDRESS_MAP_START( port_map_stereo_pattern, AS_IO, 8, astrocde_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( port_map_16col_pattern, AS_IO, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::port_map_16col_pattern) AM_RANGE(0x0000, 0x0019) AM_SELECT(0xff00) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w) AM_RANGE(0x0050, 0x0058) AM_SELECT(0xff00) AM_DEVWRITE("astrocade2", astrocade_device, astrocade_sound_w) AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w) @@ -653,7 +653,7 @@ static ADDRESS_MAP_START( port_map_16col_pattern, AS_IO, 8, astrocde_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( port_map_16col_pattern_nosound, AS_IO, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::port_map_16col_pattern_nosound) AM_RANGE(0x0000, 0x0019) AM_SELECT(0xff00) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w) AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w) AM_RANGE(0x00bf, 0x00bf) AM_MIRROR(0xff00) AM_WRITE(profpac_page_select_w) @@ -664,7 +664,7 @@ static ADDRESS_MAP_START( port_map_16col_pattern_nosound, AS_IO, 8, astrocde_sta ADDRESS_MAP_END -static ADDRESS_MAP_START( port_map_16col_pattern_tenpindx, AS_IO, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::port_map_16col_pattern_tenpindx) AM_IMPORT_FROM(port_map_16col_pattern_nosound) AM_RANGE(0x0060, 0x0060) AM_MIRROR(0xff00) AM_READ_PORT("P60") AM_RANGE(0x0061, 0x0061) AM_MIRROR(0xff00) AM_READ_PORT("P61") @@ -678,7 +678,7 @@ static ADDRESS_MAP_START( port_map_16col_pattern_tenpindx, AS_IO, 8, astrocde_st ADDRESS_MAP_END -static ADDRESS_MAP_START( tenpin_sub_io_map, AS_IO, 8, astrocde_state ) +ADDRESS_MAP_START(astrocde_state::tenpin_sub_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x90, 0x93) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) AM_RANGE(0x97, 0x97) AM_DEVREAD("soundlatch", generic_latch_8_device, read) |