Changeset 1722

Timestamp:

11/22/09 09:05:16 (13 years ago)

Author:

ppalmers

Message:

fix format warnings for extreme debugging

Files:

• branches/libffado-2.0/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/bebob/bebob_avplug.cpp (modified) (1 diff)
• branches/libffado-2.0/src/bebob/bebob_dl_bcd.cpp (modified) (4 diffs)
• branches/libffado-2.0/src/bebob/focusrite/focusrite_generic.cpp (modified) (6 diffs)
• branches/libffado-2.0/src/bebob/focusrite/focusrite_saffire.cpp (modified) (1 diff)
• branches/libffado-2.0/src/debugmodule/debugmodule.cpp (modified) (1 diff)
• branches/libffado-2.0/src/DeviceStringParser.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/fbtypes.h (modified) (2 diffs)
• branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware.cpp (modified) (1 diff)
• branches/libffado-2.0/src/fireworks/fireworks_session_block.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libavc/general/avc_plug.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libcontrol/Element.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libieee1394/configrom.cpp (modified) (7 diffs)
• branches/libffado-2.0/src/libieee1394/cycletimer.h (modified) (14 diffs)
• branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp (modified) (15 diffs)
• branches/libffado-2.0/src/libieee1394/ieee1394service.cpp (modified) (8 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandler.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (10 diffs)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp (modified) (27 diffs)
• branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (5 diffs)
• branches/libffado-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (28 diffs)
• branches/libffado-2.0/src/libutil/Configuration.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/libutil/serialize_expat.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libutil/StreamStatistics.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libutil/SystemTimeSource.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libutil/Time.h (modified) (2 diffs)
• branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp (modified) (3 diffs)
• branches/libffado-2.0/support/firmware/fireworks-downloader.cpp (modified) (2 diffs)
• branches/libffado-2.0/tests/streaming/teststreaming3.cpp (modified) (1 diff)
• branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp (modified) (2 diffs)
• branches/libffado-2.0/tests/systemtests/test-isoxmit-1.cpp (modified) (3 diffs)
• branches/libffado-2.0/tests/test-ffado.cpp (modified) (6 diffs)

branches/libffado-2.0/src/bebob/bebob_avdevice.cpp

@@ -724 +724 @@
-
-    char* configId;
-lx
+"PRIx64"
-    if ( !configId ) {
-        debugError( "could not create id string\n" );
@@ -800 +800 @@
-    // come up with an unique file name for the current settings
-    char* configId;
-lx
+"PRIx64"
-    if ( !configId ) {
-        debugError( "Could not create id string\n" );

branches/libffado-2.0/src/bebob/bebob_avplug.cpp

@@ -583 +583 @@
-        {
-            debugError( "number of output plugs (%d) disagree with "
-lu
+zd
-                        infoType->m_plugOutput->m_nrOfOutputPlugs,
-                        infoType->m_plugOutput->m_outputPlugAddresses.size());

branches/libffado-2.0/src/bebob/bebob_dl_bcd.cpp

@@ -154 +154 @@
-    bytes_read = fread( &m_bcd_version, 1, sizeof( fb_quadlet_t ), m_file );
-    if ( bytes_read != sizeof( fb_quadlet_t ) ) {
-lu
+zd
-                    sizeof( fb_quadlet_t ),
-                    BCDFileVersionOffset );
@@ -245 +245 @@
-    size_t bytes_read = std::fread( q, 1, sizeof( *q ), m_file );
-    if ( bytes_read  != sizeof( *q ) ) {
-lu
+zd
-                    sizeof( *q ),  addr );
-        return false;
@@ -263 +263 @@
-    size_t bytes_read = std::fread( o, 1, sizeof( *o ), m_file );
-    if ( bytes_read  != sizeof( *o ) ) {
-lu
+zd
-                    sizeof( *o ), addr );
-        return false;
@@ -281 +281 @@
-    size_t bytes_read = std::fread( b, 1, len, m_file );
-    if ( bytes_read  != len ) {
-lu
+zd
-                    len, addr );
-        return false;

branches/libffado-2.0/src/bebob/focusrite/focusrite_generic.cpp

@@ -69 +69 @@
-    if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) {
-        ffado_microsecs_t wait = m_earliest_next_cmd_time - now;
-lu
+"PRIu64"
-        Util::SystemTimeSource::SleepUsecRelative(wait);
-    }
@@ -94 +94 @@
-    if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) {
-        ffado_microsecs_t wait = m_earliest_next_cmd_time - now;
-lu
+"PRIu64"
-        Util::SystemTimeSource::SleepUsecRelative(wait);
-    }
@@ -169 +169 @@
-
-    if(!get1394Service().write_quadlet( nodeId, addr, CondSwapToBus32(data) ) ) {
-lX
+"PRIX64"
-        return false;
-    }
@@ -185 +185 @@
-
-    if(!get1394Service().read_quadlet( nodeId, addr, &result ) ) {
-lX
+"PRIX64"
-        return false;
-    }
@@ -385 +385 @@
-RegisterControl::setValue(uint64_t addr, uint64_t v)
-{
-lu to %lu
+"PRIu64" to %"PRIu64"
-                                     addr, v);
-
@@ -403 +403 @@
-        return 0;
-    } else {
-lu
+"PRIu64"
-                                         addr, val);
-        return val;

branches/libffado-2.0/src/bebob/focusrite/focusrite_saffire.cpp

@@ -48 +48 @@
-    if(config.getValueForDeviceSetting(getConfigRom().getNodeVendorId(), getConfigRom().getModelId(), "cmd_interval_time", delaytime)) {
-        m_cmd_time_interval = delaytime;
-lu
+"PRIu64"
-                     m_cmd_time_interval );
-    } else {
-        m_cmd_time_interval = 10000;
-lu
+"PRIu64"
-                     m_cmd_time_interval );
-    }

branches/libffado-2.0/src/debugmodule/debugmodule.cpp

@@ -186 +186 @@
-    int chars_written=0;
-    int retval=0;
-lu
+"PRIu64"
-                      ts_usec, getPreSequence( level ),
-                      fname,  line,  function );

branches/libffado-2.0/src/DeviceStringParser.cpp

@@ -203 +203 @@
-        case eGUID:
-            retval = m_guid && (m_guid == x.m_guid);
-lX == 0x%016lX
+"PRIX64" == 0x%016"PRIX64"
-                        m_guid, x.m_guid, retval);
-            return retval;
@@ -225 +225 @@
-        case eGUID:
-            debugOutput(DEBUG_LEVEL_INFO, "type: eGUID\n");
-lX
+"PRIX64"
-            break;
-        case eInvalid:

branches/libffado-2.0/src/fbtypes.h

@@ -25 +25 @@
-#define FBTYPES_H
-
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
-#include <libraw1394/raw1394.h>
-
@@ -35 +38 @@
-typedef nodeaddr_t  fb_nodeaddr_t;
-
+#define FORMAT_FB_OCTLET_T      "0x%016" PRIX64
+#define FORMAT_FB_NODEID_T      "0x%016" PRIX64
+#define FORMAT_FB_NODEADDR_T    "0x%016" PRIX64
+
-class DeviceManager;
-

branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware.cpp

@@ -127 +127 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC HW CAPS info:\n");
-    debugOutput(DEBUG_LEVEL_NORMAL, " Flags   : 0x%08X\n", m_flags);
-lX
+"PRIX64"
-    debugOutput(DEBUG_LEVEL_NORMAL, " HwType  : 0x%08X\n", m_type);
-    debugOutput(DEBUG_LEVEL_NORMAL, " Version : %u\n", m_version);

branches/libffado-2.0/src/fireworks/fireworks_session_block.cpp

@@ -255 +255 @@
-
-    if (len != h.size_quads*4) {
-lu
+zd
-    }
-

branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp

@@ -255 +255 @@
-        
-        debugOutput(DEBUG_LEVEL_VERBOSE,
-lu
+zd
-                    readDescCmd.m_data_length, bytes_read);
-        

branches/libffado-2.0/src/libavc/general/avc_plug.cpp

@@ -1344 +1344 @@
-            return string("Output");
-        default:
-        case eAPT_Unknown:
-            return string("Unknown");
-    }

branches/libffado-2.0/src/libcontrol/Element.cpp

@@ -302 +302 @@
-{
-    Util::MutexLockHelper lock(getLock());
-lu
+zd
-        getName().c_str(), m_Children.size());
-

branches/libffado-2.0/src/libieee1394/configrom.cpp

@@ -484 +484 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, 
-lX
+"PRIX64"
-                 getGuid());
-
@@ -515 +515 @@
-
-        debugOutput( DEBUG_LEVEL_VERBOSE,
-lX
+"PRIX64"
-                        guid);
-
@@ -522 +522 @@
-            if ( nodeId != getNodeId() ) {
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-lX
+"PRIX64"
-                             "from %d to %d\n",
-                             getGuid(),
@@ -530 +530 @@
-            } else {
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-lX
+"PRIX64"
-                             getGuid(),
-                             getNodeId());
@@ -547 +547 @@
-
-    debugOutput( DEBUG_LEVEL_VERBOSE,
-lX
+"PRIX64"
-                 "the bus anymore (removed?)\n",
-                 getGuid() );
@@ -560 +560 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "Config ROM\n" );
-    debugOutput(DEBUG_LEVEL_NORMAL, "\tCurrent Node Id:\t%d\n",       getNodeId() );
-lX
+"PRIX64"
-    debugOutput(DEBUG_LEVEL_NORMAL, "\tVendor Name:\t\t%s\n",         getVendorName().c_str() );
-    debugOutput(DEBUG_LEVEL_NORMAL, "\tModel Name:\t\t%s\n",          getModelName().c_str() );
@@ -581 +581 @@
-    printMessage("Config ROM\n" );
-    printMessage("\tCurrent Node Id:\t%d\n",       getNodeId() );
-lX
+"PRIX64"
-    printMessage("\tVendor Name:\t\t%s\n",         getVendorName().c_str() );
-    printMessage("\tModel Name:\t\t%s\n",          getModelName().c_str() );

branches/libffado-2.0/src/libieee1394/cycletimer.h

@@ -95 +95 @@
-#ifdef DEBUG
-        if (x >= TICKS_PER_SECOND * 128L) {
-lu
+"PRIu64"
-        }
-#endif
@@ -118 +118 @@
-#ifdef DEBUG
-        if (x < 0) {
-ld
+"PRId64"
-        }
-#endif
@@ -145 +145 @@
-#ifdef DEBUG
-        if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) {
-lu
+"PRIu64"
-        }
-        if (x < 0) {
-ld
+"PRId64"
-        }
-#endif
@@ -249 +249 @@
-    if(diff > max || diff < -max) {
-        debugWarning("difference does not make any sense\n");
-ld max=%ld
+"PRId64" max=%"PRId64"
-        
-    }
@@ -302 +302 @@
-    uint64_t timestamp;
-
-04llX CY=%u CTR=%08llX
+"PRIX64" CY=%u CTR=%08"PRIX64"
-                       syt_timestamp, rcv_cycle, ctr_now);
-
@@ -313 +313 @@
-    int diff_cycles = diffCycles(cc_cycles, rcv_cycle);
-    if (diff_cycles<0) {
-lu
+"PRIu64"
-                        rcv_cycle, cc_cycles, diff_cycles);
-    }
@@ -351 +351 @@
-    } else {
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-d + %d = %d
+u + %"PRId64" = %"PRId64"
-                           rcv_cycle, delta_cycles, new_cycles);
-
@@ -372 +372 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-lu TSC=%08lX SYT=%04lX
+"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }
@@ -391 +391 @@
-    uint64_t timestamp;
-
-llX
+"PRIX64"
-                       syt_timestamp, rcv_ctr);
-
@@ -433 +433 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-lu TSC=%08lX SYT=%04lX
+"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }
@@ -457 +457 @@
-    uint64_t timestamp;
-
-llX CY=%04X CTR=%08llX
+"PRIX64" CY=%04X CTR=%08"PRIX64"
-                       syt_timestamp, xmt_cycle, ctr_now);
-
@@ -467 +467 @@
-    int diff_cycles = diffCycles(xmt_cycle, cc_cycles);
-    if (diff_cycles<0) {
-lu
+"PRIu64"
-                        xmt_cycle, cc_cycles, diff_cycles);
-    }
@@ -505 +505 @@
-    } else {
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-d + %d = %d
+u + %"PRId64" = %"PRId64"
-                           xmt_cycle, delta_cycles, new_cycles);
-
@@ -526 +526 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-lu TSC=%08lX SYT=%04lX
+"PRIu64" TSC=%08"PRIX64" SYT=%04"PRIX64"
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }

branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp

@@ -164 +164 @@
-                        m_cycle_timer_prev, maxtries2);
-        }
-lu
+"PRIu64"
-                            m_cycle_timer_prev, local_time);
-        debugOutput(DEBUG_LEVEL_VERBOSE,
-lu
+"PRIu64"
-                           (uint32_t)m_cycle_timer_prev, (uint64_t)CYCLE_TIMER_TO_TICKS(m_cycle_timer_prev),
-                           (unsigned int)CYCLE_TIMER_GET_SECS( m_cycle_timer_prev ),
@@ -291 +291 @@
-    cycle_timer_ticks = CYCLE_TIMER_TO_TICKS(cycle_timer);
-
-lu
+"PRIu64"
-                        cycle_timer, local_time);
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                       (uint32_t)cycle_timer, (uint64_t)cycle_timer_ticks,
-                       (unsigned int)TICKS_TO_SECS( (uint64_t)cycle_timer_ticks ),
@@ -351 +351 @@
-        ffado_microsecs_t now = Util::SystemTimeSource::getCurrentTimeAsUsecs();
-        int sleep_time = m_sleep_until - now;
-ld/%f (now: %ld
+"PRId64"/%f (now: %"PRId64"
-                    this, m_sleep_until, m_next_time_usecs, now, sleep_time);
-        #endif
@@ -390 +390 @@
-        if(not_good) {
-            debugOutput(DEBUG_LEVEL_VERBOSE, 
-ld, max: +/- %u (try: %d) %ld
+"PRId64", max: +/- %u (try: %d) %"PRId64"
-                        this, err_ticks, 1*TICKS_PER_CYCLE, ntries, expected_ticks);
-            // sleep half a cycle to make sure the hardware moved on
@@ -419 +419 @@
-    }
-
-lu
+"PRIu64"
-                        cycle_timer, local_time);
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-lu
+"PRIu64"
-                       (uint32_t)cycle_timer, (uint64_t)cycle_timer_ticks,
-                       (unsigned int)TICKS_TO_SECS( (uint64_t)cycle_timer_ticks ),
@@ -436 +436 @@
-    } else if (diff_ticks > m_ticks_per_update * 20) {
-        debugOutput(DEBUG_LEVEL_VERBOSE,
-ld
+"PRId64"
-                    diff_ticks, (float)(m_ticks_per_update * 20));
-        if(!initDLL()) {
@@ -462 +462 @@
-            diff_ticks_corr = diff_ticks - ticks_late;
-            debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-d, diff_ticks = %ld, ticks_late = %ld
+"PRId64", diff_ticks = %"PRId64", ticks_late = %"PRId64"
-                               diff_ticks_corr, diff_ticks, ticks_late);
-        } else {
@@ -473 +473 @@
-        // makes no sense if not running realtime
-        if(m_realtime && usecs_late > 1000) {
-ld
+"PRId64"
-        }
-        #endif
@@ -526 +526 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 
-d ticks_late=%ld
+"PRId64" ticks_late=%"PRId64"
-                           m_current_time_usecs, m_next_time_usecs, usecs_late, ticks_late);
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-d
+"PRId64"
-                           m_current_time_ticks, m_next_time_ticks, diff_ticks);
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                           (uint64_t)m_current_time_ticks,
-                           (unsigned int)TICKS_TO_SECS( (uint64_t)m_current_time_ticks ),
@@ -538 +538 @@
-                           (unsigned int)TICKS_TO_OFFSET( (uint64_t)m_current_time_ticks ) );
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                           (uint64_t)m_next_time_ticks,
-                           (unsigned int)TICKS_TO_SECS( (uint64_t)m_next_time_ticks ),
@@ -545 +545 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                           local_time, m_dll_e2, getRate());
-    }
@@ -589 +589 @@
-    }
-    int32_t ctr_diff = cycle_timer_ticks-dll_time;
-lu
+"PRIu64"
-                this, cycle_timer_ticks, dll_time, ctr_diff, (ctr_diff>0?"lag":"lead"));
-#endif
@@ -792 +792 @@
-        if (diffTicks(cycle_timer_ticks, m_cycle_timer_ticks_prev) < 0) {
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-lu -> %lu
+"PRIu64" -> %"PRIu64"
-                        maxtries, m_cycle_timer_ticks_prev, cycle_timer_ticks);
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
@@ -798 +798 @@
-                        m_cycle_timer_prev, *cycle_timer);
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                        cycle_timer_ticks,
-                        (unsigned int)TICKS_TO_SECS( cycle_timer_ticks ),
@@ -804 +804 @@
-                        (unsigned int)TICKS_TO_OFFSET( cycle_timer_ticks ) );
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                        m_cycle_timer_ticks_prev,
-                        (unsigned int)TICKS_TO_SECS( m_cycle_timer_ticks_prev ),

branches/libffado-2.0/src/libieee1394/ieee1394service.cpp

@@ -509 +509 @@
-        #ifdef DEBUG
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-lX, length = %lu
+"PRIX64", length = %zd
-            nodeId, addr, length);
-        printBuffer( DEBUG_LEVEL_VERY_VERBOSE, length, buffer );
@@ -518 +518 @@
-        #ifdef DEBUG
-        debugOutput(DEBUG_LEVEL_NORMAL,
-lX, length = %lu
+"PRIX64", length = %zd
-                    nodeId, addr, length);
-        #endif
@@ -564 +564 @@
-
-    #ifdef DEBUG
-lX, length = %lu
+"PRIX64", length = %zd
-                nodeId, addr, length);
-    printBuffer( DEBUG_LEVEL_VERY_VERBOSE, length, data );
@@ -601 +601 @@
-    }
-    #ifdef DEBUG
-lX
+"PRIX64"
-                nodeId, addr);
-lX) *(addr)=0x%016lX
+"PRIX64") *(addr)=0x%016"PRIX64"
-                compare_value, swap_value);
-    fb_octlet_t buffer;
@@ -609 +609 @@
-        debugWarning("Could not read register\n");
-    } else {
-lX
+"PRIX64"
-    }
-    #endif
@@ -633 +633 @@
-        debugWarning("Could not read register\n");
-    } else {
-lX
+"PRIX64"
-    }
-    #endif
@@ -827 +827 @@
-    fb_quadlet_t *data_quads = (fb_quadlet_t *)data;
-    #ifdef DEBUG
-lu
+zd
-                nodeid, response, length);
-    printBuffer(DEBUG_LEVEL_VERY_VERBOSE, (length+3)/4, data_quads );
@@ -1381 +1381 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, " CycleTimerHelper: %p, IsoManager: %p, WatchDog: %p\n",
-                 m_pCTRHelper, m_pIsoManager, m_pWatchdog );
-lu
+"PRIu64"
-                ctr,
-                (unsigned int)TICKS_TO_SECS( ctr ),

branches/libffado-2.0/src/libieee1394/IsoHandler.cpp

@@ -397 +397 @@
-    if((pkt_ctr & ~0x0FFFL) != pkt_ctr_ref) {
-        debugWarning("reconstructed CTR counter discrepancy\n");
-
-
-
+
+
+
+
+
+
+
-    }
-    #endif
@@ -490 +494 @@
-        if(((pkt_ctr & ~0x0FFFL) != pkt_ctr_ref) && (m_packets > m_buf_packets)) {
-            debugWarning("reconstructed CTR counter discrepancy\n");
-
-
-
+
+
+
+
+
+
+
-        }
-        #endif

branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp

@@ -331 +331 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-ld, max = %lld, now: %08lX, last: %08l
+"PRId64", max = %"PRId64", now: %08X, last: %08
-                           this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"), 
-                           i, measured_diff_ticks, max_diff_ticks, ctr_at_poll_return, last_packet_seen);
-        if(measured_diff_ticks > max_diff_ticks) {
-ld (max: %ld
+"PRId64" (max: %"PRId64"
-                       this, (m_handlerType == IsoHandler::eHT_Transmit? "Transmit": "Receive"),
-                       ctr_at_poll_return, last_packet_seen, measured_diff_ticks, max_diff_ticks);
@@ -416 +416 @@
-            debugError("(%p) sem_timedwait error (result=%d errno=EINVAL)\n", 
-                        this, result);
-
-
+
+
+
-            return eAR_Error;
-        } else {
-            debugError("(%p) sem_timedwait error (result=%d errno=%d)\n", 
-                        this, result, errno);
-
-
+
+
+
-            return eAR_Error;
-        }
@@ -888 +890 @@
-
-    m_StreamProcessors.push_back(stream);
-lu streams, %lu
+zd streams, %zd
-                                      m_StreamProcessors.size(), m_IsoHandlers.size());
-    return true;

branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp

@@ -148 +148 @@
-    if(isRunning()) {
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                           m_last_timestamp, m_syt_interval, getTicksPerFrame());
-/*        debugOutput(DEBUG_LEVEL_NORMAL,
-lu ticks | delta_t: %5ld
+"PRIu64" ticks | delta_t: %5"PRId64"
-                           m_last_timestamp, now_t-last_t, m_data_buffer->getBufferFill());*/
-    }

branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -95 +95 @@
-
-    debugOutputExtreme( DEBUG_LEVEL_ULTRA_VERBOSE,
-
+(int) 
-    // check whether the packet buffer has packets for us to send.
-    // the base timestamp is the one of the next sample in the buffer
@@ -141 +141 @@
-        {
-            debugOutput( DEBUG_LEVEL_NORMAL,
-lu
-
+d
+(int)
-                         transmit_at_cycle, cycles_until_transmit );
-            // we are too late
@@ -153 +153 @@
-
-            debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-u
-
+d
+(int)
-                               transmit_at_cycle, cycles_until_transmit, now_cycle );
-            #endif
@@ -200 +200 @@
-            // we are too late
-            debugOutput(DEBUG_LEVEL_VERBOSE,
-lu, TC=%04u, CUT=%04d, TSP=%011lu
-
+d, TC=%04u, CUT=%04d, TSP=%011"PRIu64"
+(int)
-                        transmit_at_cycle, cycles_until_transmit,
-                        presentation_time, (unsigned int)TICKS_TO_CYCLES(presentation_time) );
@@ -229 +229 @@
-            // for timestamp tracing
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                               presentation_time,
-                               (unsigned int)CYCLE_TIMER_GET_CYCLES(pkt_ctr),
@@ -239 +239 @@
-        {
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu (%04u), TSP=%011llu
-
+"PRIu64" (%04u), TSP=%011"PRId64"
+(int)
-                               transmit_at_cycle, cycles_until_transmit,
-                               transmit_at_time, (unsigned int)TICKS_TO_CYCLES(transmit_at_time),
@@ -248 +248 @@
-            {
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu (%04u), TSP=%011llu 
-
+"PRIu64" (%04u), TSP=%011"PRId64"
+(int)
-                                   transmit_at_cycle, cycles_until_transmit,
-                                   transmit_at_time, (unsigned int)TICKS_TO_CYCLES(transmit_at_time),
@@ -269 +269 @@
-    {
-        debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-lu
+"PRIu64"
-                           m_last_timestamp,
-                           (unsigned int)TICKS_TO_CYCLES(m_last_timestamp));
@@ -301 +301 @@
-    struct iec61883_packet *packet = ( struct iec61883_packet * ) data;
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-CY=%04u, TSP=%011lu
-
+TSP=%011"PRIu64"
+(int)
-                       (unsigned int)TICKS_TO_CYCLES(m_last_timestamp));
-
@@ -338 +338 @@
-    struct iec61883_packet *packet = ( struct iec61883_packet * ) data;
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-CY=%04u, TSP=%011lu
-
+TSP=%011"PRIu64"
+(int)
-                       (unsigned int)TICKS_TO_CYCLES(m_last_timestamp) );
-    packet->sid = m_local_node_id;

branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp

@@ -378 +378 @@
-        if (m_last_timestamp > 0 && m_last_timestamp2 > 0) {
-            int64_t tsp_diff = diffTicks(m_last_timestamp, m_last_timestamp2);
-ld
+"PRId64"
-            double tsp_diff_d = tsp_diff;
-            double fs_syt = 1.0/tsp_diff_d;
@@ -399 +399 @@
-                if(diff-ticks_per_packet > 50 || diff-ticks_per_packet < -50) {
-                    debugOutput(DEBUG_LEVEL_VERBOSE,
-lu rather large TSP difference TS=%011lu => TS=%011lu
-
+d rather large TSP difference TS=%011"PRIu64" => TS=%011"PRIu64"
+(int)
-                                m_last_timestamp, diff, ticks_per_packet);
-                    // !!!HACK!!! FIXME: this is the result of a failure in wrapping/unwrapping somewhere
@@ -410 +410 @@
-                    diff = diffTicks(last_timestamp_fixed, m_last_timestamp2);
-                    if(diff-ticks_per_packet < 50 && diff-ticks_per_packet > -50) {
-lu rather large TSP difference TS=%011lu => TS=%011lu
-
+d rather large TSP difference TS=%011"PRIu64" => TS=%011"PRIu64"
+(int)
-                                    m_last_timestamp, diff, ticks_per_packet);
-                        debugWarning("HACK: fixed by adding one second of ticks. This is a bug being run-time fixed.\n");
@@ -420 +420 @@
-                        diff = diffTicks(last_timestamp_fixed, m_last_timestamp2);
-                        if(diff-ticks_per_packet < 50 && diff-ticks_per_packet > -50) {
-lu rather large TSP difference TS=%011lu => TS=%011lu
-
+d rather large TSP difference TS=%011"PRIu64" => TS=%011"PRIu64"
+(int)
-                                        m_last_timestamp, diff, ticks_per_packet);
-                            debugWarning("HACK: fixed by subtracing one second of ticks. This is a bug being run-time fixed.\n");
@@ -429 +429 @@
-                }
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu %011lu
-
+"PRIu64" %011"PRIu64"
+(int)
-                                m_last_timestamp2, m_last_timestamp, 
-                                diff, ticks_per_packet);
@@ -437 +437 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu
-
+"PRIu64"
+(int)
-                          m_last_timestamp);
-
@@ -606 +606 @@
-        if (result == eCRV_Packet) {
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu
-
+"PRIu64"
+(int)
-
-            // assumed not to xrun
@@ -657 +657 @@
-        if (result == eCRV_Packet || result == eCRV_Defer) {
-            debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-lu
-
+"PRIu64"
+(int)
-
-            // valid packet timestamp
@@ -694 +694 @@
-            if (m_last_timestamp > 0 && m_last_timestamp2 > 0) {
-                int64_t tsp_diff = diffTicks(m_last_timestamp, m_last_timestamp2);
-ld
+"PRId64"
-                double tsp_diff_d = tsp_diff;
-                double fs_syt = 1.0/tsp_diff_d;
@@ -703 +703 @@
-                debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "Nom fs: %12f, Instantanous fs: %12f, diff: %12f (%12f)\n",
-                           fs_nom, fs_syt, fs_diff, fs_diff_norm);
-lu, m_last_timestamp2: %011lu
+"PRIu64", m_last_timestamp2: %011"PRIu64"
-//                            fs_diff, m_last_timestamp, m_last_timestamp2);
-                if (fs_diff_norm > 0.01 || fs_diff_norm < -0.01) {
@@ -716 +716 @@
-                if(diff-ticks_per_packet > 50 || diff-ticks_per_packet < -50) {
-                    debugOutput(DEBUG_LEVEL_VERBOSE,
-ld, rather large TSP difference TS=%011lu => TS=%011lu
-
+d, rather large TSP difference TS=%011"PRIu64" => TS=%011"PRIu64"
+(int)
-                                m_last_timestamp, diff, ticks_per_packet);
-                }
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-ld %011lu %011lu
-
+d %011"PRIu64" %011"PRIu64"
+(int)
-                                m_last_timestamp, diff, ticks_per_packet);
-            }
@@ -757 +757 @@
-            goto send_empty_packet;
-        } else if (result == eCRV_Again) {
-ld\n", 
+d\n", (int)
-            if(m_state != m_next_state) {
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state from %s to %s\n",
@@ -792 +792 @@
-    debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-                       "XMIT EMPTY: CY=%04u\n",
-
+(int)
-
-    generateEmptyPacketHeader(data, length, tag, sy, pkt_ctr);
@@ -809 +809 @@
-    bool result;
-    debugOutputExtreme( DEBUG_LEVEL_VERBOSE,
-lu
+"PRIu64"
-                        this, getTypeString(), nbframes, ts);
-    assert( getType() == ePT_Receive );
@@ -840 +840 @@
-    lag_frames = (((float)lag_ticks) / srate);
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-ld, %lu
+"PRId64", %"PRIu64"
-                       this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    if (lag_frames >= 1.0) {
-        // the stream lags
-ld, %lu
+"PRId64", %"PRIu64"
-                      this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    } else if (lag_frames <= -1.0) {
-        // the stream leads
-ld, %lu
+"PRId64", %"PRIu64"
-                      this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    }
@@ -862 +862 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-ld
+"PRId64"
-                       this, nbframes, ts);
-    // dry run on this side means that we put silence in all enabled ports
@@ -873 +873 @@
-{
-    bool result;
-ld
+"PRId64"
-    result = m_data_buffer->dropFrames(nbframes);
-    SIGNAL_ACTIVITY_ISO_RECV;
@@ -883 +883 @@
-    bool result;
-    debugOutputExtreme( DEBUG_LEVEL_VERBOSE,
-lu
+"PRIu64"
-                        this, getTypeString(), nbframes, ts);
-    assert( getType() == ePT_Transmit );
@@ -896 +896 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-lu
+"PRIu64"
-                       nbframes, ts);
-    // transfer the data
-    m_data_buffer->blockProcessWriteFrames(nbframes, ts);
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-lu
+"PRIu64"
-    return true; // FIXME: what about failure?
-}
@@ -909 +909 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-lu
+"PRIu64"
-                       nbframes, ts);
-    // do nothing
@@ -919 +919 @@
-{
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-                       nbframes, ts);
-
@@ -1070 +1070 @@
-    // make the scratch buffer one period of frames long
-    m_scratch_buffer_size_bytes = m_StreamProcessorManager.getPeriodSize() * getEventsPerFrame() * getEventSize();
-l
+z
-    if(m_scratch_buffer) delete[] m_scratch_buffer;
-    m_scratch_buffer = new byte_t[m_scratch_buffer_size_bytes];
@@ -1159 +1159 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-lu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-lu
+"PRIu64"
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1205 +1205 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-lu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-lu
+"PRIu64"
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1229 +1229 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-lu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-lu
+"PRIu64"
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1254 +1254 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-lu
+"PRIu64"
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-lu
+"PRIu64"
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1901 +1901 @@
-    }
-    uint64_t now = m_1394service.getCycleTimerTicks();
-lu
+"PRIu64"
-                        now,
-                        (unsigned int)TICKS_TO_SECS(now),

branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp

@@ -182 +182 @@
-    #ifdef DEBUG
-    if(isRunning()) {
-lu
+"PRIu64"
-            m_last_timestamp, getTicksPerFrame());
-    }

branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

@@ -197 +197 @@
-            // we are too late
-            debugOutput(DEBUG_LEVEL_VERBOSE,
-lu
+"PRIu64"
-                        cycle,
-                        transmit_at_cycle, cycles_until_transmit,
@@ -232 +232 @@
-        {
-            debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-lu (%04u), TSP=%011lu
+"PRIu64" (%04u), TSP=%011"PRIu64"
-                        cycle,
-                        transmit_at_cycle, cycles_until_transmit,
@@ -241 +241 @@
-            {
-                debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-lu (%04u), TSP=%011lu
+"PRIu64" (%04u), TSP=%011"PRIu64"
-                            cycle,
-                            transmit_at_cycle, cycles_until_transmit,
@@ -289 +289 @@
-    uint32_t pkt_ctr )
-{
-lu, TSP=%011lu
-
+d, TSP=%011"PRIu64"
+(int)
-                ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) );
-
@@ -318 +318 @@
-    unsigned int cycle = CYCLE_TIMER_GET_CYCLES(pkt_ctr);
-
-lu
+"PRIu64"
-                 cycle, m_last_timestamp,
-                 ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) );

branches/libffado-2.0/src/libstreaming/StreamProcessorManager.cpp

@@ -192 +192 @@
-            debugError("(%p) sem_[timed]wait error (result=%d errno=EINVAL)\n", 
-                        this, result);
-
-
+
+
+
-            return eAR_Error;
-        } else {
-            debugError("(%p) sem_[timed]wait error (result=%d errno=%d)\n", 
-                        this, result, errno);
-
-
+
+
+
-            return eAR_Error;
-        }
@@ -540 +542 @@
-        #ifdef DEBUG
-        int64_t now = Util::SystemTimeSource::getCurrentTime();
-ld, syncdelay: %lld, diff: %lld
-ld, now: %lld, wait: %lld
+"PRId64", syncdelay: %"PRId64", diff: %"PRId64"
+"PRId64", now: %"PRId64", wait: %"PRId64"
-        #endif
-    
@@ -549 +551 @@
-        #ifdef DEBUG
-        now = Util::SystemTimeSource::getCurrentTime();
-ld, now: %lld, excess: %lld
+"PRId64", now: %"PRId64", excess: %"PRId64"
-        #endif
-    }
@@ -570 +572 @@
-    // figure out where we are now
-    uint64_t time_of_first_sample = m_SyncSource->getTimeAtPeriod();
-lu
+"PRIu64"
-        time_of_first_sample,
-        (unsigned int)TICKS_TO_SECS(time_of_first_sample),
@@ -587 +589 @@
-    time_of_first_sample = addTicks(time_of_first_sample,
-                                    time_for_startup_ticks);
-lu
+"PRIu64"
-        time_for_startup_frames, time_for_startup_ticks);
-
-lu
+"PRIu64"
-        time_of_first_sample,
-        (unsigned int)TICKS_TO_SECS(time_of_first_sample),
@@ -603 +605 @@
-    uint64_t time_to_start_recv = substractTicks(time_of_first_sample,
-                                                 prestart_cycles_for_recv * TICKS_PER_CYCLE);
-lu
+"PRIu64"
-        time_to_start_xmit,
-        (unsigned int)TICKS_TO_SECS(time_to_start_xmit),
-        (unsigned int)TICKS_TO_CYCLES(time_to_start_xmit),
-        (unsigned int)TICKS_TO_OFFSET(time_to_start_xmit));
-lu
+"PRIu64"
-        time_to_start_recv,
-        (unsigned int)TICKS_TO_SECS(time_to_start_recv),
@@ -660 +662 @@
-        signed int fc;
-        (*it)->getBufferHeadTimestamp ( &ts, &fc );
-ld => head TS %010lu
+"PRId64" => head TS %010"PRIu64"
-                    time_of_first_sample, (uint64_t)ts, fc);
-    }
@@ -690 +692 @@
-    }
-    if(!m_SyncSource->scheduleStartRunning(time_to_start_sync)) {
-lu
+"PRIu64"
-        return false;
-    }
@@ -700 +702 @@
-        if(*it != m_SyncSource) {
-            if(!(*it)->scheduleStartRunning(time_to_start_recv)) {
-lu
+"PRIu64"
-                return false;
-            }
@@ -710 +712 @@
-        if(*it != m_SyncSource) {
-            if(!(*it)->scheduleStartRunning(time_to_start_xmit)) {
-lu
+"PRIu64"
-                return false;
-            }
@@ -743 +745 @@
-    #endif
-
-ld
+"PRId64"
-                m_time_of_transfer, rate);
-
@@ -762 +764 @@
-
-    int64_t transmit_tail_timestamp = addTicks(m_time_of_transfer, delay_in_ticks);
-ld
+"PRId64"
-                transmit_tail_timestamp, rate);
-
@@ -773 +775 @@
-        signed int fc;
-        (*it)->getBufferHeadTimestamp ( &ts, &fc );
-ld
+"PRId64"
-                    (uint64_t)ts, fc);
-    }
@@ -830 +832 @@
-                StreamProcessor *s = m_ReceiveProcessors.at(i);
-                diff = diffTicks(m_SyncSource->getTimeAtPeriod(), s->getTimeAtPeriod());
-ld
+"PRId64"
-                    m_SyncSource, s, diff);
-                if ( nb_sync_runs == periods_per_align_try ) {
@@ -850 +852 @@
-            diff_between_streams[i] /= periods_per_align_try;
-            diff_between_streams_frames[i] = (int)roundf(diff_between_streams[i] / s->getTicksPerFrame());
-ld
+"PRId64"
-                m_SyncSource, s, diff_between_streams[i], diff_between_streams_frames[i]);
-
@@ -1100 +1102 @@
-    #ifdef DEBUG
-    int64_t now = Util::SystemTimeSource::getCurrentTime();
-ld, syncdelay: %lld, diff: %lld
-ld, now: %lld, wait: %lld
+"PRId64", syncdelay: %"PRId64", diff: %"PRId64"
+"PRId64", now: %"PRId64", wait: %"PRId64"
-    #endif
-
@@ -1109 +1111 @@
-    #ifdef DEBUG
-    now = Util::SystemTimeSource::getCurrentTime();
-ld, now: %lld, excess: %lld
+"PRId64", now: %"PRId64", excess: %"PRId64"
-    #endif
-
@@ -1239 +1241 @@
-    // so 50 ticks = 10%, which is a rather large jitter value.
-    if(diff-ticks_per_period > 50 || diff-ticks_per_period < -50) {
-lu => TS=%011lu
+"PRIu64" => TS=%011"PRIu64"
-                                            m_time_of_transfer2, m_time_of_transfer, diff, ticks_per_period);
-    }
@@ -1246 +1248 @@
-
-    debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-lu
+"PRIu64"
-                        m_nbperiods, m_time_of_transfer);
-
@@ -1262 +1264 @@
-    }
-    debugOutputExtreme( DEBUG_LEVEL_VERY_VERBOSE, 
-lu
+"PRIu64"
-                        m_time_of_transfer, rcv_bf, xmt_bf, rcv_bf+xmt_bf);
-
@@ -1335 +1337 @@
-    if(m_SyncSource == NULL) return false;
-    debugOutputExtreme( DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-        t, m_time_of_transfer,
-        (unsigned int)TICKS_TO_SECS(m_time_of_transfer),
@@ -1349 +1351 @@
-                ++it ) {
-            if(!(*it)->getFrames(m_period, m_time_of_transfer)) {
-lu
+"PRIu64"
-                            m_period, m_time_of_transfer,*it);
-                retval &= false; // buffer underrun
@@ -1372 +1374 @@
-
-            if(!(*it)->putFrames(m_period, transmit_timestamp)) {
-lu
+"PRIu64"
-                        m_period, transmit_timestamp, *it);
-                retval &= false; // buffer underrun
@@ -1413 +1415 @@
-    if(m_SyncSource == NULL) return false;
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-lu
+"PRIu64"
-        t, m_time_of_transfer,
-        (unsigned int)TICKS_TO_SECS(m_time_of_transfer),
@@ -1427 +1429 @@
-                ++it ) {
-            if(!(*it)->dropFrames(m_period, m_time_of_transfer)) {
-lu
+"PRIu64"
-                            m_period, m_time_of_transfer,*it);
-                retval &= false; // buffer underrun
@@ -1450 +1452 @@
-
-            if(!(*it)->putSilenceFrames(m_period, transmit_timestamp)) {
-lu
+"PRIu64"
-                        m_period, transmit_timestamp, *it);
-                retval &= false; // buffer underrun
@@ -1623 +1625 @@
-        #ifdef DEBUG
-        if(idx >= (int)m_CapturePorts_shadow.size()) {
-lu
+zd
-            return NULL;
-        }
@@ -1631 +1633 @@
-        #ifdef DEBUG
-        if(idx >= (int)m_PlaybackPorts_shadow.size()) {
-lu
+zd
-            return NULL;
-        }

branches/libffado-2.0/src/libutil/Configuration.cpp

@@ -190 +190 @@
-            int64_t i = s;
-            debugOutput(DEBUG_LEVEL_NORMAL,
-ld (0x%016lX
+"PRId64" (0x%016"PRIX64"
-                        prefix.c_str(), s.getName(), i, i);
-        }
@@ -259 +259 @@
-        if(t == Setting::TypeInt64) {
-            ref = *s;
-ld
+"PRId64"
-            return true;
-        } else {

branches/libffado-2.0/src/libutil/serialize_expat.cpp

@@ -117 +117 @@
-            Xml::Node& n = pNode->add( Xml::Node(tokens[tokens.size() - 1].c_str(), NULL) );
-            char* valstr;
-ld
+"PRId64"
-            n.set_child_text( valstr );
-            free( valstr );

branches/libffado-2.0/src/libutil/StreamStatistics.cpp

@@ -55 +55 @@
-void StreamStatistics::dumpInfo() {
-    debugOutputShort( DEBUG_LEVEL_VERBOSE, 
-ld cnt=%ld sum=%ld
+"PRId64" cnt=%"PRId64" sum=%"PRId64"
-                      m_name.c_str(), m_min, m_average, m_max, m_count, m_sum);
-    debugOutputShort( DEBUG_LEVEL_VERBOSE, "    Signal stats\n");

branches/libffado-2.0/src/libutil/SystemTimeSource.cpp

@@ -55 +55 @@
-    ts.tv_nsec = (wake_at_usec % (1000000LL)) * 1000LL;
-    debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-"clock_nanosleep until %ld sec, %lld
-
+       "clock_nanosleep until %"PRId64" sec, %"PRId64"
+       
-    int err = clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &ts, NULL);
-    if(err) {

branches/libffado-2.0/src/libutil/Time.h

@@ -25 +25 @@
-#define __Time__
-
+#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-
@@ -34 +35 @@
- */
-typedef uint64_t ffado_microsecs_t;
+#define PRI_FFADO_MICROSECS_T PRIu64
-
-static inline void SleepRelativeUsec(ffado_microsecs_t usec) {

branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp

@@ -505 +505 @@
-        if (written < write_size)
-        {
-lu
+zd
-            return false;
-        }
@@ -534 +534 @@
-    if (written < write_size)
-    {
-lu
+zd
-        return false;
-    }
@@ -645 +645 @@
-
-        if(vec[0].len + vec[1].len < m_process_block_size) { // this indicates a full event buffer
-lu
+zd
-                       this, ffado_ringbuffer_read_space(m_event_buffer), bytes2write);
-            debugShowBackLog();

branches/libffado-2.0/support/firmware/fireworks-downloader.cpp

@@ -23 +23 @@
- */
-
+#include "fbtypes.h"
-#include "downloader.h"
-
@@ -213 +214 @@
-
-    if (node_id < 0) {
-lX
+"PRIX64"
-        return -1;
-    }

branches/libffado-2.0/tests/streaming/teststreaming3.cpp

@@ -264 +264 @@
-    }
-
-ld\n", 
+d\n", (int)
-    setDebugLevel(arguments.verbose);
-

branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp

@@ -188 +188 @@
-    }
-
-ld...\n",
+d...\n", (int)
-    do
-    {
@@ -225 +225 @@
-    }
-
-ld)...\n", 
+d)...\n", (int)
-    set_realtime_priority(arguments.rtprio);
-

branches/libffado-2.0/tests/systemtests/test-isoxmit-1.cpp

@@ -232 +232 @@
-    }
-
-ld\n",
+d\n", (int)
-    setDebugLevel(arguments.verbose);
-
@@ -243 +243 @@
-    }
-
-ld...\n", 
+d...\n", (int)
-    do
-    {
@@ -270 +270 @@
-    raw1394_set_bus_reset_handler(handle, myResetHandler);
-
-ld)...\n", 
+d)...\n", (int)
-    set_realtime_priority(arguments.rtprio);
-

branches/libffado-2.0/tests/test-ffado.cpp

@@ -351 +351 @@
-
-            int devices_on_bus = m_deviceManager->getNbDevices();
-ld, devices_on_bus = %d\n", 
+d, devices_on_bus = %d\n", (int)
-
-            for(i=0;i<devices_on_bus;i++) {
@@ -443 +443 @@
-        service.setVerboseLevel(arguments.verbose);
-        if ( !service.initialize( arguments.port ) ) {
-ld\n", 
+d\n", (int)
-            return exitfunction(-1);
-        }
@@ -455 +455 @@
-        
-        if (!service.setSplitTimeoutUsecs(nodeid, usecs)) {
-l
-
+
+(int)
-            return exitfunction(-1);
-        }
@@ -466 +466 @@
-        service.setVerboseLevel(arguments.verbose);
-        if ( !service.initialize( arguments.port ) ) {
-ld\n", 
+d\n", (int)
-            return exitfunction(-1);
-        }
@@ -478 +478 @@
-        int usecs = service.getSplitTimeoutUsecs(nodeid);
-        if (usecs < 0) {
-l
-
-
-
-l
-
+
+(int)
+
+
+
+(int)
-
-        return exitfunction(0);
@@ -511 +511 @@
-        uint64_t result_rcv = sytRecvToFullTicks(syt_timestamp, rcv_cycle, ctr_now);
-        uint64_t result_xmt = sytXmitToFullTicks(syt_timestamp, rcv_cycle, ctr_now);
-lX %010lu  XMT: 0x%010lX %010lu CTR: %010lu
+"PRIX64" %010"PRIu64"  XMT: 0x%010"PRIX64" %010"PRIu64" CTR: %010"PRIu64"
-               result_rcv, result_rcv, result_xmt, result_xmt, CYCLE_TIMER_TO_TICKS(ctr_now));
-