Minor updates to the Benito programmer - remove redundant PORT register manipulations.

[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 14d277c..20545a4 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -32,9 +32,9 @@
 \r
 void USB_INT_DisableAllInterrupts(void)\r
 {\r
 \r
 void USB_INT_DisableAllInterrupts(void)\r
 {\r

-       #if defined(USB_FULL_CONTROLLER)\r
+       #if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r

        USBCON &= ~((1 << VBUSTE) | (1 << IDTE));                               \r
        USBCON &= ~((1 << VBUSTE) | (1 << IDTE));                               \r

-       #elif defined(USB_MODIFIED_FULL_CONTROLLER)\r
+       #elif defined(USB_SERIES_4_AVR)\r

        USBCON &= ~(1 << VBUSTE);                                       \r
        #endif\r
        \r
        USBCON &= ~(1 << VBUSTE);                                       \r
        #endif\r
        \r


@@ -50,7 +50,7 @@ void USB_INT_DisableAllInterrupts(void)
 \r
 void USB_INT_ClearAllInterrupts(void)\r
 {\r
 \r
 void USB_INT_ClearAllInterrupts(void)\r
 {\r

-       #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
+       #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r

        USBINT  = 0;\r
        #endif\r
        \r
        USBINT  = 0;\r
        #endif\r
        \r


@@ -67,38 +67,36 @@ void USB_INT_ClearAllInterrupts(void)
 ISR(USB_GEN_vect, ISR_BLOCK)\r
 {\r
        #if defined(USB_CAN_BE_DEVICE)\r
 ISR(USB_GEN_vect, ISR_BLOCK)\r
 {\r
        #if defined(USB_CAN_BE_DEVICE)\r

-       #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
+       #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r

        if (USB_INT_HasOccurred(USB_INT_VBUS) && USB_INT_IsEnabled(USB_INT_VBUS))\r
        {\r
                USB_INT_Clear(USB_INT_VBUS);\r
 \r
        if (USB_INT_HasOccurred(USB_INT_VBUS) && USB_INT_IsEnabled(USB_INT_VBUS))\r
        {\r
                USB_INT_Clear(USB_INT_VBUS);\r
 \r

-               RAISE_EVENT(USB_VBUSChange);\r
+               EVENT_USB_VBUSChange();\r

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

-                       RAISE_EVENT(USB_VBUSConnect);\r
+                       EVENT_USB_VBUSConnect();\r

                        \r
                        \r

-                       if (USB_IsConnected)\r
-                         RAISE_EVENT(USB_Disconnect);\r
+                       if (USB_DeviceState != DEVICE_STATE_Unattached)\r
+                         EVENT_USB_Disconnect();\r

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

-                               \r
-                       USB_IsConnected = true;\r

 \r
 \r

-                       RAISE_EVENT(USB_Connect);\r
+                       USB_DeviceState = DEVICE_STATE_Powered;\r
+                       EVENT_USB_Connect();\r

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

-                       RAISE_EVENT(USB_Disconnect);\r
+                       USB_DeviceState = DEVICE_STATE_Unattached;\r
+                       EVENT_USB_Disconnect();\r

                \r
                        USB_Detach();\r
                        USB_CLK_Freeze();\r
                        USB_PLL_Off();\r
                        USB_REG_Off();\r
 \r
                \r
                        USB_Detach();\r
                        USB_CLK_Freeze();\r
                        USB_PLL_Off();\r
                        USB_REG_Off();\r
 \r

-                       USB_IsConnected = false;\r
-\r
-                       RAISE_EVENT(USB_VBUSDisconnect);\r
+                       EVENT_USB_VBUSDisconnect();\r

                        \r
                        USB_INT_Clear(USB_INT_VBUS);\r
                }\r
                        \r
                        USB_INT_Clear(USB_INT_VBUS);\r
                }\r


@@ -117,16 +115,12 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
                  USB_PLL_Off();\r
 \r
                if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
                  USB_PLL_Off();\r
 \r

-               USB_IsSuspended = true;\r
-\r
-               RAISE_EVENT(USB_Suspend);\r
-\r
-               #if defined(USB_LIMITED_CONTROLLER) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
-               if (USB_IsConnected)\r
-               {\r
-                       USB_IsConnected = false;\r
-                       RAISE_EVENT(USB_Disconnect);\r
-               }\r
+               #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
+               USB_DeviceState = DEVICE_STATE_Unattached;\r
+               EVENT_USB_Disconnect();\r
+               #else\r
+               USB_DeviceState = DEVICE_STATE_Suspended;\r
+               EVENT_USB_Suspend();\r

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


@@ -145,23 +139,20 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_INT_Disable(USB_INT_WAKEUP);\r
                USB_INT_Enable(USB_INT_SUSPEND);\r
                \r
                USB_INT_Disable(USB_INT_WAKEUP);\r
                USB_INT_Enable(USB_INT_SUSPEND);\r
                \r

-               #if defined(USB_LIMITED_CONTROLLER) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
-               if (!(USB_IsConnected))\r
-               {\r
-                       USB_IsConnected = true;\r
-                       RAISE_EVENT(USB_Connect);\r
-               }\r
+               #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
+               USB_DeviceState = DEVICE_STATE_Powered;\r
+               EVENT_USB_Connect();\r
+               #else\r
+               USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r
+               EVENT_USB_WakeUp();             \r

                #endif\r
                #endif\r

-\r
-               USB_IsSuspended = false;\r
-\r
-               RAISE_EVENT(USB_WakeUp);\r

        }\r
    \r
        if (USB_INT_HasOccurred(USB_INT_EORSTI) && USB_INT_IsEnabled(USB_INT_EORSTI))\r
        {\r
                USB_INT_Clear(USB_INT_EORSTI);\r
 \r
        }\r
    \r
        if (USB_INT_HasOccurred(USB_INT_EORSTI) && USB_INT_IsEnabled(USB_INT_EORSTI))\r
        {\r
                USB_INT_Clear(USB_INT_EORSTI);\r
 \r

+               USB_DeviceState         = DEVICE_STATE_Default;\r

                USB_ConfigurationNumber = 0;\r
 \r
                USB_INT_Clear(USB_INT_SUSPEND);\r
                USB_ConfigurationNumber = 0;\r
 \r
                USB_INT_Clear(USB_INT_SUSPEND);\r


@@ -178,7 +169,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_INT_Enable(USB_INT_ENDPOINT_SETUP);\r
                #endif\r
 \r
                USB_INT_Enable(USB_INT_ENDPOINT_SETUP);\r
                #endif\r
 \r

-               RAISE_EVENT(USB_Reset);\r
+               EVENT_USB_Reset();\r

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


@@ -189,8 +180,8 @@ 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

-               RAISE_EVENT(USB_DeviceUnattached);\r
-               RAISE_EVENT(USB_Disconnect);\r
+               EVENT_USB_DeviceUnattached();\r
+               EVENT_USB_Disconnect();\r

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


@@ -202,8 +193,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

-               RAISE_EVENT(USB_HostError, HOST_ERROR_VBusVoltageDip);\r
-               RAISE_EVENT(USB_DeviceUnattached);\r
+               EVENT_USB_HostError(HOST_ERROR_VBusVoltageDip);\r
+               EVENT_USB_DeviceUnattached();\r

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


@@ -213,22 +204,22 @@ 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

-               RAISE_EVENT(USB_DeviceAttached);\r
+               EVENT_USB_DeviceAttached();\r

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

-               USB_HostState = HOST_STATE_Attached;\r
+               USB_HostState = HOST_STATE_Powered;\r

        }\r
 \r
        if (USB_INT_HasOccurred(USB_INT_BCERRI) && USB_INT_IsEnabled(USB_INT_BCERRI))\r
        {\r
                USB_INT_Clear(USB_INT_BCERRI);\r
                \r
        }\r
 \r
        if (USB_INT_HasOccurred(USB_INT_BCERRI) && USB_INT_IsEnabled(USB_INT_BCERRI))\r
        {\r
                USB_INT_Clear(USB_INT_BCERRI);\r
                \r

-               RAISE_EVENT(USB_DeviceEnumerationFailed, HOST_ENUMERROR_NoDeviceDetected, 0);\r
-               RAISE_EVENT(USB_DeviceUnattached);\r
+               EVENT_USB_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);\r
+               EVENT_USB_DeviceUnattached();\r

                \r
                \r

-               if (USB_IsConnected)\r
-                 RAISE_EVENT(USB_Disconnect);\r
+               if (USB_HostState != HOST_STATE_Unattached)\r
+                 EVENT_USB_Disconnect();\r

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


@@ -239,15 +230,18 @@ ISR(USB_GEN_vect, ISR_BLOCK)
        {               \r
                USB_INT_Clear(USB_INT_IDTI);\r
 \r
        {               \r
                USB_INT_Clear(USB_INT_IDTI);\r
 \r

-               if (USB_IsConnected)\r
+               if (USB_DeviceState != DEVICE_STATE_Unattached)\r
+                 EVENT_USB_Disconnect();\r
+\r
+               if (USB_HostState != HOST_STATE_Unattached)\r

                {\r
                {\r

-                       if (USB_CurrentMode == USB_MODE_HOST)\r
-                         RAISE_EVENT(USB_DeviceUnattached);\r
-                       else\r
-                         RAISE_EVENT(USB_Disconnect);\r
+                       EVENT_USB_Disconnect();\r
+                       EVENT_USB_DeviceUnattached();\r

                }\r
                }\r

+       \r
+               EVENT_USB_Disconnect();\r

 \r
 \r

-               RAISE_EVENT(USB_UIDChange);\r
+               EVENT_USB_UIDChange();\r

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