Serial support for STM32F3xx.

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

4 files changed, 127 insertions, 3 deletions

diff --git a/os/hal/platforms/STM32F3xx/hal_lld.c b/os/hal/platforms/STM32F3xx/hal_lld.c
index 0753257b8..8f7fe9102 100644
--- a/os/hal/platforms/STM32F3xx/hal_lld.c
+++ b/os/hal/platforms/STM32F3xx/hal_lld.c
@@ -196,6 +196,10 @@ void stm32_clock_init(void) {
   /* SYSCFG clock enabled here because it is a multi-functional unit shared

      among multiple drivers.*/

   rccEnableAPB2(RCC_APB2ENR_SYSCFGEN, TRUE);

+

+  /* USB IRQ relocated to not conflict with CAN.*/

+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_USB_IT_RMP;

+

 #endif /* !STM32_NO_INIT */

 }

 

diff --git a/os/hal/platforms/STM32F3xx/hal_lld.h b/os/hal/platforms/STM32F3xx/hal_lld.h
index 79e971743..826376fc4 100644
--- a/os/hal/platforms/STM32F3xx/hal_lld.h
+++ b/os/hal/platforms/STM32F3xx/hal_lld.h
@@ -1287,8 +1287,8 @@ typedef uint32_t halrtcnt_t;
 /*===========================================================================*/

 

 /* STM32 ISR, DMA and RCC helpers.*/

-/*#include "stm32_isr.h"

-#include "stm32_dma.h"*/

+#include "stm32_isr.h"

+/*#include "stm32_dma.h"*/

 #include "stm32_rcc.h"

 

 #ifdef __cplusplus

diff --git a/os/hal/platforms/STM32F3xx/platform.mk b/os/hal/platforms/STM32F3xx/platform.mk
index 0dc6f1892..8aaa856ae 100644
--- a/os/hal/platforms/STM32F3xx/platform.mk
+++ b/os/hal/platforms/STM32F3xx/platform.mk
@@ -6,4 +6,5 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F3xx/hal_lld.c \
 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F3xx \

               ${CHIBIOS}/os/hal/platforms/STM32 \

-              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2

+              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv2 \

+              ${CHIBIOS}/os/hal/platforms/STM32/USARTv2

diff --git a/os/hal/platforms/STM32F3xx/stm32_isr.h b/os/hal/platforms/STM32F3xx/stm32_isr.h
new file mode 100644
index 000000000..8b2973701
--- /dev/null
+++ b/os/hal/platforms/STM32F3xx/stm32_isr.h
@@ -0,0 +1,119 @@
+/*

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

+                 2011,2012 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+ * @file    STM32F3xx/stm32_isr.h

+ * @brief   ISR remapper driver header.

+ *

+ * @addtogroup STM32F3xx_ISR

+ * @{

+ */

+

+#ifndef _STM32_ISR_H_

+#define _STM32_ISR_H_

+

+/*===========================================================================*/

+/* Driver constants.                                                         */

+/*===========================================================================*/

+

+/**

+ * @name    ISR names and numbers remapping

+ * @{

+ */

+/*

+ * CAN units.

+ */

+#define STM32_CAN1_TX_HANDLER       Vector8C

+#define STM32_CAN1_RX0_HANDLER      Vector90

+#define STM32_CAN1_RX1_HANDLER      Vector94

+#define STM32_CAN1_SCE_HANDLER      Vector98

+

+#define STM32_CAN1_TX_NUMBER        19

+#define STM32_CAN1_RX0_NUMBER       20

+#define STM32_CAN1_RX1_NUMBER       21

+#define STM32_CAN1_SCE_NUMBER       22

+

+/*

+ * TIM units.

+ */

+#define STM32_TIM1_UP_HANDLER       VectorA4

+#define STM32_TIM1_CC_HANDLER       VectorAC

+#define STM32_TIM2_HANDLER          VectorB0

+#define STM32_TIM3_HANDLER          VectorB4

+#define STM32_TIM4_HANDLER          VectorB8

+#define STM32_TIM8_UP_HANDLER       VectorF0

+#define STM32_TIM8_CC_HANDLER       VectorF8

+

+#define STM32_TIM1_UP_NUMBER        25

+#define STM32_TIM1_CC_NUMBER        27

+#define STM32_TIM2_NUMBER           28

+#define STM32_TIM3_NUMBER           29

+#define STM32_TIM4_NUMBER           30

+#define STM32_TIM8_UP_NUMBER        44

+#define STM32_TIM8_CC_NUMBER        46

+

+/*

+ * USART units.

+ */

+#define STM32_USART1_HANDLER        VectorD4

+#define STM32_USART2_HANDLER        VectorD8

+#define STM32_USART3_HANDLER        VectorDC

+#define STM32_UART4_HANDLER         Vector110

+#define STM32_UART5_HANDLER         Vector114

+

+#define STM32_USART1_NUMBER         37

+#define STM32_USART2_NUMBER         38

+#define STM32_USART3_NUMBER         39

+#define STM32_UART4_NUMBER          52

+#define STM32_UART5_NUMBER          53

+

+/*

+ * USB units.

+ */

+#define STM32_USB1_HP_HANDLER       Vector168

+#define STM32_USB1_LP_HANDLER       Vector16C

+

+#define STM32_USB1_HP_NUMBER        74

+#define STM32_USB1_LP_NUMBER        75

+/** @} */

+

+/*===========================================================================*/

+/* Driver pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver data structures and types.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver macros.                                                            */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#endif /* _STM32_ISR_H_ */

+

+/** @} */