diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-11-26 10:30:56 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-11-26 10:30:56 +0000 |
| commit | c1a535d343d6ea6e84f99b9b0b760d9a582ad969 (patch) | |
| tree | ce3cb37141a76b01ca16fd4b413331b8ef9dcd6e /os/hal/platforms/STM32L1xx | |
| parent | f3bbf4800acff7c34a24306c534b7414fd481b6a (diff) | |
| download | ChibiOS-c1a535d343d6ea6e84f99b9b0b760d9a582ad969.tar.gz ChibiOS-c1a535d343d6ea6e84f99b9b0b760d9a582ad969.tar.bz2 ChibiOS-c1a535d343d6ea6e84f99b9b0b760d9a582ad969.zip | |
Unified STM32 registers header file stm32.h.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3526 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/STM32L1xx')
| -rw-r--r-- | os/hal/platforms/STM32L1xx/hal_lld.h | 43 | ||||
| -rw-r--r-- | os/hal/platforms/STM32L1xx/stm32l1xx.h | 4 |
2 files changed, 2 insertions, 45 deletions
diff --git a/os/hal/platforms/STM32L1xx/hal_lld.h b/os/hal/platforms/STM32L1xx/hal_lld.h index fe2909536..b25bad51d 100644 --- a/os/hal/platforms/STM32L1xx/hal_lld.h +++ b/os/hal/platforms/STM32L1xx/hal_lld.h @@ -37,7 +37,7 @@ #ifndef _HAL_LLD_H_
#define _HAL_LLD_H_
-#include "stm32l1xx.h"
+#include "stm32.h"
/*===========================================================================*/
/* Driver constants. */
@@ -956,47 +956,6 @@ /* Driver data structures and types. */
/*===========================================================================*/
-/**
- * @brief STM32 TIM registers block.
- * @note Removed from the ST headers and redefined because the non uniform
- * declaration of the CCR registers among the various sub-families.
- */
-typedef struct {
- volatile uint16_t CR1;
- uint16_t _resvd0;
- volatile uint16_t CR2;
- uint16_t _resvd1;
- volatile uint16_t SMCR;
- uint16_t _resvd2;
- volatile uint16_t DIER;
- uint16_t _resvd3;
- volatile uint16_t SR;
- uint16_t _resvd4;
- volatile uint16_t EGR;
- uint16_t _resvd5;
- volatile uint16_t CCMR1;
- uint16_t _resvd6;
- volatile uint16_t CCMR2;
- uint16_t _resvd7;
- volatile uint16_t CCER;
- uint16_t _resvd8;
- volatile uint32_t CNT;
- volatile uint16_t PSC;
- uint16_t _resvd9;
- volatile uint32_t ARR;
- volatile uint16_t RCR;
- uint16_t _resvd10;
- volatile uint32_t CCR[4];
- volatile uint16_t BDTR;
- uint16_t _resvd11;
- volatile uint16_t DCR;
- uint16_t _resvd12;
- volatile uint16_t DMAR;
- uint16_t _resvd13;
- volatile uint16_t OR;
- uint16_t _resvd14;
-} TIM_TypeDef;
-
/*===========================================================================*/
/* Driver macros. */
/*===========================================================================*/
diff --git a/os/hal/platforms/STM32L1xx/stm32l1xx.h b/os/hal/platforms/STM32L1xx/stm32l1xx.h index 5fadee5db..9c665d29b 100644 --- a/os/hal/platforms/STM32L1xx/stm32l1xx.h +++ b/os/hal/platforms/STM32L1xx/stm32l1xx.h @@ -191,6 +191,7 @@ typedef enum IRQn */
#include "core_cm3.h"
+/* CHIBIOS FIX */
/*#include "system_stm32l1xx.h"*/
#include <stdint.h>
@@ -615,8 +616,6 @@ typedef struct * @brief TIM
*/
-/* CHIBIOS FIX */
-#if 0
typedef struct
{
__IO uint16_t CR1;
@@ -660,7 +659,6 @@ typedef struct __IO uint16_t OR;
uint16_t RESERVED20;
} TIM_TypeDef;
-#endif
/**
* @brief Universal Synchronous Asynchronous Receiver Transmitter
|