Fix board name redefinition in BoardTypes.h (thanks to Daniel Czigany).

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

diff --git a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
index 64af140..8d26874 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
@@ -254,8 +254,8 @@ static void USB_Device_GetInternalSerialDescriptor(void)
 
 static void USB_Device_GetDescriptor(void)
 {
-       void*    DescriptorPointer;
-       uint16_t DescriptorSize;
+       const void* DescriptorPointer;
+       uint16_t    DescriptorSize;
        
        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
        uint8_t  DescriptorAddressSpace;
@@ -364,18 +364,18 @@ static void USB_Device_ClearSetFeature(void)
 
                                Endpoint_SelectEndpoint(EndpointIndex);
 
-                               if (!(Endpoint_IsEnabled()))
-                                 return;
-
-                               if (USB_ControlRequest.bRequest == REQ_SetFeature)
-                               {
-                                       Endpoint_StallTransaction();
-                               }
-                               else
-                               {
-                                       Endpoint_ClearStall();
-                                       Endpoint_ResetFIFO(EndpointIndex);
-                                       Endpoint_ResetDataToggle();
+                               if (Endpoint_IsEnabled())
+                               {                               
+                                       if (USB_ControlRequest.bRequest == REQ_SetFeature)
+                                       {
+                                               Endpoint_StallTransaction();
+                                       }
+                                       else
+                                       {
+                                               Endpoint_ClearStall();
+                                               Endpoint_ResetFIFO(EndpointIndex);
+                                               Endpoint_ResetDataToggle();
+                                       }                                       
                                }
                        }