Changeset 589

Timestamp:

08/29/07 08:26:18 (16 years ago)

Author:

ppalmers

Message:

small discovery fix

Files:

• trunk/libffado/src/fireworks/fireworks_device.cpp (modified) (1 diff)
• trunk/libffado/src/fireworks/fireworks_device.h (modified) (1 diff)
• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (2 diffs)

trunk/libffado/src/fireworks/fireworks_device.cpp

@@ -79 +79 @@
-}
-
+bool
+Device::discover()
+{
+    unsigned int vendorId = m_pConfigRom->getNodeVendorId();
+    unsigned int modelId = m_pConfigRom->getModelId();
+
+    for ( unsigned int i = 0;
+          i < ( sizeof( supportedDeviceList )/sizeof( GenericAVC::VendorModelEntry ) );
+          ++i )
+    {
+        if ( ( supportedDeviceList[i].vendor_id == vendorId )
+             && ( supportedDeviceList[i].model_id == modelId )
+           )
+        {
+            m_model = &(supportedDeviceList[i]);
+        }
+    }
+
+    if (m_model == NULL) {
+        return false;
+    }
+    debugOutput( DEBUG_LEVEL_VERBOSE, "found %s %s\n",
+            m_model->vendor_name, m_model->model_name);
+
+    if ( !GenericAVC::AvDevice::discover() ) {
+        debugError( "Could not discover GenericAVC::AvDevice\n" );
+        return false;
+    }
+
+    return true;
+}
+
-FFADODevice *
-Device::createDevice( Ieee1394Service& ieee1394Service,

trunk/libffado/src/fireworks/fireworks_device.h

@@ -44 +44 @@
-    static FFADODevice * createDevice( Ieee1394Service& ieee1394Service,
-                                        std::auto_ptr<ConfigRom>( configRom ));
+    virtual bool discover();
-
-    virtual void showDevice();

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -48 +48 @@
-namespace GenericAVC {
-
-NORMAL
+VERBOSE
-
-// to define the supported devices
@@ -103 +103 @@
-AvDevice::discover()
-{
-    unsigned int vendorId = m_pConfigRom->getNodeVendorId();
-    unsigned int modelId = m_pConfigRom->getModelId();
-
-    for ( unsigned int i = 0;
-          i < ( sizeof( supportedDeviceList )/sizeof( VendorModelEntry ) );
-          ++i )
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
-             && ( supportedDeviceList[i].model_id == modelId )
-           )
-        {
-            m_model = &(supportedDeviceList[i]);
-        }
-    }
-
-    if (m_model == NULL) {
-        return false;
-    }
-    debugOutput( DEBUG_LEVEL_VERBOSE, "found %s %s\n",
-            m_model->vendor_name, m_model->model_name);
-
-    if ( !Unit::discover() ) {
-        debugError( "Could not discover unit\n" );