Skip to content

Commit 5c3c678

Browse files
archiguparchigup
committed
Change parameter type instead
1 parent fd05bb5 commit 5c3c678

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

‎include/message_buffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ typedef void * MessageBufferHandle_t;
218218
* @code{c}
219219
* size_t xMessageBufferSend( MessageBufferHandle_t xMessageBuffer,
220220
* const void *pvTxData,
221-
* size_t xDataLengthBytes,
221+
* configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
222222
* TickType_t xTicksToWait );
223223
* @endcode
224224
*
@@ -318,7 +318,7 @@ typedef void * MessageBufferHandle_t;
318318
* @code{c}
319319
* size_t xMessageBufferSendFromISR( MessageBufferHandle_t xMessageBuffer,
320320
* const void *pvTxData,
321-
* size_t xDataLengthBytes,
321+
* configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
322322
* BaseType_t *pxHigherPriorityTaskWoken );
323323
* @endcode
324324
*

‎include/mpu_prototypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ UBaseType_t MPU_uxEventGroupGetNumber( void * xEventGroup ) FREERTOS_SYSTEM_CALL
231231
/* MPU versions of message/stream_buffer.h API functions. */
232232
size_t MPU_xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
233233
const void * pvTxData,
234-
size_t xDataLengthBytes,
234+
configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
235235
TickType_t xTicksToWait ) FREERTOS_SYSTEM_CALL;
236236
size_t MPU_xStreamBufferReceive( StreamBufferHandle_t xStreamBuffer,
237237
void * pvRxData,

‎include/stream_buffer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ typedef struct StreamBufferDef_t * StreamBufferHandle_t;
227227
* @code{c}
228228
* size_t xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
229229
* const void *pvTxData,
230-
* size_t xDataLengthBytes,
230+
* configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
231231
* TickType_t xTicksToWait );
232232
* @endcode
233233
*
@@ -315,7 +315,7 @@ typedef struct StreamBufferDef_t * StreamBufferHandle_t;
315315
*/
316316
size_t xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
317317
const void * pvTxData,
318-
size_t xDataLengthBytes,
318+
configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
319319
TickType_t xTicksToWait ) PRIVILEGED_FUNCTION;
320320

321321
/**
@@ -416,7 +416,7 @@ size_t xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
416416
*/
417417
size_t xStreamBufferSendFromISR( StreamBufferHandle_t xStreamBuffer,
418418
const void * pvTxData,
419-
size_t xDataLengthBytes,
419+
configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
420420
BaseType_t * const pxHigherPriorityTaskWoken ) PRIVILEGED_FUNCTION;
421421

422422
/**

‎portable/Common/mpu_wrappers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ void MPU_vEventGroupDelete( EventGroupHandle_t xEventGroup ) /* FREERTOS_SYSTEM_
12251225

12261226
size_t MPU_xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
12271227
const void * pvTxData,
1228-
size_t xDataLengthBytes,
1228+
configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
12291229
TickType_t xTicksToWait ) /* FREERTOS_SYSTEM_CALL */
12301230
{
12311231
size_t xReturn;

‎stream_buffer.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static size_t prvReadMessageFromBuffer( StreamBuffer_t * pxStreamBuffer,
197197
*/
198198
static size_t prvWriteMessageToBuffer( StreamBuffer_t * const pxStreamBuffer,
199199
const void * pvTxData,
200-
size_t xDataLengthBytes,
200+
configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
201201
size_t xSpace,
202202
size_t xRequiredSpace ) PRIVILEGED_FUNCTION;
203203

@@ -541,7 +541,7 @@ size_t xStreamBufferBytesAvailable( StreamBufferHandle_t xStreamBuffer )
541541

542542
size_t xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
543543
const void * pvTxData,
544-
size_t xDataLengthBytes,
544+
configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
545545
TickType_t xTicksToWait )
546546
{
547547
StreamBuffer_t * const pxStreamBuffer = xStreamBuffer;
@@ -672,7 +672,7 @@ size_t xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
672672

673673
size_t xStreamBufferSendFromISR( StreamBufferHandle_t xStreamBuffer,
674674
const void * pvTxData,
675-
size_t xDataLengthBytes,
675+
configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
676676
BaseType_t * const pxHigherPriorityTaskWoken )
677677
{
678678
StreamBuffer_t * const pxStreamBuffer = xStreamBuffer;
@@ -723,15 +723,11 @@ size_t xStreamBufferSendFromISR( StreamBufferHandle_t xStreamBuffer,
723723

724724
static size_t prvWriteMessageToBuffer( StreamBuffer_t * const pxStreamBuffer,
725725
const void * pvTxData,
726-
size_t xDataLengthBytes,
726+
configMESSAGE_BUFFER_LENGTH_TYPE xDataLengthBytes,
727727
size_t xSpace,
728728
size_t xRequiredSpace )
729729
{
730730
size_t xNextHead = pxStreamBuffer->xHead;
731-
configMESSAGE_BUFFER_LENGTH_TYPE xBufferLengthData = ( configMESSAGE_BUFFER_LENGTH_TYPE ) xDataLengthBytes;
732-
733-
/* Ensure the data length given fits within configMESSAGE_BUFFER_LENGTH_TYPE. */
734-
configASSERT( ( size_t ) xBufferLengthData == xDataLengthBytes );
735731

736732
if( ( pxStreamBuffer->ucFlags & sbFLAGS_IS_MESSAGE_BUFFER ) != ( uint8_t ) 0 )
737733
{
@@ -742,7 +738,7 @@ static size_t prvWriteMessageToBuffer( StreamBuffer_t * const pxStreamBuffer,
742738
/* There is enough space to write both the message length and the message
743739
* itself into the buffer. Start by writing the length of the data, the data
744740
* itself will be written later in this function. */
745-
xNextHead = prvWriteBytesToBuffer( pxStreamBuffer, ( const uint8_t * ) &( xBufferLengthData ), sbBYTES_TO_STORE_MESSAGE_LENGTH, xNextHead );
741+
xNextHead = prvWriteBytesToBuffer( pxStreamBuffer, ( const uint8_t * ) &( xDataLengthBytes ), sbBYTES_TO_STORE_MESSAGE_LENGTH, xNextHead );
746742
}
747743
else
748744
{

0 commit comments

Comments
 (0)