summaryrefslogtreecommitdiffstats
path: root/lib/libusbhid/usbvar.h
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2010-10-16 11:20:53 +0000
committerhselasky <hselasky@FreeBSD.org>2010-10-16 11:20:53 +0000
commit5b550686a5110cf18c816f96d37d170d8a28e4dc (patch)
tree1ea0271ac1ee85fd4578cf84cc88d1e6186f7224 /lib/libusbhid/usbvar.h
parent21647a48345019a086209231c331adba0d1be8be (diff)
downloadFreeBSD-src-5b550686a5110cf18c816f96d37d170d8a28e4dc.zip
FreeBSD-src-5b550686a5110cf18c816f96d37d170d8a28e4dc.tar.gz
- Add support for libusbhid in 32-bit compatibility mode.
- Add missing check for ugd_actlen being too small. - Add missing inclusion guard to usbvar.h header file. - This also fixes buildworld breakage since r213852.
Diffstat (limited to 'lib/libusbhid/usbvar.h')
-rw-r--r--lib/libusbhid/usbvar.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h
index 9605106..2722a37 100644
--- a/lib/libusbhid/usbvar.h
+++ b/lib/libusbhid/usbvar.h
@@ -29,6 +29,9 @@
*
*/
+#ifndef _USBVAR_H_
+#define _USBVAR_H_
+
struct report_desc {
uint32_t size;
uint8_t data[1];
@@ -41,3 +44,11 @@ int hid_set_immed_compat7(int fd, int enable);
int hid_get_report_id_compat7(int fd);
report_desc_t hid_get_report_desc_compat7(int fd);
#endif
+
+#ifdef COMPAT_32BIT
+#define hid_pass_ptr(ptr) ((uint64_t)(uintptr_t)(ptr))
+#else
+#define hid_pass_ptr(ptr) (ptr)
+#endif
+
+#endif /* _USBVAR_H_ */
OpenPOWER on IntegriCloud