Skip to content

Commit 5f5ed08

Browse files
SkptakSkptak
committed
Slight formatting change to mpu_wrappers files
1 parent 1eae231 commit 5f5ed08

File tree

2 files changed

+66
-67
lines changed

2 files changed

+66
-67
lines changed

‎portable/GCC/ARM_CRx_MPU/mpu_wrappers_v2_asm.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ vPortSystemCallExit:
6969
* Inputs: VOID
7070
*/
7171
.align 4
72-
.weak xPortIsPrivileged
72+
.global xPortIsPrivileged
7373
.type xPortIsPrivileged, %function
7474
xPortIsPrivileged:
7575
/* Load value of CPSR into R0 */

‎portable/GCC/ARM_CRx_MPU/mpu_wrappers_v2_asm.h‎

Lines changed: 65 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -86,34 +86,34 @@ typedef struct xEventGroupWaitBitsParams
8686
TickType_t xTicksToWait;
8787
} xEventGroupWaitBitsParams_t;
8888

89-
/*-----------------------------------------------------------*/
89+
/* ----------------------------------------------------------------------------------- */
9090

9191
extern TickType_t MPU_xTaskGetTickCount( void )
9292
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
9393

94-
/*-----------------------------------------------------------*/
94+
/* ----------------------------------------------------------------------------------- */
9595

9696
UBaseType_t MPU_uxTaskGetNumberOfTasks( void )
9797
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
9898

99-
/*-----------------------------------------------------------*/
99+
/* ----------------------------------------------------------------------------------- */
100100

101101
char * MPU_pcTaskGetName( TaskHandle_t xTaskToQuery )
102102
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
103103

104-
/*-----------------------------------------------------------*/
104+
/* ----------------------------------------------------------------------------------- */
105105

106106
void MPU_vTaskSetTimeOutState( TimeOut_t * const pxTimeOut )
107107
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
108108

109-
/*-----------------------------------------------------------*/
109+
/* ----------------------------------------------------------------------------------- */
110110

111111
BaseType_t MPU_xTaskCheckForTimeOut(
112112
TimeOut_t * const pxTimeOut,
113113
TickType_t * const pxTicksToWait
114114
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
115115

116-
/*-----------------------------------------------------------*/
116+
/* ----------------------------------------------------------------------------------- */
117117

118118
BaseType_t MPU_xQueueGenericSend(
119119
QueueHandle_t xQueue,
@@ -122,37 +122,37 @@ BaseType_t MPU_xQueueGenericSend(
122122
const BaseType_t xCopyPosition
123123
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
124124

125-
/*-----------------------------------------------------------*/
125+
/* ----------------------------------------------------------------------------------- */
126126

127127
UBaseType_t MPU_uxQueueMessagesWaiting( const QueueHandle_t xQueue )
128128
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
129129

130-
/*-----------------------------------------------------------*/
130+
/* ----------------------------------------------------------------------------------- */
131131

132132
UBaseType_t MPU_uxQueueSpacesAvailable( const QueueHandle_t xQueue )
133133
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
134134

135-
/*-----------------------------------------------------------*/
135+
/* ----------------------------------------------------------------------------------- */
136136

137137
BaseType_t MPU_xQueueReceive(
138138
QueueHandle_t xQueue,
139139
void * const pvBuffer,
140140
TickType_t xTicksToWait
141141
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
142-
/*-----------------------------------------------------------*/
142+
/* ----------------------------------------------------------------------------------- */
143143

144144
BaseType_t MPU_xQueuePeek(
145145
QueueHandle_t xQueue,
146146
void * const pvBuffer,
147147
TickType_t xTicksToWait
148148
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
149149

150-
/*-----------------------------------------------------------*/
150+
/* ----------------------------------------------------------------------------------- */
151151

152152
BaseType_t MPU_xQueueSemaphoreTake( QueueHandle_t xQueue, TickType_t xTicksToWait )
153153
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
154154

155-
/*-----------------------------------------------------------*/
155+
/* ----------------------------------------------------------------------------------- */
156156

157157
size_t MPU_xStreamBufferSend(
158158
StreamBufferHandle_t xStreamBuffer,
@@ -161,7 +161,7 @@ size_t MPU_xStreamBufferSend(
161161
TickType_t xTicksToWait
162162
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
163163

164-
/*-----------------------------------------------------------*/
164+
/* ----------------------------------------------------------------------------------- */
165165

166166
size_t MPU_xStreamBufferReceive(
167167
StreamBufferHandle_t xStreamBuffer,
@@ -170,39 +170,39 @@ size_t MPU_xStreamBufferReceive(
170170
TickType_t xTicksToWait
171171
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
172172

173-
/*-----------------------------------------------------------*/
173+
/* ----------------------------------------------------------------------------------- */
174174

175175
BaseType_t MPU_xStreamBufferIsFull( StreamBufferHandle_t xStreamBuffer )
176176
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
177177

178-
/*-----------------------------------------------------------*/
178+
/* ----------------------------------------------------------------------------------- */
179179

180180
BaseType_t MPU_xStreamBufferIsEmpty( StreamBufferHandle_t xStreamBuffer )
181181
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
182182

183-
/*-----------------------------------------------------------*/
183+
/* ----------------------------------------------------------------------------------- */
184184

185185
size_t MPU_xStreamBufferSpacesAvailable( StreamBufferHandle_t xStreamBuffer )
186186
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
187187

188-
/*-----------------------------------------------------------*/
188+
/* ----------------------------------------------------------------------------------- */
189189

190190
size_t MPU_xStreamBufferBytesAvailable( StreamBufferHandle_t xStreamBuffer )
191191
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
192192

193-
/*-----------------------------------------------------------*/
193+
/* ----------------------------------------------------------------------------------- */
194194

195195
BaseType_t MPU_xStreamBufferSetTriggerLevel(
196196
StreamBufferHandle_t xStreamBuffer,
197197
size_t xTriggerLevel
198198
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
199199

200-
/*-----------------------------------------------------------*/
200+
/* ----------------------------------------------------------------------------------- */
201201

202202
size_t MPU_xStreamBufferNextMessageLengthBytes( StreamBufferHandle_t xStreamBuffer )
203203
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
204204

205-
/*-----------------------------------------------------------*/
205+
/* ----------------------------------------------------------------------------------- */
206206

207207
EventBits_t MPU_xEventGroupWaitBits(
208208
EventGroupHandle_t xEventGroup,
@@ -211,21 +211,21 @@ EventBits_t MPU_xEventGroupWaitBits(
211211
const BaseType_t xWaitForAllBits,
212212
TickType_t xTicksToWait
213213
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
214-
/*-----------------------------------------------------------*/
214+
/* ----------------------------------------------------------------------------------- */
215215

216216
EventBits_t MPU_xEventGroupClearBits(
217217
EventGroupHandle_t xEventGroup,
218218
const EventBits_t uxBitsToClear
219219
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
220220

221-
/*-----------------------------------------------------------*/
221+
/* ----------------------------------------------------------------------------------- */
222222

223223
EventBits_t MPU_xEventGroupSetBits(
224224
EventGroupHandle_t xEventGroup,
225225
const EventBits_t uxBitsToSet
226226
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
227227

228-
/*-----------------------------------------------------------*/
228+
/* ----------------------------------------------------------------------------------- */
229229

230230
EventBits_t MPU_xEventGroupSync(
231231
EventGroupHandle_t xEventGroup,
@@ -234,7 +234,7 @@ EventBits_t MPU_xEventGroupSync(
234234
TickType_t xTicksToWait
235235
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
236236

237-
/*-----------------------------------------------------------*/
237+
/* ----------------------------------------------------------------------------------- */
238238

239239
#if( INCLUDE_xTaskDelayUntil == 1 )
240240

@@ -243,48 +243,48 @@ BaseType_t MPU_xTaskDelayUntil(
243243
const TickType_t xTimeIncrement
244244
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
245245

246-
#endif /* if ( INCLUDE_xTaskDelayUntil == 1 ) */
247-
/*-----------------------------------------------------------*/
246+
#endif /* ( INCLUDE_xTaskDelayUntil == 1 ) */
247+
/* ----------------------------------------------------------------------------------- */
248248

249249
#if( INCLUDE_xTaskAbortDelay == 1 )
250250

251251
BaseType_t MPU_xTaskAbortDelay( TaskHandle_t xTask )
252252
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
253253

254-
#endif /* if ( INCLUDE_xTaskAbortDelay == 1 ) */
255-
/*-----------------------------------------------------------*/
254+
#endif /* ( INCLUDE_xTaskAbortDelay == 1 ) */
255+
/* ----------------------------------------------------------------------------------- */
256256

257257
#if( INCLUDE_vTaskDelay == 1 )
258258

259259
void MPU_vTaskDelay( const TickType_t xTicksToDelay )
260260
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
261261

262-
#endif /* if ( INCLUDE_vTaskDelay == 1 ) */
263-
/*-----------------------------------------------------------*/
262+
#endif /* ( INCLUDE_vTaskDelay == 1 ) */
263+
/* ----------------------------------------------------------------------------------- */
264264

265265
#if( INCLUDE_uxTaskPriorityGet == 1 )
266266

267267
UBaseType_t MPU_uxTaskPriorityGet( const TaskHandle_t xTask )
268268
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
269269

270-
#endif /* if ( INCLUDE_uxTaskPriorityGet == 1 ) */
271-
/*-----------------------------------------------------------*/
270+
#endif /* ( INCLUDE_uxTaskPriorityGet == 1 ) */
271+
/* ----------------------------------------------------------------------------------- */
272272

273273
#if( INCLUDE_eTaskGetState == 1 )
274274

275275
eTaskState MPU_eTaskGetState( TaskHandle_t xTask )
276276
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
277277

278-
#endif /* if ( INCLUDE_eTaskGetState == 1 ) */
279-
/*-----------------------------------------------------------*/
278+
#endif /* ( INCLUDE_eTaskGetState == 1 ) */
279+
/* ----------------------------------------------------------------------------------- */
280280

281281
#if( INCLUDE_xTaskGetIdleTaskHandle == 1 )
282282

283283
TaskHandle_t MPU_xTaskGetIdleTaskHandle( void )
284284
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
285285

286-
#endif /* if ( INCLUDE_xTaskGetIdleTaskHandle == 1 ) */
287-
/*-----------------------------------------------------------*/
286+
#endif /* ( INCLUDE_xTaskGetIdleTaskHandle == 1 ) */
287+
/* ----------------------------------------------------------------------------------- */
288288

289289
#if( INCLUDE_vTaskSuspend == 1 )
290290

@@ -294,8 +294,8 @@ void MPU_vTaskSuspend( TaskHandle_t xTaskToSuspend )
294294
void MPU_vTaskResume( TaskHandle_t xTaskToResume )
295295
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
296296

297-
#endif /* if ( INCLUDE_vTaskSuspend == 1 ) */
298-
/*-----------------------------------------------------------*/
297+
#endif /* ( INCLUDE_vTaskSuspend == 1 ) */
298+
/* ----------------------------------------------------------------------------------- */
299299

300300
#if( configGENERATE_RUN_TIME_STATS == 1 )
301301
configRUN_TIME_COUNTER_TYPE MPU_ulTaskGetRunTimeCounter( const TaskHandle_t xTask )
@@ -309,10 +309,10 @@ configRUN_TIME_COUNTER_TYPE MPU_ulTaskGetIdleRunTimePercent( void )
309309
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
310310
configRUN_TIME_COUNTER_TYPE MPU_ulTaskGetIdleRunTimeCounter( void )
311311
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
312-
#endif /* ( INCLUDE_xTaskGetIdleTaskHandle == 1 ) */
312+
#endif /* ( INCLUDE_xTaskGetIdleTaskHandle == 1 ) */
313313

314-
#endif /* if ( ( configGENERATE_RUN_TIME_STATS == 1 ) */
315-
/*-----------------------------------------------------------*/
314+
#endif /* ( ( configGENERATE_RUN_TIME_STATS == 1 ) */
315+
/* ----------------------------------------------------------------------------------- */
316316

317317
#if( configUSE_APPLICATION_TASK_TAG == 1 )
318318

@@ -322,8 +322,8 @@ void MPU_vTaskSetApplicationTaskTag( TaskHandle_t xTask, TaskHookFunction_t pxHo
322322
TaskHookFunction_t MPU_xTaskGetApplicationTaskTag( TaskHandle_t xTask )
323323
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
324324

325-
#endif /* if ( configUSE_APPLICATION_TASK_TAG == 1 ) */
326-
/*-----------------------------------------------------------*/
325+
#endif /* ( configUSE_APPLICATION_TASK_TAG == 1 ) */
326+
/* ----------------------------------------------------------------------------------- */
327327

328328
#if( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )
329329

@@ -338,41 +338,40 @@ void * MPU_pvTaskGetThreadLocalStoragePointer(
338338
BaseType_t xIndex
339339
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
340340

341-
#endif /* if ( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 ) */
342-
/*-----------------------------------------------------------*/
341+
#endif /* ( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 ) */
342+
/* ----------------------------------------------------------------------------------- */
343343

344344
#if( INCLUDE_uxTaskGetStackHighWaterMark == 1 )
345345

346346
UBaseType_t MPU_uxTaskGetStackHighWaterMark( TaskHandle_t xTask )
347347
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
348348

349-
#endif /* if ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) */
350-
/*-----------------------------------------------------------*/
349+
#endif /* ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) */
350+
/* ----------------------------------------------------------------------------------- */
351351

352352
#if( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 )
353353

354354
configSTACK_DEPTH_TYPE MPU_uxTaskGetStackHighWaterMark2( TaskHandle_t xTask )
355355
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
356356

357-
#endif /* if ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) */
358-
/*-----------------------------------------------------------*/
357+
#endif /* ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) */
358+
/* ----------------------------------------------------------------------------------- */
359359

360360
#if( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) )
361361

362362
TaskHandle_t MPU_xTaskGetCurrentTaskHandle( void )
363363
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
364364

365-
#endif /* if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) \
366-
) */
367-
/*-----------------------------------------------------------*/
365+
#endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) */
366+
/* ----------------------------------------------------------------------------------- */
368367

369368
#if( INCLUDE_xTaskGetSchedulerState == 1 )
370369

371370
BaseType_t MPU_xTaskGetSchedulerState( void )
372371
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
373372

374-
#endif /* if ( INCLUDE_xTaskGetSchedulerState == 1 ) */
375-
/*-----------------------------------------------------------*/
373+
#endif /* ( INCLUDE_xTaskGetSchedulerState == 1 ) */
374+
/* ----------------------------------------------------------------------------------- */
376375

377376
#if( configUSE_TRACE_FACILITY == 1 )
378377

@@ -395,8 +394,8 @@ UBaseType_t MPU_uxEventGroupGetNumber( void * xEventGroup )
395394
void MPU_vEventGroupSetNumber( void * xEventGroup, UBaseType_t uxEventGroupNumber )
396395
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
397396

398-
#endif /*( configUSE_TRACE_FACILITY == 1 )*/
399-
/*-----------------------------------------------------------*/
397+
#endif /* ( configUSE_TRACE_FACILITY == 1 ) */
398+
/* ----------------------------------------------------------------------------------- */
400399

401400
#if( configUSE_TASK_NOTIFICATIONS == 1 )
402401

@@ -423,8 +422,8 @@ uint32_t MPU_ulTaskGenericNotifyValueClear(
423422
uint32_t ulBitsToClear
424423
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
425424

426-
#endif /* if ( configUSE_TASK_NOTIFICATIONS == 1 ) */
427-
/*-----------------------------------------------------------*/
425+
#endif /* ( configUSE_TASK_NOTIFICATIONS == 1 ) */
426+
/* ----------------------------------------------------------------------------------- */
428427

429428
#if( configUSE_RECURSIVE_MUTEXES == 1 )
430429

@@ -441,8 +440,8 @@ TaskHandle_t MPU_xQueueGetMutexHolder( QueueHandle_t xSemaphore )
441440

442441
#endif /* ( INCLUDE_xSemaphoreGetMutexHolder == 1 ) ) */
443442

444-
#endif /* if ( configUSE_RECURSIVE_MUTEXES == 1 ) */
445-
/*-----------------------------------------------------------*/
443+
#endif /* ( configUSE_RECURSIVE_MUTEXES == 1 ) */
444+
/* ----------------------------------------------------------------------------------- */
446445

447446
#if( configUSE_QUEUE_SETS == 1 )
448447

@@ -456,8 +455,8 @@ BaseType_t MPU_xQueueAddToSet(
456455
QueueSetHandle_t xQueueSet
457456
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
458457

459-
#endif /* if ( configUSE_QUEUE_SETS == 1 ) */
460-
/*-----------------------------------------------------------*/
458+
#endif /* ( configUSE_QUEUE_SETS == 1 ) */
459+
/* ----------------------------------------------------------------------------------- */
461460

462461
#if( configQUEUE_REGISTRY_SIZE > 0 )
463462

@@ -470,8 +469,8 @@ void MPU_vQueueUnregisterQueue( QueueHandle_t xQueue )
470469
const char * MPU_pcQueueGetName( QueueHandle_t xQueue )
471470
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
472471

473-
#endif /* if ( configQUEUE_REGISTRY_SIZE > 0 ) */
474-
/*-----------------------------------------------------------*/
472+
#endif /* ( configQUEUE_REGISTRY_SIZE > 0 ) */
473+
/* ----------------------------------------------------------------------------------- */
475474

476475
#if( configUSE_TIMERS == 1 )
477476

@@ -508,7 +507,7 @@ TickType_t MPU_xTimerGetPeriod( TimerHandle_t xTimer )
508507
TickType_t MPU_xTimerGetExpiryTime( TimerHandle_t xTimer )
509508
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
510509

511-
#endif /* if ( configUSE_TIMERS == 1 ) */
512-
/*-----------------------------------------------------------*/
510+
#endif /* ( configUSE_TIMERS == 1 ) */
511+
/* ----------------------------------------------------------------------------------- */
513512

514513
#endif /* MPU_PROTOTYPES_H */

0 commit comments

Comments
 (0)