RTC for F4x branch.

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

4 files changed, 49 insertions, 18 deletions

diff --git a/testhal/STM32F1xx/CAN/Makefile b/testhal/STM32F1xx/CAN/Makefile
index f93aeb073..0f7e20317 100644
--- a/testhal/STM32F1xx/CAN/Makefile
+++ b/testhal/STM32F1xx/CAN/Makefile
@@ -8,6 +8,11 @@ ifeq ($(USE_OPT),)
   USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

 endif

 

+# C specific options here (added to USE_OPT).

+ifeq ($(USE_COPT),)

+  USE_COPT = 

+endif

+

 # C++ specific options here (added to USE_OPT).

 ifeq ($(USE_CPPOPT),)

   USE_CPPOPT = -fno-rtti

@@ -23,9 +28,9 @@ ifeq ($(USE_THUMB),)
   USE_THUMB = yes

 endif

 

-# Enable register caching optimization (read documentation).

-ifeq ($(USE_CURRP_CACHING),)

-  USE_CURRP_CACHING = no

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

+ifeq ($(USE_VERBOSE_COMPILE),)

+  USE_VERBOSE_COMPILE = no

 endif

 

 #

@@ -201,4 +206,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk

+include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

diff --git a/testhal/STM32F1xx/CAN/halconf.h b/testhal/STM32F1xx/CAN/halconf.h
index a7ae76b45..03b395896 100644
--- a/testhal/STM32F1xx/CAN/halconf.h
+++ b/testhal/STM32F1xx/CAN/halconf.h
@@ -56,6 +56,13 @@
 #endif

 

 /**

+ * @brief   Enables the EXT subsystem.

+ */

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

+#define HAL_USE_EXT                 FALSE

+#endif

+

+/**

  * @brief   Enables the GPT subsystem.

  */

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

@@ -98,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__)

@@ -185,6 +199,13 @@
 /* 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.                                          */

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

@@ -235,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.

@@ -316,10 +330,6 @@
 #define SPI_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

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

-/* UART driver related settings.                                             */

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

-

 #endif /* _HALCONF_H_ */

 

 /** @} */

diff --git a/testhal/STM32F1xx/CAN/mcuconf.h b/testhal/STM32F1xx/CAN/mcuconf.h
index 558c0773d..bce5518d6 100644
--- a/testhal/STM32F1xx/CAN/mcuconf.h
+++ b/testhal/STM32F1xx/CAN/mcuconf.h
@@ -52,7 +52,6 @@
 #define STM32_ADC_USE_ADC1                  TRUE

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_ADC1_IRQ_PRIORITY         5

-#define STM32_ADC_DMA_ERROR_HOOK(adcp)      chSysHalt()

 

 /*

  * CAN driver system settings.

@@ -61,6 +60,21 @@
 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

+ * EXT driver system settings.

+ */

+#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

+#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

+#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

+#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

+#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

+#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

+#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI17_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

+

+/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -117,11 +131,13 @@
 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

+#define STM32_SERIAL_USE_USART6             FALSE

 #define STM32_SERIAL_USART1_PRIORITY        12

 #define STM32_SERIAL_USART2_PRIORITY        12

 #define STM32_SERIAL_USART3_PRIORITY        12

 #define STM32_SERIAL_UART4_PRIORITY         12

 #define STM32_SERIAL_UART5_PRIORITY         12

+#define STM32_SERIAL_USART6_PRIORITY        12

 

 /*

  * SPI driver system settings.

diff --git a/testhal/STM32F1xx/CAN/readme.txt b/testhal/STM32F1xx/CAN/readme.txt
index 3b92f4fa3..81ef4c60a 100644
--- a/testhal/STM32F1xx/CAN/readme.txt
+++ b/testhal/STM32F1xx/CAN/readme.txt
@@ -4,7 +4,7 @@
 

 ** TARGET **

 

-The demo will on an Olimex STM32-P103 board.

+The demo runs on an Olimex STM32-P103 board.

 

 ** The Demo **