Merge branch 'MAINTAIN_6v11'

2015-04-08 11:47:16 +01:00
parent 5c44fecd13 f4d02b8fd8
commit 29535560db
4 changed files with 7 additions and 2 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 sc_usb_audio Change Log
 =======================

+6.11.3
+------
+    - RESOLVED:  (Major) Streaming issue when mixer not enabled (introduced in 6.11.2)
+
 6.11.2
 ------
    - RESOLVED:   (Major) Enumeration issue when MAX_MIX_COUNT > 0 only. Introduced in mixer 
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 USB Audio Shared
 ................

-:Latest release: 6.11.2rc2
+:Latest release: 6.11.3rc0
 :Maintainer: xross
 :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.

--- a/module_usb_audio/audio.xc
+++ b/module_usb_audio/audio.xc
@@ -245,6 +245,7 @@ static inline unsigned DoSampleTransfer(chanend c_out, int readBuffNo, unsigned
    else
    {
 #ifndef MIXER // Interfaces straight to decouple()
+        inuint(c_out);
 #if NUM_USB_CHAN_IN > 0
 #pragma loop unroll
        for(int i = 0; i < I2S_CHANS_ADC; i++)
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -469,7 +469,7 @@
 * @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
 */
 #ifndef BCD_DEVICE_N
-#define BCD_DEVICE_N             2
+#define BCD_DEVICE_N             3
 #endif

 /**