From 074a58f6eb8f0beea202c9d54957ac4875e24b7a Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Fri, 15 Aug 2014 12:58:32 +0100 Subject: [PATCH 1/4] Removed "Input" and "Output" append on interface strings. --- module_usb_audio/endpoint0/descriptors.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h index f054dc52..cea473f4 100644 --- a/module_usb_audio/endpoint0/descriptors.h +++ b/module_usb_audio/endpoint0/descriptors.h @@ -180,17 +180,17 @@ StringDescTable_t g_strTable = .vendorStr = VENDOR_STR, .serialStr = "", .productStr_Audio2 = PRODUCT_STR_A2, - .outputInterfaceStr_Audio2 = APPEND_PRODUCT_STR_A2(Output), - .inputInterfaceStr_Audio2 = APPEND_PRODUCT_STR_A2(Input), - .usbInputTermStr_Audio2 = APPEND_PRODUCT_STR_A2(Output), - .usbOutputTermStr_Audio2 = APPEND_PRODUCT_STR_A2(Input), + .outputInterfaceStr_Audio2 = APPEND_PRODUCT_STR_A2(), + .inputInterfaceStr_Audio2 = APPEND_PRODUCT_STR_A2(), + .usbInputTermStr_Audio2 = APPEND_PRODUCT_STR_A2(), + .usbOutputTermStr_Audio2 = APPEND_PRODUCT_STR_A2(), #if defined (AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS == 1) .productStr_Audio1 = PRODUCT_STR_A1, - .outputInterfaceStr_Audio1 = APPEND_PRODUCT_STR_A1(Output), - .inputInterfaceStr_Audio1 = APPEND_PRODUCT_STR_A1(Input), - .usbInputTermStr_Audio1 = APPEND_PRODUCT_STR_A1(Output), - .usbOutputTermStr_Audio1 = APPEND_PRODUCT_STR_A1(Input), + .outputInterfaceStr_Audio1 = APPEND_PRODUCT_STR_A1(), + .inputInterfaceStr_Audio1 = APPEND_PRODUCT_STR_A1(), + .usbInputTermStr_Audio1 = APPEND_PRODUCT_STR_A1(), + .usbOutputTermStr_Audio1 = APPEND_PRODUCT_STR_A1(), #endif .clockSelectorStr = APPEND_VENDOR_STR(Clock Selector), .internalClockSourceStr = APPEND_VENDOR_STR(Internal Clock), From a9259412bd20febe6ea1d32b14930b5595f48a8c Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Fri, 15 Aug 2014 12:59:08 +0100 Subject: [PATCH 2/4] changelog 6.6.1 -> 6.6.2 --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 22ff07f2..c1959d91 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ sc_usb_audio Change Log ======================= -6.6.1 +6.6.2 ----- * see sw_usb_audio for changelog From f2b688b4cb1ff723c322ddea30ee4608bd1edb4e Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Fri, 15 Aug 2014 12:59:26 +0100 Subject: [PATCH 3/4] xpd: Patched version number --- module_dfu/.cproject | 18 +++--------------- module_usb_audio/devicedefines.h | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/module_dfu/.cproject b/module_dfu/.cproject index bb778c83..da068095 100644 --- a/module_dfu/.cproject +++ b/module_dfu/.cproject @@ -156,11 +156,7 @@