summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author David Haywood <hazemamewip@hotmail.com>2018-03-15 00:29:48 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2018-03-14 20:29:48 -0400
commite86bb4ec2adbc99f3f203876be09253d490e3d92 (patch)
tree192c8cf53c897b20855e3b8284f4793fa5ff3dbb /src
parent9f7b85d038850e4ddc95d54c66436532aff96650 (diff)
use dumped C-Chip for Rainbow Islands [Team Caps0ff] (#3325)
simulation isn't yet removed because Rainbow Islands Extra still needs it (I'm checking if I can make a temporary ROM until it is so that we can clean it up in the meantime)
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/rbisland.cpp106
-rw-r--r--src/mame/includes/rbisland.h76
-rw-r--r--src/mame/machine/rbisland.cpp3
3 files changed, 128 insertions, 57 deletions
diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp
index 2fef560b835..1a5bfbb5214 100644
--- a/src/mame/drivers/rbisland.cpp
+++ b/src/mame/drivers/rbisland.cpp
@@ -346,7 +346,7 @@ WRITE16_MEMBER(rbisland_state::jumping_sound_w)
MEMORY STRUCTURES
***************************************************************************/
-void rbisland_state::rbisland_map(address_map &map)
+void rbisland_state::rbisland_base_map(address_map &map)
{
map(0x000000, 0x07ffff).rom();
map(0x10c000, 0x10ffff).ram(); /* main RAM */
@@ -359,9 +359,7 @@ void rbisland_state::rbisland_map(address_map &map)
map(0x3e0000, 0x3e0001).nopr();
map(0x3e0001, 0x3e0001).w("ciu", FUNC(pc060ha_device::master_port_w));
map(0x3e0003, 0x3e0003).rw("ciu", FUNC(pc060ha_device::master_comm_r), FUNC(pc060ha_device::master_comm_w));
- map(0x800000, 0x8007ff).rw(this, FUNC(rbisland_state::rbisland_cchip_ram_r), FUNC(rbisland_state::rbisland_cchip_ram_w));
- map(0x800802, 0x800803).rw(this, FUNC(rbisland_state::rbisland_cchip_ctrl_r), FUNC(rbisland_state::rbisland_cchip_ctrl_w));
- map(0x800c00, 0x800c01).w(this, FUNC(rbisland_state::rbisland_cchip_bank_w));
+ // c-chip goes here
map(0xc00000, 0xc0ffff).rw(m_pc080sn, FUNC(pc080sn_device::word_r), FUNC(pc080sn_device::word_w));
map(0xc20000, 0xc20003).w(m_pc080sn, FUNC(pc080sn_device::yscroll_word_w));
map(0xc40000, 0xc40003).w(m_pc080sn, FUNC(pc080sn_device::xscroll_word_w));
@@ -369,6 +367,21 @@ void rbisland_state::rbisland_map(address_map &map)
map(0xd00000, 0xd03fff).rw(m_pc090oj, FUNC(pc090oj_device::word_r), FUNC(pc090oj_device::word_w)); /* sprite ram + other stuff */
}
+void rbisland_state::rbisland_sim_map(address_map &map)
+{
+ rbisland_base_map(map);
+ map(0x800000, 0x8007ff).rw(this, FUNC(rbisland_state::rbisland_cchip_ram_r), FUNC(rbisland_state::rbisland_cchip_ram_w));
+ map(0x800802, 0x800803).rw(this, FUNC(rbisland_state::rbisland_cchip_ctrl_r), FUNC(rbisland_state::rbisland_cchip_ctrl_w));
+ map(0x800c00, 0x800c01).w(this, FUNC(rbisland_state::rbisland_cchip_bank_w));
+}
+
+void rbisland_state::rbisland_emu_map(address_map &map)
+{
+ rbisland_base_map(map);
+ map(0x800000, 0x8007ff).rw(m_cchip, FUNC(taito_cchip_device::mem68_r), FUNC(taito_cchip_device::mem68_w)).umask16(0x00ff);
+ map(0x800800, 0x800fff).rw(m_cchip, FUNC(taito_cchip_device::asic_r), FUNC(taito_cchip_device::asic68_w)).umask16(0x00ff);
+}
+
void rbisland_state::jumping_map(address_map &map)
{
map(0x000000, 0x09ffff).rom();
@@ -433,7 +446,6 @@ void rbisland_state::jumping_sound_map(address_map &map)
map(0xc000, 0xffff).rom();
}
-
/***********************************************************
INPUT PORTS, DIPs
***********************************************************/
@@ -528,6 +540,14 @@ static INPUT_PORTS_START( rbisland )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
INPUT_PORTS_END
+static INPUT_PORTS_START( rbisland_emu )
+ PORT_INCLUDE(rbisland)
+
+ PORT_MODIFY("80000D")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
+INPUT_PORTS_END
+
static INPUT_PORTS_START( jumping )
PORT_INCLUDE(rbisland_generic)
@@ -632,21 +652,18 @@ void rbisland_state::machine_start()
{
}
-MACHINE_CONFIG_START(rbisland_state::rbisland)
+MACHINE_CONFIG_START(rbisland_state::rbisland_base)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rbisland_map)
+ MCFG_CPU_PROGRAM_MAP(rbisland_sim_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rbisland_sound_map)
- MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)/2) /* ? MHz */
-
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
-
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -682,6 +699,45 @@ MACHINE_CONFIG_START(rbisland_state::rbisland)
MCFG_PC060HA_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
+INTERRUPT_GEN_MEMBER(rbisland_state::interrupt)
+{
+ m_maincpu->set_input_line(4, HOLD_LINE);
+ m_cchip->ext_interrupt(ASSERT_LINE);
+ m_cchip_irq_clear->adjust(attotime::zero);
+}
+
+TIMER_DEVICE_CALLBACK_MEMBER(rbisland_state::cchip_irq_clear_cb)
+{
+ m_cchip->ext_interrupt(CLEAR_LINE);
+}
+
+WRITE8_MEMBER(rbisland_state::counters_w)
+{
+ machine().bookkeeping().coin_lockout_w(1, data & 0x80);
+ machine().bookkeeping().coin_lockout_w(0, data & 0x40);
+ machine().bookkeeping().coin_counter_w(1, data & 0x20);
+ machine().bookkeeping().coin_counter_w(0, data & 0x10);
+}
+
+MACHINE_CONFIG_START(rbisland_state::rbisland_emu)
+ rbisland_base(config);
+
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rbisland_emu_map)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, interrupt)
+
+ MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)/2) /* ? MHz */
+ MCFG_CCHIP_IN_PORTA_CB(IOPORT("800007"))
+ MCFG_CCHIP_IN_PORTB_CB(IOPORT("800009"))
+ MCFG_CCHIP_IN_PORTC_CB(IOPORT("80000B"))
+ MCFG_CCHIP_IN_PORTAD_CB(IOPORT("80000D"))
+ MCFG_CCHIP_OUT_PORTB_CB(WRITE8(rbisland_state, counters_w))
+
+ MCFG_TIMER_DRIVER_ADD("cchip_irq_clear", rbisland_state, cchip_irq_clear_cb)
+MACHINE_CONFIG_END
+
+
+
/* Jumping: The PCB has 2 Xtals, 18.432MHz and 24MHz */
MACHINE_CONFIG_START(rbisland_state::jumping)
@@ -749,7 +805,7 @@ ROM_START( rbisland )
ROM_LOAD16_BYTE( "b22-04.24", 0x40001, 0x20000, CRC(91625e7f) SHA1(765afd973d9b82bb496b04beca284bf2769d6e6f) )
ROM_REGION( 0x2000, "cchip:cchip_eprom", 0 )
- ROM_LOAD( "cchip_b22-15.53", 0x0000, 0x2000, NO_DUMP )
+ ROM_LOAD( "cchip_b22-15.53", 0x0000, 0x2000, CRC(08c588a6) SHA1(7e38342be68d37f7106df069dd2021c509be1244) )
ROM_REGION( 0x1c000, "audiocpu", 0 )
ROM_LOAD( "b22-14.43", 0x00000, 0x4000, CRC(113c1a5b) SHA1(effa2adf54a6be78b2d4baf3a47529342fb0d895) )
@@ -774,7 +830,7 @@ ROM_START( rbislando )
ROM_LOAD16_BYTE( "b22-04.24", 0x40001, 0x20000, CRC(91625e7f) SHA1(765afd973d9b82bb496b04beca284bf2769d6e6f) )
ROM_REGION( 0x2000, "cchip:cchip_eprom", 0 )
- ROM_LOAD( "cchip_b22-15.53", 0x0000, 0x2000, NO_DUMP )
+ ROM_LOAD( "cchip_b22-15.53", 0x0000, 0x2000, CRC(08c588a6) SHA1(7e38342be68d37f7106df069dd2021c509be1244) )
ROM_REGION( 0x1c000, "audiocpu", 0 )
ROM_LOAD( "b22-14.43", 0x00000, 0x4000, CRC(113c1a5b) SHA1(effa2adf54a6be78b2d4baf3a47529342fb0d895) )
@@ -952,21 +1008,18 @@ ROM_START( jumpingi )
ROM_LOAD( "JP3.IC51", 0x000, 0x104, CRC(c1e6cb8f) SHA1(9908e62bb9b806047b7a344bb62334bd696b9fc8) ) // PAL16L8A-2CN z80 address decoder?
ROM_END
+
+
+
DRIVER_INIT_MEMBER(rbisland_state,rbisland)
{
uint8_t *ROM = memregion("audiocpu")->base();
-
membank("bank1")->configure_entries(0, 4, &ROM[0xc000], 0x4000);
-
- rbisland_cchip_init(0);
}
DRIVER_INIT_MEMBER(rbisland_state,rbislande)
{
- uint8_t *ROM = memregion("audiocpu")->base();
-
- membank("bank1")->configure_entries(0, 4, &ROM[0xc000], 0x4000);
-
+ DRIVER_INIT_CALL(rbisland);
rbisland_cchip_init(1);
}
@@ -977,9 +1030,12 @@ DRIVER_INIT_MEMBER(rbisland_state,jumping)
}
-GAME( 1987, rbisland, 0, rbisland, rbisland, rbisland_state, rbisland, ROT0, "Taito Corporation", "Rainbow Islands (new version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rbislando, rbisland, rbisland, rbisland, rbisland_state, rbisland, ROT0, "Taito Corporation", "Rainbow Islands (old version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, rbislande, rbisland, rbisland, rbisland, rbisland_state, rbislande, ROT0, "Taito Corporation", "Rainbow Islands (Extra)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, jumping, rbisland, jumping, jumping, rbisland_state, jumping, ROT0, "bootleg", "Jumping (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, jumpinga, rbisland, jumping, jumping, rbisland_state, jumping, ROT0, "bootleg (Seyutu)", "Jumping (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, jumpingi, rbisland, jumpingi, jumping, rbisland_state, jumping, ROT0, "bootleg (Seyutu)", "Jumping (set 3, Imnoe PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rbisland, 0, rbisland_emu, rbisland_emu, rbisland_state, rbisland, ROT0, "Taito Corporation", "Rainbow Islands (new version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rbislando, rbisland, rbisland_emu, rbisland_emu, rbisland_state, rbisland, ROT0, "Taito Corporation", "Rainbow Islands (old version)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1989, jumping, rbisland, jumping, jumping, rbisland_state, jumping, ROT0, "bootleg", "Jumping (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, jumpinga, rbisland, jumping, jumping, rbisland_state, jumping, ROT0, "bootleg (Seyutu)", "Jumping (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, jumpingi, rbisland, jumpingi, jumping, rbisland_state, jumping, ROT0, "bootleg (Seyutu)", "Jumping (set 3, Imnoe PCB)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1988, rbislande, rbisland, rbisland_base, rbisland, rbisland_state, rbislande, ROT0, "Taito Corporation", "Rainbow Islands - Extra Version", MACHINE_SUPPORTS_SAVE )
+
diff --git a/src/mame/includes/rbisland.h b/src/mame/includes/rbisland.h
index 4c573a01929..4d67a6652a7 100644
--- a/src/mame/includes/rbisland.h
+++ b/src/mame/includes/rbisland.h
@@ -15,7 +15,7 @@
#include "video/pc080sn.h"
#include "video/pc090oj.h"
-
+#include "machine/timer.h"
class rbisland_state : public driver_device
{
@@ -29,32 +29,10 @@ public:
m_pc080sn(*this, "pc080sn"),
m_pc090oj(*this, "pc090oj"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette") { }
-
- /* memory pointers */
- optional_shared_ptr<uint16_t> m_spriteram;
-
- /* video-related */
- uint16_t m_sprite_ctrl;
- uint16_t m_sprites_flipscreen;
+ m_palette(*this, "palette"),
+ m_cchip_irq_clear(*this, "cchip_irq_clear")
+ { }
- /* misc */
- uint8_t m_jumping_latch;
-
- /* c-chip */
- std::unique_ptr<uint8_t[]> m_CRAM[8];
- int m_extra_version;
- uint8_t m_current_bank;
- emu_timer *m_cchip_timer;
-
- /* devices */
- required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_audiocpu;
- optional_device<taito_cchip_device> m_cchip;
- required_device<pc080sn_device> m_pc080sn;
- optional_device<pc090oj_device> m_pc090oj;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
DECLARE_WRITE16_MEMBER(jumping_sound_w);
DECLARE_READ8_MEMBER(jumping_latch_r);
@@ -66,6 +44,7 @@ public:
DECLARE_WRITE16_MEMBER(rbisland_spritectrl_w);
DECLARE_WRITE16_MEMBER(jumping_spritectrl_w);
DECLARE_WRITE8_MEMBER(bankswitch_w);
+ DECLARE_WRITE8_MEMBER(counters_w);
DECLARE_DRIVER_INIT(jumping);
DECLARE_DRIVER_INIT(rbislande);
DECLARE_DRIVER_INIT(rbisland);
@@ -74,17 +53,50 @@ public:
uint32_t screen_update_rainbow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_jumping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(cchip_timer);
- void request_round_data( );
- void request_world_data( );
- void request_goalin_data( );
- void rbisland_cchip_init( int version );
+ INTERRUPT_GEN_MEMBER(interrupt);
+ TIMER_DEVICE_CALLBACK_MEMBER(cchip_irq_clear_cb);
+
void jumping(machine_config &config);
- void rbisland(machine_config &config);
+ void rbisland_base(machine_config &config);
+ void rbisland_emu(machine_config &config);
void jumpingi(machine_config &config);
void jumping_map(address_map &map);
void jumping_sound_map(address_map &map);
- void rbisland_map(address_map &map);
+ void rbisland_base_map(address_map &map);
+ void rbisland_emu_map(address_map &map);
+ void rbisland_sim_map(address_map &map);
void rbisland_sound_map(address_map &map);
+
+private:
+ /* memory pointers */
+ optional_shared_ptr<uint16_t> m_spriteram;
+
+ /* video-related */
+ uint16_t m_sprite_ctrl;
+ uint16_t m_sprites_flipscreen;
+
+ /* misc */
+ uint8_t m_jumping_latch;
+
+ /* c-chip simulation */
+ std::unique_ptr<uint8_t[]> m_CRAM[8];
+ int m_extra_version;
+ uint8_t m_current_bank;
+ emu_timer *m_cchip_timer;
+ void request_round_data( );
+ void request_world_data( );
+ void request_goalin_data( );
+ void rbisland_cchip_init( int version );
+
+ /* devices */
+ required_device<cpu_device> m_maincpu;
+ required_device<cpu_device> m_audiocpu;
+ optional_device<taito_cchip_device> m_cchip;
+ required_device<pc080sn_device> m_pc080sn;
+ optional_device<pc090oj_device> m_pc090oj;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<palette_device> m_palette;
+ optional_device<timer_device> m_cchip_irq_clear;
};
diff --git a/src/mame/machine/rbisland.cpp b/src/mame/machine/rbisland.cpp
index 4b8b1bcbbac..11006c10fff 100644
--- a/src/mame/machine/rbisland.cpp
+++ b/src/mame/machine/rbisland.cpp
@@ -109,6 +109,7 @@ static const uint8_t CROM_BANK2[] =
0x22, 0x22
};
+// fcd-1052 in C-Chip ROM
static const uint8_t CROM_BANK4_WORLD0[] =
{
0x28, 0x00, 0x2C, 0x00, 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x3C, 0x00,
@@ -285,6 +286,7 @@ static const uint8_t CROM_BANK4_WORLD9[] =
0xFB, 0x0F, 0xFC, 0x0F, 0xDC, 0x02, 0xDD, 0x02
};
+// 8f1-9bc in C-Chip ROM
static const uint8_t CROM_BANK5_WORLD0[] =
{
0x1C, 0x00, 0x1C, 0x00, 0x32, 0x00, 0x32, 0x00, 0x48, 0x00, 0x48, 0x00,
@@ -306,6 +308,7 @@ static const uint8_t CROM_BANK5_WORLD0[] =
0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x3C, 0x00, 0x00, 0x01, 0xFF, 0xFF
};
+// 9bd-a4c in C-Chip ROM
static const uint8_t CROM_BANK5_WORLD1[] =
{
0x0C, 0x00, 0x22, 0x00, 0x38, 0x00, 0x4E, 0x00, 0x64, 0x00, 0x7A, 0x00,