Skip to content

Commit 2f157af

Browse files
chinglee-iotchinglee-iot
committed
Use portTASK_FUNCTION_PROTO to replace portNORETURN
* Use portTASK_FUNCTION_PROTO to replace portNORETURN
1 parent 4a35c97 commit 2f157af

File tree

29 files changed

+4
-36
lines changed

29 files changed

+4
-36
lines changed

‎include/FreeRTOS.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -895,10 +895,6 @@
895895
#define portDONT_DISCARD
896896
#endif
897897

898-
#ifndef portNORETURN
899-
#define portNORETURN
900-
#endif
901-
902898
#ifndef configUSE_TIME_SLICING
903899
#define configUSE_TIME_SLICING 1
904900
#endif

‎portable/ARMv8M/non_secure/portable/GCC/ARM_CM23/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M23"
5252
#define portHAS_BASEPRI 0
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/ARMv8M/non_secure/portable/GCC/ARM_CM23_NTZ/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M23"
5252
#define portHAS_BASEPRI 0
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/ARMv8M/non_secure/portable/GCC/ARM_CM33/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M33"
5252
#define portHAS_BASEPRI 1
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/ARMv8M/non_secure/portable/GCC/ARM_CM33_NTZ/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M33"
5252
#define portHAS_BASEPRI 1
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/ARMv8M/non_secure/portable/GCC/ARM_CM35P/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M35P"
5252
#define portHAS_BASEPRI 1
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/ARMv8M/non_secure/portable/GCC/ARM_CM55/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#define portARCH_NAME "Cortex-M55"
5757
#define portHAS_BASEPRI 1
5858
#define portDONT_DISCARD __attribute__( ( used ) )
59-
#define portNORETURN __attribute__( ( noreturn ) )
6059
/*-----------------------------------------------------------*/
6160

6261
/* ARMv8-M common port configurations. */

‎portable/ARMv8M/non_secure/portable/GCC/ARM_CM85/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#define portARCH_NAME "Cortex-M85"
5757
#define portHAS_BASEPRI 1
5858
#define portDONT_DISCARD __attribute__( ( used ) )
59-
#define portNORETURN __attribute__( ( noreturn ) )
6059
/*-----------------------------------------------------------*/
6160

6261
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM0/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ typedef unsigned long UBaseType_t;
7979
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
8080
#define portBYTE_ALIGNMENT 8
8181
#define portDONT_DISCARD __attribute__( ( used ) )
82-
#define portNORETURN __attribute__( ( noreturn ) )
8382
/*-----------------------------------------------------------*/
8483

8584

‎portable/GCC/ARM_CM23/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M23"
5252
#define portHAS_BASEPRI 0
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM23_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M23"
5252
#define portHAS_BASEPRI 0
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM3/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
8080
#define portBYTE_ALIGNMENT 8
8181
#define portDONT_DISCARD __attribute__( ( used ) )
82-
#define portNORETURN __attribute__( ( noreturn ) )
8382
/*-----------------------------------------------------------*/
8483

8584
/* Scheduler utilities. */

‎portable/GCC/ARM_CM33/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M33"
5252
#define portHAS_BASEPRI 1
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM33_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M33"
5252
#define portHAS_BASEPRI 1
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM35P/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M35P"
5252
#define portHAS_BASEPRI 1
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM35P_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#define portARCH_NAME "Cortex-M35P"
5252
#define portHAS_BASEPRI 1
5353
#define portDONT_DISCARD __attribute__( ( used ) )
54-
#define portNORETURN __attribute__( ( noreturn ) )
5554
/*-----------------------------------------------------------*/
5655

5756
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM3_MPU/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
116116
#define portBYTE_ALIGNMENT 8
117117
#define portDONT_DISCARD __attribute__( ( used ) )
118-
#define portNORETURN __attribute__( ( noreturn ) )
119118
/*-----------------------------------------------------------*/
120119

121120
/* SVC numbers for various services. */

‎portable/GCC/ARM_CM4F/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
8383
#define portBYTE_ALIGNMENT 8
8484
#define portDONT_DISCARD __attribute__( ( used ) )
85-
#define portNORETURN __attribute__( ( noreturn ) )
8685
/*-----------------------------------------------------------*/
8786

8887
/* Scheduler utilities. */

‎portable/GCC/ARM_CM4_MPU/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ typedef struct MPU_SETTINGS
203203
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
204204
#define portBYTE_ALIGNMENT 8
205205
#define portDONT_DISCARD __attribute__( ( used ) )
206-
#define portNORETURN __attribute__( ( noreturn ) )
207206
/*-----------------------------------------------------------*/
208207

209208
/* SVC numbers for various services. */

‎portable/GCC/ARM_CM55/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#define portARCH_NAME "Cortex-M55"
5757
#define portHAS_BASEPRI 1
5858
#define portDONT_DISCARD __attribute__( ( used ) )
59-
#define portNORETURN __attribute__( ( noreturn ) )
6059
/*-----------------------------------------------------------*/
6160

6261
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM55_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#define portARCH_NAME "Cortex-M55"
5757
#define portHAS_BASEPRI 1
5858
#define portDONT_DISCARD __attribute__( ( used ) )
59-
#define portNORETURN __attribute__( ( noreturn ) )
6059
/*-----------------------------------------------------------*/
6160

6261
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM7/r0p1/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
8080
#define portBYTE_ALIGNMENT 8
8181
#define portDONT_DISCARD __attribute__( ( used ) )
82-
#define portNORETURN __attribute__( ( noreturn ) )
8382
/*-----------------------------------------------------------*/
8483

8584
/* Scheduler utilities. */

‎portable/GCC/ARM_CM85/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#define portARCH_NAME "Cortex-M85"
5757
#define portHAS_BASEPRI 1
5858
#define portDONT_DISCARD __attribute__( ( used ) )
59-
#define portNORETURN __attribute__( ( noreturn ) )
6059
/*-----------------------------------------------------------*/
6160

6261
/* ARMv8-M common port configurations. */

‎portable/GCC/ARM_CM85_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#define portARCH_NAME "Cortex-M85"
5757
#define portHAS_BASEPRI 1
5858
#define portDONT_DISCARD __attribute__( ( used ) )
59-
#define portNORETURN __attribute__( ( noreturn ) )
6059
/*-----------------------------------------------------------*/
6160

6261
/* ARMv8-M common port configurations. */

‎portable/ThirdParty/GCC/Posix/portmacro.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ typedef unsigned long TickType_t;
7070
/*-----------------------------------------------------------*/
7171

7272
/* Architecture specifics. */
73-
#define portNORETURN __attribute__( ( noreturn ) )
74-
7573
#define portSTACK_GROWTH ( -1 )
7674
#define portHAS_STACK_OVERFLOW_CHECKING ( 1 )
7775
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
@@ -114,7 +112,7 @@ extern void vPortCancelThread( void *pxTaskToDelete );
114112
#define portCLEAN_UP_TCB( pxTCB ) vPortCancelThread( pxTCB )
115113
/*-----------------------------------------------------------*/
116114

117-
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
115+
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) __attribute__( ( noreturn ) )
118116
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
119117
/*-----------------------------------------------------------*/
120118

‎portable/ThirdParty/GCC/RP2040/include/portmacro.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
8181
#define portBYTE_ALIGNMENT 8
8282
#define portDONT_DISCARD __attribute__( ( used ) )
83-
#define portNORETURN __attribute__( ( noreturn ) )
8483
/* We have to use PICO_DIVIDER_DISABLE_INTERRUPTS as the source of truth rathern than our config,
8584
* as our FreeRTOSConfig.h header cannot be included by ASM code - which is what this affects in the SDK */
8685
#define portUSE_DIVIDER_SAVE_RESTORE !PICO_DIVIDER_DISABLE_INTERRUPTS

‎portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,6 @@
335335
/*-----------------------------------------------------------*/
336336

337337
/* Architecture specifics. */
338-
#define portNORETURN __attribute__( ( noreturn ) )
339-
340338
#define portSTACK_GROWTH ( -1 )
341339
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
342340
#define portBYTE_ALIGNMENT 4

‎tasks.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static void prvInitialiseTaskLists( void ) PRIVILEGED_FUNCTION;
432432
* void prvIdleTask( void *pvParameters );
433433
*
434434
*/
435-
static portTASK_FUNCTION_PROTO( prvIdleTask, pvParameters ) portNORETURN PRIVILEGED_FUNCTION;
435+
static portTASK_FUNCTION_PROTO( prvIdleTask, pvParameters ) PRIVILEGED_FUNCTION;
436436

437437
/*
438438
* Utility to free all memory allocated by the scheduler to hold a TCB,
@@ -3486,7 +3486,7 @@ void vTaskMissedYield( void )
34863486
*
34873487
*/
34883488

3489-
portTASK_FUNCTION( prvIdleTask, pvParameters )
3489+
static portTASK_FUNCTION( prvIdleTask, pvParameters )
34903490
{
34913491
/* Stop warnings. */
34923492
( void ) pvParameters;

‎timers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
* task. Other tasks communicate with the timer service task using the
159159
* xTimerQueue queue.
160160
*/
161-
static portTASK_FUNCTION_PROTO( prvTimerTask, pvParameters ) portNORETURN PRIVILEGED_FUNCTION;
161+
static portTASK_FUNCTION_PROTO( prvTimerTask, pvParameters ) PRIVILEGED_FUNCTION;
162162

163163
/*
164164
* Called by the timer service task to interpret and process a command it

0 commit comments

Comments
 (0)