aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2012-02-06 02:49:25 -0500
committerHenrik Rydberg <rydberg@euromail.se>2012-02-09 03:40:57 -0500
commit1cf0c6e69e396538615153056605aaafab11935a (patch)
treec414962f0047548765778132a3a988d48d7034b5
parentb89529a10c954f14191367355da2a6053c49abb9 (diff)
Input: Add EVIOC mechanism for MT slots
This patch adds the ability to extract MT slot data via a new ioctl, EVIOCGMTSLOTS. The function returns an array of slot values for the specified ABS_MT event type. Example of user space usage: struct { unsigned code; int values[64]; } req; req.code = ABS_MT_POSITION_X; if (ioctl(fd, EVIOCGMTSLOTS(sizeof(req)), &req) < 0) return -1; for (i = 0; i < 64; i++) printf("slot %d: %d\n", i, req.values[i]); Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--drivers/input/evdev.c27
-rw-r--r--include/linux/input.h25
2 files changed, 51 insertions, 1 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 76457d50bc34..e4cad161be9d 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -20,7 +20,7 @@
20#include <linux/slab.h> 20#include <linux/slab.h>
21#include <linux/module.h> 21#include <linux/module.h>
22#include <linux/init.h> 22#include <linux/init.h>
23#include <linux/input.h> 23#include <linux/input/mt.h>
24#include <linux/major.h> 24#include <linux/major.h>
25#include <linux/device.h> 25#include <linux/device.h>
26#include "input-compat.h" 26#include "input-compat.h"
@@ -623,6 +623,28 @@ static int evdev_handle_set_keycode_v2(struct input_dev *dev, void __user *p)
623 return input_set_keycode(dev, &ke); 623 return input_set_keycode(dev, &ke);
624} 624}
625 625
626static int evdev_handle_mt_request(struct input_dev *dev,
627 unsigned int size,
628 int __user *ip)
629{
630 const struct input_mt_slot *mt = dev->mt;
631 unsigned int code;
632 int max_slots;
633 int i;
634
635 if (get_user(code, &ip[0]))
636 return -EFAULT;
637 if (!input_is_mt_value(code))
638 return -EINVAL;
639
640 max_slots = (size - sizeof(__u32)) / sizeof(__s32);
641 for (i = 0; i < dev->mtsize && i < max_slots; i++)
642 if (put_user(input_mt_get_value(&mt[i], code), &ip[1 + i]))
643 return -EFAULT;
644
645 return 0;
646}
647
626static long evdev_do_ioctl(struct file *file, unsigned int cmd, 648static long evdev_do_ioctl(struct file *file, unsigned int cmd,
627 void __user *p, int compat_mode) 649 void __user *p, int compat_mode)
628{ 650{
@@ -708,6 +730,9 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
708 return bits_to_user(dev->propbit, INPUT_PROP_MAX, 730 return bits_to_user(dev->propbit, INPUT_PROP_MAX,
709 size, p, compat_mode); 731 size, p, compat_mode);
710 732
733 case EVIOCGMTSLOTS(0):
734 return evdev_handle_mt_request(dev, size, ip);
735
711 case EVIOCGKEY(0): 736 case EVIOCGKEY(0):
712 return bits_to_user(dev->key, KEY_MAX, size, p, compat_mode); 737 return bits_to_user(dev->key, KEY_MAX, size, p, compat_mode);
713 738
diff --git a/include/linux/input.h b/include/linux/input.h
index 3862e32c4eeb..af264438631d 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -114,6 +114,31 @@ struct input_keymap_entry {
114#define EVIOCGUNIQ(len) _IOC(_IOC_READ, 'E', 0x08, len) /* get unique identifier */ 114#define EVIOCGUNIQ(len) _IOC(_IOC_READ, 'E', 0x08, len) /* get unique identifier */
115#define EVIOCGPROP(len) _IOC(_IOC_READ, 'E', 0x09, len) /* get device properties */ 115#define EVIOCGPROP(len) _IOC(_IOC_READ, 'E', 0x09, len) /* get device properties */
116 116
117/**
118 * EVIOCGMTSLOTS(len) - get MT slot values
119 *
120 * The ioctl buffer argument should be binary equivalent to
121 *
122 * struct input_mt_request_layout {
123 * __u32 code;
124 * __s32 values[num_slots];
125 * };
126 *
127 * where num_slots is the (arbitrary) number of MT slots to extract.
128 *
129 * The ioctl size argument (len) is the size of the buffer, which
130 * should satisfy len = (num_slots + 1) * sizeof(__s32). If len is
131 * too small to fit all available slots, the first num_slots are
132 * returned.
133 *
134 * Before the call, code is set to the wanted ABS_MT event type. On
135 * return, values[] is filled with the slot values for the specified
136 * ABS_MT code.
137 *
138 * If the request code is not an ABS_MT value, -EINVAL is returned.
139 */
140#define EVIOCGMTSLOTS(len) _IOC(_IOC_READ, 'E', 0x0a, len)
141
117#define EVIOCGKEY(len) _IOC(_IOC_READ, 'E', 0x18, len) /* get global key state */ 142#define EVIOCGKEY(len) _IOC(_IOC_READ, 'E', 0x18, len) /* get global key state */
118#define EVIOCGLED(len) _IOC(_IOC_READ, 'E', 0x19, len) /* get all LEDs */ 143#define EVIOCGLED(len) _IOC(_IOC_READ, 'E', 0x19, len) /* get all LEDs */
119#define EVIOCGSND(len) _IOC(_IOC_READ, 'E', 0x1a, len) /* get all sounds status */ 144#define EVIOCGSND(len) _IOC(_IOC_READ, 'E', 0x1a, len) /* get all sounds status */