diff options
Diffstat (limited to 'os/hal/platforms/STM32F1xx')
| -rw-r--r-- | os/hal/platforms/STM32F1xx/hal_lld.h | 43 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F1xx/stm32f10x.h | 3 |
2 files changed, 1 insertions, 45 deletions
diff --git a/os/hal/platforms/STM32F1xx/hal_lld.h b/os/hal/platforms/STM32F1xx/hal_lld.h index b1ba1a5ed..64cf0165c 100644 --- a/os/hal/platforms/STM32F1xx/hal_lld.h +++ b/os/hal/platforms/STM32F1xx/hal_lld.h @@ -43,7 +43,7 @@ #ifndef _HAL_LLD_H_
#define _HAL_LLD_H_
-#include "stm32f10x.h"
+#include "stm32.h"
/*===========================================================================*/
/* Driver constants. */
@@ -102,47 +102,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/STM32F1xx/stm32f10x.h b/os/hal/platforms/STM32F1xx/stm32f10x.h index e8f413763..6697b9648 100644 --- a/os/hal/platforms/STM32F1xx/stm32f10x.h +++ b/os/hal/platforms/STM32F1xx/stm32f10x.h @@ -1198,8 +1198,6 @@ typedef struct * @brief TIM
*/
-/* CHIBIOS FIX */
-#if 0
typedef struct
{
__IO uint16_t CR1;
@@ -1243,7 +1241,6 @@ typedef struct __IO uint16_t DMAR;
uint16_t RESERVED19;
} TIM_TypeDef;
-#endif
/**
* @brief Universal Synchronous Asynchronous Receiver Transmitter
|