Input: make gamepad API keycodes more clear

Shuffle the defines around so that it is clear that BTN_A, BTN_B, etc are
legacy definitions and not an accidental typos that need their own key codes.

Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index 8f82ad2..d584047 100644 (file)
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -506,15 +506,15 @@ struct input_keymap_entry {
 #define BTN_DEAD               0x12f
 
 #define BTN_GAMEPAD            0x130
-#define BTN_A                  0x130
 #define BTN_SOUTH              0x130
-#define BTN_B                  0x131
+#define BTN_A                  BTN_SOUTH
 #define BTN_EAST               0x131
+#define BTN_B                  BTN_EAST
 #define BTN_C                  0x132
-#define BTN_X                  0x133
 #define BTN_NORTH              0x133
-#define BTN_Y                  0x134
+#define BTN_X                  BTN_NORTH
 #define BTN_WEST               0x134
+#define BTN_Y                  BTN_WEST
 #define BTN_Z                  0x135
 #define BTN_TL                 0x136
 #define BTN_TR                 0x137