From c74dcc924cb621e3f81803941f55b3140888b08e Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <dok@dok-net.net>
Date: Mon, 31 Aug 2020 15:56:46 +0200
Subject: [PATCH] Force gcc inlining, use same style for getCycleCount as for
 getCpuFreqMHz.

---
 cores/esp8266/Esp.h | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/cores/esp8266/Esp.h b/cores/esp8266/Esp.h
index 7a920a3e1..c321db382 100644
--- a/cores/esp8266/Esp.h
+++ b/cores/esp8266/Esp.h
@@ -124,7 +124,7 @@ class EspClass {
 #if defined(F_CPU) || defined(CORE_MOCK)
         constexpr 
 #endif
-            uint8_t getCpuFreqMHz() const
+            inline uint8_t getCpuFreqMHz() const __attribute__((always_inline))
         {
             return esp_get_cpu_freq_mhz();
         }
@@ -166,21 +166,15 @@ class EspClass {
         uint8_t *random(uint8_t *resultArray, const size_t outputSizeBytes) const;
         uint32_t random() const;
 
-#ifndef CORE_MOCK
-        inline uint32_t getCycleCount() __attribute__((always_inline));
+#if !defined(CORE_MOCK)
+        inline uint32_t getCycleCount() __attribute__((always_inline))
+        {
+            return esp_get_cycle_count();
+        }
 #else
         uint32_t getCycleCount();
-#endif
-};
-
-#ifndef CORE_MOCK
-
-uint32_t EspClass::getCycleCount()
-{
-    return esp_get_cycle_count();
-}
-
 #endif // !defined(CORE_MOCK)
+};
 
 extern EspClass ESP;