From f555ad7ced743a19eb1eefaf5eaf536fcbe58d80 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 10 Jan 2011 18:43:34 +0000 Subject: Altered all endpoint/pipe stream transfers so that the new BytesProcessed parameter now points to a location where the number of bytes in the transfer that have been completed can be stored (or NULL if entire transaction should be performed in one chunk). Added new Endpoint_Null_Stream() and Pipe_Null_stream() functions. Removed the NO_STREAM_CALLBACKS compile time option due to the new partial stream transfer feature replacing it. Fixed errors in the incomplete Test and Measurement device demo preventing proper operation (thanks to Pavel Plotnikov). --- .../Host/LowLevel/StillImageHost/Lib/StillImageCommands.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c') diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c index d99dbf9a44..34cb70f11a 100644 --- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c +++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c @@ -55,7 +55,7 @@ void SImage_SendBlockHeader(void) Pipe_Unfreeze(); /* Write the PIMA block to the data OUT pipe */ - Pipe_Write_Stream_LE(&PIMA_SendBlock, PIMA_COMMAND_SIZE(0)); + Pipe_Write_Stream_LE(&PIMA_SendBlock, PIMA_COMMAND_SIZE(0), NULL); /* If the block type is a command, send its parameters (if any) */ if (PIMA_SendBlock.Type == PIMA_CONTAINER_CommandBlock) @@ -67,7 +67,7 @@ void SImage_SendBlockHeader(void) if (ParamBytes) { /* Write the PIMA parameters to the data OUT pipe */ - Pipe_Write_Stream_LE(&PIMA_SendBlock.Params, ParamBytes); + Pipe_Write_Stream_LE(&PIMA_SendBlock.Params, ParamBytes, NULL); } /* Send the PIMA command block to the attached device */ @@ -91,7 +91,7 @@ uint8_t SImage_ReceiveEventHeader(void) Pipe_Unfreeze(); /* Read in the event data into the global structure */ - ErrorCode = Pipe_Read_Stream_LE(&PIMA_EventBlock, sizeof(PIMA_EventBlock)); + ErrorCode = Pipe_Read_Stream_LE(&PIMA_EventBlock, sizeof(PIMA_EventBlock), NULL); /* Clear the pipe after read complete to prepare for next event */ Pipe_ClearIN(); @@ -166,7 +166,7 @@ uint8_t SImage_ReceiveBlockHeader(void) } /* Load in the response from the attached device */ - Pipe_Read_Stream_LE(&PIMA_ReceivedBlock, PIMA_COMMAND_SIZE(0)); + Pipe_Read_Stream_LE(&PIMA_ReceivedBlock, PIMA_COMMAND_SIZE(0), NULL); /* Check if the returned block type is a response block */ if (PIMA_ReceivedBlock.Type == PIMA_CONTAINER_ResponseBlock) @@ -178,7 +178,7 @@ uint8_t SImage_ReceiveBlockHeader(void) if (ParamBytes) { /* Read the PIMA parameters from the data IN pipe */ - Pipe_Read_Stream_LE(&PIMA_ReceivedBlock.Params, ParamBytes); + Pipe_Read_Stream_LE(&PIMA_ReceivedBlock.Params, ParamBytes, NULL); } /* Clear pipe bank after use */ @@ -208,7 +208,7 @@ uint8_t SImage_SendData(void* const Buffer, Pipe_Unfreeze(); /* Write the data contents to the pipe */ - ErrorCode = Pipe_Write_Stream_LE(Buffer, Bytes); + ErrorCode = Pipe_Write_Stream_LE(Buffer, Bytes, NULL); /* Send the last packet to the attached device */ Pipe_ClearOUT(); @@ -236,7 +236,7 @@ uint8_t SImage_ReadData(void* const Buffer, Pipe_Unfreeze(); /* Read in the data into the buffer */ - ErrorCode = Pipe_Read_Stream_LE(Buffer, Bytes); + ErrorCode = Pipe_Read_Stream_LE(Buffer, Bytes, NULL); /* Freeze the pipe again after use */ Pipe_Freeze(); -- cgit v1.2.3