Merge branch 'develop' into feature/pendragon

2019-11-06 15:20:36 +00:00
parent 28cce8b51c 6dd1853094
commit 5bb5998788
3 changed files with 8 additions and 2 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 lib_xua Change Log
 ==================

+0.2.1
+-----
+
+  * HOTFIX: Fix descriptors for XUA_ADAPTIVE
+
 0.2.0_demo
 ----------
  * ADDED:     UAC1 HID support with simulated Voice Command detection reported
--- a/lib_xua/module_build_info
+++ b/lib_xua/module_build_info
@@ -1,4 +1,4 @@
-VERSION = 0.2.0
+VERSION = 0.2.1

 DEPENDENT_MODULES = lib_logging(>=3.0.0) \
                    lib_xassert(>=4.0.0) \
--- a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
+++ b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
@@ -1639,7 +1639,8 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
        .bmAttributes                  = ISO_EP_ATTRIBUTES_ADAPTIVE, /* (bitmap)  */
 #else
        .bmAttributes                  = ISO_EP_ATTRIBUTES_ASYNCH,   /* (bitmap)  */
-#endif        .wMaxPacketSize                = HS_STREAM_FORMAT_OUTPUT_3_MAXPACKETSIZE,
+#endif        
+        .wMaxPacketSize                = HS_STREAM_FORMAT_OUTPUT_3_MAXPACKETSIZE,
        .bInterval                     = 1,
    },