X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/c5038f1bf44aea75f1ae1ed035cb7d523ccfdacb..05fcf7e2a79bebb978d4aeaef26b12f70c6826f8:/LUFA/Drivers/USB/LowLevel/LowLevel.c

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index e6791098a..eb8ee1eef 100644
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -125,7 +125,7 @@ void USB_ShutDown(void)
 
 	USB_IsInitialized = false;
 
-	#if defined(CAN_BE_BOTH)
+	#if defined(USB_CAN_BE_BOTH)
 	USB_CurrentMode = USB_MODE_NONE;
 	#endif
 }
@@ -142,8 +142,14 @@ void USB_ResetInterface(void)
 	#if defined(USB_CAN_BE_DEVICE)
 	USB_DeviceState = DEVICE_STATE_Unattached;
 	USB_ConfigurationNumber  = 0;
-	USB_RemoteWakeupEnabled  = false;
-	USB_CurrentlySelfPowered = false;
+
+	#if !defined(NO_DEVICE_REMOTE_WAKEUP)
+		USB_RemoteWakeupEnabled  = false;
+	#endif
+	
+	#if !defined(NO_DEVICE_SELF_POWER)
+		USB_CurrentlySelfPowered = false;
+	#endif
 	#endif
 	
 	if (!(USB_Options & USB_OPT_MANUAL_PLL))
@@ -213,10 +219,6 @@ void USB_ResetInterface(void)
 		#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(CONTROL_ONLY_DEVICE)
-		UENUM = ENDPOINT_CONTROLEP;
-		#endif
 	#elif defined(USB_HOST_ONLY)
 	USB_Host_HostMode_On();