diff options
Diffstat (limited to 'src/mame/drivers/cclimber.cpp')
-rw-r--r-- | src/mame/drivers/cclimber.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 5841d7cbac2..289c56badee 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -321,7 +321,7 @@ READ8_MEMBER(cclimber_state::bagmanf_a000_r) /* Note that River Patrol reads/writes to a000-a4f0. This is a bug in the code. The instruction at 0x0593 should say LD DE,$8000 */ -static ADDRESS_MAP_START( cclimber_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::cclimber_map) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6bff) AM_RAM /* Crazy Kong only */ AM_RANGE(0x8000, 0x83ff) AM_RAM @@ -342,11 +342,11 @@ static ADDRESS_MAP_START( cclimber_map, AS_PROGRAM, 8, cclimber_state ) AM_RANGE(0xb800, 0xb800) AM_READ_PORT("SYSTEM") ADDRESS_MAP_END -static ADDRESS_MAP_START( decrypted_opcodes_map, AS_OPCODES, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::decrypted_opcodes_map) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_SHARE("decrypted_opcodes") ADDRESS_MAP_END -static ADDRESS_MAP_START( cannonb_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::cannonb_map) AM_RANGE(0x5045, 0x505f) AM_WRITENOP /* do not errorlog this */ AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6bff) AM_RAM @@ -368,7 +368,7 @@ static ADDRESS_MAP_START( cannonb_map, AS_PROGRAM, 8, cclimber_state ) AM_RANGE(0xb800, 0xb800) AM_READ_PORT("SYSTEM") ADDRESS_MAP_END -static ADDRESS_MAP_START( swimmer_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::swimmer_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x88ff) AM_MIRROR(0x0100) AM_RAM AM_SHARE("bigspriteram") @@ -385,13 +385,13 @@ static ADDRESS_MAP_START( swimmer_map, AS_PROGRAM, 8, cclimber_state ) AM_RANGE(0xb880, 0xb880) AM_READ_PORT("SYSTEM") ADDRESS_MAP_END -static ADDRESS_MAP_START( guzzler_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::guzzler_map) AM_IMPORT_FROM(swimmer_map) AM_RANGE(0xc000, 0xc7ff) AM_RAM /* ??? used by Guzzler */ AM_RANGE(0xe000, 0xffff) AM_ROM /* Guzzler only */ ADDRESS_MAP_END -static ADDRESS_MAP_START( yamato_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::yamato_map) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6fff) AM_RAM AM_RANGE(0x7000, 0x7fff) AM_ROM @@ -413,11 +413,11 @@ static ADDRESS_MAP_START( yamato_map, AS_PROGRAM, 8, cclimber_state ) AM_RANGE(0xba00, 0xba00) AM_READ_PORT("START") /* maybe a mirror of b800 */ ADDRESS_MAP_END -static ADDRESS_MAP_START( yamato_decrypted_opcodes_map, AS_OPCODES, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::yamato_decrypted_opcodes_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_SHARE("decrypted_opcodes") ADDRESS_MAP_END -static ADDRESS_MAP_START( toprollr_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::toprollr_map) AM_RANGE(0x0000, 0x5fff) AM_ROMBANK("bank1") AM_RANGE(0x6000, 0x6bff) AM_RAM AM_SHARE("ram") AM_RANGE(0x8800, 0x88ff) AM_RAM AM_SHARE("bigspriteram") @@ -436,7 +436,7 @@ static ADDRESS_MAP_START( toprollr_map, AS_PROGRAM, 8, cclimber_state ) AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( bagmanf_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::bagmanf_map) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6bff) AM_RAM /* Crazy Kong only */ AM_RANGE(0x8000, 0x8000) AM_READ_PORT("P1") @@ -457,44 +457,44 @@ static ADDRESS_MAP_START( bagmanf_map, AS_PROGRAM, 8, cclimber_state ) AM_RANGE(0xb800, 0xb800) AM_READNOP ADDRESS_MAP_END -static ADDRESS_MAP_START( toprollr_decrypted_opcodes_map, AS_OPCODES, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::toprollr_decrypted_opcodes_map) AM_RANGE(0x0000, 0x5fff) AM_ROMBANK("bank1d") AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("maincpu", 0xc000) ADDRESS_MAP_END -static ADDRESS_MAP_START( cclimber_portmap, AS_IO, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::cclimber_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x08, 0x09) AM_DEVWRITE("cclimber_audio:aysnd", ay8910_device, address_data_w) AM_RANGE(0x0c, 0x0c) AM_DEVREAD("cclimber_audio:aysnd", ay8910_device, data_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( yamato_portmap, AS_IO, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::yamato_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(yamato_p0_w) /* ??? */ AM_RANGE(0x01, 0x01) AM_WRITE(yamato_p1_w) /* ??? */ ADDRESS_MAP_END -static ADDRESS_MAP_START( swimmer_audio_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::swimmer_audio_map) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM AM_RANGE(0x3000, 0x3000) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_RANGE(0x4000, 0x4001) AM_RAM /* ??? */ ADDRESS_MAP_END -static ADDRESS_MAP_START( yamato_audio_map, AS_PROGRAM, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::yamato_audio_map) AM_RANGE(0x0000, 0x07ff) AM_ROM AM_RANGE(0x5000, 0x53ff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( swimmer_audio_portmap, AS_IO, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::swimmer_audio_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_device, data_address_w) AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay2", ay8910_device, data_address_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( yamato_audio_portmap, AS_IO, 8, cclimber_state ) +ADDRESS_MAP_START(cclimber_state::yamato_audio_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_device, address_data_w) AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_device, address_data_w) @@ -1135,7 +1135,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(cclimber_state::cclimberx, cclimber) MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) + MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(cclimber_state::ckongb, cclimber) @@ -1175,7 +1175,7 @@ MACHINE_CONFIG_DERIVED(cclimber_state::yamato, root) MCFG_CPU_PROGRAM_MAP(yamato_map) MCFG_CPU_IO_MAP(yamato_portmap) MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq) - MCFG_CPU_DECRYPTED_OPCODES_MAP(yamato_decrypted_opcodes_map) + MCFG_CPU_OPCODES_MAP(yamato_decrypted_opcodes_map) MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz ? */ @@ -1206,7 +1206,7 @@ MACHINE_CONFIG_DERIVED(cclimber_state::toprollr, cclimber) MCFG_CPU_PROGRAM_MAP(toprollr_map) MCFG_CPU_IO_MAP(cclimber_portmap) MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq) - MCFG_CPU_DECRYPTED_OPCODES_MAP(toprollr_decrypted_opcodes_map) + MCFG_CPU_OPCODES_MAP(toprollr_decrypted_opcodes_map) MCFG_SEGACRPT_SET_SIZE(0) MCFG_SEGACRPT_SET_NUMBANKS(3) MCFG_SEGACRPT_SET_BANKSIZE(0x6000) |