keymap: fix sixaxis gamepad keymapping

Values below starting at 256 are reserved for KEY_BUTTON_*,
use some other unused key id for the GUIDE button. This button
is only virtual since it's mapped from a CEC event

diff --git a/xbmc/guilib/Key.h b/xbmc/guilib/Key.h
index 960c8e3..7c907d0 100644 (file)
--- a/xbmc/guilib/Key.h
+++ b/xbmc/guilib/Key.h
@@ -30,6 +30,10 @@
 
 #include "utils/StdString.h"
 
+// Reserved 0 - 255
+//  XBIRRemote.h
+//  XINPUT_IR_REMOTE-*
+
 // Analogue - don't change order
 #define KEY_BUTTON_A                        256
 #define KEY_BUTTON_B                        257

diff --git a/xbmc/input/XBIRRemote.h b/xbmc/input/XBIRRemote.h
index c62aaf1..216d39a 100644 (file)
--- a/xbmc/input/XBIRRemote.h
+++ b/xbmc/input/XBIRRemote.h
@@ -88,11 +88,15 @@
 #define XINPUT_IR_REMOTE_YELLOW         253
 #define XINPUT_IR_REMOTE_BLUE           254
 #define XINPUT_IR_REMOTE_PLAYLIST       255
-#define XINPUT_IR_REMOTE_GUIDE          256
+#define XINPUT_IR_REMOTE_GUIDE          50
 
 #define XINPUT_IR_REMOTE_LIVE_RADIO     248
 #define XINPUT_IR_REMOTE_EPG_SEARCH     246
 
+// Reserved 256 -> ...
+// Key.h
+// KEY_BUTTON_*
+
 typedef struct _XINPUT_IR_REMOTE
 {
   BYTE wButtons;