rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity

OP-328: Use removal callback when device unplugged and also added mutexs to

Browse Source 
protect the list of devices from race conditions.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3089 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2011-03-28 15:39:35 +00:00 committed by peabody124
parent 852e6072c3
commit cdb521ac4a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/openpilotgcs/src/plugins/rawhid/usbmonitor_mac.cpp
View File

@ -99,11 +99,10 @@ USBMonitor* USBMonitor::m_instance = 0;
void USBMonitor::removeDevice(IOHIDDeviceRef dev) { void USBMonitor::removeDevice(IOHIDDeviceRef dev) {
//QMutexLocker locker(listMutex);
for( int i = 0; i < knowndevices.length(); i++) { for( int i = 0; i < knowndevices.length(); i++) {
USBPortInfo port = knowndevices.at(i); USBPortInfo port = knowndevices.at(i);
if(port.dev_handle == dev) { if(port.dev_handle == dev) {
qDebug() << "Found device to remove"; QMutexLocker locker(listMutex);
knowndevices.removeAt(i); knowndevices.removeAt(i);
emit deviceRemoved(port); emit deviceRemoved(port);
return; return;
@ -118,11 +117,12 @@ void USBMonitor::removeDevice(IOHIDDeviceRef dev) {
*/ */
void USBMonitor::detach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDeviceRef dev) void USBMonitor::detach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDeviceRef dev)
{ {
//instance()->removeDevice(dev);
instance()->removeDevice(dev);
} }
void USBMonitor::addDevice(USBPortInfo info) { void USBMonitor::addDevice(USBPortInfo info) {
//QMutexLocker locker(listMutex); QMutexLocker locker(listMutex);
knowndevices.append(info); knowndevices.append(info);
emit deviceDiscovered(info); emit deviceDiscovered(info);
} }
@ -146,9 +146,9 @@ void USBMonitor::attach_callback(void *context, IOReturn r, void *hid_mgr, IOHID
// TOOD: Eventually want to take array of usages if devices start needing that // TOOD: Eventually want to take array of usages if devices start needing that
got_properties &= HID_GetIntProperty(dev, CFSTR( kIOHIDPrimaryUsageKey ), &deviceInfo.Usage); got_properties &= HID_GetIntProperty(dev, CFSTR( kIOHIDPrimaryUsageKey ), &deviceInfo.Usage);
got_properties &= HID_GetIntProperty(dev, CFSTR( kIOHIDPrimaryUsagePageKey ), &deviceInfo.UsagePage); got_properties &= HID_GetIntProperty(dev, CFSTR( kIOHIDPrimaryUsagePageKey ), &deviceInfo.UsagePage);
qDebug() << "New device HAH";
// Currently only enumerating objects that have the complete list of properties
if(got_properties) { if(got_properties) {
qDebug() << "New device";
instance()->addDevice(deviceInfo); instance()->addDevice(deviceInfo);
} }
} }
@ -159,7 +159,6 @@ Returns a list of all currently available devices
QList<USBPortInfo> USBMonitor::availableDevices() QList<USBPortInfo> USBMonitor::availableDevices()
{ {
//QMutexLocker locker(listMutex); //QMutexLocker locker(listMutex);
qDebug() << "Queried available devices. Count: " << knowndevices.count();
return knowndevices; return knowndevices;
} }
@ -185,7 +184,6 @@ QList<USBPortInfo> USBMonitor::availableDevices(int vid, int pid, int bcdDeviceM
thePortsWeWant.append(port); thePortsWeWant.append(port);
} }
qDebug() << "Queried filtered available devices. Count: " << thePortsWeWant.count();
return thePortsWeWant; return thePortsWeWant;
} }