Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 30559
b: refs/heads/master
c: 1e0afb2
h: refs/heads/master
i:
  30557: e893048
  30555: 9a5ddf5
  30551: 2707e71
  30543: 984c425
  30527: b2b7771
v: v3
  • Loading branch information
Dmitry Torokhov committed Jun 26, 2006
1 parent 8563934 commit dafb09c
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 62 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f60d2b111cd55c335c2b70e50d66a612d2b10856
refs/heads/master: 1e0afb288e56d469ca1c583342bb9782d49333c6
10 changes: 8 additions & 2 deletions trunk/drivers/input/evdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,19 @@ static int evdev_fasync(int fd, struct file *file, int on)
{
int retval;
struct evdev_list *list = file->private_data;

retval = fasync_helper(fd, file, on, &list->fasync);

return retval < 0 ? retval : 0;
}

static int evdev_flush(struct file * file, fl_owner_t id)
static int evdev_flush(struct file *file, fl_owner_t id)
{
struct evdev_list *list = file->private_data;
if (!list->evdev->exist) return -ENODEV;

if (!list->evdev->exist)
return -ENODEV;

return input_flush_device(&list->evdev->handle, file);
}

Expand Down Expand Up @@ -300,6 +305,7 @@ static ssize_t evdev_read(struct file * file, char __user * buffer, size_t count
static unsigned int evdev_poll(struct file *file, poll_table *wait)
{
struct evdev_list *list = file->private_data;

poll_wait(file, &list->evdev->wait, wait);
return ((list->head == list->tail) ? 0 : (POLLIN | POLLRDNORM)) |
(list->evdev->exist ? 0 : (POLLHUP | POLLERR));
Expand Down
37 changes: 25 additions & 12 deletions trunk/drivers/input/input.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,13 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
case EV_SYN:
switch (code) {
case SYN_CONFIG:
if (dev->event) dev->event(dev, type, code, value);
if (dev->event)
dev->event(dev, type, code, value);
break;

case SYN_REPORT:
if (dev->sync) return;
if (dev->sync)
return;
dev->sync = 1;
break;
}
Expand Down Expand Up @@ -137,7 +139,8 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
if (code > MSC_MAX || !test_bit(code, dev->mscbit))
return;

if (dev->event) dev->event(dev, type, code, value);
if (dev->event)
dev->event(dev, type, code, value);

break;

Expand All @@ -147,7 +150,9 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
return;

change_bit(code, dev->led);
if (dev->event) dev->event(dev, type, code, value);

if (dev->event)
dev->event(dev, type, code, value);

break;

Expand All @@ -159,21 +164,25 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
if (!!test_bit(code, dev->snd) != !!value)
change_bit(code, dev->snd);

if (dev->event) dev->event(dev, type, code, value);
if (dev->event)
dev->event(dev, type, code, value);

break;

case EV_REP:

if (code > REP_MAX || value < 0 || dev->rep[code] == value) return;
if (code > REP_MAX || value < 0 || dev->rep[code] == value)
return;

dev->rep[code] = value;
if (dev->event) dev->event(dev, type, code, value);
if (dev->event)
dev->event(dev, type, code, value);

break;

case EV_FF:
if (dev->event) dev->event(dev, type, code, value);
if (dev->event)
dev->event(dev, type, code, value);
break;
}

Expand Down Expand Up @@ -336,9 +345,11 @@ static inline void input_wakeup_procfs_readers(void)
static unsigned int input_proc_devices_poll(struct file *file, poll_table *wait)
{
int state = input_devices_state;

poll_wait(file, &input_devices_poll_wait, wait);
if (state != input_devices_state)
return POLLIN | POLLRDNORM;

return 0;
}

Expand Down Expand Up @@ -972,9 +983,10 @@ int input_register_device(struct input_dev *dev)

void input_unregister_device(struct input_dev *dev)
{
struct list_head * node, * next;
struct list_head *node, *next;

if (!dev) return;
if (!dev)
return;

del_timer_sync(&dev->timer);

Expand Down Expand Up @@ -1005,7 +1017,8 @@ void input_register_handler(struct input_handler *handler)
struct input_handle *handle;
struct input_device_id *id;

if (!handler) return;
if (!handler)
return;

INIT_LIST_HEAD(&handler->h_list);

Expand All @@ -1025,7 +1038,7 @@ void input_register_handler(struct input_handler *handler)

void input_unregister_handler(struct input_handler *handler)
{
struct list_head * node, * next;
struct list_head *node, *next;

list_for_each_safe(node, next, &handler->h_list) {
struct input_handle * handle = to_handle_h(node);
Expand Down
69 changes: 45 additions & 24 deletions trunk/drivers/input/joydev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ static int joydev_correct(int value, struct js_corr *corr)
return 0;
}

if (value < -32767) return -32767;
if (value > 32767) return 32767;

return value;
return value < -32767 ? -32767 : (value > 32767 ? 32767 : value);
}

static void joydev_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
Expand All @@ -96,7 +93,8 @@ static void joydev_event(struct input_handle *handle, unsigned int type, unsigne
switch (type) {

case EV_KEY:
if (code < BTN_MISC || value == 2) return;
if (code < BTN_MISC || value == 2)
return;
event.type = JS_EVENT_BUTTON;
event.number = joydev->keymap[code - BTN_MISC];
event.value = value;
Expand All @@ -106,7 +104,8 @@ static void joydev_event(struct input_handle *handle, unsigned int type, unsigne
event.type = JS_EVENT_AXIS;
event.number = joydev->absmap[code];
event.value = joydev_correct(value, joydev->corr + event.number);
if (event.value == joydev->abs[event.number]) return;
if (event.value == joydev->abs[event.number])
return;
joydev->abs[event.number] = event.value;
break;

Expand Down Expand Up @@ -134,7 +133,9 @@ static int joydev_fasync(int fd, struct file *file, int on)
{
int retval;
struct joydev_list *list = file->private_data;

retval = fasync_helper(fd, file, on, &list->fasync);

return retval < 0 ? retval : 0;
}

Expand Down Expand Up @@ -222,12 +223,12 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo
return sizeof(struct JS_DATA_TYPE);
}

if (list->startup == joydev->nabs + joydev->nkey
&& list->head == list->tail && (file->f_flags & O_NONBLOCK))
return -EAGAIN;
if (list->startup == joydev->nabs + joydev->nkey &&
list->head == list->tail && (file->f_flags & O_NONBLOCK))
return -EAGAIN;

retval = wait_event_interruptible(list->joydev->wait,
!list->joydev->exist ||
!list->joydev->exist ||
list->startup < joydev->nabs + joydev->nkey ||
list->head != list->tail);

Expand Down Expand Up @@ -276,8 +277,9 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo
static unsigned int joydev_poll(struct file *file, poll_table *wait)
{
struct joydev_list *list = file->private_data;

poll_wait(file, &list->joydev->wait, wait);
return ((list->head != list->tail || list->startup < list->joydev->nabs + list->joydev->nkey) ?
return ((list->head != list->tail || list->startup < list->joydev->nabs + list->joydev->nkey) ?
(POLLIN | POLLRDNORM) : 0) | (list->joydev->exist ? 0 : (POLLHUP | POLLERR));
}

Expand All @@ -291,20 +293,26 @@ static int joydev_ioctl_common(struct joydev *joydev, unsigned int cmd, void __u
case JS_SET_CAL:
return copy_from_user(&joydev->glue.JS_CORR, argp,
sizeof(joydev->glue.JS_CORR)) ? -EFAULT : 0;

case JS_GET_CAL:
return copy_to_user(argp, &joydev->glue.JS_CORR,
sizeof(joydev->glue.JS_CORR)) ? -EFAULT : 0;

case JS_SET_TIMEOUT:
return get_user(joydev->glue.JS_TIMEOUT, (s32 __user *) argp);

case JS_GET_TIMEOUT:
return put_user(joydev->glue.JS_TIMEOUT, (s32 __user *) argp);

case JSIOCGVERSION:
return put_user(JS_VERSION, (__u32 __user *) argp);

case JSIOCGAXES:
return put_user(joydev->nabs, (__u8 __user *) argp);

case JSIOCGBUTTONS:
return put_user(joydev->nkey, (__u8 __user *) argp);

case JSIOCSCORR:
if (copy_from_user(joydev->corr, argp,
sizeof(joydev->corr[0]) * joydev->nabs))
Expand All @@ -314,38 +322,49 @@ static int joydev_ioctl_common(struct joydev *joydev, unsigned int cmd, void __u
joydev->abs[i] = joydev_correct(dev->abs[j], joydev->corr + i);
}
return 0;

case JSIOCGCORR:
return copy_to_user(argp, joydev->corr,
sizeof(joydev->corr[0]) * joydev->nabs) ? -EFAULT : 0;

case JSIOCSAXMAP:
if (copy_from_user(joydev->abspam, argp, sizeof(__u8) * (ABS_MAX + 1)))
return -EFAULT;
for (i = 0; i < joydev->nabs; i++) {
if (joydev->abspam[i] > ABS_MAX) return -EINVAL;
if (joydev->abspam[i] > ABS_MAX)
return -EINVAL;
joydev->absmap[joydev->abspam[i]] = i;
}
return 0;

case JSIOCGAXMAP:
return copy_to_user(argp, joydev->abspam,
sizeof(__u8) * (ABS_MAX + 1)) ? -EFAULT : 0;

case JSIOCSBTNMAP:
if (copy_from_user(joydev->keypam, argp, sizeof(__u16) * (KEY_MAX - BTN_MISC + 1)))
return -EFAULT;
for (i = 0; i < joydev->nkey; i++) {
if (joydev->keypam[i] > KEY_MAX || joydev->keypam[i] < BTN_MISC) return -EINVAL;
if (joydev->keypam[i] > KEY_MAX || joydev->keypam[i] < BTN_MISC)
return -EINVAL;
joydev->keymap[joydev->keypam[i] - BTN_MISC] = i;
}
return 0;

case JSIOCGBTNMAP:
return copy_to_user(argp, joydev->keypam,
sizeof(__u16) * (KEY_MAX - BTN_MISC + 1)) ? -EFAULT : 0;

default:
if ((cmd & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT)) == JSIOCGNAME(0)) {
int len;
if (!dev->name) return 0;
if (!dev->name)
return 0;
len = strlen(dev->name) + 1;
if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);
if (copy_to_user(argp, dev->name, len)) return -EFAULT;
if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd);
if (copy_to_user(argp, dev->name, len))
return -EFAULT;
return len;
}
}
Expand All @@ -362,7 +381,9 @@ static long joydev_compat_ioctl(struct file *file, unsigned int cmd, unsigned lo
struct JS_DATA_SAVE_TYPE_32 ds32;
int err;

if (!joydev->exist) return -ENODEV;
if (!joydev->exist)
return -ENODEV;

switch(cmd) {
case JS_SET_TIMELIMIT:
err = get_user(tmp32, (s32 __user *) arg);
Expand Down Expand Up @@ -395,8 +416,7 @@ static long joydev_compat_ioctl(struct file *file, unsigned int cmd, unsigned lo
ds32.JS_SAVE = joydev->glue.JS_SAVE;
ds32.JS_CORR = joydev->glue.JS_CORR;

err = copy_to_user(argp, &ds32,
sizeof(ds32)) ? -EFAULT : 0;
err = copy_to_user(argp, &ds32, sizeof(ds32)) ? -EFAULT : 0;
break;

default:
Expand All @@ -412,7 +432,8 @@ static int joydev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
struct joydev *joydev = list->joydev;
void __user *argp = (void __user *)arg;

if (!joydev->exist) return -ENODEV;
if (!joydev->exist)
return -ENODEV;

switch(cmd) {
case JS_SET_TIMELIMIT:
Expand Down Expand Up @@ -546,8 +567,8 @@ static struct input_device_id joydev_blacklist[] = {
.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
.evbit = { BIT(EV_KEY) },
.keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },
}, /* Avoid itouchpads, touchscreens and tablets */
{ }, /* Terminating entry */
}, /* Avoid itouchpads, touchscreens and tablets */
{ } /* Terminating entry */
};

static struct input_device_id joydev_ids[] = {
Expand All @@ -566,7 +587,7 @@ static struct input_device_id joydev_ids[] = {
.evbit = { BIT(EV_ABS) },
.absbit = { BIT(ABS_THROTTLE) },
},
{ }, /* Terminating entry */
{ } /* Terminating entry */
};

MODULE_DEVICE_TABLE(input, joydev_ids);
Expand All @@ -579,7 +600,7 @@ static struct input_handler joydev_handler = {
.minor = JOYDEV_MINOR_BASE,
.name = "joydev",
.id_table = joydev_ids,
.blacklist = joydev_blacklist,
.blacklist = joydev_blacklist,
};

static int __init joydev_init(void)
Expand Down
Loading

0 comments on commit dafb09c

Please sign in to comment.