git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1759 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 5 insertions, 6 deletions

diff --git a/os/kernel/src/chdebug.c b/os/kernel/src/chdebug.c
index 462f2559e..15a2f3e92 100644
--- a/os/kernel/src/chdebug.c
+++ b/os/kernel/src/chdebug.c
@@ -50,15 +50,14 @@ void trace_init(void) {
 /**

  * @brief   Inserts in the circular debug trace buffer a context switch record.

  *

- * @param[in] ntp       the thread to be switched in

  * @param[in] otp       the thread being switched out

  */

-void chDbgTrace(Thread *ntp, Thread *otp) {

+void chDbgTrace(Thread *otp) {

 

   trace_buffer.tb_ptr->cse_wtobjp = otp->p_u.wtobjp;

   trace_buffer.tb_ptr->cse_time = chTimeNow();

   trace_buffer.tb_ptr->cse_state = otp->p_state;

-  trace_buffer.tb_ptr->cse_tid = (unsigned)ntp >> 4;

+  trace_buffer.tb_ptr->cse_tid = (unsigned)currp >> 6;

   if (++trace_buffer.tb_ptr >= &trace_buffer.tb_buffer[TRACE_BUFFER_SIZE])

     trace_buffer.tb_ptr = &trace_buffer.tb_buffer[0];

 }

diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c
index c75f099f6..d412798c0 100644
--- a/os/kernel/src/chschd.c
+++ b/os/kernel/src/chschd.c
@@ -101,7 +101,7 @@ void chSchGoSleepS(tstate_t newstate) {
 #endif

   setcurrp(fifo_remove(&rlist.r_queue));

   currp->p_state = THD_STATE_CURRENT;

-  chDbgTrace(currp, otp);

+  chDbgTrace(otp);

   chSysSwitchI(currp, otp);

 }

 #endif /* !defined(PORT_OPTIMIZED_GOSLEEPS) */

@@ -199,7 +199,7 @@ void chSchWakeupS(Thread *ntp, msg_t msg) {
 #endif

     setcurrp(ntp);

     ntp->p_state = THD_STATE_CURRENT;

-    chDbgTrace(ntp, otp);

+    chDbgTrace(otp);

     chSysSwitchI(ntp, otp);

   }

 }

@@ -222,7 +222,7 @@ void chSchDoRescheduleI(void) {
   setcurrp(fifo_remove(&rlist.r_queue));

   currp->p_state = THD_STATE_CURRENT;

   chSchReadyI(otp);

-  chDbgTrace(currp, otp);

+  chDbgTrace(otp);

   chSysSwitchI(currp, otp);

 }

 #endif /* !defined(PORT_OPTIMIZED_DORESCHEDULEI) */