j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sdk_os_delay_us: rewrite to avoid hal.h

Browse source 
Seems to fail to compile recently, missing xthal_get_ccount(), so
avoid using hal.h which is outside esp-open-rtos.
This commit is contained in:
Our Air Quality 2018-04-25 13:05:25 +10:00
parent 782eaabb97
commit cec6b7c19f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
open_esplibs/libmain/misc.c
View file

@ -11,7 +11,7 @@
#include "esp/gpio_regs.h" #include "esp/gpio_regs.h"
#include "esp/rtc_regs.h" #include "esp/rtc_regs.h"
#include "sdk_internal.h" #include "sdk_internal.h"
#include "xtensa/hal.h" #include "xtensa_ops.h"
static int cpu_freq = 80; static int cpu_freq = 80;
@ -28,9 +28,14 @@ void sdk_os_update_cpu_frequency(int freq) {
void sdk_ets_update_cpu_frequency(int freq) __attribute__ (( alias ("sdk_os_update_cpu_frequency") )); void sdk_ets_update_cpu_frequency(int freq) __attribute__ (( alias ("sdk_os_update_cpu_frequency") ));
void sdk_os_delay_us(uint16_t us) { void sdk_os_delay_us(uint16_t us) {
uint32_t start_ccount = xthal_get_ccount(); uint32_t start_ccount, ccount;
uint32_t delay_ccount = cpu_freq * us; uint32_t delay_ccount = cpu_freq * us;
while (xthal_get_ccount() - start_ccount < delay_ccount) {}
RSR(start_ccount, ccount);
do {
RSR(ccount, ccount);
} while (ccount - start_ccount < delay_ccount);
} }
void sdk_ets_delay_us(uint16_t us) __attribute__ (( alias ("sdk_os_delay_us") )); void sdk_ets_delay_us(uint16_t us) __attribute__ (( alias ("sdk_os_delay_us") ));