summaryrefslogtreecommitdiff
path: root/sysutils/hid-tools/files/patch-hidtools_hidraw.py
diff options
context:
space:
mode:
authorVladimir Kondratyev <wulf@FreeBSD.org>2021-02-14 23:07:31 +0000
committerVladimir Kondratyev <wulf@FreeBSD.org>2021-02-14 23:07:31 +0000
commit75a813c71581cfbb8ae865f30fff77103a0a28f3 (patch)
tree1e32a7a1e814afd1e9c8b42a5547b516a0d415c1 /sysutils/hid-tools/files/patch-hidtools_hidraw.py
parentsysutils/iichid: Update to 0.0.6 (diff)
new port: sysutils/hid-tools
sysutils/hid-tools: Python scripts to manipulate HID data PR: 253498 Approved by: lwhsu (ports)
Notes
Notes: svn path=/head/; revision=565272
Diffstat (limited to 'sysutils/hid-tools/files/patch-hidtools_hidraw.py')
-rw-r--r--sysutils/hid-tools/files/patch-hidtools_hidraw.py58
1 files changed, 58 insertions, 0 deletions
diff --git a/sysutils/hid-tools/files/patch-hidtools_hidraw.py b/sysutils/hid-tools/files/patch-hidtools_hidraw.py
new file mode 100644
index 000000000000..163f1a7eb510
--- /dev/null
+++ b/sysutils/hid-tools/files/patch-hidtools_hidraw.py
@@ -0,0 +1,58 @@
+Fix ioctl(2) definitions to match <sys/ioccom.h> and <dev/hid/hidraw.h>
+
+--- hidtools/hidraw.py.orig 2019-03-29 01:29:29 UTC
++++ hidtools/hidraw.py
+@@ -36,13 +36,14 @@ def _ioctl(fd, EVIOC, code, return_type, buf=None):
+
+
+ # extracted from <asm-generic/ioctl.h>
+-_IOC_WRITE = 1
++_IOC_VOID = 1
+ _IOC_READ = 2
++_IOC_WRITE = 4
+
+ _IOC_NRBITS = 8
+ _IOC_TYPEBITS = 8
+-_IOC_SIZEBITS = 14
+-_IOC_DIRBITS = 2
++_IOC_SIZEBITS = 13
++_IOC_DIRBITS = 3
+
+ _IOC_NRSHIFT = 0
+ _IOC_TYPESHIFT = _IOC_NRSHIFT + _IOC_NRBITS
+@@ -74,7 +75,7 @@ def _IOW(type, nr, size):
+
+ # define HIDIOCGRDESCSIZE _IOR('H', 0x01, int)
+ def _IOC_HIDIOCGRDESCSIZE(none, len):
+- return _IOR('H', 0x01, len)
++ return _IOR('U', 30, len)
+
+
+ def _HIDIOCGRDESCSIZE(fd):
+@@ -85,7 +86,7 @@ def _HIDIOCGRDESCSIZE(fd):
+
+ # define HIDIOCGRDESC _IOR('H', 0x02, struct hidraw_report_descriptor)
+ def _IOC_HIDIOCGRDESC(none, len):
+- return _IOR('H', 0x02, len)
++ return _IOC(_IOC_VOID, 'U', 31, 0)
+
+
+ def _HIDIOCGRDESC(fd, size):
+@@ -102,7 +103,7 @@ def _HIDIOCGRDESC(fd, size):
+
+ # define HIDIOCGRAWINFO _IOR('H', 0x03, struct hidraw_devinfo)
+ def _IOC_HIDIOCGRAWINFO(none, len):
+- return _IOR('H', 0x03, len)
++ return _IOR('U', 32, len)
+
+
+ def _HIDIOCGRAWINFO(fd):
+@@ -113,7 +114,7 @@ def _HIDIOCGRAWINFO(fd):
+
+ # define HIDIOCGRAWNAME(len) _IOC(_IOC_READ, 'H', 0x04, len)
+ def _IOC_HIDIOCGRAWNAME(none, len):
+- return _IOC(_IOC_READ, 'H', 0x04, len)
++ return _IOC(_IOC_READ, 'U', 33, len)
+
+
+ def _HIDIOCGRAWNAME(fd):