rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix old lock_cnt and isr_cnt

This commit is contained in:
Fabien Poussin 2017-03-29 18:15:10 +02:00
parent 9f75cd5c75
commit a7cf2d82ef
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/config/stm32f4ems/chconf.h
View File

@ -522,9 +522,8 @@ extern "C"
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
#if !CH_DBG_SYSTEM_STATE_CHECK #if !CH_DBG_SYSTEM_STATE_CHECK
extern cnt_t dbg_lock_cnt; #define dbg_enter_lock() {ch.dbg.lock_cnt = 1;ON_LOCK_HOOK;}
#define dbg_enter_lock() {dbg_lock_cnt = 1;ON_LOCK_HOOK;} #define dbg_leave_lock() {ON_UNLOCK_HOOK;ch.dbg.lock_cnt = 0;}
#define dbg_leave_lock() {ON_UNLOCK_HOOK;dbg_lock_cnt = 0;}
#endif #endif
void chDbgPanic3(const char *msg, const char * file, int line); void chDbgPanic3(const char *msg, const char * file, int line);

2
firmware/hw_layer/stm32f4/mpu_util.cpp
View File

@ -59,7 +59,7 @@ extern uint32_t IRQSTACK$$Base; /* symbol created by the IAR linker */
int getRemainingStack(Thread *otp) { int getRemainingStack(Thread *otp) {
#if CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__) #if CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)
int remainingStack; int remainingStack;
if (dbg_isr_cnt > 0) { if (ch.dbg.isr_cnt > 0) {
remainingStack = (__get_SP() - sizeof(intctx_t)) - (int)&IRQSTACK$$Base; remainingStack = (__get_SP() - sizeof(intctx_t)) - (int)&IRQSTACK$$Base;
} else { } else {
remainingStack = (__get_SP() - sizeof(intctx_t)) - (int)otp->p_stklimit; remainingStack = (__get_SP() - sizeof(intctx_t)) - (int)otp->p_stklimit;

3
firmware/util/rfiutil.c
View File

@ -75,6 +75,3 @@ void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par
} }
#endif #endif
cnt_t dbg_lock_cnt;
cnt_t dbg_isr_cnt;