From 01ced8725f17eadbc197112fdb667c9122e3d339 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Sat, 16 Jul 2016 09:58:17 +0200 Subject: [PATCH] airbustr.cpp, ajax.cpp, asuka.cpp: simplified rom loading (nw) --- src/mame/drivers/airbustr.cpp | 92 ++++++++++---------------- src/mame/drivers/ajax.cpp | 56 +++++++--------- src/mame/drivers/asuka.cpp | 120 ++++++++++++++-------------------- src/mame/includes/airbustr.h | 16 ++--- src/mame/includes/ajax.h | 12 ++-- src/mame/machine/ajax.cpp | 32 +++++---- src/mame/video/airbustr.cpp | 14 ++-- src/mame/video/ajax.cpp | 4 +- 8 files changed, 148 insertions(+), 198 deletions(-) diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp index 29aa298c9fb..ceb26ccd0c3 100644 --- a/src/mame/drivers/airbustr.cpp +++ b/src/mame/drivers/airbustr.cpp @@ -266,12 +266,12 @@ WRITE8_MEMBER(airbustr_state::master_nmi_trigger_w) WRITE8_MEMBER(airbustr_state::master_bankswitch_w) { - membank("bank1")->set_entry(data & 0x07); + membank("masterbank")->set_entry(data & 0x07); } WRITE8_MEMBER(airbustr_state::slave_bankswitch_w) { - membank("bank2")->set_entry(data & 0x07); + membank("slavebank")->set_entry(data & 0x07); flip_screen_set(data & 0x10); @@ -281,7 +281,7 @@ WRITE8_MEMBER(airbustr_state::slave_bankswitch_w) WRITE8_MEMBER(airbustr_state::sound_bankswitch_w) { - membank("bank3")->set_entry(data & 0x07); + membank("audiobank")->set_entry(data & 0x07); } READ8_MEMBER(airbustr_state::soundcommand_status_r) @@ -316,7 +316,7 @@ WRITE8_MEMBER(airbustr_state::soundcommand2_w) } -WRITE8_MEMBER(airbustr_state::airbustr_coin_counter_w) +WRITE8_MEMBER(airbustr_state::coin_counter_w) { machine().bookkeeping().coin_counter_w(0, data & 1); machine().bookkeeping().coin_counter_w(1, data & 2); @@ -327,7 +327,7 @@ WRITE8_MEMBER(airbustr_state::airbustr_coin_counter_w) /* Memory Maps */ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, airbustr_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("masterbank") AM_RANGE(0xc000, 0xcfff) AM_DEVREADWRITE("pandora", kaneko_pandora_device, spriteram_r, spriteram_w) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("devram") // shared with protection device @@ -343,11 +343,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8, airbustr_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") - AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(airbustr_videoram2_w) AM_SHARE("videoram2") - AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(airbustr_colorram2_w) AM_SHARE("colorram2") - AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(airbustr_videoram_w) AM_SHARE("videoram") - AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(airbustr_colorram_w) AM_SHARE("colorram") + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("slavebank") + AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(videoram2_w) AM_SHARE("videoram2") + AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(colorram2_w) AM_SHARE("colorram2") + AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram") + AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(colorram_w) AM_SHARE("colorram") AM_RANGE(0xd000, 0xd5ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0xd600, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_RAM @@ -358,18 +358,18 @@ static ADDRESS_MAP_START( slave_io_map, AS_IO, 8, airbustr_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(slave_bankswitch_w) AM_RANGE(0x02, 0x02) AM_READWRITE(soundcommand2_r, soundcommand_w) - AM_RANGE(0x04, 0x0c) AM_WRITE(airbustr_scrollregs_w) + AM_RANGE(0x04, 0x0c) AM_WRITE(scrollregs_w) AM_RANGE(0x0e, 0x0e) AM_READ(soundcommand_status_r) AM_RANGE(0x20, 0x20) AM_READ_PORT("P1") AM_RANGE(0x22, 0x22) AM_READ_PORT("P2") AM_RANGE(0x24, 0x24) AM_READ_PORT("SYSTEM") - AM_RANGE(0x28, 0x28) AM_WRITE(airbustr_coin_counter_w) + AM_RANGE(0x28, 0x28) AM_WRITE(coin_counter_w) AM_RANGE(0x38, 0x38) AM_WRITENOP // irq ack / irq mask ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, airbustr_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3") + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("audiobank") AM_RANGE(0xc000, 0xdfff) AM_RAM ADDRESS_MAP_END @@ -541,16 +541,9 @@ INTERRUPT_GEN_MEMBER(airbustr_state::slave_interrupt) void airbustr_state::machine_start() { - UINT8 *MASTER = memregion("master")->base(); - UINT8 *SLAVE = memregion("slave")->base(); - UINT8 *AUDIO = memregion("audiocpu")->base(); - - membank("bank1")->configure_entries(0, 3, &MASTER[0x00000], 0x4000); - membank("bank1")->configure_entries(3, 5, &MASTER[0x10000], 0x4000); - membank("bank2")->configure_entries(0, 3, &SLAVE[0x00000], 0x4000); - membank("bank2")->configure_entries(3, 5, &SLAVE[0x10000], 0x4000); - membank("bank3")->configure_entries(0, 3, &AUDIO[0x00000], 0x4000); - membank("bank3")->configure_entries(3, 5, &AUDIO[0x10000], 0x4000); + membank("masterbank")->configure_entries(0, 8, memregion("master")->base(), 0x4000); + membank("slavebank")->configure_entries(0, 8, memregion("slave")->base(), 0x4000); + membank("audiobank")->configure_entries(0, 8, memregion("audiocpu")->base(), 0x4000); save_item(NAME(m_soundlatch_status)); save_item(NAME(m_soundlatch2_status)); @@ -569,10 +562,6 @@ void airbustr_state::machine_reset() m_fg_scrollx = 0; m_fg_scrolly = 0; m_highbits = 0; - - membank("bank1")->set_entry(0x02); - membank("bank2")->set_entry(0x02); - membank("bank3")->set_entry(0x02); } /* Machine Driver */ @@ -607,8 +596,8 @@ static MACHINE_CONFIG_START( airbustr, airbustr_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) - MCFG_SCREEN_UPDATE_DRIVER(airbustr_state, screen_update_airbustr) - MCFG_SCREEN_VBLANK_DRIVER(airbustr_state, screen_eof_airbustr) + MCFG_SCREEN_UPDATE_DRIVER(airbustr_state, screen_update) + MCFG_SCREEN_VBLANK_DRIVER(airbustr_state, screen_eof) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", airbustr) @@ -646,17 +635,14 @@ MACHINE_CONFIG_END /* ROMs */ ROM_START( airbustr ) - ROM_REGION( 0x24000, "master", 0 ) - ROM_LOAD( "pr12.h19", 0x00000, 0x0c000, CRC(91362eb2) SHA1(cd85acfa6542af68dd1cad46f9426a95cfc9432e) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "master", 0 ) + ROM_LOAD( "pr12.h19", 0x00000, 0x20000, CRC(91362eb2) SHA1(cd85acfa6542af68dd1cad46f9426a95cfc9432e) ) - ROM_REGION( 0x24000, "slave", 0 ) - ROM_LOAD( "pr13.l15", 0x00000, 0x0c000, CRC(13b2257b) SHA1(325efa54e757a1f08caf81801930d61ea4e7b6d4) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "slave", 0 ) + ROM_LOAD( "pr13.l15", 0x00000, 0x20000, CRC(13b2257b) SHA1(325efa54e757a1f08caf81801930d61ea4e7b6d4) ) - ROM_REGION( 0x24000, "audiocpu", 0 ) - ROM_LOAD( "pr-21.bin", 0x00000, 0x0c000, CRC(6e0a5df0) SHA1(616b7c7aaf52a9a55b63c60717c1866940635cd4) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "audiocpu", 0 ) + ROM_LOAD( "pr-21.bin", 0x00000, 0x20000, CRC(6e0a5df0) SHA1(616b7c7aaf52a9a55b63c60717c1866940635cd4) ) ROM_REGION( 0x1000, "mcu", 0 ) //MCU is a 80c51 like DJ Boy / Heavy Unit? ROM_LOAD( "i80c51", 0x0000, 0x1000, NO_DUMP ) @@ -673,17 +659,14 @@ ROM_START( airbustr ) ROM_END ROM_START( airbustrj ) - ROM_REGION( 0x24000, "master", 0 ) - ROM_LOAD( "pr-14j.bin", 0x00000, 0x0c000, CRC(6b9805bd) SHA1(db6df33cf17316a4b81d7731dca9fe8bbf81f014) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "master", 0 ) + ROM_LOAD( "pr-14j.bin", 0x00000, 0x20000, CRC(6b9805bd) SHA1(db6df33cf17316a4b81d7731dca9fe8bbf81f014) ) - ROM_REGION( 0x24000, "slave", 0 ) - ROM_LOAD( "pr-11j.bin", 0x00000, 0x0c000, CRC(85464124) SHA1(8cce8dfdede48032c40d5f155fd58061866668de) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "slave", 0 ) + ROM_LOAD( "pr-11j.bin", 0x00000, 0x20000, CRC(85464124) SHA1(8cce8dfdede48032c40d5f155fd58061866668de) ) - ROM_REGION( 0x24000, "audiocpu", 0 ) - ROM_LOAD( "pr-21.bin", 0x00000, 0x0c000, CRC(6e0a5df0) SHA1(616b7c7aaf52a9a55b63c60717c1866940635cd4) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "audiocpu", 0 ) + ROM_LOAD( "pr-21.bin", 0x00000, 0x20000, CRC(6e0a5df0) SHA1(616b7c7aaf52a9a55b63c60717c1866940635cd4) ) ROM_REGION( 0x1000, "mcu", 0 ) //MCU is a 80c51 like DJ Boy / Heavy Unit? ROM_LOAD( "i80c51", 0x0000, 0x1000, NO_DUMP ) @@ -713,17 +696,14 @@ Rom 5 is on a piggyback daughterboard with a z80 and a PAL */ ROM_START( airbustrb ) - ROM_REGION( 0x24000, "master", 0 ) - ROM_LOAD( "5.bin", 0x00000, 0x0c000, CRC(9e4216a2) SHA1(46572da4df5a67b10cc3ee21bdc0ec4bcecaaf93) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "master", 0 ) + ROM_LOAD( "5.bin", 0x00000, 0x20000, CRC(9e4216a2) SHA1(46572da4df5a67b10cc3ee21bdc0ec4bcecaaf93) ) - ROM_REGION( 0x24000, "slave", 0 ) - ROM_LOAD( "1.bin", 0x00000, 0x0c000, CRC(85464124) SHA1(8cce8dfdede48032c40d5f155fd58061866668de) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "slave", 0 ) + ROM_LOAD( "1.bin", 0x00000, 0x20000, CRC(85464124) SHA1(8cce8dfdede48032c40d5f155fd58061866668de) ) - ROM_REGION( 0x24000, "audiocpu", 0 ) - ROM_LOAD( "2.bin", 0x00000, 0x0c000, CRC(6e0a5df0) SHA1(616b7c7aaf52a9a55b63c60717c1866940635cd4) ) - ROM_CONTINUE( 0x10000, 0x14000 ) + ROM_REGION( 0x20000, "audiocpu", 0 ) + ROM_LOAD( "2.bin", 0x00000, 0x20000, CRC(6e0a5df0) SHA1(616b7c7aaf52a9a55b63c60717c1866940635cd4) ) ROM_REGION( 0x80000, "gfx1", 0 ) /* Same content as airbusj, pr-001.bin, different sized roms / interleave */ diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp index 1e7b55127fa..64990f48aba 100644 --- a/src/mame/drivers/ajax.cpp +++ b/src/mame/drivers/ajax.cpp @@ -21,25 +21,25 @@ #include "includes/konamipt.h" static ADDRESS_MAP_START( ajax_main_map, AS_PROGRAM, 8, ajax_state ) - AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ajax_ls138_f10_r, ajax_ls138_f10_w) /* bankswitch + sound command + FIRQ command */ + AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ls138_f10_r, ls138_f10_w) /* bankswitch + sound command + FIRQ command */ AM_RANGE(0x0800, 0x0807) AM_DEVREADWRITE("k051960", k051960_device, k051937_r, k051937_w) /* sprite control registers */ AM_RANGE(0x0c00, 0x0fff) AM_DEVREADWRITE("k051960", k051960_device, k051960_r, k051960_w) /* sprite RAM 2128SL at J7 */ AM_RANGE(0x1000, 0x1fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")/* palette */ AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("share1") /* shared RAM with the 6809 */ AM_RANGE(0x4000, 0x5fff) AM_RAM /* RAM 6264L at K10 */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank2") /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM N11 */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("mainbank") /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM N11 */ ADDRESS_MAP_END static ADDRESS_MAP_START( ajax_sub_map, AS_PROGRAM, 8, ajax_state ) AM_RANGE(0x0000, 0x07ff) AM_DEVREADWRITE("k051316", k051316_device, read, write) /* 051316 zoom/rotation layer */ AM_RANGE(0x0800, 0x080f) AM_DEVWRITE("k051316", k051316_device, ctrl_w) /* 051316 control registers */ AM_RANGE(0x1000, 0x17ff) AM_DEVREAD("k051316", k051316_device, rom_r) /* 051316 (ROM test) */ - AM_RANGE(0x1800, 0x1800) AM_WRITE(ajax_bankswitch_2_w) /* bankswitch control */ + AM_RANGE(0x1800, 0x1800) AM_WRITE(bankswitch_2_w) /* bankswitch control */ AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("share1") /* shared RAM with the 052001 */ AM_RANGE(0x4000, 0x7fff) AM_DEVREADWRITE("k052109", k052109_device, read, write) /* video RAM + color RAM + video registers */ - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* banked ROM */ - AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM I16 */ + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("subbank") /* banked ROM */ + AM_RANGE(0xa000, 0xffff) AM_ROM AM_REGION ("sub", 0x12000) /* ROM I16 */ ADDRESS_MAP_END static ADDRESS_MAP_START( ajax_sound_map, AS_PROGRAM, 8, ajax_state ) @@ -185,7 +185,7 @@ static MACHINE_CONFIG_START( ajax, ajax_state ) MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 112, 400, 256, 16, 240) // 6MHz dotclock is more realistic, however needs drawing updates. replace when ready // MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240) - MCFG_SCREEN_UPDATE_DRIVER(ajax_state, screen_update_ajax) + MCFG_SCREEN_UPDATE_DRIVER(ajax_state, screen_update) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 2048) @@ -242,15 +242,13 @@ MACHINE_CONFIG_END */ ROM_START( ajax ) - ROM_REGION( 0x28000, "maincpu", 0 ) /* 052001 code */ - ROM_LOAD( "770_m01.n11", 0x10000, 0x08000, CRC(4a64e53a) SHA1(acd249bfcb5f248c41b3e40c7c1bce1b8c645d3a) ) /* banked ROM */ - ROM_CONTINUE( 0x08000, 0x08000 ) /* fixed ROM */ - ROM_LOAD( "770_l02.n12", 0x18000, 0x10000, CRC(ad7d592b) SHA1(c75d9696b16de231c479379dd02d33fe54021d88) ) /* banked ROM */ + ROM_REGION( 0x20000, "maincpu", 0 ) /* 052001 code */ + ROM_LOAD( "770_m01.n11", 0x00000, 0x10000, CRC(4a64e53a) SHA1(acd249bfcb5f248c41b3e40c7c1bce1b8c645d3a) ) /* last 0x8000 fixed, first 0x8000 banked */ + ROM_LOAD( "770_l02.n12", 0x10000, 0x10000, CRC(ad7d592b) SHA1(c75d9696b16de231c479379dd02d33fe54021d88) ) /* banked ROM */ - ROM_REGION( 0x22000, "sub", 0 ) /* 64k + 72k for banked ROMs */ - ROM_LOAD( "770_l05.i16", 0x20000, 0x02000, CRC(ed64fbb2) SHA1(429046edaf1299afa7fb9c385b4ef0c244ec2409) ) /* banked ROM */ - ROM_CONTINUE( 0x0a000, 0x06000 ) /* fixed ROM */ - ROM_LOAD( "770_f04.g16", 0x10000, 0x10000, CRC(e0e4ec9c) SHA1(15ae09c3ad67ec626d8178ec1417f0c57ca4eca4) ) /* banked ROM */ + ROM_REGION( 0x18000, "sub", 0 ) /* 96k */ + ROM_LOAD( "770_f04.g16", 0x00000, 0x10000, CRC(e0e4ec9c) SHA1(15ae09c3ad67ec626d8178ec1417f0c57ca4eca4) ) /* banked ROM */ + ROM_LOAD( "770_l05.i16", 0x10000, 0x08000, CRC(ed64fbb2) SHA1(429046edaf1299afa7fb9c385b4ef0c244ec2409) ) /* last 0x6000 fixed, first 0x2000 banked */ ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */ ROM_LOAD( "770_h03.f16", 0x00000, 0x08000, CRC(2ffd2afc) SHA1(ca2ef684f87bcf9b70b3ec66ec80685edaf04b9b) ) @@ -308,15 +306,13 @@ ROM_START( ajax ) ROM_END ROM_START( typhoon ) - ROM_REGION( 0x28000, "maincpu", 0 ) /* 052001 code */ - ROM_LOAD( "770_k01.n11", 0x10000, 0x08000, CRC(5ba74a22) SHA1(897d3309f2efb3bfa56e86581ee4a492e656788c) ) /* banked ROM */ - ROM_CONTINUE( 0x08000, 0x08000 ) /* fixed ROM */ - ROM_LOAD( "770_k02.n12", 0x18000, 0x10000, CRC(3bcf782a) SHA1(4b6127bced0b2519f8ad30587f32588a16368071) ) /* banked ROM */ + ROM_REGION( 0x20000, "maincpu", 0 ) /* 052001 code */ + ROM_LOAD( "770_k01.n11", 0x00000, 0x10000, CRC(5ba74a22) SHA1(897d3309f2efb3bfa56e86581ee4a492e656788c) ) /* last 0x8000 fixed, first 0x8000 banked */ + ROM_LOAD( "770_k02.n12", 0x10000, 0x10000, CRC(3bcf782a) SHA1(4b6127bced0b2519f8ad30587f32588a16368071) ) /* banked ROM */ - ROM_REGION( 0x22000, "sub", 0 ) /* 64k + 72k for banked ROMs */ - ROM_LOAD( "770_k05.i16", 0x20000, 0x02000, CRC(0f1bebbb) SHA1(012a8867ee0febaaadd7bcbc91e462bda5d3a411) ) /* banked ROM */ - ROM_CONTINUE( 0x0a000, 0x06000 ) /* fixed ROM */ - ROM_LOAD( "770_f04.g16", 0x10000, 0x10000, CRC(e0e4ec9c) SHA1(15ae09c3ad67ec626d8178ec1417f0c57ca4eca4) ) /* banked ROM */ + ROM_REGION( 0x18000, "sub", 0 ) /* 96k */ + ROM_LOAD( "770_f04.g16", 0x00000, 0x10000, CRC(e0e4ec9c) SHA1(15ae09c3ad67ec626d8178ec1417f0c57ca4eca4) ) /* banked ROM */ + ROM_LOAD( "770_k05.i16", 0x10000, 0x08000, CRC(0f1bebbb) SHA1(012a8867ee0febaaadd7bcbc91e462bda5d3a411) ) /* last 0x6000 fixed, first 0x2000 banked */ ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */ ROM_LOAD( "770_h03.f16", 0x00000, 0x08000, CRC(2ffd2afc) SHA1(ca2ef684f87bcf9b70b3ec66ec80685edaf04b9b) ) @@ -344,15 +340,13 @@ ROM_START( typhoon ) ROM_END ROM_START( ajaxj ) - ROM_REGION( 0x28000, "maincpu", 0 ) /* 052001 code */ - ROM_LOAD( "770_l01.n11", 0x10000, 0x08000, CRC(7cea5274) SHA1(8e3b2b11a8189e3a1703b3b4b453fbb386f5537f) ) /* banked ROM */ - ROM_CONTINUE( 0x08000, 0x08000 ) /* fixed ROM */ - ROM_LOAD( "770_l02.n12", 0x18000, 0x10000, CRC(ad7d592b) SHA1(c75d9696b16de231c479379dd02d33fe54021d88) ) /* banked ROM */ + ROM_REGION( 0x20000, "maincpu", 0 ) /* 052001 code */ + ROM_LOAD( "770_l01.n11", 0x00000, 0x10000, CRC(7cea5274) SHA1(8e3b2b11a8189e3a1703b3b4b453fbb386f5537f) ) /* last 0x8000 fixed, first 0x8000 banked */ + ROM_LOAD( "770_l02.n12", 0x10000, 0x10000, CRC(ad7d592b) SHA1(c75d9696b16de231c479379dd02d33fe54021d88) ) /* banked ROM */ - ROM_REGION( 0x22000, "sub", 0 ) /* 64k + 72k for banked ROMs */ - ROM_LOAD( "770_l05.i16", 0x20000, 0x02000, CRC(ed64fbb2) SHA1(429046edaf1299afa7fb9c385b4ef0c244ec2409) ) /* banked ROM */ - ROM_CONTINUE( 0x0a000, 0x06000 ) /* fixed ROM */ - ROM_LOAD( "770_f04.g16", 0x10000, 0x10000, CRC(e0e4ec9c) SHA1(15ae09c3ad67ec626d8178ec1417f0c57ca4eca4) ) /* banked ROM */ + ROM_REGION( 0x18000, "sub", 0 ) /* 96k */ + ROM_LOAD( "770_f04.g16", 0x00000, 0x10000, CRC(e0e4ec9c) SHA1(15ae09c3ad67ec626d8178ec1417f0c57ca4eca4) ) /* banked ROM */ + ROM_LOAD( "770_l05.i16", 0x10000, 0x8000, CRC(ed64fbb2) SHA1(429046edaf1299afa7fb9c385b4ef0c244ec2409) ) /* last 0x6000 fixed, first 0x2000 banked */ ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */ ROM_LOAD( "770_f03.f16", 0x00000, 0x08000, CRC(3fe914fd) SHA1(c691920402bd859e2bf765084704a8bfad302cfa) ) diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp index dcf86e81ce7..9b1db784a9a 100644 --- a/src/mame/drivers/asuka.cpp +++ b/src/mame/drivers/asuka.cpp @@ -248,7 +248,7 @@ void asuka_state::device_timer(emu_timer &timer, device_timer_id id, int param, INTERRUPT_GEN_MEMBER(asuka_state::cadash_interrupt) { - timer_set(downcast(&device)->cycles_to_attotime(500), TIMER_CADASH_INTERRUPT5); + timer_set(m_maincpu->cycles_to_attotime(500), TIMER_CADASH_INTERRUPT5); device.execute().set_input_line(4, HOLD_LINE); /* interrupt vector 4 */ } @@ -259,12 +259,12 @@ INTERRUPT_GEN_MEMBER(asuka_state::cadash_interrupt) WRITE8_MEMBER(asuka_state::sound_bankswitch_w) { - membank("bank1")->set_entry(data & 0x03); + membank("audiobank")->set_entry(data & 0x03); } WRITE8_MEMBER(asuka_state::sound_bankswitch_2151_w) { - membank("bank1")->set_entry(data & 0x03); + membank("audiobank")->set_entry(data & 0x03); } @@ -384,7 +384,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bonzeadv_z80_map, AS_PROGRAM, 8, asuka_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("audiobank") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) AM_RANGE(0xe200, 0xe200) AM_DEVWRITE("tc0140syt", tc0140syt_device, slave_port_w) @@ -398,7 +398,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8, asuka_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("audiobank") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) // AM_RANGE(0x9002, 0x9100) AM_READNOP @@ -412,7 +412,7 @@ ADDRESS_MAP_END /* no MSM5205 */ static ADDRESS_MAP_START( cadash_z80_map, AS_PROGRAM, 8, asuka_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("audiobank") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("tc0140syt", tc0140syt_device, slave_port_w) @@ -775,8 +775,7 @@ GFXDECODE_END void asuka_state::machine_start() { /* configure the banks */ - membank("bank1")->configure_entry(0, memregion("audiocpu")->base()); - membank("bank1")->configure_entries(1, 3, memregion("audiocpu")->base() + 0x10000, 0x04000); + membank("audiobank")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x04000); save_item(NAME(m_adpcm_pos)); save_item(NAME(m_adpcm_data)); @@ -1214,9 +1213,8 @@ ROM_START( bonzeadv ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "b41-02.7", 0x00000, 0x80000, CRC(29f205d9) SHA1(9e9f0c2755a9aa5acfe2601911bfa07d8d61164c) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b41-13.20", 0x00000, 0x04000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b41-13.20", 0x00000, 0x10000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) /* banked */ /* CPU3 - CCHIP aka TC0030CMD marked b41-05.43 */ @@ -1239,9 +1237,8 @@ ROM_START( bonzeadvo ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "b41-02.7", 0x00000, 0x80000, CRC(29f205d9) SHA1(9e9f0c2755a9aa5acfe2601911bfa07d8d61164c) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b41-13.20", 0x00000, 0x04000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b41-13.20", 0x00000, 0x10000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) /* banked */ /* CPU3 - CCHIP aka TC0030CMD marked b41-05.43 */ @@ -1264,9 +1261,8 @@ ROM_START( bonzeadvu ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "b41-02.7", 0x00000, 0x80000, CRC(29f205d9) SHA1(9e9f0c2755a9aa5acfe2601911bfa07d8d61164c) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b41-13.20", 0x00000, 0x04000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b41-13.20", 0x00000, 0x10000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) /* banked */ /* CPU3 - CCHIP aka TC0030CMD marked b41-05.43 */ @@ -1289,9 +1285,8 @@ ROM_START( jigkmgri ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "b41-02.7", 0x00000, 0x80000, CRC(29f205d9) SHA1(9e9f0c2755a9aa5acfe2601911bfa07d8d61164c) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b41-13.20", 0x00000, 0x04000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b41-13.20", 0x00000, 0x10000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) /* banked */ /* CPU3 - CCHIP aka TC0030CMD marked b41-05.43 */ @@ -1323,9 +1318,8 @@ ROM_START( bonzeadvp ) /* Labels consists of hand written checksum values of the ROM_LOAD16_BYTE( "03eb.ic16", 0x40000, 0x20000, CRC(39f32715) SHA1(5c555fde1ae0bb1e796e0122157bc694392122f3) ) // ^ ROM_LOAD16_BYTE( "b8e1.ic22", 0x40001, 0x20000, CRC(15b836cf) SHA1(0f7e5cb6a57c336125909e28af664fe7387947d4) ) // ^ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b41-13.20", 0x00000, 0x04000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) // missing from dump - ROM_CONTINUE( 0x10000, 0x0c000) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b41-13.20", 0x00000, 0x10000, CRC(9e464254) SHA1(b6f6126b54c15320ecaa652d0eeabaa4cd94bd26) ) // missing from dump /* banked */ /* is the C-Chip the same as the final? */ @@ -1351,9 +1345,8 @@ ROM_START( asuka ) ROM_LOAD16_BYTE( "b68-07.ic5", 0x80000, 0x10000, CRC(c113acc8) SHA1(613c61a78df73dcb0b9c9018ae829e865baac772) ) ROM_LOAD16_BYTE( "b68-06.ic4", 0x80001, 0x10000, CRC(f517e64d) SHA1(8be491bfe0f7eed58521de9d31da677acf635c23) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b68-11.ic27", 0x00000, 0x04000, CRC(c378b508) SHA1(1b145fe736b924f298e02532cf9f26cc18b42ca7) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b68-11.ic27", 0x00000, 0x10000, CRC(c378b508) SHA1(1b145fe736b924f298e02532cf9f26cc18b42ca7) ) /* banked */ ROM_REGION( 0x10000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b68-10.ic24", 0x00000, 0x10000, CRC(387aaf40) SHA1(47c583564ef1d49ece15f97221b2e073e8fb0544) ) @@ -1378,9 +1371,8 @@ ROM_START( asukaj ) /* Known to exist but not dumped: revision 1 with B68 08-1 & ROM_LOAD16_BYTE( "b68-07.ic5", 0x80000, 0x10000, CRC(c113acc8) SHA1(613c61a78df73dcb0b9c9018ae829e865baac772) ) ROM_LOAD16_BYTE( "b68-06.ic4", 0x80001, 0x10000, CRC(f517e64d) SHA1(8be491bfe0f7eed58521de9d31da677acf635c23) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b68-11.ic27", 0x00000, 0x04000, CRC(c378b508) SHA1(1b145fe736b924f298e02532cf9f26cc18b42ca7) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b68-11.ic27", 0x00000, 0x10000, CRC(c378b508) SHA1(1b145fe736b924f298e02532cf9f26cc18b42ca7) ) /* banked */ ROM_REGION( 0x10000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "b68-10.ic24", 0x00000, 0x10000, CRC(387aaf40) SHA1(47c583564ef1d49ece15f97221b2e073e8fb0544) ) @@ -1405,9 +1397,8 @@ ROM_START( mofflott ) ROM_LOAD16_BYTE( "c17-05.bin", 0x80000, 0x10000, CRC(57ac4741) SHA1(3188ff0866324c68fba8e9745a0cb186784cb53d) ) ROM_LOAD16_BYTE( "c17-04.bin", 0x80001, 0x10000, CRC(f4250410) SHA1(1f5f6baca4aa695ce2ae5c65adcb460da872a239) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c17-07.bin", 0x00000, 0x04000, CRC(cdb7bc2c) SHA1(5113055c954a39918436db75cc06b53c29c60728) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c17-07.bin", 0x00000, 0x10000, CRC(cdb7bc2c) SHA1(5113055c954a39918436db75cc06b53c29c60728) ) /* banked */ ROM_REGION( 0x10000, "ymsnd", 0 ) /* ADPCM samples */ ROM_LOAD( "c17-06.bin", 0x00000, 0x10000, CRC(5c332125) SHA1(408f42df18b38347c8a4e177a9484162a66877e1) ) @@ -1426,9 +1417,8 @@ ROM_START( cadash ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x08000, "subcpu", 0 ) /* HD64180RP8 code (link) */ ROM_LOAD( "c21-07.57", 0x00000, 0x08000, CRC(f02292bd) SHA1(0a5c06a048ad67f90e0d766b504582e9eef035f7) ) @@ -1457,9 +1447,8 @@ ROM_START( cadashp ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x0800, "plds", 0 ) ROM_LOAD( "pal16l8b-c21-09.ic34", 0x0000, 0x0104, CRC(4b296700) SHA1(79d6c8fb13e30795d9c1f49885ada658f9722b68) ) @@ -1481,9 +1470,8 @@ ROM_START( cadashj ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x08000, "subcpu", ROMREGION_ERASE00 ) /* HD64180RP8 code (link) */ ROM_LOAD( "c21-07.57", 0x00000, 0x08000, CRC(f02292bd) SHA1(0a5c06a048ad67f90e0d766b504582e9eef035f7) ) @@ -1508,9 +1496,8 @@ ROM_START( cadashj1 ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x08000, "subcpu", ROMREGION_ERASE00 ) /* HD64180RP8 code (link) */ // the board this set was from did not have the link section populated ROM_LOAD( "c21-07.57", 0x00000, 0x08000, CRC(f02292bd) SHA1(0a5c06a048ad67f90e0d766b504582e9eef035f7) ) @@ -1535,9 +1522,8 @@ ROM_START( cadashjo ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x08000, "subcpu", ROMREGION_ERASE00 ) /* HD64180RP8 code (link) */ // the board this set was from did not have the link section populated ROM_LOAD( "c21-07.57", 0x00000, 0x08000, CRC(f02292bd) SHA1(0a5c06a048ad67f90e0d766b504582e9eef035f7) ) @@ -1562,9 +1548,8 @@ ROM_START( cadashu ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x08000, "subcpu", 0 ) /* HD64180RP8 code (link) */ ROM_LOAD( "c21-07.57", 0x00000, 0x08000, CRC(f02292bd) SHA1(0a5c06a048ad67f90e0d766b504582e9eef035f7) ) @@ -1589,9 +1574,8 @@ ROM_START( cadashi ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x08000, "subcpu", 0 ) /* HD64180RP8 code (link) */ ROM_LOAD( "c21-07.57", 0x00000, 0x08000, CRC(f02292bd) SHA1(0a5c06a048ad67f90e0d766b504582e9eef035f7) ) @@ -1616,9 +1600,8 @@ ROM_START( cadashf ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x08000, "subcpu", 0 ) /* HD64180RP8 code (link) */ ROM_LOAD( "c21-07.57", 0x00000, 0x08000, CRC(f02292bd) SHA1(0a5c06a048ad67f90e0d766b504582e9eef035f7) ) @@ -1643,9 +1626,8 @@ ROM_START( cadashg ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "c21-01.1", 0x00000, 0x80000, CRC(1ff6f39c) SHA1(742f296efc8073fafa73da2c8d7d26ca9514b6bf) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "c21-08.38", 0x00000, 0x04000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "c21-08.38", 0x00000, 0x10000, CRC(dca495a0) SHA1(4e0f401f1b967da75f33fd7294860ad0b4bf2dce) ) /* banked */ ROM_REGION( 0x08000, "subcpu", 0 ) /* HD64180RP8 code (link) */ ROM_LOAD( "c21-07.57", 0x00000, 0x08000, CRC(f02292bd) SHA1(0a5c06a048ad67f90e0d766b504582e9eef035f7) ) @@ -1670,9 +1652,8 @@ ROM_START( galmedes ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "gm-obj.ic6", 0x00000, 0x80000, CRC(7a4a1315) SHA1(e2010ee4222415fd55ba3102003be4151d29e39b) ) /* Sprites (16 x 16) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "gm-snd.ic27", 0x00000, 0x04000, CRC(d6f56c21) SHA1(ff9743448ac8ce57a2f8c33a26145e7b92cbe3c3) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "gm-snd.ic27", 0x00000, 0x10000, CRC(d6f56c21) SHA1(ff9743448ac8ce57a2f8c33a26145e7b92cbe3c3) ) /* banked */ ROM_REGION( 0x144, "pals", 0 ) ROM_LOAD( "b68-04.ic32", 0x00000, 0x144, CRC(9be618d1) SHA1(61ee33c3db448a05ff8f455e77fe17d51106baec) ) @@ -1694,9 +1675,8 @@ ROM_START( earthjkr ) ROM_LOAD16_BYTE( "ej_1.ic5", 0x80000, 0x10000, CRC(cb4891db) SHA1(af1112608cdd897ef6028ef617f5ca69d7964861) ) ROM_LOAD16_BYTE( "ej_0.ic4", 0x80001, 0x10000, CRC(b612086f) SHA1(625748fcb698ec57b7b3ce46019cf85de99aaaa1) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "ej_2.ic27", 0x00000, 0x04000, CRC(42ba2566) SHA1(c437388684b565c7504d6bad6accd73aa000faca) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "ej_2.ic27", 0x00000, 0x10000, CRC(42ba2566) SHA1(c437388684b565c7504d6bad6accd73aa000faca) ) /* banked */ ROM_REGION( 0x144, "pals", 0 ) ROM_LOAD( "b68-04.ic32", 0x00000, 0x144, CRC(9be618d1) SHA1(61ee33c3db448a05ff8f455e77fe17d51106baec) ) @@ -1718,9 +1698,8 @@ ROM_START( earthjkrp ) // was production PCB complete with MASK rom, could just ROM_LOAD16_BYTE( "ej_1.ic5", 0x80000, 0x10000, CRC(cb4891db) SHA1(af1112608cdd897ef6028ef617f5ca69d7964861) ) ROM_LOAD16_BYTE( "ej_0.ic4", 0x80001, 0x10000, CRC(b612086f) SHA1(625748fcb698ec57b7b3ce46019cf85de99aaaa1) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "ej_2.ic27", 0x00000, 0x04000, CRC(42ba2566) SHA1(c437388684b565c7504d6bad6accd73aa000faca) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "ej_2.ic27", 0x00000, 0x10000, CRC(42ba2566) SHA1(c437388684b565c7504d6bad6accd73aa000faca) ) /* banked */ ROM_REGION( 0x144, "pals", 0 ) ROM_LOAD( "b68-04.ic32", 0x00000, 0x144, CRC(9be618d1) SHA1(61ee33c3db448a05ff8f455e77fe17d51106baec) ) @@ -1740,9 +1719,8 @@ ROM_START( eto ) ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "eto-3.ic6", 0x00000, 0x80000, CRC(dd247397) SHA1(53a7bf877fd7e5f3daf295a698f4012447b6f113) ) /* SCR tiles (8 x 8) */ - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "eto-5.ic27", 0x00000, 0x04000, CRC(b3689da0) SHA1(812d2e0a794403df9f0a5035784f14cd070ea080) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "eto-5.ic27", 0x00000, 0x10000, CRC(b3689da0) SHA1(812d2e0a794403df9f0a5035784f14cd070ea080) ) /* banked */ ROM_END diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 557f5e97b4d..aba98cff98c 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -75,20 +75,20 @@ public: DECLARE_READ8_MEMBER(soundcommand2_r); DECLARE_WRITE8_MEMBER(soundcommand_w); DECLARE_WRITE8_MEMBER(soundcommand2_w); - DECLARE_WRITE8_MEMBER(airbustr_coin_counter_w); - DECLARE_WRITE8_MEMBER(airbustr_videoram_w); - DECLARE_WRITE8_MEMBER(airbustr_colorram_w); - DECLARE_WRITE8_MEMBER(airbustr_videoram2_w); - DECLARE_WRITE8_MEMBER(airbustr_colorram2_w); - DECLARE_WRITE8_MEMBER(airbustr_scrollregs_w); + DECLARE_WRITE8_MEMBER(coin_counter_w); + DECLARE_WRITE8_MEMBER(videoram_w); + DECLARE_WRITE8_MEMBER(colorram_w); + DECLARE_WRITE8_MEMBER(videoram2_w); + DECLARE_WRITE8_MEMBER(colorram2_w); + DECLARE_WRITE8_MEMBER(scrollregs_w); DECLARE_DRIVER_INIT(airbustr); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - UINT32 screen_update_airbustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void screen_eof_airbustr(screen_device &screen, bool state); + UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof(screen_device &screen, bool state); INTERRUPT_GEN_MEMBER(slave_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(airbustr_scanline); }; diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 7ff39c253df..6c7abd7f54c 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -46,15 +46,15 @@ public: required_device m_soundlatch; DECLARE_WRITE8_MEMBER(sound_bank_w); - DECLARE_READ8_MEMBER(ajax_ls138_f10_r); - DECLARE_WRITE8_MEMBER(ajax_ls138_f10_w); - DECLARE_WRITE8_MEMBER(ajax_bankswitch_2_w); - DECLARE_WRITE8_MEMBER(ajax_bankswitch_w); - DECLARE_WRITE8_MEMBER(ajax_lamps_w); + DECLARE_READ8_MEMBER(ls138_f10_r); + DECLARE_WRITE8_MEMBER(ls138_f10_w); + DECLARE_WRITE8_MEMBER(bankswitch_2_w); + DECLARE_WRITE8_MEMBER(bankswitch_w); + DECLARE_WRITE8_MEMBER(lamps_w); DECLARE_WRITE8_MEMBER(k007232_extvol_w); virtual void machine_start() override; virtual void machine_reset() override; - UINT32 screen_update_ajax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(volume_callback0); DECLARE_WRITE8_MEMBER(volume_callback1); K051316_CB_MEMBER(zoom_callback); diff --git a/src/mame/machine/ajax.cpp b/src/mame/machine/ajax.cpp index 9deefef82aa..5f38deb1281 100644 --- a/src/mame/machine/ajax.cpp +++ b/src/mame/machine/ajax.cpp @@ -16,7 +16,7 @@ #include "includes/ajax.h" -/* ajax_bankswitch_w: +/* bankswitch_w: Handled by the LS273 Octal +ve edge trigger D-type Flip-flop with Reset at H11: Bit Description @@ -33,7 +33,7 @@ (*) The Coin Counters are handled by the Konami Custom 051550 */ -WRITE8_MEMBER(ajax_state::ajax_bankswitch_w) +WRITE8_MEMBER(ajax_state::bankswitch_w) { int bank = 0; @@ -50,10 +50,10 @@ WRITE8_MEMBER(ajax_state::ajax_bankswitch_w) /* bank # (ROMS N11 and N12) */ bank += (data & 0x07); - membank("bank2")->set_entry(bank); + membank("mainbank")->set_entry(bank); } -/* ajax_lamps_w: +/* lamps_w: Handled by the LS273 Octal +ve edge trigger D-type Flip-flop with Reset at B9: Bit Description @@ -77,7 +77,7 @@ WRITE8_MEMBER(ajax_state::ajax_bankswitch_w) LS393 C20 Dual -ve edge trigger 4-bit Binary Ripple Counter with Resets */ -WRITE8_MEMBER(ajax_state::ajax_lamps_w) +WRITE8_MEMBER(ajax_state::lamps_w) { output().set_led_value(1, data & 0x02); /* super weapon lamp */ output().set_led_value(2, data & 0x04); /* power up lamps */ @@ -106,7 +106,7 @@ WRITE8_MEMBER(ajax_state::ajax_lamps_w) 0x01c0 (r) MIO2 Enables DIPSW #3 reading */ -READ8_MEMBER(ajax_state::ajax_ls138_f10_r) +READ8_MEMBER(ajax_state::ls138_f10_r) { int data = 0, index; static const char *const portnames[] = { "SYSTEM", "P1", "DSW1", "DSW2" }; @@ -134,7 +134,7 @@ READ8_MEMBER(ajax_state::ajax_ls138_f10_r) return data; } -WRITE8_MEMBER(ajax_state::ajax_ls138_f10_w) +WRITE8_MEMBER(ajax_state::ls138_f10_w) { switch ((offset & 0x01c0) >> 6) { @@ -153,10 +153,10 @@ WRITE8_MEMBER(ajax_state::ajax_ls138_f10_w) m_soundlatch->write(space, offset, data); break; case 0x03: /* Bankswitch + coin counters + priority*/ - ajax_bankswitch_w(space, 0, data); + bankswitch_w(space, 0, data); break; case 0x05: /* Lamps + Joystick vibration + Control panel quaking */ - ajax_lamps_w(space, 0, data); + lamps_w(space, 0, data); break; default: @@ -164,7 +164,7 @@ WRITE8_MEMBER(ajax_state::ajax_ls138_f10_w) } } -/* ajax_bankswitch_w_2: +/* bankswitch_w_2: Handled by the LS273 Octal +ve edge trigger D-type Flip-flop with Reset at K14: Bit Description @@ -179,7 +179,7 @@ WRITE8_MEMBER(ajax_state::ajax_ls138_f10_w) 0 SRB0 / */ -WRITE8_MEMBER(ajax_state::ajax_bankswitch_2_w) +WRITE8_MEMBER(ajax_state::bankswitch_2_w) { /* enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); @@ -191,7 +191,7 @@ WRITE8_MEMBER(ajax_state::ajax_bankswitch_2_w) m_firq_enable = data & 0x10; /* bank # (ROMS G16 and I16) */ - membank("bank1")->set_entry(data & 0x0f); + membank("subbank")->set_entry(data & 0x0f); } void ajax_state::machine_start() @@ -199,11 +199,9 @@ void ajax_state::machine_start() UINT8 *MAIN = memregion("maincpu")->base(); UINT8 *SUB = memregion("sub")->base(); - membank("bank1")->configure_entries(0, 9, &SUB[0x10000], 0x2000); - membank("bank2")->configure_entries(0, 12, &MAIN[0x10000], 0x2000); - - membank("bank1")->set_entry(0); - membank("bank2")->set_entry(0); + membank("mainbank")->configure_entries(0, 4, &MAIN[0x00000], 0x2000); + membank("mainbank")->configure_entries(4, 8, &MAIN[0x10000], 0x2000); + membank("subbank")->configure_entries(0, 9, &SUB[0x00000], 0x2000); save_item(NAME(m_priority)); save_item(NAME(m_firq_enable)); diff --git a/src/mame/video/airbustr.cpp b/src/mame/video/airbustr.cpp index e258fa7a547..e6f1aa4af4a 100644 --- a/src/mame/video/airbustr.cpp +++ b/src/mame/video/airbustr.cpp @@ -35,25 +35,25 @@ #include "emu.h" #include "includes/airbustr.h" -WRITE8_MEMBER(airbustr_state::airbustr_videoram_w) +WRITE8_MEMBER(airbustr_state::videoram_w) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(airbustr_state::airbustr_colorram_w) +WRITE8_MEMBER(airbustr_state::colorram_w) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(airbustr_state::airbustr_videoram2_w) +WRITE8_MEMBER(airbustr_state::videoram2_w) { m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(airbustr_state::airbustr_colorram2_w) +WRITE8_MEMBER(airbustr_state::colorram2_w) { m_colorram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); @@ -71,7 +71,7 @@ WRITE8_MEMBER(airbustr_state::airbustr_colorram2_w) Bg Y Bg X Fg Y Fg X <-Scroll High Bits (complemented!) */ -WRITE8_MEMBER(airbustr_state::airbustr_scrollregs_w) +WRITE8_MEMBER(airbustr_state::scrollregs_w) { switch (offset) // offset 0 <-> port 4 { @@ -125,7 +125,7 @@ void airbustr_state::video_start() } -UINT32 airbustr_state::screen_update_airbustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +UINT32 airbustr_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); @@ -136,7 +136,7 @@ UINT32 airbustr_state::screen_update_airbustr(screen_device &screen, bitmap_ind1 return 0; } -void airbustr_state::screen_eof_airbustr(screen_device &screen, bool state) +void airbustr_state::screen_eof(screen_device &screen, bool state) { // rising edge if (state) diff --git a/src/mame/video/ajax.cpp b/src/mame/video/ajax.cpp index 35e68312860..6185728851d 100644 --- a/src/mame/video/ajax.cpp +++ b/src/mame/video/ajax.cpp @@ -2,7 +2,7 @@ // copyright-holders:Manuel Abadia /*************************************************************************** - video.c + ajax.cpp Functions to emulate the video hardware of the machine. @@ -72,7 +72,7 @@ K051316_CB_MEMBER(ajax_state::zoom_callback) ***************************************************************************/ -UINT32 ajax_state::screen_update_ajax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +UINT32 ajax_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { m_k052109->tilemap_update();