X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;fp=gp2x%2Fmenu.c;h=ff8cd9947bb70a41604e0d154fabae8975281918;hb=b3972d826fe31f82aa3382f80454e5d8ce895705;hp=e37c87884027be00bbfc6aabc20b81cfacdf9edc;hpb=725d7f6c16b396ad3c7f98175cc20289c5241f3a;p=libpicofe.git diff --git a/gp2x/menu.c b/gp2x/menu.c index e37c878..ff8cd99 100644 --- a/gp2x/menu.c +++ b/gp2x/menu.c @@ -13,7 +13,7 @@ #include "gp2x.h" #include "emu.h" #include "menu.h" -#include "usbjoy.h" +#include "../linux/usbjoy.h" #include "../common/emu.h" #include "../common/menu.h" #include "../common/arm_utils.h" @@ -90,9 +90,9 @@ static unsigned long input2_read(unsigned long interesting, int *joy) { *joy = 0; if ((ret = gp2x_joystick_read(0) & interesting)) break; - gp2x_usbjoy_update(); + usbjoy_update(); for (i = 0; i < num_of_joys; i++) { - ret = gp2x_usbjoy_check2(i); + ret = usbjoy_check2(i); if (ret) { *joy = i + 1; break; } } if (ret) break;