arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-29 05:21:37 +03:00
Code Activity

deprecate RTC_REG macros in favor of TIMER_REG macros (old typo in macro names) (#5326)

Browse Source
This commit is contained in:
Develo
2018-11-09 14:53:58 -03:00
committed by GitHub
parent 79a6f36a02
commit e948ad1999
1 changed files with 88 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/sdk/include/eagle_soc.h
View File

@ -167,11 +167,17 @@
// }} // }}
// TIMER reg {{ // TIMER reg {{
#define RTC_REG_READ(addr) READ_PERI_REG(PERIPHS_TIMER_BASEDDR + addr) #define TIMER_REG_READ(addr) READ_PERI_REG(PERIPHS_TIMER_BASEDDR + addr)
#define RTC_REG_WRITE(addr, val) WRITE_PERI_REG(PERIPHS_TIMER_BASEDDR + addr, val) #define TIMER_REG_WRITE(addr, val) WRITE_PERI_REG(PERIPHS_TIMER_BASEDDR + addr, val)
#define RTC_CLR_REG_MASK(reg, mask) CLEAR_PERI_REG_MASK(PERIPHS_TIMER_BASEDDR +reg, mask) #define TIMER_CLR_REG_MASK(reg, mask) CLEAR_PERI_REG_MASK(PERIPHS_TIMER_BASEDDR +reg, mask)
/* Returns the current time according to the timer timer. */
#define NOW() RTC_REG_READ(FRC2_COUNT_ADDRESS)
//Previous definitions of the above, kept for a while for possible compatibility, but deprecated
#define RTC_REG_READ(addr) _Pragma("GCC warning \"'RTC_REG_READ' macro is deprecated\"") TIMER_REG_READ(addr)
#define RTC_REG_WRITE(addr, val) _Pragma("GCC warning \"'RTC_REG_WRITE' macro is deprecated\"") TIMER_REG_WRITE(addr, val)
#define RTC_CLR_REG_MASK(reg, mask) _Pragma("GCC warning \"'RTC_CLR_REG_MASK' macro is deprecated\"") TIMER_CLR_REG_MASK(reg, mask)
//load initial_value to timer1 //load initial_value to timer1
#define FRC1_LOAD_ADDRESS 0x00 #define FRC1_LOAD_ADDRESS 0x00
@ -189,6 +195,9 @@
#define FRC2_COUNT_ADDRESS 0x24 #define FRC2_COUNT_ADDRESS 0x24
// }} // }}
/* Returns the current time according to the timer timer. */
#define NOW() TIMER_REG_READ(FRC2_COUNT_ADDRESS)
//RTC reg {{ //RTC reg {{
#define REG_RTC_BASE PERIPHS_RTC_BASEADDR #define REG_RTC_BASE PERIPHS_RTC_BASEADDR