X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7c5444b89a49df7cb671b0b041567990d2a3012e..d0db78432fc02bacbd57cc9f15eb05b4e56981cb:/LUFA/Drivers/USB/LowLevel/LowLevel.c

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index 82705db96..4fcf4fcab 100644
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -38,8 +38,6 @@ volatile uint8_t USB_CurrentMode = USB_MODE_NONE;
 volatile uint8_t USB_Options;
 #endif
 
-volatile bool FrameElapsed;
-
 void USB_Init(
                #if defined(USB_CAN_BE_BOTH)
                const uint8_t Mode
@@ -70,7 +68,7 @@ void USB_Init(
 	USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
 	#endif
 	
-	#if defined(USB_DEVICE_ONLY) && defined(USB_FULL_CONTROLLER)
+	#if defined(USB_DEVICE_ONLY) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
 	UHWCON |= (1 << UIMOD);
 	#elif defined(USB_HOST_ONLY)
 	UHWCON &= ~(1 << UIMOD);
@@ -101,7 +99,7 @@ void USB_Init(
 	
 	USB_ResetInterface();
 
-	#if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)
+	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
 	USB_OTGPAD_On();
 	#endif
 
@@ -138,7 +136,7 @@ void USB_ShutDown(void)
 	USB_Interface_Disable();
 	USB_PLL_Off();
 	
-	#if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)
+	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
 	USB_OTGPAD_Off();
 	#endif
 
@@ -152,8 +150,6 @@ void USB_ResetInterface(void)
 	USB_INT_DisableAllInterrupts();
 	USB_INT_ClearAllInterrupts();
 
-	FrameElapsed = false;
-
 	USB_IsConnected = false;
 
 	#if defined(USB_CAN_BE_HOST)
@@ -169,7 +165,7 @@ void USB_ResetInterface(void)
 	
 	if (!(USB_Options & USB_OPT_MANUAL_PLL))
 	{
-		#if defined(USB_MODIFIED_FULL_CONTROLLER)
+		#if defined(USB_SERIES_4_AVR)
 		PLLFRQ = ((1 << PLLUSB) | (1 << PDIV3) | (1 << PDIV1));
 		#endif
 
@@ -190,10 +186,12 @@ void USB_ResetInterface(void)
 		
 	if (!(USB_Options & USB_OPT_REG_DISABLED))
 	  USB_REG_On();
+	else
+	  USB_REG_Off();
 	
 	USB_CLK_Unfreeze();
 
-	#if (defined(USB_CAN_BE_DEVICE) && (defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)))
+	#if (defined(USB_CAN_BE_DEVICE) && (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)))
 	if (USB_CurrentMode == USB_MODE_DEVICE)
 	{
 		if (USB_Options & USB_DEVICE_OPT_LOWSPEED)