bugfixes in cd/Memory.s, poll loop detection

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

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 60907ff..f43f9b7 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -790,6 +790,9 @@ static void emu_msg_cb(const char *msg)
        }\r
        gettimeofday(&noticeMsgTime, 0);\r
        noticeMsgTime.tv_sec -= 2;\r
+\r
+       /* assumption: emu_msg_cb gets called only when something slow is about to happen */\r
+       reset_timing = 1;\r
 }\r
 \r
 static void emu_state_cb(const char *str)\r
@@ -1168,7 +1171,9 @@ void emu_Loop(void)
                                if (frames_shown > frames_done) frames_shown = frames_done;\r
                        }\r
                }\r
-\r
+#if 0\r
+               sprintf(fpsbuff, "%05i", Pico.m.frame_count);\r
+#endif\r
                lim_time = (frames_done+1) * target_frametime;\r
                if(currentConfig.Frameskip >= 0) { // frameskip enabled\r
                        for(i = 0; i < currentConfig.Frameskip; i++) {\r

diff --git a/gp2x/version.h b/gp2x/version.h
index db5382d..7bb0de2 100644 (file)
--- a/gp2x/version.h
+++ b/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.201"\r
+#define VERSION "1.30"\r
 \r

diff --git a/linux/port_config.h b/linux/port_config.h
index e5c88bb..a0a855a 100644 (file)
--- a/linux/port_config.h
+++ b/linux/port_config.h
@@ -12,8 +12,8 @@
 // pico.c
 #define CAN_HANDLE_240_LINES   1
 
-#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
-//#define dprintf(x...)
+//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
+#define dprintf(x...)
 
 #endif //PORT_CONFIG_H