Fix up the incomplete Webserver project so that it integrates with the uIP stack...

[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 56e54f2..ee6d16e 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -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
@@ -209,7 +216,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_INT_Clear(USB_INT_IDTI);\r
 \r
                if (USB_DeviceState != DEVICE_STATE_Unattached)\r
-                 EVENT_USB_Disconnect();\r
+                 EVENT_USB_Device_Disconnect();\r
 \r
                if (USB_HostState != HOST_STATE_Unattached)\r
                  EVENT_USB_Host_DeviceUnattached();\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