Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NVIC interrupt macro names

Browse Source 
In libopencm3 master the NVIC macros are prefixed with NVIC_ not
NVIC_M4_
This commit is contained in:
Ben Gamari
2013-06-13 17:00:30 -04:00
parent fac5d0dfba
commit ddd7d8ca71
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/hackrf_usb/hackrf_usb.c
View File

@ -295,7 +295,7 @@ usb_endpoint_t usb_endpoint_bulk_out = {
void baseband_streaming_disable() { void baseband_streaming_disable() {
sgpio_cpld_stream_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_in);
usb_endpoint_disable(&usb_endpoint_bulk_out); 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); sgpio_configure(transceiver_mode, true);
nvic_set_priority(NVIC_M4_SGPIO_IRQ, 0); nvic_set_priority(NVIC_SGPIO_IRQ, 0);
nvic_enable_irq(NVIC_M4_SGPIO_IRQ); nvic_enable_irq(NVIC_SGPIO_IRQ);
SGPIO_SET_EN_1 = (1 << SGPIO_SLICE_A); SGPIO_SET_EN_1 = (1 << SGPIO_SLICE_A);
sgpio_cpld_stream_enable(); 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); SGPIO_CLR_STATUS_1 = (1 << SGPIO_SLICE_A);
uint32_t* const p = (uint32_t*)&usb_bulk_buffer[usb_bulk_buffer_offset]; 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_out);
usb_endpoint_init(&usb_endpoint_control_in); 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); usb_run(&usb_device);

4
firmware/hackrf_usb/usb.c
View File

@ -412,7 +412,7 @@ static void usb_interrupt_enable(
usb_device_t* const device usb_device_t* const device
) { ) {
if( device == usb_device_usb0 ) { 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(); const uint32_t status = usb_get_status();
if( status == 0 ) { if( status == 0 ) {