notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed the .rsg stupidity
[picodrive.git]
/
platform
/
gp2x
/
menu.c
diff --git
a/platform/gp2x/menu.c
b/platform/gp2x/menu.c
index
e37c878
..
ff8cd99
100644
(file)
--- a/
platform/gp2x/menu.c
+++ b/
platform/gp2x/menu.c
@@
-13,7
+13,7
@@
#include "gp2x.h"
\r
#include "emu.h"
\r
#include "menu.h"
\r
#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/emu.h"
\r
#include "../common/menu.h"
\r
#include "../common/arm_utils.h"
\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
{
\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
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
if (ret) { *joy = i + 1; break; }
\r
}
\r
if (ret) break;
\r