Changeset 788

Timestamp:

12/31/07 05:47:10 (16 years ago)

Author:

ppalmers

Message:

fix unreliable streaming bug

Files:

• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (4 diffs)

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -162 +162 @@
-CycleTimerHelper::Execute()
-{
-m_usecs_per_update
+1000*1000
-    return true;
-}
@@ -172 +172 @@
-    if(!m_Parent.readCycleTimerReg(&cycle_timer, &local_time)) {
-        debugError("Could not read cycle timer register\n");
-false
+0
-    }
-    return CYCLE_TIMER_TO_TICKS(cycle_timer);
@@ -183 +183 @@
-}
-
+uint32_t
+CycleTimerHelper::getCycleTimer()
+{
+    uint32_t cycle_timer;
+    uint64_t local_time;
+    if(!m_Parent.readCycleTimerReg(&cycle_timer, &local_time)) {
+        debugError("Could not read cycle timer register\n");
+        return 0;
+    }
+    return cycle_timer;
+}
+
+uint32_t
+CycleTimerHelper::getCycleTimer(uint64_t now)
+{
+    return getCycleTimer();
+}
-#else
-
@@ -298 +315 @@
-    return retval;
-}
+
+uint32_t
+CycleTimerHelper::getCycleTimer()
+{
+    return TICKS_TO_CYCLE_TIMER(getCycleTimerTicks());
+}
+
+uint32_t
+CycleTimerHelper::getCycleTimer(uint64_t now)
+{
+    return TICKS_TO_CYCLE_TIMER(getCycleTimerTicks(now));
+}
-#endif
-
-uint32_t
-CycleTimerHelper::getCycleTimer()
-{
-    return TICKS_TO_CYCLE_TIMER(getCycleTimerTicks());
-}
-
-uint32_t
-CycleTimerHelper::getCycleTimer(uint64_t now)
-{
-    return TICKS_TO_CYCLE_TIMER(getCycleTimerTicks(now));
-}
-
-void