Changeset 898

Timestamp:

03/02/08 12:04:52 (13 years ago)

Author:

wagi

Message:

add non-debug print function to ConfigRom?

Files:

• trunk/libffado/src/devicemanager.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/configrom.cpp (modified) (2 diffs)
• trunk/libffado/src/libieee1394/configrom.h (modified) (1 diff)

trunk/libffado/src/devicemanager.cpp

@@ -285 +285 @@
-
-                if( getDebugLevel() >= DEBUG_LEVEL_VERBOSE) {
-
+Debug
-                }
-

trunk/libffado/src/libieee1394/configrom.cpp

@@ -519 +519 @@
-
-void
-
+Debug
-{
-    using namespace std;
@@ -537 +537 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "\tMax rec:\t\t%d (max asy payload: %d bytes)\n",
-            getMaxRec(), getAsyMaxPayload() );
+}
+
+void
+ConfigRom::printConfigRom() const
+{
+    using namespace std;
+    printf("Config ROM\n" );
+    printf("\tCurrent Node Id:\t%d\n",       getNodeId() );
+    printf("\tGUID:\t\t\t0x%016llX\n",       getGuid());
+    printf("\tVendor Name:\t\t%s\n",         getVendorName().c_str() );
+    printf("\tModel Name:\t\t%s\n",          getModelName().c_str() );
+    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() );
+    printf("\tCycle clock accuracy:\t%d\n", getCycleClockAccurancy() );
+    printf("\tMax rec:\t\t%d (max asy payload: %d bytes)\n", getMaxRec(), getAsyMaxPayload() );
-}
-

trunk/libffado/src/libieee1394/configrom.h

@@ -105 +105 @@
-                   Ieee1394Service& ieee1394Service );
-
+    void printConfigRomDebug() const;
-    void printConfigRom() const;
-    void setVerboseLevel(int level) {