From e589b403b272f298371af5f43e9164899ae1c426 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 6 Oct 2017 13:40:21 +0200 Subject: [PATCH] cpu/stm32f1: optimized isr vector definitions --- cpu/stm32f1/vectors.c | 214 +++++++++++++++++++++--------------------- 1 file changed, 106 insertions(+), 108 deletions(-) diff --git a/cpu/stm32f1/vectors.c b/cpu/stm32f1/vectors.c index 40ea22823e..3c7a5b4494 100644 --- a/cpu/stm32f1/vectors.c +++ b/cpu/stm32f1/vectors.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014-2015 Freie Universität Berlin + * Copyright (C) 2014-2017 Freie Universität Berlin * * This file is subject to the terms and conditions of the GNU Lesser General * Public License v2.1. See the file LICENSE in the top level directory for more @@ -19,12 +19,8 @@ * @} */ -#include #include "vectors_cortexm.h" -/* get the start of the ISR stack as defined in the linkerscript */ -extern uint32_t _estack; - /* define a local dummy handler as it needs to be in the same compilation unit * as the alias definition */ void dummy_handler(void) { @@ -32,123 +28,125 @@ void dummy_handler(void) { } /* STM32F1 specific interrupt vectors */ -WEAK_DEFAULT void isr_wwdg(void); -WEAK_DEFAULT void isr_pvd(void); -WEAK_DEFAULT void isr_tamper(void); -WEAK_DEFAULT void isr_rtc(void); -WEAK_DEFAULT void isr_flash(void); -WEAK_DEFAULT void isr_rcc(void); -WEAK_DEFAULT void isr_exti(void); -WEAK_DEFAULT void isr_dma1_ch1(void); -WEAK_DEFAULT void isr_dma1_ch2(void); -WEAK_DEFAULT void isr_dma1_ch3(void); -WEAK_DEFAULT void isr_dma1_ch4(void); -WEAK_DEFAULT void isr_dma1_ch5(void); -WEAK_DEFAULT void isr_dma1_ch6(void); -WEAK_DEFAULT void isr_dma1_ch7(void); WEAK_DEFAULT void isr_adc1_2(void); -WEAK_DEFAULT void isr_usb_hp_can1_tx(void); -WEAK_DEFAULT void isr_usb_lp_can1_rx0(void); +WEAK_DEFAULT void isr_adc3(void); WEAK_DEFAULT void isr_can1_rx1(void); WEAK_DEFAULT void isr_can1_sce(void); +WEAK_DEFAULT void isr_dma1_channel1(void); +WEAK_DEFAULT void isr_dma1_channel2(void); +WEAK_DEFAULT void isr_dma1_channel3(void); +WEAK_DEFAULT void isr_dma1_channel4(void); +WEAK_DEFAULT void isr_dma1_channel5(void); +WEAK_DEFAULT void isr_dma1_channel6(void); +WEAK_DEFAULT void isr_dma1_channel7(void); +WEAK_DEFAULT void isr_dma2_channel1(void); +WEAK_DEFAULT void isr_dma2_channel2(void); +WEAK_DEFAULT void isr_dma2_channel3(void); +WEAK_DEFAULT void isr_dma2_channel4_5(void); +WEAK_DEFAULT void isr_exti(void); +WEAK_DEFAULT void isr_flash(void); +WEAK_DEFAULT void isr_fsmc(void); +WEAK_DEFAULT void isr_i2c1_er(void); +WEAK_DEFAULT void isr_i2c1_ev(void); +WEAK_DEFAULT void isr_i2c2_er(void); +WEAK_DEFAULT void isr_i2c2_ev(void); +WEAK_DEFAULT void isr_pvd(void); +WEAK_DEFAULT void isr_rcc(void); +WEAK_DEFAULT void isr_rtc(void); +WEAK_DEFAULT void isr_rtc_alarm(void); +WEAK_DEFAULT void isr_sdio(void); +WEAK_DEFAULT void isr_spi1(void); +WEAK_DEFAULT void isr_spi2(void); +WEAK_DEFAULT void isr_spi3(void); +WEAK_DEFAULT void isr_tamper(void); WEAK_DEFAULT void isr_tim1_brk(void); -WEAK_DEFAULT void isr_tim1_up(void); -WEAK_DEFAULT void isr_tim1_trg_com(void); WEAK_DEFAULT void isr_tim1_cc(void); +WEAK_DEFAULT void isr_tim1_trg_com(void); +WEAK_DEFAULT void isr_tim1_up(void); WEAK_DEFAULT void isr_tim2(void); WEAK_DEFAULT void isr_tim3(void); WEAK_DEFAULT void isr_tim4(void); -WEAK_DEFAULT void isr_i2c1_ev(void); -WEAK_DEFAULT void isr_i2c1_er(void); -WEAK_DEFAULT void isr_i2c2_ev(void); -WEAK_DEFAULT void isr_i2c2_er(void); -WEAK_DEFAULT void isr_spi1(void); -WEAK_DEFAULT void isr_spi2(void); +WEAK_DEFAULT void isr_tim5(void); +WEAK_DEFAULT void isr_tim6(void); +WEAK_DEFAULT void isr_tim7(void); +WEAK_DEFAULT void isr_tim8_brk(void); +WEAK_DEFAULT void isr_tim8_cc(void); +WEAK_DEFAULT void isr_tim8_trg_com(void); +WEAK_DEFAULT void isr_tim8_up(void); +WEAK_DEFAULT void isr_uart4(void); +WEAK_DEFAULT void isr_uart5(void); WEAK_DEFAULT void isr_usart1(void); WEAK_DEFAULT void isr_usart2(void); WEAK_DEFAULT void isr_usart3(void); -WEAK_DEFAULT void isr_rtc_alarm(void); -WEAK_DEFAULT void isr_usb_wakeup(void); -WEAK_DEFAULT void isr_tim8_brk(void); -WEAK_DEFAULT void isr_tim8_up(void); -WEAK_DEFAULT void isr_tim8_trg_com(void); -WEAK_DEFAULT void isr_tim8_cc(void); -WEAK_DEFAULT void isr_adc3(void); -WEAK_DEFAULT void isr_fsmc(void); -WEAK_DEFAULT void isr_sdio(void); -WEAK_DEFAULT void isr_tim5(void); -WEAK_DEFAULT void isr_spi3(void); -WEAK_DEFAULT void isr_uart4(void); -WEAK_DEFAULT void isr_uart5(void); -WEAK_DEFAULT void isr_tim6(void); -WEAK_DEFAULT void isr_tim7(void); -WEAK_DEFAULT void isr_dma2_ch1(void); -WEAK_DEFAULT void isr_dma2_ch2(void); -WEAK_DEFAULT void isr_dma2_ch3(void); -WEAK_DEFAULT void isr_dma2_ch4_5(void); +WEAK_DEFAULT void isr_usb_hp_can1_tx(void); +WEAK_DEFAULT void isr_usb_lp_can1_rx0(void); +WEAK_DEFAULT void isr_usbwakeup(void); +WEAK_DEFAULT void isr_wwdg(void); /* CPU specific interrupt vector table */ ISR_VECTOR(1) const isr_t vector_cpu[CPU_IRQ_NUMOF] = { - isr_wwdg, /* [0] Window WatchDog Interrupt */ - isr_pvd, /* [1] PVD through EXTI Line detection Interrupt */ - isr_tamper, /* [2] Tamper Interrupt */ - isr_rtc, /* [3] RTC global Interrupt */ - isr_flash, /* [4] FLASH global Interrupt */ - isr_rcc, /* [5] RCC global Interrupt */ - isr_exti, /* [6] EXTI Line0 Interrupt */ - isr_exti, /* [7] EXTI Line1 Interrupt */ - isr_exti, /* [8] EXTI Line2 Interrupt */ - isr_exti, /* [9] EXTI Line3 Interrupt */ - isr_exti, /* [10] EXTI Line4 Interrupt */ - isr_dma1_ch1, /* [11] DMA1 Channel 1 global Interrupt */ - isr_dma1_ch2, /* [12] DMA1 Channel 2 global Interrupt */ - isr_dma1_ch3, /* [13] DMA1 Channel 3 global Interrupt */ - isr_dma1_ch4, /* [14] DMA1 Channel 4 global Interrupt */ - isr_dma1_ch5, /* [15] DMA1 Channel 5 global Interrupt */ - isr_dma1_ch6, /* [16] DMA1 Channel 6 global Interrupt */ - isr_dma1_ch7, /* [17] DMA1 Channel 7 global Interrupt */ - isr_adc1_2, /* [18] ADC1 and ADC2 global Interrupt */ - isr_usb_hp_can1_tx, /* [19] USB Device High Priority or CAN1 TX Interrupts */ - isr_usb_lp_can1_rx0, /* [20] USB Device Low Priority or CAN1 RX0 Interrupts */ - isr_can1_rx1, /* [21] CAN1 RX1 Interrupt */ - isr_can1_sce, /* [22] CAN1 SCE Interrupt */ - isr_exti, /* [23] External Line[9:5] Interrupts */ - isr_tim1_brk, /* [24] TIM1 Break Interrupt */ - isr_tim1_up, /* [25] TIM1 Update Interrupt */ - isr_tim1_trg_com, /* [26] TIM1 Trigger and Commutation Interrupt */ - isr_tim1_cc, /* [27] TIM1 Capture Compare Interrupt */ - isr_tim2, /* [28] TIM2 global Interrupt */ - isr_tim3, /* [29] TIM3 global Interrupt */ - isr_tim4, /* [30] TIM4 global Interrupt */ - isr_i2c1_ev, /* [31] I2C1 Event Interrupt */ - isr_i2c1_er, /* [32] I2C1 Error Interrupt */ - isr_i2c2_ev, /* [33] I2C2 Event Interrupt */ - isr_i2c2_er, /* [34] I2C2 Error Interrupt */ - isr_spi1, /* [35] SPI1 global Interrupt */ - isr_spi2, /* [36] SPI2 global Interrupt */ - isr_usart1, /* [37] USART1 global Interrupt */ - isr_usart2, /* [38] USART2 global Interrupt */ - isr_usart3, /* [39] USART3 global Interrupt */ - isr_exti, /* [40] External Line[15:10] Interrupts */ - isr_rtc_alarm, /* [41] RTC Alarm through EXTI Line Interrupt */ - isr_usb_wakeup, /* [42] USB Device WakeUp from suspend through EXTI Line Interrupt */ + /* shared vectors for all family members */ + [ 0] = isr_wwdg, /* [ 0] Window WatchDog Interrupt */ + [ 1] = isr_pvd, /* [ 1] PVD through EXTI Line detection Interrupt */ + [ 2] = isr_tamper, /* [ 2] Tamper Interrupt */ + [ 3] = isr_rtc, /* [ 3] RTC global Interrupt */ + [ 4] = isr_flash, /* [ 4] FLASH global Interrupt */ + [ 5] = isr_rcc, /* [ 5] RCC global Interrupt */ + [ 6] = isr_exti, /* [ 6] EXTI Line0 Interrupt */ + [ 7] = isr_exti, /* [ 7] EXTI Line1 Interrupt */ + [ 8] = isr_exti, /* [ 8] EXTI Line2 Interrupt */ + [ 9] = isr_exti, /* [ 9] EXTI Line3 Interrupt */ + [10] = isr_exti, /* [10] EXTI Line4 Interrupt */ + [11] = isr_dma1_channel1, /* [11] DMA1 Channel 1 global Interrupt */ + [12] = isr_dma1_channel2, /* [12] DMA1 Channel 2 global Interrupt */ + [13] = isr_dma1_channel3, /* [13] DMA1 Channel 3 global Interrupt */ + [14] = isr_dma1_channel4, /* [14] DMA1 Channel 4 global Interrupt */ + [15] = isr_dma1_channel5, /* [15] DMA1 Channel 5 global Interrupt */ + [16] = isr_dma1_channel6, /* [16] DMA1 Channel 6 global Interrupt */ + [17] = isr_dma1_channel7, /* [17] DMA1 Channel 7 global Interrupt */ + [18] = isr_adc1_2, /* [18] ADC1 and ADC2 global Interrupt */ + [19] = isr_usb_hp_can1_tx, /* [19] USB Device High Priority or CAN1 TX Interrupts */ + [20] = isr_usb_lp_can1_rx0, /* [20] USB Device Low Priority or CAN1 RX0 Interrupts */ + [21] = isr_can1_rx1, /* [21] CAN1 RX1 Interrupt */ + [22] = isr_can1_sce, /* [22] CAN1 SCE Interrupt */ + [23] = isr_exti, /* [23] External Line[9:5] Interrupts */ + [24] = isr_tim1_brk, /* [24] TIM1 Break Interrupt */ + [25] = isr_tim1_up, /* [25] TIM1 Update Interrupt */ + [26] = isr_tim1_trg_com, /* [26] TIM1 Trigger and Commutation Interrupt */ + [27] = isr_tim1_cc, /* [27] TIM1 Capture Compare Interrupt */ + [28] = isr_tim2, /* [28] TIM2 global Interrupt */ + [29] = isr_tim3, /* [29] TIM3 global Interrupt */ + [30] = isr_tim4, /* [30] TIM4 global Interrupt */ + [31] = isr_i2c1_ev, /* [31] I2C1 Event Interrupt */ + [32] = isr_i2c1_er, /* [32] I2C1 Error Interrupt */ + [33] = isr_i2c2_ev, /* [33] I2C2 Event Interrupt */ + [34] = isr_i2c2_er, /* [34] I2C2 Error Interrupt */ + [35] = isr_spi1, /* [35] SPI1 global Interrupt */ + [36] = isr_spi2, /* [36] SPI2 global Interrupt */ + [37] = isr_usart1, /* [37] USART1 global Interrupt */ + [38] = isr_usart2, /* [38] USART2 global Interrupt */ + [39] = isr_usart3, /* [39] USART3 global Interrupt */ + [40] = isr_exti, /* [40] External Line[15:10] Interrupts */ + [41] = isr_rtc_alarm, /* [41] RTC Alarm through EXTI Line Interrupt */ + [42] = isr_usbwakeup, /* [42] USB Device WakeUp from suspend through EXTI Line Interrupt */ + #if defined(CPU_MODEL_STM32F103RE) - isr_tim8_brk, /* [43] TIM8 Break Interrupt */ - isr_tim8_up, /* [44] TIM8 Update Interrupt */ - isr_tim8_trg_com, /* [45] TIM8 Trigger and Commutation Interrupt */ - isr_tim8_cc, /* [46] TIM8 Capture Compare Interrupt */ - isr_adc3, /* [47] ADC3 global Interrupt */ - isr_fsmc, /* [48] FSMC global Interrupt */ - isr_sdio, /* [49] SDIO global Interrupt */ - isr_tim5, /* [50] TIM5 global Interrupt */ - isr_spi3, /* [51] SPI3 global Interrupt */ - isr_uart4, /* [52] UART4 global Interrupt */ - isr_uart5, /* [53] UART5 global Interrupt */ - isr_tim6, /* [54] TIM6 global Interrupt */ - isr_tim7, /* [55] TIM7 global Interrupt */ - isr_dma2_ch1, /* [56] DMA2 Channel 1 global Interrupt */ - isr_dma2_ch2, /* [57] DMA2 Channel 2 global Interrupt */ - isr_dma2_ch3, /* [58] DMA2 Channel 3 global Interrupt */ - isr_dma2_ch4_5, /* [59] DMA2 Channel 4 and Channel 5 global Interrupt */ + [43] = isr_tim8_brk, /* [43] TIM8 Break Interrupt */ + [44] = isr_tim8_up, /* [44] TIM8 Update Interrupt */ + [45] = isr_tim8_trg_com, /* [45] TIM8 Trigger and Commutation Interrupt */ + [46] = isr_tim8_cc, /* [46] TIM8 Capture Compare Interrupt */ + [47] = isr_adc3, /* [47] ADC3 global Interrupt */ + [48] = isr_fsmc, /* [48] FSMC global Interrupt */ + [49] = isr_sdio, /* [49] SDIO global Interrupt */ + [50] = isr_tim5, /* [50] TIM5 global Interrupt */ + [51] = isr_spi3, /* [51] SPI3 global Interrupt */ + [52] = isr_uart4, /* [52] UART4 global Interrupt */ + [53] = isr_uart5, /* [53] UART5 global Interrupt */ + [54] = isr_tim6, /* [54] TIM6 global Interrupt */ + [55] = isr_tim7, /* [55] TIM7 global Interrupt */ + [56] = isr_dma2_channel1, /* [56] DMA2 Channel 1 global Interrupt */ + [57] = isr_dma2_channel2, /* [57] DMA2 Channel 2 global Interrupt */ + [58] = isr_dma2_channel3, /* [58] DMA2 Channel 3 global Interrupt */ + [59] = isr_dma2_channel4_5, /* [59] DMA2 Channel 4 and Channel 5 global Interrupt */ #endif };