Calling esp_intr_noniram_[en|dis]able twice is an error, so abort instead of doing an assert which disappears in non-debug mode

This commit is contained in:
Jeroen Domburg 2017-01-09 12:04:21 +08:00
parent 0bfe08578b
commit 11a994d5d8

View file

@ -691,7 +691,7 @@ void esp_intr_noniram_disable()
int oldint; int oldint;
int cpu=xPortGetCoreID(); int cpu=xPortGetCoreID();
int intmask=~non_iram_int_mask[cpu]; int intmask=~non_iram_int_mask[cpu];
assert(non_iram_int_disabled_flag[cpu]==false); if (non_iram_int_disabled_flag[cpu]) abort();
non_iram_int_disabled_flag[cpu]=true; non_iram_int_disabled_flag[cpu]=true;
asm volatile ( asm volatile (
"movi %0,0\n" "movi %0,0\n"
@ -709,7 +709,7 @@ void esp_intr_noniram_enable()
{ {
int cpu=xPortGetCoreID(); int cpu=xPortGetCoreID();
int intmask=non_iram_int_disabled[cpu]; int intmask=non_iram_int_disabled[cpu];
assert(non_iram_int_disabled_flag[cpu]==true); if (!non_iram_int_disabled_flag[cpu]) abort();
non_iram_int_disabled_flag[cpu]=false; non_iram_int_disabled_flag[cpu]=false;
asm volatile ( asm volatile (
"movi a3,0\n" "movi a3,0\n"