asyn-only dev support + in_gp2x driver

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 94d1183..b44e514 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -32,13 +32,6 @@
 \r
 extern int  mmuhack_status;\r
 \r
-const char * const keyNames[] = {\r
-       "UP",    "???",    "LEFT", "???",  "DOWN", "???", "RIGHT",    "???",\r
-       "START", "SELECT", "L",    "R",    "A",    "B",   "X",        "Y",\r
-       "???",   "???",    "???",  "???",  "???",  "???", "VOL DOWN", "VOL UP",\r
-       "???",   "???",    "???",  "PUSH", "???",  "???", "???",      "???"\r
-};\r
-\r
 void menu_darken_bg(void *dst, int pixels, int darker);\r
 static void menu_prepare_bg(int use_game_bg);\r
 \r
@@ -239,7 +232,7 @@ rescan:
                n = scandir("/", &namelist, scandir_filter, scandir_cmp);\r
                if (n < 0) {\r
                        // oops, we failed\r
-                       printf("dir: "); printf(curr_path); printf("\n");\r
+                       printf("dir: %s\n", curr_path);\r
                        perror("scandir");\r
                        return NULL;\r
                }\r
@@ -843,11 +836,13 @@ static void draw_cd_menu_options(int menu_sel, struct bios_names_t *bios_names)
 \r
        me_draw(cdopt_entries, CDOPT_ENTRY_COUNT, tl_x, tl_y, menu_cdopt_cust_draw, bios_names);\r
 \r
+/* FIXME\r
        selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);\r
        if ((selected_id == MA_CDOPT_TESTBIOS_USA && strcmp(bios_names->us, "NOT FOUND")) ||\r
                (selected_id == MA_CDOPT_TESTBIOS_EUR && strcmp(bios_names->eu, "NOT FOUND")) ||\r
                (selected_id == MA_CDOPT_TESTBIOS_JAP && strcmp(bios_names->jp, "NOT FOUND")))\r
                        text_out16(tl_x, 210, "Press start to test selected BIOS");\r
+*/\r
 \r
        menu_flip();\r
 }\r
@@ -879,7 +874,7 @@ static void cd_menu_loop_options(void)
        for(;;)\r
        {\r
                draw_cd_menu_options(menu_sel, &bios_names);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MOK|PBTN_MBACK|GP2X_START); /* FIXME */\r
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MOK|PBTN_MBACK);\r
                if (inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
                if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
                selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);\r
@@ -896,13 +891,13 @@ static void cd_menu_loop_options(void)
                                }\r
                        }\r
                }\r
-               if (inp & PBTN_MOK) { // toggleable options\r
+               if (inp & PBTN_MOK) {\r
+                       // toggleable options\r
                        if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, 1) &&\r
                            selected_id == MA_CDOPT_DONE) {\r
                                return;\r
                        }\r
-               }\r
-               if (inp & GP2X_START) { // BIOS testers\r
+                       // BIOS testers\r
                        switch (selected_id) {\r
                                case MA_CDOPT_TESTBIOS_USA:\r
                                        if (emu_findBios(4, &bios)) { // test US\r