diff options
Diffstat (limited to 'sys/dev/hid/hidraw.h')
| -rw-r--r-- | sys/dev/hid/hidraw.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sys/dev/hid/hidraw.h b/sys/dev/hid/hidraw.h index 4eaf8650a332..b1b037ab8c1b 100644 --- a/sys/dev/hid/hidraw.h +++ b/sys/dev/hid/hidraw.h @@ -35,23 +35,9 @@ #define HIDRAW_BUFFER_SIZE 64 /* number of input reports buffered */ #define HID_MAX_DESCRIPTOR_SIZE 4096 /* artificial limit taken from Linux */ -/* - * Align IOCTL structures to hide differences when running 32-bit - * programs under 64-bit kernels: - */ -#ifdef COMPAT_32BIT -#define HIDRAW_IOCTL_STRUCT_ALIGN(n) __aligned(n) -#else -#define HIDRAW_IOCTL_STRUCT_ALIGN(n) -#endif - /* Compatible with usb_gen_descriptor structure */ struct hidraw_gen_descriptor { -#ifdef COMPAT_32BIT - uint64_t hgd_data; -#else void *hgd_data; -#endif uint16_t hgd_lang_id; uint16_t hgd_maxlen; uint16_t hgd_actlen; @@ -63,18 +49,18 @@ struct hidraw_gen_descriptor { uint8_t hgd_endpt_index; uint8_t hgd_report_type; uint8_t reserved[8]; -} HIDRAW_IOCTL_STRUCT_ALIGN(8); +}; struct hidraw_report_descriptor { uint32_t size; uint8_t value[HID_MAX_DESCRIPTOR_SIZE]; -} HIDRAW_IOCTL_STRUCT_ALIGN(4); +}; struct hidraw_devinfo { uint32_t bustype; int16_t vendor; int16_t product; -} HIDRAW_IOCTL_STRUCT_ALIGN(4); +}; /* FreeBSD uhid(4)-compatible ioctl interface */ #define HIDRAW_GET_REPORT_DESC _IOWR('U', 21, struct hidraw_gen_descriptor) |