From 7f125090039adbe5c28e052584c7c32684ab5ec4 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Mon, 16 Nov 2015 10:11:21 +0000
Subject: Mass update of halconf.h.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8495 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/include/uart.h      |  4 ++--
 os/hal/templates/halconf.h | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'os')

diff --git a/os/hal/include/uart.h b/os/hal/include/uart.h
index f619599d9..43afcd7d9 100644
--- a/os/hal/include/uart.h
+++ b/os/hal/include/uart.h
@@ -56,7 +56,7 @@
  * @note    Disabling this option saves both code and data space.
  */
 #if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
-#define UART_USE_WAIT                       TRUE
+#define UART_USE_WAIT                       FALSE
 #endif
 
 /**
@@ -64,7 +64,7 @@
  * @note    Disabling this option saves both code and data space.
  */
 #if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define UART_USE_MUTUAL_EXCLUSION           TRUE
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
 #endif
 /** @} */
 
diff --git a/os/hal/templates/halconf.h b/os/hal/templates/halconf.h
index 568ae7db0..843f0cc34 100644
--- a/os/hal/templates/halconf.h
+++ b/os/hal/templates/halconf.h
@@ -369,6 +369,26 @@
 #endif
 /** @} */
 
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
 #endif /* _HALCONF_H_ */
 
 /** @} */
-- 
cgit v1.2.3