diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-11-15 19:44:09 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-11-15 19:44:09 +0000 |
| commit | 5962467685985de2d79a85a1fcf8b1961d3d72de (patch) | |
| tree | 5c788196a537443c252e27c06e07faf711d7e44a /os/hal/platforms/STM32 | |
| parent | b28de36fe95f0755d01a32c33e6f5faffb0af753 (diff) | |
| download | ChibiOS-5962467685985de2d79a85a1fcf8b1961d3d72de.tar.gz ChibiOS-5962467685985de2d79a85a1fcf8b1961d3d72de.tar.bz2 ChibiOS-5962467685985de2d79a85a1fcf8b1961d3d72de.zip | |
Added STM32VL-Discovery demo. Changes to all the board files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2370 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/STM32')
| -rw-r--r-- | os/hal/platforms/STM32/hal_lld.c | 27 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/hal_lld.h | 21 |
2 files changed, 11 insertions, 37 deletions
diff --git a/os/hal/platforms/STM32/hal_lld.c b/os/hal/platforms/STM32/hal_lld.c index 8cd9c289f..faa265f59 100644 --- a/os/hal/platforms/STM32/hal_lld.c +++ b/os/hal/platforms/STM32/hal_lld.c @@ -38,27 +38,6 @@ /* Driver local variables. */
/*===========================================================================*/
-/**
- * @brief PAL setup.
- * @details Digital I/O ports static configuration as defined in @p board.h.
- */
-const PALConfig 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 STM32_HAS_GPIOE || defined(__DOXYGEN__)
- {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},
-#if STM32_HAS_GPIOF || defined(__DOXYGEN__)
- {VAL_GPIOFODR, VAL_GPIOFCRL, VAL_GPIOFCRH},
-#if STM32_HAS_GPIOG || defined(__DOXYGEN__)
- {VAL_GPIOGODR, VAL_GPIOGCRL, VAL_GPIOGCRH},
-#endif
-#endif
-#endif
-};
-
/*===========================================================================*/
/* Driver local functions. */
/*===========================================================================*/
@@ -97,8 +76,9 @@ void hal_lld_init(void) { *
* @special
*/
-#if defined(STM32F10X_LD) || defined(STM32F10X_MD) || \
- defined(STM32F10X_HD) || defined(__DOXYGEN__)
+#if defined(STM32F10X_LD) || defined(STM32F10X_MD) || \
+ defined(STM32F10X_HD) || defined(STM32F10X_LD_VL) || \
+ defined(STM32F10X_MD_VL) || defined(__DOXYGEN__)
/*
* Clocks initialization for the LD, MD and HD sub-families.
*/
@@ -146,6 +126,7 @@ void stm32_clock_init(void) { ;
#endif
}
+
#elif defined(STM32F10X_CL)
/*
* Clocks initialization for the CL sub-family.
diff --git a/os/hal/platforms/STM32/hal_lld.h b/os/hal/platforms/STM32/hal_lld.h index 324e8a57c..e8f71a01f 100644 --- a/os/hal/platforms/STM32/hal_lld.h +++ b/os/hal/platforms/STM32/hal_lld.h @@ -78,8 +78,7 @@ #define STM32_HAS_CAN1 FALSE
#define STM32_HAS_CAN2 FALSE
-#define STM32_HAS_DAC1 TRUE
-#define STM32_HAS_DAC2 TRUE
+#define STM32_HAS_DAC TRUE
#define STM32_HAS_DMA1 TRUE
#define STM32_HAS_DMA2 FALSE
@@ -147,8 +146,7 @@ #define STM32_HAS_CAN1 FALSE
#define STM32_HAS_CAN2 FALSE
-#define STM32_HAS_DAC1 TRUE
-#define STM32_HAS_DAC2 TRUE
+#define STM32_HAS_DAC TRUE
#define STM32_HAS_DMA1 TRUE
#define STM32_HAS_DMA2 FALSE
@@ -216,8 +214,7 @@ #define STM32_HAS_CAN1 TRUE
#define STM32_HAS_CAN2 FALSE
-#define STM32_HAS_DAC1 FALSE
-#define STM32_HAS_DAC2 FALSE
+#define STM32_HAS_DAC FALSE
#define STM32_HAS_DMA1 TRUE
#define STM32_HAS_DMA2 FALSE
@@ -285,8 +282,7 @@ #define STM32_HAS_CAN1 TRUE
#define STM32_HAS_CAN2 FALSE
-#define STM32_HAS_DAC1 FALSE
-#define STM32_HAS_DAC2 FALSE
+#define STM32_HAS_DAC FALSE
#define STM32_HAS_DMA1 TRUE
#define STM32_HAS_DMA2 FALSE
@@ -355,8 +351,7 @@ #define STM32_HAS_CAN1 TRUE
#define STM32_HAS_CAN2 FALSE
-#define STM32_HAS_DAC1 TRUE
-#define STM32_HAS_DAC2 TRUE
+#define STM32_HAS_DAC TRUE
#define STM32_HAS_DMA1 TRUE
#define STM32_HAS_DMA2 TRUE
@@ -424,8 +419,7 @@ #define STM32_HAS_CAN1 TRUE
#define STM32_HAS_CAN2 TRUE
-#define STM32_HAS_DAC1 TRUE
-#define STM32_HAS_DAC2 TRUE
+#define STM32_HAS_DAC TRUE
#define STM32_HAS_DMA1 TRUE
#define STM32_HAS_DMA2 TRUE
@@ -493,8 +487,7 @@ #define STM32_HAS_CAN1 TRUE
#define STM32_HAS_CAN2 TRUE
-#define STM32_HAS_DAC1 TRUE
-#define STM32_HAS_DAC2 TRUE
+#define STM32_HAS_DAC TRUE
#define STM32_HAS_DMA1 TRUE
#define STM32_HAS_DMA2 TRUE
|