Revert "Merge branch 'feature/add_global_isr_switch' into 'master'"

This reverts merge request !914
This commit is contained in:
Dong Heng
2019-04-28 10:32:35 +08:00
parent fb396797bf
commit ae61e4dce3
8 changed files with 38 additions and 20 deletions

View File

@ -50,7 +50,7 @@
#define SET_STKREG(r,v) sp[(r) >> 2] = (uint32_t)(v)
#define PORT_ASSERT(x) do { if (!(x)) {ets_printf("%s %u\n", "rtos_port", __LINE__); while(1){}; }} while (0)
extern uint8_t NMIIrqIsOn;
extern char NMIIrqIsOn;
static int SWReq = 0;
uint32_t cpu_sr;
@ -250,22 +250,12 @@ void show_critical_info(void)
void IRAM_ATTR vPortETSIntrLock(void)
{
if (NMIIrqIsOn == 0) {
vPortEnterCritical();
do {
REG_WRITE(INT_ENA_WDEV, WDEV_TSF0_REACH_INT);
} while(REG_READ(INT_ENA_WDEV) != WDEV_TSF0_REACH_INT);
}
ETS_INTR_LOCK();
}
void IRAM_ATTR vPortETSIntrUnlock(void)
{
if (NMIIrqIsOn == 0) {
extern uint32_t WDEV_INTEREST_EVENT;
REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT);
vPortExitCritical();
}
ETS_INTR_UNLOCK();
}
/*