From b9e0b172ae41ba1f1974bc2ce0ad4033cbba4233 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 2 Dec 2015 18:05:41 +0000 Subject: [PATCH 1/9] CHANGELOG only --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 32bca934..74ad20f3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,12 +3,12 @@ sc_usb_audio Change Log 6.14.0 ------ - - ADDED: Support for the use and integration of PDM microphones (including PDM to PCM - conversion) via lib_mic_array - ADDED: Support for various "low" sample rates (i.e. < 44100) into UAC2 sample rate list and UAC1 descriptors - ADDED: Support for for master-clock/sample-rate divides that are not a power of 2 (i.e. 32kHz from 24.567MHz) + - ADDED: Support for the use and integration of PDM microphones (including PDM to PCM + conversion) via lib_mic_array - ADDED: Extended available sample-rate/master-clock ratios. Previous restriction was <= 512x (i.e. could not support 1024x and above e.g. 49.152MHz MCLK for Sample Rates below 96kHz) (#13893) From a1d331c118919acc459e2f70f484eb43d57e28c9 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 2 Dec 2015 22:11:53 +0000 Subject: [PATCH 2/9] module_usb_midi/module_queue no longer uses lib_assert (required to release) --- module_queue/module_build_info | 2 +- module_queue/src/queue.h | 2 +- module_usb_midi/src/midiinparse.xc | 16 +++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/module_queue/module_build_info b/module_queue/module_build_info index 5082786c..fb146b9d 100644 --- a/module_queue/module_build_info +++ b/module_queue/module_build_info @@ -11,4 +11,4 @@ MODULE_XCC_XC_FLAGS = $(XCC_XC_FLAGS) -DEPENDENT_MODULES = lib_xassert +DEPENDENT_MODULES = diff --git a/module_queue/src/queue.h b/module_queue/src/queue.h index 39b57728..1d120fc8 100644 --- a/module_queue/src/queue.h +++ b/module_queue/src/queue.h @@ -1,7 +1,7 @@ #ifndef QUEUE_H_ #define QUEUE_H_ -#include +#define assert(x) asm("ecallf %0"::"r"(x)); typedef struct queue_t { /// Read index. diff --git a/module_usb_midi/src/midiinparse.xc b/module_usb_midi/src/midiinparse.xc index 020f9b61..913b5b54 100644 --- a/module_usb_midi/src/midiinparse.xc +++ b/module_usb_midi/src/midiinparse.xc @@ -2,11 +2,9 @@ * @file midiinparse.xc * @brief Generates USB MIDI events from MIDI events * @author Russell Gallop, XMOS Semiconductor - * @version 0.1 */ #include -//#include #include "midiinparse.h" /** @@ -14,13 +12,13 @@ * */ void dump_midi_in_parse_state(struct midi_in_parse_state &s) { - printstr("expect_msg_len: 0x"); printhexln(s.expect_msg_len); - printstr("msg_type: 0x"); printhexln(s.msg_type); - printstr("receivebuffer: 0x"); printhex(s.receivebuffer[0]); - printstr(", 0x"); printhex(s.receivebuffer[1]); - printstr(", 0x"); printhexln(s.receivebuffer[2]); - printstr("received: 0x"); printhexln(s.received); - printstr("codeIndexNumber: 0x"); printhexln(s.codeIndexNumber); + printstr("expect_msg_len: 0x"); printhexln(s.expect_msg_len); + printstr("msg_type: 0x"); printhexln(s.msg_type); + printstr("receivebuffer: 0x"); printhex(s.receivebuffer[0]); + printstr(", 0x"); printhex(s.receivebuffer[1]); + printstr(", 0x"); printhexln(s.receivebuffer[2]); + printstr("received: 0x"); printhexln(s.received); + printstr("codeIndexNumber: 0x"); printhexln(s.codeIndexNumber); } /** From ee6dd02faae3af8e50b3c02c540d0ae7a4842729 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 2 Dec 2015 22:30:42 +0000 Subject: [PATCH 3/9] xpd: Patched version number --- module_queue/.cproject | 15 +- module_usb_audio/.cproject | 1166 ++++++++---------------------------- module_usb_audio/.project | 160 +++-- module_usb_midi/.cproject | 15 +- 4 files changed, 318 insertions(+), 1038 deletions(-) diff --git a/module_queue/.cproject b/module_queue/.cproject index 5041e25c..b009a5bc 100644 --- a/module_queue/.cproject +++ b/module_queue/.cproject @@ -156,10 +156,7 @@ @@ -272,10 +269,7 @@ @@ -394,10 +388,7 @@ - - - - + diff --git a/module_usb_audio/.cproject b/module_usb_audio/.cproject index 4e47aeca..cc782131 100644 --- a/module_usb_audio/.cproject +++ b/module_usb_audio/.cproject @@ -1,53 +1,3 @@ -<<<<<<< HEAD - - - - - - - - - - - - - - - - xmake - -f .makefile - all - true - true - true - - - xmake - -f .makefile - clean - true - true - true - - - - - - - - - - - - - - - + + - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/module_usb_audio/.project b/module_usb_audio/.project index 80c9d6e8..cb42a172 100644 --- a/module_usb_audio/.project +++ b/module_usb_audio/.project @@ -1,90 +1,76 @@ - module_usb_audio - - - - - - com.xmos.cdt.core.LegacyProjectCheckerBuilder - - - - - com.xmos.cdt.core.ProjectInfoSyncBuilder - - - - - com.xmos.cdt.core.ModulePathBuilder - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - ?children? - ?name?=outputEntries\|?children?=?name?=entry\\\\|\\|\|| - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.buildArguments - CONFIG=Debug - - - org.eclipse.cdt.make.core.buildCommand - xmake - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - false - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - com.xmos.cdt.core.XdeProjectNature - + module_usb_audio + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + ?children? + ?name?=outputEntries\|?children?=?name?=entry\\\\|\\|\|| + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.buildArguments + CONFIG=Debug + + + org.eclipse.cdt.make.core.buildCommand + xmake + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + false + + + org.eclipse.cdt.make.core.enableCleanBuild + true + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + com.xmos.cdt.core.XdeProjectNature + + diff --git a/module_usb_midi/.cproject b/module_usb_midi/.cproject index b7f42267..bd78753f 100644 --- a/module_usb_midi/.cproject +++ b/module_usb_midi/.cproject @@ -156,10 +156,7 @@