Changeset 674

Timestamp:

11/01/07 09:04:57 (16 years ago)

Author:

ppalmers

Message:

Introduce bus reset handling

Files:

• trunk/libffado/src/devicemanager.cpp (modified) (1 diff)
• trunk/libffado/src/devicemanager.h (modified) (1 diff)
• trunk/libffado/src/ffadodevice.cpp (modified) (1 diff)
• trunk/libffado/src/ffadodevice.h (modified) (1 diff)

trunk/libffado/src/devicemanager.cpp

@@ -165 +165 @@
-    }
-
+    // add the bus reset handler
+    m_busreset_functor = new MemberFunctor0< DeviceManager*,
+                void (DeviceManager::*)() >
+                ( this, &DeviceManager::busresetHandler, false );
+    m_1394Service->addBusResetHandler( m_busreset_functor );
+
-    setVerboseLevel(getDebugLevel());
-    return true;
+}
+
+void
+DeviceManager::busresetHandler()
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Bus reset...\n" );
+
+    // propagate the bus reset to all avDevices
+    for ( FFADODeviceVectorIterator it = m_avDevices.begin();
+          it != m_avDevices.end();
+          ++it )
+    {
+        (*it)->handleBusReset();
+    }
-}
-

trunk/libffado/src/devicemanager.h

@@ -85 +85 @@
-    FFADODevice* getSlaveDriver( std::auto_ptr<ConfigRom>( configRom ) );
-
+    void busresetHandler();
+
-protected:
-
+  
-    FFADODeviceVector  m_avDevices;
-
-
+
-
-// debug stuff

trunk/libffado/src/ffadodevice.cpp

@@ -125 +125 @@
-
-void
+FFADODevice::handleBusReset()
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Handle bus reset...\n");
+    
+    // update the config rom node id
+    sleep(1);
+    getConfigRom().setVerboseLevel(getDebugLevel());
+    getConfigRom().updatedNodeId();
+
+}
+
+void
-FFADODevice::setVerboseLevel(int l)
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Setting verbose level to %d...\n", l );
-    setDebugLevel(l);
+    getConfigRom().setVerboseLevel(l);
-}
-

trunk/libffado/src/ffadodevice.h

@@ -402 +402 @@
-    int getNodeId();
-
+    /**
+     * @brief handle a bus reset
+     *
+     * Called whenever a bus reset is detected. Handle everything
+     * that has to be done to cope with a bus reset.
+     *
+     */
+    void handleBusReset();
+
-    // the Control::Container functions
-    virtual std::string getName();