From ced8a1c6565efbe0374bb60fed4f9a0a3836086a Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Wed, 29 Mar 2017 18:15:10 +0200 Subject: [PATCH] Fix old lock_cnt and isr_cnt --- firmware/config/stm32f4ems/chconf.h | 5 ++--- firmware/hw_layer/stm32f4/mpu_util.cpp | 2 +- firmware/util/rfiutil.c | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/firmware/config/stm32f4ems/chconf.h b/firmware/config/stm32f4ems/chconf.h index 454e1e807a..d608f3345a 100644 --- a/firmware/config/stm32f4ems/chconf.h +++ b/firmware/config/stm32f4ems/chconf.h @@ -522,9 +522,8 @@ extern "C" #ifndef __ASSEMBLER__ #if !CH_DBG_SYSTEM_STATE_CHECK -extern cnt_t dbg_lock_cnt; -#define dbg_enter_lock() {dbg_lock_cnt = 1;ON_LOCK_HOOK;} -#define dbg_leave_lock() {ON_UNLOCK_HOOK;dbg_lock_cnt = 0;} +#define dbg_enter_lock() {ch.dbg.lock_cnt = 1;ON_LOCK_HOOK;} +#define dbg_leave_lock() {ON_UNLOCK_HOOK;ch.dbg.lock_cnt = 0;} #endif void chDbgPanic3(const char *msg, const char * file, int line); diff --git a/firmware/hw_layer/stm32f4/mpu_util.cpp b/firmware/hw_layer/stm32f4/mpu_util.cpp index 5e6ab5bd1a..72a8941565 100644 --- a/firmware/hw_layer/stm32f4/mpu_util.cpp +++ b/firmware/hw_layer/stm32f4/mpu_util.cpp @@ -59,7 +59,7 @@ extern uint32_t IRQSTACK$$Base; /* symbol created by the IAR linker */ int getRemainingStack(Thread *otp) { #if CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__) int remainingStack; - if (dbg_isr_cnt > 0) { + if (ch.dbg.isr_cnt > 0) { remainingStack = (__get_SP() - sizeof(intctx_t)) - (int)&IRQSTACK$$Base; } else { remainingStack = (__get_SP() - sizeof(intctx_t)) - (int)otp->p_stklimit; diff --git a/firmware/util/rfiutil.c b/firmware/util/rfiutil.c index cae4d239d6..bdad4981aa 100644 --- a/firmware/util/rfiutil.c +++ b/firmware/util/rfiutil.c @@ -75,6 +75,3 @@ void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par } #endif - -cnt_t dbg_lock_cnt; -cnt_t dbg_isr_cnt; \ No newline at end of file