Removed obsolete halconf.h files.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3754 35acf78f-673a-0410-8e92-d51de3d6d3f4

5 files changed, 53 insertions, 106 deletions

diff --git a/testhal/STM32F1xx/I2C/halconf.h b/testhal/STM32F1xx/I2C/halconf.h
index 54a69c2f7..3f73e9cd9 100644
--- a/testhal/STM32F1xx/I2C/halconf.h
+++ b/testhal/STM32F1xx/I2C/halconf.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -188,14 +189,6 @@
 /*===========================================================================*/

 

 /**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(I2C_USE_WAIT) || defined(__DOXYGEN__)

-#define I2C_USE_WAIT                TRUE

-#endif

-

-/**

  * @brief   Enables the mutual exclusion APIs on the I2C bus.

  */

 #if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

@@ -303,7 +296,7 @@
  *          default configuration.

  */

 #if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      57600

+#define SERIAL_DEFAULT_BITRATE      38400

 #endif

 

 /**

@@ -314,7 +307,7 @@
  *          buffers.

  */

 #if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE         256

+#define SERIAL_BUFFERS_SIZE         16

 #endif

 

 /*===========================================================================*/

diff --git a/testhal/STM32F1xx/RTC/halconf.h b/testhal/STM32F1xx/RTC/halconf.h
index 12944d159..b15abca14 100644
--- a/testhal/STM32F1xx/RTC/halconf.h
+++ b/testhal/STM32F1xx/RTC/halconf.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -169,7 +170,7 @@
  * @note    Disabling this option saves both code and data space.

  */

 #if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

+#define ADC_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

 /*===========================================================================*/

@@ -188,31 +189,12 @@
 /*===========================================================================*/

 

 /**

- * @brief   Enables synchronous APIs.

- * @note    Disabling this option saves both code and data space.

- */

-#if !defined(I2C_USE_WAIT) || defined(__DOXYGEN__)

-#define I2C_USE_WAIT                TRUE

-#endif

-

-/**

  * @brief   Enables the mutual exclusion APIs on the I2C bus.

  */

 #if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

 #define I2C_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

-/**

- * @brief   Switch to asynchronouse driver with callbacks.

- */

-#if !defined(I2C_SUPPORTS_CALLBACKS) || defined(__DOXYGEN__)

-#define I2C_SUPPORTS_CALLBACKS      TRUE

-#endif

-

-/*===========================================================================*/

-/* RTC driver related settings.                                              */

-/*===========================================================================*/

-

 /*===========================================================================*/

 /* MAC driver related settings.                                              */

 /*===========================================================================*/

@@ -314,7 +296,7 @@
  *          default configuration.

  */

 #if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      9600

+#define SERIAL_DEFAULT_BITRATE      38400

 #endif

 

 /**

@@ -345,7 +327,7 @@
  * @note    Disabling this option saves both code and data space.

  */

 #if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

+#define SPI_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

 #endif /* _HALCONF_H_ */

diff --git a/testhal/STM32F4xx/I2C/halconf.h b/testhal/STM32F4xx/I2C/halconf.h
index 5e8e3fc98..71bb07687 100644
--- a/testhal/STM32F4xx/I2C/halconf.h
+++ b/testhal/STM32F4xx/I2C/halconf.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -44,7 +45,7 @@
  * @brief   Enables the ADC subsystem.

  */

 #if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)

-#define HAL_USE_ADC                 TRUE

+#define HAL_USE_ADC                 FALSE

 #endif

 

 /**

@@ -72,7 +73,7 @@
  * @brief   Enables the I2C subsystem.

  */

 #if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)

-#define HAL_USE_I2C                 TRUE

+#define HAL_USE_I2C                 FALSE

 #endif

 

 /**

@@ -100,7 +101,14 @@
  * @brief   Enables the PWM subsystem.

  */

 #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

+#define HAL_USE_PWM                 FALSE

+#endif

+

+/**

+ * @brief   Enables the RTC subsystem.

+ */

+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

+#define HAL_USE_RTC                 FALSE

 #endif

 

 /**

@@ -145,20 +153,6 @@
 #define HAL_USE_USB                 FALSE

 #endif

 

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(RTC_SUPPORTS_CALLBACKS) || defined(__DOXYGEN__)

-#define RTC_SUPPORTS_CALLBACKS      FLASE

-#endif

-

 /*===========================================================================*/

 /* ADC driver related settings.                                              */

 /*===========================================================================*/

@@ -176,7 +170,7 @@
  * @note    Disabling this option saves both code and data space.

  */

 #if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

+#define ADC_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

 /*===========================================================================*/

@@ -202,13 +196,16 @@
 #endif

 

 /*===========================================================================*/

-/* RTC driver related settings.                                              */

-/*===========================================================================*/

-

-/*===========================================================================*/

 /* MAC driver related settings.                                              */

 /*===========================================================================*/

 

+/**

+ * @brief   Enables an event sources for incoming packets.

+ */

+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

+#define MAC_USE_EVENTS              TRUE

+#endif

+

 /*===========================================================================*/

 /* MMC_SPI driver related settings.                                          */

 /*===========================================================================*/

@@ -259,16 +256,9 @@
 #endif

 

 /*===========================================================================*/

-/* PAL driver related settings.                                              */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* PWM driver related settings.                                              */

-/*===========================================================================*/

-

-/*===========================================================================*/

 /* SDC driver related settings.                                              */

 /*===========================================================================*/

+

 /**

  * @brief   Number of initialization attempts before rejecting the card.

  * @note    Attempts are performed at 10mS intevals.

@@ -306,7 +296,7 @@
  *          default configuration.

  */

 #if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      115200

+#define SERIAL_DEFAULT_BITRATE      38400

 #endif

 

 /**

@@ -337,13 +327,9 @@
  * @note    Disabling this option saves both code and data space.

  */

 #if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

+#define SPI_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

-/*===========================================================================*/

-/* UART driver related settings.                                             */

-/*===========================================================================*/

-

 #endif /* _HALCONF_H_ */

 

 /** @} */

diff --git a/testhal/STM32F4xx/RTC/Makefile b/testhal/STM32F4xx/RTC/Makefile
index b41ba0124..02f7a7f98 100644
--- a/testhal/STM32F4xx/RTC/Makefile
+++ b/testhal/STM32F4xx/RTC/Makefile
@@ -30,7 +30,7 @@ endif
 

 # Enable this if you want to see the full log while compiling.

 ifeq ($(USE_VERBOSE_COMPILE),)

-  USE_VERBOSE_COMPILE = yes

+  USE_VERBOSE_COMPILE = no

 endif

 

 #

diff --git a/testhal/STM32F4xx/RTC/halconf.h b/testhal/STM32F4xx/RTC/halconf.h
index 9e64ec3c0..775428e22 100644
--- a/testhal/STM32F4xx/RTC/halconf.h
+++ b/testhal/STM32F4xx/RTC/halconf.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -104,6 +105,13 @@
 #endif

 

 /**

+ * @brief   Enables the RTC subsystem.

+ */

+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

+#define HAL_USE_RTC                 FALSE

+#endif

+

+/**

  * @brief   Enables the SDC subsystem.

  */

 #if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)

@@ -145,20 +153,6 @@
 #define HAL_USE_USB                 FALSE

 #endif

 

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)

-#define HAL_USE_RTC                 TRUE

-#endif

-

-/**

- * @brief   Enables the RTC subsystem.

- */

-#if !defined(RTC_SUPPORTS_CALLBACKS) || defined(__DOXYGEN__)

-#define RTC_SUPPORTS_CALLBACKS      TRUE

-#endif

-

 /*===========================================================================*/

 /* ADC driver related settings.                                              */

 /*===========================================================================*/

@@ -176,7 +170,7 @@
  * @note    Disabling this option saves both code and data space.

  */

 #if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define ADC_USE_MUTUAL_EXCLUSION    FALSE

+#define ADC_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

 /*===========================================================================*/

@@ -202,13 +196,16 @@
 #endif

 

 /*===========================================================================*/

-/* RTC driver related settings.                                              */

-/*===========================================================================*/

-

-/*===========================================================================*/

 /* MAC driver related settings.                                              */

 /*===========================================================================*/

 

+/**

+ * @brief   Enables an event sources for incoming packets.

+ */

+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)

+#define MAC_USE_EVENTS              TRUE

+#endif

+

 /*===========================================================================*/

 /* MMC_SPI driver related settings.                                          */

 /*===========================================================================*/

@@ -259,16 +256,9 @@
 #endif

 

 /*===========================================================================*/

-/* PAL driver related settings.                                              */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* PWM driver related settings.                                              */

-/*===========================================================================*/

-

-/*===========================================================================*/

 /* SDC driver related settings.                                              */

 /*===========================================================================*/

+

 /**

  * @brief   Number of initialization attempts before rejecting the card.

  * @note    Attempts are performed at 10mS intevals.

@@ -306,7 +296,7 @@
  *          default configuration.

  */

 #if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)

-#define SERIAL_DEFAULT_BITRATE      9600

+#define SERIAL_DEFAULT_BITRATE      38400

 #endif

 

 /**

@@ -337,13 +327,9 @@
  * @note    Disabling this option saves both code and data space.

  */

 #if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

-#define SPI_USE_MUTUAL_EXCLUSION    FALSE

+#define SPI_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

-/*===========================================================================*/

-/* UART driver related settings.                                             */

-/*===========================================================================*/

-

 #endif /* _HALCONF_H_ */

 

 /** @} */