Commit 211712d6 authored by Dean Camera's avatar Dean Camera
Browse files

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

Remove ClearPipeStall routine from the StillImageHost demo, as there is now a version of the function built into the library itself.
parent 4c035b14
......@@ -226,7 +226,7 @@ void USB_Printer_Host(void)
break;
}
puts_P(PSTR("Test Page Sent, Waiting for Pipe...\r\n"));
puts_P(PSTR("Test Page Sent.\r\n"));
/* Indicate device no longer busy */
LEDs_SetAllLEDs(LEDMASK_USB_READY);
......
......@@ -133,7 +133,7 @@ uint8_t SImage_RecieveBlockHeader(void)
if (Pipe_IsStalled())
{
/* Clear the stall condition on the OUT pipe */
SImage_ClearPipeStall(SIMAGE_DATA_OUT_PIPE);
USB_Host_ClearPipeStall(SIMAGE_DATA_OUT_PIPE);
/* Return error code and break out of the loop */
return PIPE_RWSTREAM_PipeStalled;
......@@ -145,7 +145,7 @@ uint8_t SImage_RecieveBlockHeader(void)
if (Pipe_IsStalled())
{
/* Clear the stall condition on the IN pipe */
SImage_ClearPipeStall(SIMAGE_DATA_IN_PIPE);
USB_Host_ClearPipeStall(SIMAGE_DATA_IN_PIPE);
/* Return error code */
return PIPE_RWSTREAM_PipeStalled;
......@@ -262,26 +262,3 @@ bool SImage_IsEventReceived(void)
return IsEventReceived;
}
/** Clears the stall condition in the attached device on the nominated endpoint number.
*
* \param[in] EndpointNum Endpoint number in the attached device whose stall condition is to be cleared
*
* \return A value from the USB_Host_SendControlErrorCodes_t enum
*/
uint8_t SImage_ClearPipeStall(const uint8_t EndpointNum)
{
USB_ControlRequest = (USB_Request_Header_t)
{
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),
.bRequest = REQ_ClearFeature,
.wValue = FEATURE_ENDPOINT_HALT,
.wIndex = EndpointNum,
.wLength = 0,
};
/* Select the control pipe for the request transfer */
Pipe_SelectPipe(PIPE_CONTROLPIPE);
return USB_Host_SendControlRequest(NULL);
}
......@@ -111,6 +111,5 @@
uint8_t SImage_SendData(void* Buffer, uint16_t Bytes);
uint8_t SImage_ReadData(void* Buffer, uint16_t Bytes);
bool SImage_IsEventReceived(void);
uint8_t SImage_ClearPipeStall(const uint8_t EndpointNum);
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment