arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Merge remote-tracking branch 'remotes/esp8266/esp8266' into esp8266

Browse Source
This commit is contained in:
Markus Sattler
2015-07-23 17:27:30 +02:00
parent 9fd139bb8c 91ca9ba75b
commit c33e2a60db
36 changed files with 2323 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/sdk/include/ets_sys.h
View File

@ -65,8 +65,8 @@ inline bool ETS_INTR_WITHINISR()
{
uint32_t ps;
__asm__ __volatile__("rsr %0,ps":"=a" (ps));
// PS.EXCM and PS.UM bit checks
return ((ps & ((1 << 4) | (1 << 5))) > 0);
// PS.EXCM bit check
return ((ps & (1 << 4)) != 0);
}
inline uint32_t ETS_INTR_ENABLED(void)