diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/keyboard.h | 4 | ||||
| -rw-r--r-- | include/linux/gameport.h | 5 | ||||
| -rw-r--r-- | include/linux/input.h | 31 | ||||
| -rw-r--r-- | include/linux/serio.h | 4 | ||||
| -rw-r--r-- | include/linux/uinput.h | 5 |
5 files changed, 21 insertions, 28 deletions
diff --git a/include/asm-ppc/keyboard.h b/include/asm-ppc/keyboard.h index bda2d671d563..cde58bef0916 100644 --- a/include/asm-ppc/keyboard.h +++ b/include/asm-ppc/keyboard.h @@ -25,10 +25,6 @@ #include <linux/ioport.h> #include <linux/kd.h> #include <asm/io.h> -/* IBM Spruce platform is different. */ -#ifdef CONFIG_SPRUCE -#include <platforms/spruce.h> -#endif #ifndef KEYBOARD_IRQ #define KEYBOARD_IRQ 1 diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 0cb1a3b46f77..7bf3bccf0fda 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h @@ -39,10 +39,7 @@ struct gameport { char *name; char *phys; - unsigned short idbus; - unsigned short idvendor; - unsigned short idproduct; - unsigned short idversion; + struct input_devinfo id; int io; int speed; diff --git a/include/linux/input.h b/include/linux/input.h index 28cc98e91037..7d413abc26b3 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -56,8 +56,15 @@ struct input_event { * IOCTLs (0x00 - 0x7f) */ +struct input_devinfo { + uint16_t bustype; + uint16_t vendor; + uint16_t product; + uint16_t version; +}; + #define EVIOCGVERSION _IOR('E', 0x01, int) /* get driver version */ -#define EVIOCGID _IOR('E', 0x02, short[4]) /* get device ID */ +#define EVIOCGID _IOR('E', 0x02, struct input_devinfo) /* get device ID */ #define EVIOCGREP _IOR('E', 0x03, int[2]) /* get repeat settings */ #define EVIOCSREP _IOW('E', 0x03, int[2]) /* get repeat settings */ #define EVIOCGKEYCODE _IOR('E', 0x04, int[2]) /* get keycode */ @@ -454,17 +461,15 @@ struct input_event { #define KEY_FIRST 0x194 #define KEY_LAST 0x195 #define KEY_AB 0x196 -#define KEY_PLAY 0x197 +#define KEY_NEXT 0x197 #define KEY_RESTART 0x198 #define KEY_SLOW 0x199 #define KEY_SHUFFLE 0x19a -#define KEY_FASTFORWARD 0x19b +#define KEY_BREAK 0x1ab #define KEY_PREVIOUS 0x19c -#define KEY_NEXT 0x19d -#define KEY_DIGITS 0x19e -#define KEY_TEEN 0x19f -#define KEY_TWEN 0x1a0 -#define KEY_BREAK 0x1a1 +#define KEY_DIGITS 0x19d +#define KEY_TEEN 0x19e +#define KEY_TWEN 0x1af #define KEY_MAX 0x1ff @@ -742,10 +747,7 @@ struct input_dev { char *name; char *phys; char *uniq; - unsigned short idbus; - unsigned short idvendor; - unsigned short idproduct; - unsigned short idversion; + struct input_devinfo id; unsigned long evbit[NBITS(EV_MAX)]; unsigned long keybit[NBITS(KEY_MAX)]; @@ -818,10 +820,7 @@ struct input_device_id { unsigned long flags; - unsigned short idbus; - unsigned short idvendor; - unsigned short idproduct; - unsigned short idversion; + struct input_devinfo id; unsigned long evbit[NBITS(EV_MAX)]; unsigned long keybit[NBITS(KEY_MAX)]; diff --git a/include/linux/serio.h b/include/linux/serio.h index 37deb0ca7836..ce0359b25fb7 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h @@ -94,8 +94,12 @@ static __inline__ void serio_dev_write_wakeup(struct serio *serio) serio->dev->write_wakeup(serio); } +/* + * bit masks for use in "interrupt" flags (3rd argument) + */ #define SERIO_TIMEOUT 1 #define SERIO_PARITY 2 +#define SERIO_FRAME 4 #define SERIO_TYPE 0xff000000UL #define SERIO_XT 0x00000000UL diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 6754ab4e0952..528b27a21d78 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h @@ -64,10 +64,7 @@ struct uinput_device { #define UINPUT_MAX_NAME_SIZE 80 struct uinput_user_dev { char name[UINPUT_MAX_NAME_SIZE]; - unsigned short idbus; - unsigned short idvendor; - unsigned short idproduct; - unsigned short idversion; + struct input_devinfo id; int ff_effects_max; int absmax[ABS_MAX + 1]; int absmin[ABS_MAX + 1]; |