Show
Ignore:
Timestamp:
12/19/09 08:12:53 (11 years ago)
Author:
ppalmers
Message:

Merged revisions 1536,1541,1544-1546,1549,1554-1562,1571,1579-1581,1618,1632,1634-1635,1661,1677-1679,1703-1704,1715,1720-1723,1743-1745,1755 via svnmerge from
svn+ssh://ffadosvn@ffado.org/ffado/branches/libffado-2.0

Also fix remaining format string warnings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado

    • Property svnmerge-blocked changed from
      /branches/libffado-2.0:1563,1565,1750

      to /branches/libffado-2.0:1563,1565,1750
    • Property svnmerge-integrated changed from
      /branches/libffado-2.0:1-1532,1566-1570,1572-1578,1582-1617,1619-1631,1633,1636-1660,1662-1676,1680-1686

      to /branches/libffado-2.0:1-1562,1564,1566-1749,1751-1762
  • trunk/libffado/src/libieee1394/cycletimer.h

    r1531 r1763  
    9595#ifdef DEBUG 
    9696        if (x >= TICKS_PER_SECOND * 128L) { 
    97             debugWarning("insufficient wrapping: %llu\n",x); 
     97            debugWarning("insufficient wrapping: %"PRIu64"\n",x); 
    9898        } 
    9999#endif 
     
    118118#ifdef DEBUG 
    119119        if (x < 0) { 
    120             debugWarning("insufficient wrapping: %lld\n",x); 
     120            debugWarning("insufficient wrapping: %"PRId64"\n",x); 
    121121        } 
    122122#endif 
     
    145145#ifdef DEBUG 
    146146        if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) { 
    147             debugWarning("insufficient wrapping (max): %llu\n",x); 
     147            debugWarning("insufficient wrapping (max): %"PRIu64"\n",x); 
    148148        } 
    149149        if (x < 0) { 
    150             debugWarning("insufficient wrapping (min): %lld\n",x); 
     150            debugWarning("insufficient wrapping (min): %"PRId64"\n",x); 
    151151        } 
    152152#endif 
     
    249249    if(diff > max || diff < -max) { 
    250250        debugWarning("difference does not make any sense\n"); 
    251         debugWarning("diff=%lld max=%lld\n", diff, max); 
     251        debugWarning("diff=%"PRId64" max=%"PRId64"\n", diff, max); 
    252252         
    253253    } 
     
    302302    uint64_t timestamp; 
    303303 
    304     debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "SYT=%04llX CY=%u CTR=%08llX\n", 
     304    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "SYT=%"PRIX64" CY=%u CTR=%08"PRIX64"\n", 
    305305                       syt_timestamp, rcv_cycle, ctr_now); 
    306306 
     
    313313    int diff_cycles = diffCycles(cc_cycles, rcv_cycle); 
    314314    if (diff_cycles<0) { 
    315         debugWarning("current cycle timer not ahead of receive cycle: rcv: %u / cc: %llu (%d)\n", 
     315        debugWarning("current cycle timer not ahead of receive cycle: rcv: %u / cc: %"PRIu64" (%d)\n", 
    316316                        rcv_cycle, cc_cycles, diff_cycles); 
    317317    } 
     
    351351    } else { 
    352352        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 
    353                            "Detected wraparound: %d + %d = %d\n", 
     353                           "Detected wraparound: %u + %"PRId64" = %"PRId64"\n", 
    354354                           rcv_cycle, delta_cycles, new_cycles); 
    355355 
     
    372372        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 
    373373            debugWarning("back-converted timestamp not equal to SYT\n"); 
    374             debugWarning("TS=%011llu TSC=%08lX SYT=%04X\n", 
     374            debugWarning("TS=%011"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"\n", 
    375375                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 
    376376        } 
     
    391391    uint64_t timestamp; 
    392392 
    393     debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "SYT=%04llX RCV_CTR=%08X\n", 
     393    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "SYT=%04"PRIX64" RCV_CTR=%08X\n", 
    394394                       syt_timestamp, rcv_ctr); 
    395395 
     
    433433        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 
    434434            debugWarning("back-converted timestamp not equal to SYT\n"); 
    435             debugWarning("TS=%011llu TSC=%08lX SYT=%04X\n", 
     435            debugWarning("TS=%011"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"\n", 
    436436                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 
    437437        } 
     
    457457    uint64_t timestamp; 
    458458 
    459     debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "SYT=%08llX CY=%04X CTR=%08llX\n", 
     459    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "SYT=%08"PRIX64" CY=%04X CTR=%08"PRIX64"\n", 
    460460                       syt_timestamp, xmt_cycle, ctr_now); 
    461461 
     
    467467    int diff_cycles = diffCycles(xmt_cycle, cc_cycles); 
    468468    if (diff_cycles<0) { 
    469         debugWarning("xmit cycle not ahead of current cycle: xmt: %u / cc: %llu (%d)\n", 
     469        debugWarning("xmit cycle not ahead of current cycle: xmt: %u / cc: %"PRIu64" (%d)\n", 
    470470                        xmt_cycle, cc_cycles, diff_cycles); 
    471471    } 
     
    505505    } else { 
    506506        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 
    507                            "Detected wraparound: %d + %d = %d\n", 
     507                           "Detected wraparound: %u + %"PRId64" = %"PRId64"\n", 
    508508                           xmt_cycle, delta_cycles, new_cycles); 
    509509 
     
    526526        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 
    527527            debugWarning("back-converted timestamp not equal to SYT\n"); 
    528             debugWarning("TS=%011llu TSC=%08lX SYT=%04X\n", 
     528            debugWarning("TS=%011"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"\n", 
    529529                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 
    530530        }