X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=input.c;h=e4c48fd3e216de01ce08845bf60e95c71f4df0d1;hb=8b6232a675c7b49bd9651805fc92917cc7a92198;hp=cfaff69d1ae2c636b93c457483a673b77c7edd99;hpb=4cdfc0bc7b3dd2051b8027da4e2f35bbb9897307;p=gpsp.git

diff --git a/input.c b/input.c
index cfaff69..e4c48fd 100644
--- a/input.c
+++ b/input.c
@@ -364,17 +364,17 @@ u32 gamepad_config_map[16] =
   BUTTON_ID_SELECT,             // Select
   BUTTON_ID_L,                  // Ltrigger
   BUTTON_ID_R,                  // Rtrigger
-  BUTTON_ID_NONE,               // A
+  BUTTON_ID_FPS,                // A
   BUTTON_ID_A,                  // B
   BUTTON_ID_B,                  // X
-  BUTTON_ID_NONE,               // Y
+  BUTTON_ID_MENU,               // Y
   BUTTON_ID_VOLDOWN,            // Vol down
   BUTTON_ID_VOLUP,              // Vol up
   BUTTON_ID_FPS,                // Push
   BUTTON_ID_MENU                // Vol middle
 };
 
-extern u32 gp2x_fps_debug;
+extern u32 fps_debug;
 extern u32 gpsp_gp2x_joystick_read(void);
 
 gui_action_type get_gui_input()
@@ -412,6 +412,12 @@ gui_action_type get_gui_input()
   if(new_buttons & GP2X_RIGHT)
     new_button = CURSOR_RIGHT;
 
+  if(new_buttons & GP2X_L)
+    new_button = CURSOR_L;
+
+  if(new_buttons & GP2X_R)
+    new_button = CURSOR_R;
+
 
   if(new_button != CURSOR_NONE)
   {
@@ -571,7 +577,7 @@ u32 update_input()
         break;
 
       case BUTTON_ID_FPS:
-        gp2x_fps_debug ^= 1;
+        fps_debug ^= 1;
         break;
     }