Changeset 481

Timestamp:

06/12/07 16:41:42 (16 years ago)

Author:

jwoithe

Message:

Fix for MOTU transmit stream failure to enable.

Files:

• trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp (modified) (7 diffs)

trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp

@@ -134 +134 @@
-    int cycle_diff = diffCycles(cycle, now_cycles);
-
+//debugOutput(DEBUG_LEVEL_VERBOSE,"tx: enabled=%d, cycle=%d, now_cycles=%d, diff=%d\n",
+//  !m_is_disabled,cycle, now_cycles, cycle_diff);
+
-    // Signal that streaming is still active
-    m_streaming_active = 1;
@@ -148 +151 @@
-    if (!m_disabled && m_is_disabled) {
-        // this means that we are trying to enable
-
+
+
+
+
+
-            m_is_disabled=false;
-
@@ -180 +187 @@
-                            ts_head, sync_lag_cycles, m_data_buffer->getFrameCounter());
-        } else {
+static int foo=0;
+if (!foo) {
+  debugOutput(DEBUG_LEVEL_VERBOSE,
+    "will enable tx StreamProcessor %p at %u, now is %d\n",
+    this, m_cycle_to_enable_at, cycle);
+  foo=1;
+}
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-                        "will enable StreamProcessor %p at %u, now is %d\n",
@@ -314 +328 @@
-            ts_frame += (unsigned int)((float)i * ticks_per_frame);
-            *quadlet = htonl( TICKS_TO_CYCLE_TIMER(ts_frame) & 0x1ffffff);
+#if 0
-if (cycle==0) {
-  debugOutput(DEBUG_LEVEL_VERBOSE,"%d %d %d\n",
@@ -320 +335 @@
-    TICKS_TO_OFFSET(ts_frame));
-}
+#endif
-#if TESTTONE
-            // FIXME: remove this hacked in 1 kHz test signal to
@@ -956 +972 @@
-    m_last_cycle=cycle;
-
+//debugOutput(DEBUG_LEVEL_VERBOSE,"rx: enabled=%d, cycle=%d\n",!m_is_disabled,cycle);
+
-    // check our enable status
-    if (!m_disabled && m_is_disabled) {
@@ -975 +993 @@
-
-        } else {
+static int foo=0;
+if (!foo) {
+debugOutput(DEBUG_LEVEL_VERBOSE,
+  "will enable rx StreamProcessor %p at %u, now is %d\n",
+  this, m_cycle_to_enable_at, cycle);
+  foo=1;
+}
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-                "will enable StreamProcessor %p at %u, now is %d\n",