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

Due to 3rd party use of symbol optimistic_yield without #include <Arduino>, have to resort to preprocessor definition for inlining.

Browse Source
This commit is contained in:
Dirk O. Kaar 2019-12-02 11:58:45 +01:00
parent 3767791fbc
commit 554435780b
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cores/esp8266/Arduino.h
View File

@ -212,16 +212,11 @@ extern "C" uint8 system_get_cpu_freq(void);
void __optimistic_yield(uint32_t intvl_cycles); void __optimistic_yield(uint32_t intvl_cycles);
void inline optimistic_yield(uint32_t interval_us) __attribute__((always_inline));
void inline optimistic_yield(uint32_t interval_us) {
__optimistic_yield(interval_us *
#if defined(F_CPU) #if defined(F_CPU)
clockCyclesPerMicrosecond() #define optimistic_yield(interval_us) (__optimistic_yield(interval_us * clockCyclesPerMicrosecond()))
#else #else
getCpuFreqMHz() #define optimistic_yield(interval_us) (__optimistic_yield(interval_us * getCpuFreqMHz()))
#endif #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))

11
cores/esp8266/core_esp8266_main.cpp
View File

@ -133,6 +133,17 @@ 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)