Added new USB_DeviceState variable to keep track of the current Device mode USB state.

[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 4fcf4fc..cd7fa89 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -110,15 +110,21 @@ void USB_Init(
 \r
 void USB_ShutDown(void)\r
 {\r
 \r
 void USB_ShutDown(void)\r
 {\r

-       if (USB_IsConnected)\r
+       #if defined(USB_CAN_BE_DEVICE)\r
+       if (USB_DeviceState != DEVICE_STATE_Unattached)\r
+         EVENT_USB_Disconnect();\r
+       #endif\r
+       \r
+       #if defined(USB_CAN_BE_HOST)\r
+       if (USB_HostState != HOST_STATE_Unattached)\r

          EVENT_USB_Disconnect();\r
          EVENT_USB_Disconnect();\r

+       #endif\r

 \r
        USB_Detach();\r
 \r
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\r
 \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_IsInitialized = false;\r
 \r
        #if defined(USB_CAN_BE_HOST)\r


@@ -126,7 +132,10 @@ void USB_ShutDown(void)
        #endif\r
 \r
        #if defined(USB_CAN_BE_DEVICE)\r
        #endif\r
 \r
        #if defined(USB_CAN_BE_DEVICE)\r

-       USB_ConfigurationNumber = 0;\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
        #endif\r
 \r
        #if defined(CAN_BE_BOTH)\r


@@ -149,16 +158,14 @@ void USB_ResetInterface(void)
 {\r
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\r
 {\r
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\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
        USB_RemoteWakeupEnabled  = false;\r
        USB_CurrentlySelfPowered = false;\r
        #endif\r