Changeset 1993

Timestamp:

09/04/11 05:03:42 (12 years ago)

Author:

jwoithe

Message:

rme: clean up debug output by replacing "temporary" printf() calls with debugOutput(). Remove unnecessary register reads used during early stages of development.

Files:

• trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp (modified) (1 diff)
• trunk/libffado/src/rme/fireface_flash.cpp (modified) (1 diff)
• trunk/libffado/src/rme/fireface_hw.cpp (modified) (5 diffs)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (2 diffs)

trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp

@@ -305 +305 @@
-  quadlet_t *sample = (quadlet_t *)data + 6;
-if (dpy==0) {
-fprintf(stderr
+debugOutput(DEBUG_LEVEL_NORMAL
-}
-if (++dpy == 8000)

trunk/libffado/src/rme/fireface_flash.cpp

@@ -306 +306 @@
-signed int i;
-  i = readBlock(RME_FF_STATUS_REG0, buf, 4);
-
-
-
-
+
+
-}
-

trunk/libffado/src/rme/fireface_hw.cpp

@@ -63 +63 @@
-    signed int n_channels = (m_rme_model==RME_MODEL_FIREFACE400)?
-                   RME_FF400_MAX_CHANNELS:RME_FF800_MAX_CHANNELS;
-    signed int i;
-
-    // Initialises the device's settings structure to a known state and then
@@ -113 +112 @@
-        }
-
-readRegister(0xfffff0000410LL);
-
-        if (ret==0) {
-            signed freq = dev_config->software_freq;
@@ -123 +120 @@
-        }
-
-for (i=0;i<9;i++)
-  readRegister(0xfffff0000410LL);
-readRegister(0x801c0000LL);
-
-        if (m_rme_model == RME_MODEL_FIREFACE400) {
-            signed int i;
@@ -134 +127 @@
-        }
-
-for (i=0;i<7;i++) {
-  set_hardware_ampgain(FF400_AMPGAIN_MIC1,0);
-  set_hardware_ampgain(FF400_AMPGAIN_MIC2,0);
-}
-readRegister(0xfffff0000404LL);
-readRegister(0x801c0000LL);
-readRegister(0xfffff0000410LL);
-readRegister(0x801c0000LL);
-readRegister(0xfffff0000410LL);
-readRegister(0xfffff000040cLL);
-readRegister(0xfffff000040cLL);
-
-        // Matrix mixer settings
-        for (dest=0; dest<n_channels; dest++) {
-            for (src=0; src<n_channels; src++) {
-                set_hardware_mixergain(RME_FF_MM_INPUT, src, dest, 0);
-readRegister(0xfffff0000410LL);
-            }
-            for (src=0; src<n_channels; src++) {
-                set_hardware_mixergain(RME_FF_MM_PLAYBACK, src, dest, 
-                  src==dest?0x8000:0);
-readRegister(0xfffff0000410LL);
-            }
-        }
-        for (src=0; src<n_channels; src++) {
-            set_hardware_mixergain(RME_FF_MM_OUTPUT, src, 0, 0x8000);
-readRegister(0xfffff0000410LL);
-        }
-
@@ -771 +749 @@
-        }
-
-printf(
+debugOutput(DEBUG_LEVEL_VERBOSE, 
-        ret = writeRegister(addr, data);
-printf(
+debugOutput(DEBUG_LEVEL_VERBOSE, 
-        if (ret == 0) {
-            dev_config->is_streaming = 1;

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -600 +600 @@
-                break;
-            }
-
-
-
-
-
-
-
-
+
+
+
+
+
-            if (m_rme_model == RME_MODEL_FIREFACE400) {
-                iso_rx_channel = get1394Service().allocateIsoChannelGeneric(bandwidth);
@@ -861 +858 @@
-    }
-
-#if 0
-    // Just add a few ports for initial testing
-    snprintf(name, sizeof(name), "%s_%s_%s", id.c_str(), mode_str, "port_0");
-    addPort(s_processor, name, direction, 0, 0);
-    snprintf(name, sizeof(name), "%s_%s_%s", id.c_str(), mode_str, "port_1");
-    addPort(s_processor, name, direction, 4, 0);
-    snprintf(name, sizeof(name), "%s_%s_%s", id.c_str(), mode_str, "port_6");
-    addPort(s_processor, name, direction, 24, 0);
-    snprintf(name, sizeof(name), "%s_%s_%s", id.c_str(), mode_str, "port_7");
-    addPort(s_processor, name, direction, 28, 0);
-#endif
-
-    return true;
-}