Merge tag 'upstream/2.1.8.20120507'

Upstream version 2.1.8.20120507

1 files changed, 7 insertions, 2 deletions

diff --git a/cusb.h b/cusb.h
index 3c24a11..eda2b16 100644
--- a/cusb.h
+++ b/cusb.h
@@ -13,13 +13,18 @@ void CUSBCleanup();
 int CUSBSetupNotifications();
 int CUSBRefreshLabelString(CPhidgetHandle phid);
 #if defined(_LINUX) && !defined(_ANDROID)
-int CUSBGetDeviceCapabilities(CPhidgetHandle phid, struct usb_device *dev,
-    struct usb_dev_handle *udev);
+void CUSBUninit();
 #else
 int CUSBGetDeviceCapabilities(CPhidgetHandle phid, HANDLE DeviceHandle);
 #endif
 #endif
 
+#ifdef _IPHONE
+int CPhidgetManager_setupNotifications(CFRunLoopRef runloop);
+int CPhidgetManager_teardownNotifications();
+int reenumerateDevice(CPhidgetHandle phid);
+#endif
+
 PHIDGET21_API int CCONV CUSBReadPacket(CPhidgetHandle phidA, unsigned char *buffer);
 PHIDGET21_API int CCONV CUSBSendPacket(CPhidgetHandle phidA, unsigned char *buffer);