Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...

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

diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index a039dff..3cf4bb3 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -148,11 +148,18 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                                           ENDPOINT_BANK_SINGLE);\r
 \r
                #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
-               USB_INT_Enable(USB_INT_ENDPOINT_SETUP);\r
+               USB_INT_Enable(USB_INT_RXSTPI);\r
                #endif\r
 \r
                EVENT_USB_Device_Reset();\r
        }\r
+       \r
+       if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))\r
+       {\r
+               USB_INT_Clear(USB_INT_SOFI);\r
+               \r
+               EVENT_USB_Device_StartOfFrame();\r
+       }\r
        #endif\r
        \r
        #if defined(USB_CAN_BE_HOST)\r
@@ -222,15 +229,15 @@ ISR(USB_GEN_vect, ISR_BLOCK)
        #endif\r
 }\r
 \r
-#if defined(INTERRUPT_CONTROL_ENDPOINT)\r
-ISR(USB_COM_vect, ISR_NOBLOCK)\r
+#if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE)\r
+ISR(USB_COM_vect, ISR_BLOCK)\r
 {\r
        uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
 \r
        USB_USBTask();\r
 \r
-       USB_INT_Clear(USB_INT_ENDPOINT_SETUP);\r
+       USB_INT_Clear(USB_INT_RXSTPI);\r
        \r
-       Endpoint_SelectEndpoint(PrevSelectedEndpoint);  \r
+       Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r
 }\r
 #endif\r