From 2376fbb2af4d2fc39710ce8e28c3fc01ea7a640f Mon Sep 17 00:00:00 2001 From: liamstask Date: Tue, 6 Jul 2010 00:25:43 +0000 Subject: [PATCH] * STM32F10X_HD is handled in hal_lld_f103.h, not hal_lld_f105_f107.h as the previous commit assumed git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2058 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32/hal_lld_f103.h | 27 ++++++++++++++++++---- os/hal/platforms/STM32/hal_lld_f105_f107.h | 13 ----------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/os/hal/platforms/STM32/hal_lld_f103.h b/os/hal/platforms/STM32/hal_lld_f103.h index def6007ad..03e689382 100644 --- a/os/hal/platforms/STM32/hal_lld_f103.h +++ b/os/hal/platforms/STM32/hal_lld_f103.h @@ -110,27 +110,46 @@ #define TIM1_CC_IRQHandler VectorAC // TIM1 Capture Compare #define TIM2_IRQHandler VectorB0 // TIM2 #define TIM3_IRQHandler VectorB4 // TIM3 -#if defined(STM32F10X_MD) +#if defined(STM32F10X_MD) || defined(STM32F10X_HD) #define TIM4_IRQHandler VectorB8 // TIM4 #endif #define I2C1_EV_IRQHandler VectorBC // I2C1 Event #define I2C1_ER_IRQHandler VectorC0 // I2C1 Error -#if defined(STM32F10X_MD) +#if defined(STM32F10X_MD) || defined(STM32F10X_HD) #define I2C2_EV_IRQHandler VectorC4 // I2C2 Event #define I2C2_ER_IRQHandler VectorC8 // I2C2 Error #endif #define SPI1_IRQHandler VectorCC // SPI1 -#if defined(STM32F10X_MD) +#if defined(STM32F10X_MD) || defined(STM32F10X_HD) #define SPI2_IRQHandler VectorD0 // SPI2 #endif #define USART1_IRQHandler VectorD4 // USART1 #define USART2_IRQHandler VectorD8 // USART2 -#if defined(STM32F10X_MD) +#if defined(STM32F10X_MD) || defined(STM32F10X_HD) #define USART3_IRQHandler VectorDC // USART3 #endif #define EXTI15_10_IRQHandler VectorE0 // EXTI Line 15..10 #define RTCAlarm_IRQHandler VectorE4 // RTC Alarm through EXTI Line #define USBWakeUp_IRQHandler VectorE8 // USB Wakeup from suspend +#if defined(STM32F10X_HD) +#define TIM8_BRK_IRQHandler VectorEC // TIM8 Break +#define TIM8_UP_IRQHandler VectorF0 // TIM8 Update +#define TIM8_TRG_COM_IRQHandler VectorF4 // TIM8 Trigger and Commutation +#define TIM8_CC_IRQHandler VectorF8 // TIM8 Capture Compare +#define ADC3_IRQHandler VectorFC // ADC3 +#define FSMC_IRQHandler Vector100 // FSMC +#define SDIO_IRQHandler Vector104 // SDIO +#define TIM5_IRQHandler Vector108 // TIM5 +#define SPI3_IRQHandler Vector10C // SPI3 +#define UART4_IRQHandler Vector110 // UART4 +#define UART5_IRQHandler Vector114 // UART5 +#define TIM6_IRQHandler Vector118 // TIM6 +#define TIM7_IRQHandler Vector11C // TIM7 +#define DMA2_Channel1_IRQHandler Vector120 // DMA2 Channel1 +#define DMA2_Channel2_IRQHandler Vector124 // DMA2 Channel2 +#define DMA2_Channel3_IRQHandler Vector128 // DMA2 Channel3 +#define DMA2_Channel4_5_IRQHandler Vector12C // DMA2 Channel4 & Channel5 +#endif /*===========================================================================*/ diff --git a/os/hal/platforms/STM32/hal_lld_f105_f107.h b/os/hal/platforms/STM32/hal_lld_f105_f107.h index ac15c3894..2b42679f6 100644 --- a/os/hal/platforms/STM32/hal_lld_f105_f107.h +++ b/os/hal/platforms/STM32/hal_lld_f105_f107.h @@ -132,15 +132,6 @@ #define EXTI15_10_IRQHandler VectorE0 // EXTI Line 15..10 #define RTCAlarm_IRQHandler VectorE4 // RTC alarm through EXTI line #define OTG_FS_WKUP_IRQHandler VectorE8 // USB OTG FS Wakeup through EXTI line -#if defined(STM32F10X_HD) -#define TIM8_BRK_IRQHandler VectorEC // TIM8 Break -#define TIM8_UP_IRQHandler VectorF0 // TIM8 Update -#define TIM8_TRG_COM_IRQHandler VectorF4 // TIM8 Trigger and Commutation -#define TIM8_CC_IRQHandler VectorF8 // TIM8 Capture Compare -#define ADC3_IRQHandler VectorFC // ADC3 -#define FSMC_IRQHandler Vector100 // FSMC -#define SDIO_IRQHandler Vector104 // SDIO -#endif #define TIM5_IRQHandler Vector108 // TIM5 #define SPI3_IRQHandler Vector10C // SPI3 #define UART4_IRQHandler Vector110 // UART4 @@ -150,9 +141,6 @@ #define DMA2_Channel1_IRQHandler Vector120 // DMA2 Channel1 #define DMA2_Channel2_IRQHandler Vector124 // DMA2 Channel2 #define DMA2_Channel3_IRQHandler Vector128 // DMA2 Channel3 -#if defined(STM32F10X_HD) -#define DMA2_Channel4_5_IRQHandler Vector12C // DMA2 Channel4 & Channel5 -#elif defined(STM32F10X_CL) #define DMA2_Channel4_IRQHandler Vector12C // DMA2 Channel4 #define DMA2_Channel5_IRQHandler Vector130 // DMA2 Channel5 #define ETH_IRQHandler Vector134 // Ethernet @@ -162,7 +150,6 @@ #define CAN2_RX1_IRQHandler Vector144 // CAN2 RX1 #define CAN2_SCE_IRQHandler Vector148 // CAN2 SCE #define OTG_FS_IRQHandler Vector14C // USB OTG FS -#endif /*===========================================================================*/ /* Driver pre-compile time settings. */