Rename reserved members of all structs so that they are uniformly named across all...

[pub/USBasp.git] / Demos / Device / Incomplete / Sideshow / Sideshow.c

diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.c b/Demos/Device/Incomplete/Sideshow/Sideshow.c
index 3e9778e..e99a26b 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Sideshow.c
+++ b/Demos/Device/Incomplete/Sideshow/Sideshow.c
@@ -115,25 +115,22 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 
 void EVENT_USB_Device_UnhandledControlRequest(void)
 {
 
 void EVENT_USB_Device_UnhandledControlRequest(void)
 {

-       /* Process UFI specific control requests */

        switch (USB_ControlRequest.bRequest)
        {
                case REQ_GetOSFeatureDescriptor:
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE))
                        {
                                void*    DescriptorPointer;
        switch (USB_ControlRequest.bRequest)
        {
                case REQ_GetOSFeatureDescriptor:
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE))
                        {
                                void*    DescriptorPointer;

-                               uint16_t DescriptorSize;
+                               uint16_t DescriptorSize = USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
+                                                                                    &DescriptorPointer, &DescriptorSize);

 
 

-                               if (!(USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
-                                                                &DescriptorPointer, &DescriptorSize)))
-                               {
-                                       return;
-                               }
+                               if (DescriptorSize == NO_DESCRIPTOR)
+                                 return;

                                
                                Endpoint_ClearSETUP();
                                
                                Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);
                                
                                Endpoint_ClearSETUP();
                                
                                Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);

-                               Endpoint_ClearOUT();                            
+                               Endpoint_ClearOUT();

                        }
 
                        break;
                        }
 
                        break;