Prepare for runtime CPU clock rate selection

dok-net · dok-net · commit 689187fc3112 · 2020-04-11T21:03:36.000+02:00
diff --git a/cores/esp8266/Esp.h b/cores/esp8266/Esp.h
@@ -209,7 +209,11 @@ class EspClass {
 
 uint8_t EspClass::getCpuFreqMHz()
 {
+#if defined(F_CPU)
     return clockCyclesPerMicrosecond();
+#elif !defined(F_CPU)
+    return system_get_cpu_freq();
+#endif
 }
 
 uint32_t EspClass::getCycleCount()
diff --git a/cores/esp8266/core_esp8266_main.cpp b/cores/esp8266/core_esp8266_main.cpp
@@ -81,14 +81,17 @@ void initVariant() __attribute__((weak));
 void initVariant() {
 }
 
-void preloop_update_frequency() __attribute__((weak));
-void preloop_update_frequency() {
+extern "C" void __preloop_update_frequency() {
 #if defined(F_CPU) && (F_CPU == 160000000L)
-    REG_SET_BIT(0x3ff00014, BIT(0));
     ets_update_cpu_frequency(160);
+    REG_SET_BIT(0x3ff00014, BIT(0));
+#elif !defined(F_CPU)
+    if (system_get_cpu_freq() == 160) REG_SET_BIT(0x3ff00014, BIT(0));
 #endif
 }
 
+extern "C" void preloop_update_frequency() __attribute__((weak, alias("__preloop_update_frequency")));
+
 extern "C" bool can_yield() {
   return cont_can_yield(g_pcont);
 }

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,11 @@ class EspClass {`
`209`	`209`
`210`	`210`	`uint8_t EspClass::getCpuFreqMHz()`
`211`	`211`	`{`
	`212`	`+#if defined(F_CPU)`
`212`	`213`	`return clockCyclesPerMicrosecond();`
	`214`	`+#elif !defined(F_CPU)`
	`215`	`+ return system_get_cpu_freq();`
	`216`	`+#endif`
`213`	`217`	`}`
`214`	`218`
`215`	`219`	`uint32_t EspClass::getCycleCount()`
Original file line number	Diff line number	Diff line change
`@@ -81,14 +81,17 @@ void initVariant() __attribute__((weak));`
`81`	`81`	`void initVariant() {`
`82`	`82`	`}`
`83`	`83`
`84`		`-void preloop_update_frequency() __attribute__((weak));`
`85`		`-void preloop_update_frequency() {`
	`84`	`+extern "C" void __preloop_update_frequency() {`
`86`	`85`	`#if defined(F_CPU) && (F_CPU == 160000000L)`
`87`		`- REG_SET_BIT(0x3ff00014, BIT(0));`
`88`	`86`	`ets_update_cpu_frequency(160);`
	`87`	`+ REG_SET_BIT(0x3ff00014, BIT(0));`
	`88`	`+#elif !defined(F_CPU)`
	`89`	`+ if (system_get_cpu_freq() == 160) REG_SET_BIT(0x3ff00014, BIT(0));`
`89`	`90`	`#endif`
`90`	`91`	`}`
`91`	`92`
	`93`	`+extern "C" void preloop_update_frequency() __attribute__((weak, alias("__preloop_update_frequency")));`
	`94`	`+`
`92`	`95`	`extern "C" bool can_yield() {`
`93`	`96`	`return cont_can_yield(g_pcont);`
`94`	`97`	`}`