GitHub-Mirror/open-zwave
2
0
Fork 0
mirror of https://github.com/Fishwaldo/open-zwave.git synced 2025-07-07 21:49:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add promiscuous message handling but left commented out.

Browse source 
Added tracking and returning driver specific message count and error data. see Manager::GetDriverStatistics
Random formatting changes for consistency.
Class SensorMultilevel will use multiple indexes for multiple sensors.
Node::GetNeighbors will only return valid data. Wait for proper query stage to complete.
On Driver shutdown stop threads then remove controller object.
Add extra comments to Driver::IsControllerCommand so we can better track commands.
Update Mac OS X example Main.cpp to be consistent with Linux version. Handle more notifications
and add a thread to wait for query completion.
Add statistics print out to both Linux and Mac OS X example apps.
Fix Mac hidapi to terminate its background CFRunLoop upon hid_close.
This commit is contained in:
glsatz 2011-08-16 20:25:14 +00:00
parent 01aa2c7853
commit 3a85a66464
12 changed files with 381 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cpp/hidapi/mac/hid.c
View file

@ -42,6 +42,7 @@ struct hid_device_ {
int uses_numbered_reports;
int disconnected;
CFStringRef run_loop_mode;
CFRunLoopRef runloopref;
uint8_t *input_report_buf;
struct input_report *input_reports;
pthread_mutex_t mutex;
@ -624,7 +625,8 @@ int HID_API_EXPORT hid_read(hid_device *dev, unsigned char *data, size_t length)
Need to get some from the OS. */
/* Move the device's run loop to this thread. */
IOHIDDeviceScheduleWithRunLoop(dev->device_handle, CFRunLoopGetCurrent(), dev->run_loop_mode);
dev->runloopref = CFRunLoopGetCurrent();
IOHIDDeviceScheduleWithRunLoop(dev->device_handle, dev->runloopref, dev->run_loop_mode);
if (dev->blocking) {
/* Run the Run Loop until it stops timing out. In other
@ -633,7 +635,7 @@ int HID_API_EXPORT hid_read(hid_device *dev, unsigned char *data, size_t length)
SInt32 code;
while (1) {
code = CFRunLoopRunInMode(dev->run_loop_mode, 1000, TRUE);
/* Return if the device has been disconnected */
if (code == kCFRunLoopRunFinished) {
dev->disconnected = 1;
@ -729,6 +731,8 @@ void HID_API_EXPORT hid_close(hid_device *dev)
if (!dev)
return;
CFRunLoopStop(dev->runloopref);
/* Close the OS handle to the device, but only if it's not
been unplugged. If it's been unplugged, then calling
IOHIDDeviceClose() will crash. */