Fixed incorrect comparison in the descriptor callback routine of the TeensyHID bootlo...

[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 0d220ce..a088654 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -39,10 +39,6 @@ volatile uint8_t USB_CurrentMode = USB_MODE_NONE;
 volatile uint8_t USB_Options;\r
 #endif\r
 \r
-#if defined(__AVR32__) && !defined(CONTROL_ONLY_DEVICE)\r
-uint8_t USB_SelectedEPNumber;\r
-#endif\r
-\r
 void USB_Init(\r
                #if defined(USB_CAN_BE_BOTH)\r
                const uint8_t Mode\r
@@ -59,10 +55,6 @@ void USB_Init(
                #endif\r
                )\r
 {\r
-       #if defined(__AVR32__)\r
-       USB_SelectedEPNumber = 0;\r
-       #endif\r
-\r
        #if defined(USB_CAN_BE_BOTH)\r
        USB_CurrentMode = Mode;\r
        #endif\r
@@ -111,8 +103,6 @@ void USB_Init(
        #endif\r
 \r
        USB_IsInitialized = true;\r
-\r
-       sei();\r
 }\r
 \r
 void USB_ShutDown(void)\r
@@ -121,9 +111,18 @@ void USB_ShutDown(void)
        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
+       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
@@ -153,11 +152,11 @@ void USB_ResetInterface(void)
        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
-               USB_CurrentlySelfPowered = false;\r
+       USB_CurrentlySelfPowered = false;\r
        #endif\r
        #endif\r
        \r
@@ -225,9 +224,9 @@ void USB_ResetInterface(void)
        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