Changeset 1720

Timestamp:

11/22/09 06:40:08 (14 years ago)

Author:

ppalmers

Message:

add an attribute to the debug printing functions that makes them check their variable argument list. also fix a few of the warnings that result from this. more to come later.

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) (12 diffs)
• branches/libffado-2.0/src/bebob/focusrite/focusrite_saffire.cpp (modified) (1 diff)
• branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (4 diffs)
• branches/libffado-2.0/src/debugmodule/debugmodule.cpp (modified) (1 diff)
• branches/libffado-2.0/src/debugmodule/debugmodule.h (modified) (2 diffs)
• branches/libffado-2.0/src/DeviceStringParser.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/fireworks/efc/efc_cmds_flash.cpp (modified) (4 diffs)
• branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware_ctrl.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/fireworks/efc/efc_cmds_ioconfig.cpp (modified) (1 diff)
• branches/libffado-2.0/src/fireworks/efc/efc_cmds_mixer.cpp (modified) (1 diff)
• branches/libffado-2.0/src/fireworks/efc/efc_cmds_monitor.cpp (modified) (1 diff)
• branches/libffado-2.0/src/fireworks/fireworks_control.cpp (modified) (4 diffs)
• branches/libffado-2.0/src/fireworks/fireworks_device.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp (modified) (3 diffs)
• 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/descriptors/avc_descriptor_cmd.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) (9 diffs)
• branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp (modified) (15 diffs)
• branches/libffado-2.0/src/motu/motu_controls.cpp (modified) (6 diffs)
• branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp (modified) (2 diffs)

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

@@ -724 +724 @@
-
-    char* configId;
-l
+
-    if ( !configId ) {
-        debugError( "could not create id string\n" );
@@ -800 +800 @@
-    // come up with an unique file name for the current settings
-    char* configId;
-l
+
-    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 "
-d
+lu
-                        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 ) ) {
-d
+lu
-                    sizeof( fb_quadlet_t ),
-                    BCDFileVersionOffset );
@@ -245 +245 @@
-    size_t bytes_read = std::fread( q, 1, sizeof( *q ), m_file );
-    if ( bytes_read  != sizeof( *q ) ) {
-d
+lu
-                    sizeof( *q ),  addr );
-        return false;
@@ -263 +263 @@
-    size_t bytes_read = std::fread( o, 1, sizeof( *o ), m_file );
-    if ( bytes_read  != sizeof( *o ) ) {
-d
+lu
-                    sizeof( *o ), addr );
-        return false;
@@ -281 +281 @@
-    size_t bytes_read = std::fread( b, 1, len, m_file );
-    if ( bytes_read  != len ) {
-d
+lu
-                    len, addr );
-        return false;

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

@@ -58 +58 @@
-FocusriteDevice::setSpecificValue(uint32_t id, uint32_t v)
-{
-lX (%u), data: 0x%08l
+X (%u), data: 0x%08
-        id, id, v);
-    bool use_avc = false;
@@ -69 +69 @@
-    if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) {
-        ffado_microsecs_t wait = m_earliest_next_cmd_time - now;
-l
+
-        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;
-l
+
-        Util::SystemTimeSource::SleepUsecRelative(wait);
-    }
@@ -105 +105 @@
-        retval = getSpecificValueARM(id, v);
-    }
-lX (%u): %08l
+X (%u): %08
-    return retval;
-}
@@ -161 +161 @@
-FocusriteDevice::setSpecificValueARM(uint32_t id, uint32_t v)
-{
-=
-lX (%u), data: 0x%08l
+ = 
+X (%u), data: 0x%08
-        id, id, data);
-
@@ -169 +169 @@
-
-    if(!get1394Service().write_quadlet( nodeId, addr, CondSwapToBus32(data) ) ) {
-
+l
-        return false;
-    }
@@ -179 +179 @@
-{
-    fb_quadlet_t result;
-l
+
-
-    fb_nodeaddr_t addr = FR_PARAM_SPACE_START + (id * 4);
@@ -185 +185 @@
-
-    if(!get1394Service().read_quadlet( nodeId, addr, &result ) ) {
-llX addr 0x%012l
-
-
-
-=
-ll
+X addr 0x%012
+
+
+
+ = 
+
-
-    *v = result;
@@ -385 +385 @@
-RegisterControl::setValue(uint64_t addr, uint64_t v)
-{
-lu to %l
+u to %
-                                     addr, v);
-
@@ -403 +403 @@
-        return 0;
-    } else {
-lu = %l
+u = %
-                                         addr, val);
-        return val;
@@ -576 +576 @@
-    struct sCellInfo c = m_CellInfo.at(row).at(col);
-
-l
+
-                                     c.address, row, col, val, v);
-
@@ -597 +597 @@
-        return 0;
-    } else {
-l
+
-                                         c.address, row, col, 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;
-l
+
-                     m_cmd_time_interval );
-    } else {
-        m_cmd_time_interval = 10000;
-l
+
-                     m_cmd_time_interval );
-    }

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

@@ -423 +423 @@
-        return;
-    }
-l
+
-
-    switch(sync & FR_SAFFIREPRO_CMD_ID_SYNC_CONFIG_MASK) {
-        default:
-l
+
-        case FR_SAFFIREPRO_CMD_SYNC_CONFIG_INTERNAL:
-            m_internal_clocksource.active=true;
@@ -466 +466 @@
-            break;
-        default:
-l
+
-    }
-}
@@ -772 +772 @@
-                break;
-            }
- 
+, ntries
-        }
-
@@ -872 +872 @@
-    }
-
-
-
+
-    return v;
-}

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

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

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

@@ -290 +290 @@
-    void printShort( debug_level_t level,
-                     const char* format,
-
+
+
+
+
+
-
-    void print( debug_level_t level,
@@ -297 +301 @@
-                unsigned int  line,
-                const char*   format,
-
+
+
+
+
+
-
-    bool setLevel( debug_level_t level )

branches/libffado-2.0/src/DeviceStringParser.cpp

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

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

@@ -68 +68 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Erase:\n");
-l
+
-}
-
@@ -120 +120 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Read:\n");
-l
-l
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Data              : \n");
-    for (unsigned int i=0; i < m_nb_quadlets; i++) {
@@ -174 +174 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Write:\n");
-l
-l
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Data              : \n");
-    for (unsigned int i=0; i < m_nb_quadlets; i++) {
@@ -292 +292 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Get Session Base:\n");
-l
+
-}
-

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);
-l
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " HwType  : 0x%08X\n", m_type);
-l
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Vendor  : %s\n", m_vendor_name);
-    debugOutput(DEBUG_LEVEL_NORMAL, " Model   : %s\n", m_model_name);
@@ -232 +232 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, " # Output Meters : %d\n", m_nb_output_meters);
-    for (i=0;i<m_nb_output_meters;i++) {
-l
+
-    }
-    
-    debugOutput(DEBUG_LEVEL_NORMAL, " # Input Meters  : %d\n", m_nb_input_meters);
-    for (;i<m_nb_output_meters+m_nb_input_meters;i++) {
-l
+
-    }
-}

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

@@ -73 +73 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Get Clock:\n");
-l
-l
-l
+
+
+
-}
-
@@ -124 +124 @@
-    EfcCmd::showEfcCmd();
-    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Set Clock:\n");
-l
-l
-l
+
+
+
-}
-

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

@@ -162 +162 @@
-                                    (m_type==eCT_Get?"GET":"SET"),
-                                    eIOConfigRegisterToString(m_reg));
-l
+
-}
-

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

@@ -245 +245 @@
-                                    eMixerTargetToString(m_target),
-                                    eMixerCommandToString(m_command));
-l
-l
+
+
-}
-

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

@@ -150 +150 @@
-                                    (m_type==eCT_Get?"GET":"SET"),
-                                    eMonitorCommandToString(m_command));
-l
-l
-l
+
+
+
-}
-

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

@@ -321 +321 @@
-            break;
-        }
-lf
+u
-                                            m_Slave->m_channel, val, m_Slave->m_value);
-        return true;
@@ -339 +339 @@
-            return 0.0;
-        }
-lf
+u
-                                            m_Slave->m_channel, m_Slave->m_value);
-        return m_Slave->m_value;
@@ -451 +451 @@
-        }
-
-l
+
-                                            m_Slave->m_channel, val, old_reg, reg);
-        return true;
@@ -583 +583 @@
-            return 0;
-        }
-l
+
-        return true;
-    } else {

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

@@ -560 +560 @@
-Device::clockIdToClockSource(uint32_t clockid) {
-    ClockSource s;
-l
+
-
-    // the polled values are used to detect
@@ -624 +624 @@
-        return EFC_CMD_HW_CLOCK_UNSPECIFIED;
-    }
-l
+
-    gccmd.showEfcCmd();
-
@@ -637 +637 @@
-        return false;
-    }
-l
+
-
-    EfcSetClockCmd sccmd;

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

@@ -172 +172 @@
-    unsigned int version_minor = (m_version & 0x00FF0000) >> 16;
-    unsigned int version_build = (m_version & 0x0000FFFF);
-l
-l
-l
-l
+
+
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL, " Firmware version     : %02u.%02u.%02u (0x%08X)\n", 
-                                    version_major, version_minor, version_build, m_version);
-    debugOutput(DEBUG_LEVEL_NORMAL, " Append CRC           : %s\n", (m_append_crc?"Yes":"No"));
-l
+
-    #endif
-}
@@ -298 +298 @@
-        }
-        
-l
+
-                    i, m_header[i]);
-    }
@@ -337 +337 @@
-        }
-        
-l
+
-                    i, m_data[i]);
-    }

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

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

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

@@ -254 +254 @@
-        }
-        
-
+l
-        
-        memcpy(m_data+bytes_read,readDescCmd.m_data, readDescCmd.m_data_length);

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

@@ -120 +120 @@
-        break;
-    default:
-s
+d
-        return false;
-    }

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

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

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

@@ -484 +484 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, 
-l
+
-                 getGuid());
-
@@ -515 +515 @@
-
-        debugOutput( DEBUG_LEVEL_VERBOSE,
-l
+
-                        guid);
-
@@ -522 +522 @@
-            if ( nodeId != getNodeId() ) {
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-l
+
-                             "from %d to %d\n",
-                             getGuid(),
@@ -530 +530 @@
-            } else {
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-l
+
-                             getGuid(),
-                             getNodeId());
@@ -547 +547 @@
-
-    debugOutput( DEBUG_LEVEL_VERBOSE,
-l
+
-                 "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() );
-l
+
-    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() );
-l
+
-    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) {
-l
+
-        }
-#endif
@@ -118 +118 @@
-#ifdef DEBUG
-        if (x < 0) {
-l
+
-        }
-#endif
@@ -145 +145 @@
-#ifdef DEBUG
-        if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) {
-l
+
-        }
-        if (x < 0) {
-l
+
-        }
-#endif
@@ -249 +249 @@
-    if(diff > max || diff < -max) {
-        debugWarning("difference does not make any sense\n");
-ld max=%l
+d max=%
-        
-    }
@@ -313 +313 @@
-    int diff_cycles = diffCycles(cc_cycles, rcv_cycle);
-    if (diff_cycles<0) {
-l
+
-                        rcv_cycle, cc_cycles, diff_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=%04
+u TSC=%08lX SYT=%04l
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }
@@ -433 +433 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-lu TSC=%08lX SYT=%04
+u TSC=%08lX SYT=%04l
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }
@@ -467 +467 @@
-    int diff_cycles = diffCycles(xmt_cycle, cc_cycles);
-    if (diff_cycles<0) {
-l
+
-                        xmt_cycle, cc_cycles, diff_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=%04
+u TSC=%08lX SYT=%04l
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }

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

@@ -164 +164 @@
-                        m_cycle_timer_prev, maxtries2);
-        }
-lu, local: %17l
+u, local: %17
-                            m_cycle_timer_prev, local_time);
-        debugOutput(DEBUG_LEVEL_VERBOSE,
-l
+
-                           (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 ),
@@ -310 +310 @@
-                bw_abs, bw_rel);
-    debugOutput(DEBUG_LEVEL_VERBOSE,
-lu, ticks/update: %l
+u, ticks/update: %
-                m_usecs_per_update, m_ticks_per_update, m_dll_e2);
-    debugOutput(DEBUG_LEVEL_VERBOSE,
@@ -351 +351 @@
-        ffado_microsecs_t now = Util::SystemTimeSource::getCurrentTimeAsUsecs();
-        int sleep_time = m_sleep_until - now;
-ld/%f (now: %l
+d/%f (now: %
-                    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) %l
+d, max: +/- %u (try: %d) %
-                        this, err_ticks, 1*TICKS_PER_CYCLE, ntries, expected_ticks);
-            // sleep half a cycle to make sure the hardware moved on
@@ -409 +409 @@
-    // // simulate a random scheduling delay between (0-10ms)
-    // ffado_microsecs_t tmp = Util::SystemTimeSource::SleepUsecRandom(10000);
-l
+
-
-    if(m_unhandled_busreset) {
@@ -436 +436 @@
-    } else if (diff_ticks > m_ticks_per_update * 20) {
-        debugOutput(DEBUG_LEVEL_VERBOSE,
-l
+
-                    diff_ticks, (float)(m_ticks_per_update * 20));
-        if(!initDLL()) {
@@ -462 +462 @@
-            diff_ticks_corr = diff_ticks - ticks_late;
-            debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
-ld, diff_ticks = %lld, ticks_late = %l
+d, diff_ticks = %ld, ticks_late = %
-                               diff_ticks_corr, diff_ticks, ticks_late);
-        } else {
@@ -473 +473 @@
-        // makes no sense if not running realtime
-        if(m_realtime && usecs_late > 1000) {
-l
+
-        }
-        #endif
@@ -526 +526 @@
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 
-ld ticks_late=%l
+d ticks_late=%
-                           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,
@@ -589 +589 @@
-    }
-    int32_t ctr_diff = cycle_timer_ticks-dll_time;
-lu - DLL %010lu = %010l
+u - DLL %010u = %010
-                this, cycle_timer_ticks, dll_time, ctr_diff, (ctr_diff>0?"lag":"lead"));
-#endif
@@ -625 +625 @@
-    if (y_step_in_ticks_int > 0) {
-        retval = addTicks(offset_in_ticks_int, y_step_in_ticks_int);
-l
+
-                    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
-l
+
-                    y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/
-    }
@@ -792 +792 @@
-        if (diffTicks(cycle_timer_ticks, m_cycle_timer_ticks_prev) < 0) {
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,
-lu -> %l
+u -> %
-                        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,
-l
+
-                        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,
-l
+
-                        m_cycle_timer_ticks_prev,
-                        (unsigned int)TICKS_TO_SECS( m_cycle_timer_ticks_prev ),

branches/libffado-2.0/src/motu/motu_controls.cpp

@@ -301 +301 @@
-    if (v > 0x80)
-      v = 0x80;
-l
+
-      row, col, val, v);
-    reg = getCellRegister(row,col);
@@ -331 +331 @@
-    val = m_parent.ReadRegister(reg) & 0xff;
-
-l
+
-      row, col, val);
-    return val;
@@ -353 +353 @@
-      v = 0x80;
-
-l
+
-      row, col, val, v);
-    reg = getCellRegister(row,col);
@@ -387 +387 @@
-    val = ((val >> 8) & 0xff) - 0x40;
-
-l
+
-      row, col, val);
-    return val;
@@ -414 +414 @@
-    uint32_t v, reg;
-
-l
+
-      row, col, val, val==0?0:1);
-    reg = getCellRegister(row,col);
@@ -460 +460 @@
-    val = (val & m_value_mask) != 0;
-
-l
+
-      row, col, val);
-    return val;

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

@@ -188 +188 @@
-    }
-
-
+l
-    do
-    {
@@ -225 +225 @@
-    }
-
-
+l
-    set_realtime_priority(arguments.rtprio);
-