Reduced latency for executing the Start-Of-Frame events (if enabled in the user appli...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / USBInterrupt.c

diff --git a/LUFA/Drivers/USB/LowLevel/USBInterrupt.c b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
index b7e2160..34234fe 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
@@ -55,25 +55,34 @@ void USB_INT_DisableAllInterrupts(void)
 void USB_INT_ClearAllInterrupts(void)
 {
        #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-       USBINT  = 0;
+       USBINT = 0;
        #endif
 
        #if defined(USB_CAN_BE_BOTH)
-       OTGINT  = 0;
+       OTGINT = 0;
        #endif
 
        #if defined(USB_CAN_BE_HOST)
-       UHINT   = 0;
+       UHINT  = 0;
        #endif
 
        #if defined(USB_CAN_BE_DEVICE)
-       UDINT   = 0;
+       UDINT  = 0;
        #endif
 }
 
 ISR(USB_GEN_vect, ISR_BLOCK)
 {
        #if defined(USB_CAN_BE_DEVICE)
+       #if !defined(NO_SOF_EVENTS)
+       if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))
+       {
+               USB_INT_Clear(USB_INT_SOFI);
+
+               EVENT_USB_Device_StartOfFrame();
+       }
+       #endif
+
        #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
        if (USB_INT_HasOccurred(USB_INT_VBUS) && USB_INT_IsEnabled(USB_INT_VBUS))
        {
@@ -161,18 +170,18 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 
                EVENT_USB_Device_Reset();
        }
+       #endif
 
+       #if defined(USB_CAN_BE_HOST)
        #if !defined(NO_SOF_EVENTS)
-       if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))
+       if (USB_INT_HasOccurred(USB_INT_HSOFI) && USB_INT_IsEnabled(USB_INT_HSOFI))
        {
-               USB_INT_Clear(USB_INT_SOFI);
+               USB_INT_Clear(USB_INT_HSOFI);
 
-               EVENT_USB_Device_StartOfFrame();
+               EVENT_USB_Host_StartOfFrame();
        }
        #endif
-       #endif
 
-       #if defined(USB_CAN_BE_HOST)
        if (USB_INT_HasOccurred(USB_INT_DDISCI) && USB_INT_IsEnabled(USB_INT_DDISCI))
        {
                USB_INT_Clear(USB_INT_DDISCI);
@@ -218,15 +227,6 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 
                USB_ResetInterface();
        }
-
-       #if !defined(NO_SOF_EVENTS)
-       if (USB_INT_HasOccurred(USB_INT_HSOFI) && USB_INT_IsEnabled(USB_INT_HSOFI))
-       {
-               USB_INT_Clear(USB_INT_HSOFI);
-
-               EVENT_USB_Host_StartOfFrame();
-       }
-       #endif
        #endif
 
        #if defined(USB_CAN_BE_BOTH)