Added stdio.h stream examples for the virtual CDC UART in the CDC host demos.

[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..f58e670 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
                                           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
                #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
        #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
                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
 \r
                if (USB_HostState != HOST_STATE_Unattached)\r
                  EVENT_USB_Host_DeviceUnattached();\r


@@ -223,14 +230,14 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 }\r
 \r
 #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
 }\r
 \r
 #if defined(INTERRUPT_CONTROL_ENDPOINT)\r

-ISR(USB_COM_vect, ISR_NOBLOCK)\r
+ISR(USB_COM_vect, ISR_BLOCK)\r

 {\r
        uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
 \r
        USB_USBTask();\r
 \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
        \r

-       Endpoint_SelectEndpoint(PrevSelectedEndpoint);  \r
+       Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r

 }\r
 #endif\r
 }\r
 #endif\r