I2C. Merged changes from trunk.

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

1 files changed, 12 insertions, 11 deletions

diff --git a/os/kernel/src/chdebug.c b/os/kernel/src/chdebug.c
index 3c3c34c70..0e378cc6d 100644
--- a/os/kernel/src/chdebug.c
+++ b/os/kernel/src/chdebug.c
@@ -40,7 +40,7 @@
 /**

  * @brief   Public trace buffer.

  */

-TraceBuffer trace_buffer;

+ch_trace_buffer_t dbg_trace_buffer;

 

 /**

  * @brief   Trace circular buffer subsystem initialization.

@@ -48,8 +48,8 @@ TraceBuffer trace_buffer;
  */

 void _trace_init(void) {

 

-  trace_buffer.tb_size = TRACE_BUFFER_SIZE;

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

+  dbg_trace_buffer.tb_size = CH_TRACE_BUFFER_SIZE;

+  dbg_trace_buffer.tb_ptr = &dbg_trace_buffer.tb_buffer[0];

 }

 

 /**

@@ -61,12 +61,13 @@ void _trace_init(void) {
  */

 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)currp >> 6;

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

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

+  dbg_trace_buffer.tb_ptr->se_time   = chTimeNow();

+  dbg_trace_buffer.tb_ptr->se_tp     = currp;

+  dbg_trace_buffer.tb_ptr->se_wtobjp = otp->p_u.wtobjp;

+  dbg_trace_buffer.tb_ptr->se_state  = (uint8_t)otp->p_state;

+  if (++dbg_trace_buffer.tb_ptr >=

+      &dbg_trace_buffer.tb_buffer[CH_TRACE_BUFFER_SIZE])

+    dbg_trace_buffer.tb_ptr = &dbg_trace_buffer.tb_buffer[0];

 }

 #endif /* CH_DBG_ENABLE_TRACE */

 

@@ -78,7 +79,7 @@ void chDbgTrace(Thread *otp) {
  *          written once and then the system is halted. This variable can be

  *          set to @p NULL if the halt is caused by a stack overflow.

  */

-char *panic_msg;

+char *dbg_panic_msg;

 

 /**

  * @brief   Prints a panic message on the console and then halts the system.

@@ -87,7 +88,7 @@ char *panic_msg;
  */

 void chDbgPanic(char *msg) {

 

-  panic_msg = msg;

+  dbg_panic_msg = msg;

   chSysHalt();

 }

 #endif /* CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || CH_DBG_ENABLE_STACK_CHECK */