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 eb8ee1e..a088654 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -28,6 +28,7 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "LowLevel.h"\r
 \r
 #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))\r
@@ -102,8 +103,6 @@ void USB_Init(
        #endif\r
 \r
        USB_IsInitialized = true;\r
-\r
-       sei();\r
 }\r
 \r
 void USB_ShutDown(void)\r
@@ -112,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
@@ -144,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
@@ -216,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