From baa853985b7471b3c25f73a516356f8754de88a0 Mon Sep 17 00:00:00 2001
From: Oscar Bailey <oscarbailey@xmos.com>
Date: Wed, 21 Oct 2020 14:50:50 +0100
Subject: [PATCH 1/4] Fix compiler errors when HID_CONTROLS > 0

---
 lib_xua/module_build_info | 1 +
 lib_xua/src/hid/hid.xc    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib_xua/module_build_info b/lib_xua/module_build_info
index 8259a798..6d7b0185 100644
--- a/lib_xua/module_build_info
+++ b/lib_xua/module_build_info
@@ -45,6 +45,7 @@ INCLUDE_DIRS = $(EXPORT_INCLUDE_DIRS) \
                src/core/user/audiostream \
                src/core/user/hid \
                src/core/user/hostactive \
+               src/hid \
                src/midi
 
 SOURCE_DIRS = src/core \
diff --git a/lib_xua/src/hid/hid.xc b/lib_xua/src/hid/hid.xc
index 906fd1ec..5d694c53 100644
--- a/lib_xua/src/hid/hid.xc
+++ b/lib_xua/src/hid/hid.xc
@@ -1,4 +1,5 @@
 // Copyright (c) 2019, XMOS Ltd, All rights reserved
+#include <stdint.h>
 #include <xs1.h>
 #include "descriptor_defs.h"
 #include "hid.h"

From 6dbff06dced9db546ee67ea159267397a38d6a21 Mon Sep 17 00:00:00 2001
From: Oscar Bailey <oscarbailey@xmos.com>
Date: Tue, 10 Nov 2020 14:35:54 +0000
Subject: [PATCH 2/4] Fix typo in pdm_mic.xc causing firmware crash

---
 lib_xua/src/core/pdm_mics/pdm_mic.xc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib_xua/src/core/pdm_mics/pdm_mic.xc b/lib_xua/src/core/pdm_mics/pdm_mic.xc
index b853f2d0..5b2b5142 100644
--- a/lib_xua/src/core/pdm_mics/pdm_mic.xc
+++ b/lib_xua/src/core/pdm_mics/pdm_mic.xc
@@ -115,7 +115,7 @@ void XUA_PdmBuffer(streaming chanend c_ds_output[2], chanend c_audio)
         dc[1].mic_gain_compensation[2]=0;
         dc[1].mic_gain_compensation[3]=0;
         dc[1].channel_count = 4;
-        dc[0].async_interface_enabled = 0;
+        dc[1].async_interface_enabled = 0;
 
         mic_array_decimator_configure(c_ds_output, decimatorCount, dc);
 

From 7fc1f254b74a77ba0afa8895ecc5935c6818b7eb Mon Sep 17 00:00:00 2001
From: Oscar Bailey <oscarbailey@xmos.com>
Date: Tue, 24 Nov 2020 15:24:02 +0000
Subject: [PATCH 3/4] Update CHANGELOG

---
 CHANGELOG.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 108b2362..9a8b1cf4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,8 @@ lib_xua Change Log
   * ADDED:     Makefile.Win32 for xmosdfu on Windows
   * FIXED:     Bump default BCD device number to v1.2.0
   * FIXED:     xmosdfu now fails with an error when given a directory (#119)
+  * FIXED:     Compilation errors related to HID code
+  * FIXED:     Runtime error when using mic array interface
 
 1.1.1
 -----

From 16a927d63b0ee1c0b28751d22182b4813a90a858 Mon Sep 17 00:00:00 2001
From: Oscar Bailey <oscarbailey@xmos.com>
Date: Tue, 24 Nov 2020 16:40:55 +0000
Subject: [PATCH 4/4] Fix copyright notices

---
 lib_xua/src/core/pdm_mics/pdm_mic.xc | 2 +-
 lib_xua/src/hid/hid.xc               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib_xua/src/core/pdm_mics/pdm_mic.xc b/lib_xua/src/core/pdm_mics/pdm_mic.xc
index 5b2b5142..137f289c 100644
--- a/lib_xua/src/core/pdm_mics/pdm_mic.xc
+++ b/lib_xua/src/core/pdm_mics/pdm_mic.xc
@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2019, XMOS Ltd, All rights reserved
+// Copyright (c) 2015-2020, XMOS Ltd, All rights reserved
 
 #include "xua.h"
 
diff --git a/lib_xua/src/hid/hid.xc b/lib_xua/src/hid/hid.xc
index 5d694c53..6a2e81f8 100644
--- a/lib_xua/src/hid/hid.xc
+++ b/lib_xua/src/hid/hid.xc
@@ -1,4 +1,4 @@
-// Copyright (c) 2019, XMOS Ltd, All rights reserved
+// Copyright (c) 2019-2020, XMOS Ltd, All rights reserved
 #include <stdint.h>
 #include <xs1.h>
 #include "descriptor_defs.h"