From a270972bf93fdfda654bac725214244a8bb12937 Mon Sep 17 00:00:00 2001 From: xross Date: Mon, 14 Mar 2022 11:18:26 +0000 Subject: [PATCH 1/6] Enable explicit feedback EP by default --- lib_xua/api/xua_conf_default.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib_xua/api/xua_conf_default.h b/lib_xua/api/xua_conf_default.h index a1db834c..0cf047d2 100644 --- a/lib_xua/api/xua_conf_default.h +++ b/lib_xua/api/xua_conf_default.h @@ -1171,6 +1171,10 @@ #endif #endif +/* Always enable explicit feedback EP, even when input stream is present */ +#ifndef UAC_FORCE_FEEDBACK_EP +#define UAC_FORCE_FEEDBACK_EP (1) +#endif #if (defined(UAC_FORCE_FEEDBACK_EP) && UAC_FORCE_FEEDBACK_EP == 0) #undef UAC_FORCE_FEEDBACK_EP From cf826e910d615607b74e16ed1c1e3f8fbcae3846 Mon Sep 17 00:00:00 2001 From: xross Date: Mon, 14 Mar 2022 11:20:20 +0000 Subject: [PATCH 2/6] Copyright date --- lib_xua/api/xua_conf_default.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/api/xua_conf_default.h b/lib_xua/api/xua_conf_default.h index 0cf047d2..89d2c458 100644 --- a/lib_xua/api/xua_conf_default.h +++ b/lib_xua/api/xua_conf_default.h @@ -1,4 +1,4 @@ -// Copyright 2011-2021 XMOS LIMITED. +// Copyright 2011-2022 XMOS LIMITED. // This Software is subject to the terms of the XMOS Public Licence: Version 1. /* * @brief Defines relating to device configuration and customisation of lib_xua From ea3dffb05c9abca1ca223b7e72b5a3a2b1c15b13 Mon Sep 17 00:00:00 2001 From: xross Date: Mon, 14 Mar 2022 11:21:10 +0000 Subject: [PATCH 3/6] Changelog update --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 252450e5..ccf5b55b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ UNRELEASED ---------- * CHANGED: Exclude HID Report functions unless the HID feature is enabled + * CHANGED: Explicit feedback EP enabled by default (see UAC_FORCE_FEEDBACK_EP) * FIXED: Incorrect conditional compilation of HID report code 3.1.0 From 46a7b7ac22f5220883b920b41a3e358d24540076 Mon Sep 17 00:00:00 2001 From: xross Date: Mon, 14 Mar 2022 16:17:12 +0000 Subject: [PATCH 4/6] Fix example builds --- examples/AN00246_xua_example/Makefile | 4 +--- examples/AN00247_xua_example_spdif_tx/Makefile | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/AN00246_xua_example/Makefile b/examples/AN00246_xua_example/Makefile index 35489717..037b1524 100644 --- a/examples/AN00246_xua_example/Makefile +++ b/examples/AN00246_xua_example/Makefile @@ -5,10 +5,8 @@ TARGET = xk-audio-216-mc.xn # The flags passed to xcc when building the application XCC_FLAGS = -fcomment-asm -Xmapper --map -Xmapper MAPFILE -O3 -report -save-temps \ -g -Wno-unused-function -Wno-timing -DXUD_SERIES_SUPPORT=XUD_X200_SERIES \ - -DXUD_CORE_CLOCK=600 -DUSB_TILE=tile[1] -fxscope + -DXUD_CORE_CLOCK=600 -DUSB_TILE=tile[1] -fxscope -DUAC_FORCE_FEEDBACK_EP=0 -#-DSDA_HIGH=2 -DSCL_HIGH=1 -fxscope - # The USED_MODULES variable lists other module used by the application. These # modules will extend the SOURCE_DIRS, INCLUDE_DIRS and LIB_DIRS variables. # Modules are expected to be in the directory above the BASE_DIR directory. diff --git a/examples/AN00247_xua_example_spdif_tx/Makefile b/examples/AN00247_xua_example_spdif_tx/Makefile index f5b953ec..00fadd8d 100644 --- a/examples/AN00247_xua_example_spdif_tx/Makefile +++ b/examples/AN00247_xua_example_spdif_tx/Makefile @@ -5,7 +5,8 @@ TARGET = xk-audio-216-mc.xn # The flags passed to xcc when building the application XCC_FLAGS = -fcomment-asm -Xmapper --map -Xmapper MAPFILE -O3 -report -save-temps \ -g -Wno-unused-function -Wno-timing -DXUD_SERIES_SUPPORT=XUD_X200_SERIES \ - -DXUD_CORE_CLOCK=600 -DUSB_TILE=tile[1] -DSDA_HIGH=2 -DSCL_HIGH=1 -fxscope + -DXUD_CORE_CLOCK=600 -DUSB_TILE=tile[1] -DSDA_HIGH=2 -DSCL_HIGH=1 -fxscope \ + -DUAC_FORCE_FEEDBACK_EP=0 # The USED_MODULES variable lists other module used by the application. These # modules will extend the SOURCE_DIRS, INCLUDE_DIRS and LIB_DIRS variables. From 8bf991eb76f1f86187161ce5bc49e13eca9bc493 Mon Sep 17 00:00:00 2001 From: xross Date: Tue, 15 Mar 2022 11:40:10 +0000 Subject: [PATCH 5/6] Fixed issue where DSD_NATIVE is always enabled if DSD_CHANS_DAC defined as 0 --- lib_xua/api/xua_conf_default.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/api/xua_conf_default.h b/lib_xua/api/xua_conf_default.h index 89d2c458..0d0fd428 100644 --- a/lib_xua/api/xua_conf_default.h +++ b/lib_xua/api/xua_conf_default.h @@ -83,7 +83,7 @@ /** * @brief Number of DSD output channels. Default: 0 (disabled) */ -#if defined(DSD_CHANS_DAC) +#if defined(DSD_CHANS_DAC) && (DSD_CHANS_DAC != 0) #if defined(NATIVE_DSD) && (NATIVE_DSD == 0) #undef NATIVE_DSD #else From fd58827b8897a662e080abdced24fb81b9b42bb3 Mon Sep 17 00:00:00 2001 From: xross Date: Tue, 15 Mar 2022 12:42:18 +0000 Subject: [PATCH 6/6] Fix build issue in AN00248 --- examples/AN00248_xua_example_pdm_mics/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/AN00248_xua_example_pdm_mics/Makefile b/examples/AN00248_xua_example_pdm_mics/Makefile index e14afb94..5adce1f7 100644 --- a/examples/AN00248_xua_example_pdm_mics/Makefile +++ b/examples/AN00248_xua_example_pdm_mics/Makefile @@ -5,7 +5,8 @@ TARGET = mic_array_ref.xn # The flags passed to xcc when building the application XCC_FLAGS = -fcomment-asm -Xmapper --map -Xmapper MAPFILE -O3 -report -save-temps \ -g -Wno-unused-function -Wno-timing -DXUD_SERIES_SUPPORT=XUD_X200_SERIES \ - -DXUD_CORE_CLOCK=600 -DUSB_TILE=tile[1] -DSDA_HIGH=2 -DSCL_HIGH=1 -fxscope + -DXUD_CORE_CLOCK=600 -DUSB_TILE=tile[1] -DSDA_HIGH=2 -DSCL_HIGH=1 -fxscope \ + -DUAC_FORCE_FEEDBACK_EP=0 # The USED_MODULES variable lists other module used by the application. These # modules will extend the SOURCE_DIRS, INCLUDE_DIRS and LIB_DIRS variables.