From 4ef53ab0953ac664a9935b26cd6536aac44eaec7 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 21 Aug 2019 13:52:43 -0400 Subject: stm32: Update code to use armcm_boot mechanism Replace the stm32 provided assembler with the src/generic/armcm_boot.c mechanism. Signed-off-by: Kevin O'Connor --- src/stm32/usbfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/stm32/usbfs.c') diff --git a/src/stm32/usbfs.c b/src/stm32/usbfs.c index a2706d31..6ded901c 100644 --- a/src/stm32/usbfs.c +++ b/src/stm32/usbfs.c @@ -6,6 +6,7 @@ #include // NULL #include "autoconf.h" // CONFIG_STM32_FLASH_START_2000 +#include "board/armcm_boot.h" // armcm_enable_irq #include "board/armcm_timer.h" // udelay #include "board/gpio.h" // gpio_out_setup #include "board/io.h" // writeb @@ -249,7 +250,7 @@ usb_reset(void) } // Main irq handler -void __visible +void USB_LP_CAN1_RX0_IRQHandler(void) { uint32_t istr = USB->ISTR; @@ -301,7 +302,6 @@ usb_init(void) USB->DADDR = 0; USB->CNTR = USB_CNTR_RESETM; USB->ISTR = 0; - NVIC_SetPriority(USB_LP_CAN1_RX0_IRQn, 1); - NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn); + armcm_enable_irq(USB_LP_CAN1_RX0_IRQHandler, USB_LP_CAN1_RX0_IRQn, 1); } DECL_INIT(usb_init); -- cgit v1.2.3-70-g09d2