From: <tr...@ff...> - 2007-12-31 13:47:11
|
Author: ppalmers Date: 2007-12-31 05:47:10 -0800 (Mon, 31 Dec 2007) New Revision: 788 Modified: trunk/libffado/src/libieee1394/CycleTimerHelper.cpp Log: fix unreliable streaming bug Modified: trunk/libffado/src/libieee1394/CycleTimerHelper.cpp =================================================================== --- trunk/libffado/src/libieee1394/CycleTimerHelper.cpp 2007-12-29 12:03:52 UTC (rev 787) +++ trunk/libffado/src/libieee1394/CycleTimerHelper.cpp 2007-12-31 13:47:10 UTC (rev 788) @@ -161,7 +161,7 @@ bool CycleTimerHelper::Execute() { - usleep(m_usecs_per_update); + usleep(1000*1000); return true; } uint32_t @@ -171,7 +171,7 @@ uint64_t local_time; if(!m_Parent.readCycleTimerReg(&cycle_timer, &local_time)) { debugError("Could not read cycle timer register\n"); - return false; + return 0; } return CYCLE_TIMER_TO_TICKS(cycle_timer); } @@ -182,6 +182,23 @@ return getCycleTimerTicks(); } +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 bool @@ -297,7 +314,6 @@ return retval; } -#endif uint32_t CycleTimerHelper::getCycleTimer() @@ -310,6 +326,7 @@ { return TICKS_TO_CYCLE_TIMER(getCycleTimerTicks(now)); } +#endif void CycleTimerHelper::setVerboseLevel(int l) |