Slight changes to TeensyHID bootloader to ensure it builds under the 2KB boundary.

[pub/lufa.git] / LUFA / Drivers / USB / LowLevel / LowLevel.c

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index cd7fa89..41d9e10 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
                #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


@@ -120,29 +118,9 @@ void USB_ShutDown(void)
          EVENT_USB_Disconnect();\r
        #endif\r
 \r
          EVENT_USB_Disconnect();\r
        #endif\r
 \r

+       USB_ResetInterface();\r

        USB_Detach();\r
        USB_Detach();\r

-\r
-       USB_INT_DisableAllInterrupts();\r
-       USB_INT_ClearAllInterrupts();\r
-\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_DeviceState = DEVICE_STATE_Unattached;\r
-       USB_ConfigurationNumber  = 0;\r
-       USB_RemoteWakeupEnabled  = false;\r
-       USB_CurrentlySelfPowered = false;\r
-       #endif\r
-\r
-       #if defined(CAN_BE_BOTH)\r
-       USB_CurrentMode = USB_MODE_NONE;\r
-       #endif\r
-\r
-       USB_Interface_Disable();\r
+       USB_Controller_Disable();\r

        USB_PLL_Off();\r
        \r
        #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
        USB_PLL_Off();\r
        \r
        #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r


@@ -152,6 +130,12 @@ void USB_ShutDown(void)
        #if defined(USB_CAN_BE_BOTH)\r
        UHWCON &= ~(1 << UIDE);\r
        #endif\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
 \r
 void USB_ResetInterface(void)\r


@@ -180,7 +164,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