Stable -> master conflicted merge

CHANGELOG.rst

@@ -3,21 +3,22 @@ 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:      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)
+    - ADDED:      Support for various "low" sample rates (i.e. < 44100) into UAC 2.0 sample rate
+                  list and UAC 1.0 descriptors
+    - ADDED:      Support for the use and integration of PDM microphones (including PDM to PCM 
+                  conversion) via lib_mic_array 
     - RESOLVED:   MIDI data not accepted after "sleep" in OSX 10.11 (El Capitan) - related to sc_xud
-                  bug #17092
+                  issue #17092
-    - CHANGE:     Asynchronous feedback system re-implemented to allow the previous two changelog 
+    - CHANGE:     Asynchronous feedback system re-implemented to allow for the first two ADDED
-                  items      
+                  changelog items 
     - CHANGE:     Hardware divider used to generate bit-clock from master clock (xCORE-200 only). 
                   Allows easy support for greater number of master-clock to sample-rate ratios.
+    - CHANGE:     module_queue no longer uses any assert module/lib
 
 6.13.0
 ------

README.rst

@@ -1,7 +1,7 @@
 USB Audio Shared
 ................
 
-:Latest release: 6.13.0beta2
+:Latest release: 6.14.0beta2
 :Maintainer: xross
 :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.
 
@@ -9,5 +9,5 @@ USB Audio Shared
 Required software (dependencies)
 ================================
 
-  * lib_xassert (git@github.com:xmos/lib_xassert.git)
+  * None
 

module_queue/.cproject

@@ -156,9 +156,6 @@
 								<option id = "com.xmos.xc.compiler.option.include.paths.84748440" name="com.xmos.xc.compiler.option.include.paths" superClass="com.xmos.xc.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/api}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert}&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue}&quot;' />
 
@@ -272,9 +269,6 @@
 								<option id = "com.xmos.c.compiler.option.include.paths.1482631" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/api}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert}&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue}&quot;' />
 
@@ -394,9 +388,6 @@
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1/xcore-xmos-elf&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/api}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert}&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue}&quot;' />
 

module_queue/module_build_info

@@ -11,4 +11,4 @@
 
 MODULE_XCC_XC_FLAGS = $(XCC_XC_FLAGS)
 
-DEPENDENT_MODULES = lib_xassert
+DEPENDENT_MODULES = 

module_queue/src/queue.h

@@ -1,7 +1,7 @@
 #ifndef QUEUE_H_
 #define QUEUE_H_
 
-#include <xassert.h>
+#define assert(x) asm("ecallf %0"::"r"(x));
 
 typedef struct queue_t {
     /// Read index.

module_usb_audio/.project

@@ -5,21 +5,6 @@
     <projects>
     </projects>
     <buildSpec>
-		<buildCommand>
-			<name>com.xmos.cdt.core.LegacyProjectCheckerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.xmos.cdt.core.ProjectInfoSyncBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.xmos.cdt.core.ModulePathBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
         <buildCommand>
             <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
             <triggers>clean,full,incremental,</triggers>
@@ -88,3 +73,4 @@
         <nature>com.xmos.cdt.core.XdeProjectNature</nature>
     </natures>
 </projectDescription>
+

module_usb_midi/.cproject

@@ -156,9 +156,6 @@
 								<option id = "com.xmos.xc.compiler.option.include.paths.70620891" name="com.xmos.xc.compiler.option.include.paths" superClass="com.xmos.xc.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/api}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert}&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_midi/src}&quot;' />
@@ -274,9 +271,6 @@
 								<option id = "com.xmos.c.compiler.option.include.paths.57949831" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/api}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert}&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_midi/src}&quot;' />
@@ -398,9 +392,6 @@
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1/xcore-xmos-elf&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/api}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/lib_xassert}&quot;' />
                                     <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_queue}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_midi/src}&quot;' />

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 <print.h>
-//#include <assert.h>
 #include "midiinparse.h"
 
 /**

xpd.xml

@@ -7,7 +7,6 @@
         </component>
         <component description = "queue" type = "demoCode" scope = "General Use" path = "module_queue" local = "false" id = "module_queue" name = "Queuing Module For USB Audio Framework">
             <board></board>
-            <componentDependency repo = "git://github.com/xmos/lib_xassert.git">lib_xassert</componentDependency>
             <keyword>UAC2</keyword>
         </component>
         <component description = "Core USB Audio Module" type = "demoCode" scope = "General Use" path = "module_usb_audio" local = "false" id = "module_usb_audio" name = "USB AUDIO MODULE">
@@ -16,16 +15,10 @@
         </component>
         <component description = "MIDI" type = "demoCode" scope = "General Use" path = "module_usb_midi" local = "false" id = "module_usb_midi" name = "MIDI Module for USB Audio Framework">
             <board></board>
-            <componentDependency version = "6.13.0">module_queue</componentDependency>
+            <componentDependency version = "6.14.0">module_queue</componentDependency>
-            <componentDependency repo = "git://github.com/xmos/lib_xassert.git">lib_xassert</componentDependency>
             <keyword>MIDI</keyword>
         </component>
     </components>
-    <dependency repo = "lib_xassert">
-        <gitbranch>master</gitbranch>
-        <githash>9c4955e3ab0604e6ba4b66ad46e01b5d96d5d6fb</githash>
-        <uri>git@github.com:xmos/lib_xassert.git</uri>
-    </dependency>
     <description>USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.</description>
     <docdir>module_dfu/doc</docdir>
     <git_export>False</git_export>