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/STM32F4xx/stm32f4xx.h | |
| 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/STM32F4xx/stm32f4xx.h')
| -rw-r--r-- | os/hal/platforms/STM32F4xx/stm32f4xx.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/os/hal/platforms/STM32F4xx/stm32f4xx.h b/os/hal/platforms/STM32F4xx/stm32f4xx.h index cd8ed7887..f4e88fc17 100644 --- a/os/hal/platforms/STM32F4xx/stm32f4xx.h +++ b/os/hal/platforms/STM32F4xx/stm32f4xx.h @@ -237,8 +237,8 @@ typedef enum IRQn * @}
*/
- /* CHIBIOS FIX */
#include "core_cm4.h" /* Cortex-M4 processor and core peripherals */
+/* CHIBIOS FIX */
/*#include "system_stm32f4xx.h"*/
#include <stdint.h>
@@ -868,8 +868,6 @@ typedef struct * @brief TIM
*/
-/* CHIBIOS FIX */
-#if 0
typedef struct
{
__IO uint16_t CR1; /*!< TIM control register 1, Address offset: 0x00 */
@@ -909,7 +907,6 @@ typedef struct __IO uint16_t OR; /*!< TIM option register, Address offset: 0x50 */
uint16_t RESERVED14; /*!< Reserved, 0x52 */
} TIM_TypeDef;
-#endif
/**
* @brief Universal Synchronous Asynchronous Receiver Transmitter
|