Changeset 2540 for trunk/libffado/src/libieee1394/test-cyclecalc.cpp

Timestamp:

06/01/14 16:49:28 (7 years ago)

Author:

jwoithe

Message:

Fix compilation when DEBUG is not defined. The fixes in the amdtp streaming module are from Phil. It is not clear how these problems have been missed. The amdtp assert's reference of buffer_size for example has been in the code base since 2.0 days, so a non-debug build which included amdtp has probably been broken for quite some time.

Files:

• trunk/libffado/src/libieee1394/test-cyclecalc.cpp (modified) (3 diffs)

trunk/libffado/src/libieee1394/test-cyclecalc.cpp

@@ -39 +39 @@
-     */
-
-
+_MESSAGES
-    uint32_t now_ctr = 0x140001DA;
-    uint64_t now = CYCLE_TIMER_TO_TICKS(0x140001DA);
-    unsigned int cycle = 7968;
-    uint16_t syt = 0x583B;
-    #endif
-    
-    debugOutput(DEBUG_LEVEL_VERBOSE,"NOW_CTR          : %08X (%03us %04uc %04ut)\n",
@@ -64 +63 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE,"CYCLE            : %uc\n",
-                          cycle);
-    #ifdef DEBUG
-    uint64_t calc_ts = sytRecvToFullTicks(syt, cycle, now_ctr);
-    #endif
-
-    debugOutput(DEBUG_LEVEL_VERBOSE,"CALC_TS          : %011"PRIu64" (%03us %04uc %04ut)\n",
@@ -73 +70 @@
-                          (unsigned int)TICKS_TO_CYCLES(calc_ts),
-                          (unsigned int)TICKS_TO_OFFSET(calc_ts));
-
+
+
+
-    
-// BL: 1211722982: Debug (IsoHandler.cpp)[ 420] putPacket: received packet: length=168, channel=0, cycle=7968