diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-10-07 09:22:09 +1100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-10-07 09:22:09 +1100 |
| commit | a75c43830ef2f1b9ba0e265baf614cdfea617beb (patch) | |
| tree | e0706588e13cba7535e7e65d097641987e2d55a3 /src/evdev.h | |
| parent | d9aadfd5f05abd9a65977d9d36cbe159d6e05386 (diff) | |
| parent | 164c62a97591d4c9b649460e7442977ea82ac02b (diff) | |
Merge branch 'libevdev'
Diffstat (limited to 'src/evdev.h')
| -rw-r--r-- | src/evdev.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/evdev.h b/src/evdev.h index 4742b43..563d108 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -47,6 +47,8 @@ #include <mtdev.h> #endif +#include <libevdev/libevdev.h> + #ifndef EV_CNT /* linux 2.6.23 kernels and earlier lack _CNT defines */ #define EV_CNT (EV_MAX+1) #endif @@ -150,8 +152,7 @@ typedef struct { } EventQueueRec, *EventQueuePtr; typedef struct { - unsigned short id_vendor; - unsigned short id_product; + struct libevdev *dev; char *device; int grabDevice; /* grab the event device? */ @@ -234,13 +235,6 @@ typedef struct { int reopen_left; /* number of attempts left to re-open the device */ OsTimerPtr reopen_timer; - /* Cached info from device. */ - unsigned long bitmask[NLONGS(EV_CNT)]; - unsigned long key_bitmask[NLONGS(KEY_CNT)]; - unsigned long rel_bitmask[NLONGS(REL_CNT)]; - unsigned long abs_bitmask[NLONGS(ABS_CNT)]; - struct input_absinfo absinfo[ABS_CNT]; - /* minor/major number */ dev_t min_maj; |