Removed two-step endpoint/pipe bank clear and switch sequence for smaller, faster...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / LowLevel.c

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index f4f277c..c9d0493 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -113,9 +113,18 @@ void USB_ShutDown(void)
        USB_Detach();\r
        USB_Controller_Disable();\r
        \r
        USB_Detach();\r
        USB_Controller_Disable();\r
        \r

+       USB_INT_DisableAllInterrupts();\r
+       USB_INT_ClearAllInterrupts();\r
+\r
+       #if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
+       UHWCON &= ~(1 << UIMOD);\r
+       #endif\r
+       \r

        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_REG_Off();\r
+\r

        #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
        USB_OTGPAD_Off();\r
        #endif\r
        #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
        USB_OTGPAD_Off();\r
        #endif\r


@@ -145,11 +154,11 @@ void USB_ResetInterface(void)
        USB_ConfigurationNumber  = 0;\r
 \r
        #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
        USB_ConfigurationNumber  = 0;\r
 \r
        #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r

-               USB_RemoteWakeupEnabled  = false;\r
+       USB_RemoteWakeupEnabled  = false;\r

        #endif\r
        \r
        #if !defined(NO_DEVICE_SELF_POWER)\r
        #endif\r
        \r
        #if !defined(NO_DEVICE_SELF_POWER)\r

-               USB_CurrentlySelfPowered = false;\r
+       USB_CurrentlySelfPowered = false;\r

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


@@ -217,9 +226,9 @@ void USB_ResetInterface(void)
        USB_INT_Clear(USB_INT_EORSTI);\r
        USB_INT_Enable(USB_INT_EORSTI);\r
 \r
        USB_INT_Clear(USB_INT_EORSTI);\r
        USB_INT_Enable(USB_INT_EORSTI);\r
 \r

-               #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
-               USB_INT_Enable(USB_INT_VBUS);\r
-               #endif\r
+       #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
+       USB_INT_Enable(USB_INT_VBUS);\r
+       #endif\r

        #elif defined(USB_HOST_ONLY)\r
        USB_Host_HostMode_On();\r
        \r
        #elif defined(USB_HOST_ONLY)\r
        USB_Host_HostMode_On();\r
        \r