Commit 1331cce0 authored by Dean Camera's avatar Dean Camera
Browse files

Fixed possible device lockup when INTERRUPT_CONTROL_ENDPOINT is enabled and...

Fixed possible device lockup when INTERRUPT_CONTROL_ENDPOINT is enabled and the control endpoint is not properly selected when the ISR completes.
parent d3c623e1
...@@ -237,10 +237,13 @@ ISR(USB_COM_vect, ISR_BLOCK) ...@@ -237,10 +237,13 @@ ISR(USB_COM_vect, ISR_BLOCK)
Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP); Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
USB_INT_Disable(USB_INT_RXSTPI); USB_INT_Disable(USB_INT_RXSTPI);
sei();
USB_USBTask(); NONATOMIC_BLOCK(NONATOMIC_FORCEOFF)
{
USB_Device_ProcessControlRequest();
}
Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
USB_INT_Enable(USB_INT_RXSTPI); USB_INT_Enable(USB_INT_RXSTPI);
Endpoint_SelectEndpoint(PrevSelectedEndpoint); Endpoint_SelectEndpoint(PrevSelectedEndpoint);
} }
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
/* Includes: */ /* Includes: */
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <util/atomic.h>
#include <stdbool.h> #include <stdbool.h>
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* LIBUSB_DRIVER_COMPAT, as it applies to all software on all platforms using the libUSB driver * LIBUSB_DRIVER_COMPAT, as it applies to all software on all platforms using the libUSB driver
* *
* <b>Fixed:</b> * <b>Fixed:</b>
* - Fixed possible device lockup when INTERRUPT_CONTROL_ENDPOINT is enabled and the control endpoint is not properly
* selected when the ISR completes
* *
* \section Sec_ChangeLog100512 Version 100512 * \section Sec_ChangeLog100512 Version 100512
* *
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment