From cce17c42fd16ed7cf74c9653ddaf06cd7fafd61c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 7 Jul 2013 21:24:13 -0400 Subject: [PATCH] libopencm3: Update --- firmware/hackrf_usb/usb_queue.c | 8 ++++---- firmware/libopencm3 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/hackrf_usb/usb_queue.c b/firmware/hackrf_usb/usb_queue.c index 8253e0b6..0341150a 100644 --- a/firmware/hackrf_usb/usb_queue.c +++ b/firmware/hackrf_usb/usb_queue.c @@ -93,13 +93,13 @@ static void endpoint_add_transfer( void usb_queue_flush_endpoint(const usb_endpoint_t* const endpoint) { uint_fast8_t index = USB_ENDPOINT_INDEX(endpoint->address); - cc_disable_interrupts(); + cm_disable_interrupts(); while (endpoint_transfers[index]) { usb_transfer_t * transfer = endpoint_transfers[index]; endpoint_transfers[index] = transfer->next; free_transfer(transfer); } - cc_enable_interrupts(); + cm_enable_interrupts(); } void usb_transfer_schedule( @@ -132,7 +132,7 @@ void usb_transfer_schedule( transfer->completion_cb = completion_cb; transfer->endpoint = (usb_endpoint_t*) endpoint; - cc_disable_interrupts(); + cm_disable_interrupts(); usb_transfer_t* tail = endpoint_transfers[index]; endpoint_add_transfer(endpoint, transfer); if (tail == NULL) { @@ -143,7 +143,7 @@ void usb_transfer_schedule( for (; tail->next != NULL; tail = tail->next); usb_endpoint_schedule_append(endpoint, &tail->td, &transfer->td); } - cc_enable_interrupts(); + cm_enable_interrupts(); } void usb_transfer_schedule_ack( diff --git a/firmware/libopencm3 b/firmware/libopencm3 index e0040d7c..0aabbbe3 160000 --- a/firmware/libopencm3 +++ b/firmware/libopencm3 @@ -1 +1 @@ -Subproject commit e0040d7c82d174c3ef1c4d3e860aa2ab765a9ab7 +Subproject commit 0aabbbe366565d25f7cd817b57b2f2eab7f1911c