Finished CDC device class driver documentation.

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / Host.c

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index 9630b6a..5f3eeb8 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -55,7 +55,7 @@ void USB_Host_ProcessNextHostState(void)
                                        break;\r
                                }\r
                                \r
-                               if (!(WaitMSRemaining--))\r
+                               if (!(--WaitMSRemaining))\r
                                  USB_HostState = PostWaitState;\r
                        }\r
                \r
@@ -90,7 +90,7 @@ void USB_Host_ProcessNextHostState(void)
                                USB_INT_Enable(USB_INT_VBERRI);\r
 \r
                                USB_IsConnected = true;\r
-                               RAISE_EVENT(USB_Connect);\r
+                               EVENT_USB_Connect();\r
                                        \r
                                USB_Host_ResumeBus();\r
                                Pipe_ClearPipes();\r
@@ -184,7 +184,7 @@ void USB_Host_ProcessNextHostState(void)
                case HOST_STATE_Default_PostAddressSet:\r
                        USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
 \r
-                       RAISE_EVENT(USB_DeviceEnumerationComplete);\r
+                       EVENT_USB_DeviceEnumerationComplete();\r
                        USB_HostState = HOST_STATE_Addressed;\r
 \r
                        break;\r
@@ -192,14 +192,14 @@ void USB_Host_ProcessNextHostState(void)
 \r
        if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
        {\r
-               RAISE_EVENT(USB_DeviceEnumerationFailed, ErrorCode, SubErrorCode);\r
+               EVENT_USB_DeviceEnumerationFailed(ErrorCode, SubErrorCode);\r
 \r
                USB_Host_VBUS_Auto_Off();\r
 \r
-               RAISE_EVENT(USB_DeviceUnattached);\r
+               EVENT_USB_DeviceUnattached();\r
                \r
                if (USB_IsConnected)\r
-                 RAISE_EVENT(USB_Disconnect);\r
+                 EVENT_USB_Disconnect();\r
 \r
                USB_ResetInterface();\r
        }\r
@@ -210,7 +210,6 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
        bool    BusSuspended = USB_Host_IsBusSuspended();\r
        uint8_t ErrorCode    = HOST_WAITERROR_Successful;\r
        \r
-       USB_INT_Clear(USB_INT_HSOFI);\r
        USB_Host_ResumeBus();\r
 \r
        while (MS)\r
@@ -260,9 +259,10 @@ static void USB_Host_ResetDevice(void)
        USB_Host_ResetBus();\r
        while (!(USB_Host_IsBusResetComplete()));\r
 \r
+       USB_Host_ResumeBus();\r
+\r
        USB_INT_Clear(USB_INT_HSOFI);\r
-       USB_Host_ResumeBus();   \r
-       \r
+\r
        for (uint8_t MSRem = 10; MSRem != 0; MSRem--)\r
        {\r
                /* Workaround for powerless-pull-up devices. After a USB bus reset,\r
@@ -272,6 +272,7 @@ static void USB_Host_ResetDevice(void)
 \r
                if (USB_INT_HasOccurred(USB_INT_HSOFI))\r
                {\r
+                       USB_INT_Clear(USB_INT_HSOFI);\r
                        USB_INT_Clear(USB_INT_DDISCI);\r
                        break;\r
                }\r