From d85462d0517baac39f3c316924162cca3d9c785a Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Wed, 15 Jun 2011 17:11:41 -0400
Subject: 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>
---
 libmaple/usb/usb_callbacks.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libmaple/usb/usb_callbacks.c')

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;
 }
 
-- 
cgit v1.2.3