From 0c873c9b66155023850ef149239f9534d3f753f2 Mon Sep 17 00:00:00 2001 From: Brian Troha Date: Wed, 13 Jun 2012 00:21:21 +0000 Subject: [PATCH] Fix / document issue with Linky Pipe New games added or promoted from NOT_WORKING status --------------------------------------------------- Linky Pipe [David Haywood] --- src/mame/drivers/eolith.c | 19 +++++++------ src/mame/drivers/eolithsp.c | 56 ++++++++++++++++++++----------------- 2 files changed, 41 insertions(+), 34 deletions(-) diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 5530fba5e3c..fd9722018e3 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -80,8 +80,10 @@ - linkypip (Linky Pipe) - Game seems to randomly hang for unknown reasons at the "Round 1" screen - just before you can actually start playing. Gets cought up here: + Linky Pipe seems to randomly hang based on the lower 2 bits of the + "dipswitches" at boot. Is this protection, some kind of left over + debug code, or a CPU bug? The game seems fine with those switches + left high. The code responsible for this issue is: 40008176: MOV L10, L11 40008178: LDW.P L5, L8 @@ -330,12 +332,11 @@ static INPUT_PORTS_START( linkypip ) PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_MODIFY("DSW1") - PORT_DIPNAME( 0x00000001, 0x00000001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:1") - PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00000000, DEF_STR( On ) ) - PORT_DIPNAME( 0x00000002, 0x00000002, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW4:2") - PORT_DIPSETTING( 0x00000002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00000000, DEF_STR( On ) ) + PORT_DIPNAME( 0x00000003, 0x00000003, "Don't Touch" ) PORT_DIPLOCATION("SW4:1,2") // See notes in header of source. + PORT_DIPSETTING( 0x00000000, "Fail (0)" ) + PORT_DIPSETTING( 0x00000001, "Fail (1)" ) + PORT_DIPSETTING( 0x00000002, "Fail (2)" ) + PORT_DIPSETTING( 0x00000003, "Working (3)" ) PORT_DIPNAME( 0x0000000c, 0x0000000c, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW4:3,4") PORT_DIPSETTING( 0x00000000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x00000004, DEF_STR( 3C_1C ) ) @@ -1498,7 +1499,7 @@ static DRIVER_INIT( hidctch3 ) * *************************************/ -GAME( 1998, linkypip, 0, eolith45, linkypip, eolith, ROT0, "Eolith", "Linky Pipe", GAME_IMPERFECT_SOUND | GAME_NOT_WORKING ) +GAME( 1998, linkypip, 0, eolith45, linkypip, eolith, ROT0, "Eolith", "Linky Pipe", GAME_IMPERFECT_SOUND ) GAME( 1998, ironfort, 0, ironfort, ironfort, eolith, ROT0, "Eolith", "Iron Fortress", GAME_IMPERFECT_SOUND ) GAME( 1998, ironfortj, ironfort, ironfort, ironfortj, eolith, ROT0, "Eolith", "Iron Fortress (Japan)", GAME_IMPERFECT_SOUND ) GAME( 1998, hidnctch, 0, eolith45, hidnctch, eolith, ROT0, "Eolith", "Hidden Catch (World) / Tul Lin Gu Lim Chat Ki '98 (Korea) (pcb ver 3.03)", GAME_IMPERFECT_SOUND ) // or Teurrin Geurim Chajgi '98 diff --git a/src/mame/drivers/eolithsp.c b/src/mame/drivers/eolithsp.c index bde086e3b4d..de027501fab 100644 --- a/src/mame/drivers/eolithsp.c +++ b/src/mame/drivers/eolithsp.c @@ -13,6 +13,7 @@ #include "includes/eolith.h" static int eolith_speedup_address; +static int eolith_speedup_address2; static int eolith_speedup_resume_scanline; static int eolith_vblank = 0; static int eolith_scanline = 0; @@ -23,41 +24,46 @@ void eolith_speedup_read(address_space *space) //if ((cpu_get_pc(&space->device())!=eolith_speedup_address) && (eolith_vblank!=1) ) // printf("%s:eolith speedup_read data %02x\n",space->machine().describe_context(), eolith_vblank); - if (cpu_get_pc(&space->device())==eolith_speedup_address && eolith_vblank==0 && eolith_scanline < eolith_speedup_resume_scanline) - { - device_spin_until_trigger(&space->device(), 1000); - } + if (eolith_vblank==0 && eolith_scanline < eolith_speedup_resume_scanline) + { + int pc = cpu_get_pc(&space->device()); + if ((pc==eolith_speedup_address) || (pc==eolith_speedup_address2)) + { + device_spin_until_trigger(&space->device(), 1000); + } + } } static const struct { const char *s_name; - UINT32 speedup_address; + int speedup_address; + int speedup_address2; int speedup_resume_scanline; } eolith_speedup_table[] = { /* eolith.c */ - { "linkypip", 0x4000825c, 240 }, - { "ironfort", 0x40020854, 240 }, - { "hidnctch", 0x4000bba0, 240 }, - { "raccoon", 0x40008204, 240 }, - { "puzzlekg", 0x40029458, 240 }, - { "hidctch2", 0x40009524, 240 }, - { "hidctch2a",0x40029B58, 240 }, - { "landbrk", 0x40023574, 240 }, - { "landbrka", 0x4002446c, 240 }, - { "nhidctch", 0x40012778, 240 }, - { "hidctch3", 0x4001f6a0, 240 }, - { "fort2b", 0x000081e0, 240 }, - { "fort2ba", 0x000081e0, 240 }, - { "penfan", 0x4001FA66, 240 }, - { "candy", 0x4001990C, 240 }, - /* eolith16.c */ - { "klondkp", 0x0001a046, 240 }, - /* vegaeo.c */ - { "crazywar", 0x00008cf8, 240 }, + { "linkypip", 0x4000825c, -1,/*0x4000ABAE,*/ 240 }, // 2nd address is used on the planet cutscene between but idle skipping between levels, but seems too aggressive + { "ironfort", 0x40020854, -1, 240 }, + { "hidnctch", 0x4000bba0, -1, 240 }, + { "raccoon", 0x40008204, -1, 240 }, + { "puzzlekg", 0x40029458, -1, 240 }, + { "hidctch2", 0x40009524, -1, 240 }, + { "hidctch2a",0x40029B58, -1, 240 }, + { "landbrk", 0x40023574, -1, 240 }, + { "landbrka", 0x4002446c, -1, 240 }, + { "nhidctch", 0x40012778, -1, 240 }, + { "hidctch3", 0x4001f6a0, -1, 240 }, + { "fort2b", 0x000081e0, -1, 240 }, + { "fort2ba", 0x000081e0, -1, 240 }, + { "penfan", 0x4001FA66, -1, 240 }, + { "candy", 0x4001990C, -1, 240 }, + /* eolith16.c */ + { "klondkp", 0x0001a046, -1, 240 }, + /* vegaeo.c */ + { "crazywar", 0x00008cf8, -1, 240 }, { NULL, 0, 0 } }; @@ -73,8 +79,8 @@ void init_eolith_speedup(running_machine &machine) if( strcmp( machine.system().name, eolith_speedup_table[ n_game ].s_name ) == 0 ) { eolith_speedup_address = eolith_speedup_table[ n_game ].speedup_address; + eolith_speedup_address2 = eolith_speedup_table[ n_game ].speedup_address2; eolith_speedup_resume_scanline = eolith_speedup_table[ n_game ].speedup_resume_scanline; - } n_game++; }