continuing input framework integration

[libpicofe.git] / pandora / pandora.c

diff --git a/pandora/pandora.c b/pandora/pandora.c
index b72d8b6..6c33e6c 100644 (file)
--- a/pandora/pandora.c
+++ b/pandora/pandora.c
@@ -12,7 +12,6 @@
 #include <errno.h>\r
 \r
 #include "../gp2x/gp2x.h"\r
-#include "../linux/usbjoy.h"\r
 #include "../linux/sndout_oss.h"\r
 #include "../common/arm_linux.h"\r
 \r
@@ -87,22 +86,6 @@ void gp2x_pd_clone_buffer2(void)
        memset(gp2x_screen, 0, 800*480*2);\r
 }\r
 \r
-\r
-unsigned long gp2x_joystick_read(int allow_usb_joy)\r
-{\r
-       unsigned long value = 0;\r
-       int i;\r
-\r
-       if (allow_usb_joy && num_of_joys > 0) {\r
-               // check the usb joy as well..\r
-               usbjoy_update();\r
-               for (i = 0; i < num_of_joys; i++)\r
-                       value |= usbjoy_check(i);\r
-       }\r
-\r
-       return value;\r
-}\r
-\r
 // FIXME\r
 #if 0\r
 static int touchcal[7] = { 6203, 0, -1501397, 0, -4200, 16132680, 65536 };\r
@@ -180,9 +163,6 @@ void gp2x_init(void)
        // snd\r
        sndout_oss_init();\r
 \r
-       /* init usb joys -GnoStiC */\r
-       usbjoy_init();\r
-\r
        printf("exitting init()\n"); fflush(stdout);\r
 }\r
 \r
@@ -196,7 +176,6 @@ void gp2x_deinit(void)
        if (fbdev >= 0)    close(fbdev);\r
 \r
        sndout_oss_exit();\r
-       usbjoy_deinit();\r
 \r
        printf("all done");\r
 }\r