Changeset 1366 for branches

Timestamp:

10/21/08 10:45:01 (12 years ago)

Author:

ppalmers

Message:

sometimes a busreset is issued to indicate a config change of a device. This requires a device to be rediscovered.

Files:

• branches/libffado-2.0/src/bebob/bebob_avdevice.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/bebob/bebob_avdevice.h (modified) (2 diffs)
• branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.h (modified) (2 diffs)
• branches/libffado-2.0/src/devicemanager.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/ffadodevice.cpp (modified) (1 diff)
• branches/libffado-2.0/src/ffadodevice.h (modified) (1 diff)

branches/libffado-2.0/src/bebob/bebob_avdevice.cpp

@@ -62 +62 @@
-AvDevice::AvDevice( DeviceManager& d, std::auto_ptr< ConfigRom >( configRom ) )
-    : GenericAVC::AvDevice( d, configRom )
+    , m_last_discovery_config_id ( 0xFFFFFFFFFFFFFFFFLLU )
-    , m_Mixer ( 0 )
-{
@@ -208 +209 @@
-        debugWarning("Could not build mixer\n");
-    }
+
+    // keep track of the config id of this discovery
+    m_last_discovery_config_id = getConfigurationId();
+
-    return true;
-}
@@ -656 +661 @@
-}
-
+bool
+AvDevice::needsRediscovery()
+{
+    // require rediscovery if the config id differs from the one saved
+    // in the previous discovery
+    return getConfigurationId() != m_last_discovery_config_id;
+}
+
-uint64_t
-AvDevice::getConfigurationId()

branches/libffado-2.0/src/bebob/bebob_avdevice.h

@@ -112 +112 @@
-
-    virtual uint64_t getConfigurationId();
+    virtual bool needsRediscovery();
-
-    std::string getCachePath();
@@ -121 +122 @@
-
-    std::vector<int> m_supported_frequencies;
+    uint64_t         m_last_discovery_config_id;
+
-protected:
-    Mixer*             m_Mixer;

branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp

@@ -524 +524 @@
-}
-
+uint64_t
+SaffireProDevice::getConfigurationId()
+{
+    // have the generic mechanism create a unique configuration id.
+    uint64_t id = BeBoB::AvDevice::getConfigurationId();
+
+    // there are some parts that can be enabled/disabled and
+    // that have influence on the AV/C model and channel config
+    // so add them to the config id
+    #if 0
+    // FIXME: doesn't seem to be working, but the channel count
+    //        makes that it's not that important
+    if(getEnableDigitalChannel(eDC_SPDIF)) {
+        id |= 1ULL << 40;
+    }
+    if(isPro26()) {
+        if(getEnableDigitalChannel(eDC_ADAT1)) {
+            id |= 1ULL << 41;
+        }
+        if(getEnableDigitalChannel(eDC_ADAT2)) {
+            id |= 1ULL << 42;
+        }
+    }
+    #endif
+    return id;
+}
+
-bool
-SaffireProDevice::setNickname( std::string name)
@@ -863 +890 @@
-                     "PLL lock range: %d\n", retval );
-    return retval;
+}
+
+bool
+SaffireProDevice::isMidiEnabled() {
+    uint32_t ready;
+    if ( !getSpecificValue(FR_SAFFIREPRO_CMD_ID_AVC_MODEL_MIDI, &ready ) ) {
+        debugError( "getSpecificValue failed\n" );
+        return false;
+    }
+
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "isMidiEnabled: %d\n", ready != 0 );
+    return ready != 0;
-}
-

branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.h

@@ -373 +373 @@
-    void flashLed();
-    bool isAudioOn();
+    bool isMidiEnabled();
-    bool isExtClockLocked();
-    uint32_t getCount32();
@@ -409 +410 @@
-protected:
-    virtual uint16_t getConfigurationIdSyncMode();
+    virtual uint64_t getConfigurationId();
-
-private:

branches/libffado-2.0/src/devicemanager.cpp

@@ -449 +449 @@
-
-    if (!slaveMode) {
+        // for the devices that are still in the list check if they require re-discovery
+        FFADODeviceVector failed_to_rediscover;
+        for ( FFADODeviceVectorIterator it_dev = m_avDevices.begin();
+            it_dev != m_avDevices.end();
+            ++it_dev )
+        {
+            FFADODevice* avDevice = *it_dev;
+            if(avDevice->needsRediscovery()) {
+                debugOutput( DEBUG_LEVEL_NORMAL,
+                             "Device with GUID %s requires rediscovery (state changed)...\n",
+                             avDevice->getConfigRom().getGuidString().c_str());
+
+                bool isFromCache = false;
+                if ( useCache && avDevice->loadFromCache() ) {
+                    debugOutput( DEBUG_LEVEL_VERBOSE, "could load from cache\n" );
+                    isFromCache = true;
+                    // restore the debug level for everything that was loaded
+                    avDevice->setVerboseLevel( getDebugLevel() );
+                } else if ( avDevice->discover() ) {
+                    debugOutput( DEBUG_LEVEL_VERBOSE, "discovery successful\n" );
+                } else {
+                    debugError( "could not discover device\n" );
+                    failed_to_rediscover.push_back(avDevice);
+                    continue;
+                }
+                if ( !isFromCache && !avDevice->saveCache() ) {
+                    debugOutput( DEBUG_LEVEL_VERBOSE, "No cached version of AVC model created\n" );
+                }
+            } else {
+                debugOutput( DEBUG_LEVEL_NORMAL,
+                             "Device with GUID %s does not require rediscovery...\n",
+                             avDevice->getConfigRom().getGuidString().c_str());
+            }
+        }
+        // remove devices that failed to rediscover
+        // FIXME: surely there has to be a better way to do this
+        FFADODeviceVector to_keep;
+        for ( FFADODeviceVectorIterator it = m_avDevices.begin();
+            it != m_avDevices.end();
+            ++it )
+        {
+            bool keep_this_device = true;
+            for ( FFADODeviceVectorIterator it2 = failed_to_rediscover.begin();
+                it2 != failed_to_rediscover.end();
+                ++it2 )
+            {
+                if(*it == *it2) {
+                    debugOutput( DEBUG_LEVEL_NORMAL,
+                                "Removing device with GUID %s due to failed discovery...\n",
+                                (*it)->getConfigRom().getGuidString().c_str());
+                    keep_this_device = false;
+                    break;
+                }
+            }
+            if(keep_this_device) {
+                to_keep.push_back(*it);
+            }
+        }
+        for ( FFADODeviceVectorIterator it2 = failed_to_rediscover.begin();
+            it2 != failed_to_rediscover.end();
+            ++it2 )
+        {
+            if (!deleteElement(*it2)) {
+                debugWarning("failed to remove AvDevice from Control::Container\n");
+            }
+            delete *it2;
+        }
+        m_avDevices = to_keep;
+
+        // pick up new devices
-        for ( Ieee1394ServiceVectorIterator it = m_1394Services.begin();
-            it != m_1394Services.end();
@@ -480 +550 @@
-
-                bool already_in_vector = false;
-
-
-
+_dev
+_dev
+_dev
-                {
-
+_dev
-                        already_in_vector = true;
-                        break;

branches/libffado-2.0/src/ffadodevice.cpp

@@ -142 +142 @@
-{
-    return false;
+}
+
+bool
+FFADODevice::needsRediscovery()
+{
+    // require rediscovery by default
+    return true;
-}
-

branches/libffado-2.0/src/ffadodevice.h

@@ -103 +103 @@
-     */
-    virtual bool saveCache();
+
+    /**
+     * @brief Called by DeviceManager to check whether a device requires rediscovery
+     *
+     * This function is called to figure out if the device has to be rediscovered
+     * e.g. after a bus reset where the device internal structure changed.
+     *
+     * @returns true if device requires rediscovery
+     */
+    virtual bool needsRediscovery();
-
-    /**