3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32: Simplify irq declaration in usbfs.c 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-12-19 10:07:21 -05:00
parent 6e8f28117b
commit 7d2c966241
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/stm32/usbfs.c
View File

@ -16,17 +16,21 @@
#include "internal.h" // GPIO
#include "sched.h" // DECL_INIT
#if CONFIG_MACH_STM32F103
// Transfer memory is accessed with 32bits, but contains only 16bits of data
typedef volatile uint32_t epmword_t;
#define USBx_IRQn USB_LP_IRQn
#elif CONFIG_MACH_STM32F0
// Transfer memory is accessed with 16bits and contains 16bits of data
typedef volatile uint16_t epmword_t;
#define USBx_IRQn USB_IRQn
#endif
/****************************************************************
* USB transfer memory
****************************************************************/
#if CONFIG_MACH_STM32F103
typedef volatile uint32_t epmword_t;
#else
typedef volatile uint16_t epmword_t;
#endif
struct ep_desc {
epmword_t addr_tx, count_tx, addr_rx, count_rx;
};
@ -293,10 +297,6 @@ usb_init(void)
USB->DADDR = 0;
USB->CNTR = USB_CNTR_RESETM;
USB->ISTR = 0;
#if CONFIG_MACH_STM32F103
armcm_enable_irq(USB_IRQHandler, USB_LP_IRQn, 1);
#elif CONFIG_MACH_STM32F0
armcm_enable_irq(USB_IRQHandler, USB_IRQn, 1);
#endif
armcm_enable_irq(USB_IRQHandler, USBx_IRQn, 1);
}
DECL_INIT(usb_init);