Line 0
Link Here
|
|
|
1 |
Fix ioctl(2) definitions to match <sys/ioccom.h> and <dev/hid/hidraw.h> |
2 |
|
3 |
--- hidtools/hidraw.py.orig 2019-03-29 01:29:29 UTC |
4 |
+++ hidtools/hidraw.py |
5 |
@@ -36,13 +36,14 @@ def _ioctl(fd, EVIOC, code, return_type, buf=None): |
6 |
|
7 |
|
8 |
# extracted from <asm-generic/ioctl.h> |
9 |
-_IOC_WRITE = 1 |
10 |
+_IOC_VOID = 1 |
11 |
_IOC_READ = 2 |
12 |
+_IOC_WRITE = 4 |
13 |
|
14 |
_IOC_NRBITS = 8 |
15 |
_IOC_TYPEBITS = 8 |
16 |
-_IOC_SIZEBITS = 14 |
17 |
-_IOC_DIRBITS = 2 |
18 |
+_IOC_SIZEBITS = 13 |
19 |
+_IOC_DIRBITS = 3 |
20 |
|
21 |
_IOC_NRSHIFT = 0 |
22 |
_IOC_TYPESHIFT = _IOC_NRSHIFT + _IOC_NRBITS |
23 |
@@ -74,7 +75,7 @@ def _IOW(type, nr, size): |
24 |
|
25 |
# define HIDIOCGRDESCSIZE _IOR('H', 0x01, int) |
26 |
def _IOC_HIDIOCGRDESCSIZE(none, len): |
27 |
- return _IOR('H', 0x01, len) |
28 |
+ return _IOR('U', 30, len) |
29 |
|
30 |
|
31 |
def _HIDIOCGRDESCSIZE(fd): |
32 |
@@ -85,7 +86,7 @@ def _HIDIOCGRDESCSIZE(fd): |
33 |
|
34 |
# define HIDIOCGRDESC _IOR('H', 0x02, struct hidraw_report_descriptor) |
35 |
def _IOC_HIDIOCGRDESC(none, len): |
36 |
- return _IOR('H', 0x02, len) |
37 |
+ return _IOC(_IOC_VOID, 'U', 31, 0) |
38 |
|
39 |
|
40 |
def _HIDIOCGRDESC(fd, size): |
41 |
@@ -102,7 +103,7 @@ def _HIDIOCGRDESC(fd, size): |
42 |
|
43 |
# define HIDIOCGRAWINFO _IOR('H', 0x03, struct hidraw_devinfo) |
44 |
def _IOC_HIDIOCGRAWINFO(none, len): |
45 |
- return _IOR('H', 0x03, len) |
46 |
+ return _IOR('U', 32, len) |
47 |
|
48 |
|
49 |
def _HIDIOCGRAWINFO(fd): |
50 |
@@ -113,7 +114,7 @@ def _HIDIOCGRAWINFO(fd): |
51 |
|
52 |
# define HIDIOCGRAWNAME(len) _IOC(_IOC_READ, 'H', 0x04, len) |
53 |
def _IOC_HIDIOCGRAWNAME(none, len): |
54 |
- return _IOC(_IOC_READ, 'H', 0x04, len) |
55 |
+ return _IOC(_IOC_READ, 'U', 33, len) |
56 |
|
57 |
|
58 |
def _HIDIOCGRAWNAME(fd): |