Fix source/license/changelog check fails

Merge branch 'feature/fix_i2s_pushout' into support/0.1
* feature/fix_i2s_pushout: Version bump, changelog and source Better fix to avoid zero length packets being added to input buffer before SoF case starts working Revert "Handle case at startup where decouple ISR gets stuck for several hundred cycles at startup, pushing out I2S timing" Handle case at startup where decouple ISR gets stuck for several hundred cycles at startup, pushing out I2S timing # Conflicts: # CHANGELOG.rst
2020-09-02 11:42:23 +01:00 · 2020-09-02 10:07:12 +01:00 · 2020-09-02 08:37:39 +01:00 · 2020-09-01 17:53:03 +01:00 · 2020-09-01 17:48:38 +01:00 · 2020-09-01 09:55:53 +01:00
6 changed files with 14 additions and 7 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 lib_xua Change Log
 ==================

+0.1.4
+-----
+
+  * RESOLVED: Zero length input packets generated before enumeration causing I2S
+    timing pushout at startup
+
 0.1.3
 -----

--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 Software Release License Agreement

-Copyright (c) 2011-2019, XMOS, All rights reserved.
+Copyright (c) 2011-2020, XMOS, All rights reserved.

 BY ACCESSING, USING, INSTALLING OR DOWNLOADING THE XMOS SOFTWARE, YOU AGREE TO BE BOUND BY THE FOLLOWING TERMS. IF YOU DO NOT AGREE TO THESE, DO NOT ATTEMPT TO DOWNLOAD, ACCESS OR USE THE XMOS Software.

--- a/lib_xua/LICENSE.txt
+++ b/lib_xua/LICENSE.txt
@@ -1,6 +1,6 @@
 Software Release License Agreement

-Copyright (c) 2017-2019, XMOS, All rights reserved.
+Copyright (c) 2017-2020, XMOS, All rights reserved.

 BY ACCESSING, USING, INSTALLING OR DOWNLOADING THE XMOS SOFTWARE, YOU AGREE TO BE BOUND BY THE FOLLOWING TERMS. IF YOU DO NOT AGREE TO THESE, DO NOT ATTEMPT TO DOWNLOAD, ACCESS OR USE THE XMOS Software.

--- a/lib_xua/module_build_info
+++ b/lib_xua/module_build_info
@@ -13,7 +13,7 @@ MODULE_XCC_FLAGS = $(XCC_FLAGS) -O3 -DREF_CLK_FREQ=100 -fasm-linenum -fcomment-a

 OPTIONAL_HEADERS += xua_conf.h

-VERSION = 0.1.3
+VERSION = 0.1.4

 DEPENDENT_MODULES = lib_logging(>=2.1.0) lib_xud(>=0.1.0)

--- a/lib_xua/src/core/buffer/decouple/decouple.xc
+++ b/lib_xua/src/core/buffer/decouple/decouple.xc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2018, XMOS Ltd, All rights reserved
+// Copyright (c) 2011-2020, XMOS Ltd, All rights reserved
 #ifndef NO_USB
 #include <xs1.h>
 #include "xua.h"
--- a/lib_xua/src/core/buffer/ep/ep_buffer.xc
+++ b/lib_xua/src/core/buffer/ep/ep_buffer.xc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2018, XMOS Ltd, All rights reserved
+// Copyright (c) 2011-2020, XMOS Ltd, All rights reserved
 #ifndef NO_USB
 #include <xs1.h>
 #include <print.h>
@@ -38,8 +38,9 @@ extern unsigned int g_curSamFreqMultiplier;
 #endif


-/* Global var for speed.  Related to feedback. Used by input stream to determine IN packet size */
-unsigned g_speed;
+/* Initialise so we get a sensible packet size until we start properly calculating feedback in the SoF case */
+/* Without this, zero size packets fill the input FIFO and take time to clear out when feedback starts */
+unsigned g_speed = (AUDIO_CLASS == 2) ? (DEFAULT_FREQ/8000) << 16 : (DEFAULT_FREQ/1000) << 16;
 unsigned g_freqChange = 0;
 unsigned feedbackValid = 0;
Author	SHA1	Message	Date
Ed	67f8badbe7	Fix source/license/changelog check fails	2020-09-02 11:42:23 +01:00
Ed	8be5f0a31f	Merge branch 'feature/fix_i2s_pushout' into support/0.1 * feature/fix_i2s_pushout: Version bump, changelog and source Better fix to avoid zero length packets being added to input buffer before SoF case starts working Revert "Handle case at startup where decouple ISR gets stuck for several hundred cycles at startup, pushing out I2S timing" Handle case at startup where decouple ISR gets stuck for several hundred cycles at startup, pushing out I2S timing # Conflicts: # CHANGELOG.rst	2020-09-02 10:07:12 +01:00
Ed	acd5e5f951	Version bump, changelog and source	2020-09-02 08:37:39 +01:00
Ed	0286ca093d	Better fix to avoid zero length packets being added to input buffer before SoF case starts working	2020-09-01 17:53:03 +01:00
Ed	2e8e57d5fa	Revert "Handle case at startup where decouple ISR gets stuck for several hundred cycles at startup, pushing out I2S timing" This reverts commit `0b32bee3aa`.	2020-09-01 17:48:38 +01:00
Ed	0b32bee3aa	Handle case at startup where decouple ISR gets stuck for several hundred cycles at startup, pushing out I2S timing	2020-09-01 09:55:53 +01:00