Changeset 1911
- Timestamp:
- 10/10/10 15:58:32 (13 years ago)
- Files:
-
- trunk/libffado/src/motu/motu_avdevice.cpp (modified) (6 diffs)
- trunk/libffado/src/motu/motu_avdevice.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/motu/motu_avdevice.cpp
r1909 r1911 2182 2182 signed int i; 2183 2183 unsigned int dir = direction==Streaming::Port::E_Capture?MOTU_PA_IN:MOTU_PA_OUT; 2184 const signed int mode_idx = direction==Streaming::Port::E_Capture?1:0; 2184 2185 unsigned int flags = 0; 2185 2186 unsigned int portgroup_flags; … … 2224 2225 portgroup_flags |= MOTU_PA_MK3_OPT_B_ANY; 2225 2226 2226 devprop->portgroup_entry[i].group_pkt_offset = -1;2227 devprop->portgroup_entry[i].group_pkt_offset[mode_idx] = -1; 2227 2228 if (( portgroup_flags & dir ) && 2228 2229 ( portgroup_flags & MOTU_PA_RATE_MASK & flags ) && … … 2230 2231 ( portgroup_flags & MOTU_PA_MK3_OPT_B_MASK & flags )) { 2231 2232 if ((portgroup_flags & MOTU_PA_PADDING) == 0) { 2232 devprop->portgroup_entry[i].group_pkt_offset = pkt_ofs;2233 devprop->portgroup_entry[i].group_pkt_offset[mode_idx] = pkt_ofs; 2233 2234 } 2234 2235 pkt_ofs += 3*devprop->portgroup_entry[i].n_channels; … … 2265 2266 */ 2266 2267 const char *mode_str = direction==Streaming::Port::E_Capture?"cap":"pbk"; 2268 const signed int mode_idx = direction==Streaming::Port::E_Capture?1:0; 2267 2269 Streaming::StreamProcessor *s_processor; 2268 2270 signed int i; … … 2295 2297 /* First scan through the port groups to determine the creation order */ 2296 2298 for (i=0; i<n_groups; i++) { 2297 if (devprop->portgroup_entry[i].group_pkt_offset >= 0) {2299 if (devprop->portgroup_entry[i].group_pkt_offset[mode_idx] >= 0) { 2298 2300 if (create_in_order) 2299 2301 creation_indices[i] = i; … … 2326 2328 asprintf(&buff,"%s_%s_%s" , id.c_str(), mode_str, namestr); 2327 2329 if (!addPort(s_processor, buff, direction, 2328 devprop->portgroup_entry[entry].group_pkt_offset +3*ch, 0))2330 devprop->portgroup_entry[entry].group_pkt_offset[mode_idx]+3*ch, 0)) 2329 2331 return false; 2330 2332 } trunk/libffado/src/motu/motu_avdevice.h
r1906 r1911 307 307 signed int port_order; 308 308 signed int port_num_offset; 309 signed int group_pkt_offset ;309 signed int group_pkt_offset[2]; 310 310 }; 311 311