Updated all host mode demos and projects to use the EVENT_USB_Host_DeviceEnumerationC...

[pub/USBasp.git] / LUFA / Drivers / USB / Core / UC3 / Host_UC3.c

diff --git a/LUFA/Drivers/USB/Core/UC3/Host_UC3.c b/LUFA/Drivers/USB/Core/UC3/Host_UC3.c
index 1dd2b57..a56ef48 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3/Host_UC3.c
+++ b/LUFA/Drivers/USB/Core/UC3/Host_UC3.c
@@ -137,7 +137,7 @@ void USB_Host_ProcessNextHostState(void)
                                break;\r
                        }\r
 \r
-                       USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];\r
+                       USB_Host_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];\r
 \r
                        USB_Host_ResetDevice();\r
 \r
@@ -146,7 +146,7 @@ void USB_Host_ProcessNextHostState(void)
                case HOST_STATE_Default_PostReset:\r
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,\r
                                           PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,\r
-                                          USB_ControlPipeSize, PIPE_BANK_SINGLE);\r
+                                          USB_Host_ControlPipeSize, PIPE_BANK_SINGLE);\r
 \r
                        if (!(Pipe_IsConfigured()))\r
                        {\r
@@ -175,8 +175,9 @@ void USB_Host_ProcessNextHostState(void)
                case HOST_STATE_Default_PostAddressSet:\r
                        USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
 \r
-                       EVENT_USB_Host_DeviceEnumerationComplete();\r
                        USB_HostState = HOST_STATE_Addressed;\r
+\r
+                       EVENT_USB_Host_DeviceEnumerationComplete();\r
                        break;\r
        }\r
 \r
@@ -253,6 +254,8 @@ static void USB_Host_ResetDevice(void)
        USB_Host_ResetBus();\r
        while (!(USB_Host_IsBusResetComplete()));\r
        USB_Host_ResumeBus();\r
+       \r
+       USB_Host_ConfigurationNumber = 0;\r
 \r
        bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);\r
 \r
@@ -285,88 +288,5 @@ static void USB_Host_ResetDevice(void)
        USB_INT_Enable(USB_INT_DDISCI);\r
 }\r
 \r
-uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber)\r
-{\r
-       USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                       .bRequest      = REQ_SetConfiguration,\r
-                       .wValue        = ConfigNumber,\r
-                       .wIndex        = 0,\r
-                       .wLength       = 0,\r
-               };\r
-\r
-       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
-       return USB_Host_SendControlRequest(NULL);\r
-}\r
-\r
-uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)\r
-{\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
-               };\r
-\r
-       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
-       return USB_Host_SendControlRequest(DeviceDescriptorPtr);\r
-}\r
-\r
-uint8_t USB_Host_GetDeviceStringDescriptor(const uint8_t Index,\r
-                                           void* const Buffer,\r
-                                           const 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(const uint8_t EndpointNum)\r
-{\r
-       USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),\r
-                       .bRequest      = REQ_ClearFeature,\r
-                       .wValue        = FEATURE_SEL_EndpointHalt,\r
-                       .wIndex        = EndpointNum,\r
-                       .wLength       = 0,\r
-               };\r
-\r
-       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
-       return USB_Host_SendControlRequest(NULL);\r
-}\r
-\r
-uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceIndex,\r
-                                        const uint8_t AltSetting)\r
-{\r
-       USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE),\r
-                       .bRequest      = REQ_SetInterface,\r
-                       .wValue        = AltSetting,\r
-                       .wIndex        = InterfaceIndex,\r
-                       .wLength       = 0,\r
-               };\r
-\r
-       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
-       return USB_Host_SendControlRequest(NULL);\r
-}\r
-\r
 #endif\r
 \r