Changeset 1545

Timestamp:

04/26/09 08:21:42 (14 years ago)

Author:

ppalmers

Message:

fixes #201

Files:

• branches/libffado-2.0/src/devicemanager.cpp (modified) (1 diff)
• branches/libffado-2.0/src/DeviceStringParser.cpp (modified) (5 diffs)
• branches/libffado-2.0/src/DeviceStringParser.h (modified) (1 diff)

branches/libffado-2.0/src/devicemanager.cpp

@@ -644 +644 @@
-        // a device id always corresponds to the same device
-        sort(m_avDevices.begin(), m_avDevices.end(), FFADODevice::compareGUID);
+
+        // first map the devices to a position using the device spec strings
+        std::map<fb_octlet_t, int> positionMap;
+        for ( FFADODeviceVectorIterator it = m_avDevices.begin();
+            it != m_avDevices.end();
+            ++it )
+        {
+            int pos = m_deviceStringParser->matchPosition((*it)->getConfigRom());
+            fb_octlet_t guid = (*it)->getConfigRom().getGuid();
+            positionMap[guid] = pos;
+            debugOutput( DEBUG_LEVEL_VERBOSE, "Mapping %s to position %d...\n", (*it)->getConfigRom().getGuidString().c_str(), pos );
+        }
+
+        // now run over all positions, and add the devices that belong to it
+        FFADODeviceVector sorted;
+        int nbPositions = m_deviceStringParser->countDeviceStrings();
-        int i=0;
+        for (i=0; i < nbPositions; i++) {
+            for ( FFADODeviceVectorIterator it = m_avDevices.begin();
+                it != m_avDevices.end();
+                ++it )
+            {
+                fb_octlet_t guid = (*it)->getConfigRom().getGuid();
+                if(positionMap[guid] == i) {
+                    sorted.push_back(*it);
+                }
+            }
+        }
+
+        // assign the new vector
+        assert(sorted.size() == m_avDevices.size());
+        m_avDevices = sorted;
+
+        // set device id's
+        i = 0;
-        for ( FFADODeviceVectorIterator it = m_avDevices.begin();
-            it != m_avDevices.end();

branches/libffado-2.0/src/DeviceStringParser.cpp

@@ -160 +160 @@
-DeviceStringParser::DeviceString::match(ConfigRom& configRom)
-{
-\n", &configRom
+ (%s)\n", &configRom, configRom.getGuidString().c_str()
-    bool match;
-    switch(m_Type) {
@@ -172 +172 @@
-                match &= ((configRom.getNodeId() & 0x3F) == m_node);
-            }
+            if(match) {
+                debugOutput(DEBUG_LEVEL_VERBOSE, "(eBusNode) device matches device string %s\n", m_String.c_str());
+            }
-            return match;
-        case eGUID:
-            //GUID should not be 0
-
+
+
+
+
+
-        case eInvalid:
-        default:
-Output(DEBUG_LEVEL_VERBOSE, "no match %p\n", &configRom
+Error("invalid DeviceString type (%d)\n", m_Type
-            return false;
-    }
@@ -282 +289 @@
-DeviceStringParser::match(ConfigRom& c)
-{
+    return matchPosition(c) != -1;
+}
+
+int
+DeviceStringParser::matchPosition(ConfigRom& c)
+{
+    int pos = 0;
-    for ( DeviceStringVectorIterator it = m_DeviceStrings.begin();
-      it != m_DeviceStrings.end();
@@ -287 +301 @@
-    {
-        if((*it)->match(c)) {
-
-
-
-
-
+
+
+
+
+
+
+
-bool
-DeviceStringParser::addDeviceString(DeviceString *o)
@@ -370 +386 @@
-}
-
-
-void
-DeviceStringParser::show()

branches/libffado-2.0/src/DeviceStringParser.h

@@ -74 +74 @@
-
-    bool match(ConfigRom &);
+    int matchPosition(ConfigRom& c);
-
-    bool parseString(std::string s);