From cec6b7c19fa0ce54c8a1d2a776b92766900d4907 Mon Sep 17 00:00:00 2001
From: Our Air Quality <info@ourairquality.org>
Date: Wed, 25 Apr 2018 13:05:25 +1000
Subject: [PATCH] sdk_os_delay_us: rewrite to avoid hal.h
Seems to fail to compile recently, missing xthal_get_ccount(), so
avoid using hal.h which is outside esp-open-rtos.
---
open_esplibs/libmain/misc.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/open_esplibs/libmain/misc.c b/open_esplibs/libmain/misc.c
index f11d4fd..eb2e459 100644
--- a/open_esplibs/libmain/misc.c
+++ b/open_esplibs/libmain/misc.c
@@ -11,7 +11,7 @@
#include "esp/gpio_regs.h"
#include "esp/rtc_regs.h"
#include "sdk_internal.h"
-#include "xtensa/hal.h"
+#include "xtensa_ops.h"
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_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;
- 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") ));