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

3 files changed, 30 insertions, 33 deletions

diff --git a/os/rt/src/chdebug.c b/os/rt/src/chdebug.c
index f9408d515..bf31b7cac 100644
--- a/os/rt/src/chdebug.c
+++ b/os/rt/src/chdebug.c
@@ -114,7 +114,7 @@
  */

 void _dbg_check_disable(void) {

 

-  if ((ch.dbg_isr_cnt != 0) || (ch.dbg_lock_cnt != 0))

+  if ((ch.dbg.isr_cnt != 0) || (ch.dbg.lock_cnt != 0))

     chSysHalt("SV#1");

 }

 

@@ -125,7 +125,7 @@ void _dbg_check_disable(void) {
  */

 void _dbg_check_suspend(void) {

 

-  if ((ch.dbg_isr_cnt != 0) || (ch.dbg_lock_cnt != 0))

+  if ((ch.dbg.isr_cnt != 0) || (ch.dbg.lock_cnt != 0))

     chSysHalt("SV#2");

 }

 

@@ -136,7 +136,7 @@ void _dbg_check_suspend(void) {
  */

 void _dbg_check_enable(void) {

 

-  if ((ch.dbg_isr_cnt != 0) || (ch.dbg_lock_cnt != 0))

+  if ((ch.dbg.isr_cnt != 0) || (ch.dbg.lock_cnt != 0))

     chSysHalt("SV#3");

 }

 

@@ -147,7 +147,7 @@ void _dbg_check_enable(void) {
  */

 void _dbg_check_lock(void) {

 

-  if ((ch.dbg_isr_cnt != 0) || (ch.dbg_lock_cnt != 0))

+  if ((ch.dbg.isr_cnt != 0) || (ch.dbg.lock_cnt != 0))

     chSysHalt("SV#4");

   _dbg_enter_lock();

 }

@@ -159,7 +159,7 @@ void _dbg_check_lock(void) {
  */

 void _dbg_check_unlock(void) {

 

-  if ((ch.dbg_isr_cnt != 0) || (ch.dbg_lock_cnt <= 0))

+  if ((ch.dbg.isr_cnt != 0) || (ch.dbg.lock_cnt <= 0))

     chSysHalt("SV#5");

   _dbg_leave_lock();

 }

@@ -171,7 +171,7 @@ void _dbg_check_unlock(void) {
  */

 void _dbg_check_lock_from_isr(void) {

 

-  if ((ch.dbg_isr_cnt <= 0) || (ch.dbg_lock_cnt != 0))

+  if ((ch.dbg.isr_cnt <= 0) || (ch.dbg.lock_cnt != 0))

     chSysHalt("SV#6");

   _dbg_enter_lock();

 }

@@ -183,7 +183,7 @@ void _dbg_check_lock_from_isr(void) {
  */

 void _dbg_check_unlock_from_isr(void) {

 

-  if ((ch.dbg_isr_cnt <= 0) || (ch.dbg_lock_cnt <= 0))

+  if ((ch.dbg.isr_cnt <= 0) || (ch.dbg.lock_cnt <= 0))

     chSysHalt("SV#7");

   _dbg_leave_lock();

 }

@@ -196,9 +196,9 @@ void _dbg_check_unlock_from_isr(void) {
 void _dbg_check_enter_isr(void) {

 

   port_lock_from_isr();

-  if ((ch.dbg_isr_cnt < 0) || (ch.dbg_lock_cnt != 0))

+  if ((ch.dbg.isr_cnt < 0) || (ch.dbg.lock_cnt != 0))

     chSysHalt("SV#8");

-  ch.dbg_isr_cnt++;

+  ch.dbg.isr_cnt++;

   port_unlock_from_isr();

 }

 

@@ -210,9 +210,9 @@ void _dbg_check_enter_isr(void) {
 void _dbg_check_leave_isr(void) {

 

   port_lock_from_isr();

-  if ((ch.dbg_isr_cnt <= 0) || (ch.dbg_lock_cnt != 0))

+  if ((ch.dbg.isr_cnt <= 0) || (ch.dbg.lock_cnt != 0))

     chSysHalt("SV#9");

-  ch.dbg_isr_cnt--;

+  ch.dbg.isr_cnt--;

   port_unlock_from_isr();

 }

 

@@ -226,7 +226,7 @@ void _dbg_check_leave_isr(void) {
  */

 void chDbgCheckClassI(void) {

 

-  if ((ch.dbg_isr_cnt < 0) || (ch.dbg_lock_cnt <= 0))

+  if ((ch.dbg.isr_cnt < 0) || (ch.dbg.lock_cnt <= 0))

     chSysHalt("SV#10");

 }

 

@@ -240,7 +240,7 @@ void chDbgCheckClassI(void) {
  */

 void chDbgCheckClassS(void) {

 

-  if ((ch.dbg_isr_cnt != 0) || (ch.dbg_lock_cnt <= 0))

+  if ((ch.dbg.isr_cnt != 0) || (ch.dbg.lock_cnt <= 0))

     chSysHalt("SV#11");

 }

 

@@ -251,10 +251,10 @@ void chDbgCheckClassS(void) {
  * @brief   Trace circular buffer subsystem initialization.

  * @note    Internal use only.

  */

-void _trace_init(void) {

+void _dbg_trace_init(void) {

 

-  ch.dbg_trace_buffer.tb_size = CH_DBG_TRACE_BUFFER_SIZE;

-  ch.dbg_trace_buffer.tb_ptr = &ch.dbg_trace_buffer.tb_buffer[0];

+  ch.dbg.trace_buffer.tb_size = CH_DBG_TRACE_BUFFER_SIZE;

+  ch.dbg.trace_buffer.tb_ptr = &ch.dbg.trace_buffer.tb_buffer[0];

 }

 

 /**

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

 void _dbg_trace(thread_t *otp) {

 

-  ch.dbg_trace_buffer.tb_ptr->se_time   = chVTGetSystemTimeX();

-  ch.dbg_trace_buffer.tb_ptr->se_tp     = currp;

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

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

-  if (++ch.dbg_trace_buffer.tb_ptr >=

-      &ch.dbg_trace_buffer.tb_buffer[CH_DBG_TRACE_BUFFER_SIZE])

-    ch.dbg_trace_buffer.tb_ptr = &ch.dbg_trace_buffer.tb_buffer[0];

+  ch.dbg.trace_buffer.tb_ptr->se_time   = chVTGetSystemTimeX();

+  ch.dbg.trace_buffer.tb_ptr->se_tp     = currp;

+  ch.dbg.trace_buffer.tb_ptr->se_wtobjp = otp->p_u.wtobjp;

+  ch.dbg.trace_buffer.tb_ptr->se_state  = (uint8_t)otp->p_state;

+  if (++ch.dbg.trace_buffer.tb_ptr >=

+      &ch.dbg.trace_buffer.tb_buffer[CH_DBG_TRACE_BUFFER_SIZE])

+    ch.dbg.trace_buffer.tb_ptr = &ch.dbg.trace_buffer.tb_buffer[0];

 }

 #endif /* CH_DBG_ENABLE_TRACE */

 

diff --git a/os/rt/src/chsys.c b/os/rt/src/chsys.c
index 53672e46d..b5c83b95a 100644
--- a/os/rt/src/chsys.c
+++ b/os/rt/src/chsys.c
@@ -119,7 +119,7 @@ void chSysInit(void) {
   _stats_init();

 #endif

 #if CH_DBG_ENABLE_TRACE

-  _trace_init();

+  _dbg_trace_init();

 #endif

 

 #if !CH_CFG_NO_IDLE_THREAD

@@ -165,16 +165,13 @@ void chSysHalt(const char *reason) {
 

   port_disable();

 

-#if CH_DBG_ENABLED

-  ch.dbg_panic_msg = reason;

-#else

-  (void)reason;

-#endif

-

 #if defined(CH_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__)

   CH_CFG_SYSTEM_HALT_HOOK(reason);

 #endif

 

+  /* Pointing to the passed message.*/

+  ch.dbg.panic_msg = reason;

+

   /* Harmless infinite loop.*/

   while (true)

     ;

diff --git a/os/rt/src/chtm.c b/os/rt/src/chtm.c
index d0cd1a630..bb3aadd39 100644
--- a/os/rt/src/chtm.c
+++ b/os/rt/src/chtm.c
@@ -79,11 +79,11 @@ void _tm_init(void) {
   /* Time Measurement subsystem calibration, it does a null measurement

      and calculates the call overhead which is subtracted to real

      measurements.*/

-  ch.measurement_offset = 0;

+  ch.tm.offset = 0;

   chTMObjectInit(&tm);

   chTMStartMeasurementX(&tm);

   chTMStopMeasurementX(&tm);

-  ch.measurement_offset = tm.last;

+  ch.tm.offset = tm.last;

 }

 

 /**

@@ -125,7 +125,7 @@ NOINLINE void chTMStartMeasurementX(time_measurement_t *tmp) {
  */

 NOINLINE void chTMStopMeasurementX(time_measurement_t *tmp) {

 

-  tm_stop(tmp, chSysGetRealtimeCounterX(), ch.measurement_offset);

+  tm_stop(tmp, chSysGetRealtimeCounterX(), ch.tm.offset);

 }

 

 /**