Skip to content

Commit 37ebbd8

Browse files
authored
Fix SMP dev branch CI errors (#79)
* Fix uncrustify * Update lexicon * Remove tailing space * Ignore XMOS AICORE header check
1 parent 096a582 commit 37ebbd8

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/lexicon.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,6 +1521,7 @@ prstc
15211521
prttc
15221522
prv
15231523
prvaddcurrenttasktodelayedlist
1524+
prvcheckforrunstatechange
15241525
prvcheckinterfaces
15251526
prvchecktaskswaitingtermination
15261527
prvcopydatatoqueue

.github/scripts/kernel_checker.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
r'.*\.git.*',
8888
r'.*portable/IAR/AtmelSAM7S64/.*AT91SAM7.*',
8989
r'.*portable/GCC/ARM7_AT91SAM7S/.*',
90-
r'.*portable/MPLAB/PIC18F/stdio.h'
90+
r'.*portable/MPLAB/PIC18F/stdio.h',
91+
r'.*portable/ThirdParty/xClang/XCOREAI/*'
9192
]
9293

9394
KERNEL_THIRD_PARTY_PATTERNS = [

portable/ThirdParty/xClang/XCOREAI/portasm.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ rtos_interrupt_callback_common:
8787
bla r1} /* and call the callback function. */
8888

8989
{set sp, r4 /* Restore the task's SP now. */
90-
90+
9191
get r11, id} /* Get the logical core ID into r11. */
9292
ldaw r0, dp[rtos_core_map]
9393
ldw r0, r0[r11] /* Translate to the RTOS core ID into r0. */

tasks.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ typedef BaseType_t TaskRunning_t;
294294
/* Code below here allows infinite loop controlling, especially for the infinite loop
295295
* in idle task function (for example when performing unit tests). */
296296
#ifndef INFINITE_LOOP
297-
#define INFINITE_LOOP() 1
297+
#define INFINITE_LOOP() 1
298298
#endif
299299

300300
/*
@@ -460,8 +460,8 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended = ( UBaseType_t
460460

461461
/* Do not move these variables to function scope as doing so prevents the
462462
* code working with debuggers that need to remove the static qualifier. */
463-
PRIVILEGED_DATA static configRUN_TIME_COUNTER_TYPE ulTaskSwitchedInTime[ configNUMBER_OF_CORES ] = { 0UL }; /**< Holds the value of a timer/counter the last time a task was switched in. */
464-
PRIVILEGED_DATA static volatile configRUN_TIME_COUNTER_TYPE ulTotalRunTime[ configNUMBER_OF_CORES ] = { 0UL }; /**< Holds the total amount of execution time as defined by the run time counter clock. */
463+
PRIVILEGED_DATA static configRUN_TIME_COUNTER_TYPE ulTaskSwitchedInTime[ configNUMBER_OF_CORES ] = { 0UL }; /**< Holds the value of a timer/counter the last time a task was switched in. */
464+
PRIVILEGED_DATA static volatile configRUN_TIME_COUNTER_TYPE ulTotalRunTime[ configNUMBER_OF_CORES ] = { 0UL }; /**< Holds the total amount of execution time as defined by the run time counter clock. */
465465

466466
#endif
467467

@@ -796,7 +796,6 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
796796
* than priority level of currently ready tasks. */
797797
if( pxTCB->uxPriority >= uxTopReadyPriority )
798798
#else
799-
800799
/* Yield is not required for a task which is already running. */
801800
if( taskTASK_IS_RUNNING( pxTCB ) == pdFALSE )
802801
#endif
@@ -3738,7 +3737,7 @@ char * pcTaskGetName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char
37383737

37393738
return pxReturn;
37403739
}
3741-
#else
3740+
#else /* if ( configNUMBER_OF_CORES == 1 ) */
37423741
static TCB_t * prvSearchForNameWithinSingleList( List_t * pxList,
37433742
const char pcNameToQuery[] )
37443743
{

0 commit comments

Comments
 (0)