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 255a6ef..3ad1e98 100644 (file)
--- 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;\r
 #endif\r
 \r
 volatile uint8_t USB_Options;\r
 #endif\r
 \r

-volatile bool FrameElapsed;\r
-\r

 void USB_Init(\r
                #if defined(USB_CAN_BE_BOTH)\r
                const uint8_t Mode\r
 void USB_Init(\r
                #if defined(USB_CAN_BE_BOTH)\r
                const uint8_t Mode\r


@@ -56,8 +54,6 @@ void USB_Init(
                #endif\r
                )\r
 {\r
                #endif\r
                )\r
 {\r

-       USB_ShutDown();\r
-\r

        #if defined(USB_CAN_BE_BOTH)\r
        USB_CurrentMode = Mode;\r
        #endif\r
        #if defined(USB_CAN_BE_BOTH)\r
        USB_CurrentMode = Mode;\r
        #endif\r


@@ -70,7 +66,7 @@ void USB_Init(
        USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
        #endif\r
        \r
        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
        UHWCON |= (1 << UIMOD);\r
        #elif defined(USB_HOST_ONLY)\r
        UHWCON &= ~(1 << UIMOD);\r


@@ -101,7 +97,7 @@ void USB_Init(
        \r
        USB_ResetInterface();\r
 \r
        \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
        USB_OTGPAD_On();\r
        #endif\r
 \r


@@ -112,64 +108,57 @@ void USB_Init(
 \r
 void USB_ShutDown(void)\r
 {\r
 \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
        #if defined(USB_CAN_BE_DEVICE)\r

-       USB_ConfigurationNumber = 0;\r
+       if (USB_DeviceState != DEVICE_STATE_Unattached)\r
+         EVENT_USB_Disconnect();\r

        #endif\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
        #endif\r
 \r

-       USB_Interface_Disable();\r
-       USB_PLL_Off();\r
+       USB_ResetInterface();\r
+       USB_Detach();\r
+       USB_Controller_Disable();\r
+       \r
+       if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
+         USB_PLL_Off();\r

        \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_Off();\r
        #endif\r
 \r
        #if defined(USB_CAN_BE_BOTH)\r
        UHWCON &= ~(1 << UIDE);\r
        #endif\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
 \r
 void USB_ResetInterface(void)\r
 {\r
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\r

-\r
-       FrameElapsed = false;\r
-\r
-       USB_IsConnected = false;\r
-\r
+       \r

        #if defined(USB_CAN_BE_HOST)\r
        #if defined(USB_CAN_BE_HOST)\r

-       USB_HostState = HOST_STATE_Unattached;\r
+       USB_HostState   = HOST_STATE_Unattached;\r

        #endif\r
        #endif\r

-\r
+       \r

        #if defined(USB_CAN_BE_DEVICE)\r
        #if defined(USB_CAN_BE_DEVICE)\r

+       USB_DeviceState = DEVICE_STATE_Unattached;\r

        USB_ConfigurationNumber  = 0;\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
        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
                PLLFRQ = ((1 << PLLUSB) | (1 << PDIV3) | (1 << PDIV1));\r
                #endif\r
 \r


@@ -177,7 +166,7 @@ void USB_ResetInterface(void)
                while (!(USB_PLL_IsReady()));\r
        }\r
        \r
                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
        \r
        #if defined(USB_CAN_BE_BOTH)\r
        if (UHWCON & (1 << UIDE))\r


@@ -190,16 +179,18 @@ void USB_ResetInterface(void)
                \r
        if (!(USB_Options & USB_OPT_REG_DISABLED))\r
          USB_REG_On();\r
                \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
        \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
        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
                  \r
                USB_INT_Enable(USB_INT_VBUS);\r
        }\r


@@ -228,8 +219,6 @@ void USB_ResetInterface(void)
        #if defined(USB_DEVICE_ONLY)    \r
        USB_INT_Enable(USB_INT_SUSPEND);\r
        USB_INT_Enable(USB_INT_EORSTI);\r
        #if defined(USB_DEVICE_ONLY)    \r
        USB_INT_Enable(USB_INT_SUSPEND);\r
        USB_INT_Enable(USB_INT_EORSTI);\r

-       USB_INT_Enable(USB_INT_SOFI);\r
-\r

        #if defined(CONTROL_ONLY_DEVICE)\r
        UENUM = ENDPOINT_CONTROLEP;\r
        #endif\r
        #if defined(CONTROL_ONLY_DEVICE)\r
        UENUM = ENDPOINT_CONTROLEP;\r
        #endif\r


@@ -245,13 +234,11 @@ void USB_ResetInterface(void)
        \r
        USB_INT_Enable(USB_INT_SRPI);\r
        USB_INT_Enable(USB_INT_BCERRI);\r
        \r
        USB_INT_Enable(USB_INT_SRPI);\r
        USB_INT_Enable(USB_INT_BCERRI);\r

-       USB_INT_Enable(USB_INT_HSOFI);\r

        #else\r
        if (USB_CurrentMode == USB_MODE_DEVICE)\r
        {\r
                USB_INT_Enable(USB_INT_SUSPEND);\r
                USB_INT_Enable(USB_INT_EORSTI);\r
        #else\r
        if (USB_CurrentMode == USB_MODE_DEVICE)\r
        {\r
                USB_INT_Enable(USB_INT_SUSPEND);\r
                USB_INT_Enable(USB_INT_EORSTI);\r

-               USB_INT_Enable(USB_INT_SOFI);\r

 \r
                #if defined(CONTROL_ONLY_DEVICE)\r
                UENUM = ENDPOINT_CONTROLEP;\r
 \r
                #if defined(CONTROL_ONLY_DEVICE)\r
                UENUM = ENDPOINT_CONTROLEP;\r


@@ -269,7 +256,6 @@ void USB_ResetInterface(void)
                \r
                USB_INT_Enable(USB_INT_SRPI);\r
                USB_INT_Enable(USB_INT_BCERRI);\r
                \r
                USB_INT_Enable(USB_INT_SRPI);\r
                USB_INT_Enable(USB_INT_BCERRI);\r

-               USB_INT_Enable(USB_INT_HSOFI);\r

        }\r
        #endif\r
 }\r
        }\r
        #endif\r
 }\r