From c07d0c2d2f6f7b0eb6e92cc6204bf05037957e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Sep 2014 15:43:52 +0200 Subject: Imported Upstream version 1.6.3 --- spectro/hidio.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'spectro/hidio.h') 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 */ -- cgit v1.2.3