From 6ce5c343b162e4f5aa2b85b782b6c553763987d2 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 23 Mar 2015 11:35:58 +0000 Subject: [PATCH 1/3] Added 6.11.2 to CHANGELOG --- CHANGELOG.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3b07643d..fdd2b1e8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,14 @@ sc_usb_audio Change Log ======================= -HEAD ----- +6.11.2 +------ - RESOLVED: (Major) Enumeration issue when MAX_MIX_COUNT > 0 only. Introduced in mixer - optimisations in 6.11.0. Does not effect designs without mixer enabled. + optimisations in 6.11.0. Only affects designs using mixer functionality. + - RESOLVED: (Normal) Audio buffering request system modified such that the mixer output is + not silent when in underflow case (i.e. host output stream not active) This issue was + introduced with the addition of DSD functionality and only affects designs using + mixer functionality. - RESOLVED: (Minor) Potential build issue due to duplicate labels in inline asm in set_interrupt_handler macro - RESOLVED: (Minor) String descriptor for Clock Selector unit incorrectly reported From f32156da38e40f05dd8602c511754935974f53c5 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 23 Mar 2015 11:56:16 +0000 Subject: [PATCH 2/3] BCD_DEVICE guarded with ifndef --- CHANGELOG.rst | 2 ++ module_usb_audio/devicedefines.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fdd2b1e8..b7f0c38b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,8 @@ sc_usb_audio Change Log mixer functionality. - RESOLVED: (Minor) Potential build issue due to duplicate labels in inline asm in set_interrupt_handler macro + - RESOLVED: (Minor) BCD_DEVICE define in devicedefines.h now guarded by ifndef (caused issues + with DFU test build configs. - RESOLVED: (Minor) String descriptor for Clock Selector unit incorrectly reported - CHANGE: HID report descriptor defines added to shared user_hid.h - CHANGE: Now uses module_adat_rx from sc_adat (local module_usb_audio_adat removed) diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h index ce3f747d..b55f56f5 100644 --- a/module_usb_audio/devicedefines.h +++ b/module_usb_audio/devicedefines.h @@ -472,8 +472,9 @@ * * Default: XMOS USB Audio Release version (e.g. 0x0651 for 6.5.1). */ +#ifndef BCD_DEVICE #define BCD_DEVICE ((BCD_DEVICE_J << 8) | ((BCD_DEVICE_M & 0xF) << 4) | (BCD_DEVICE_N & 0xF)) - +#endif /** * @brief Number of supported output stream formats. From 3ee4bdfea961b94c6320088560a166a1b440ccc7 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 23 Mar 2015 11:56:35 +0000 Subject: [PATCH 3/3] Dead code removal only. --- module_usb_audio/uac_hwresources.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/module_usb_audio/uac_hwresources.h b/module_usb_audio/uac_hwresources.h index a5f67f6e..31181e19 100644 --- a/module_usb_audio/uac_hwresources.h +++ b/module_usb_audio/uac_hwresources.h @@ -27,8 +27,6 @@ #define CLKBLK_USB_RST XS1_CLKBLK_4 /* Clock block passed into L/G series XUD */ #define CLKBLK_FLASHLIB XS1_CLKBLK_5 /* Clock block for use by flash lib */ -/* #define CLKBLK_SPDIF_TX XS1_CLKBLK_1 */ -/* #define CLKBLK_MCLK XS1_CLKBLK_2 */ #define CLKBLK_I2S_BIT XS1_CLKBLK_3 #else @@ -44,11 +42,8 @@ /* use REF for ADAT_RX on U-series */ /* #define CLKBLK_ADAT_RX XS1_CLKBLK_3 */ /* Note, U-series XUD uses clock blocks 4 and 5 - see XUD_Ports.xc */ - #define CLKBLK_FLASHLIB XS1_CLKBLK_5 /* Clock block for use by flash lib */ -/* #define CLKBLK_SPDIF_TX XS1_CLKBLK_1 */ -/* #define CLKBLK_MCLK XS1_CLKBLK_2 */ #define CLKBLK_I2S_BIT XS1_CLKBLK_3 #endif