From 93dd54ecdcfce8ad063a4d951473f110e15c28df Mon Sep 17 00:00:00 2001
From: marcoveeneman <marco-veeneman@hotmail.com>
Date: Fri, 24 Nov 2017 22:23:27 +0100
Subject: Fixed compile errors in demos

---
 demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile |  4 +++-
 demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h | 10 ++++++++++
 demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c   |  6 ++++--
 demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile |  4 +++-
 demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h | 10 ++++++++++
 demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c   |  6 ++++--
 6 files changed, 34 insertions(+), 6 deletions(-)

(limited to 'demos')

diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
index b393902..7c0ab70 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
@@ -99,7 +99,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/TM4C123xH6.ld
diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h
index 0d24275..9c9f341 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h
@@ -182,6 +182,16 @@
  */
 #define CH_CFG_USE_MUTEXES                  TRUE
 
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+
 /**
  * @brief   Conditional Variables APIs.
  * @details If enabled then the conditional variables APIs are included
diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
index 2872f89..7feea14 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
@@ -16,7 +16,8 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
+#include "oslib_test_root.h"
 
 typedef struct led_config
 {
@@ -68,7 +69,8 @@ int main(void)
   sdStart(&SD1, NULL);
 
   if (!palReadLine(LINE_SW2)) {
-    test_execute((BaseSequentialStream *)&SD1);
+    test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+    test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
   }
 
   ledRed.line    = LINE_LED_RED;
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
index 2542d28..da83f36 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
@@ -99,7 +99,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/TM4C129xNC.ld
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
index cc0b2bd..1db198c 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
@@ -182,6 +182,16 @@
  */
 #define CH_CFG_USE_MUTEXES                  TRUE
 
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+
 /**
  * @brief   Conditional Variables APIs.
  * @details If enabled then the conditional variables APIs are included
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
index 22082fe..4afc71f 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
@@ -16,7 +16,8 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
+#include "oslib_test_root.h"
 
 typedef struct led_config
 {
@@ -70,7 +71,8 @@ int main(void)
   sdStart(&SD1, NULL);
 
   if (!palReadLine(LINE_SW1)) {
-    test_execute((BaseSequentialStream *)&SD1);
+    test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
+    test_execute((BaseSequentialStream *)&SD1, &oslib_test_suite);
   }
 
   led1.line  = LINE_LED0;
-- 
cgit v1.2.3