Changeset 2413

Show
Ignore:
Timestamp:
09/24/13 05:09:26 (9 years ago)
Author:
jwoithe
Message:

A series of fixes provided by Andreas Hehn. These were mostly discovered when attempting to compile FFADO with clang:
* libavc: implement a better way to quieten an "unused parameter" warning
* bebob: fix a typo when assigning to cachePath
* dice: correctly create routes for the ARM audio ports
* fireworks-downloader: really zero the "args" variable
* saffire-pro: fix a typo when applying sync lock mask

I'm not sure what the correct approach should be for the DICE fix. Andreas's patch originally commented this out. The DICE chip does provide 8 ARM audio ports on the router's input and output sides though, so perhaps they ought to be included (although the present entries only seem to cover the router outputs to the ARM, not the returns from it). Those with DICE-based interfaces are encouraged to test this patch to verify there are no regressions caused by this change.

Files:

Legend:

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

    r1763 r2413  
    710710    if ( asprintf( &pCachePath, "%s/cache/",  path.c_str() ) < 0 ) { 
    711711        debugError( "Could not create path string for cache pool (trying '/var/cache/libffado' instead)\n" ); 
    712         cachePath == "/var/cache/libffado/"; 
     712        cachePath = "/var/cache/libffado/"; 
    713713    } else { 
    714714        cachePath = pCachePath; 
  • trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp

    r1969 r2413  
    449449            break; 
    450450    } 
    451     switch((sync && FR_SAFFIREPRO_CMD_ID_SYNC_LOCK_MASK) >> 8) { 
     451    switch((sync & FR_SAFFIREPRO_CMD_ID_SYNC_LOCK_MASK) >> 8) { 
    452452        case FR_SAFFIREPRO_CMD_SYNC_CONFIG_INTERNAL: 
    453453            // always locked 
  • trunk/libffado/src/dice/dice_eap.cpp

    r2365 r2413  
    618618            } 
    619619            // the ARM audio port 
    620             for (i=0; i<0; i++) { 
     620            for (i=0; i<8; i++) { 
    621621              addRoute(eRS_Muted, 0, eRD_ARM, i); 
    622622            } 
  • trunk/libffado/src/libavc/general/avc_plug.cpp

    r2322 r2413  
    13411341        { 
    13421342            const ChannelInfo* channelInfo = &( *cit ); 
    1343             channelInfo = channelInfo; 
     1343            // Avoid unused variable warning when debug is disabled 
     1344            static_cast<void>(channelInfo); 
    13441345            debugOutput( debugLevel, 
    13451346                         "stream position: %d\n", 
  • trunk/libffado/support/firmware/fireworks-downloader.cpp

    r1763 r2413  
    106106    printf("-----------------------------------------------\n\n"); 
    107107 
    108     memset(args, 0, sizeof(args)); 
     108    memset(args, 0, sizeof(*args)); 
    109109 
    110110    args->guid = 0xFFFFFFFFFFFFFFFFLL;