From d25102cbae2cd22d5abd1fe26a4ea91fe2eb717c Mon Sep 17 00:00:00 2001 From: angelosa Date: Wed, 30 May 2018 02:43:25 +0200 Subject: [PATCH] tatsumi.cpp: unbreak apache3 / roundup5 (nw) --- src/mame/drivers/tatsumi.cpp | 54 ++++++++++++++++++------------------ src/mame/includes/tatsumi.h | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 5ed8ff84e16..976eba1a174 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -264,12 +264,12 @@ void apache3_state::apache3_v30_map(address_map &map) map(0x0f800, 0x0f801).rw(this, FUNC(apache3_state::apache3_bank_r), FUNC(apache3_state::apache3_bank_w)); map(0x10000, 0x1ffff).rw(this, FUNC(apache3_state::apache3_v30_v20_r), FUNC(apache3_state::apache3_v30_v20_w)); map(0x20000, 0x2ffff).rw(this, FUNC(apache3_state::tatsumi_v30_68000_r), FUNC(apache3_state::tatsumi_v30_68000_w)); - map(0xa0000, 0xfffff).rom(); + map(0x80000, 0xfffff).rom().region("master_rom", 0); } void apache3_state::apache3_68000_map(address_map &map) { - map(0x00000, 0x7ffff).rom(); + map(0x00000, 0x7ffff).rom().region("slave_rom", 0); map(0x80000, 0x83fff).ram().share("sharedram"); map(0x90000, 0x93fff).ram().share("spriteram"); map(0x9a000, 0x9a1ff).rw(this, FUNC(apache3_state::tatsumi_sprite_control_r), FUNC(apache3_state::tatsumi_sprite_control_w)).share("obj_ctrl_ram"); @@ -288,7 +288,7 @@ void apache3_state::apache3_v20_map(address_map &map) map(0x08000, 0x08001).r(this, FUNC(apache3_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write)); map(0x0a000, 0x0a000).r(this, FUNC(apache3_state::tatsumi_hack_oki_r)).w(m_oki, FUNC(okim6295_device::write)); map(0x0e000, 0x0e007).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)); - map(0xf0000, 0xfffff).rom(); + map(0xf0000, 0xfffff).rom().region("sound_rom", 0); } void apache3_state::apache3_z80_map(address_map &map) @@ -313,12 +313,12 @@ void roundup5_state::roundup5_v30_map(address_map &map) map(0x10000, 0x1ffff).rw(this, FUNC(roundup5_state::roundup_v30_z80_r), FUNC(roundup5_state::roundup_v30_z80_w)); map(0x20000, 0x2ffff).rw(this, FUNC(roundup5_state::tatsumi_v30_68000_r), FUNC(roundup5_state::tatsumi_v30_68000_w)); map(0x30000, 0x3ffff).rw(this, FUNC(roundup5_state::gfxdata_r), FUNC(roundup5_state::gfxdata_w)).umask16(0x00ff); - map(0x80000, 0xfffff).rom(); + map(0x80000, 0xfffff).rom().region("master_rom", 0); } void roundup5_state::roundup5_68000_map(address_map &map) { - map(0x00000, 0x7ffff).rom(); + map(0x00000, 0x7ffff).rom().region("slave_rom", 0); map(0x80000, 0x83fff).ram().share("sharedram"); map(0x90000, 0x93fff).ram().share("spriteram"); map(0x9a000, 0x9a1ff).rw(this, FUNC(roundup5_state::tatsumi_sprite_control_r), FUNC(roundup5_state::tatsumi_sprite_control_w)).share("obj_ctrl_ram"); @@ -1090,20 +1090,20 @@ MACHINE_CONFIG_END /***************************************************************************/ ROM_START( apache3 ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* v30 main cpu */ - ROM_LOAD16_BYTE( "ap-25f.125", 0x0a0001, 0x10000, CRC(3c7530f4) SHA1(9f7b58a3abddbdc3081ba9dfc1732406eb8c1752) ) - ROM_LOAD16_BYTE( "ap-26f.133", 0x0a0000, 0x10000, CRC(2955997f) SHA1(86e37def923d9cf4eb33e7979118ec6f1ef62678) ) - ROM_LOAD16_BYTE( "ap-23f.110", 0x0e0001, 0x10000, CRC(d7077149) SHA1(b08f5a9ee03641c20bdd5e5c9671a22c740150c6) ) - ROM_LOAD16_BYTE( "ap-24f.118", 0x0e0000, 0x10000, CRC(0bdef11b) SHA1(ed687600962ed2ca3a8e67cbd84fa5486778eade) ) + ROM_REGION( 0x80000, "master_rom", 0 ) /* v30 main cpu */ + ROM_LOAD16_BYTE( "ap-25f.125", 0x020001, 0x10000, CRC(3c7530f4) SHA1(9f7b58a3abddbdc3081ba9dfc1732406eb8c1752) ) + ROM_LOAD16_BYTE( "ap-26f.133", 0x020000, 0x10000, CRC(2955997f) SHA1(86e37def923d9cf4eb33e7979118ec6f1ef62678) ) + ROM_LOAD16_BYTE( "ap-23f.110", 0x060001, 0x10000, CRC(d7077149) SHA1(b08f5a9ee03641c20bdd5e5c9671a22c740150c6) ) + ROM_LOAD16_BYTE( "ap-24f.118", 0x060000, 0x10000, CRC(0bdef11b) SHA1(ed687600962ed2ca3a8e67cbd84fa5486778eade) ) - ROM_REGION( 0x80000, "sub", 0 ) /* 68000 sub cpu */ + ROM_REGION16_BE( 0x80000, "slave_rom", 0 ) /* 68000 sub cpu */ ROM_LOAD16_BYTE( "ap-19c.80", 0x000001, 0x10000, CRC(0908e468) SHA1(a2d725993bd4cd5425468736154fd3dd9dd7b060) ) ROM_LOAD16_BYTE( "ap-21c.97", 0x000000, 0x10000, CRC(38a056fb) SHA1(67c8ae58670cebde0771854e1fb5fc2eb2543ecc) ) ROM_LOAD16_BYTE( "ap-20a.89", 0x040001, 0x20000, CRC(92d24b5e) SHA1(1ea270d46a607e47b7e0961b532316aa05dc8f4e) ) ROM_LOAD16_BYTE( "ap-22a.105", 0x040000, 0x20000, CRC(a8458a92) SHA1(43674731c2e9962c2bfbb73a85484cf03d6be223) ) - ROM_REGION( 0x100000, "audiocpu", 0 ) /* 64k code for sound V20 */ - ROM_LOAD( "ap-27d.151", 0x0f0000, 0x10000, CRC(294b4d79) SHA1(2b03418a12a2aaf3919b98161d8d0ce6ae29a2bb) ) + ROM_REGION( 0x10000, "sound_rom", 0 ) /* 64k code for sound V20 */ + ROM_LOAD( "ap-27d.151", 0x00000, 0x10000, CRC(294b4d79) SHA1(2b03418a12a2aaf3919b98161d8d0ce6ae29a2bb) ) ROM_REGION( 0x200000, "sprites", ROMREGION_ERASE00 ) /* Filled in by both regions below */ @@ -1142,20 +1142,20 @@ ROM_START( apache3 ) ROM_END ROM_START( apache3a ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* v30 main cpu */ - ROM_LOAD16_BYTE( "ap-25c.125", 0x0a0001, 0x10000, CRC(7bc496a6) SHA1(5491d06181d729407e975b85a8715fdc3b489c67) ) - ROM_LOAD16_BYTE( "ap-26c.133", 0x0a0000, 0x10000, CRC(9393a470) SHA1(00376f7a545629a83eb5a90b9d1685a68430e4ce) ) - ROM_LOAD16_BYTE( "ap-23g.110", 0x0e0001, 0x10000, CRC(0ab485e4) SHA1(d8d0695312732c31cedcb1c298810a6793835e80) ) - ROM_LOAD16_BYTE( "ap-24g.118", 0x0e0000, 0x10000, CRC(6348e196) SHA1(6be537491a56a28b62981cae6db8dfc4eb2fece2) ) + ROM_REGION( 0x80000, "master_rom", 0 ) /* v30 main cpu */ + ROM_LOAD16_BYTE( "ap-25c.125", 0x020001, 0x10000, CRC(7bc496a6) SHA1(5491d06181d729407e975b85a8715fdc3b489c67) ) + ROM_LOAD16_BYTE( "ap-26c.133", 0x020000, 0x10000, CRC(9393a470) SHA1(00376f7a545629a83eb5a90b9d1685a68430e4ce) ) + ROM_LOAD16_BYTE( "ap-23g.110", 0x060001, 0x10000, CRC(0ab485e4) SHA1(d8d0695312732c31cedcb1c298810a6793835e80) ) + ROM_LOAD16_BYTE( "ap-24g.118", 0x060000, 0x10000, CRC(6348e196) SHA1(6be537491a56a28b62981cae6db8dfc4eb2fece2) ) - ROM_REGION( 0x80000, "sub", 0 ) /* 68000 sub cpu */ + ROM_REGION16_BE( 0x80000, "slave_rom", 0 ) /* 68000 sub cpu */ ROM_LOAD16_BYTE( "ap-19c.80", 0x000001, 0x10000, CRC(0908e468) SHA1(a2d725993bd4cd5425468736154fd3dd9dd7b060) ) ROM_LOAD16_BYTE( "ap-21c.97", 0x000000, 0x10000, CRC(38a056fb) SHA1(67c8ae58670cebde0771854e1fb5fc2eb2543ecc) ) ROM_LOAD16_BYTE( "ap-20a.89", 0x040001, 0x20000, CRC(92d24b5e) SHA1(1ea270d46a607e47b7e0961b532316aa05dc8f4e) ) ROM_LOAD16_BYTE( "ap-22a.105", 0x040000, 0x20000, CRC(a8458a92) SHA1(43674731c2e9962c2bfbb73a85484cf03d6be223) ) - ROM_REGION( 0x100000, "audiocpu", 0 ) /* 64k code for sound V20 */ - ROM_LOAD( "ap-27d.151", 0x0f0000, 0x10000, CRC(294b4d79) SHA1(2b03418a12a2aaf3919b98161d8d0ce6ae29a2bb) ) + ROM_REGION( 0x10000, "sound_rom", 0 ) /* 64k code for sound V20 */ + ROM_LOAD( "ap-27d.151", 0x00000, 0x10000, CRC(294b4d79) SHA1(2b03418a12a2aaf3919b98161d8d0ce6ae29a2bb) ) ROM_REGION( 0x200000, "sprites", ROMREGION_ERASE00 ) /* Filled in by both regions below */ @@ -1194,13 +1194,13 @@ ROM_START( apache3a ) ROM_END ROM_START( roundup5 ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* v30 main cpu */ - ROM_LOAD16_BYTE( "ru-23s", 0x080000, 0x20000, CRC(2dc8c521) SHA1(b78de101db3ef00fc4375ae32a7871e0da2dac6c) ) - ROM_LOAD16_BYTE( "ru-26s", 0x080001, 0x20000, CRC(1e16b531) SHA1(d7badef29cf1c4a9bd262933ecd1ca3343ea94bd) ) - ROM_LOAD16_BYTE( "ru-22t", 0x0c0000, 0x20000, CRC(9611382e) SHA1(c99258782dbad6d69ba7f54115ee3aa218f9b6ee) ) - ROM_LOAD16_BYTE( "ru-25t", 0x0c0001, 0x20000, CRC(b6cd0f2d) SHA1(61925c2346d79baaf9bce3d19a7dfc45b8232f92) ) + ROM_REGION( 0x80000, "master_rom", 0 ) /* v30 main cpu */ + ROM_LOAD16_BYTE( "ru-23s", 0x000000, 0x20000, CRC(2dc8c521) SHA1(b78de101db3ef00fc4375ae32a7871e0da2dac6c) ) + ROM_LOAD16_BYTE( "ru-26s", 0x000001, 0x20000, CRC(1e16b531) SHA1(d7badef29cf1c4a9bd262933ecd1ca3343ea94bd) ) + ROM_LOAD16_BYTE( "ru-22t", 0x040000, 0x20000, CRC(9611382e) SHA1(c99258782dbad6d69ba7f54115ee3aa218f9b6ee) ) + ROM_LOAD16_BYTE( "ru-25t", 0x040001, 0x20000, CRC(b6cd0f2d) SHA1(61925c2346d79baaf9bce3d19a7dfc45b8232f92) ) - ROM_REGION( 0x80000, "sub", 0 ) /* 68000 sub cpu */ + ROM_REGION16_BE( 0x80000, "slave_rom", 0 ) /* 68000 sub cpu */ ROM_LOAD16_BYTE( "ru-20s", 0x000000, 0x20000, CRC(c5524558) SHA1(a94e7e4548148c83a332524ab4e06607732e13d5) ) ROM_LOAD16_BYTE( "ru-18s", 0x000001, 0x20000, CRC(163ef03d) SHA1(099ac2d74164bdc6402b08efb521f49275780858) ) ROM_LOAD16_BYTE( "ru-21s", 0x040000, 0x20000, CRC(b9f91b70) SHA1(43c5d9dafb60ed3e5c3eb0e612c2dbc5497f8a6c) ) diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index f78f3157fec..40ca02dea16 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -39,8 +39,8 @@ public: optional_shared_ptr m_sharedram; required_shared_ptr m_sprite_control_ram; required_shared_ptr m_spriteram; - optional_memory_region m_mainregion; - optional_memory_region m_subregion; + required_memory_region m_mainregion; + required_memory_region m_subregion; uint8_t *m_rom_sprite_lookup[2]; uint8_t *m_rom_clut[2];