diff options
| author | Erik Gilling <konkers@konkers.net> | 2016-03-03 14:20:41 -0800 |
|---|---|---|
| committer | Erik Gilling <konkers@konkers.net> | 2016-06-06 20:55:43 -0700 |
| commit | 6c82940c3203254f4953488fc9c1ac609a5d9e8e (patch) | |
| tree | bcd5b5287edfd02c85a4f9593f0242071d02db8e /platform | |
| parent | 5324238022b264de6ec77c3a55cc424a5ad0b139 (diff) | |
| download | common-6c82940c3203254f4953488fc9c1ac609a5d9e8e.tar.gz | |
[stm32f0xx] Import new CMSIS from STM32Cube_FW_F0_V1.5.0.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/stm32f0xx/can.c | 4 | ||||
| -rw-r--r-- | platform/stm32f0xx/rules.mk | 2 | ||||
| -rw-r--r-- | platform/stm32f0xx/vectab.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/platform/stm32f0xx/can.c b/platform/stm32f0xx/can.c index 219604f4..aadb8011 100644 --- a/platform/stm32f0xx/can.c +++ b/platform/stm32f0xx/can.c @@ -27,7 +27,7 @@ typedef enum { static cbuf_t can_rx_buf; static mutex_t can_tx_mutex; -void stm32_CEC_IRQ(void) +void stm32_CEC_CAN_IRQ(void) { arm_cm_irq_entry(); bool resched = false; @@ -181,7 +181,7 @@ void can_init(bool loopback) { // Enable FIFO 0 message pending interrupt can->IER |= CAN_IER_FMPIE0; - NVIC_EnableIRQ(CEC_IRQn); + NVIC_EnableIRQ(CEC_CAN_IRQn); } ssize_t can_send(const can_msg_t *msg) diff --git a/platform/stm32f0xx/rules.mk b/platform/stm32f0xx/rules.mk index c08025d4..744caaff 100644 --- a/platform/stm32f0xx/rules.mk +++ b/platform/stm32f0xx/rules.mk @@ -46,7 +46,7 @@ LINKER_SCRIPT += \ $(BUILDDIR)/system-twosegment.ld MODULE_DEPS += \ - platform/stm32f0xx/STM32F0xx_StdPeriph_Driver \ + platform/stm32f0xx/CMSIS \ arch/arm/arm-m/systick \ lib/cbuf diff --git a/platform/stm32f0xx/vectab.c b/platform/stm32f0xx/vectab.c index ed10ac91..550800ab 100644 --- a/platform/stm32f0xx/vectab.c +++ b/platform/stm32f0xx/vectab.c @@ -48,7 +48,7 @@ DEFAULT_HANDLER(RCC_IRQ) DEFAULT_HANDLER(EXTI0_1_IRQ) DEFAULT_HANDLER(EXTI2_3_IRQ) DEFAULT_HANDLER(EXTI4_15_IRQ) -DEFAULT_HANDLER(TS_IRQ) +DEFAULT_HANDLER(TSC_IRQ) DEFAULT_HANDLER(DMA1_Channel1_IRQ) DEFAULT_HANDLER(DMA1_Channel2_3_IRQ) DEFAULT_HANDLER(DMA1_Channel4_5_6_7_IRQ) @@ -70,7 +70,7 @@ DEFAULT_HANDLER(SPI2_IRQ) DEFAULT_HANDLER(USART1_IRQ) DEFAULT_HANDLER(USART2_IRQ) DEFAULT_HANDLER(USART3_4_IRQ) -DEFAULT_HANDLER(CEC_IRQ) +DEFAULT_HANDLER(CEC_CAN_IRQ) DEFAULT_HANDLER(USB_IRQ) #define VECTAB_ENTRY(x) [x##n] = stm32_##x @@ -85,7 +85,7 @@ const void *const __SECTION(".text.boot.vectab2") vectab2[] = { VECTAB_ENTRY(EXTI0_1_IRQ), // EXTI Line 0 and 1 Interrupts VECTAB_ENTRY(EXTI2_3_IRQ), // EXTI Line 2 and 3 Interrupts VECTAB_ENTRY(EXTI4_15_IRQ), // EXTI Line 4 to 15 Interrupts - VECTAB_ENTRY(TS_IRQ), // Touch sense controller Interrupt + VECTAB_ENTRY(TSC_IRQ), // Touch sense controller Interrupt VECTAB_ENTRY(DMA1_Channel1_IRQ), // DMA1 Channel 1 Interrupt VECTAB_ENTRY(DMA1_Channel2_3_IRQ), // DMA1 Channel 2 and Channel 3 Interrupts VECTAB_ENTRY(DMA1_Channel4_5_6_7_IRQ), // DMA1 Channels 4-7 Interrupts @@ -107,6 +107,6 @@ const void *const __SECTION(".text.boot.vectab2") vectab2[] = { VECTAB_ENTRY(USART1_IRQ), // USART1 Interrupt VECTAB_ENTRY(USART2_IRQ), // USART2 Interrupt VECTAB_ENTRY(USART3_4_IRQ), // USART3 and USART4 Interrupts - VECTAB_ENTRY(CEC_IRQ), // CEC Interrupt + VECTAB_ENTRY(CEC_CAN_IRQ), // CEC Interrupt VECTAB_ENTRY(USB_IRQ), // USB Low Priority global Interrupt }; |