By review feedback, maintain esp_ as prefix.

esp8266 · Oct 13, 2021 · 62af940 · 62af940
1 parent 67ced12
commit 62af940
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cores/esp8266/core_esp8266_main.cpp b/cores/esp8266/core_esp8266_main.cpp
@@ -162,7 +162,7 @@ extern "C" void __esp_delay(unsigned long ms) {
 
 extern "C" void esp_delay(unsigned long ms) __attribute__((weak, alias("__esp_delay")));
 
-bool try_esp_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms) {
+bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms) {
     uint32_t expired = millis() - start_ms;
     if (expired >= timeout_ms) {
         return true;

diff --git a/cores/esp8266/coredecls.h b/cores/esp8266/coredecls.h
@@ -55,7 +55,7 @@ inline void esp_suspend(T&& blocked) {
 // is asynchronously resumed before the timeout is reached.
 // Also returns false if intvl_ms have expired during the active call.
 // Otherwise return true to indicate the timeout_ms have completely expired.
-bool try_esp_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms);
+bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms);
 
 // This overload of esp_delay() delays for a duration of at most timeout_ms milliseconds.
 // Whenever it is resumed, as well as every intvl_ms millisconds, it performs
@@ -64,7 +64,7 @@ bool try_esp_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uin
 template <typename T>
 inline void esp_delay(const uint32_t timeout_ms, T&& blocked, const uint32_t intvl_ms) {
     const auto start_ms = millis();
-    while (!try_esp_delay(start_ms, timeout_ms, intvl_ms) && blocked()) {
+    while (!esp_try_delay(start_ms, timeout_ms, intvl_ms) && blocked()) {
     }
 }
 

diff --git a/tests/host/common/Arduino.cpp b/tests/host/common/Arduino.cpp
@@ -71,7 +71,7 @@ extern "C" void esp_delay (unsigned long ms)
     usleep(ms * 1000);
 }
 
-bool try_esp_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms) {
+bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uint32_t intvl_ms) {
     decltype(millis()) expired;
 
     if ((expired = millis() - start_ms) >= timeout_ms) {