Changeset 668
- Timestamp:
- 10/21/07 08:05:11 (16 years ago)
- Files:
-
- trunk/libffado/src/fireworks/efc/efc_avc_cmd.cpp (modified) (2 diffs)
- trunk/libffado/src/fireworks/efc/efc_cmds_ioconfig.cpp (modified) (1 diff)
- trunk/libffado/src/fireworks/efc/efc_cmds_mixer.cpp (modified) (2 diffs)
- trunk/libffado/src/fireworks/efc/efc_cmds_monitor.cpp (modified) (1 diff)
- trunk/libffado/src/fireworks/fireworks_device.cpp (modified) (1 diff)
- trunk/libffado/support/mixer/mixer_af2.py (modified) (1 diff)
- trunk/libffado/tests/test-echomixer.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/fireworks/efc/efc_avc_cmd.cpp
r629 r668 60 60 result &= m_cmd->serialize( se ); 61 61 62 if(!result) { 63 debugWarning("Serialization failed\n"); 64 } 65 62 66 return result; 63 67 } … … 78 82 result &= m_cmd->deserialize( de ); 79 83 84 if(!result) { 85 debugWarning("Deserialization failed\n"); 86 } 87 80 88 return result; 81 89 } trunk/libffado/src/fireworks/efc/efc_cmds_ioconfig.cpp
r665 r668 72 72 result &= EfcCmd::deserialize ( de ); 73 73 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 } 75 77 76 78 return result; trunk/libffado/src/fireworks/efc/efc_cmds_mixer.cpp
r665 r668 85 85 result &= se.write(htonl(m_value), "Value" ); 86 86 } 87 88 if(!result) { 89 debugWarning("Serialization failed\n"); 90 } 91 87 92 return result; 88 93 } … … 95 100 result &= EfcCmd::deserialize ( de ); 96 101 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 } 99 110 100 111 return result; trunk/libffado/src/fireworks/efc/efc_cmds_monitor.cpp
r663 r668 130 130 result &= EfcCmd::deserialize ( de ); 131 131 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 } 135 141 136 142 return result; trunk/libffado/src/fireworks/fireworks_device.cpp
r665 r668 176 176 // c.showEfcCmd(); 177 177 178 if ( cmd.getResponse() != AVC::AVCCommand::eR_Accepted) { 179 debugError( "EfcOverAVCCmd not accepted\n" ); 180 return false; 181 } 182 178 183 if ( c.m_header.retval != EfcCmd::eERV_Ok 179 184 && c.m_header.retval != EfcCmd::eERV_FlashBusy) { trunk/libffado/support/mixer/mixer_af2.py
r667 r668 153 153 self.VolumeControls[sender][0], 154 154 vol) 155 self.hw.setConti nuous(self.VolumeControls[sender][0],155 self.hw.setContignuous(self.VolumeControls[sender][0], 156 156 vol) 157 157 trunk/libffado/tests/test-echomixer.cpp
r667 r668 223 223 // #define DO_RECORD_MIX 224 224 #define DO_PHYS_OUT_MIX 225 //#define DO_PHYS_IN_MIX225 #define DO_PHYS_IN_MIX 226 226 227 227 #ifdef DO_PLAYBACK_MIX