port to updated Cyclone, debug menu

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

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 377ea11..d9c40bb 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -6,7 +6,7 @@ CROSS = arm-linux-
 \r
 # settings\r
 #mz80 = 1\r
-debug_cyclone = 0\r
+#debug_cyclone = 1\r
 asm_memory = 1\r
 asm_render = 1\r
 asm_ym2612 = 1\r
@@ -180,7 +180,7 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 # build Cyclone\r
 ../../cpu/Cyclone/proj/Cyclone.s :\r
        @echo building Cyclone...\r
-       @make -C ../../cpu/Cyclone/proj\r
+       @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
 \r
 ../../cpu/musashi/m68kops.c :\r
        @make -C ../../cpu/musashi\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 2275279..3386a95 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -419,6 +419,36 @@ static char *romsel_loop(char *curr_path)
        return ret;\r
 }\r
 \r
+// ------------ debug menu ------------\r
+\r
+char *debugString(void);\r
+\r
+static void draw_debug(void)\r
+{\r
+       char *p, *str = debugString();\r
+       int len, line;\r
+\r
+       gp2x_pd_clone_buffer2();\r
+\r
+       p = str;\r
+       for (line = 0; line < 24; line++)\r
+       {\r
+               while (*p && *p != '\n') p++;\r
+               len = p - str;\r
+               if (len > 55) len = 55;\r
+               gp2x_smalltext8_lim(1, line*10, str, len);\r
+               if (*p == 0) break;\r
+               p++; str = p;\r
+       }\r
+       gp2x_video_flip2();\r
+}\r
+\r
+static void debug_menu_loop(void)\r
+{\r
+       draw_debug();\r
+       wait_for_input(GP2X_B|GP2X_X);\r
+}\r
+\r
 // ------------ patch/gg menu ------------\r
 \r
 static void draw_patchlist(int sel)\r
@@ -444,7 +474,7 @@ static void draw_patchlist(int sel)
 }\r
 \r
 \r
-void patches_menu_loop(void)\r
+static void patches_menu_loop(void)\r
 {\r
        int menu_sel = 0;\r
        unsigned long inp = 0;\r
@@ -1239,7 +1269,8 @@ static void draw_menu_root(int menu_sel)
 \r
 static void menu_loop_root(void)\r
 {\r
-       int ret, menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;\r
+       static int menu_sel = 4;\r
+       int ret, menu_sel_max = 8, menu_sel_min = 4;\r
        unsigned long inp = 0;\r
        char curr_path[PATH_MAX], *selfname;\r
        FILE *tstf;\r
@@ -1254,7 +1285,7 @@ static void menu_loop_root(void)
                getcwd(curr_path, PATH_MAX);\r
        }\r
 \r
-       if (rom_data) menu_sel = menu_sel_min = 0;\r
+       if (rom_data) menu_sel_min = 0;\r
        if (PicoPatches) menu_sel_max = 9;\r
 \r
        /* make sure action buttons are not pressed on entering menu */\r
@@ -1264,9 +1295,10 @@ static void menu_loop_root(void)
        for (;;)\r
        {\r
                draw_menu_root(menu_sel);\r
-               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);\r
+               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT|GP2X_L|GP2X_R);\r
                if(inp & GP2X_UP  )  { menu_sel--; if (menu_sel < menu_sel_min) menu_sel = menu_sel_max; }\r
                if(inp & GP2X_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = menu_sel_min; }\r
+               if((inp & (GP2X_L|GP2X_R)) == (GP2X_L|GP2X_R)) debug_menu_loop();\r
                if(inp &(GP2X_SELECT|GP2X_X)){\r
                        if (rom_data) {\r
                                while (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released\r

diff --git a/gp2x/version.h b/gp2x/version.h
index cc93f89..a3ccbd3 100644 (file)
--- a/gp2x/version.h
+++ b/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.32"\r
+#define VERSION "1.33"\r
 \r