Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...

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