Fix build error in TestApp demo caused by previous commit.

[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 16a50ac..3ad1e98 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -54,8 +54,6 @@ void USB_Init(
                #endif\r
                )\r
 {\r
-       USB_ShutDown();\r
-\r
        #if defined(USB_CAN_BE_BOTH)\r
        USB_CurrentMode = Mode;\r
        #endif\r
@@ -68,7 +66,7 @@ void USB_Init(
        USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
        #endif\r
        \r
-       #if defined(USB_DEVICE_ONLY) && defined(USB_FULL_CONTROLLER)\r
+       #if defined(USB_DEVICE_ONLY) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
        UHWCON |= (1 << UIMOD);\r
        #elif defined(USB_HOST_ONLY)\r
        UHWCON &= ~(1 << UIMOD);\r
@@ -99,7 +97,7 @@ void USB_Init(
        \r
        USB_ResetInterface();\r
 \r
-       #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
+       #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
        USB_OTGPAD_On();\r
        #endif\r
 \r
@@ -110,62 +108,57 @@ void USB_Init(
 \r
 void USB_ShutDown(void)\r
 {\r
-       if (USB_IsConnected)\r
-         EVENT_USB_Disconnect();\r
-\r
-       USB_Detach();\r
-\r
-       USB_INT_DisableAllInterrupts();\r
-       USB_INT_ClearAllInterrupts();\r
-\r
-       USB_IsConnected   = false;\r
-       USB_IsInitialized = false;\r
-\r
-       #if defined(USB_CAN_BE_HOST)\r
-       USB_HostState = HOST_STATE_Unattached;\r
-       #endif\r
-\r
        #if defined(USB_CAN_BE_DEVICE)\r
-       USB_ConfigurationNumber = 0;\r
+       if (USB_DeviceState != DEVICE_STATE_Unattached)\r
+         EVENT_USB_Disconnect();\r
        #endif\r
-\r
-       #if defined(CAN_BE_BOTH)\r
-       USB_CurrentMode = USB_MODE_NONE;\r
+       \r
+       #if defined(USB_CAN_BE_HOST)\r
+       if (USB_HostState != HOST_STATE_Unattached)\r
+         EVENT_USB_Disconnect();\r
        #endif\r
 \r
-       USB_Interface_Disable();\r
-       USB_PLL_Off();\r
+       USB_ResetInterface();\r
+       USB_Detach();\r
+       USB_Controller_Disable();\r
        \r
-       #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
+       if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
+         USB_PLL_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
 \r
        #if defined(USB_CAN_BE_BOTH)\r
        UHWCON &= ~(1 << UIDE);\r
        #endif\r
+\r
+       USB_IsInitialized = false;\r
+\r
+       #if defined(CAN_BE_BOTH)\r
+       USB_CurrentMode = USB_MODE_NONE;\r
+       #endif\r
 }\r
 \r
 void USB_ResetInterface(void)\r
 {\r
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\r
-\r
-       USB_IsConnected = false;\r
-\r
+       \r
        #if defined(USB_CAN_BE_HOST)\r
-       USB_HostState = HOST_STATE_Unattached;\r
+       USB_HostState   = HOST_STATE_Unattached;\r
        #endif\r
-\r
+       \r
        #if defined(USB_CAN_BE_DEVICE)\r
+       USB_DeviceState = DEVICE_STATE_Unattached;\r
        USB_ConfigurationNumber  = 0;\r
-       USB_IsSuspended          = false;\r
        USB_RemoteWakeupEnabled  = false;\r
        USB_CurrentlySelfPowered = false;\r
        #endif\r
        \r
        if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
        {\r
-               #if defined(USB_MODIFIED_FULL_CONTROLLER)\r
+               #if defined(USB_SERIES_4_AVR)\r
                PLLFRQ = ((1 << PLLUSB) | (1 << PDIV3) | (1 << PDIV1));\r
                #endif\r
 \r
@@ -173,7 +166,7 @@ void USB_ResetInterface(void)
                while (!(USB_PLL_IsReady()));\r
        }\r
        \r
-       USB_Interface_Reset();\r
+       USB_Controller_Reset();\r
        \r
        #if defined(USB_CAN_BE_BOTH)\r
        if (UHWCON & (1 << UIDE))\r
@@ -186,16 +179,18 @@ void USB_ResetInterface(void)
                \r
        if (!(USB_Options & USB_OPT_REG_DISABLED))\r
          USB_REG_On();\r
+       else\r
+         USB_REG_Off();\r
        \r
        USB_CLK_Unfreeze();\r
 \r
-       #if (defined(USB_CAN_BE_DEVICE) && (defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)))\r
+       #if (defined(USB_CAN_BE_DEVICE) && (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)))\r
        if (USB_CurrentMode == USB_MODE_DEVICE)\r
        {\r
                if (USB_Options & USB_DEVICE_OPT_LOWSPEED)\r
                  USB_Device_SetLowSpeed();\r
                else\r
-                 USB_Device_SetHighSpeed();\r
+                 USB_Device_SetFullSpeed();\r
                  \r
                USB_INT_Enable(USB_INT_VBUS);\r
        }\r