Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[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 3d99b25..a5452fd 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -66,10 +66,12 @@ void USB_Host_ProcessNextHostState(void)
                        USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;\r
                        break;\r
                case HOST_STATE_Powered_WaitForDeviceSettle:\r
-                       #if HOST_DEVICE_SETTLE_DELAY_MS > 0\r
-                       _delay_ms(1);\r
-\r
-                       if (!(WaitMSRemaining--))\r
+                       if (WaitMSRemaining--)\r
+                       {\r
+                               _delay_ms(1);\r
+                               break;\r
+                       }\r
+                       else\r
                        {\r
                                USB_Host_VBUS_Manual_Off();\r
 \r
@@ -79,9 +81,6 @@ void USB_Host_ProcessNextHostState(void)
                                \r
                                USB_HostState = HOST_STATE_Powered_WaitForConnect;\r
                        }\r
-                       #else\r
-                       USB_HostState = HOST_STATE_Powered_WaitForConnect;                      \r
-                       #endif\r
                        \r
                        break;\r
                case HOST_STATE_Powered_WaitForConnect:         \r
@@ -92,8 +91,6 @@ void USB_Host_ProcessNextHostState(void)
 \r
                                USB_INT_Clear(USB_INT_VBERRI);\r
                                USB_INT_Enable(USB_INT_VBERRI);\r
-\r
-                               EVENT_USB_Connect();\r
                                        \r
                                USB_Host_ResumeBus();\r
                                Pipe_ClearPipes();\r
@@ -139,11 +136,7 @@ void USB_Host_ProcessNextHostState(void)
                                break;\r
                        }\r
 \r
-                       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
                        USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];\r
-                       #else\r
-                       USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, bMaxPacketSize0)];                   \r
-                       #endif\r
        \r
                        USB_Host_ResetDevice();\r
                        \r
@@ -185,19 +178,18 @@ void USB_Host_ProcessNextHostState(void)
                case HOST_STATE_Default_PostAddressSet:\r
                        USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
 \r
-                       EVENT_USB_DeviceEnumerationComplete();\r
+                       EVENT_USB_Host_DeviceEnumerationComplete();\r
                        USB_HostState = HOST_STATE_Addressed;\r
                        break;\r
        }\r
 \r
        if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
        {\r
-               EVENT_USB_DeviceEnumerationFailed(ErrorCode, SubErrorCode);\r
+               EVENT_USB_Host_DeviceEnumerationFailed(ErrorCode, SubErrorCode);\r
 \r
                USB_Host_VBUS_Auto_Off();\r
 \r
-               EVENT_USB_DeviceUnattached();\r
-               EVENT_USB_Disconnect();\r
+               EVENT_USB_Host_DeviceUnattached();\r
 \r
                USB_ResetInterface();\r
        }\r
@@ -304,11 +296,11 @@ uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)
 {\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
-                       bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                       bRequest:      REQ_GetDescriptor,\r
-                       wValue:        (DTYPE_Device << 8),\r
-                       wIndex:        0,\r
-                       wLength:       sizeof(USB_Descriptor_Device_t),\r
+                       .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                       .bRequest      = REQ_GetDescriptor,\r
+                       .wValue        = (DTYPE_Device << 8),\r
+                       .wIndex        = 0,\r
+                       .wLength       = sizeof(USB_Descriptor_Device_t),\r
                };\r
 \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
@@ -316,10 +308,26 @@ uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)
        return USB_Host_SendControlRequest(DeviceDescriptorPtr);\r
 }\r
 \r
+uint8_t USB_Host_GetDeviceStringDescriptor(uint8_t Index, void* const Buffer, uint8_t BufferLength)\r
+{\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+               {\r
+                       .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                       .bRequest      = REQ_GetDescriptor,\r
+                       .wValue        = (DTYPE_String << 8) | Index,\r
+                       .wIndex        = 0,\r
+                       .wLength       = BufferLength,\r
+               };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(Buffer);\r
+}\r
+\r
 uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)\r
 {\r
        if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)\r
-         EndpointNum |= (1 << 7);\r
+         EndpointNum |= ENDPOINT_DESCRIPTOR_DIR_IN;\r
 \r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r