Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SMP dev branch CI errors #79

Merged
merged 4 commits into from
Apr 25, 2023
Merged

Fix SMP dev branch CI errors #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6ec3c7
Fix uncrustify
chinglee-iot Apr 24, 2023
8037d3b
Update lexicon
chinglee-iot Apr 24, 2023
4e2c58d
Remove tailing space
chinglee-iot Apr 24, 2023
8748c6e
Ignore XMOS AICORE header check
chinglee-iot Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/lexicon.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,7 @@ prstc
prttc
prv
prvaddcurrenttasktodelayedlist
prvcheckforrunstatechange
prvcheckinterfaces
prvchecktaskswaitingtermination
prvcopydatatoqueue
Expand Down
3 changes: 2 additions & 1 deletion .github/scripts/kernel_checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
r'.*\.git.*',
r'.*portable/IAR/AtmelSAM7S64/.*AT91SAM7.*',
r'.*portable/GCC/ARM7_AT91SAM7S/.*',
r'.*portable/MPLAB/PIC18F/stdio.h'
r'.*portable/MPLAB/PIC18F/stdio.h',
r'.*portable/ThirdParty/xClang/XCOREAI/*'
]

KERNEL_THIRD_PARTY_PATTERNS = [
Expand Down
2 changes: 1 addition & 1 deletion portable/ThirdParty/xClang/XCOREAI/portasm.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ rtos_interrupt_callback_common:
bla r1} /* and call the callback function. */

{set sp, r4 /* Restore the task's SP now. */

get r11, id} /* Get the logical core ID into r11. */
ldaw r0, dp[rtos_core_map]
ldw r0, r0[r11] /* Translate to the RTOS core ID into r0. */
Expand Down
9 changes: 4 additions & 5 deletions tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ typedef BaseType_t TaskRunning_t;
/* Code below here allows infinite loop controlling, especially for the infinite loop
* in idle task function (for example when performing unit tests). */
#ifndef INFINITE_LOOP
#define INFINITE_LOOP() 1
#define INFINITE_LOOP() 1
#endif

/*
Expand Down Expand Up @@ -460,8 +460,8 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended = ( UBaseType_t

/* Do not move these variables to function scope as doing so prevents the
* code working with debuggers that need to remove the static qualifier. */
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. */
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. */
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. */
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. */

#endif

Expand Down Expand Up @@ -796,7 +796,6 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
* than priority level of currently ready tasks. */
if( pxTCB->uxPriority >= uxTopReadyPriority )
#else

/* Yield is not required for a task which is already running. */
if( taskTASK_IS_RUNNING( pxTCB ) == pdFALSE )
#endif
Expand Down Expand Up @@ -3738,7 +3737,7 @@ char * pcTaskGetName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char

return pxReturn;
}
#else
#else /* if ( configNUMBER_OF_CORES == 1 ) */
static TCB_t * prvSearchForNameWithinSingleList( List_t * pxList,
const char pcNameToQuery[] )
{
Expand Down