reset behavior changed, Puggsy detection added

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@405 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Cart.c b/Pico/Cart.c
index 47ea1cc..f2683ca 100644 (file)
--- a/Pico/Cart.c
+++ b/Pico/Cart.c
@@ -530,7 +530,8 @@ int PicoCartInsert(unsigned char *rom,unsigned int romsize)
   else PicoMemSetup();\r
   PicoMemReset();\r
 \r
-  return PicoReset(1);\r
+  PicoPower();\r
+  return 0;\r
 }\r
 \r
 int PicoCartUnload(void)\r
@@ -597,6 +598,12 @@ static void PicoCartDetect(void)
     sram_size  = 0x004000;\r
   }\r
 \r
+  // this game actually doesn't have SRAM, but some weird protection\r
+  if (rom_strcmp(0x120, "PUGGSY") == 0)\r
+  {\r
+    SRam.start = SRam.end = sram_size = 0;\r
+  }\r
+\r
   if (sram_size)\r
   {\r
     SRam.data = (unsigned char *) calloc(sram_size, 1);\r

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 2ebe9c9..7978fed 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -52,10 +52,32 @@ void PicoExit(void)
     PicoExitMCD();\r
   z80_exit();\r
 \r
-  if(SRam.data) free(SRam.data); SRam.data=0;\r
+  if (SRam.data) free(SRam.data); SRam.data=0;\r
 }\r
 \r
-int PicoReset(int hard)\r
+void PicoPower(void)\r
+{\r
+  // clear all memory of the emulated machine\r
+  memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);\r
+\r
+  memset(&Pico.video,0,sizeof(Pico.video));\r
+  memset(&Pico.m,0,sizeof(Pico.m));\r
+\r
+  Pico.video.pending_ints=0;\r
+  z80_reset();\r
+\r
+  // default VDP register values (based on Fusion)\r
+  Pico.video.reg[0] = Pico.video.reg[1] = 0x04;\r
+  Pico.video.reg[0xc] = 0x81;\r
+  Pico.video.reg[0xf] = 0x02;\r
+\r
+  if (PicoMCD & 1)\r
+    PicoPowerMCD();\r
+\r
+  PicoReset();\r
+}\r
+\r
+int PicoReset(void)\r
 {\r
   unsigned int region=0;\r
   int support=0,hw=0,i=0;\r
@@ -72,25 +94,12 @@ int PicoReset(int hard)
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).\r
   SekSetRealTAS(PicoMCD & 1);\r
   SekCycleCntT=0;\r
-  z80_reset();\r
 \r
-  // reset VDP state, VRAM and PicoMisc\r
-  //memset(&Pico.video,0,sizeof(Pico.video));\r
-  //memset(&Pico.vram,0,sizeof(Pico.vram));\r
-  memset(Pico.ioports,0,sizeof(Pico.ioports)); // needed for MCD to reset properly\r
-  memset(&Pico.m,0,sizeof(Pico.m));\r
-  Pico.video.pending_ints=0;\r
+  if (PicoMCD & 1)\r
+    // needed for MCD to reset properly, probably some bug hides behind this..\r
+    memset(Pico.ioports,0,sizeof(Pico.ioports));\r
   emustatus = 0;\r
 \r
-  if (hard) {\r
-    // clear all memory of the emulated machine\r
-    memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);\r
-  }\r
-\r
-  // default VDP register values (based on Fusion)\r
-  Pico.video.reg[0] = Pico.video.reg[1] = 0x04;\r
-  Pico.video.reg[0xc] = 0x81;\r
-  Pico.video.reg[0xf] = 0x02;\r
   Pico.m.dirtyPal = 1;\r
 \r
   if(PicoRegionOverride)\r
@@ -141,12 +150,16 @@ int PicoReset(int hard)
 \r
   Pico.m.hardware=(unsigned char)(hw|0x20); // No disk attached\r
   Pico.m.pal=pal;\r
-  Pico.video.status = 0x3408 | pal; // always set bits | vblank | pal\r
+  Pico.video.status = 0x3408 | pal; // 'always set' bits | vblank | pal\r
 \r
   PsndReset(); // pal must be known here\r
 \r
+  // create an empty "dma" to cause 68k exec start at random frame location\r
+  if (Pico.m.dma_xfers == 0 && !(PicoOpt&0x10000))\r
+    Pico.m.dma_xfers = rand() & 0x1fff;\r
+\r
   if (PicoMCD & 1) {\r
-    PicoResetMCD(hard);\r
+    PicoResetMCD();\r
     return 0;\r
   }\r
 \r

diff --git a/Pico/Pico.h b/Pico/Pico.h
index 9dae8df..946d98e 100644 (file)
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -43,7 +43,8 @@ extern int PicoAutoRgnOrder; // packed priority list of regions, for example 0x1
 extern int PicoSVPCycles;\r
 int  PicoInit(void);\r
 void PicoExit(void);\r
-int  PicoReset(int hard);\r
+void PicoPower(void);\r
+int  PicoReset(void);\r
 int  PicoFrame(void);\r
 void PicoFrameDrawOnly(void);\r
 extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU\r

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 06a50a0..cd4d00e 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -425,7 +425,8 @@ PICO_INTERNAL int CheckDMA(void);
 // cd/Pico.c\r
 PICO_INTERNAL int  PicoInitMCD(void);\r
 PICO_INTERNAL void PicoExitMCD(void);\r
-PICO_INTERNAL int PicoResetMCD(int hard);\r
+PICO_INTERNAL void PicoPowerMCD(void);\r
+PICO_INTERNAL int PicoResetMCD(void);\r
 PICO_INTERNAL int PicoFrameMCD(void);\r
 \r
 // Sek.c\r

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index 9d028b4..02cad9b 100644 (file)
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/Pico.c
@@ -48,16 +48,18 @@ PICO_INTERNAL void PicoExitMCD(void)
   //dump_ram(Pico.ram, "ram.bin");
 }
 
-PICO_INTERNAL int PicoResetMCD(int hard)
+PICO_INTERNAL void PicoPowerMCD(void)
+{
+  int fmt_size = sizeof(formatted_bram);
+  memset(Pico_mcd->prg_ram,    0, sizeof(Pico_mcd->prg_ram));
+  memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M));
+  memset(Pico_mcd->pcm_ram,    0, sizeof(Pico_mcd->pcm_ram));
+  memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
+  memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size);
+}
+
+PICO_INTERNAL int PicoResetMCD(void)
 {
-  if (hard) {
-    int fmt_size = sizeof(formatted_bram);
-    memset(Pico_mcd->prg_ram,    0, sizeof(Pico_mcd->prg_ram));
-    memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M));
-    memset(Pico_mcd->pcm_ram,    0, sizeof(Pico_mcd->pcm_ram));
-    memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
-    memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size);
-  }
   memset(Pico_mcd->s68k_regs, 0, sizeof(Pico_mcd->s68k_regs));
   memset(&Pico_mcd->pcm, 0, sizeof(Pico_mcd->pcm));
   memset(&Pico_mcd->m, 0, sizeof(Pico_mcd->m));

diff --git a/platform/common/emu.c b/platform/common/emu.c
index c2e4075..14cc52a 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -434,7 +434,7 @@ int emu_ReloadRom(void)
                        } else {\r
                                PicoRegionOverride = 4;\r
                        }\r
-                       PicoReset(0);\r
+                       PicoReset();\r
                        // TODO: bits 6 & 5\r
                }\r
                movie_data[0x18+30] = 0;\r

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index 523da87..b911606 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -775,7 +775,7 @@ void emu_Loop(void)
 
 void emu_ResetGame(void)
 {
-       PicoReset(0);
+       PicoReset();
        reset_timing = 1;
 }
 

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index f2867fc..05d22f6 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -977,7 +977,7 @@ void emu_Loop(void)
 \r
 void emu_ResetGame(void)\r
 {\r
-       PicoReset(0);\r
+       PicoReset();\r
        reset_timing = 1;\r
 }\r
 \r

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index acbe643..99d16da 100644 (file)
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -1022,7 +1022,7 @@ void emu_Loop(void)
 
 void emu_ResetGame(void)
 {
-       PicoReset(0);
+       PicoReset();
        reset_timing = 1;
 }
 

diff --git a/platform/uiq2/SimpleServer.cpp b/platform/uiq2/SimpleServer.cpp
index 6a58306..d220b3f 100644 (file)
--- a/platform/uiq2/SimpleServer.cpp
+++ b/platform/uiq2/SimpleServer.cpp
@@ -114,7 +114,7 @@ void CPicoServSession::DispatchMessageL(const RMessage &aMessage)
 \r
                case PicoMsgReset: \r
                        if(rom_data) {\r
-                               PicoReset(0);\r
+                               PicoReset();\r
                                pico_was_reset = 1;\r
                                gamestate = PGS_Running;\r
                        }\r

diff --git a/platform/uiq3/Engine.cpp b/platform/uiq3/Engine.cpp
index 08b8124..5e21b91 100644 (file)
--- a/platform/uiq3/Engine.cpp
+++ b/platform/uiq3/Engine.cpp
@@ -63,7 +63,7 @@ TInt CPicoGameSession::Do(const TPicoServRqst what, TAny *param)
 \r
                case PicoMsgReset: \r
                        if(rom_data) {\r
-                               PicoReset(0);\r
+                               PicoReset();\r
                                pico_was_reset = 1;\r
                                return ChangeRunState(PGS_Running);\r
                        }\r

diff --git a/platform/win32/GenaDrive/Input.cpp b/platform/win32/GenaDrive/Input.cpp
index 92abe2b..86fa94f 100644 (file)
--- a/platform/win32/GenaDrive/Input.cpp
+++ b/platform/win32/GenaDrive/Input.cpp
@@ -92,7 +92,7 @@ static int DeviceRead()
 \r
   static int sblobked = 0;\r
   if (!sblobked && GetAsyncKeyState(VK_TAB)) {\r
-    PicoReset(0);\r
+    PicoReset();\r
     sblobked = 1;\r
   }\r
   else if (!sblobked && GetAsyncKeyState(VK_ESCAPE))\r