reset behavior changed, Puggsy detection added

[libpicofe.git] / gp2x / emu.c

diff --git a/gp2x/emu.c b/gp2x/emu.c
index a3e7f83..05d22f6 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -11,7 +11,6 @@
 #include <linux/limits.h>\r
 #include <ctype.h>\r
 #include <unistd.h>\r
-#include <sched.h>\r
 \r
 #include <stdarg.h>\r
 \r
@@ -142,7 +141,7 @@ void emu_prepareDefaultConfig(void)
        defaultConfig.s_PsndRate = 44100;\r
        defaultConfig.s_PicoRegion = 0; // auto\r
        defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP\r
-       defaultConfig.s_PicoCDBuffers = 64;\r
+       defaultConfig.s_PicoCDBuffers = 0;\r
        defaultConfig.Frameskip = -1; // auto\r
        defaultConfig.CPUclock = 200;\r
        defaultConfig.volume = 50;\r
@@ -653,9 +652,6 @@ static void simpleWait(int thissec, int lim_time)
        gettimeofday(&tval, 0);\r
        if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
 \r
-       if (tval.tv_usec < lim_time)\r
-               sched_yield();\r
-\r
        while (tval.tv_usec < lim_time)\r
        {\r
                spend_cycles(1024);\r
@@ -869,9 +865,10 @@ void emu_Loop(void)
                        bench_fps += frames_shown;\r
                        sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
 #else\r
-                       if (currentConfig.EmuOpt & 2)\r
+                       if (currentConfig.EmuOpt & 2) {\r
                                sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
-                       if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
+                               if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
+                       }\r
 #endif\r
                        frames_shown = frames_done = 0;\r
                        thissec = tval.tv_sec;\r
@@ -980,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