extracted OSS code to sndout_oss_*, BTN->PBTN, refactoring

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index b7bd3f1..ff8cd99 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -13,15 +13,15 @@
 #include "gp2x.h"\r
 #include "emu.h"\r
 #include "menu.h"\r
-#include "usbjoy.h"\r
+#include "../linux/usbjoy.h"\r
 #include "../common/emu.h"\r
 #include "../common/menu.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/readpng.h"\r
 #include "version.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
 #include <zlib/zlib.h>\r
 \r
 #ifndef _DIRENT_HAVE_D_TYPE\r
@@ -90,9 +90,9 @@ static unsigned long input2_read(unsigned long interesting, int *joy)
        {\r
                *joy = 0;\r
                if ((ret = gp2x_joystick_read(0) & interesting)) break;\r
-               gp2x_usbjoy_update();\r
+               usbjoy_update();\r
                for (i = 0; i < num_of_joys; i++) {\r
-                       ret = gp2x_usbjoy_check2(i);\r
+                       ret = usbjoy_check2(i);\r
                        if (ret) { *joy = i + 1; break; }\r
                }\r
                if (ret) break;\r