diff options
| author | Vojtech Pavlik <vojtech@twilight.ucw.cz> | 2002-07-25 20:36:05 +0200 |
|---|---|---|
| committer | Vojtech Pavlik <vojtech@twilight.ucw.cz> | 2002-07-25 20:36:05 +0200 |
| commit | 3fc985a64495a17d454b6cb7ae5813d3748b949b (patch) | |
| tree | 61129a0ce78030a12061bbc05dcbf6ad3c3bbe2c /include/linux | |
| parent | 5731e6d7f4b76a10b7f5e2010e0722cd8554571d (diff) | |
Add EVIOCSABS() ioctl to change the abs* informative
values on input devices. This is something the X peoople
really wanted.
Rename input_devinfo to input_id, it's shorter and more
to the point.
Remove superfluous printks in uinput.c
Clean up return values in evdev.c ioctl.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/gameport.h | 2 | ||||
| -rw-r--r-- | include/linux/input.h | 9 | ||||
| -rw-r--r-- | include/linux/uinput.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 7bf3bccf0fda..f13fad0db609 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h @@ -39,7 +39,7 @@ struct gameport { char *name; char *phys; - struct input_devinfo id; + struct input_id id; int io; int speed; diff --git a/include/linux/input.h b/include/linux/input.h index 938fab4e3c48..03336a0bc6ba 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -56,7 +56,7 @@ struct input_event { * IOCTLs (0x00 - 0x7f) */ -struct input_devinfo { +struct input_id { __u16 bustype; __u16 vendor; __u16 product; @@ -64,7 +64,7 @@ struct input_devinfo { }; #define EVIOCGVERSION _IOR('E', 0x01, int) /* get driver version */ -#define EVIOCGID _IOR('E', 0x02, struct input_devinfo) /* get device ID */ +#define EVIOCGID _IOR('E', 0x02, struct input_id) /* 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 */ @@ -80,6 +80,7 @@ struct input_devinfo { #define EVIOCGBIT(ev,len) _IOC(_IOC_READ, 'E', 0x20 + ev, len) /* get event bits */ #define EVIOCGABS(abs) _IOR('E', 0x40 + abs, int[5]) /* get abs value/limits */ +#define EVIOCSABS(abs) _IOW('E', 0xc0 + abs, int[5]) /* set abs value/limits */ #define EVIOCSFF _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect)) /* send a force effect to a force feedback device */ #define EVIOCRMFF _IOW('E', 0x81, int) /* Erase a force effect */ @@ -754,7 +755,7 @@ struct input_dev { char *name; char *phys; char *uniq; - struct input_devinfo id; + struct input_id id; unsigned long evbit[NBITS(EV_MAX)]; unsigned long keybit[NBITS(KEY_MAX)]; @@ -829,7 +830,7 @@ struct input_device_id { unsigned long flags; - struct input_devinfo id; + struct input_id id; unsigned long evbit[NBITS(EV_MAX)]; unsigned long keybit[NBITS(KEY_MAX)]; diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 528b27a21d78..db554ad4cdcf 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h @@ -64,7 +64,7 @@ struct uinput_device { #define UINPUT_MAX_NAME_SIZE 80 struct uinput_user_dev { char name[UINPUT_MAX_NAME_SIZE]; - struct input_devinfo id; + struct input_id id; int ff_effects_max; int absmax[ABS_MAX + 1]; int absmin[ABS_MAX + 1]; |