Hunt down debug.h and roll-back

TODO: rename it to something else... it is an internal header

Author: mcspr

cores/esp8266/Arduino.h

@@ -231,8 +231,8 @@ using std::round;
 using std::isinf;
 using std::isnan;
 
-// Use stdlib abs() and round() to avoid issues with the C++ libraries
-// TODO: does C code need Arduino macros?
+// Use float-compatible stl abs() and round(), we don't use Arduino macros to avoid issues with the C++ libraries
+// TODO: ...does C code need Arduino macros?
 using std::abs;
 using std::round;
 
@@ -287,6 +287,7 @@ inline void configTzTime(const char* tz, const char* server1,
 
 #endif // __cplusplus
 
+#include "debug.h"
 #include "pins_arduino.h"
 
 #endif

cores/esp8266/Esp.h

@@ -174,7 +174,7 @@ class EspClass {
         }
 #else
         uint32_t getCycleCount();
-#endif
+#endif // ifndef CORE_MOCK
 };
 
 extern EspClass ESP;

cores/esp8266/core_esp8266_features.h

@@ -84,13 +84,7 @@ namespace arduino
 // level 15 will disable ALL interrupts,
 // level 0 will enable ALL interrupts,
 //
-#ifdef CORE_MOCK
-
-#define xt_rsil(level) (level)
-#define xt_wsr_ps(state) do { (void)(state); } while (0)
-
-#else
-
+#ifndef CORE_MOCK
 #define xt_rsil(level) (__extension__({uint32_t state; __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state) :: "memory"); state;}))
 #define xt_wsr_ps(state)  __asm__ __volatile__("wsr %0,ps; isync" :: "a" (state) : "memory")
 
@@ -101,7 +95,10 @@ inline uint32_t esp_get_cycle_count() {
   return ccount;
 }
 
-#endif // ifdef CORE_MOCK
+#else
+#define xt_rsil(level) (level)
+#define xt_wsr_ps(state) do { (void)(state); } while (0)
+#endif // ifndef CORE_MOCK
 
 
 // Tools for preloading code into the flash cache

libraries/ESP8266WiFi/src/ESP8266WiFiSTA-WPS.cpp

@@ -28,8 +28,6 @@
 #include "ESP8266WiFiSTA.h"
 #include "coredecls.h" // disable_extra4k_at_link_time()
 
-#include "debug.h"
-
 static void wifi_wps_status_cb(wps_cb_status status);
 
 /**

libraries/ESP8266WiFi/src/include/ClientContext.h

@@ -29,9 +29,10 @@ typedef void (*discard_cb_t)(void*, ClientContext*);
 extern "C" void esp_yield();
 extern "C" void esp_schedule();
 
-#include "DataSource.h"
 #include <debug.h>
 
+#include "DataSource.h"
+
 bool getDefaultPrivateGlobalSyncValue ();
 
 class ClientContext

libraries/SDFS/src/SDFS.cpp

@@ -27,7 +27,6 @@
 #include "SDFS.h"
 #include "SDFSFormatter.h"
 #include <FS.h>
-#include <debug.h>
 
 using namespace fs;
 

libraries/SDFS/src/SDFSFormatter.h

@@ -26,7 +26,6 @@
 #include "SDFS.h"
 #include <FS.h>
 #include <PolledTimeout.h>
-#include <debug.h>
 
 namespace sdfs {
 

tests/host/common/include/ClientContext.h

@@ -28,6 +28,7 @@ extern "C" void esp_yield();
 extern "C" void esp_schedule();
 
 #include <include/DataSource.h>
+#include <debug.h>
 
 bool getDefaultPrivateGlobalSyncValue ();