Fix incorrectly named include guards in the Board driver header files.

[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..2ac6c0a 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)
 {
 
 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();
 
 
        EVENT_USB_Device_ControlRequest();
 


@@ -203,12 +204,13 @@ static void USB_Device_GetInternalSerialDescriptor(void)
        struct
        {
                USB_Descriptor_Header_t Header;
        struct
        {
                USB_Descriptor_Header_t Header;

-               wchar_t                 UnicodeString[20];
+               uint16_t                UnicodeString[INTERNAL_SERIAL_LENGTH_BITS / 4];

        } SignatureDescriptor;
 
        SignatureDescriptor.Header.Type = DTYPE_String;
        } SignatureDescriptor;
 
        SignatureDescriptor.Header.Type = DTYPE_String;

-       SignatureDescriptor.Header.Size = USB_Device_GetSerialString(SignatureDescriptor.UnicodeString,
-                                                                    sizeof(SignatureDescriptor.UnicodeString));
+       SignatureDescriptor.Header.Size = USB_STRING_LEN(INTERNAL_SERIAL_LENGTH_BITS / 4);
+       
+       USB_Device_GetSerialString(SignatureDescriptor.UnicodeString);

 
        Endpoint_ClearSETUP();
 
 
        Endpoint_ClearSETUP();
 


@@ -338,7 +340,7 @@ static void USB_Device_ClearSetFeature(void)
                                        else
                                        {
                                                Endpoint_ClearStall();
                                        else
                                        {
                                                Endpoint_ClearStall();

-                                               Endpoint_ResetFIFO(EndpointIndex);
+                                               Endpoint_ResetEndpoint(EndpointIndex);

                                                Endpoint_ResetDataToggle();
                                        }
                                }
                                                Endpoint_ResetDataToggle();
                                        }
                                }