Changeset 405

Timestamp:

02/19/07 00:02:47 (16 years ago)

Author:

pieterpalmers

Message:

- fix some small bugs in ieee1394service and configrom
- modify bounce device's discovery routine

Files:

• branches/streaming-rework/src/bounce/bounce_avdevice.cpp (modified) (6 diffs)
• branches/streaming-rework/src/bounce/bounce_avdevice.h (modified) (2 diffs)
• branches/streaming-rework/src/configrom.cpp (modified) (3 diffs)
• branches/streaming-rework/src/devicemanager.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/ieee1394service.cpp (modified) (3 diffs)

branches/streaming-rework/src/bounce/bounce_avdevice.cpp

@@ -44 +44 @@
-namespace Bounce {
-
+// to define the supported devices
+static VendorModelEntry supportedDeviceList[] =
+{
+    {0x0B0001, 0x0B0001, 0x0B0001, "FreeBoB", "Bounce"},
+};
+
-IMPL_DEBUG_MODULE( BounceDevice, BounceDevice, DEBUG_LEVEL_VERBOSE );
-
@@ -56 +62 @@
-    , m_verboseLevel( verboseLevel )
-    , m_samplerate (44100)
+    , m_model( NULL )
-    , m_id(0)
-    , m_receiveProcessor ( 0 )
@@ -79 +86 @@
-}
-
-struct VendorModelEntry {
-    unsigned int vendor_id;
-    unsigned int model_id;
-};
-
-static VendorModelEntry supportedDeviceList[] =
-{
-//     {0x0000, 0x000000},
-};
-
-bool
-BounceDevice::probe( ConfigRom& configRom )
-{
-
+// 
-    unsigned int modelId = configRom.getModelId();
+    unsigned int unitSpecifierId = configRom.getUnitSpecifierId();
-
-    for ( unsigned int i = 0;
@@ -99 +97 @@
-          ++i )
-    {
-
-
+
+
+
+
-           )
-        {
@@ -117 +117 @@
-//      quadlet_t *resp;
-
+//     unsigned int vendorId = m_configRom->getNodeVendorId();
+    unsigned int modelId = m_configRom->getModelId();
+    unsigned int unitSpecifierId = m_configRom->getUnitSpecifierId();
+
+    for ( unsigned int i = 0;
+          i < ( sizeof( supportedDeviceList )/sizeof( VendorModelEntry ) );
+          ++i )
+    {
+        if ( //( supportedDeviceList[i].vendor_id == vendorId )
+             ( supportedDeviceList[i].model_id == modelId ) 
+             && ( supportedDeviceList[i].unit_specifier_id == unitSpecifierId ) 
+           )
+        {
+            m_model = &(supportedDeviceList[i]);
+        }
+    }
+
+    if (m_model != NULL) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "found %s %s\n",
+                m_model->vendor_name, m_model->model_name);
+        return true;
+    }
+    
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Discovering...\n" );
-
@@ -171 +194 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "Vendor            :  %s\n", m_configRom->getVendorName().c_str());
-    debugOutput(DEBUG_LEVEL_NORMAL, "Model             :  %s\n", m_configRom->getModelName().c_str());
+    debugOutput(DEBUG_LEVEL_NORMAL, "Vendor Name       :  %s\n", m_model->vendor_name);
+    debugOutput(DEBUG_LEVEL_NORMAL, "Model Name        :  %s\n", m_model->model_name);
-    debugOutput(DEBUG_LEVEL_NORMAL, "Node              :  %d\n", m_nodeId);
-    debugOutput(DEBUG_LEVEL_NORMAL, "GUID              :  0x%016llX\n", m_configRom->getGuid());

branches/streaming-rework/src/bounce/bounce_avdevice.h

@@ -42 +42 @@
-namespace Bounce {
-
+// struct to define the supported devices
+struct VendorModelEntry {
+    unsigned int vendor_id;
+    unsigned int model_id;
+    unsigned int unit_specifier_id;
+    char *vendor_name;
+    char *model_name;
+};
+
-class BounceDevice : public IAvDevice {
-public:
@@ -82 +91 @@
-
-    unsigned int m_samplerate;
+    struct VendorModelEntry* m_model;
-    unsigned int m_id;
-

branches/streaming-rework/src/configrom.cpp

@@ -128 +128 @@
-                                 &csr_info );
-    if (!m_csr || csr1212_parse_csr( m_csr ) != CSR1212_SUCCESS) {
-
+\n
-        if (m_csr) {
-            csr1212_destroy_csr(m_csr);
@@ -215 +215 @@
-{
-    struct config_csr_info* csr_info = (struct config_csr_info*) private_data;
-
+
-    if ( !csr_info->service->read( csr_info->nodeId,
-                                   addr,
-
+(size_t)
-                                   ( quadlet_t* )buffer) )
-    {
@@ -486 +486 @@
-    printf( "\tNode Vendor ID:\t\t0x%06x\n",  getNodeVendorId() );
-    printf( "\tModel Id:\t\t0x%08x\n",        getModelId() );
+    printf( "\tUnit Specifier ID:\t0x%06x\n",  getUnitSpecifierId() );
+    printf( "\tUnit version:\t\t0x%08x\n",        getUnitVersion() );
-    printf( "\tISO resource manager:\t%d\n",  isIsoResourseManager() );
-    printf( "\tCycle master capable:\t%d\n",  isSupportsIsoOperations() );
-    printf( "\tBus manager capable:\t%d\n",   isBusManagerCapable() );
-n
+
-    printf( "\tMax rec:\t\t%d (max asy payload: %d bytes)\n",
-            getMaxRec(), getAsyMaxPayload() );

branches/streaming-rework/src/devicemanager.cpp

@@ -372 +372 @@
-        }
-
-        free(result);
-    }
-

branches/streaming-rework/src/libfreebobavc/ieee1394service.cpp

@@ -33 +33 @@
-
-Ieee1394Service::Ieee1394Service()
-
+, m_resetHandle( 0 )
-    , m_port( -1 )
-    , m_threadRunning( false )
@@ -109 +109 @@
-        #ifdef DEBUG
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-X, length = %d
+llX, length = %u
-            nodeId, addr, length);
-        printBuffer( length, buffer );
@@ -117 +117 @@
-    } else {
-        #ifdef DEBUG
-X, length = %d
+llX, length = %u
-              nodeId, addr, length);
-        #endif