laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Resolved enum issue when MAX_MIX_COUNT > 0. Introduced in 6.11 mixer opts (bug #16564)

Browse Source
This commit is contained in:
Ross Owen
2015-03-18 10:24:20 +00:00
parent 1e963e8bc5
commit 961bebf683
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@@ -1,6 +1,11 @@
sc_usb_audio Change Log sc_usb_audio Change Log
======================= =======================
HEAD
----
- RESOLVED: Enumeration issue when MAX_MIX_COUNT > 0. Introduced in mixer optimisations
in 6.11.0
6.11.1 6.11.1
------ ------
- ADDED: ADAT transmit functionality, including SMUX. See ADAT_TX and ADAT_TX_INDEX. - ADDED: ADAT transmit functionality, including SMUX. See ADAT_TX and ADAT_TX_INDEX.

12
module_usb_audio/mixer/mixer.xc
View File

@@ -363,9 +363,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
/* Request from audio() */ /* Request from audio() */
inuint(c_mixer2); inuint(c_mixer2);
GiveSamplesToDevice(c_mixer2, samples_to_device_map, multOut, underflow);
GetSamplesFromDevice(c_mixer2);
/* Request data from decouple thread */ /* Request data from decouple thread */
outuint(c_host, 0); outuint(c_host, 0);
@@ -504,9 +501,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
sampFreq = inuint(c_host); sampFreq = inuint(c_host);
mixer1_mix2_flag = sampFreq > 96000; mixer1_mix2_flag = sampFreq > 96000;
/* Wait for request */
inuint(c_mixer2);
/* Inform mixer2 (or audio()) about freq change */ /* Inform mixer2 (or audio()) about freq change */
outct(c_mixer2, command); outct(c_mixer2, command);
outuint(c_mixer2, sampFreq); outuint(c_mixer2, sampFreq);
@@ -515,9 +509,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
case SET_STREAM_FORMAT_OUT: case SET_STREAM_FORMAT_OUT:
case SET_STREAM_FORMAT_IN: case SET_STREAM_FORMAT_IN:
/* Wait for request */
inuint(c_mixer2);
/* Inform mixer2 (or audio()) about format change */ /* Inform mixer2 (or audio()) about format change */
outct(c_mixer2, command); outct(c_mixer2, command);
outuint(c_mixer2, inuint(c_host)); outuint(c_mixer2, inuint(c_host));
@@ -612,7 +603,8 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
} }
#else /* IF MAX_MIX_COUNT > 0 */ #else /* IF MAX_MIX_COUNT > 0 */
/* No mixes, this thread runs on its own doing just volume */ /* No mixes, this thread runs on its own doing just volume */
GiveSamplesToDevice(c_mixer2, samples_to_device_map, multOut, underflow);
GetSamplesFromDevice(c_mixer2);
GiveSamplesToHost(c_host, samples_to_host_map, multIn); GiveSamplesToHost(c_host, samples_to_host_map, multIn);
GetSamplesFromHost(c_host, underflow); GetSamplesFromHost(c_host, underflow);
#endif #endif