Endpoint_ResetFIFO() renamed to Endpoint_ResetEndpoint(), to be consistent with the...

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

diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index f0c336e..4ee2fce 100644 (file)
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
@@ -48,10 +48,11 @@ bool    USB_RemoteWakeupEnabled;
 
 void USB_Device_ProcessControlRequest(void)
 {
-       uint8_t* RequestHeader = (uint8_t*)&USB_ControlRequest;
-
-       for (uint8_t RequestHeaderByte = 0; RequestHeaderByte < sizeof(USB_Request_Header_t); RequestHeaderByte++)
-         *(RequestHeader++) = Endpoint_Read_Byte();
+       USB_ControlRequest.bmRequestType = Endpoint_Read_Byte();
+       USB_ControlRequest.bRequest      = Endpoint_Read_Byte();
+       USB_ControlRequest.wValue        = Endpoint_Read_Word_LE();
+       USB_ControlRequest.wIndex        = Endpoint_Read_Word_LE();
+       USB_ControlRequest.wLength       = Endpoint_Read_Word_LE();
 
        EVENT_USB_Device_ControlRequest();
 
@@ -338,7 +339,7 @@ static void USB_Device_ClearSetFeature(void)
                                        else
                                        {
                                                Endpoint_ClearStall();
-                                               Endpoint_ResetFIFO(EndpointIndex);
+                                               Endpoint_ResetEndpoint(EndpointIndex);
                                                Endpoint_ResetDataToggle();
                                        }
                                }