arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Corrections after review remarks; thanks @earlephilhower

Browse Source
This commit is contained in:
Dirk O. Kaar 2020-02-20 19:41:08 +01:00
parent 50fab5162f
commit afe40211ef
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cores/esp8266/core_esp8266_main.cpp
View File

@ -56,8 +56,8 @@ cont_t* g_pcont __attribute__((section(".noinit")));
/* Event queue used by the main (arduino) task */ /* Event queue used by the main (arduino) task */
static os_event_t s_loop_queue[LOOP_QUEUE_SIZE]; static os_event_t s_loop_queue[LOOP_QUEUE_SIZE];
/* Used to implement __optimistic_yield */ /* Used to implement optimistic_yield */
static uint32_t s_cycles_since_yield_start; static uint32_t s_cycles_at_yield_start;
/* For ets_intr_lock_nest / ets_intr_unlock_nest /* For ets_intr_lock_nest / ets_intr_unlock_nest
* Max nesting seen by SDK so far is 2. * Max nesting seen by SDK so far is 2.
@ -96,7 +96,7 @@ extern "C" bool can_yield() {
static inline void esp_yield_within_cont() __attribute__((always_inline)); static inline void esp_yield_within_cont() __attribute__((always_inline));
static void esp_yield_within_cont() { static void esp_yield_within_cont() {
cont_yield(g_pcont); cont_yield(g_pcont);
s_cycles_since_yield_start = ESP.getCycleCount(); s_cycles_at_yield_start = ESP.getCycleCount();
run_scheduled_recurrent_functions(); run_scheduled_recurrent_functions();
} }
@ -129,9 +129,9 @@ extern "C" void optimistic_yield(uint32_t interval_us) {
#if defined(F_CPU) #if defined(F_CPU)
clockCyclesPerMicrosecond(); clockCyclesPerMicrosecond();
#else #else
getCpuFreqMHz(); ESP.getCpuFreqMHz();
#endif #endif
if ((ESP.getCycleCount() - s_cycles_since_yield_start) > intvl_cycles && if ((ESP.getCycleCount() - s_cycles_at_yield_start) > intvl_cycles &&
can_yield()) can_yield())
{ {
yield(); yield();
@ -188,7 +188,7 @@ static void loop_wrapper() {
static void loop_task(os_event_t *events) { static void loop_task(os_event_t *events) {
(void) events; (void) events;
s_cycles_since_yield_start = ESP.getCycleCount(); s_cycles_at_yield_start = ESP.getCycleCount();
cont_run(g_pcont, &loop_wrapper); cont_run(g_pcont, &loop_wrapper);
if (cont_check(g_pcont) != 0) { if (cont_check(g_pcont) != 0) {
panic(); panic();