Fixed bug in RNDISEthernet and DualCDC demos not using the correct USB_ControlRequest...

[pub/USBasp.git] / Demos / Host / StillImageHost / StillImageCommands.c

diff --git a/Demos/Host/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/StillImageCommands.c
index 233e5b1..8f05e48 100644 (file)
--- a/Demos/Host/StillImageHost/StillImageCommands.c
+++ b/Demos/Host/StillImageHost/StillImageCommands.c
@@ -119,7 +119,7 @@ uint8_t SImage_RecieveBlockHeader(void)
                        if (!(TimeoutMSRem))\r
                        {\r
                                /* Return error code */\r
                        if (!(TimeoutMSRem))\r
                        {\r
                                /* Return error code */\r

-                               return PIPE_RWSTREAM_ERROR_Timeout;\r
+                               return PIPE_RWSTREAM_Timeout;\r

                        }\r
                }\r
                \r
                        }\r
                }\r
                \r


@@ -132,7 +132,7 @@ uint8_t SImage_RecieveBlockHeader(void)
                        SImage_ClearPipeStall(SIMAGE_DATA_OUT_PIPE);\r
 \r
                        /* Return error code and break out of the loop */\r
                        SImage_ClearPipeStall(SIMAGE_DATA_OUT_PIPE);\r
 \r
                        /* Return error code and break out of the loop */\r

-                       return PIPE_RWSTREAM_ERROR_PipeStalled;\r
+                       return PIPE_RWSTREAM_PipeStalled;\r

                }\r
 \r
                Pipe_SelectPipe(SIMAGE_DATA_IN_PIPE);\r
                }\r
 \r
                Pipe_SelectPipe(SIMAGE_DATA_IN_PIPE);\r


@@ -144,14 +144,14 @@ uint8_t SImage_RecieveBlockHeader(void)
                        SImage_ClearPipeStall(SIMAGE_DATA_IN_PIPE);\r
 \r
                        /* Return error code */\r
                        SImage_ClearPipeStall(SIMAGE_DATA_IN_PIPE);\r
 \r
                        /* Return error code */\r

-                       return PIPE_RWSTREAM_ERROR_PipeStalled;\r
+                       return PIPE_RWSTREAM_PipeStalled;\r

                }\r
                  \r
                /* Check to see if the device was disconnected, if so exit function */\r
                if (!(USB_IsConnected))\r
                {\r
                        /* Return error code */\r
                }\r
                  \r
                /* Check to see if the device was disconnected, if so exit function */\r
                if (!(USB_IsConnected))\r
                {\r
                        /* Return error code */\r

-                       return PIPE_RWSTREAM_ERROR_DeviceDisconnected;\r
+                       return PIPE_RWSTREAM_DeviceDisconnected;\r

                }\r
        };\r
        \r
                }\r
        };\r
        \r


@@ -185,7 +185,7 @@ uint8_t SImage_RecieveBlockHeader(void)
        /* Freeze the IN pipe after use */\r
        Pipe_Freeze();\r
        \r
        /* Freeze the IN pipe after use */\r
        Pipe_Freeze();\r
        \r

-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\r

 }\r
 \r
 /** Function to send the given data to the device, after a command block has been issued.\r
 }\r
 \r
 /** Function to send the given data to the device, after a command block has been issued.\r


@@ -263,7 +263,7 @@ bool SImage_IsEventReceived(void)
  */\r
 uint8_t SImage_ClearPipeStall(const uint8_t EndpointNum)\r
 {\r
  */\r
 uint8_t SImage_ClearPipeStall(const uint8_t EndpointNum)\r
 {\r

-       USB_HostRequest = (USB_Host_Request_Header_t)\r
+       USB_ControlRequest = (USB_Request_Header_t)\r

                {\r
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),\r
                        .bRequest      = REQ_ClearFeature,\r
                {\r
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),\r
                        .bRequest      = REQ_ClearFeature,\r