From 8bb6a2600fa4d2fe55bfd271c90362cf4b59b7bd Mon Sep 17 00:00:00 2001 From: James Cotton Date: Sun, 9 Sep 2012 11:40:14 -0500 Subject: [PATCH] GCS Serial: Was double detecting USBCDC devices. --- .../src/qextserialenumerator_osx.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ground/openpilotgcs/src/libs/qextserialport/src/qextserialenumerator_osx.cpp b/ground/openpilotgcs/src/libs/qextserialport/src/qextserialenumerator_osx.cpp index f8db6fbc6..9cf05e69c 100644 --- a/ground/openpilotgcs/src/libs/qextserialport/src/qextserialenumerator_osx.cpp +++ b/ground/openpilotgcs/src/libs/qextserialport/src/qextserialenumerator_osx.cpp @@ -22,8 +22,7 @@ QextSerialEnumerator::~QextSerialEnumerator( ) // static QList QextSerialEnumerator::getPorts() -{ - QList infoList; +{ QList infoList; io_iterator_t serialPortIterator = 0; kern_return_t kernResult = KERN_FAILURE; CFMutableDictionaryRef matchingDictionary; @@ -44,18 +43,6 @@ QList QextSerialEnumerator::getPorts() IOObjectRelease(serialPortIterator); serialPortIterator = 0; - if( !(matchingDictionary = IOServiceNameMatching("AppleUSBCDC")) ) { - qWarning("IOServiceNameMatching returned a NULL dictionary."); - return infoList; - } - - if( IOServiceGetMatchingServices(kIOMasterPortDefault, matchingDictionary, &serialPortIterator) != KERN_SUCCESS ) { - qCritical() << "IOServiceGetMatchingServices failed, returned" << kernResult; - return infoList; - } - iterateServicesOSX(serialPortIterator, infoList); - IOObjectRelease(serialPortIterator); - return infoList; }