Skip to content

Commit 370498f

Browse files
SkptakSkptak
committed
Slight changes to formatting
1 parent 5f5ed08 commit 370498f

File tree

4 files changed

+163
-201
lines changed

4 files changed

+163
-201
lines changed

‎portable/GCC/ARM_CRx_MPU/.clang-format‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
Language: Cpp
3-
AlignAfterOpenBracket: BlockIndent
3+
AlignAfterOpenBracket: Align
44
AlignConsecutiveAssignments: None
55
AlignConsecutiveBitFields: AcrossEmptyLinesAndComments
66
AlignConsecutiveDeclarations: None
@@ -41,7 +41,7 @@ BraceWrapping:
4141
SplitEmptyFunction: true
4242
SplitEmptyRecord: true
4343
SplitEmptyNamespace: true
44-
BreakBeforeBinaryOperators: None
44+
BreakBeforeBinaryOperators: NonAssignment
4545
BreakBeforeBraces: Custom
4646
BreakBeforeConceptDeclarations: true
4747
BreakBeforeTernaryOperators: true
@@ -62,6 +62,7 @@ IndentExternBlock: NoIndent
6262
IndentGotoLabels: true
6363
IndentPPDirectives: BeforeHash
6464
IndentWidth: 4
65+
IndentWrappedFunctionNames: true
6566
KeepEmptyLinesAtTheStartOfBlocks: false
6667
MaxEmptyLinesToKeep: 1
6768
NamespaceIndentation: None

‎portable/GCC/ARM_CRx_MPU/mpu_wrappers_v2_asm.h‎

Lines changed: 89 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,17 @@ void MPU_vTaskSetTimeOutState( TimeOut_t * const pxTimeOut )
108108

109109
/* ----------------------------------------------------------------------------------- */
110110

111-
BaseType_t MPU_xTaskCheckForTimeOut(
112-
TimeOut_t * const pxTimeOut,
113-
TickType_t * const pxTicksToWait
114-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
111+
BaseType_t MPU_xTaskCheckForTimeOut( TimeOut_t * const pxTimeOut,
112+
TickType_t * const pxTicksToWait )
113+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
115114

116115
/* ----------------------------------------------------------------------------------- */
117116

118-
BaseType_t MPU_xQueueGenericSend(
119-
QueueHandle_t xQueue,
120-
const void * const pvItemToQueue,
121-
TickType_t xTicksToWait,
122-
const BaseType_t xCopyPosition
123-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
117+
BaseType_t MPU_xQueueGenericSend( QueueHandle_t xQueue,
118+
const void * const pvItemToQueue,
119+
TickType_t xTicksToWait,
120+
const BaseType_t xCopyPosition )
121+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
124122

125123
/* ----------------------------------------------------------------------------------- */
126124

@@ -134,18 +132,16 @@ UBaseType_t MPU_uxQueueSpacesAvailable( const QueueHandle_t xQueue )
134132

135133
/* ----------------------------------------------------------------------------------- */
136134

137-
BaseType_t MPU_xQueueReceive(
138-
QueueHandle_t xQueue,
139-
void * const pvBuffer,
140-
TickType_t xTicksToWait
141-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
135+
BaseType_t MPU_xQueueReceive( QueueHandle_t xQueue,
136+
void * const pvBuffer,
137+
TickType_t xTicksToWait )
138+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
142139
/* ----------------------------------------------------------------------------------- */
143140

144-
BaseType_t MPU_xQueuePeek(
145-
QueueHandle_t xQueue,
146-
void * const pvBuffer,
147-
TickType_t xTicksToWait
148-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
141+
BaseType_t MPU_xQueuePeek( QueueHandle_t xQueue,
142+
void * const pvBuffer,
143+
TickType_t xTicksToWait )
144+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
149145

150146
/* ----------------------------------------------------------------------------------- */
151147

@@ -154,21 +150,19 @@ BaseType_t MPU_xQueueSemaphoreTake( QueueHandle_t xQueue, TickType_t xTicksToWai
154150

155151
/* ----------------------------------------------------------------------------------- */
156152

157-
size_t MPU_xStreamBufferSend(
158-
StreamBufferHandle_t xStreamBuffer,
159-
const void * pvTxData,
160-
size_t xDataLengthBytes,
161-
TickType_t xTicksToWait
162-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
153+
size_t MPU_xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
154+
const void * pvTxData,
155+
size_t xDataLengthBytes,
156+
TickType_t xTicksToWait )
157+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
163158

164159
/* ----------------------------------------------------------------------------------- */
165160

166-
size_t MPU_xStreamBufferReceive(
167-
StreamBufferHandle_t xStreamBuffer,
168-
void * pvRxData,
169-
size_t xBufferLengthBytes,
170-
TickType_t xTicksToWait
171-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
161+
size_t MPU_xStreamBufferReceive( StreamBufferHandle_t xStreamBuffer,
162+
void * pvRxData,
163+
size_t xBufferLengthBytes,
164+
TickType_t xTicksToWait )
165+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
172166

173167
/* ----------------------------------------------------------------------------------- */
174168

@@ -192,10 +186,9 @@ size_t MPU_xStreamBufferBytesAvailable( StreamBufferHandle_t xStreamBuffer )
192186

193187
/* ----------------------------------------------------------------------------------- */
194188

195-
BaseType_t MPU_xStreamBufferSetTriggerLevel(
196-
StreamBufferHandle_t xStreamBuffer,
197-
size_t xTriggerLevel
198-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
189+
BaseType_t MPU_xStreamBufferSetTriggerLevel( StreamBufferHandle_t xStreamBuffer,
190+
size_t xTriggerLevel )
191+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
199192

200193
/* ----------------------------------------------------------------------------------- */
201194

@@ -204,44 +197,39 @@ size_t MPU_xStreamBufferNextMessageLengthBytes( StreamBufferHandle_t xStreamBuff
204197

205198
/* ----------------------------------------------------------------------------------- */
206199

207-
EventBits_t MPU_xEventGroupWaitBits(
208-
EventGroupHandle_t xEventGroup,
209-
const EventBits_t uxBitsToWaitFor,
210-
const BaseType_t xClearOnExit,
211-
const BaseType_t xWaitForAllBits,
212-
TickType_t xTicksToWait
213-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
200+
EventBits_t MPU_xEventGroupWaitBits( EventGroupHandle_t xEventGroup,
201+
const EventBits_t uxBitsToWaitFor,
202+
const BaseType_t xClearOnExit,
203+
const BaseType_t xWaitForAllBits,
204+
TickType_t xTicksToWait )
205+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
214206
/* ----------------------------------------------------------------------------------- */
215207

216-
EventBits_t MPU_xEventGroupClearBits(
217-
EventGroupHandle_t xEventGroup,
218-
const EventBits_t uxBitsToClear
219-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
208+
EventBits_t MPU_xEventGroupClearBits( EventGroupHandle_t xEventGroup,
209+
const EventBits_t uxBitsToClear )
210+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
220211

221212
/* ----------------------------------------------------------------------------------- */
222213

223-
EventBits_t MPU_xEventGroupSetBits(
224-
EventGroupHandle_t xEventGroup,
225-
const EventBits_t uxBitsToSet
226-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
214+
EventBits_t MPU_xEventGroupSetBits( EventGroupHandle_t xEventGroup,
215+
const EventBits_t uxBitsToSet )
216+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
227217

228218
/* ----------------------------------------------------------------------------------- */
229219

230-
EventBits_t MPU_xEventGroupSync(
231-
EventGroupHandle_t xEventGroup,
232-
const EventBits_t uxBitsToSet,
233-
const EventBits_t uxBitsToWaitFor,
234-
TickType_t xTicksToWait
235-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
220+
EventBits_t MPU_xEventGroupSync( EventGroupHandle_t xEventGroup,
221+
const EventBits_t uxBitsToSet,
222+
const EventBits_t uxBitsToWaitFor,
223+
TickType_t xTicksToWait )
224+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
236225

237226
/* ----------------------------------------------------------------------------------- */
238227

239228
#if( INCLUDE_xTaskDelayUntil == 1 )
240229

241-
BaseType_t MPU_xTaskDelayUntil(
242-
TickType_t * const pxPreviousWakeTime,
243-
const TickType_t xTimeIncrement
244-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
230+
BaseType_t MPU_xTaskDelayUntil( TickType_t * const pxPreviousWakeTime,
231+
const TickType_t xTimeIncrement )
232+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
245233

246234
#endif /* ( INCLUDE_xTaskDelayUntil == 1 ) */
247235
/* ----------------------------------------------------------------------------------- */
@@ -316,7 +304,8 @@ configRUN_TIME_COUNTER_TYPE MPU_ulTaskGetIdleRunTimeCounter( void )
316304

317305
#if( configUSE_APPLICATION_TASK_TAG == 1 )
318306

319-
void MPU_vTaskSetApplicationTaskTag( TaskHandle_t xTask, TaskHookFunction_t pxHookFunction )
307+
void MPU_vTaskSetApplicationTaskTag( TaskHandle_t xTask,
308+
TaskHookFunction_t pxHookFunction )
320309
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
321310

322311
TaskHookFunction_t MPU_xTaskGetApplicationTaskTag( TaskHandle_t xTask )
@@ -327,16 +316,14 @@ TaskHookFunction_t MPU_xTaskGetApplicationTaskTag( TaskHandle_t xTask )
327316

328317
#if( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )
329318

330-
void MPU_vTaskSetThreadLocalStoragePointer(
331-
TaskHandle_t xTaskToSet,
332-
BaseType_t xIndex,
333-
void * pvValue
334-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
319+
void MPU_vTaskSetThreadLocalStoragePointer( TaskHandle_t xTaskToSet,
320+
BaseType_t xIndex,
321+
void * pvValue )
322+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
335323

336-
void * MPU_pvTaskGetThreadLocalStoragePointer(
337-
TaskHandle_t xTaskToQuery,
338-
BaseType_t xIndex
339-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
324+
void * MPU_pvTaskGetThreadLocalStoragePointer( TaskHandle_t xTaskToQuery,
325+
BaseType_t xIndex )
326+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
340327

341328
#endif /* ( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 ) */
342329
/* ----------------------------------------------------------------------------------- */
@@ -362,7 +349,8 @@ configSTACK_DEPTH_TYPE MPU_uxTaskGetStackHighWaterMark2( TaskHandle_t xTask )
362349
TaskHandle_t MPU_xTaskGetCurrentTaskHandle( void )
363350
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
364351

365-
#endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) */
352+
#endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) \
353+
*/
366354
/* ----------------------------------------------------------------------------------- */
367355

368356
#if( INCLUDE_xTaskGetSchedulerState == 1 )
@@ -375,18 +363,16 @@ BaseType_t MPU_xTaskGetSchedulerState( void )
375363

376364
#if( configUSE_TRACE_FACILITY == 1 )
377365

378-
void MPU_vTaskGetInfo(
379-
TaskHandle_t xTask,
380-
TaskStatus_t * pxTaskStatus,
381-
BaseType_t xGetFreeStackSpace,
382-
eTaskState eState
383-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
366+
void MPU_vTaskGetInfo( TaskHandle_t xTask,
367+
TaskStatus_t * pxTaskStatus,
368+
BaseType_t xGetFreeStackSpace,
369+
eTaskState eState )
370+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
384371

385-
UBaseType_t MPU_uxTaskGetSystemState(
386-
TaskStatus_t * const pxTaskStatusArray,
387-
const UBaseType_t uxArraySize,
388-
configRUN_TIME_COUNTER_TYPE * const pulTotalRunTime
389-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
372+
UBaseType_t MPU_uxTaskGetSystemState( TaskStatus_t * const pxTaskStatusArray,
373+
const UBaseType_t uxArraySize,
374+
configRUN_TIME_COUNTER_TYPE * const pulTotalRunTime )
375+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
390376

391377
UBaseType_t MPU_uxEventGroupGetNumber( void * xEventGroup )
392378
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
@@ -402,25 +388,23 @@ void MPU_vEventGroupSetNumber( void * xEventGroup, UBaseType_t uxEventGroupNumbe
402388
BaseType_t MPU_xTaskGenericNotifyEntry( const xTaskGenericNotifyParams_t * pxParams )
403389
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
404390

405-
BaseType_t MPU_xTaskGenericNotifyWaitEntry( const xTaskGenericNotifyWaitParams_t * pxParams
406-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
391+
BaseType_t MPU_xTaskGenericNotifyWaitEntry(
392+
const xTaskGenericNotifyWaitParams_t * pxParams )
393+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
407394

408-
uint32_t MPU_ulTaskGenericNotifyTake(
409-
UBaseType_t uxIndexToWaitOn,
410-
BaseType_t xClearCountOnExit,
411-
TickType_t xTicksToWait
412-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
395+
uint32_t MPU_ulTaskGenericNotifyTake( UBaseType_t uxIndexToWaitOn,
396+
BaseType_t xClearCountOnExit,
397+
TickType_t xTicksToWait )
398+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
413399

414-
BaseType_t MPU_xTaskGenericNotifyStateClear(
415-
TaskHandle_t xTask,
416-
UBaseType_t uxIndexToClear
417-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
400+
BaseType_t MPU_xTaskGenericNotifyStateClear( TaskHandle_t xTask,
401+
UBaseType_t uxIndexToClear )
402+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
418403

419-
uint32_t MPU_ulTaskGenericNotifyValueClear(
420-
TaskHandle_t xTask,
421-
UBaseType_t uxIndexToClear,
422-
uint32_t ulBitsToClear
423-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
404+
uint32_t MPU_ulTaskGenericNotifyValueClear( TaskHandle_t xTask,
405+
UBaseType_t uxIndexToClear,
406+
uint32_t ulBitsToClear )
407+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
424408

425409
#endif /* ( configUSE_TASK_NOTIFICATIONS == 1 ) */
426410
/* ----------------------------------------------------------------------------------- */
@@ -445,15 +429,13 @@ TaskHandle_t MPU_xQueueGetMutexHolder( QueueHandle_t xSemaphore )
445429

446430
#if( configUSE_QUEUE_SETS == 1 )
447431

448-
QueueSetMemberHandle_t MPU_xQueueSelectFromSet(
449-
QueueSetHandle_t xQueueSet,
450-
const TickType_t xTicksToWait
451-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
432+
QueueSetMemberHandle_t MPU_xQueueSelectFromSet( QueueSetHandle_t xQueueSet,
433+
const TickType_t xTicksToWait )
434+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
452435

453-
BaseType_t MPU_xQueueAddToSet(
454-
QueueSetMemberHandle_t xQueueOrSemaphore,
455-
QueueSetHandle_t xQueueSet
456-
) __attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
436+
BaseType_t MPU_xQueueAddToSet( QueueSetMemberHandle_t xQueueOrSemaphore,
437+
QueueSetHandle_t xQueueSet )
438+
__attribute__( ( naked ) ) FREERTOS_SYSTEM_CALL;
457439

458440
#endif /* ( configUSE_QUEUE_SETS == 1 ) */
459441
/* ----------------------------------------------------------------------------------- */

0 commit comments

Comments
 (0)