summaryrefslogtreecommitdiff
path: root/spectro/hidio.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-01 15:43:52 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-01 15:43:52 +0200
commitc07d0c2d2f6f7b0eb6e92cc6204bf05037957e82 (patch)
tree41791cbe367cf023b98043fee56f9346b2592b49 /spectro/hidio.h
parentd7f89e6fe63b8697fab5a901cfce457b375638b3 (diff)
Imported Upstream version 1.6.3upstream/1.6.3
Diffstat (limited to 'spectro/hidio.h')
-rw-r--r--spectro/hidio.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/spectro/hidio.h b/spectro/hidio.h
index b25fe03..a7e94c8 100644
--- a/spectro/hidio.h
+++ b/spectro/hidio.h
@@ -60,6 +60,12 @@ struct hid_idevice {
OVERLAPPED ols; /* Overlapped structure for write/read */
#endif
#if defined(__APPLE__)
+# if defined(USE_NEW_OSX_CODE) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+ int lid; /* Location ID */
+ IOHIDDeviceRef ioob; /* Object to open */
+ /* Stuff setup when device is open: */
+ CFRunLoopRef rlr;
+#else
int lid; /* Location ID */
io_object_t ioob; /* Object to open */
/* Stuff setup when device is open: */
@@ -68,7 +74,10 @@ struct hid_idevice {
CFRunLoopSourceRef evsrc;
CFRunLoopRef rlr;
IOReturn result;
+# define HID_RBUF_SIZE 1024
+ unsigned char rbuf[HID_RBUF_SIZE]; /* Buffer for read callback */
int bread; /* Bytes read by callback */
+#endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
#endif
#if defined (UNIX) && !defined(__APPLE__)
int temp; /* Shut the compiler up */