espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-22 01:27:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp8266/include/esp8266/eagle_soc.h
View File

@ -123,8 +123,6 @@
#define TM1_EDGE_INT_DISABLE() CLEAR_PERI_REG_MASK(EDGE_INT_ENABLE_REG, BIT1) #define TM1_EDGE_INT_DISABLE() CLEAR_PERI_REG_MASK(EDGE_INT_ENABLE_REG, BIT1)
//}} //}}
#define INT_ENA_WDEV 0x3ff20c18
#define WDEV_TSF0_REACH_INT (BIT(27))
//Watch dog reg {{ //Watch dog reg {{
#define PERIPHS_WDT_BASEADDR 0x60000900 #define PERIPHS_WDT_BASEADDR 0x60000900

34
components/esp8266/include/rom/ets_sys.h
View File

@ -53,9 +53,39 @@ typedef enum {
CANCEL, CANCEL,
} STATUS; } STATUS;
void vPortETSIntrLock(void); extern char NMIIrqIsOn;
extern uint32_t WDEV_INTEREST_EVENT;
void vPortETSIntrUnlock(void); #define INT_ENA_WDEV 0x3ff20c18
#define WDEV_TSF0_REACH_INT (BIT(27))
#define ETS_NMI_LOCK() \
do { \
do { \
REG_WRITE(INT_ENA_WDEV, WDEV_TSF0_REACH_INT); \
} while(REG_READ(INT_ENA_WDEV) != WDEV_TSF0_REACH_INT); \
} while (0)
#define ETS_NMI_UNLOCK() \
do { \
REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT); \
} while (0)
#define ETS_INTR_LOCK() do { \
if (NMIIrqIsOn == 0) { \
vPortEnterCritical(); \
do { \
REG_WRITE(INT_ENA_WDEV, WDEV_TSF0_REACH_INT); \
} while(REG_READ(INT_ENA_WDEV) != WDEV_TSF0_REACH_INT); \
} \
} while(0)
#define ETS_INTR_UNLOCK() do { \
if (NMIIrqIsOn == 0) { \
REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT); \
vPortExitCritical(); \
} \
} while(0)
#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5] #define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x" #define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"

6
components/esp8266/lib/VERSION
View File

@ -1,7 +1,7 @@
gwen: gwen:
core: 381d974 core: 33a48e5
net80211: 381d974 net80211: 71f5b94
pp: 381d974 pp: c32a629
wpa: 33a48e5 wpa: 33a48e5
espnow: da96924 espnow: da96924
wps: da96924 wps: da96924

BIN
components/esp8266/lib/libcore.a
View File

Binary file not shown.

BIN
components/esp8266/lib/libcore_dbg.a
View File

Binary file not shown.

BIN
components/esp8266/lib/libpp.a
View File

Binary file not shown.

BIN
components/esp8266/lib/libpp_dbg.a
View File

Binary file not shown.

16
components/freertos/port/esp8266/port.c
View File

@ -50,7 +50,7 @@
#define SET_STKREG(r,v) sp[(r) >> 2] = (uint32_t)(v) #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) #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; static int SWReq = 0;
uint32_t cpu_sr; uint32_t cpu_sr;
@ -250,22 +250,12 @@ void show_critical_info(void)
void IRAM_ATTR vPortETSIntrLock(void) void IRAM_ATTR vPortETSIntrLock(void)
{ {
if (NMIIrqIsOn == 0) { ETS_INTR_LOCK();
vPortEnterCritical();
do {
REG_WRITE(INT_ENA_WDEV, WDEV_TSF0_REACH_INT);
} while(REG_READ(INT_ENA_WDEV) != WDEV_TSF0_REACH_INT);
}
} }
void IRAM_ATTR vPortETSIntrUnlock(void) void IRAM_ATTR vPortETSIntrUnlock(void)
{ {
if (NMIIrqIsOn == 0) { ETS_INTR_UNLOCK();
extern uint32_t WDEV_INTEREST_EVENT;
REG_WRITE(INT_ENA_WDEV, WDEV_INTEREST_EVENT);
vPortExitCritical();
}
} }
/* /*