Merge branch 'ApproxEng:master'

gvalkov · gvalkov · commit de43294ed020 · 2018-03-22T19:44:49.000+01:00
diff --git a/evdev/device.py b/evdev/device.py
@@ -108,7 +108,7 @@ class InputDevice(EventIO):
     A linux input device from which input events can be read.
     '''
 
-    __slots__ = ('fn', 'fd', 'info', 'name', 'phys', '_rawcapabilities',
+    __slots__ = ('fn', 'fd', 'info', 'name', 'phys', 'uniq', '_rawcapabilities',
                  'version', 'ff_effects_count')
 
     def __init__(self, dev):
@@ -144,6 +144,9 @@ def __init__(self, dev):
         #: The physical topology of the device.
         self.phys = info_res[5]
 
+	#: The unique address of the device
+        self.uniq = info_res[6]
+
         #: The evdev protocol version.
         self.version = _input.ioctl_EVIOCGVERSION(self.fd)
 
diff --git a/evdev/input.c b/evdev/input.c
@@ -216,6 +216,7 @@ ioctl_devinfo(PyObject *self, PyObject *args)
     struct input_id iid;
     char name[MAX_NAME_SIZE];
     char phys[MAX_NAME_SIZE] = {0};
+    char uniq[MAX_NAME_SIZE] = {0};
 
     int ret = PyArg_ParseTuple(args, "i", &fd);
     if (!ret) return NULL;
@@ -225,11 +226,13 @@ ioctl_devinfo(PyObject *self, PyObject *args)
     if (ioctl(fd, EVIOCGID, &iid) < 0)                 goto on_err;
     if (ioctl(fd, EVIOCGNAME(sizeof(name)), name) < 0) goto on_err;
 
+    ioctl(fd, EVIOCGUNIQ(sizeof(uniq)), uniq);
+
     // Some devices do not have a physical topology associated with them
     ioctl(fd, EVIOCGPHYS(sizeof(phys)), phys);
 
-    return Py_BuildValue("hhhhss", iid.bustype, iid.vendor, iid.product, iid.version,
-                         name, phys);
+    return Py_BuildValue("hhhhsss", iid.bustype, iid.vendor, iid.product, iid.version,
+                         name, phys, uniq);
 
     on_err:
         PyErr_SetFromErrno(PyExc_IOError);
