Cyclone poll detection problem fixed

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

diff --git a/common/lprintf.h b/common/lprintf.h
index 1d30472..34ec6b7 100644 (file)
--- a/common/lprintf.h
+++ b/common/lprintf.h
@@ -1,9 +1,2 @@
-#if defined(__GP2X__)
- #include <stdio.h>
- #define lprintf printf
-#elif defined(PSP)
- extern void lprintf(const char *fmt, ...);
-#else
- #include "giz.h"
-#endif
+extern void lprintf(const char *fmt, ...);
 

diff --git a/gp2x/Makefile b/gp2x/Makefile
index eeb37c7..7c083c1 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -34,7 +34,7 @@ endif
 DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK\r
 COPT_COMMON = -static -Wall -Winline\r
 ifeq ($(DEBUG),)\r
-COPT_COMMON += -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 else\r
 COPT_COMMON += -ggdb\r
 endif\r

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 701bcd8..3f2ed3f 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -43,7 +43,7 @@ char romFileName[PATH_MAX];
 \r
 extern int crashed_940;\r
 \r
-static short sndBuffer[2*44100/50];\r
+static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
 static struct timeval noticeMsgTime = { 0, 0 };        // when started showing\r
 static int osd_fps_x;\r
 static int combo_keys = 0, combo_acts = 0;     // keys and actions which need button combos\r

diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c
index 4995f08..3ed64fb 100644 (file)
--- a/gp2x/gp2x.c
+++ b/gp2x/gp2x.c
@@ -22,6 +22,7 @@
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
+#include <stdarg.h>\r
 #include <string.h>\r
 #include <unistd.h>\r
 #include <sys/mman.h>\r
@@ -375,4 +376,13 @@ void gp2x_deinit(void)
        }\r
 }\r
 \r
+/* lprintf */\r
+void lprintf(const char *fmt, ...)\r
+{\r
+       va_list vl;\r
+\r
+       va_start(vl, fmt);\r
+       vprintf(fmt, vl);\r
+       va_end(vl);\r
+}\r
 \r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 8b4968c..ddb9d2e 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -155,11 +155,12 @@ static void cdload_progress_cb(int percent)
 \r
        smalltext_out16(1, 3*10, "Processing CD image / MP3s", 0xffff);\r
        smalltext_out16_lim(1, 4*10, romFileName, 0xffff, 80);\r
-       dst += 30;\r
+       dst += 320*30;\r
 \r
        if (len > 320) len = 320;\r
        for (ln = 8; ln > 0; ln--, dst += 320)\r
                memset(dst, 0xff, len*2);\r
+       menu_flip();\r
        cdload_called = 1;\r
 }\r
 \r
@@ -182,7 +183,7 @@ void menu_romload_prepare(const char *rom_name)
 \r
 void menu_romload_end(void)\r
 {\r
-       PicoCartLoadProgressCB = NULL;\r
+       PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;\r
        smalltext_out16(1, cdload_called ? 60 : 30, "Starting emulation...", 0xffff);\r
        menu_flip();\r
 }\r

diff --git a/gp2x/port_config.h b/gp2x/port_config.h
index 5d9bf04..1503593 100644 (file)
--- a/gp2x/port_config.h
+++ b/gp2x/port_config.h
@@ -18,7 +18,7 @@
 #define CAN_HANDLE_240_LINES   1\r
 \r
 // logging emu events\r
-#define EL_LOGMASK 0 // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO) // xffff\r
+#define EL_LOGMASK EL_STATUS // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO|EL_INTS|EL_CDPOLL) // xffff\r
 \r
 //#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)\r
 #define dprintf(x...)\r

diff --git a/linux/gp2x.c b/linux/gp2x.c
index 3b43c3d..b89990b 100644 (file)
--- a/linux/gp2x.c
+++ b/linux/gp2x.c
@@ -428,5 +428,13 @@ void spend_cycles(int c)
        usleep(c/200);
 }
 
+/* lprintf */
+void lprintf(const char *fmt, ...)
+{
+       va_list vl;
 
+       va_start(vl, fmt);
+       vprintf(fmt, vl);
+       va_end(vl);
+}