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
This commit is contained in:
Ed
2020-09-02 10:07:12 +01:00
3 changed files with 11 additions and 4 deletions

View File

@@ -1,6 +1,12 @@
lib_xua Change Log lib_xua Change Log
================== ==================
0.1.4
-----
* RESOLVED: Zero length input packets generated before enumeration causing
I2S timing pushout at startup
0.1.3 0.1.3
----- -----

View File

@@ -13,7 +13,7 @@ MODULE_XCC_FLAGS = $(XCC_FLAGS) -O3 -DREF_CLK_FREQ=100 -fasm-linenum -fcomment-a
OPTIONAL_HEADERS += xua_conf.h 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) DEPENDENT_MODULES = lib_logging(>=2.1.0) lib_xud(>=0.1.0)

View File

@@ -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 #ifndef NO_USB
#include <xs1.h> #include <xs1.h>
#include <print.h> #include <print.h>
@@ -38,8 +38,9 @@ extern unsigned int g_curSamFreqMultiplier;
#endif #endif
/* Global var for speed. Related to feedback. Used by input stream to determine IN packet size */ /* Initialise so we get a sensible packet size until we start properly calculating feedback in the SoF case */
unsigned g_speed; /* 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 g_freqChange = 0;
unsigned feedbackValid = 0; unsigned feedbackValid = 0;