From 5c1773a883fa3fbc03b3a04724984fee4aff5fff Mon Sep 17 00:00:00 2001 From: xross Date: Tue, 5 Jul 2022 19:17:10 +0100 Subject: [PATCH 1/6] Copyright comment --- lib_xua/api/xua_buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/api/xua_buffer.h b/lib_xua/api/xua_buffer.h index 2c3c673d..265846cc 100644 --- a/lib_xua/api/xua_buffer.h +++ b/lib_xua/api/xua_buffer.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. #ifndef __XUA_BUFFER_H__ #define __XUA_BUFFER_H__ From 7e098c7139be571c7b51e2d23739098ae45128c2 Mon Sep 17 00:00:00 2001 From: xross Date: Tue, 5 Jul 2022 19:22:34 +0100 Subject: [PATCH 2/6] Add missing include --- lib_xua/src/core/endpoint0/xua_ep0_descriptors.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h index 5c88faca..3ce6310b 100644 --- a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h +++ b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h @@ -10,12 +10,13 @@ #define _DEVICE_DESCRIPTORS_ #include -#include "xua.h" /* Device specific define */ +#include "xua.h" /* Device specific define */ #include "descriptor_defs.h" #include "usbaudio20.h" /* Defines from the USB Audio 2.0 Specifications */ #include "usbaudiocommon.h" #include "xud_device.h" #include "xua_hid_descriptor.h" +#include "xud.h" #define APPEND_VENDOR_STR(x) VENDOR_STR" "#x From a913cd85f1a893d0133dd272dd2b700ed8dae06c Mon Sep 17 00:00:00 2001 From: xross Date: Mon, 11 Jul 2022 11:36:53 +0100 Subject: [PATCH 3/6] Fixed error message --- .gitignore | 1 + lib_xua/src/core/endpoint0/xua_ep0_descriptors.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a10bd6ad..979a2930 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ _build* **/.vscode/** **.egg-info *.pdf +*tests/logs/* # waf build files .lock-waf_* diff --git a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h index 3ce6310b..83f7cbb5 100644 --- a/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h +++ b/lib_xua/src/core/endpoint0/xua_ep0_descriptors.h @@ -2683,7 +2683,7 @@ unsigned char cfgDesc_Audio1[] = #elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC) ISO_EP_ATTRIBUTES_SYNC, /* Iso, sync, data endpoint */ #else -#error "Bad XUD_SYNCMODE" +#error "Unsupported XUA_SYNCMODE" #endif (FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff), /* 4 wMaxPacketSize (Typically 294 bytes)*/ (FS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5 wMaxPacketSize */ @@ -2831,7 +2831,7 @@ unsigned char cfgDesc_Audio1[] = #elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC) ISO_EP_ATTRIBUTES_SYNC, /* Iso, sync, data endpoint */ #else -#error "Bad XUD_SYNCMODE" +#error "Unsupported XUA_SYNCMODE" #endif FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE&0xff, /* 4 wMaxPacketSize (Typically 294 bytes)*/ (FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE&0xff00)>>8, /* 5 wMaxPacketSize */ From 2a8f3b11d96ef3fb2a25f8b4860c373e57ec1038 Mon Sep 17 00:00:00 2001 From: xross Date: Mon, 11 Jul 2022 12:09:30 +0100 Subject: [PATCH 4/6] Updated copyright comment --- lib_xua/src/core/endpoint0/chanstrings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/src/core/endpoint0/chanstrings.h b/lib_xua/src/core/endpoint0/chanstrings.h index f1e98422..b30886a5 100644 --- a/lib_xua/src/core/endpoint0/chanstrings.h +++ b/lib_xua/src/core/endpoint0/chanstrings.h @@ -1,4 +1,4 @@ -// Copyright 2015-2021 XMOS LIMITED. +// Copyright 2015-2022 XMOS LIMITED. // This Software is subject to the terms of the XMOS Public Licence: Version 1. /* AUTOGENERATED using chanstringgen.py */ From 1ad26f6bac94a68a7160246c949256d1df25fc4a Mon Sep 17 00:00:00 2001 From: xross Date: Mon, 11 Jul 2022 12:35:07 +0100 Subject: [PATCH 5/6] Update app_test_i2s_loopback for latest API related to TDM --- legacy_tests/app_test_i2s_loopback/Makefile | 8 ++++---- legacy_tests/app_test_i2s_loopback/main.xc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/legacy_tests/app_test_i2s_loopback/Makefile b/legacy_tests/app_test_i2s_loopback/Makefile index c3e3ab40..51bec388 100644 --- a/legacy_tests/app_test_i2s_loopback/Makefile +++ b/legacy_tests/app_test_i2s_loopback/Makefile @@ -45,25 +45,25 @@ BUILD_FLAGS_i2s_slave_8in_8out_192khz = $(BUILD_FLAGS) \ -D DEFAULT_FREQ=192000 -DCODEC_MASTER=1 \ -O2 # optimisations to meet timing -BUILD_FLAGS_tdm_master_8in_8out_48khz = $(BUILD_FLAGS) -D I2S_MODE_TDM=1 \ +BUILD_FLAGS_tdm_master_8in_8out_48khz = $(BUILD_FLAGS) -D XUA_PCM_FORMAT=XUA_PCM_FORMAT_TDM \ -D ADAT_RX=0 -D ADAT_TX=0 -D SPDIF_RX=0 -D SPDIF_TX=0 -D MIDI=0 \ -D NUM_USB_CHAN_IN=8 -D NUM_USB_CHAN_OUT=8 -D I2S_CHANS_ADC=8 -D I2S_CHANS_DAC=8 \ -D DEFAULT_FREQ=48000 \ -O2 # optimisations to meet timing -BUILD_FLAGS_tdm_slave_8in_8out_48khz = $(BUILD_FLAGS) -D I2S_MODE_TDM=1 \ +BUILD_FLAGS_tdm_slave_8in_8out_48khz = $(BUILD_FLAGS) -D XUA_PCM_FORMAT=XUA_PCM_FORMAT_TDM \ -D ADAT_RX=0 -D ADAT_TX=0 -D SPDIF_RX=0 -D SPDIF_TX=0 -D MIDI=0 \ -D NUM_USB_CHAN_IN=8 -D NUM_USB_CHAN_OUT=8 -D I2S_CHANS_ADC=8 -D I2S_CHANS_DAC=8 \ -D DEFAULT_FREQ=48000 -DCODEC_MASTER=1 \ -O2 # optimisations to meet timing -BUILD_FLAGS_tdm_master_16in_16out_48khz = $(BUILD_FLAGS) -D I2S_MODE_TDM=1 \ +BUILD_FLAGS_tdm_master_16in_16out_48khz = $(BUILD_FLAGS) -D XUA_PCM_FORMAT=XUA_PCM_FORMAT_TDM \ -D ADAT_RX=0 -D ADAT_TX=0 -D SPDIF_RX=0 -D SPDIF_TX=0 -D MIDI=0 \ -D NUM_USB_CHAN_IN=16 -D NUM_USB_CHAN_OUT=16 -D I2S_CHANS_ADC=16 -D I2S_CHANS_DAC=16 \ -D DEFAULT_FREQ=48000 \ -O2 # optimisations to meet timing -BUILD_FLAGS_tdm_slave_16in_16out_48khz = $(BUILD_FLAGS) -D I2S_MODE_TDM=1 \ +BUILD_FLAGS_tdm_slave_16in_16out_48khz = $(BUILD_FLAGS) -D XUA_PCM_FORMAT=XUD_PCM_FORMAT_TDM \ -D ADAT_RX=0 -D ADAT_TX=0 -D SPDIF_RX=0 -D SPDIF_TX=0 -D MIDI=0 \ -D NUM_USB_CHAN_IN=16 -D NUM_USB_CHAN_OUT=16 -D I2S_CHANS_ADC=16 -D I2S_CHANS_DAC=16 \ -D DEFAULT_FREQ=48000 -DCODEC_MASTER=1 \ diff --git a/legacy_tests/app_test_i2s_loopback/main.xc b/legacy_tests/app_test_i2s_loopback/main.xc index bfef1fd1..a98bc9ec 100644 --- a/legacy_tests/app_test_i2s_loopback/main.xc +++ b/legacy_tests/app_test_i2s_loopback/main.xc @@ -203,7 +203,7 @@ void slave_mode_clk_setup(const unsigned samFreq, const unsigned chans_per_frame #endif -#if I2S_MODE_TDM +#if (XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM) const int i2s_tdm_mode = 8; #else const int i2s_tdm_mode = 2; From f534537b7657bfa243551691864b415594953022 Mon Sep 17 00:00:00 2001 From: xross Date: Mon, 11 Jul 2022 13:43:13 +0100 Subject: [PATCH 6/6] Fix typo in define --- legacy_tests/app_test_i2s_loopback/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy_tests/app_test_i2s_loopback/Makefile b/legacy_tests/app_test_i2s_loopback/Makefile index 51bec388..7fb0bb12 100644 --- a/legacy_tests/app_test_i2s_loopback/Makefile +++ b/legacy_tests/app_test_i2s_loopback/Makefile @@ -63,7 +63,7 @@ BUILD_FLAGS_tdm_master_16in_16out_48khz = $(BUILD_FLAGS) -D XUA_PCM_FORMAT=XUA_P -D DEFAULT_FREQ=48000 \ -O2 # optimisations to meet timing -BUILD_FLAGS_tdm_slave_16in_16out_48khz = $(BUILD_FLAGS) -D XUA_PCM_FORMAT=XUD_PCM_FORMAT_TDM \ +BUILD_FLAGS_tdm_slave_16in_16out_48khz = $(BUILD_FLAGS) -D XUA_PCM_FORMAT=XUA_PCM_FORMAT_TDM \ -D ADAT_RX=0 -D ADAT_TX=0 -D SPDIF_RX=0 -D SPDIF_TX=0 -D MIDI=0 \ -D NUM_USB_CHAN_IN=16 -D NUM_USB_CHAN_OUT=16 -D I2S_CHANS_ADC=16 -D I2S_CHANS_DAC=16 \ -D DEFAULT_FREQ=48000 -DCODEC_MASTER=1 \