Revert changed CDC_Device_Flush() prototype accidentially changed in the last commit.

[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 51a761a..f58e670 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -72,36 +72,15 @@ ISR(USB_GEN_vect, ISR_BLOCK)
        {\r
                USB_INT_Clear(USB_INT_VBUS);\r
 \r
        {\r
                USB_INT_Clear(USB_INT_VBUS);\r
 \r

-               EVENT_USB_VBUSChange();\r
-\r

                if (USB_VBUS_GetStatus())\r
                {\r
                if (USB_VBUS_GetStatus())\r
                {\r

-                       EVENT_USB_VBUSConnect();\r
-                       \r
-                       if (USB_DeviceState != DEVICE_STATE_Unattached)\r
-                         EVENT_USB_Disconnect();\r
-                               \r
-                       USB_ResetInterface();\r
-\r

                        USB_DeviceState = DEVICE_STATE_Powered;\r
                        USB_DeviceState = DEVICE_STATE_Powered;\r

-                       EVENT_USB_Connect();\r
+                       EVENT_USB_Device_Connect();\r

                }\r
                else\r
                {\r
                }\r
                else\r
                {\r

-                       USB_DeviceState = DEVICE_STATE_Unattached;\r
-                       EVENT_USB_Disconnect();\r
-               \r
-                       USB_Detach();\r
-                       USB_CLK_Freeze();\r
-\r
-                       if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
-                         USB_PLL_Off();\r
-\r
-                       USB_REG_Off();\r
-\r
-                       EVENT_USB_VBUSDisconnect();\r
-                       \r
-                       USB_INT_Clear(USB_INT_VBUS);\r
+                       USB_DeviceState = DEVICE_STATE_Unattached;              \r
+                       EVENT_USB_Device_Disconnect();\r

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


@@ -120,10 +99,10 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 \r
                #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
                USB_DeviceState = DEVICE_STATE_Unattached;\r
 \r
                #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
                USB_DeviceState = DEVICE_STATE_Unattached;\r

-               EVENT_USB_Disconnect();\r
+               EVENT_USB_Device_Disconnect();\r

                #else\r
                USB_DeviceState = DEVICE_STATE_Suspended;\r
                #else\r
                USB_DeviceState = DEVICE_STATE_Suspended;\r

-               EVENT_USB_Suspend();\r
+               EVENT_USB_Device_Suspend();\r

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


@@ -143,11 +122,11 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_INT_Enable(USB_INT_SUSPEND);\r
                \r
                #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
                USB_INT_Enable(USB_INT_SUSPEND);\r
                \r
                #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r

-               USB_DeviceState = DEVICE_STATE_Powered;\r
-               EVENT_USB_Connect();\r
+               USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;\r
+               EVENT_USB_Device_Connect();\r

                #else\r
                USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r
                #else\r
                USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r

-               EVENT_USB_WakeUp();             \r
+               EVENT_USB_Device_WakeUp();              \r

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


@@ -169,10 +148,17 @@ 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
                #endif\r
 \r

-               EVENT_USB_Reset();\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
        }\r
        #endif\r
        \r


@@ -183,8 +169,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_INT_Clear(USB_INT_DCONNI);\r
                USB_INT_Disable(USB_INT_DDISCI);\r
                        \r
                USB_INT_Clear(USB_INT_DCONNI);\r
                USB_INT_Disable(USB_INT_DDISCI);\r
                        \r

-               EVENT_USB_DeviceUnattached();\r
-               EVENT_USB_Disconnect();\r
+               EVENT_USB_Host_DeviceUnattached();\r

 \r
                USB_ResetInterface();\r
        }\r
 \r
                USB_ResetInterface();\r
        }\r


@@ -196,8 +181,8 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_Host_VBUS_Manual_Off();\r
                USB_Host_VBUS_Auto_Off();\r
 \r
                USB_Host_VBUS_Manual_Off();\r
                USB_Host_VBUS_Auto_Off();\r
 \r

-               EVENT_USB_HostError(HOST_ERROR_VBusVoltageDip);\r
-               EVENT_USB_DeviceUnattached();\r
+               EVENT_USB_Host_HostError(HOST_ERROR_VBusVoltageDip);\r
+               EVENT_USB_Host_DeviceUnattached();\r

 \r
                USB_HostState = HOST_STATE_Unattached;\r
        }\r
 \r
                USB_HostState = HOST_STATE_Unattached;\r
        }\r


@@ -207,7 +192,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_INT_Clear(USB_INT_SRPI);\r
                USB_INT_Disable(USB_INT_SRPI);\r
        \r
                USB_INT_Clear(USB_INT_SRPI);\r
                USB_INT_Disable(USB_INT_SRPI);\r
        \r

-               EVENT_USB_DeviceAttached();\r
+               EVENT_USB_Host_DeviceAttached();\r

 \r
                USB_INT_Enable(USB_INT_DDISCI);\r
                \r
 \r
                USB_INT_Enable(USB_INT_DDISCI);\r
                \r


@@ -218,11 +203,8 @@ ISR(USB_GEN_vect, ISR_BLOCK)
        {\r
                USB_INT_Clear(USB_INT_BCERRI);\r
                \r
        {\r
                USB_INT_Clear(USB_INT_BCERRI);\r
                \r

-               EVENT_USB_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);\r
-               EVENT_USB_DeviceUnattached();\r
-               \r
-               if (USB_HostState != HOST_STATE_Unattached)\r
-                 EVENT_USB_Disconnect();\r
+               EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);\r
+               EVENT_USB_Host_DeviceUnattached();\r

 \r
                USB_ResetInterface();\r
        }\r
 \r
                USB_ResetInterface();\r
        }\r


@@ -234,32 +216,28 @@ 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
 \r
                if (USB_HostState != HOST_STATE_Unattached)\r

-               {\r
-                       EVENT_USB_Disconnect();\r
-                       EVENT_USB_DeviceUnattached();\r
-               }\r
-       \r
-               EVENT_USB_Disconnect();\r
-\r
-               EVENT_USB_UIDChange();\r
+                 EVENT_USB_Host_DeviceUnattached();\r

                \r
                \r

+               USB_CurrentMode = USB_GetUSBModeFromUID();\r
+               EVENT_USB_UIDChange();\r
+\r

                USB_ResetInterface();\r
        }\r
        #endif\r
 }\r
 \r
 #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
                USB_ResetInterface();\r
        }\r
        #endif\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