Changeset 1047

Show
Ignore:
Timestamp:
04/26/08 10:30:41 (13 years ago)
Author:
ppalmers
Message:

remove compiler warnings. change non-critical warnings to debug messages.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/bebob/bebob_mixer.cpp

    r975 r1047  
    324324EnhancedMixerFBFeature::setValue(double v) 
    325325{ 
    326     int volume=(int)v; 
    327326    debugOutput(DEBUG_LEVEL_NORMAL,"Set feature volume %d to %d...\n", 
    328                 m_Slave.getId(), volume); 
     327                m_Slave.getId(), (int)v); 
    329328 
    330329    return true; 
  • trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp

    r960 r1047  
    652652    unsigned int id; 
    653653    switch(c) { 
     654        default: 
    654655        case eDC_ADAT1: id=FR_SAFFIREPRO_CMD_ID_ENABLE_ADAT1_INPUT; break; 
    655656        case eDC_ADAT2: id=FR_SAFFIREPRO_CMD_ID_ENABLE_ADAT2_INPUT; break; 
     
    671672    unsigned int id; 
    672673    switch(c) { 
     674        default: 
    673675        case eDC_ADAT1: id=FR_SAFFIREPRO_CMD_ID_ENABLE_ADAT1_INPUT; break; 
    674676        case eDC_ADAT2: id=FR_SAFFIREPRO_CMD_ID_ENABLE_ADAT2_INPUT; break; 
  • trunk/libffado/src/devicemanager.cpp

    r967 r1047  
    927927    bool slaveMode=false; 
    928928    if(!getOption("slaveMode", slaveMode)) { 
    929         debugWarning("Could not retrieve slaveMode parameter, defauling to false\n"); 
    930     } 
    931  
     929        debugOutput(DEBUG_LEVEL_NORMAL,  
     930                    "Could not retrieve slaveMode parameter, defauling to false\n"); 
     931    } 
     932    return device->getStreamProcessorByIndex(0); 
     933/* 
    932934    #warning TEST CODE FOR BOUNCE DEVICE !! 
    933935    // this makes the bounce slave use the xmit SP as sync source 
     
    936938    } else { 
    937939        return device->getStreamProcessorByIndex(0); 
    938     } 
     940    }*/ 
    939941} 
    940942 
  • trunk/libffado/src/dice/dice_avdevice.cpp

    r1043 r1047  
    309309    quadlet_t extended_status; 
    310310    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &extended_status); 
     311    #ifdef DEBUG 
    311312    uint16_t clock_status = (extended_status) & 0xFFFF; 
    312313    uint16_t clock_slipping = (extended_status >> 16) & 0xFFFF; 
    313314    debugOutput(DEBUG_LEVEL_VERBOSE," Clock status: 0x%08X, status=0x%04X, slip=0x%04X\n", 
    314315                                    extended_status, clock_status, clock_slipping); 
     316    #endif 
    315317 
    316318    diceNameVector names = getClockSourceNameString(); 
     
    471473    quadlet_t extended_status; 
    472474    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &extended_status); 
     475    #ifdef DEBUG 
    473476    uint16_t clock_status = (extended_status) & 0xFFFF; 
    474477    uint16_t clock_slipping = (extended_status >> 16) & 0xFFFF; 
    475478    debugOutput(DEBUG_LEVEL_VERBOSE," Clock status: 0x%08X, status=0x%04X, slip=0x%04X\n", 
    476479                                    extended_status, clock_status, clock_slipping); 
     480    #endif 
    477481 
    478482    diceNameVector names = getClockSourceNameString(); 
     
    516520    debugOutput(DEBUG_LEVEL_VERBOSE," Global param space:\n"); 
    517521 
    518     readGlobalRegBlock(DICE_REGISTER_GLOBAL_OWNER, (fb_quadlet_t *)&tmp_octlet,sizeof(fb_octlet_t)); 
     522    readGlobalRegBlock(DICE_REGISTER_GLOBAL_OWNER, reinterpret_cast<fb_quadlet_t *>(&tmp_octlet), sizeof(fb_octlet_t)); 
    519523    debugOutput(DEBUG_LEVEL_VERBOSE,"  Owner            : 0x%016X\n",tmp_octlet); 
    520524 
  • trunk/libffado/src/ffado.cpp

    r1046 r1047  
    7676} 
    7777 
    78 #warning this should be cleaned up 
     78// FIXME: this should be cleaned up 
    7979#include "libavc/general/avc_generic.h" 
    8080void ffado_sleep_after_avc_command( int time ) 
     
    379379            return ffado_audio_datatype_error; 
    380380    } 
    381     #warning FIXME 
    382381} 
    383382 
  • trunk/libffado/src/libavc/general/avc_plug.cpp

    r1013 r1047  
    138138 
    139139    if ( !initFromDescriptor() ) { 
    140         debugError( "discover: Could not init plug from descriptor (%d,%d,%d,%d,%d)\n", 
     140        debugOutput(DEBUG_LEVEL_NORMAL, 
     141                    "discover: Could not init plug from descriptor (%d,%d,%d,%d,%d)\n", 
    141142                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id ); 
    142143//         return false; 
     
    144145 
    145146    if ( !discoverPlugType() ) { 
    146         debugError( "discover: Could not discover plug type (%d,%d,%d,%d,%d)\n", 
     147        debugOutput(DEBUG_LEVEL_NORMAL,  
     148                    "discover: Could not discover plug type (%d,%d,%d,%d,%d)\n", 
    147149                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id ); 
    148150        return false; 
     
    150152 
    151153    if ( !discoverName() ) { 
    152         debugError( "Could not discover name (%d,%d,%d,%d,%d)\n", 
     154        debugOutput(DEBUG_LEVEL_NORMAL,  
     155                    "Could not discover name (%d,%d,%d,%d,%d)\n", 
    153156                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id ); 
    154157        return false; 
     
    163166 
    164167    if ( !discoverChannelPosition() ) { 
    165         debugError( "Could not discover channel positions " 
     168        debugOutput(DEBUG_LEVEL_NORMAL,  
     169                    "Could not discover channel positions " 
    166170                    "(%d,%d,%d,%d,%d)\n", 
    167171                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id ); 
     
    170174 
    171175    if ( !discoverChannelName() ) { 
    172         debugError( "Could not discover channel name " 
     176        debugOutput(DEBUG_LEVEL_NORMAL,  
     177                    "Could not discover channel name " 
    173178                    "(%d,%d,%d,%d,%d)\n", 
    174179                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id ); 
     
    177182 
    178183    if ( !discoverClusterInfo() ) { 
    179         debugError( "Could not discover channel name " 
     184        debugOutput(DEBUG_LEVEL_NORMAL,  
     185                    "Could not discover cluster info " 
    180186                    "(%d,%d,%d,%d,%d)\n", 
    181187                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id ); 
     
    184190 
    185191    if ( !discoverStreamFormat() ) { 
    186         debugError( "Could not discover stream format " 
     192        debugOutput(DEBUG_LEVEL_NORMAL,  
     193                    "Could not discover stream format " 
    187194                    "(%d,%d,%d,%d,%d)\n", 
    188195                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id ); 
     
    191198 
    192199    if ( !discoverSupportedStreamFormats() ) { 
    193         debugError( "Could not discover supported stream formats " 
     200        debugOutput(DEBUG_LEVEL_NORMAL,  
     201                    "Could not discover supported stream formats " 
    194202                    "(%d,%d,%d,%d,%d)\n", 
    195203                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id ); 
     
    288296 
    289297    if ( !extStreamFormatCmd.getFormatInformation() ) { 
    290         debugWarning( "No stream format information for plug found -> skip\n" ); 
     298        debugOutput(DEBUG_LEVEL_NORMAL, "No stream format information for plug found -> skip\n" ); 
    291299        return true; 
    292300    } 
     
    295303           != FormatInformation::eFHR_AudioMusic  ) 
    296304    { 
    297         debugWarning( "Format hierarchy root is not Audio&Music -> skip\n" ); 
     305        debugOutput(DEBUG_LEVEL_NORMAL, "Format hierarchy root is not Audio&Music -> skip\n" ); 
    298306        return true; 
    299307    } 
     
    323331 
    324332            if ( !clusterInfo ) { 
    325                 debugError( "No matching cluster " 
     333                debugOutput(DEBUG_LEVEL_NORMAL,  
     334                            "No matching cluster " 
    326335                            "info found for index %d\n",  i ); 
    327336                    return false; 
     
    345354            if ( nrOfChannels != streamFormatInfo->m_numberOfChannels ) 
    346355            { 
    347                 debugWarning( "Number of channels " 
     356                debugOutput(DEBUG_LEVEL_NORMAL,  
     357                              "Number of channels " 
    348358                              "mismatch: '%s' plug discovering reported " 
    349359                              "%d channels for cluster '%s', while stream " 
     
    564574       (getPlugAddressType() == eAPA_ExternalPlug)) { 
    565575        if (getPlugDirection() != eAPD_Output) { 
    566             debugWarning("Signal Source command not valid for non-output unit plugs...\n"); 
     576            debugOutput(DEBUG_LEVEL_NORMAL, "Signal Source command not valid for non-output unit plugs...\n"); 
    567577            return -1; 
    568578        } 
     
    571581    if(getPlugAddressType() == eAPA_SubunitPlug) { 
    572582        if (getPlugDirection() != eAPD_Input) { 
    573             debugWarning("Signal Source command not valid for non-input subunit plugs...\n"); 
     583            debugOutput(DEBUG_LEVEL_NORMAL, "Signal Source command not valid for non-input subunit plugs...\n"); 
    574584            return -1; 
    575585        } 
     
    662672    if (getDirection() == eAPD_Output) { 
    663673        if (getInputConnections().size()==0) { 
    664             debugWarning("No input connections to propagate from, skipping.\n"); 
     674            debugOutput(DEBUG_LEVEL_NORMAL, "No input connections to propagate from, skipping.\n"); 
    665675            return true; 
    666676        } 
    667677        if (getInputConnections().size()>1) { 
    668             debugWarning("Too many input connections to propagate from, using first one.\n"); 
     678            debugOutput(DEBUG_LEVEL_NORMAL, "Too many input connections to propagate from, using first one.\n"); 
    669679        } 
    670680 
     
    674684    } else if (getDirection() == eAPD_Input) { 
    675685        if (getOutputConnections().size()==0) { 
    676             debugWarning("No output connections to propagate from, skipping.\n"); 
     686            debugOutput(DEBUG_LEVEL_NORMAL, "No output connections to propagate from, skipping.\n"); 
    677687            return true; 
    678688        } 
    679689        if (getOutputConnections().size()>1) { 
    680             debugWarning("Too many output connections to propagate from, using first one.\n"); 
     690            debugOutput(DEBUG_LEVEL_NORMAL, "Too many output connections to propagate from, using first one.\n"); 
    681691        } 
    682692 
     
    685695 
    686696    } else { 
    687         debugWarning("plug with undefined direction\n"); 
     697        debugError("plug with undefined direction\n"); 
    688698        return false; 
    689699    } 
     
    16321642                   PlugManager& plugManager ) 
    16331643{ 
    1634     #warning FIXME: The derived class should be creating these 
    16351644    // FIXME: The derived class should be creating these, such that discover() can become pure virtual 
    1636  
    16371645    if ( !deser.isExisting( basePath + "m_subunitType" ) ) { 
    16381646        return 0; 
  • trunk/libffado/src/libavc/general/avc_subunit.cpp

    r864 r1047  
    226226Subunit::initPlugFromDescriptor( Plug& plug ) 
    227227{ 
    228     debugError("plug loading from descriptor not implemented\n"); 
     228    debugOutput(DEBUG_LEVEL_NORMAL, "plug loading from descriptor not implemented\n"); 
    229229    return false; 
    230230} 
     
    260260    Subunit* pSubunit = 0; 
    261261 
    262     #warning FIXME: The derived class should be creating these 
    263262    // FIXME: The derived class should be creating these, such that discover() can become pure virtual 
    264263    switch( sbType ) { 
  • trunk/libffado/src/libavc/general/avc_unit.cpp

    r1042 r1047  
    632632                                                   Plug::eAPT_Sync ); 
    633633    if ( !syncPCRInputPlugs.size() ) { 
    634         debugWarning( "No PCR sync input plug found\n" ); 
     634        debugOutput(DEBUG_LEVEL_NORMAL, "No PCR sync input plug found\n" ); 
    635635    } 
    636636 
     
    639639                                                    Plug::eAPT_Sync ); 
    640640    if ( !syncPCROutputPlugs.size() ) { 
    641         debugWarning( "No PCR sync output plug found\n" ); 
     641        debugOutput(DEBUG_LEVEL_NORMAL, "No PCR sync output plug found\n" ); 
    642642    } 
    643643 
     
    646646                                                  Plug::eAPT_IsoStream ); 
    647647    if ( !isoPCRInputPlugs.size() ) { 
    648         debugWarning( "No PCR iso input plug found\n" ); 
     648        debugOutput(DEBUG_LEVEL_NORMAL, "No PCR iso input plug found\n" ); 
    649649 
    650650    } 
     
    654654                                                   Plug::eAPT_IsoStream ); 
    655655    if ( !isoPCROutputPlugs.size() ) { 
    656         debugWarning( "No PCR iso output plug found\n" ); 
     656        debugOutput(DEBUG_LEVEL_NORMAL, "No PCR iso output plug found\n" ); 
    657657 
    658658    } 
     
    825825{ 
    826826    m_pPlugManager->showPlugs(); 
    827     SubunitMusic* s=getMusicSubunit(0); 
    828     if(s) s->showMusicPlugs(); 
     827    //SubunitMusic* s=getMusicSubunit(0); 
     828    //if(s) s->showMusicPlugs(); 
    829829} 
    830830 
  • trunk/libffado/src/libieee1394/test-cyclecalc.cpp

    r864 r1047  
    3939     */ 
    4040 
     41    #ifdef DEBUG 
    4142    uint32_t now_ctr = 0x140001DA; 
    4243    uint64_t now = CYCLE_TIMER_TO_TICKS(0x140001DA); 
    4344    unsigned int cycle = 7968; 
    4445    uint16_t syt = 0x583B; 
     46    #endif 
    4547     
    4648    debugOutput(DEBUG_LEVEL_VERBOSE,"NOW_CTR          : %08X (%03us %04uc %04ut)\n", 
     
    6264    debugOutput(DEBUG_LEVEL_VERBOSE,"CYCLE            : %uc\n", 
    6365                          cycle); 
    64  
     66    #ifdef DEBUG 
    6567    uint64_t calc_ts = sytRecvToFullTicks(syt, cycle, now_ctr); 
     68    #endif 
    6669 
    6770    debugOutput(DEBUG_LEVEL_VERBOSE,"CALC_TS          : %011llu (%03us %04uc %04ut)\n", 
  • trunk/libffado/support/dbus/controlclient.h

    r864 r1047  
    3131#include "controlclient-glue.h" 
    3232 
    33 static const char* SERVER_NAME = "org.ffado.Control"; 
    34 static const char* SERVER_PATH = "/org/ffado/Control/Test/Fader"; 
    35  
    3633namespace DBusControl { 
    3734 
  • trunk/libffado/support/dbus/test-dbus.cpp

    r864 r1047  
    2929#include "controlclient.h" 
    3030#include <dbus-c++/dbus.h> 
     31 
     32static const char* SERVER_NAME = "org.ffado.Control"; 
     33static const char* SERVER_PATH = "/org/ffado/Control/Test/Fader"; 
    3134 
    3235using namespace std; 
  • trunk/libffado/tests/systemtests/test-sysload.cpp

    r927 r1047  
    173173        uint64_t run_until = sleep_time + arguments.period * arguments.cpu_pct / 100; 
    174174         
    175         uint64_t tic = rt_gettime_usecs(); 
     175//         uint64_t tic = rt_gettime_usecs(); 
    176176        while(rt_gettime_usecs() < run_until) load_function(); 
    177177        uint64_t toc = rt_gettime_usecs();