Show
Ignore:
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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/libieee1394/test-cyclecalc.cpp

    r1763 r2540  
    3939     */ 
    4040 
    41     #ifdef DEBUG 
     41    #ifdef DEBUG_MESSAGES 
    4242    uint32_t now_ctr = 0x140001DA; 
    4343    uint64_t now = CYCLE_TIMER_TO_TICKS(0x140001DA); 
    4444    unsigned int cycle = 7968; 
    4545    uint16_t syt = 0x583B; 
    46     #endif 
    4746     
    4847    debugOutput(DEBUG_LEVEL_VERBOSE,"NOW_CTR          : %08X (%03us %04uc %04ut)\n", 
     
    6463    debugOutput(DEBUG_LEVEL_VERBOSE,"CYCLE            : %uc\n", 
    6564                          cycle); 
    66     #ifdef DEBUG 
    6765    uint64_t calc_ts = sytRecvToFullTicks(syt, cycle, now_ctr); 
    68     #endif 
    6966 
    7067    debugOutput(DEBUG_LEVEL_VERBOSE,"CALC_TS          : %011"PRIu64" (%03us %04uc %04ut)\n", 
     
    7370                          (unsigned int)TICKS_TO_CYCLES(calc_ts), 
    7471                          (unsigned int)TICKS_TO_OFFSET(calc_ts)); 
    75  
     72    #else 
     73    printf("DEBUG_MESSAGES not enabled for build.  This program won't show anything without it.\n"); 
     74    #endif 
    7675     
    7776// BL: 1211722982: Debug (IsoHandler.cpp)[ 420] putPacket: received packet: length=168, channel=0, cycle=7968