LUO GANG / mbed-rtos-test

Official mbed Real Time Operating System based on the RTX implementation of the CMSIS-RTOS API open standard.

Fork of mbed-rtos by mbed official

Files at this revision

API Documentation at this revision

Revision 7:80173c64d05d, committed 2012-11-23

Comitter:
emilmont
Date:
Fri Nov 23 10:16:38 2012 +0000
Parent:
6:350b53afb889
Child:
8:88a1a9c26ae3
Commit message:
Avoid using C++ keyword for C structure filed name

Changed in this revision

rtx/rt_HAL_CM.h Show annotated file Show diff for this revision Revisions of this file
rtx/rt_Task.c Show annotated file Show diff for this revision Revisions of this file
rtx/rt_TypeDef.h Show annotated file Show diff for this revision Revisions of this file 
--- a/rtx/rt_HAL_CM.h	Fri Nov 23 09:57:31 2012 +0000
+++ b/rtx/rt_HAL_CM.h	Fri Nov 23 10:16:38 2012 +0000
@@ -262,7 +262,7 @@
 #ifdef DBG_MSG
 #define DBG_INIT() dbg_init()
 #define DBG_TASK_NOTIFY(p_tcb,create) if (dbg_msg) dbg_task_notify(p_tcb,create)
-#define DBG_TASK_SWITCH(task_id)      if (dbg_msg && (os_tsk.new!=os_tsk.run)) \
+#define DBG_TASK_SWITCH(task_id)      if (dbg_msg && (os_tsk.new_tsk != os_tsk.run)) \
                                                    dbg_task_switch(task_id)
 #else
 #define DBG_INIT()

--- a/rtx/rt_Task.c	Fri Nov 23 09:57:31 2012 +0000
+++ b/rtx/rt_Task.c	Fri Nov 23 10:16:38 2012 +0000
@@ -106,7 +106,7 @@
 
 void rt_switch_req (P_TCB p_new) {
   /* Switch to next task (identified by "p_new"). */
-  os_tsk.new   = p_new;
+  os_tsk.new_tsk   = p_new;
   p_new->state = RUNNING;
   DBG_TASK_SWITCH(p_new->task_id);
 }

--- a/rtx/rt_TypeDef.h	Fri Nov 23 09:57:31 2012 +0000
+++ b/rtx/rt_TypeDef.h	Fri Nov 23 10:16:38 2012 +0000
@@ -58,7 +58,7 @@
 
 typedef struct OS_TSK {
   P_TCB  run;                     /* Current running task                    */
-  P_TCB  new;                     /* Scheduled task to run                   */
+  P_TCB  new_tsk;                 /* Scheduled task to run                   */
 } *P_TSK;
 
 typedef struct OS_ROBIN {         /* Round Robin Control                     */