X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/8f6b4ddf764c3a54e42d00a7502c82c5c3e71b1c..e0985b995009d71b80d214a66944e76f4e41aadb:/Demos/Host/StillImageHost/StillImageCommands.c?ds=sidebyside

diff --git a/Demos/Host/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/StillImageCommands.c
index ebf20b0b2..8f05e48f4 100644
--- a/Demos/Host/StillImageHost/StillImageCommands.c
+++ b/Demos/Host/StillImageHost/StillImageCommands.c
@@ -119,7 +119,7 @@ uint8_t SImage_RecieveBlockHeader(void)
 			if (!(TimeoutMSRem))
 			{
 				/* Return error code */
-				return PIPE_RWSTREAM_ERROR_Timeout;
+				return PIPE_RWSTREAM_Timeout;
 			}
 		}
 		
@@ -132,7 +132,7 @@ uint8_t SImage_RecieveBlockHeader(void)
 			SImage_ClearPipeStall(SIMAGE_DATA_OUT_PIPE);
 
 			/* Return error code and break out of the loop */
-			return PIPE_RWSTREAM_ERROR_PipeStalled;
+			return PIPE_RWSTREAM_PipeStalled;
 		}
 
 		Pipe_SelectPipe(SIMAGE_DATA_IN_PIPE);
@@ -144,14 +144,14 @@ uint8_t SImage_RecieveBlockHeader(void)
 			SImage_ClearPipeStall(SIMAGE_DATA_IN_PIPE);
 
 			/* Return error code */
-			return PIPE_RWSTREAM_ERROR_PipeStalled;
+			return PIPE_RWSTREAM_PipeStalled;
 		}
 		  
 		/* Check to see if the device was disconnected, if so exit function */
 		if (!(USB_IsConnected))
 		{
 			/* Return error code */
-			return PIPE_RWSTREAM_ERROR_DeviceDisconnected;
+			return PIPE_RWSTREAM_DeviceDisconnected;
 		}
 	};
 	
@@ -185,7 +185,7 @@ uint8_t SImage_RecieveBlockHeader(void)
 	/* Freeze the IN pipe after use */
 	Pipe_Freeze();
 	
-	return PIPE_RWSTREAM_ERROR_NoError;
+	return PIPE_RWSTREAM_NoError;
 }
 
 /** Function to send the given data to the device, after a command block has been issued.
@@ -261,15 +261,15 @@ bool SImage_IsEventReceived(void)
  *
  *  \return A value from the USB_Host_SendControlErrorCodes_t enum
  */
-uint8_t SImage_ClearPipeStall(const uint8_t PipeEndpointNum)
+uint8_t SImage_ClearPipeStall(const uint8_t EndpointNum)
 {
-	USB_HostRequest = (USB_Host_Request_Header_t)
+	USB_ControlRequest = (USB_Request_Header_t)
 		{
-			bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),
-			bRequest:      REQ_ClearFeature,
-			wValue:        FEATURE_ENDPOINT_HALT,
-			wIndex:        PipeEndpointNum,
-			wLength:       0,
+			.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 */