Changeset 668

Show
Ignore:
Timestamp:
10/21/07 08:05:11 (13 years ago)
Author:
ppalmers
Message:

fix small bug in ECHO mixer commands

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/fireworks/efc/efc_avc_cmd.cpp

    r629 r668  
    6060    result &= m_cmd->serialize( se ); 
    6161 
     62    if(!result) { 
     63        debugWarning("Serialization failed\n"); 
     64    } 
     65 
    6266    return result; 
    6367} 
     
    7882    result &= m_cmd->deserialize( de ); 
    7983     
     84    if(!result) { 
     85        debugWarning("Deserialization failed\n"); 
     86    } 
     87     
    8088    return result; 
    8189} 
  • trunk/libffado/src/fireworks/efc/efc_cmds_ioconfig.cpp

    r665 r668  
    7272    result &= EfcCmd::deserialize ( de ); 
    7373 
    74     EFC_DESERIALIZE_AND_SWAP(de, &m_value, result); 
     74    if (m_type == eCT_Get) { 
     75        EFC_DESERIALIZE_AND_SWAP(de, &m_value, result); 
     76    } 
    7577 
    7678    return result; 
  • trunk/libffado/src/fireworks/efc/efc_cmds_mixer.cpp

    r665 r668  
    8585        result &= se.write(htonl(m_value), "Value" ); 
    8686    } 
     87 
     88    if(!result) { 
     89        debugWarning("Serialization failed\n"); 
     90    } 
     91 
    8792    return result; 
    8893} 
     
    95100    result &= EfcCmd::deserialize ( de ); 
    96101 
    97     EFC_DESERIALIZE_AND_SWAP(de, (quadlet_t *)&m_channel, result); 
    98     EFC_DESERIALIZE_AND_SWAP(de, &m_value, result); 
     102    if (m_type == eCT_Get) { 
     103        EFC_DESERIALIZE_AND_SWAP(de, (quadlet_t *)&m_channel, result); 
     104        EFC_DESERIALIZE_AND_SWAP(de, &m_value, result); 
     105    } 
     106 
     107    if(!result) { 
     108        debugWarning("Deserialization failed\n"); 
     109    } 
    99110 
    100111    return result; 
  • trunk/libffado/src/fireworks/efc/efc_cmds_monitor.cpp

    r663 r668  
    130130    result &= EfcCmd::deserialize ( de ); 
    131131 
    132     EFC_DESERIALIZE_AND_SWAP(de, (quadlet_t *)&m_input, result); 
    133     EFC_DESERIALIZE_AND_SWAP(de, (quadlet_t *)&m_output, result); 
    134     EFC_DESERIALIZE_AND_SWAP(de, &m_value, result); 
     132    if (m_type == eCT_Get) { 
     133        EFC_DESERIALIZE_AND_SWAP(de, (quadlet_t *)&m_input, result); 
     134        EFC_DESERIALIZE_AND_SWAP(de, (quadlet_t *)&m_output, result); 
     135        EFC_DESERIALIZE_AND_SWAP(de, &m_value, result); 
     136    } 
     137 
     138    if(!result) { 
     139        debugWarning("Deserialization failed\n"); 
     140    } 
    135141 
    136142    return result; 
  • trunk/libffado/src/fireworks/fireworks_device.cpp

    r665 r668  
    176176//     c.showEfcCmd(); 
    177177 
     178    if ( cmd.getResponse() != AVC::AVCCommand::eR_Accepted) { 
     179        debugError( "EfcOverAVCCmd not accepted\n" ); 
     180        return false; 
     181    } 
     182 
    178183    if (   c.m_header.retval != EfcCmd::eERV_Ok 
    179184        && c.m_header.retval != EfcCmd::eERV_FlashBusy) { 
  • trunk/libffado/support/mixer/mixer_af2.py

    r667 r668  
    153153                    self.VolumeControls[sender][0], 
    154154                    vol) 
    155         self.hw.setContinuous(self.VolumeControls[sender][0], 
     155        self.hw.setContignuous(self.VolumeControls[sender][0], 
    156156                              vol) 
    157157 
  • trunk/libffado/tests/test-echomixer.cpp

    r667 r668  
    223223// #define DO_RECORD_MIX 
    224224#define DO_PHYS_OUT_MIX 
    225 // #define DO_PHYS_IN_MIX 
     225#define DO_PHYS_IN_MIX 
    226226 
    227227#ifdef DO_PLAYBACK_MIX