Fix build errors in Joystick device demo and library LEDs driver (on *nix systems).

[pub/USBasp.git] / Demos / Device / RNDISEthernet / RNDISEthernet.c

diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.c b/Demos/Device/RNDISEthernet/RNDISEthernet.c
index ec8eb7b..8338cdd 100644 (file)
--- a/Demos/Device/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.c
@@ -150,10 +150,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
        uint16_t wLength = Endpoint_Read_Word_LE();\r
 \r
        /* Process RNDIS class commands */\r
-       switch (bRequest)\r
+       switch (USB_ControlRequest.bRequest)\r
        {\r
                case REQ_SendEncapsulatedCommand:\r
-                       if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Clear the SETUP packet, ready for data transfer */\r
                                Endpoint_ClearSETUP();\r
@@ -170,8 +170,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        \r
                        break;\r
                case REQ_GetEncapsulatedResponse:\r
-                       if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
+                               /* Clear the SETUP packet, ready for data transfer */\r
+                               Endpoint_ClearSETUP();\r
+                               \r
                                /* Check if a response to the last message is ready */\r
                                if (!(MessageHeader->MessageLength))\r
                                {\r
@@ -180,15 +183,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                        MessageHeader->MessageLength = 1;\r
                                }\r
 \r
-                               /* Check if less than the requested number of bytes to transfer */\r
-                               if (MessageHeader->MessageLength < wLength)\r
-                                 wLength = MessageHeader->MessageLength;\r
-\r
-                               /* Clear the SETUP packet, ready for data transfer */\r
-                               Endpoint_ClearSETUP();\r
-                               \r
                                /* Write the message response data to the endpoint */\r
-                               Endpoint_Write_Control_Stream_LE(RNDISMessageBuffer, wLength);\r
+                               Endpoint_Write_Control_Stream_LE(RNDISMessageBuffer, MessageHeader->MessageLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                Endpoint_ClearOUT();\r