newlib: rename esp_setup_time_syscalls to esp_set_time_from_rtc

This function no longer sets up syscalls, and new name reflects its
purpose better.
This commit is contained in:
Ivan Grokhotkov
2017-08-29 11:48:18 +08:00
parent d2acf1ce77
commit f31efb697c
4 changed files with 7 additions and 11 deletions

View File

@@ -268,7 +268,7 @@ void start_cpu0_default(void)
_GLOBAL_REENT->_stderr = (FILE*) &__sf_fake_stderr; _GLOBAL_REENT->_stderr = (FILE*) &__sf_fake_stderr;
#endif #endif
esp_timer_init(); esp_timer_init();
esp_setup_time_syscalls(); esp_set_time_from_rtc();
#if CONFIG_ESP32_APPTRACE_ENABLE #if CONFIG_ESP32_APPTRACE_ENABLE
esp_err_t err = esp_apptrace_init(); esp_err_t err = esp_apptrace_init();
if (err != ESP_OK) { if (err != ESP_OK) {

View File

@@ -248,7 +248,7 @@ esp_err_t esp_light_sleep_start()
// At this point, if FRC1 is used for timekeeping, time will be lagging behind. // At this point, if FRC1 is used for timekeeping, time will be lagging behind.
// This will update the microsecond count based on RTC timer. // This will update the microsecond count based on RTC timer.
esp_setup_time_syscalls(); esp_set_time_from_rtc();
// However, we do not advance RTOS ticks here; doing so would be rather messy, // However, we do not advance RTOS ticks here; doing so would be rather messy,
// as ticks can only be advanced on CPU0. // as ticks can only be advanced on CPU0.

View File

@@ -34,10 +34,8 @@ void esp_reent_init(struct _reent* r);
void esp_setup_syscall_table(); void esp_setup_syscall_table();
/** /**
* Initialize hardware timer used as time source for newlib time functions. * Update current microsecond time from RTC
*
* Called from the startup code, not intended to be called from application.
*/ */
void esp_setup_time_syscalls(); void esp_set_time_from_rtc();
#endif //__ESP_NEWLIB_H__ #endif //__ESP_NEWLIB_H__

View File

@@ -137,14 +137,12 @@ uint32_t esp_clk_slowclk_cal_get()
return REG_READ(RTC_SLOW_CLK_CAL_REG); return REG_READ(RTC_SLOW_CLK_CAL_REG);
} }
void esp_setup_time_syscalls() void esp_set_time_from_rtc()
{ {
#if defined( WITH_FRC1 ) #if defined( WITH_FRC1 ) && defined( WITH_RTC )
#if defined( WITH_RTC )
// initialize time from RTC clock // initialize time from RTC clock
s_microseconds_offset = get_rtc_time_us() - esp_timer_get_time(); s_microseconds_offset = get_rtc_time_us() - esp_timer_get_time();
#endif //WITH_RTC #endif // WITH_FRC1 && WITH_RTC
#endif // WITH_FRC1
} }
clock_t IRAM_ATTR _times_r(struct _reent *r, struct tms *ptms) clock_t IRAM_ATTR _times_r(struct _reent *r, struct tms *ptms)