diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-10-01 12:30:57 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-10-01 12:30:57 +0000 |
commit | e23cb1d41f87d6f5eba8e76e3dbfedceb9a6fc2b (patch) | |
tree | 50aa19c5107ccddee957b4bbe9bb8c058ceb26a5 /os/hal | |
parent | 2acabf55f6ca9d992803b629157b971358fb76f6 (diff) | |
download | ChibiOS-e23cb1d41f87d6f5eba8e76e3dbfedceb9a6fc2b.tar.gz ChibiOS-e23cb1d41f87d6f5eba8e76e3dbfedceb9a6fc2b.tar.bz2 ChibiOS-e23cb1d41f87d6f5eba8e76e3dbfedceb9a6fc2b.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6341 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
-rw-r--r-- | os/hal/ports/STM32/GPIOv2/pal_lld.h | 14 | ||||
-rw-r--r-- | os/hal/ports/STM32/stm32.h | 120 | ||||
-rw-r--r-- | os/hal/ports/STM32F0xx/hal_lld.h | 1 | ||||
-rw-r--r-- | os/hal/ports/STM32F30x/hal_lld.h | 1 | ||||
-rw-r--r-- | os/hal/ports/STM32F37x/hal_lld.h | 1 | ||||
-rw-r--r-- | os/hal/ports/STM32F4xx/hal_lld.h | 1 | ||||
-rw-r--r-- | os/hal/ports/STM32L1xx/hal_lld.h | 1 |
7 files changed, 14 insertions, 125 deletions
diff --git a/os/hal/ports/STM32/GPIOv2/pal_lld.h b/os/hal/ports/STM32/GPIOv2/pal_lld.h index 5349507df..ae20a4a70 100644 --- a/os/hal/ports/STM32/GPIOv2/pal_lld.h +++ b/os/hal/ports/STM32/GPIOv2/pal_lld.h @@ -130,6 +130,20 @@ PAL_STM32_OTYPE_OPENDRAIN)
/** @} */
+/* Discarded definitions from the ST headers, the PAL driver uses its own
+ definitions in order to have an unified handling for all devices.
+ Unfortunately the ST headers have no uniform definitions for the same
+ objects across the various sub-families.*/
+#undef GPIOA
+#undef GPIOB
+#undef GPIOC
+#undef GPIOD
+#undef GPIOE
+#undef GPIOF
+#undef GPIOG
+#undef GPIOH
+#undef GPIOI
+
/**
* @name GPIO ports definitions
* @{
diff --git a/os/hal/ports/STM32/stm32.h b/os/hal/ports/STM32/stm32.h deleted file mode 100644 index 1b8b8392a..000000000 --- a/os/hal/ports/STM32/stm32.h +++ /dev/null @@ -1,120 +0,0 @@ -/*
- ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file STM32/stm32.h
- * @brief STM32 common header.
- * @pre One of the following macros must be defined before including
- * this header, the macro selects the inclusion of the appropriate
- * vendor header:
- * - STM32F0XX for Entry Level devices.
- * - STM32F10X_LD_VL for Value Line Low Density devices.
- * - STM32F10X_MD_VL for Value Line Medium Density devices.
- * - STM32F10X_LD for Performance Low Density devices.
- * - STM32F10X_MD for Performance Medium Density devices.
- * - STM32F10X_HD for Performance High Density devices.
- * - STM32F10X_XL for Performance eXtra Density devices.
- * - STM32F10X_CL for Connectivity Line devices.
- * - STM32F2XX for High-performance STM32 F-2 devices.
- * - STM32F30X for Analog & DSP devices.
- * - STM32F37X for Analog & DSP devices.
- * - STM32F4XX for High-performance STM32 F-4 devices.
- * - STM32L1XX_MD for Ultra Low Power Medium-density devices.
- * .
- *
- * @addtogroup HAL
- * @{
- */
-
-#ifndef _STM32_H_
-#define _STM32_H_
-
-
-#if defined(STM32F10X_LD_VL) || defined(STM32F10X_MD_VL) || \
- defined(STM32F10X_HD_VL) || defined(STM32F10X_LD) || \
- defined(STM32F10X_MD) || defined(STM32F10X_HD) || \
- defined(STM32F10X_XL) || defined(STM32F10X_CL) || \
- defined(__DOXYGEN__)
-#include "stm32f10x.h"
-
-#else /* !STM32F1XX_XX */
-
-#if defined(STM32F0XX_LD) || defined(STM32F0XX_MD)
-#include "stm32f0xx.h"
-
-#elif defined(STM32F2XX)
-#include "stm32f2xx.h"
-
-#elif defined(STM32F30X)
-#include "stm32f30x.h"
-
-#elif defined(STM32F37X)
-#include "stm32f37x.h"
-
-#elif defined(STM32F40XX) || defined(STM32F42XX)
-#include "stm32f4xx.h"
-
-#elif defined(STM32L1XX_MD)
-#include "stm32l1xx.h"
-
-#else
-#error "STM32 device not specified"
-#endif
-
-/* Discarded definitions from the ST headers, the PAL driver uses its own
- definitions in order to have an unified handling for all devices.
- Unfortunately the ST headers have no uniform definitions for the same
- objects across the various sub-families.*/
-#undef GPIOA
-#undef GPIOB
-#undef GPIOC
-#undef GPIOD
-#undef GPIOE
-#undef GPIOF
-#undef GPIOG
-#undef GPIOH
-#undef GPIOI
-
-#endif /* !STM32F1XX_XX */
-
-
-/*===========================================================================*/
-/* Driver constants. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver pre-compile time settings. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Derived constants and error checks. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver data structures and types. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver macros. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* External declarations. */
-/*===========================================================================*/
-
-#endif /* _STM32_H_ */
-
-/** @} */
diff --git a/os/hal/ports/STM32F0xx/hal_lld.h b/os/hal/ports/STM32F0xx/hal_lld.h index c7238de56..0a47e1f38 100644 --- a/os/hal/ports/STM32F0xx/hal_lld.h +++ b/os/hal/ports/STM32F0xx/hal_lld.h @@ -36,7 +36,6 @@ #ifndef _HAL_LLD_H_
#define _HAL_LLD_H_
-#include "stm32.h"
#include "stm32_registry.h"
/*===========================================================================*/
diff --git a/os/hal/ports/STM32F30x/hal_lld.h b/os/hal/ports/STM32F30x/hal_lld.h index 83174e930..f291e8f8a 100644 --- a/os/hal/ports/STM32F30x/hal_lld.h +++ b/os/hal/ports/STM32F30x/hal_lld.h @@ -36,7 +36,6 @@ #ifndef _HAL_LLD_H_
#define _HAL_LLD_H_
-#include "stm32.h"
#include "stm32_registry.h"
/*===========================================================================*/
diff --git a/os/hal/ports/STM32F37x/hal_lld.h b/os/hal/ports/STM32F37x/hal_lld.h index 763e70da0..efd22043f 100644 --- a/os/hal/ports/STM32F37x/hal_lld.h +++ b/os/hal/ports/STM32F37x/hal_lld.h @@ -36,7 +36,6 @@ #ifndef _HAL_LLD_H_
#define _HAL_LLD_H_
-#include "stm32.h"
#include "stm32_registry.h"
/*===========================================================================*/
diff --git a/os/hal/ports/STM32F4xx/hal_lld.h b/os/hal/ports/STM32F4xx/hal_lld.h index ae5378c23..246ee2237 100644 --- a/os/hal/ports/STM32F4xx/hal_lld.h +++ b/os/hal/ports/STM32F4xx/hal_lld.h @@ -36,7 +36,6 @@ #ifndef _HAL_LLD_H_
#define _HAL_LLD_H_
-#include "stm32.h"
#include "stm32_registry.h"
/*===========================================================================*/
diff --git a/os/hal/ports/STM32L1xx/hal_lld.h b/os/hal/ports/STM32L1xx/hal_lld.h index dca4b5966..3abc9a730 100644 --- a/os/hal/ports/STM32L1xx/hal_lld.h +++ b/os/hal/ports/STM32L1xx/hal_lld.h @@ -34,7 +34,6 @@ #ifndef _HAL_LLD_H_
#define _HAL_LLD_H_
-#include "stm32.h"
#include "stm32_registry.h"
/*===========================================================================*/
|