X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/8b7565956380c558bb309732c1d7d2cb58b193ea..fc31973daffea3506051ce51a5f79383ce0867d6:/LUFA/Drivers/USB/LowLevel/LowLevel.c

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index eb8ee1eef..a088654f7 100644
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -28,6 +28,7 @@
   this software.
 */
 
+#define  __INCLUDE_FROM_USB_DRIVER
 #include "LowLevel.h"
 
 #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
@@ -102,8 +103,6 @@ void USB_Init(
 	#endif
 
 	USB_IsInitialized = true;
-
-	sei();
 }
 
 void USB_ShutDown(void)
@@ -112,9 +111,18 @@ void USB_ShutDown(void)
 	USB_Detach();
 	USB_Controller_Disable();
 	
+	USB_INT_DisableAllInterrupts();
+	USB_INT_ClearAllInterrupts();
+
+	#if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
+	UHWCON &= ~(1 << UIMOD);
+	#endif
+	
 	if (!(USB_Options & USB_OPT_MANUAL_PLL))
 	  USB_PLL_Off();
 	
+	USB_REG_Off();
+
 	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
 	USB_OTGPAD_Off();
 	#endif
@@ -144,11 +152,11 @@ void USB_ResetInterface(void)
 	USB_ConfigurationNumber  = 0;
 
 	#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-		USB_RemoteWakeupEnabled  = false;
+	USB_RemoteWakeupEnabled  = false;
 	#endif
 	
 	#if !defined(NO_DEVICE_SELF_POWER)
-		USB_CurrentlySelfPowered = false;
+	USB_CurrentlySelfPowered = false;
 	#endif
 	#endif
 	
@@ -216,9 +224,9 @@ void USB_ResetInterface(void)
 	USB_INT_Clear(USB_INT_EORSTI);
 	USB_INT_Enable(USB_INT_EORSTI);
 
-		#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-		USB_INT_Enable(USB_INT_VBUS);
-		#endif
+	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
+	USB_INT_Enable(USB_INT_VBUS);
+	#endif
 	#elif defined(USB_HOST_ONLY)
 	USB_Host_HostMode_On();