mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-04-19 21:11:57 -04:00
Remove portALIGNMENT_ASSERT_pxCurrentTCB() macro, which serves no purpose.
This commit is contained in:
parent
6cbbfd2eb5
commit
a7c47131fa
|
@ -231,10 +231,6 @@ typedef portBASE_TYPE (*pdTASK_HOOK_CODE)( void * );
|
||||||
#define configASSERT( x )
|
#define configASSERT( x )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef portALIGNMENT_ASSERT_pxCurrentTCB
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB configASSERT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The timers module relies on xTaskGetSchedulerState(). */
|
/* The timers module relies on xTaskGetSchedulerState(). */
|
||||||
#if configUSE_TIMERS == 1
|
#if configUSE_TIMERS == 1
|
||||||
|
|
||||||
|
|
|
@ -214,10 +214,6 @@ extern void vPortExitCritical( void );
|
||||||
|
|
||||||
#define portNOP()
|
#define portNOP()
|
||||||
|
|
||||||
/* There are an uneven number of items on the initial stack, so
|
|
||||||
portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,10 +136,6 @@ extern void vPortClearInterruptMask( unsigned long ulNewMaskValue );
|
||||||
#define portENTER_CRITICAL() vPortEnterCritical()
|
#define portENTER_CRITICAL() vPortEnterCritical()
|
||||||
#define portEXIT_CRITICAL() vPortExitCritical()
|
#define portEXIT_CRITICAL() vPortExitCritical()
|
||||||
|
|
||||||
/* There are an uneven number of items on the initial stack, so
|
|
||||||
portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------*/
|
/*-----------------------------------------------------------*/
|
||||||
|
|
||||||
/* Task function macros as described on the FreeRTOS.org WEB site. These are
|
/* Task function macros as described on the FreeRTOS.org WEB site. These are
|
||||||
|
|
|
@ -159,9 +159,6 @@ void vPortSetIPL( unsigned long ulNewIPL ) __attribute__((naked));
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* This macro is not appropriate for this port so is defined away. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB( x )
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------*/
|
/*-----------------------------------------------------------*/
|
||||||
|
|
||||||
/* Task function macros as described on the FreeRTOS.org WEB site. */
|
/* Task function macros as described on the FreeRTOS.org WEB site. */
|
||||||
|
|
|
@ -188,10 +188,6 @@ extern void vTaskExitCritical( void );
|
||||||
extern unsigned long uxPortSetInterruptMaskFromISR( void );
|
extern unsigned long uxPortSetInterruptMaskFromISR( void );
|
||||||
#define portSET_INTERRUPT_MASK_FROM_ISR() uxPortSetInterruptMaskFromISR()
|
#define portSET_INTERRUPT_MASK_FROM_ISR() uxPortSetInterruptMaskFromISR()
|
||||||
|
|
||||||
/* As this port holds a CSA address in pxTopOfStack, the assert that checks the
|
|
||||||
pxTopOfStack alignment is removed. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )
|
|
||||||
|
|
||||||
/* Pend a priority 1 interrupt, which will take care of the context switch. */
|
/* Pend a priority 1 interrupt, which will take care of the context switch. */
|
||||||
#define portYIELD_FROM_ISR( xHigherPriorityTaskWoken ) if( xHigherPriorityTaskWoken != pdFALSE ) { CPU_SRC0.bits.SETR = 1; _isync(); }
|
#define portYIELD_FROM_ISR( xHigherPriorityTaskWoken ) if( xHigherPriorityTaskWoken != pdFALSE ) { CPU_SRC0.bits.SETR = 1; _isync(); }
|
||||||
|
|
||||||
|
|
|
@ -157,11 +157,6 @@ extern void vPortClearInterruptMask( unsigned long ulNewMask );
|
||||||
#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x) vPortClearInterruptMask( x )
|
#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x) vPortClearInterruptMask( x )
|
||||||
/*-----------------------------------------------------------*/
|
/*-----------------------------------------------------------*/
|
||||||
|
|
||||||
/* There are an uneven number of items on the initial stack, so
|
|
||||||
portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )
|
|
||||||
/*-----------------------------------------------------------*/
|
|
||||||
|
|
||||||
/* Tickless idle/low power functionality. */
|
/* Tickless idle/low power functionality. */
|
||||||
#ifndef portSUPPRESS_TICKS_AND_SLEEP
|
#ifndef portSUPPRESS_TICKS_AND_SLEEP
|
||||||
extern void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime );
|
extern void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime );
|
||||||
|
|
|
@ -167,9 +167,6 @@ void vPortSetIPL( unsigned long ulNewIPL );
|
||||||
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
||||||
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
||||||
|
|
||||||
/* This macro is not appropriate for this port so is defined away. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB( x )
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -138,11 +138,6 @@ extern void vPortExitCritical( void );
|
||||||
|
|
||||||
/*-----------------------------------------------------------*/
|
/*-----------------------------------------------------------*/
|
||||||
|
|
||||||
/* There are an uneven number of items on the initial stack, so
|
|
||||||
portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )
|
|
||||||
/*-----------------------------------------------------------*/
|
|
||||||
|
|
||||||
/* Tickless idle/low power functionality. */
|
/* Tickless idle/low power functionality. */
|
||||||
#ifndef portSUPPRESS_TICKS_AND_SLEEP
|
#ifndef portSUPPRESS_TICKS_AND_SLEEP
|
||||||
extern void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime );
|
extern void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime );
|
||||||
|
|
|
@ -172,9 +172,6 @@ extern void vTaskExitCritical( void );
|
||||||
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
||||||
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
||||||
|
|
||||||
/* This macro is not appropriate for this port so is defined away. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB( x )
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -162,9 +162,6 @@ extern void vTaskExitCritical( void );
|
||||||
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
||||||
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
|
||||||
|
|
||||||
/* This macro is not appropriate for this port so is defined away. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB( x )
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -155,10 +155,6 @@ extern void vPortExitCritical( void );
|
||||||
#define portENTER_CRITICAL() vPortEnterCritical()
|
#define portENTER_CRITICAL() vPortEnterCritical()
|
||||||
#define portEXIT_CRITICAL() vPortExitCritical()
|
#define portEXIT_CRITICAL() vPortExitCritical()
|
||||||
|
|
||||||
/* There are an uneven number of items on the initial stack, so
|
|
||||||
portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */
|
|
||||||
#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------*/
|
/*-----------------------------------------------------------*/
|
||||||
|
|
||||||
/* Task function macros as described on the FreeRTOS.org WEB site. */
|
/* Task function macros as described on the FreeRTOS.org WEB site. */
|
||||||
|
|
|
@ -540,9 +540,6 @@ tskTCB * pxNewTCB;
|
||||||
}
|
}
|
||||||
#endif /* portUSING_MPU_WRAPPERS */
|
#endif /* portUSING_MPU_WRAPPERS */
|
||||||
|
|
||||||
/* Check the alignment of the initialised stack. */
|
|
||||||
portALIGNMENT_ASSERT_pxCurrentTCB( ( ( ( unsigned long ) pxNewTCB->pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );
|
|
||||||
|
|
||||||
if( ( void * ) pxCreatedTask != NULL )
|
if( ( void * ) pxCreatedTask != NULL )
|
||||||
{
|
{
|
||||||
/* Pass the TCB out - in an anonymous way. The calling function/
|
/* Pass the TCB out - in an anonymous way. The calling function/
|
||||||
|
@ -1843,10 +1840,10 @@ void vTaskSwitchContext( void )
|
||||||
ulTotalRunTime = portGET_RUN_TIME_COUNTER_VALUE();
|
ulTotalRunTime = portGET_RUN_TIME_COUNTER_VALUE();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Add the amount of time the task has been running to the
|
/* Add the amount of time the task has been running to the
|
||||||
accumulated time so far. The time the task started running was
|
accumulated time so far. The time the task started running was
|
||||||
stored in ulTaskSwitchedInTime. Note that there is no overflow
|
stored in ulTaskSwitchedInTime. Note that there is no overflow
|
||||||
protection here so count values are only valid until the timer
|
protection here so count values are only valid until the timer
|
||||||
overflows. The guard against negative values is to protect
|
overflows. The guard against negative values is to protect
|
||||||
against suspect run time stat counter implementations - which
|
against suspect run time stat counter implementations - which
|
||||||
are provided by the application, not the kernel. */
|
are provided by the application, not the kernel. */
|
||||||
|
|
Loading…
Reference in a new issue