Merge pull request #157 from oscarbailey-xmos/feature/fix-hid-compiler-errors

Fix compiler errors when HID_CONTROLS > 0

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
 -----

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 \

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"
 
@@ -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);
 

lib_xua/src/hid/hid.xc

@@ -1,4 +1,5 @@
-// 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"
 #include "hid.h"