From 9bbc74119ea1b3226666b770658ce510ac3b8e96 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Wed, 14 Mar 2018 12:29:24 +0000
Subject: Configuration files realignment.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11741 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 demos/STM32/RT-STM32F303-DISCOVERY/chconf.h  | 51 ----------------------------
 demos/STM32/RT-STM32F469I-DISCOVERY/chconf.h | 21 ++++--------
 2 files changed, 6 insertions(+), 66 deletions(-)

(limited to 'demos/STM32')

diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/chconf.h
index 2289663f5..899a292ef 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/chconf.h
@@ -30,8 +30,6 @@
 
 #define _CHIBIOS_RT_CONF_
 #define _CHIBIOS_RT_CONF_VER_5_0_
-#define _CHIBIOS_RT_CONF_
-#define _CHIBIOS_RT_CONF_VER_5_0_VER_5_0_
 
 /*===========================================================================*/
 /**
@@ -328,55 +326,6 @@
  * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
  */
 #define CH_CFG_USE_DYNAMIC                  TRUE
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Objects factory options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Objects Factory APIs.
- * @details If enabled then the objects factory APIs are included in the
- *          kernel.
- *
- * @note    The default is @p FALSE.
- */
-#define CH_CFG_USE_FACTORY                  TRUE
-
-/**
- * @brief   Maximum length for object names.
- * @details If the specified length is zero then the name is stored by
- *          pointer but this could have unintended side effects.
- */
-#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
-
-/**
- * @brief   Enables the registry of generic objects.
- */
-#define CH_CFG_FACTORY_OBJECTS_REGISTRY     TRUE
-
-/**
- * @brief   Enables factory for generic buffers.
- */
-#define CH_CFG_FACTORY_GENERIC_BUFFERS      TRUE
-
-/**
- * @brief   Enables factory for semaphores.
- */
-#define CH_CFG_FACTORY_SEMAPHORES           TRUE
-
-/**
- * @brief   Enables factory for mailboxes.
- */
-#define CH_CFG_FACTORY_MAILBOXES            TRUE
-
-/**
- * @brief   Enables factory for objects FIFOs.
- */
-#define CH_CFG_FACTORY_OBJ_FIFOS            TRUE
 
 /** @} */
 
diff --git a/demos/STM32/RT-STM32F469I-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F469I-DISCOVERY/chconf.h
index 702ccab37..665a147d4 100644
--- a/demos/STM32/RT-STM32F469I-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F469I-DISCOVERY/chconf.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
+#ifndef CHCONF_H
+#define CHCONF_H
 
 #define _CHIBIOS_RT_CONF_
 #define _CHIBIOS_RT_CONF_VER_5_0_
@@ -277,14 +277,6 @@
  */
 #define CH_CFG_USE_MAILBOXES                TRUE
 
-/**
- * @brief   I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES                   TRUE
-
 /**
  * @brief   Core Memory Manager APIs.
  * @details If enabled then the core memory manager APIs are included
@@ -431,17 +423,16 @@
 
 /**
  * @brief   Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- *          activated.
+ * @details If enabled then the trace buffer is activated.
  *
- * @note    The default is @p CH_DBG_TRACE_MASK_NONE.
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
  */
 #define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_NONE
 
 /**
  * @brief   Trace buffer entries.
  * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
- *          different from @p CH_DBG_TRACE_MASK_NONE.
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
  */
 #define CH_DBG_TRACE_BUFFER_SIZE            128
 
@@ -612,6 +603,6 @@
 /* Port-specific settings (override port settings defaulted in chcore.h).    */
 /*===========================================================================*/
 
-#endif  /* _CHCONF_H_ */
+#endif  /* CHCONF_H */
 
 /** @} */
-- 
cgit v1.2.3