arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-10 14:42:08 +03:00
Code Activity

No need for preprocessor undefinition of optimistic_yield, after all.

Browse Source
This commit is contained in:
Dirk O. Kaar
2019-12-24 23:43:04 +01:00
parent 8d2eca5684
commit 50fab5162f
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cores/esp8266/Arduino.h
View File

@ -205,18 +205,7 @@ void loop(void);
void yield(void); void yield(void);
#ifndef F_CPU void optimistic_yield(uint32_t interval_us);
// single function needed from SDK user_interface.h
extern "C" uint8 system_get_cpu_freq(void);
#endif
void __optimistic_yield(uint32_t intvl_cycles);
#if defined(F_CPU)
#define optimistic_yield(interval_us) (__optimistic_yield(interval_us * clockCyclesPerMicrosecond()))
#else
#define optimistic_yield(interval_us) (__optimistic_yield(interval_us * getCpuFreqMHz()))
#endif
#define _PORT_GPIO16 1 #define _PORT_GPIO16 1
#define digitalPinToPort(pin) (((pin)==16)?(_PORT_GPIO16):(0)) #define digitalPinToPort(pin) (((pin)==16)?(_PORT_GPIO16):(0))

19
cores/esp8266/core_esp8266_main.cpp
View File

@ -124,7 +124,13 @@ extern "C" void __yield() {
extern "C" void yield(void) __attribute__ ((weak, alias("__yield"))); extern "C" void yield(void) __attribute__ ((weak, alias("__yield")));
extern "C" void __optimistic_yield(uint32_t intvl_cycles) { extern "C" void optimistic_yield(uint32_t interval_us) {
const uint32_t intvl_cycles = interval_us *
#if defined(F_CPU)
clockCyclesPerMicrosecond();
#else
getCpuFreqMHz();
#endif
if ((ESP.getCycleCount() - s_cycles_since_yield_start) > intvl_cycles && if ((ESP.getCycleCount() - s_cycles_since_yield_start) > intvl_cycles &&
can_yield()) can_yield())
{ {
@ -132,17 +138,6 @@ extern "C" void __optimistic_yield(uint32_t intvl_cycles) {
} }
} }
#undef optimistic_yield
extern "C" void optimistic_yield(uint32_t interval_us) {
__optimistic_yield(interval_us *
#if defined(F_CPU)
clockCyclesPerMicrosecond()
#else
getCpuFreqMHz()
#endif
);
}
// Replace ets_intr_(un)lock with nestable versions // Replace ets_intr_(un)lock with nestable versions
extern "C" void IRAM_ATTR ets_intr_lock() { extern "C" void IRAM_ATTR ets_intr_lock() {
if (ets_intr_lock_stack_ptr < ETS_INTR_LOCK_NEST_MAX) if (ets_intr_lock_stack_ptr < ETS_INTR_LOCK_NEST_MAX)