From ddd7d8ca716875d570750300858ce22151810af7 Mon Sep 17 00:00:00 2001
From: Ben Gamari <bgamari.foss@gmail.com>
Date: Thu, 13 Jun 2013 17:00:30 -0400
Subject: [PATCH] Fix NVIC interrupt macro names

In libopencm3 master the NVIC macros are prefixed with NVIC_ not
NVIC_M4_
---
 firmware/hackrf_usb/hackrf_usb.c | 10 +++++-----
 firmware/hackrf_usb/usb.c        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index 86a1ab13..fdf10249 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -295,7 +295,7 @@ usb_endpoint_t usb_endpoint_bulk_out = {
 void baseband_streaming_disable() {
 	sgpio_cpld_stream_disable();
 
-	nvic_disable_irq(NVIC_M4_SGPIO_IRQ);
+	nvic_disable_irq(NVIC_SGPIO_IRQ);
 	
 	usb_endpoint_disable(&usb_endpoint_bulk_in);
 	usb_endpoint_disable(&usb_endpoint_bulk_out);
@@ -335,8 +335,8 @@ void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) {
 
 	sgpio_configure(transceiver_mode, true);
 
-	nvic_set_priority(NVIC_M4_SGPIO_IRQ, 0);
-	nvic_enable_irq(NVIC_M4_SGPIO_IRQ);
+	nvic_set_priority(NVIC_SGPIO_IRQ, 0);
+	nvic_enable_irq(NVIC_SGPIO_IRQ);
 	SGPIO_SET_EN_1 = (1 << SGPIO_SLICE_A);
 
     sgpio_cpld_stream_enable();
@@ -896,7 +896,7 @@ void usb_configuration_changed(
 	}
 };
 
-void sgpio_irqhandler() {
+void sgpio_isr() {
 	SGPIO_CLR_STATUS_1 = (1 << SGPIO_SLICE_A);
 
 	uint32_t* const p = (uint32_t*)&usb_bulk_buffer[usb_bulk_buffer_offset];
@@ -973,7 +973,7 @@ int main(void) {
 	usb_endpoint_init(&usb_endpoint_control_out);
 	usb_endpoint_init(&usb_endpoint_control_in);
 	
-	nvic_set_priority(NVIC_M4_USB0_IRQ, 255);
+	nvic_set_priority(NVIC_USB0_IRQ, 255);
 
 	usb_run(&usb_device);
 	
diff --git a/firmware/hackrf_usb/usb.c b/firmware/hackrf_usb/usb.c
index 2737201e..c647fb7e 100644
--- a/firmware/hackrf_usb/usb.c
+++ b/firmware/hackrf_usb/usb.c
@@ -412,7 +412,7 @@ static void usb_interrupt_enable(
 	usb_device_t* const device
 ) {
 	if( device == usb_device_usb0 ) {
-		nvic_enable_irq(NVIC_M4_USB0_IRQ);
+		nvic_enable_irq(NVIC_USB0_IRQ);
 	}
 }
 
@@ -602,7 +602,7 @@ static void usb_check_for_transfer_events() {
 	}
 }
 
-void usb0_irqhandler() {
+void usb0_isr() {
 	const uint32_t status = usb_get_status();
 	
 	if( status == 0 ) {