Merge lp:~oif-team/evemu/trunk.prop into lp:evemu

[Henrik Rydberg]

Support the upcoming device properties.

[Chase Douglas (chasedouglas)]

Seems good.

review: Approve

=== modified file 'include/evemu.h'
--- include/evemu.h	2010-09-18 17:10:11 +0000
+++ include/evemu.h	2010-12-21 17:21:49 +0000
@@ -26,28 +26,23 @@
  *
  ****************************************************************************/
 
-#ifndef _EVPLAY_H
-#define _EVPLAY_H
+#ifndef _EVEMU_H
+#define _EVEMU_H
 
-#include <linux/uinput.h>
 #include <stdio.h>
-
-#define EVPLAY_NBITS	KEY_CNT
-#define EVPLAY_NBYTES	((EVPLAY_NBITS + 7) / 8)
-
-struct evemu_device {
-	char name[UINPUT_MAX_NAME_SIZE];
-	struct input_id id;
-	unsigned char mask[EV_CNT][EVPLAY_NBYTES];
-	int bytes[EV_CNT];
-	struct input_absinfo abs[ABS_CNT];
-};
-
-static inline int evemu_has(const struct evemu_device *dev,
-			     int type, int code)
-{
-	return (dev->mask[type][code >> 3] >> (code & 7)) & 1;
-}
+#include <errno.h>
+#include <linux/input.h>
+
+#define EVEMU_VERSION_MAJOR	1
+#define EVEMU_VERSION_MINOR	1
+
+struct evemu_device *evemu_new(const char *name);
+void evemu_delete(struct evemu_device *dev);
+
+const char *evemu_get_name(const struct evemu_device *dev);
+
+int evemu_has_prop(const struct evemu_device *dev, int code);
+int evemu_has_event(const struct evemu_device *dev, int type, int code);
 
 int evemu_extract(struct evemu_device *dev, int fd);
 int evemu_write(const struct evemu_device *dev, FILE *fp);

=== added file 'src/evemu-impl.h'
--- src/evemu-impl.h	1970-01-01 00:00:00 +0000
+++ src/evemu-impl.h	2010-12-21 17:21:49 +0000
@@ -0,0 +1,20 @@
+#ifndef _EVEMU_IMPL_H
+#define _EVEMU_IMPL_H
+
+#include <evemu.h>
+#include <linux/uinput.h>
+
+#define EVPLAY_NBITS	KEY_CNT
+#define EVPLAY_NBYTES	((EVPLAY_NBITS + 7) / 8)
+
+struct evemu_device {
+	int version_major, version_minor;
+	char name[UINPUT_MAX_NAME_SIZE];
+	struct input_id id;
+	unsigned char prop[EVPLAY_NBYTES];
+	unsigned char mask[EV_CNT][EVPLAY_NBYTES];
+	int pbytes, mbytes[EV_CNT];
+	struct input_absinfo abs[ABS_CNT];
+};
+
+#endif

=== modified file 'src/evemu.c'
--- src/evemu.c	2010-09-19 07:54:48 +0000
+++ src/evemu.c	2010-12-21 17:21:49 +0000
@@ -26,13 +26,25 @@
  *
  ****************************************************************************/
 
-#include "evemu.h"
+#include "evemu-impl.h"
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <poll.h>
 
+#ifndef UI_SET_PROPBIT
+#define UI_SET_PROPBIT		_IOW(UINPUT_IOCTL_BASE, 110, int)
+#define EVIOCGPROP(len)		_IOC(_IOC_READ, 'E', 0x09, len)
+#define INPUT_PROP_POINTER		0x00
+#define INPUT_PROP_DIRECT		0x01
+#define INPUT_PROP_BUTTONPAD		0x02
+#define INPUT_PROP_SEMI_MT		0x03
+#define INPUT_PROP_MAX			0x1f
+#define INPUT_PROP_CNT			(INPUT_PROP_MAX + 1)
+#endif
+
 #define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
 
 static void copy_bits(unsigned char *mask, const unsigned long *bits, int bytes)
@@ -44,6 +56,39 @@
 	}
 }
 
+struct evemu_device *evemu_new(const char *name)
+{
+	struct evemu_device *dev = calloc(1, sizeof(struct evemu_device));
+
+	dev->version_major = EVEMU_VERSION_MAJOR;
+	dev->version_minor = EVEMU_VERSION_MINOR;
+
+	if (name && strlen(name) < sizeof(dev->name))
+		strcpy(dev->name, name);
+
+	return dev;
+}
+
+void evemu_delete(struct evemu_device *dev)
+{
+	free(dev);
+}
+
+const char *evemu_get_name(const struct evemu_device *dev)
+{
+	return dev->name;
+}
+
+int evemu_has_prop(const struct evemu_device *dev, int code)
+{
+	return (dev->prop[code >> 3] >> (code & 7)) & 1;
+}
+
+int evemu_has_event(const struct evemu_device *dev, int type, int code)
+{
+	return (dev->mask[type][code >> 3] >> (code & 7)) & 1;
+}
+
 int evemu_extract(struct evemu_device *dev, int fd)
 {
 	unsigned long bits[64];
@@ -62,16 +107,22 @@
 	if (rc < 0)
 		return rc;
 
+	SYSCALL(rc = ioctl(fd, EVIOCGPROP(sizeof(bits)), bits));
+	if (rc >= 0) {
+		copy_bits(dev->prop, bits, rc);
+		dev->pbytes = rc;
+	}
+
 	for (i = 0; i < EV_CNT; i++) {
 		SYSCALL(rc = ioctl(fd, EVIOCGBIT(i, sizeof(bits)), bits));
 		if (rc < 0)
 			continue;
 		copy_bits(dev->mask[i], bits, rc);
-		dev->bytes[i] = rc;
+		dev->mbytes[i] = rc;
 	}
 
 	for (i = 0; i < ABS_CNT; i++) {
-		if (!evemu_has(dev, EV_ABS, i))
+		if (!evemu_has_event(dev, EV_ABS, i))
 			continue;
 		SYSCALL(rc = ioctl(fd, EVIOCGABS(i), &dev->abs[i]));
 		if (rc < 0)
@@ -81,6 +132,15 @@
 	return 0;
 }
 
+static void write_prop(FILE * fp, const unsigned char *mask, int bytes)
+{
+	int i;
+	for (i = 0; i < bytes; i += 8)
+		fprintf(fp, "P: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+			mask[i], mask[i + 1], mask[i + 2], mask[i + 3],
+			mask[i + 4], mask[i + 5], mask[i + 6], mask[i + 7]);
+}
+
 static void write_mask(FILE * fp, int index,
 		       const unsigned char *mask, int bytes)
 {
@@ -107,14 +167,28 @@
 		dev->id.bustype, dev->id.vendor,
 		dev->id.product, dev->id.version);
 
+	write_prop(fp, dev->prop, dev->pbytes);
+
 	for (i = 0; i < EV_CNT; i++)
-		write_mask(fp, i, dev->mask[i], dev->bytes[i]);
+		write_mask(fp, i, dev->mask[i], dev->mbytes[i]);
 
 	for (i = 0; i < ABS_CNT; i++)
-		if (evemu_has(dev, EV_ABS, i))
+		if (evemu_has_event(dev, EV_ABS, i))
 			write_abs(fp, i, &dev->abs[i]);
 }
 
+static void read_prop(struct evemu_device *dev, FILE *fp)
+{
+	unsigned int mask[8];
+	int i;
+	while (fscanf(fp, "P: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+		      mask + 0, mask + 1, mask + 2, mask + 3,
+		      mask + 4, mask + 5, mask + 6, mask + 7) > 0) {
+		for (i = 0; i < 8; i++)
+			dev->prop[dev->pbytes++] = mask[i];
+	}
+}
+
 static void read_mask(struct evemu_device *dev, FILE *fp)
 {
 	unsigned int mask[8];
@@ -123,7 +197,7 @@
 		      &index, mask + 0, mask + 1, mask + 2, mask + 3,
 		      mask + 4, mask + 5, mask + 6, mask + 7) > 0) {
 		for (i = 0; i < 8; i++)
-			dev->mask[index][dev->bytes[index]++] = mask[i];
+			dev->mask[index][dev->mbytes[index]++] = mask[i];
 	}
 }
 
@@ -157,6 +231,8 @@
 	dev->id.product = product;
 	dev->id.version = version;
 
+	read_prop(dev, fp);
+
 	read_mask(dev, fp);
 
 	read_abs(dev, fp);
@@ -225,7 +301,14 @@
 	return 0;
 }
 
-static int set_bit(int fd, int type, int code)
+static int set_prop_bit(int fd, int code)
+{
+	int ret;
+	SYSCALL(ret = ioctl(fd, UI_SET_PROPBIT, code));
+	return ret;
+}
+
+static int set_event_bit(int fd, int type, int code)
 {
 	int ret = 0;
 
@@ -262,14 +345,28 @@
 	return ret;
 }
 
+static int set_prop(const struct evemu_device *dev, int fd)
+{
+	int bits = 8 * dev->pbytes;
+	int ret, i;
+	for (i = 0; i < bits; i++) {
+		if (!evemu_has_prop(dev, i))
+			continue;
+		ret = set_prop_bit(fd, i);
+		if (ret < 0)
+			return ret;
+	}
+	return 0;
+}
+
 static int set_mask(const struct evemu_device *dev, int type, int fd)
 {
-	int bits = 8 * dev->bytes[type];
+	int bits = 8 * dev->mbytes[type];
 	int ret, i;
 	for (i = 0; i < bits; i++) {
-		if (!evemu_has(dev, type, i))
+		if (!evemu_has_event(dev, type, i))
 			continue;
-		ret = set_bit(fd, type, i);
+		ret = set_event_bit(fd, type, i);
 		if (ret < 0)
 			return ret;
 	}
@@ -285,7 +382,7 @@
 	memcpy(udev.name, dev->name, sizeof(udev.name));
 	udev.id = dev->id;
 	for (i = 0; i < ABS_CNT; i++) {
-		if (!evemu_has(dev, EV_ABS, i))
+		if (!evemu_has_event(dev, EV_ABS, i))
 			continue;
 		udev.absmax[i] = dev->abs[i].maximum;
 		udev.absmin[i] = dev->abs[i].minimum;
@@ -293,6 +390,10 @@
 		udev.absflat[i] = dev->abs[i].flat;
 	}
 
+	ret = set_prop(dev, fd);
+	if (ret < 0)
+		return ret;
+
 	for (i = 0; i < EV_CNT; i++) {
 		ret = set_mask(dev, i, fd);
 		if (ret < 0)

=== modified file 'tools/evemu-describe.c'
--- tools/evemu-describe.c	2010-09-18 17:10:11 +0000
+++ tools/evemu-describe.c	2010-12-21 17:21:49 +0000
@@ -26,22 +26,27 @@
  *
  ****************************************************************************/
 
-#include "evemu.h"
+#include <evemu.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
 
 static int describe_device(int fd)
 {
-	struct evemu_device dev;
-	int ret;
+	struct evemu_device *dev;
+	int ret = -ENOMEM;
 
-	ret = evemu_extract(&dev, fd);
+	dev = evemu_new(0);
+	if (!dev)
+		goto out;
+	ret = evemu_extract(dev, fd);
 	if (ret)
-		return ret;
-	evemu_write(&dev, stdout);
+		goto out;
 
-	return 0;
+	evemu_write(dev, stdout);
+out:
+	evemu_delete(dev);
+	return ret;
 }
 
 int main(int argc, char *argv[])

=== modified file 'tools/evemu-device.c'
--- tools/evemu-device.c	2010-09-23 15:53:46 +0000
+++ tools/evemu-device.c	2010-12-21 17:21:49 +0000
@@ -50,7 +50,7 @@
 		ret = read(fd, name, sizeof(name));
 		if (ret > 0)
 			name[ret - 1] = 0;
-		if (!strcmp(dev->name, name))
+		if (!strcmp(evemu_get_name(dev), name))
 			sprintf(node, "/dev/input/event%d", i + 1);
 		close(fd);
 	}
@@ -58,7 +58,7 @@
 	fd = open(node, O_RDONLY);
 	if (fd < 0)
 		return;
-	fprintf(stdout, "%s: %s\n", dev->name, node);
+	fprintf(stdout, "%s: %s\n", evemu_get_name(dev), node);
 	fflush(stdout);
 	while ((ret = read(fd, data, sizeof(data))) > 0);
 	close(fd);
@@ -66,28 +66,36 @@
 
 static int evemu_device(FILE *fp)
 {
-	struct evemu_device dev;
-	int ret, fd;
-
-	ret = evemu_read(&dev, fp);
+	struct evemu_device *dev;
+	char name[64];
+	int ret = -ENOMEM;
+	int fd;
+
+	sprintf(name, "evemu-%d", getpid());
+
+	dev = evemu_new(name);
+	if (!dev)
+		goto out;
+	ret = evemu_read(dev, fp);
 	if (ret <= 0)
-		return ret;
-
-	sprintf(dev.name, "evemu-%d", getpid());
-
-	fd = open(UINPUT_NODE, O_WRONLY);
-	if (fd < 0)
-		return fd;
-	ret = evemu_create(&dev, fd);
-	if (ret < 0)
-		return ret;
-
-	hold_device(&dev);
-
+		goto out;
+
+	ret = fd = open(UINPUT_NODE, O_WRONLY);
+	if (ret < 0)
+		goto out;
+
+	ret = evemu_create(dev, fd);
+	if (ret < 0)
+		goto out_close;
+	hold_device(dev);
 	evemu_destroy(fd);
+
+out_close:
 	close(fd);
+out:
+	evemu_delete(dev);
 
-	return 0;
+	return ret;
 }
 
 int main(int argc, char *argv[])

=== modified file 'tools/evemu-echo.c'
--- tools/evemu-echo.c	2010-09-18 17:10:11 +0000
+++ tools/evemu-echo.c	2010-12-21 17:21:49 +0000
@@ -33,16 +33,20 @@
 
 static int evemu_echo_describe(FILE *fp)
 {
-	struct evemu_device dev;
-	int ret;
+	struct evemu_device *dev;
+	int ret = -ENOMEM;
 
-	ret = evemu_read(&dev, fp);
+	dev = evemu_new(0);
+	if (!dev)
+		goto out;
+	ret = evemu_read(dev, fp);
 	if (ret <= 0)
-		return ret;
-
-	evemu_write(&dev, stdout);
-
-	return 0;
+		goto out;
+
+	evemu_write(dev, stdout);
+out:
+	evemu_delete(dev);
+	return ret;
 }
 
 static int evemu_echo_event(FILE *fp)