Skip to content

Commit 0395f32

Browse files
authored
Merge branch 'main' into zikalino-replace-pre-with-code
2 parents d7c0678 + c290780 commit 0395f32

File tree

7 files changed

+305
-298
lines changed

7 files changed

+305
-298
lines changed

include/message_buffer.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ typedef void * MessageBufferHandle_t;
165165
* stored in the message buffer is actually (xBufferSizeBytes - 1).
166166
*
167167
* @param pucMessageBufferStorageArea Must point to a uint8_t array that is at
168-
* least xBufferSizeBytes + 1 big. This is the array to which messages are
168+
* least xBufferSizeBytes big. This is the array to which messages are
169169
* copied when they are written to the message buffer.
170170
*
171171
* @param pxStaticMessageBuffer Must point to a variable of type
@@ -194,8 +194,8 @@ typedef void * MessageBufferHandle_t;
194194
* {
195195
* MessageBufferHandle_t xMessageBuffer;
196196
*
197-
* xMessageBuffer = xMessageBufferCreateStatic( sizeof( ucBufferStorage ),
198-
* ucBufferStorage,
197+
* xMessageBuffer = xMessageBufferCreateStatic( sizeof( ucStorageBuffer ),
198+
* ucStorageBuffer,
199199
* &xMessageBufferStruct );
200200
*
201201
* // As neither the pucMessageBufferStorageArea or pxStaticMessageBuffer
@@ -737,7 +737,7 @@ typedef void * MessageBufferHandle_t;
737737
* message_buffer.h
738738
*
739739
* <pre>
740-
* BaseType_t xMessageBufferSendCompletedFromISR( MessageBufferHandle_t xStreamBuffer, BaseType_t *pxHigherPriorityTaskWoken );
740+
* BaseType_t xMessageBufferSendCompletedFromISR( MessageBufferHandle_t xMessageBuffer, BaseType_t *pxHigherPriorityTaskWoken );
741741
* </pre>
742742
*
743743
* For advanced users only.
@@ -753,7 +753,7 @@ typedef void * MessageBufferHandle_t;
753753
* See the example implemented in FreeRTOS/Demo/Minimal/MessageBufferAMP.c for
754754
* additional information.
755755
*
756-
* @param xStreamBuffer The handle of the stream buffer to which data was
756+
* @param xMessageBuffer The handle of the stream buffer to which data was
757757
* written.
758758
*
759759
* @param pxHigherPriorityTaskWoken *pxHigherPriorityTaskWoken should be
@@ -777,7 +777,7 @@ typedef void * MessageBufferHandle_t;
777777
* message_buffer.h
778778
*
779779
* <pre>
780-
* BaseType_t xMessageBufferReceiveCompletedFromISR( MessageBufferHandle_t xStreamBuffer, BaseType_t *pxHigherPriorityTaskWoken );
780+
* BaseType_t xMessageBufferReceiveCompletedFromISR( MessageBufferHandle_t xMessageBuffer, BaseType_t *pxHigherPriorityTaskWoken );
781781
* </pre>
782782
*
783783
* For advanced users only.
@@ -794,7 +794,7 @@ typedef void * MessageBufferHandle_t;
794794
* See the example implemented in FreeRTOS/Demo/Minimal/MessageBufferAMP.c for
795795
* additional information.
796796
*
797-
* @param xStreamBuffer The handle of the stream buffer from which data was
797+
* @param xMessageBuffer The handle of the stream buffer from which data was
798798
* read.
799799
*
800800
* @param pxHigherPriorityTaskWoken *pxHigherPriorityTaskWoken should be

include/queue.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ typedef struct QueueDefinition * QueueSetMemberHandle_t;
155155
* QueueHandle_t xQueueCreateStatic(
156156
* UBaseType_t uxQueueLength,
157157
* UBaseType_t uxItemSize,
158-
* uint8_t *pucQueueStorageBuffer,
158+
* uint8_t *pucQueueStorage,
159159
* StaticQueue_t *pxQueueBuffer
160160
* );
161161
* </pre>
@@ -182,11 +182,11 @@ typedef struct QueueDefinition * QueueSetMemberHandle_t;
182182
* that will be copied for each posted item. Each item on the queue must be
183183
* the same size.
184184
*
185-
* @param pucQueueStorageBuffer If uxItemSize is not zero then
186-
* pucQueueStorageBuffer must point to a uint8_t array that is at least large
185+
* @param pucQueueStorage If uxItemSize is not zero then
186+
* pucQueueStorage must point to a uint8_t array that is at least large
187187
* enough to hold the maximum number of items that can be in the queue at any
188188
* one time - which is ( uxQueueLength * uxItemsSize ) bytes. If uxItemSize is
189-
* zero then pucQueueStorageBuffer can be NULL.
189+
* zero then pucQueueStorage can be NULL.
190190
*
191191
* @param pxQueueBuffer Must point to a variable of type StaticQueue_t, which
192192
* will be used to hold the queue's data structure.
@@ -214,7 +214,7 @@ typedef struct QueueDefinition * QueueSetMemberHandle_t;
214214
*
215215
* void vATask( void *pvParameters )
216216
* {
217-
* QueueHandle_t xQueue1;
217+
* QueueHandle_t xQueue1;
218218
*
219219
* // Create a queue capable of containing 10 uint32_t values.
220220
* xQueue1 = xQueueCreate( QUEUE_LENGTH, // The number of items the queue can hold.
@@ -1501,7 +1501,7 @@ BaseType_t xQueueGiveMutexRecursive( QueueHandle_t xMutex ) PRIVILEGED_FUNCTION;
15011501
* is the handle returned by a call to xQueueCreate(). Semaphore and mutex
15021502
* handles can also be passed in here.
15031503
*
1504-
* @param pcName The name to be associated with the handle. This is the
1504+
* @param pcQueueName The name to be associated with the handle. This is the
15051505
* name that the kernel aware debugger will display. The queue registry only
15061506
* stores a pointer to the string - so the string must be persistent (global or
15071507
* preferably in ROM/Flash), not on the stack.

include/stream_buffer.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ typedef struct StreamBufferDef_t * StreamBufferHandle_t;
172172
* that is greater than the buffer size.
173173
*
174174
* @param pucStreamBufferStorageArea Must point to a uint8_t array that is at
175-
* least xBufferSizeBytes + 1 big. This is the array to which streams are
175+
* least xBufferSizeBytes big. This is the array to which streams are
176176
* copied when they are written to the stream buffer.
177177
*
178178
* @param pxStaticStreamBuffer Must point to a variable of type
@@ -202,9 +202,9 @@ typedef struct StreamBufferDef_t * StreamBufferHandle_t;
202202
* StreamBufferHandle_t xStreamBuffer;
203203
* const size_t xTriggerLevel = 1;
204204
*
205-
* xStreamBuffer = xStreamBufferCreateStatic( sizeof( ucBufferStorage ),
205+
* xStreamBuffer = xStreamBufferCreateStatic( sizeof( ucStorageBuffer ),
206206
* xTriggerLevel,
207-
* ucBufferStorage,
207+
* ucStorageBuffer,
208208
* &xStreamBufferStruct );
209209
*
210210
* // As neither the pucStreamBufferStorageArea or pxStaticStreamBuffer

0 commit comments

Comments
 (0)