Changeset 1720

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

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/src/bebob/bebob_avdevice.cpp

    r1407 r1720  
    724724 
    725725    char* configId; 
    726     asprintf(&configId, "%016llx", getConfigurationId() ); 
     726    asprintf(&configId, "%016lx", getConfigurationId() ); 
    727727    if ( !configId ) { 
    728728        debugError( "could not create id string\n" ); 
     
    800800    // come up with an unique file name for the current settings 
    801801    char* configId; 
    802     asprintf(&configId, "%016llx", BeBoB::AvDevice::getConfigurationId() ); 
     802    asprintf(&configId, "%016lx", BeBoB::AvDevice::getConfigurationId() ); 
    803803    if ( !configId ) { 
    804804        debugError( "Could not create id string\n" ); 
  • branches/libffado-2.0/src/bebob/bebob_avplug.cpp

    r1241 r1720  
    583583        { 
    584584            debugError( "number of output plugs (%d) disagree with " 
    585                         "number of elements in plug address vector (%d)\n", 
     585                        "number of elements in plug address vector (%lu)\n", 
    586586                        infoType->m_plugOutput->m_nrOfOutputPlugs, 
    587587                        infoType->m_plugOutput->m_outputPlugAddresses.size()); 
  • branches/libffado-2.0/src/bebob/bebob_dl_bcd.cpp

    r864 r1720  
    154154    bytes_read = fread( &m_bcd_version, 1, sizeof( fb_quadlet_t ), m_file ); 
    155155    if ( bytes_read != sizeof( fb_quadlet_t ) ) { 
    156         debugError( "parse: %d bytes read at position %d failed\n", 
     156        debugError( "parse: %lu bytes read at position %d failed\n", 
    157157                    sizeof( fb_quadlet_t ), 
    158158                    BCDFileVersionOffset ); 
     
    245245    size_t bytes_read = std::fread( q, 1, sizeof( *q ), m_file ); 
    246246    if ( bytes_read  != sizeof( *q ) ) { 
    247         debugError( "read: %d byte read failed at position 0x%08x\n", 
     247        debugError( "read: %lu byte read failed at position 0x%08x\n", 
    248248                    sizeof( *q ),  addr ); 
    249249        return false; 
     
    263263    size_t bytes_read = std::fread( o, 1, sizeof( *o ), m_file ); 
    264264    if ( bytes_read  != sizeof( *o ) ) { 
    265         debugError( "read: %d byte read failed at position 0x%08x\n", 
     265        debugError( "read: %lu byte read failed at position 0x%08x\n", 
    266266                    sizeof( *o ), addr ); 
    267267        return false; 
     
    281281    size_t bytes_read = std::fread( b, 1, len, m_file ); 
    282282    if ( bytes_read  != len ) { 
    283         debugError( "read: %d byte read failed at position 0x%08x\n", 
     283        debugError( "read: %lu byte read failed at position 0x%08x\n", 
    284284                    len, addr ); 
    285285        return false; 
  • branches/libffado-2.0/src/bebob/focusrite/focusrite_generic.cpp

    r1524 r1720  
    5858FocusriteDevice::setSpecificValue(uint32_t id, uint32_t v) 
    5959{ 
    60     debugOutput(DEBUG_LEVEL_VERBOSE, "Writing parameter address space id 0x%08lX (%u), data: 0x%08lX\n", 
     60    debugOutput(DEBUG_LEVEL_VERBOSE, "Writing parameter address space id 0x%08X (%u), data: 0x%08X\n", 
    6161        id, id, v); 
    6262    bool use_avc = false; 
     
    6969    if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) { 
    7070        ffado_microsecs_t wait = m_earliest_next_cmd_time - now; 
    71         debugOutput( DEBUG_LEVEL_VERBOSE, "Rate control... %llu\n", wait ); 
     71        debugOutput( DEBUG_LEVEL_VERBOSE, "Rate control... %lu\n", wait ); 
    7272        Util::SystemTimeSource::SleepUsecRelative(wait); 
    7373    } 
     
    9494    if(m_cmd_time_interval && (m_earliest_next_cmd_time > now)) { 
    9595        ffado_microsecs_t wait = m_earliest_next_cmd_time - now; 
    96         debugOutput( DEBUG_LEVEL_VERBOSE, "Rate control... %llu\n", wait ); 
     96        debugOutput( DEBUG_LEVEL_VERBOSE, "Rate control... %lu\n", wait ); 
    9797        Util::SystemTimeSource::SleepUsecRelative(wait); 
    9898    } 
     
    105105        retval = getSpecificValueARM(id, v); 
    106106    } 
    107     debugOutput(DEBUG_LEVEL_VERBOSE,"Read parameter address space id 0x%08lX (%u): %08lX\n", id, id, *v); 
     107    debugOutput(DEBUG_LEVEL_VERBOSE,"Read parameter address space id 0x%08X (%u): %08X\n", id, id, *v); 
    108108    return retval; 
    109109} 
     
    161161FocusriteDevice::setSpecificValueARM(uint32_t id, uint32_t v) 
    162162{ 
    163     fb_quadlet_t data=v; 
    164     debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing parameter address space id 0x%08lX (%u), data: 0x%08lX\n", 
     163    fb_quadlet_t data = v; 
     164    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing parameter address space id 0x%08X (%u), data: 0x%08X\n", 
    165165        id, id, data); 
    166166 
     
    169169 
    170170    if(!get1394Service().write_quadlet( nodeId, addr, CondSwapToBus32(data) ) ) { 
    171         debugError("Could not write to node 0x%04X addr 0x%012X\n", nodeId, addr); 
     171        debugError("Could not write to node 0x%04X addr 0x%012lX\n", nodeId, addr); 
    172172        return false; 
    173173    } 
     
    179179{ 
    180180    fb_quadlet_t result; 
    181     debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading parameter address space id 0x%08lX\n", id); 
     181    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading parameter address space id 0x%08X\n", id); 
    182182 
    183183    fb_nodeaddr_t addr = FR_PARAM_SPACE_START + (id * 4); 
     
    185185 
    186186    if(!get1394Service().read_quadlet( nodeId, addr, &result ) ) { 
    187         debugError("Could not read from node 0x%04llX addr 0x%012llX\n", nodeId, addr); 
    188         return false; 
    189     } 
    190  
    191     result=CondSwapFromBus32(result); 
    192     debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08llX\n", result); 
     187        debugError("Could not read from node 0x%04X addr 0x%012lX\n", nodeId, addr); 
     188        return false; 
     189    } 
     190 
     191    result = CondSwapFromBus32(result); 
     192    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08X\n", result); 
    193193 
    194194    *v = result; 
     
    385385RegisterControl::setValue(uint64_t addr, uint64_t v) 
    386386{ 
    387     debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for addr %llu to %llu\n", 
     387    debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for addr %lu to %lu\n", 
    388388                                     addr, v); 
    389389 
     
    403403        return 0; 
    404404    } else { 
    405         debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for %llu = %lu\n",  
     405        debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for %lu = %u\n",  
    406406                                         addr, val); 
    407407        return val; 
     
    576576    struct sCellInfo c = m_CellInfo.at(row).at(col); 
    577577 
    578     debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for id %d row %d col %d to %lf (%ld)\n",  
     578    debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for id %d row %d col %d to %lf (%d)\n",  
    579579                                     c.address, row, col, val, v); 
    580580 
     
    597597        return 0; 
    598598    } else { 
    599         debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for id %d row %d col %d = %lu\n",  
     599        debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for id %d row %d col %d = %u\n",  
    600600                                         c.address, row, col, val); 
    601601        return val; 
  • branches/libffado-2.0/src/bebob/focusrite/focusrite_saffire.cpp

    r1618 r1720  
    4848    if(config.getValueForDeviceSetting(getConfigRom().getNodeVendorId(), getConfigRom().getModelId(), "cmd_interval_time", delaytime)) { 
    4949        m_cmd_time_interval = delaytime; 
    50         debugOutput( DEBUG_LEVEL_VERBOSE, "Setting command interval time to %llu\n", 
     50        debugOutput( DEBUG_LEVEL_VERBOSE, "Setting command interval time to %lu\n", 
    5151                     m_cmd_time_interval ); 
    5252    } else { 
    5353        m_cmd_time_interval = 10000; 
    54         debugOutput( DEBUG_LEVEL_VERBOSE, "No command interval time setting found, defaulting to %llu\n", 
     54        debugOutput( DEBUG_LEVEL_VERBOSE, "No command interval time setting found, defaulting to %lu\n", 
    5555                     m_cmd_time_interval ); 
    5656    } 
  • branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp

    r1618 r1720  
    423423        return; 
    424424    } 
    425     debugOutput(DEBUG_LEVEL_VERBOSE, "SYNC_CONFIG field value: %08lX\n", sync ); 
     425    debugOutput(DEBUG_LEVEL_VERBOSE, "SYNC_CONFIG field value: %08X\n", sync ); 
    426426 
    427427    switch(sync & FR_SAFFIREPRO_CMD_ID_SYNC_CONFIG_MASK) { 
    428428        default: 
    429             debugWarning( "Unexpected SYNC_CONFIG field value: %08lX\n", sync ); 
     429            debugWarning( "Unexpected SYNC_CONFIG field value: %08X\n", sync ); 
    430430        case FR_SAFFIREPRO_CMD_SYNC_CONFIG_INTERNAL: 
    431431            m_internal_clocksource.active=true; 
     
    466466            break; 
    467467        default: 
    468             debugWarning( "Unexpected SYNC_CONFIG_STATE field value: %08lX\n", sync ); 
     468            debugWarning( "Unexpected SYNC_CONFIG_STATE field value: %08X\n", sync ); 
    469469    } 
    470470} 
     
    772772                break; 
    773773            } 
    774             debugOutput( DEBUG_LEVEL_VERBOSE, "setSampleRate (try %d) failed. Try again...\n" ); 
     774            debugOutput( DEBUG_LEVEL_VERBOSE, "setSampleRate (try %d) failed. Try again...\n", ntries); 
    775775        } 
    776776 
     
    872872    } 
    873873 
    874     debugOutput( DEBUG_LEVEL_VERBOSE, 
    875                      "getCount32: %08lX\n", v ); 
     874    debugOutput( DEBUG_LEVEL_VERBOSE, "getCount32: %08X\n", v ); 
    876875    return v; 
    877876} 
  • branches/libffado-2.0/src/debugmodule/debugmodule.cpp

    r1235 r1720  
    186186    int chars_written=0; 
    187187    int retval=0; 
    188     retval = snprintf(msg, MB_BUFFERSIZE, "%011llu: %s (%s)[%4d] %s: ",  
     188    retval = snprintf(msg, MB_BUFFERSIZE, "%011lu: %s (%s)[%4d] %s: ",  
    189189                      ts_usec, getPreSequence( level ), 
    190190                      fname,  line,  function ); 
  • branches/libffado-2.0/src/debugmodule/debugmodule.h

    r1567 r1720  
    290290    void printShort( debug_level_t level, 
    291291                     const char* format, 
    292                      ... ) const; 
     292                     ... ) const 
     293#ifdef __GNUC__ 
     294            __attribute__((format(printf, 3, 4))) 
     295#endif 
     296            ; 
    293297 
    294298    void print( debug_level_t level, 
     
    297301                unsigned int  line, 
    298302                const char*   format, 
    299                 ... ) const; 
     303                ... ) const 
     304#ifdef __GNUC__ 
     305            __attribute__((format(printf, 6, 7))) 
     306#endif 
     307            ; 
    300308 
    301309    bool setLevel( debug_level_t level ) 
  • branches/libffado-2.0/src/DeviceStringParser.cpp

    r1545 r1720  
    203203        case eGUID: 
    204204            retval = m_guid && (m_guid == x.m_guid); 
    205             debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "eGUID 0x%016X == 0x%016X? %d\n", 
     205            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "eGUID 0x%016lX == 0x%016lX? %d\n", 
    206206                        m_guid, x.m_guid, retval); 
    207207            return retval; 
     
    225225        case eGUID: 
    226226            debugOutput(DEBUG_LEVEL_INFO, "type: eGUID\n"); 
    227             debugOutput(DEBUG_LEVEL_INFO, " GUID: %016LLX\n", m_guid); 
     227            debugOutput(DEBUG_LEVEL_INFO, " GUID: %016lX\n", m_guid); 
    228228            break; 
    229229        case eInvalid: 
  • branches/libffado-2.0/src/fireworks/efc/efc_cmds_flash.cpp

    r1136 r1720  
    6868    EfcCmd::showEfcCmd(); 
    6969    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Erase:\n"); 
    70     debugOutput(DEBUG_LEVEL_NORMAL, " Address     : %lu\n", m_address); 
     70    debugOutput(DEBUG_LEVEL_NORMAL, " Address     : %u\n", m_address); 
    7171} 
    7272 
     
    120120    EfcCmd::showEfcCmd(); 
    121121    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Read:\n"); 
    122     debugOutput(DEBUG_LEVEL_NORMAL, " Address           : %lu\n", m_address); 
    123     debugOutput(DEBUG_LEVEL_NORMAL, " Length (quadlets) : %lu\n", m_nb_quadlets); 
     122    debugOutput(DEBUG_LEVEL_NORMAL, " Address           : %u\n", m_address); 
     123    debugOutput(DEBUG_LEVEL_NORMAL, " Length (quadlets) : %u\n", m_nb_quadlets); 
    124124    debugOutput(DEBUG_LEVEL_NORMAL, " Data              : \n"); 
    125125    for (unsigned int i=0; i < m_nb_quadlets; i++) { 
     
    174174    EfcCmd::showEfcCmd(); 
    175175    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Write:\n"); 
    176     debugOutput(DEBUG_LEVEL_NORMAL, " Address           : %lu\n", m_address); 
    177     debugOutput(DEBUG_LEVEL_NORMAL, " Length (quadlets) : %lu\n", m_nb_quadlets); 
     176    debugOutput(DEBUG_LEVEL_NORMAL, " Address           : %u\n", m_address); 
     177    debugOutput(DEBUG_LEVEL_NORMAL, " Length (quadlets) : %u\n", m_nb_quadlets); 
    178178    debugOutput(DEBUG_LEVEL_NORMAL, " Data              : \n"); 
    179179    for (unsigned int i=0; i < m_nb_quadlets; i++) { 
     
    292292    EfcCmd::showEfcCmd(); 
    293293    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Flash Get Session Base:\n"); 
    294     debugOutput(DEBUG_LEVEL_NORMAL, " Address           : %lu\n", m_address); 
     294    debugOutput(DEBUG_LEVEL_NORMAL, " Address           : %u\n", m_address); 
    295295} 
    296296 
  • branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware.cpp

    r1135 r1720  
    127127    debugOutput(DEBUG_LEVEL_NORMAL, "EFC HW CAPS info:\n"); 
    128128    debugOutput(DEBUG_LEVEL_NORMAL, " Flags   : 0x%08X\n", m_flags); 
    129     debugOutput(DEBUG_LEVEL_NORMAL, " GUID    : %016llX\n", m_guid); 
     129    debugOutput(DEBUG_LEVEL_NORMAL, " GUID    : %016lX\n", m_guid); 
    130130    debugOutput(DEBUG_LEVEL_NORMAL, " HwType  : 0x%08X\n", m_type); 
    131     debugOutput(DEBUG_LEVEL_NORMAL, " Version : %lu\n", m_version); 
     131    debugOutput(DEBUG_LEVEL_NORMAL, " Version : %u\n", m_version); 
    132132    debugOutput(DEBUG_LEVEL_NORMAL, " Vendor  : %s\n", m_vendor_name); 
    133133    debugOutput(DEBUG_LEVEL_NORMAL, " Model   : %s\n", m_model_name); 
     
    232232    debugOutput(DEBUG_LEVEL_NORMAL, " # Output Meters : %d\n", m_nb_output_meters); 
    233233    for (i=0;i<m_nb_output_meters;i++) { 
    234         debugOutput(DEBUG_LEVEL_NORMAL, "     Meter %d: %ld\n", i, m_meters[i]); 
     234        debugOutput(DEBUG_LEVEL_NORMAL, "     Meter %d: %d\n", i, m_meters[i]); 
    235235    } 
    236236     
    237237    debugOutput(DEBUG_LEVEL_NORMAL, " # Input Meters  : %d\n", m_nb_input_meters); 
    238238    for (;i<m_nb_output_meters+m_nb_input_meters;i++) { 
    239         debugOutput(DEBUG_LEVEL_NORMAL, "     Meter %d: %ld\n", i, m_meters[i]); 
     239        debugOutput(DEBUG_LEVEL_NORMAL, "     Meter %d: %d\n", i, m_meters[i]); 
    240240    } 
    241241} 
  • branches/libffado-2.0/src/fireworks/efc/efc_cmds_hardware_ctrl.cpp

    r1284 r1720  
    7373    EfcCmd::showEfcCmd(); 
    7474    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Get Clock:\n"); 
    75     debugOutput(DEBUG_LEVEL_NORMAL, " Clock       : %lu\n", m_clock); 
    76     debugOutput(DEBUG_LEVEL_NORMAL, " Samplerate  : %lu\n", m_samplerate); 
    77     debugOutput(DEBUG_LEVEL_NORMAL, " Index       : %lu\n", m_index); 
     75    debugOutput(DEBUG_LEVEL_NORMAL, " Clock       : %u\n", m_clock); 
     76    debugOutput(DEBUG_LEVEL_NORMAL, " Samplerate  : %u\n", m_samplerate); 
     77    debugOutput(DEBUG_LEVEL_NORMAL, " Index       : %u\n", m_index); 
    7878} 
    7979 
     
    124124    EfcCmd::showEfcCmd(); 
    125125    debugOutput(DEBUG_LEVEL_NORMAL, "EFC Set Clock:\n"); 
    126     debugOutput(DEBUG_LEVEL_NORMAL, " Clock       : %lu\n", m_clock); 
    127     debugOutput(DEBUG_LEVEL_NORMAL, " Samplerate  : %lu\n", m_samplerate); 
    128     debugOutput(DEBUG_LEVEL_NORMAL, " Index       : %lu\n", m_index); 
     126    debugOutput(DEBUG_LEVEL_NORMAL, " Clock       : %u\n", m_clock); 
     127    debugOutput(DEBUG_LEVEL_NORMAL, " Samplerate  : %u\n", m_samplerate); 
     128    debugOutput(DEBUG_LEVEL_NORMAL, " Index       : %u\n", m_index); 
    129129} 
    130130 
  • branches/libffado-2.0/src/fireworks/efc/efc_cmds_ioconfig.cpp

    r1260 r1720  
    162162                                    (m_type==eCT_Get?"GET":"SET"), 
    163163                                    eIOConfigRegisterToString(m_reg)); 
    164     debugOutput(DEBUG_LEVEL_NORMAL, " Value       : %lu\n", m_value); 
     164    debugOutput(DEBUG_LEVEL_NORMAL, " Value       : %u\n", m_value); 
    165165} 
    166166 
  • branches/libffado-2.0/src/fireworks/efc/efc_cmds_mixer.cpp

    r1136 r1720  
    245245                                    eMixerTargetToString(m_target), 
    246246                                    eMixerCommandToString(m_command)); 
    247     debugOutput(DEBUG_LEVEL_NORMAL, " Channel     : %ld\n", m_channel); 
    248     debugOutput(DEBUG_LEVEL_NORMAL, " Value       : %lu\n", m_value); 
     247    debugOutput(DEBUG_LEVEL_NORMAL, " Channel     : %d\n", m_channel); 
     248    debugOutput(DEBUG_LEVEL_NORMAL, " Value       : %u\n", m_value); 
    249249} 
    250250 
  • branches/libffado-2.0/src/fireworks/efc/efc_cmds_monitor.cpp

    r1136 r1720  
    150150                                    (m_type==eCT_Get?"GET":"SET"), 
    151151                                    eMonitorCommandToString(m_command)); 
    152     debugOutput(DEBUG_LEVEL_NORMAL, " Input       : %ld\n", m_input); 
    153     debugOutput(DEBUG_LEVEL_NORMAL, " Output      : %ld\n", m_output); 
    154     debugOutput(DEBUG_LEVEL_NORMAL, " Value       : %lu\n", m_value); 
     152    debugOutput(DEBUG_LEVEL_NORMAL, " Input       : %d\n", m_input); 
     153    debugOutput(DEBUG_LEVEL_NORMAL, " Output      : %d\n", m_output); 
     154    debugOutput(DEBUG_LEVEL_NORMAL, " Value       : %u\n", m_value); 
    155155} 
    156156 
  • branches/libffado-2.0/src/fireworks/fireworks_control.cpp

    r1285 r1720  
    321321            break; 
    322322        } 
    323         debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for channel %d to %lf = %lf\n",  
     323        debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for channel %d to %lf = %u\n",  
    324324                                            m_Slave->m_channel, val, m_Slave->m_value); 
    325325        return true; 
     
    339339            return 0.0; 
    340340        } 
    341         debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for channel %d = %lf\n",  
     341        debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for channel %d = %u\n",  
    342342                                            m_Slave->m_channel, m_Slave->m_value); 
    343343        return m_Slave->m_value; 
     
    451451        } 
    452452 
    453         debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for channel %d to %ld (reg: 0x%08X => 0x%08X)\n",  
     453        debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for channel %d to %d (reg: 0x%08X => 0x%08X)\n",  
    454454                                            m_Slave->m_channel, val, old_reg, reg); 
    455455        return true; 
     
    583583            return 0; 
    584584        } 
    585         debugOutput(DEBUG_LEVEL_VERBOSE, "setValue to %ld \n", val); 
     585        debugOutput(DEBUG_LEVEL_VERBOSE, "setValue to %d \n", val); 
    586586        return true; 
    587587    } else { 
  • branches/libffado-2.0/src/fireworks/fireworks_device.cpp

    r1560 r1720  
    560560Device::clockIdToClockSource(uint32_t clockid) { 
    561561    ClockSource s; 
    562     debugOutput(DEBUG_LEVEL_VERBOSE, "clock id: %lu\n", clockid); 
     562    debugOutput(DEBUG_LEVEL_VERBOSE, "clock id: %u\n", clockid); 
    563563 
    564564    // the polled values are used to detect 
     
    624624        return EFC_CMD_HW_CLOCK_UNSPECIFIED; 
    625625    } 
    626     debugOutput(DEBUG_LEVEL_VERBOSE, "Active clock: 0x%08lX\n",gccmd.m_clock); 
     626    debugOutput(DEBUG_LEVEL_VERBOSE, "Active clock: 0x%08X\n",gccmd.m_clock); 
    627627    gccmd.showEfcCmd(); 
    628628 
     
    637637        return false; 
    638638    } 
    639     debugOutput(DEBUG_LEVEL_VERBOSE, "Set clock: 0x%08lX\n", id); 
     639    debugOutput(DEBUG_LEVEL_VERBOSE, "Set clock: 0x%08X\n", id); 
    640640 
    641641    EfcSetClockCmd sccmd; 
  • branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp

    r1280 r1720  
    172172    unsigned int version_minor = (m_version & 0x00FF0000) >> 16; 
    173173    unsigned int version_build = (m_version & 0x0000FFFF); 
    174     debugOutput(DEBUG_LEVEL_NORMAL, " Address Offset       : 0x%08lX\n", m_flash_offset_address); 
    175     debugOutput(DEBUG_LEVEL_NORMAL, " Length (Quadlets)    : 0x%08lX\n", m_length_quads); 
    176     debugOutput(DEBUG_LEVEL_NORMAL, " CRC 32               : 0x%08lX\n", m_CRC32); 
    177     debugOutput(DEBUG_LEVEL_NORMAL, " Checksum             : 0x%08lX\n", m_checksum); 
     174    debugOutput(DEBUG_LEVEL_NORMAL, " Address Offset       : 0x%08X\n", m_flash_offset_address); 
     175    debugOutput(DEBUG_LEVEL_NORMAL, " Length (Quadlets)    : 0x%08X\n", m_length_quads); 
     176    debugOutput(DEBUG_LEVEL_NORMAL, " CRC 32               : 0x%08X\n", m_CRC32); 
     177    debugOutput(DEBUG_LEVEL_NORMAL, " Checksum             : 0x%08X\n", m_checksum); 
    178178    debugOutput(DEBUG_LEVEL_NORMAL, " Firmware version     : %02u.%02u.%02u (0x%08X)\n",  
    179179                                    version_major, version_minor, version_build, m_version); 
    180180    debugOutput(DEBUG_LEVEL_NORMAL, " Append CRC           : %s\n", (m_append_crc?"Yes":"No")); 
    181     debugOutput(DEBUG_LEVEL_NORMAL, " Footprint (Quadlets) : 0x%08lX\n", m_footprint_quads); 
     181    debugOutput(DEBUG_LEVEL_NORMAL, " Footprint (Quadlets) : 0x%08X\n", m_footprint_quads); 
    182182    #endif 
    183183} 
     
    298298        } 
    299299         
    300         debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "   Header %02d: %08lX\n",  
     300        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "   Header %02d: %08X\n",  
    301301                    i, m_header[i]); 
    302302    } 
     
    337337        } 
    338338         
    339         debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "   Data %02d: %08lX\n",  
     339        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "   Data %02d: %08X\n",  
    340340                    i, m_data[i]); 
    341341    } 
  • branches/libffado-2.0/src/fireworks/fireworks_session_block.cpp

    r1290 r1720  
    255255 
    256256    if (len != h.size_quads*4) { 
    257         debugWarning("size not correct: got %d, should be %d according to data\n", len, h.size_quads*4); 
     257        debugWarning("size not correct: got %lu, should be %d according to data\n", len, h.size_quads*4); 
    258258    } 
    259259 
  • branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp

    r1235 r1720  
    254254        } 
    255255         
    256         debugOutput(DEBUG_LEVEL_VERBOSE, " copying %u bytes to internal buffer offset %u\n",readDescCmd.m_data_length, bytes_read); 
     256        debugOutput(DEBUG_LEVEL_VERBOSE, " copying %u bytes to internal buffer offset %lu\n",readDescCmd.m_data_length, bytes_read); 
    257257         
    258258        memcpy(m_data+bytes_read,readDescCmd.m_data, readDescCmd.m_data_length); 
  • branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp

    r1235 r1720  
    120120        break; 
    121121    default: 
    122         debugError("Can't handle command type %s\n", getCommandType()); 
     122        debugError("Can't handle command type %d\n", getCommandType()); 
    123123        return false; 
    124124    } 
  • branches/libffado-2.0/src/libcontrol/Element.cpp

    r1412 r1720  
    302302{ 
    303303    Util::MutexLockHelper lock(getLock()); 
    304     debugOutput( DEBUG_LEVEL_NORMAL, "Container %s (%d Elements)\n", 
     304    debugOutput( DEBUG_LEVEL_NORMAL, "Container %s (%lu Elements)\n", 
    305305        getName().c_str(), m_Children.size()); 
    306306 
  • branches/libffado-2.0/src/libieee1394/configrom.cpp

    r1292 r1720  
    484484{ 
    485485    debugOutput( DEBUG_LEVEL_VERBOSE,  
    486                  "Checking for updated node id for device with GUID 0x%016llX...\n", 
     486                 "Checking for updated node id for device with GUID 0x%016lX...\n", 
    487487                 getGuid()); 
    488488 
     
    515515 
    516516        debugOutput( DEBUG_LEVEL_VERBOSE, 
    517                         " Node has GUID 0x%016llX\n", 
     517                        " Node has GUID 0x%016lX\n", 
    518518                        guid); 
    519519 
     
    522522            if ( nodeId != getNodeId() ) { 
    523523                debugOutput( DEBUG_LEVEL_VERBOSE, 
    524                              "Device with GUID 0x%016llX changed node id " 
     524                             "Device with GUID 0x%016lX changed node id " 
    525525                             "from %d to %d\n", 
    526526                             getGuid(), 
     
    530530            } else { 
    531531                debugOutput( DEBUG_LEVEL_VERBOSE, 
    532                              "Device with GUID 0x%016llX kept node id %d\n", 
     532                             "Device with GUID 0x%016lX kept node id %d\n", 
    533533                             getGuid(), 
    534534                             getNodeId()); 
     
    547547 
    548548    debugOutput( DEBUG_LEVEL_VERBOSE, 
    549                  "Device with GUID 0x%016llX could not be found on " 
     549                 "Device with GUID 0x%016lX could not be found on " 
    550550                 "the bus anymore (removed?)\n", 
    551551                 getGuid() ); 
     
    560560    debugOutput(DEBUG_LEVEL_NORMAL, "Config ROM\n" ); 
    561561    debugOutput(DEBUG_LEVEL_NORMAL, "\tCurrent Node Id:\t%d\n",       getNodeId() ); 
    562     debugOutput(DEBUG_LEVEL_NORMAL, "\tGUID:\t\t\t0x%016llX\n",       getGuid()); 
     562    debugOutput(DEBUG_LEVEL_NORMAL, "\tGUID:\t\t\t0x%016lX\n",       getGuid()); 
    563563    debugOutput(DEBUG_LEVEL_NORMAL, "\tVendor Name:\t\t%s\n",         getVendorName().c_str() ); 
    564564    debugOutput(DEBUG_LEVEL_NORMAL, "\tModel Name:\t\t%s\n",          getModelName().c_str() ); 
     
    581581    printMessage("Config ROM\n" ); 
    582582    printMessage("\tCurrent Node Id:\t%d\n",       getNodeId() ); 
    583     printMessage("\tGUID:\t\t\t0x%016llX\n",       getGuid()); 
     583    printMessage("\tGUID:\t\t\t0x%016lX\n",       getGuid()); 
    584584    printMessage("\tVendor Name:\t\t%s\n",         getVendorName().c_str() ); 
    585585    printMessage("\tModel Name:\t\t%s\n",          getModelName().c_str() ); 
  • branches/libffado-2.0/src/libieee1394/cycletimer.h

    r1528 r1720  
    9595#ifdef DEBUG 
    9696        if (x >= TICKS_PER_SECOND * 128L) { 
    97             debugWarning("insufficient wrapping: %llu\n",x); 
     97            debugWarning("insufficient wrapping: %lu\n",x); 
    9898        } 
    9999#endif 
     
    118118#ifdef DEBUG 
    119119        if (x < 0) { 
    120             debugWarning("insufficient wrapping: %lld\n",x); 
     120            debugWarning("insufficient wrapping: %ld\n",x); 
    121121        } 
    122122#endif 
     
    145145#ifdef DEBUG 
    146146        if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) { 
    147             debugWarning("insufficient wrapping (max): %llu\n",x); 
     147            debugWarning("insufficient wrapping (max): %lu\n",x); 
    148148        } 
    149149        if (x < 0) { 
    150             debugWarning("insufficient wrapping (min): %lld\n",x); 
     150            debugWarning("insufficient wrapping (min): %ld\n",x); 
    151151        } 
    152152#endif 
     
    249249    if(diff > max || diff < -max) { 
    250250        debugWarning("difference does not make any sense\n"); 
    251         debugWarning("diff=%lld max=%lld\n", diff, max); 
     251        debugWarning("diff=%ld max=%ld\n", diff, max); 
    252252         
    253253    } 
     
    313313    int diff_cycles = diffCycles(cc_cycles, rcv_cycle); 
    314314    if (diff_cycles<0) { 
    315         debugWarning("current cycle timer not ahead of receive cycle: rcv: %u / cc: %llu (%d)\n", 
     315        debugWarning("current cycle timer not ahead of receive cycle: rcv: %u / cc: %lu (%d)\n", 
    316316                        rcv_cycle, cc_cycles, diff_cycles); 
    317317    } 
     
    372372        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 
    373373            debugWarning("back-converted timestamp not equal to SYT\n"); 
    374             debugWarning("TS=%011llu TSC=%08lX SYT=%04X\n", 
     374            debugWarning("TS=%011lu TSC=%08lX SYT=%04lX\n", 
    375375                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 
    376376        } 
     
    433433        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 
    434434            debugWarning("back-converted timestamp not equal to SYT\n"); 
    435             debugWarning("TS=%011llu TSC=%08lX SYT=%04X\n", 
     435            debugWarning("TS=%011lu TSC=%08lX SYT=%04lX\n", 
    436436                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 
    437437        } 
     
    467467    int diff_cycles = diffCycles(xmt_cycle, cc_cycles); 
    468468    if (diff_cycles<0) { 
    469         debugWarning("xmit cycle not ahead of current cycle: xmt: %u / cc: %llu (%d)\n", 
     469        debugWarning("xmit cycle not ahead of current cycle: xmt: %u / cc: %lu (%d)\n", 
    470470                        xmt_cycle, cc_cycles, diff_cycles); 
    471471    } 
     
    526526        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) { 
    527527            debugWarning("back-converted timestamp not equal to SYT\n"); 
    528             debugWarning("TS=%011llu TSC=%08lX SYT=%04X\n", 
     528            debugWarning("TS=%011lu TSC=%08lX SYT=%04lX\n", 
    529529                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp); 
    530530        } 
  • branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp

    r1544 r1720  
    164164                        m_cycle_timer_prev, maxtries2); 
    165165        } 
    166         debugOutput( DEBUG_LEVEL_VERBOSE, " read : CTR: %11lu, local: %17llu\n", 
     166        debugOutput( DEBUG_LEVEL_VERBOSE, " read : CTR: %11u, local: %17lu\n", 
    167167                            m_cycle_timer_prev, local_time); 
    168168        debugOutput(DEBUG_LEVEL_VERBOSE, 
    169                            "  ctr   : 0x%08X %11llu (%03us %04ucy %04uticks)\n", 
     169                           "  ctr   : 0x%08X %11lu (%03us %04ucy %04uticks)\n", 
    170170                           (uint32_t)m_cycle_timer_prev, (uint64_t)CYCLE_TIMER_TO_TICKS(m_cycle_timer_prev), 
    171171                           (unsigned int)CYCLE_TIMER_GET_SECS( m_cycle_timer_prev ), 
     
    310310                bw_abs, bw_rel); 
    311311    debugOutput(DEBUG_LEVEL_VERBOSE, 
    312                 "  usecs/update: %lu, ticks/update: %lu, m_dll_e2: %f\n", 
     312                "  usecs/update: %u, ticks/update: %u, m_dll_e2: %f\n", 
    313313                m_usecs_per_update, m_ticks_per_update, m_dll_e2); 
    314314    debugOutput(DEBUG_LEVEL_VERBOSE, 
     
    351351        ffado_microsecs_t now = Util::SystemTimeSource::getCurrentTimeAsUsecs(); 
    352352        int sleep_time = m_sleep_until - now; 
    353         debugOutput( DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) Sleep until %lld/%f (now: %lld, diff=%d) ...\n", 
     353        debugOutput( DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) Sleep until %ld/%f (now: %ld, diff=%d) ...\n", 
    354354                    this, m_sleep_until, m_next_time_usecs, now, sleep_time); 
    355355        #endif 
     
    390390        if(not_good) { 
    391391            debugOutput(DEBUG_LEVEL_VERBOSE,  
    392                         "(%p) have to retry CTR read, diff unrealistic: diff: %lld, max: +/- %u (try: %d) %lld\n",  
     392                        "(%p) have to retry CTR read, diff unrealistic: diff: %ld, max: +/- %u (try: %d) %ld\n",  
    393393                        this, err_ticks, 1*TICKS_PER_CYCLE, ntries, expected_ticks); 
    394394            // sleep half a cycle to make sure the hardware moved on 
     
    409409    // // simulate a random scheduling delay between (0-10ms) 
    410410    // ffado_microsecs_t tmp = Util::SystemTimeSource::SleepUsecRandom(10000); 
    411     // debugOutput( DEBUG_LEVEL_VERBOSE, " (%p) random sleep of %llu usecs...\n", this, tmp); 
     411    // debugOutput( DEBUG_LEVEL_VERBOSE, " (%p) random sleep of %lu usecs...\n", this, tmp); 
    412412 
    413413    if(m_unhandled_busreset) { 
     
    436436    } else if (diff_ticks > m_ticks_per_update * 20) { 
    437437        debugOutput(DEBUG_LEVEL_VERBOSE, 
    438                     "re-init dll due to too large tick diff: %lld >> %f\n", 
     438                    "re-init dll due to too large tick diff: %ld >> %f\n", 
    439439                    diff_ticks, (float)(m_ticks_per_update * 20)); 
    440440        if(!initDLL()) { 
     
    462462            diff_ticks_corr = diff_ticks - ticks_late; 
    463463            debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE, 
    464                                "diff_ticks_corr=%lld, diff_ticks = %lld, ticks_late = %lld\n", 
     464                               "diff_ticks_corr=%ld, diff_ticks = %ld, ticks_late = %ld\n", 
    465465                               diff_ticks_corr, diff_ticks, ticks_late); 
    466466        } else { 
     
    473473        // makes no sense if not running realtime 
    474474        if(m_realtime && usecs_late > 1000) { 
    475             debugOutput(DEBUG_LEVEL_VERBOSE, "Rather late wakeup: %lld usecs\n", usecs_late); 
     475            debugOutput(DEBUG_LEVEL_VERBOSE, "Rather late wakeup: %ld usecs\n", usecs_late); 
    476476        } 
    477477        #endif 
     
    526526 
    527527        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,  
    528                            " usecs: current: %f next: %f usecs_late=%lld ticks_late=%lld\n", 
     528                           " usecs: current: %f next: %f usecs_late=%ld ticks_late=%ld\n", 
    529529                           m_current_time_usecs, m_next_time_usecs, usecs_late, ticks_late); 
    530530        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 
    531                            " ticks: current: %f next: %f diff=%lld\n", 
     531                           " ticks: current: %f next: %f diff=%ld\n", 
    532532                           m_current_time_ticks, m_next_time_ticks, diff_ticks); 
    533533        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, 
     
    589589    } 
    590590    int32_t ctr_diff = cycle_timer_ticks-dll_time; 
    591     debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) CTR DIFF: HW %010llu - DLL %010lu = %010ld (%s)\n",  
     591    debugOutput(DEBUG_LEVEL_ULTRA_VERBOSE, "(%p) CTR DIFF: HW %010lu - DLL %010u = %010d (%s)\n",  
    592592                this, cycle_timer_ticks, dll_time, ctr_diff, (ctr_diff>0?"lag":"lead")); 
    593593#endif 
     
    625625    if (y_step_in_ticks_int > 0) { 
    626626        retval = addTicks(offset_in_ticks_int, y_step_in_ticks_int); 
    627 /*        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "y_step_in_ticks_int > 0: %lld, time_diff: %f, rate: %f, retval: %lu\n",  
     627/*        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "y_step_in_ticks_int > 0: %ld, time_diff: %f, rate: %f, retval: %lu\n",  
    628628                    y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/ 
    629629    } else { 
     
    631631 
    632632        // this can happen if the update thread was woken up earlier than it should have been 
    633 /*        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "y_step_in_ticks_int <= 0: %lld, time_diff: %f, rate: %f, retval: %lu\n",  
     633/*        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE, "y_step_in_ticks_int <= 0: %ld, time_diff: %f, rate: %f, retval: %lu\n",  
    634634                    y_step_in_ticks_int, time_diff, my_vars.rate, retval);*/ 
    635635    } 
     
    792792        if (diffTicks(cycle_timer_ticks, m_cycle_timer_ticks_prev) < 0) { 
    793793            debugOutput( DEBUG_LEVEL_VERY_VERBOSE, 
    794                         "non-monotonic CTR (try %02d): %llu -> %llu\n", 
     794                        "non-monotonic CTR (try %02d): %lu -> %lu\n", 
    795795                        maxtries, m_cycle_timer_ticks_prev, cycle_timer_ticks); 
    796796            debugOutput( DEBUG_LEVEL_VERY_VERBOSE, 
     
    798798                        m_cycle_timer_prev, *cycle_timer); 
    799799            debugOutput( DEBUG_LEVEL_VERY_VERBOSE, 
    800                         " current: %011llu (%03us %04ucy %04uticks)\n", 
     800                        " current: %011lu (%03us %04ucy %04uticks)\n", 
    801801                        cycle_timer_ticks, 
    802802                        (unsigned int)TICKS_TO_SECS( cycle_timer_ticks ), 
     
    804804                        (unsigned int)TICKS_TO_OFFSET( cycle_timer_ticks ) ); 
    805805            debugOutput( DEBUG_LEVEL_VERY_VERBOSE, 
    806                         " prev   : %011llu (%03us %04ucy %04uticks)\n", 
     806                        " prev   : %011lu (%03us %04ucy %04uticks)\n", 
    807807                        m_cycle_timer_ticks_prev, 
    808808                        (unsigned int)TICKS_TO_SECS( m_cycle_timer_ticks_prev ), 
  • branches/libffado-2.0/src/motu/motu_controls.cpp

    r1520 r1720  
    301301    if (v > 0x80) 
    302302      v = 0x80; 
    303     debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader setValue for row %d col %d to %lf (%ld)\n", 
     303    debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader setValue for row %d col %d to %lf (%d)\n", 
    304304      row, col, val, v); 
    305305    reg = getCellRegister(row,col); 
     
    331331    val = m_parent.ReadRegister(reg) & 0xff; 
    332332 
    333     debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader getValue for row %d col %d = %lu\n", 
     333    debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader getValue for row %d col %d = %u\n", 
    334334      row, col, val); 
    335335    return val; 
     
    353353      v = 0x80; 
    354354 
    355     debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelPan setValue for row %d col %d to %lf (%ld)\n", 
     355    debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelPan setValue for row %d col %d to %lf (%d)\n", 
    356356      row, col, val, v); 
    357357    reg = getCellRegister(row,col); 
     
    387387    val = ((val >> 8) & 0xff) - 0x40; 
    388388 
    389     debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelPan getValue for row %d col %d = %lu\n", 
     389    debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelPan getValue for row %d col %d = %u\n", 
    390390      row, col, val); 
    391391    return val; 
     
    414414    uint32_t v, reg; 
    415415 
    416     debugOutput(DEBUG_LEVEL_VERBOSE, "BinSw setValue for row %d col %d to %lf (%ld)\n", 
     416    debugOutput(DEBUG_LEVEL_VERBOSE, "BinSw setValue for row %d col %d to %lf (%d)\n", 
    417417      row, col, val, val==0?0:1); 
    418418    reg = getCellRegister(row,col); 
     
    460460    val = (val & m_value_mask) != 0; 
    461461 
    462     debugOutput(DEBUG_LEVEL_VERBOSE, "BinSw getValue for row %d col %d = %lu\n", 
     462    debugOutput(DEBUG_LEVEL_VERBOSE, "BinSw getValue for row %d col %d = %u\n", 
    463463      row, col, val); 
    464464    return val; 
  • branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp

    r1235 r1720  
    188188    } 
    189189 
    190     debugOutput(DEBUG_LEVEL_INFO, "Select 1394 port %d...\n", arguments.port); 
     190    debugOutput(DEBUG_LEVEL_INFO, "Select 1394 port %ld...\n", arguments.port); 
    191191    do 
    192192    { 
     
    225225    } 
    226226 
    227     debugOutput(DEBUG_LEVEL_INFO, "Setting RT priority (%d)...\n", arguments.rtprio); 
     227    debugOutput(DEBUG_LEVEL_INFO, "Setting RT priority (%ld)...\n", arguments.rtprio); 
    228228    set_realtime_priority(arguments.rtprio); 
    229229