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

7 files changed, 193 insertions, 14 deletions

diff --git a/os/hal/platforms/STM32/adc_lld.c b/os/hal/platforms/STM32/adc_lld.c
index b31579b90..c2f2e91f9 100644
--- a/os/hal/platforms/STM32/adc_lld.c
+++ b/os/hal/platforms/STM32/adc_lld.c
@@ -26,8 +26,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "stm32_dma.h"

-#include "nvic.h"

 

 #if CH_HAL_USE_ADC

 

diff --git a/os/hal/platforms/STM32/hal_lld.c b/os/hal/platforms/STM32/hal_lld.c
new file mode 100644
index 000000000..1fa5a2aca
--- /dev/null
+++ b/os/hal/platforms/STM32/hal_lld.c
@@ -0,0 +1,128 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 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 templates/hal_lld.c

+ * @brief HAL Driver subsystem low level driver source template

+ * @addtogroup HAL_LLD

+ * @{

+ */

+

+#include <ch.h>

+#include <hal.h>

+

+#define AIRCR_VECTKEY           0x05FA0000

+

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

+/* Low Level Driver exported variables.                                      */

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

+

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

+/* Low Level Driver local variables.                                         */

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

+

+/*

+ * Digital I/O ports static configuration as defined in @p board.h.

+ */

+const STM32GPIOConfig pal_default_config =

+{

+  {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},

+  {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},

+  {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},

+  {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},

+#if !defined(STM32F10X_LD)

+  {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},

+#endif

+#if defined(STM32F10X_HD)

+  {VAL_GPIOFODR, VAL_GPIOFCRL, VAL_GPIOFCRH},

+  {VAL_GPIOGODR, VAL_GPIOGCRL, VAL_GPIOGCRH},

+#endif

+};

+

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

+/* Low Level Driver local functions.                                         */

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

+

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

+/* Low Level Driver interrupt handlers.                                      */

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

+

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

+/* Low Level Driver exported functions.                                      */

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

+

+/**

+ * @brief Low level HAL driver initialization.

+ */

+void hal_lld_init(void) {

+

+#if CH_HAL_USE_ADC || CH_HAL_USE_SPI

+  dmaInit();

+#endif

+}

+

+/**

+ * @brief STM32 clocks and PLL initialization.

+ * @note All the involved constants come from the file @p board.h.

+ */

+void stm32_clock_init(void) {

+

+  /* HSI setup.*/

+  RCC->CR = RCC_CR_HSITRIM_RESET_BITS | RCC_CR_HSION;

+  while (!(RCC->CR & RCC_CR_HSIRDY))

+    ;                           /* Waits until HSI stable.                  */

+  /* HSE setup.*/

+  RCC->CR |= RCC_CR_HSEON;

+  while (!(RCC->CR & RCC_CR_HSERDY))

+    ;                           /* Waits until HSE stable.                  */

+  /* PLL setup.*/

+  RCC->CFGR = RCC_CFGR_PLLSRC_HSE_BITS | PLLPREBITS | PLLMULBITS;

+  RCC->CR |= RCC_CR_PLLON;

+  while (!(RCC->CR & RCC_CR_PLLRDY))

+    ;                           /* Waits until PLL stable.                  */

+  /* Clock sources.*/

+  RCC->CFGR |= RCC_CFGR_HPRE_DIV1   | RCC_CFGR_PPRE1_DIV2  |

+               RCC_CFGR_PPRE2_DIV2  | RCC_CFGR_ADCPRE_DIV8 |

+               RCC_CFGR_MCO_NOCLOCK | USBPREBITS;

+

+  /* Flash setup and final clock selection.   */

+  FLASH->ACR = FLASHBITS;       /* Flash wait states depending on clock.    */

+  RCC->CFGR |= RCC_CFGR_SW_PLL; /* Switches the PLL clock ON.               */

+  while ((RCC->CFGR & RCC_CFGR_SW) != RCC_CFGR_SW_PLL)

+    ;

+}

+

+/**

+ * @brief STM32 NVIC/SCB/SYSTICK initialization.

+ * @note All the involved constants come from the file @p board.h.

+ */

+void stm32_nvic_init(void) {

+

+  /* Note: PRIGROUP 4:0 (4:4).*/

+  SCB->AIRCR = AIRCR_VECTKEY | SCB_AIRCR_PRIGROUP_0 | SCB_AIRCR_PRIGROUP_1;

+  NVICSetSystemHandlerPriority(HANDLER_SVCALL, PRIORITY_SVCALL);

+  NVICSetSystemHandlerPriority(HANDLER_SYSTICK, PRIORITY_SYSTICK);

+  NVICSetSystemHandlerPriority(HANDLER_PENDSV, PRIORITY_PENDSV);

+

+  SysTick->LOAD = SYSCLK / (8000000 / CH_FREQUENCY) - 1;

+  SysTick->VAL = 0;

+  SysTick->CTRL = SysTick_CTRL_ENABLE | SysTick_CTRL_TICKINT;

+}

+

+/** @} */

diff --git a/os/hal/platforms/STM32/hal_lld.h b/os/hal/platforms/STM32/hal_lld.h
new file mode 100644
index 000000000..7be941ca2
--- /dev/null
+++ b/os/hal/platforms/STM32/hal_lld.h
@@ -0,0 +1,61 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 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 templates/hal_lld.h

+ * @brief HAL subsystem low level driver header template

+ * @addtogroup HAL_LLD

+ * @{

+ */

+

+#ifndef _HAL_LLD_H_

+#define _HAL_LLD_H_

+

+#include "nvic.h"

+#include "stm32_dma.h"

+

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

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

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

+

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

+/* Driver constants.                                                         */

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

+

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

+/* Driver data structures and types.                                         */

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

+

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

+/* External declarations.                                                    */

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

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void hal_lld_init(void);

+  void stm32_clock_init(void);

+  void stm32_nvic_init(void);

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* _HAL_LLD_H_ */

+

+/** @} */

diff --git a/os/hal/platforms/STM32/platform.mk b/os/hal/platforms/STM32/platform.mk
index 6e78d5dd6..e31325ccc 100644
--- a/os/hal/platforms/STM32/platform.mk
+++ b/os/hal/platforms/STM32/platform.mk
@@ -1,10 +1,11 @@
 # List of all the STM32 platform files.

-PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32/stm32_dma.c \

+PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32/hal_lld.c \

               ${CHIBIOS}/os/hal/platforms/STM32/adc_lld.c \

               ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \

               ${CHIBIOS}/os/hal/platforms/STM32/pal_lld.c \

               ${CHIBIOS}/os/hal/platforms/STM32/serial_lld.c \

-              ${CHIBIOS}/os/hal/platforms/STM32/spi_lld.c

+              ${CHIBIOS}/os/hal/platforms/STM32/spi_lld.c \

+              ${CHIBIOS}/os/hal/platforms/STM32/stm32_dma.c

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32

diff --git a/os/hal/platforms/STM32/serial_lld.c b/os/hal/platforms/STM32/serial_lld.c
index 2d9407f90..5337c4dfa 100644
--- a/os/hal/platforms/STM32/serial_lld.c
+++ b/os/hal/platforms/STM32/serial_lld.c
@@ -26,7 +26,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "nvic.h"

 

 #if CH_HAL_USE_SERIAL

 

diff --git a/os/hal/platforms/STM32/spi_lld.c b/os/hal/platforms/STM32/spi_lld.c
index 1d73646a0..0adbe4d8a 100644
--- a/os/hal/platforms/STM32/spi_lld.c
+++ b/os/hal/platforms/STM32/spi_lld.c
@@ -26,8 +26,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "nvic.h"

-#include "stm32_dma.h"

 

 #if CH_HAL_USE_SPI

 

diff --git a/os/hal/platforms/STM32/stm32_dma.c b/os/hal/platforms/STM32/stm32_dma.c
index da036d159..e7574b75d 100644
--- a/os/hal/platforms/STM32/stm32_dma.c
+++ b/os/hal/platforms/STM32/stm32_dma.c
@@ -25,13 +25,7 @@
  */

 

 #include "ch.h"

-#include "stm32_dma.h"

-

-#undef FALSE

-#undef TRUE

-#include <stm32f10x.h>

-#define FALSE 0

-#define TRUE (!FALSE)

+#include "hal.h"

 

 static cnt_t dmacnt1;

 #if defined(STM32F10X_HD) || defined (STM32F10X_CL)