Skip to content

Commit fc10b76

Browse files
适配5.0.0 rt_thread结构体显示继承rt_object
修改 task.c 编译错误,目前struct rt_thread结构体已无type和name字段,而是显式继承struct rt_object结构体,见 [kernel] 将rt_thread结构体改为显式继承rt_object
1 parent fbe0e6c commit fc10b76

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

FreeRTOS/tasks.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,11 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
147147
prvInitialiseNewTask( pxTaskCode, pcName, ( uint32_t ) usStackDepth, pvParameters, uxPriority, pxCreatedTask, pxNewTCB, ( StackType_t * ) stack_start );
148148
xReturn = pdPASS;
149149
/* Mark as dynamic */
150-
( ( struct rt_thread * ) pxNewTCB )->type &= ~RT_Object_Class_Static;
150+
#if RT_VER_NUM < 0x50000
151+
( ( struct rt_thread * ) pxNewTCB )-> type &= ~RT_Object_Class_Static;
152+
#else
153+
( ( struct rt_thread * ) pxNewTCB )-> parent.type &= ~RT_Object_Class_Static;
154+
#endif /* RT_VER_NUM < 0x50000 */
151155
rt_thread_startup( ( rt_thread_t ) pxNewTCB );
152156
}
153157
else
@@ -556,7 +560,11 @@ UBaseType_t uxTaskGetNumberOfTasks( void )
556560
char * pcTaskGetName( TaskHandle_t xTaskToQuery )
557561
{
558562
rt_thread_t thread = ( rt_thread_t ) prvGetTCBFromHandle( xTaskToQuery );
563+
#if RT_VER_NUM < 0x50000
559564
return &( thread->name[ 0 ] );
565+
#else
566+
return &( thread->parent.name[ 0 ] );
567+
#endif /* RT_VER_NUM < 0x50000 */
560568
}
561569
/*-----------------------------------------------------------*/
562570

0 commit comments

Comments
 (0)