diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-06-15 17:11:41 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-10-18 13:30:17 -0400 |
| commit | d85462d0517baac39f3c316924162cca3d9c785a (patch) | |
| tree | 08a3417acacbae3f4666f0ee0cad893cfe3f8a8c /libmaple/usb/usb_callbacks.c | |
| parent | c6c959682084c8493a0c39754374e7dbe6cf1708 (diff) | |
| download | librambutan-d85462d0517baac39f3c316924162cca3d9c785a.tar.gz librambutan-d85462d0517baac39f3c316924162cca3d9c785a.zip | |
usb: Replace duplicated code with nvic.h API.
Replace calls to usbEnbISR()/usbDsbISR() with
nvic_irq_enable()/nvic_irq_disable(). Remove ST-style code. Use
nvic_sys_reset() instead of systemHardReset(). Rename some
conflicting #defines that including nvic.h created.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple/usb/usb_callbacks.c')
| -rw-r--r-- | libmaple/usb/usb_callbacks.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmaple/usb/usb_callbacks.c b/libmaple/usb/usb_callbacks.c index 890a97f..b2edd8a 100644 --- a/libmaple/usb/usb_callbacks.c +++ b/libmaple/usb/usb_callbacks.c @@ -1,5 +1,7 @@ /* insert license */ +#include "nvic.h" + #include "usb_callbacks.h" #include "usb_lib.h" #include "descriptors.h" @@ -140,7 +142,7 @@ void usbInit(void) { wInterrupt_Mask = ISR_MSK; _SetCNTR(wInterrupt_Mask); - usbEnbISR(); + nvic_irq_enable(NVIC_USB_LP_CAN_RX0); bDeviceState = UNCONNECTED; } |