Remove ClearPipeStall routine from the StillImageHost demo, as there is now a version...

diff --git a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
index 9eb05ab..d9f409e 100644 (file)
--- a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
+++ b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
@@ -226,7 +226,7 @@ void USB_Printer_Host(void)
                                break;\r
                        }\r
 \r
-                       puts_P(PSTR("Test Page Sent, Waiting for Pipe...\r\n"));\r
+                       puts_P(PSTR("Test Page Sent.\r\n"));\r
                \r
                        /* Indicate device no longer busy */\r
                        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c
index c0a9575..e0d71a0 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c
+++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c
@@ -133,7 +133,7 @@ uint8_t SImage_RecieveBlockHeader(void)
                if (Pipe_IsStalled())\r
                {\r
                        /* Clear the stall condition on the OUT pipe */\r
-                       SImage_ClearPipeStall(SIMAGE_DATA_OUT_PIPE);\r
+                       USB_Host_ClearPipeStall(SIMAGE_DATA_OUT_PIPE);\r
 \r
                        /* Return error code and break out of the loop */\r
                        return PIPE_RWSTREAM_PipeStalled;\r
@@ -145,7 +145,7 @@ uint8_t SImage_RecieveBlockHeader(void)
                if (Pipe_IsStalled())\r
                {\r
                        /* Clear the stall condition on the IN pipe */\r
-                       SImage_ClearPipeStall(SIMAGE_DATA_IN_PIPE);\r
+                       USB_Host_ClearPipeStall(SIMAGE_DATA_IN_PIPE);\r
 \r
                        /* Return error code */\r
                        return PIPE_RWSTREAM_PipeStalled;\r
@@ -262,26 +262,3 @@ bool SImage_IsEventReceived(void)
        \r
        return IsEventReceived;\r
 }\r
-\r
-/** Clears the stall condition in the attached device on the nominated endpoint number.\r
- *\r
- *  \param[in] EndpointNum  Endpoint number in the attached device whose stall condition is to be cleared\r
- *\r
- *  \return A value from the USB_Host_SendControlErrorCodes_t enum\r
- */\r
-uint8_t SImage_ClearPipeStall(const uint8_t EndpointNum)\r
-{\r
-       USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),\r
-                       .bRequest      = REQ_ClearFeature,\r
-                       .wValue        = FEATURE_ENDPOINT_HALT,\r
-                       .wIndex        = EndpointNum,\r
-                       .wLength       = 0,\r
-               };\r
-       \r
-       /* Select the control pipe for the request transfer */\r
-       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
-       return USB_Host_SendControlRequest(NULL);\r
-}\r

diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h
index 6000510..b44b752 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h
+++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h
@@ -111,6 +111,5 @@
                uint8_t SImage_SendData(void* Buffer, uint16_t Bytes);\r
                uint8_t SImage_ReadData(void* Buffer, uint16_t Bytes);\r
                bool    SImage_IsEventReceived(void);\r
-               uint8_t SImage_ClearPipeStall(const uint8_t EndpointNum);\r
 \r
 #endif\r