Changeset 1721

Timestamp:

11/22/09 07:26:31 (13 years ago)

Author:

ppalmers

Message:

fix all format string warnings

Files:

• branches/libffado-2.0/src/debugmodule/debugmodule.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp (modified) (9 diffs)
• branches/libffado-2.0/src/libieee1394/ieee1394service.cpp (modified) (11 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandler.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp (modified) (5 diffs)
• branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (8 diffs)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp (modified) (26 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) (29 diffs)
• branches/libffado-2.0/src/libutil/Configuration.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/libutil/PosixThread.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/libutil/serialize_expat.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libutil/serialize_libxml.cpp (modified) (2 diffs)
• 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/TimestampedBuffer.cpp (modified) (3 diffs)
• branches/libffado-2.0/support/firmware/fireworks-downloader.cpp (modified) (1 diff)
• branches/libffado-2.0/tests/streaming/teststreaming3.cpp (modified) (1 diff)
• branches/libffado-2.0/tests/systemtests/test-isoxmit-1.cpp (modified) (3 diffs)
• branches/libffado-2.0/tests/test-ffado.cpp (modified) (1 diff)

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

@@ -186 +186 @@
-    int chars_written=0;
-    int retval=0;
-d
+u
-                      ts_usec, getPreSequence( level ),
-                      fname,  line,  function );

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

@@ -249 +249 @@
-        // copy the payload
-        
-+readDescCmd.m_data_length>
+ + readDescCmd.m_data_length > 
-            debugWarning("Device returned too much data, truncating\n");
-            readDescCmd.m_data_length=m_descriptor_length-bytes_read;
-        }
-        
-
+
+
+
-        
-        memcpy(m_data+bytes_read,readDescCmd.m_data, readDescCmd.m_data_length);

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

@@ -291 +291 @@
-    cycle_timer_ticks = CYCLE_TIMER_TO_TICKS(cycle_timer);
-
-lu, local: %17l
+u, local: %17
-                        cycle_timer, local_time);
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                       (uint32_t)cycle_timer, (uint64_t)cycle_timer_ticks,
-                       (unsigned int)TICKS_TO_SECS( (uint64_t)cycle_timer_ticks ),
@@ -409 +409 @@
-    // // simulate a random scheduling delay between (0-10ms)
-    // ffado_microsecs_t tmp = Util::SystemTimeSource::SleepUsecRandom(10000);
-l
+
-
-    if(m_unhandled_busreset) {
@@ -419 +419 @@
-    }
-
-lu, local: %17l
+u, local: %17
-                        cycle_timer, local_time);
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-l
+
-                       (uint32_t)cycle_timer, (uint64_t)cycle_timer_ticks,
-                       (unsigned int)TICKS_TO_SECS( (uint64_t)cycle_timer_ticks ),
@@ -462 +462 @@
-            diff_ticks_corr = diff_ticks - ticks_late;
-            debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-l
+
-                               diff_ticks_corr, diff_ticks, ticks_late);
-        } else {
@@ -526 +526 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 
-l
+
-                           m_current_time_usecs, m_next_time_usecs, usecs_late, ticks_late);
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                           m_current_time_ticks, m_next_time_ticks, diff_ticks);
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                           (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,
-l
+
-                           (uint64_t)m_next_time_ticks,
-                           (unsigned int)TICKS_TO_SECS( (uint64_t)m_next_time_ticks ),
@@ -545 +545 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                           local_time, m_dll_e2, getRate());
-    }
@@ -625 +625 @@
-    if (y_step_in_ticks_int > 0) {
-        retval = addTicks(offset_in_ticks_int, y_step_in_ticks_int);
-ld, time_diff: %f, rate: %f, retval: %l
+d, time_diff: %f, rate: %f, retval: %
-                    y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/
-    } else {
@@ -631 +631 @@
-
-        // this can happen if the update thread was woken up earlier than it should have been
-ld, time_diff: %f, rate: %f, retval: %l
+d, time_diff: %f, rate: %f, retval: %
-                    y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/
-    }

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

@@ -509 +509 @@
-        #ifdef DEBUG
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-lX, length = %
+X, length = %l
-            nodeId, addr, length);
-        printBuffer( DEBUG_LEVEL_VERY_VERBOSE, length, buffer );
@@ -518 +518 @@
-        #ifdef DEBUG
-        debugOutput(DEBUG_LEVEL_NORMAL,
-lX, length = %
+X, length = %l
-                    nodeId, addr, length);
-        #endif
@@ -564 +564 @@
-
-    #ifdef DEBUG
-lX, length = %d
+X, length = %lu
-                nodeId, addr, length);
-    printBuffer( DEBUG_LEVEL_VERY_VERBOSE, length, data );
@@ -601 +601 @@
-    }
-    #ifdef DEBUG
-l
+
-                nodeId, addr);
-lX) *(addr)=0x%016l
+X) *(addr)=0x%016
-                compare_value, swap_value);
-    fb_octlet_t buffer;
@@ -609 +609 @@
-        debugWarning("Could not read register\n");
-    } else {
-l
+
-    }
-    #endif
@@ -633 +633 @@
-        debugWarning("Could not read register\n");
-    } else {
-l
+
-    }
-    #endif
@@ -827 +827 @@
-    fb_quadlet_t *data_quads = (fb_quadlet_t *)data;
-    #ifdef DEBUG
-d
+lu
-                nodeid, response, length);
-    printBuffer(DEBUG_LEVEL_VERY_VERBOSE, (length+3)/4, data_quads );
@@ -857 +857 @@
-            } else if(FCP_MASK_SUBUNIT_AND_OPCODE(first_quadlet) 
-                      != FCP_MASK_SUBUNIT_AND_OPCODE(CondSwapFromBus32(m_fcp_block.request[0]))) {
-lX != %08l
+X != %08
-                             FCP_MASK_SUBUNIT_AND_OPCODE(first_quadlet),
-                             FCP_MASK_SUBUNIT_AND_OPCODE(CondSwapFromBus32(m_fcp_block.request[0])));
@@ -921 +921 @@
-        return 0;
-    }
-l
+
-
-    if(!readNoLock( 0xffc0 | nodeId, CSR_REGISTER_BASE + CSR_SPLIT_TIMEOUT_LO, 1,
@@ -928 +928 @@
-        return 0;
-    }
-l
+
-
-    split_timeout_hi = CondSwapFromBus32(split_timeout_hi);
@@ -1381 +1381 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, " CycleTimerHelper: %p, IsoManager: %p, WatchDog: %p\n",
-                 m_pCTRHelper, m_pIsoManager, m_pWatchdog );
-l
+
-                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");
-lX, %lX, %lX, %lX, %ld, %ld, %ld, %l
+X, %X, %X, %X, %d, %ld, %ld, %
-                       cycle, pkt_ctr_ref, pkt_ctr, now, m_last_now, now_secs_ref, CYCLE_TIMER_GET_SECS(now), CYCLE_TIMER_GET_SECS(m_last_now), tmp);
-        debugWarning(" diffcy = %ld \n", diff_cycles);
@@ -490 +490 @@
-        if(((pkt_ctr & ~0x0FFFL) != pkt_ctr_ref) && (m_packets > m_buf_packets)) {
-            debugWarning("reconstructed CTR counter discrepancy\n");
-lX, %lX, %lX, %lX, %ld, %ld, %ld, %l
+X, %X, %X, %X, %d, %ld, %ld, %
-                        cycle, pkt_ctr_ref, pkt_ctr, now, m_last_now, now_secs_ref, CYCLE_TIMER_GET_SECS(now), CYCLE_TIMER_GET_SECS(m_last_now), tmp);
-            debugWarning(" diffcy = %ld \n", diff_cycles);

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

@@ -113 +113 @@
-
-        if (!h->handleBusReset()) {
-
+, h
-            retval = false;
-        }
@@ -331 +331 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-l
+
-                           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) {
-lX, last: %08lX, diff: %lld (max: %l
+X, last: %08X, diff: %ld (max: %
-                       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);
-d ts.nsec=%l
+ld ts.nsec=%
-                       this, m_activity_wait_timeout_nsec, ts.tv_sec, ts.tv_nsec);
-            return eAR_Error;
@@ -422 +422 @@
-            debugError("(%p) sem_timedwait error (result=%d errno=%d)\n", 
-                        this, result, errno);
-d ts.nsec=%l
+ld ts.nsec=%
-                       this, m_activity_wait_timeout_nsec, ts.tv_sec, ts.tv_nsec);
-            return eAR_Error;
@@ -888 +888 @@
-
-    m_StreamProcessors.push_back(stream);
-d streams, %d
+lu streams, %lu
-                                      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,
-l
+
-                           m_last_timestamp, m_syt_interval, getTicksPerFrame());
-/*        debugOutput(DEBUG_LEVEL_NORMAL,
-lu ticks | delta_t: %5l
+u ticks | delta_t: %5
-                           m_last_timestamp, now_t-last_t, m_data_buffer->getBufferFill());*/
-    }

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

@@ -141 +141 @@
-        {
-            debugOutput( DEBUG_LEVEL_NORMAL,
-
+l
-                         fc, CYCLE_TIMER_GET_CYCLES(pkt_ctr), 
-                         transmit_at_cycle, cycles_until_transmit );
@@ -200 +200 @@
-            // we are too late
-            debugOutput(DEBUG_LEVEL_VERBOSE,
-u, TC=%04u, CUT=%04d, TSP=%011l
+lu, TC=%04u, CUT=%04d, TSP=%011
-                        CYCLE_TIMER_GET_CYCLES(pkt_ctr),
-                        transmit_at_cycle, cycles_until_transmit,
@@ -229 +229 @@
-            // for timestamp tracing
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                               presentation_time,
-                               (unsigned int)CYCLE_TIMER_GET_CYCLES(pkt_ctr),
@@ -239 +239 @@
-        {
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                               CYCLE_TIMER_GET_CYCLES(pkt_ctr),
-                               transmit_at_cycle, cycles_until_transmit,
@@ -248 +248 @@
-            {
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                                   CYCLE_TIMER_GET_CYCLES(pkt_ctr),
-                                   transmit_at_cycle, cycles_until_transmit,
@@ -269 +269 @@
-    {
-        debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-l
+
-                           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,
-l
+
-                       CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp,
-                       (unsigned int)TICKS_TO_CYCLES(m_last_timestamp));
@@ -338 +338 @@
-    struct iec61883_packet *packet = ( struct iec61883_packet * ) data;
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-l
+
-                       CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp,
-                       (unsigned int)TICKS_TO_CYCLES(m_last_timestamp) );

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);
-l
+
-            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,
-u rather large TSP difference TS=%011llu => TS=%011l
+lu rather large TSP difference TS=%011lu => TS=%011
-                                CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp2,
-                                m_last_timestamp, diff, ticks_per_packet);
@@ -410 +410 @@
-                    diff = diffTicks(last_timestamp_fixed, m_last_timestamp2);
-                    if(diff-ticks_per_packet < 50 && diff-ticks_per_packet > -50) {
-u rather large TSP difference TS=%011llu => TS=%011l
+lu rather large TSP difference TS=%011lu => TS=%011
-                                    CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp2,
-                                    m_last_timestamp, diff, ticks_per_packet);
@@ -420 +420 @@
-                        diff = diffTicks(last_timestamp_fixed, m_last_timestamp2);
-                        if(diff-ticks_per_packet < 50 && diff-ticks_per_packet > -50) {
-u rather large TSP difference TS=%011llu => TS=%011l
+lu rather large TSP difference TS=%011lu => TS=%011
-                                        CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp2,
-                                        m_last_timestamp, diff, ticks_per_packet);
@@ -429 +429 @@
-                }
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-lu %011l
+u %011
-                                CYCLE_TIMER_GET_CYCLES(pkt_ctr),
-                                m_last_timestamp2, m_last_timestamp, 
@@ -437 +437 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                          CYCLE_TIMER_GET_CYCLES(pkt_ctr),
-                          m_last_timestamp);
@@ -606 +606 @@
-        if (result == eCRV_Packet) {
-            debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                               CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp);
-
@@ -657 +657 @@
-        if (result == eCRV_Packet || result == eCRV_Defer) {
-            debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-l
+
-                               CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp);
-
@@ -694 +694 @@
-            if (m_last_timestamp > 0 && m_last_timestamp2 > 0) {
-                int64_t tsp_diff = diffTicks(m_last_timestamp, m_last_timestamp2);
-l
+
-                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: %011l
+u, m_last_timestamp2: %011
-//                            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,
-d, rather large TSP difference TS=%011llu => TS=%011l
+ld, rather large TSP difference TS=%011lu => TS=%011
-                                CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp2,
-                                m_last_timestamp, diff, ticks_per_packet);
-                }
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-d %011llu %011l
+ld %011lu %011
-                                CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp2,
-                                m_last_timestamp, diff, ticks_per_packet);
@@ -757 +757 @@
-            goto send_empty_packet;
-        } else if (result == eCRV_Again) {
-
+l
-            if(m_state != m_next_state) {
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state from %s to %s\n",
@@ -809 +809 @@
-    bool result;
-    debugOutputExtreme( DEBUG_LEVEL_VERBOSE,
-l
+
-                        this, getTypeString(), nbframes, ts);
-    assert( getType() == ePT_Receive );
@@ -840 +840 @@
-    lag_frames = (((float)lag_ticks) / srate);
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-ld, %l
+d, %
-                       this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    if (lag_frames >= 1.0) {
-        // the stream lags
-ld, %l
+d, %
-                      this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    } else if (lag_frames <= -1.0) {
-        // the stream leads
-ld, %l
+d, %
-                      this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-    }
@@ -862 +862 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                       this, nbframes, ts);
-    // dry run on this side means that we put silence in all enabled ports
@@ -873 +873 @@
-{
-    bool result;
-l
+
-    result = m_data_buffer->dropFrames(nbframes);
-    SIGNAL_ACTIVITY_ISO_RECV;
@@ -883 +883 @@
-    bool result;
-    debugOutputExtreme( DEBUG_LEVEL_VERBOSE,
-l
+
-                        this, getTypeString(), nbframes, ts);
-    assert( getType() == ePT_Transmit );
@@ -896 +896 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-l
+
-                       nbframes, ts);
-    // transfer the data
-    m_data_buffer->blockProcessWriteFrames(nbframes, ts);
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-l
+
-    return true; // FIXME: what about failure?
-}
@@ -909 +909 @@
-{
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-l
+
-                       nbframes, ts);
-    // do nothing
@@ -919 +919 @@
-{
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-                       nbframes, ts);
-
@@ -1070 +1070 @@
-    // make the scratch buffer one period of frames long
-    m_scratch_buffer_size_bytes = m_StreamProcessorManager.getPeriodSize() * getEventsPerFrame() * getEventSize();
-d quadlets\n"
+ld quadlets\n", m_scratch_buffer_size_bytes
-    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();
-l
+
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-l
+
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1205 +1205 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-l
+
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-l
+
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1229 +1229 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-l
+
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-l
+
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1254 +1254 @@
-    #ifdef DEBUG
-    uint64_t now = m_1394service.getCycleTimerTicks();
-l
+
-                          now,
-                          (unsigned int)TICKS_TO_SECS(now),
-                          (unsigned int)TICKS_TO_CYCLES(now),
-                          (unsigned int)TICKS_TO_OFFSET(now));
-l
+
-                          tx,
-                          (unsigned int)TICKS_TO_SECS(tx),
@@ -1901 +1901 @@
-    }
-    uint64_t now = m_1394service.getCycleTimerTicks();
-l
+
-                        now,
-                        (unsigned int)TICKS_TO_SECS(now),

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

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

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

@@ -197 +197 @@
-            // we are too late
-            debugOutput(DEBUG_LEVEL_VERBOSE,
-l
+
-                        cycle,
-                        transmit_at_cycle, cycles_until_transmit,
@@ -232 +232 @@
-        {
-            debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-lu (%04u), TSP=%011l
+u (%04u), TSP=%011
-                        cycle,
-                        transmit_at_cycle, cycles_until_transmit,
@@ -241 +241 @@
-            {
-                debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
-lu (%04u), TSP=%011l
+u (%04u), TSP=%011
-                            cycle,
-                            transmit_at_cycle, cycles_until_transmit,
@@ -289 +289 @@
-    uint32_t pkt_ctr )
-{
-u, TSP=%011l
+lu, TSP=%011
-                CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp, 
-                ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) );
@@ -318 +318 @@
-    unsigned int cycle = CYCLE_TIMER_GET_CYCLES(pkt_ctr);
-
-l
+
-                 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);
-ld ts.sec=%d ts.nsec=%l
+d ts.sec=%ld ts.nsec=%
-                       this, m_activity_wait_timeout_nsec, ts.tv_sec, ts.tv_nsec);
-            return eAR_Error;
@@ -198 +198 @@
-            debugError("(%p) sem_[timed]wait error (result=%d errno=%d)\n", 
-                        this, result, errno);
-ld ts.sec=%d ts.nsec=%l
+d ts.sec=%ld ts.nsec=%
-                       this, m_activity_wait_timeout_nsec, ts.tv_sec, ts.tv_nsec);
-            return eAR_Error;
@@ -540 +540 @@
-        #ifdef DEBUG
-        int64_t now = Util::SystemTimeSource::getCurrentTime();
-l
-l
+
+
-        #endif
-    
@@ -549 +549 @@
-        #ifdef DEBUG
-        now = Util::SystemTimeSource::getCurrentTime();
-l
+
-        #endif
-    }
@@ -570 +570 @@
-    // figure out where we are now
-    uint64_t time_of_first_sample = m_SyncSource->getTimeAtPeriod();
-l
+
-        time_of_first_sample,
-        (unsigned int)TICKS_TO_SECS(time_of_first_sample),
@@ -587 +587 @@
-    time_of_first_sample = addTicks(time_of_first_sample,
-                                    time_for_startup_ticks);
-l
+
-        time_for_startup_frames, time_for_startup_ticks);
-
-l
+
-        time_of_first_sample,
-        (unsigned int)TICKS_TO_SECS(time_of_first_sample),
@@ -603 +603 @@
-    uint64_t time_to_start_recv = substractTicks(time_of_first_sample,
-                                                 prestart_cycles_for_recv * TICKS_PER_CYCLE);
-l
+
-        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));
-l
+
-        time_to_start_recv,
-        (unsigned int)TICKS_TO_SECS(time_to_start_recv),
@@ -660 +660 @@
-        signed int fc;
-        (*it)->getBufferHeadTimestamp ( &ts, &fc );
-ld => head TS %010lld
+d => head TS %010lu
-                    time_of_first_sample, (uint64_t)ts, fc);
-    }
@@ -690 +690 @@
-    }
-    if(!m_SyncSource->scheduleStartRunning(time_to_start_sync)) {
-l
+
-        return false;
-    }
@@ -700 +700 @@
-        if(*it != m_SyncSource) {
-            if(!(*it)->scheduleStartRunning(time_to_start_recv)) {
-l
+
-                return false;
-            }
@@ -710 +710 @@
-        if(*it != m_SyncSource) {
-            if(!(*it)->scheduleStartRunning(time_to_start_xmit)) {
-l
+
-                return false;
-            }
@@ -743 +743 @@
-    #endif
-
-l
+
-                m_time_of_transfer, rate);
-
@@ -762 +762 @@
-
-    int64_t transmit_tail_timestamp = addTicks(m_time_of_transfer, delay_in_ticks);
-l
+
-                transmit_tail_timestamp, rate);
-
@@ -773 +773 @@
-        signed int fc;
-        (*it)->getBufferHeadTimestamp ( &ts, &fc );
-l
+
-                    (uint64_t)ts, fc);
-    }
@@ -830 +830 @@
-                StreamProcessor *s = m_ReceiveProcessors.at(i);
-                diff = diffTicks(m_SyncSource->getTimeAtPeriod(), s->getTimeAtPeriod());
-l
+
-                    m_SyncSource, s, diff);
-                if ( nb_sync_runs == periods_per_align_try ) {
@@ -850 +850 @@
-            diff_between_streams[i] /= periods_per_align_try;
-            diff_between_streams_frames[i] = (int)roundf(diff_between_streams[i] / s->getTicksPerFrame());
-l
+
-                m_SyncSource, s, diff_between_streams[i], diff_between_streams_frames[i]);
-
@@ -1100 +1100 @@
-    #ifdef DEBUG
-    int64_t now = Util::SystemTimeSource::getCurrentTime();
-l
-l
+
+
-    #endif
-
@@ -1109 +1109 @@
-    #ifdef DEBUG
-    now = Util::SystemTimeSource::getCurrentTime();
-l
+
-    #endif
-
@@ -1239 +1239 @@
-    // so 50 ticks = 10%, which is a rather large jitter value.
-    if(diff-ticks_per_period > 50 || diff-ticks_per_period < -50) {
-lu => TS=%011l
+u => TS=%011
-                                            m_time_of_transfer2, m_time_of_transfer, diff, ticks_per_period);
-    }
@@ -1246 +1246 @@
-
-    debugOutputExtreme(DEBUG_LEVEL_VERBOSE,
-l
+
-                        m_nbperiods, m_time_of_transfer);
-
@@ -1262 +1262 @@
-    }
-    debugOutputExtreme( DEBUG_LEVEL_VERY_VERBOSE, 
-l
+
-                        m_time_of_transfer, rcv_bf, xmt_bf, rcv_bf+xmt_bf);
-
@@ -1335 +1335 @@
-    if(m_SyncSource == NULL) return false;
-    debugOutputExtreme( DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-        t, m_time_of_transfer,
-        (unsigned int)TICKS_TO_SECS(m_time_of_transfer),
@@ -1349 +1349 @@
-                ++it ) {
-            if(!(*it)->getFrames(m_period, m_time_of_transfer)) {
-l
+
-                            m_period, m_time_of_transfer,*it);
-                retval &= false; // buffer underrun
@@ -1372 +1372 @@
-
-            if(!(*it)->putFrames(m_period, transmit_timestamp)) {
-l
+
-                        m_period, transmit_timestamp, *it);
-                retval &= false; // buffer underrun
@@ -1413 +1413 @@
-    if(m_SyncSource == NULL) return false;
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-l
+
-        t, m_time_of_transfer,
-        (unsigned int)TICKS_TO_SECS(m_time_of_transfer),
@@ -1427 +1427 @@
-                ++it ) {
-            if(!(*it)->dropFrames(m_period, m_time_of_transfer)) {
-l
+
-                            m_period, m_time_of_transfer,*it);
-                retval &= false; // buffer underrun
@@ -1450 +1450 @@
-
-            if(!(*it)->putSilenceFrames(m_period, transmit_timestamp)) {
-l
+
-                        m_period, transmit_timestamp, *it);
-                retval &= false; // buffer underrun
@@ -1623 +1623 @@
-        #ifdef DEBUG
-        if(idx >= (int)m_CapturePorts_shadow.size()) {
-d
+lu
-            return NULL;
-        }
@@ -1631 +1631 @@
-        #ifdef DEBUG
-        if(idx >= (int)m_PlaybackPorts_shadow.size()) {
-d
+lu
-            return NULL;
-        }

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

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

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

@@ -142 +142 @@
-        if ((res = pthread_create(&fThread, &attributes, ThreadHandler, this))) {
-            debugError("Cannot create realtime thread (%d: %s)\n", res, strerror(res));
- %s
+
-            return -1;
-        }
@@ -162 +162 @@
-{
-    if (fThread) { // If thread has been started
-
+(void *)
-        void* status;
-        pthread_cancel(fThread);
-        pthread_join(fThread, &status);
-
+(void *)
-        return 0;
-    } else {
@@ -176 +176 @@
-{
-    if (fThread) { // If thread has been started
-
+(void *)
-        void* status;
-        fRunning = false; // Request for the thread to stop
-        pthread_join(fThread, &status);
-
+(void *)
-        return 0;
-    } 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;
-l
+
-            n.set_child_text( valstr );
-            free( valstr );

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

@@ -89 +89 @@
-
-{
-
+ll
-                 strMemberName.c_str(), value );
-
@@ -266 +266 @@
-            value = strtoll( pElement->get_child_text()->get_content().c_str(),
-                             &tail, 0 );
-
+ll
-                         strMemberName.c_str(), value );
-            return true;

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

@@ -55 +55 @@
-void StreamStatistics::dumpInfo() {
-    debugOutputShort( DEBUG_LEVEL_VERBOSE, 
-l
+
-                      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,
-l
+
-                (int64_t)ts.tv_sec, (int64_t)ts.tv_nsec);
-    int err = clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &ts, NULL);

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

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

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

@@ -213 +213 @@
-
-    if (node_id < 0) {
-l
+
-        return -1;
-    }

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

@@ -264 +264 @@
-    }
-
-
+l
-    setDebugLevel(arguments.verbose);
-

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

@@ -232 +232 @@
-    }
-
-
+l
-    setDebugLevel(arguments.verbose);
-
@@ -243 +243 @@
-    }
-
-
+l
-    do
-    {
@@ -270 +270 @@
-    raw1394_set_bus_reset_handler(handle, myResetHandler);
-
-
+l
-    set_realtime_priority(arguments.rtprio);
-

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

@@ -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 %010llu  XMT: 0x%010llX %010llu CTR: %010l
+X %010lu  XMT: 0x%010lX %010lu CTR: %010
-               result_rcv, result_rcv, result_xmt, result_xmt, CYCLE_TIMER_TO_TICKS(ctr_now));
-