Clean up ets_printf declarations

igrr · igrr · commit 77af5da58ffb · 2014-12-18T18:45:22.000+03:00
diff --git a/cores/esp8266/core_esp8266_main.cpp b/cores/esp8266/core_esp8266_main.cpp
@@ -86,6 +86,7 @@ static void loop_task(os_event_t *events)
     cont_run(&g_cont, &loop_wrapper);
     if (cont_check(&g_cont) != 0)
     {
+        ets_printf("\r\nheap collided with sketch stack\r\n");
         abort();
     }
 }
diff --git a/cores/esp8266/debug.h b/cores/esp8266/debug.h
@@ -3,7 +3,6 @@
 
 #include <stddef.h>
 
-extern "C" size_t ets_printf(const char*, ...);
 #define DEBUGV ets_printf
 
 
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -34,7 +34,6 @@ extern "C" {
 extern "C" void esp_schedule();
 extern "C" void esp_yield();
 
-
 ESP8266WiFiClass::ESP8266WiFiClass()
 {
 
diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -22,6 +22,8 @@
 extern "C" 
 {
     #include "include/wl_definitions.h"
+    #include "osapi.h"
+    #include "ets_sys.h"
 }
 
 #include "debug.h"
diff --git a/libraries/ESP8266WiFi/src/WiFiServer.cpp b/libraries/ESP8266WiFi/src/WiFiServer.cpp
@@ -19,6 +19,11 @@
 
 #define LWIP_INTERNAL
 
+extern "C" {
+    #include "osapi.h"
+    #include "ets_sys.h"
+}
+
 #include "debug.h"
 #include "ESP8266WiFi.h"
 #include "WiFiClient.h"
diff --git a/libraries/Wire/utility/i2c.cpp b/libraries/Wire/utility/i2c.cpp
@@ -5,9 +5,7 @@ extern "C" {
 #include "ets_sys.h"
 #include "osapi.h"
 #include "gpio.h"
-
-size_t ets_printf(const char*, ...);
-#define DEBUGV ets_printf
+#include "debug.h"
 }
 
 static uint8_t s_sda_pin = 0;

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ static void loop_task(os_event_t *events)`
`86`	`86`	`cont_run(&g_cont, &loop_wrapper);`
`87`	`87`	`if (cont_check(&g_cont) != 0)`
`88`	`88`	`{`
	`89`	`+ ets_printf("\r\nheap collided with sketch stack\r\n");`
`89`	`90`	`abort();`
`90`	`91`	`}`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`#include <stddef.h>`
`5`	`5`
`6`		`-extern "C" size_t ets_printf(const char*, ...);`
`7`	`6`	`#define DEBUGV ets_printf`
`8`	`7`
`9`	`8`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ extern "C" {`
`34`	`34`	`extern "C" void esp_schedule();`
`35`	`35`	`extern "C" void esp_yield();`
`36`	`36`
`37`		`-`
`38`	`37`	`ESP8266WiFiClass::ESP8266WiFiClass()`
`39`	`38`	`{`
`40`	`39`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`extern "C"`
`23`	`23`	`{`
`24`	`24`	`#include "include/wl_definitions.h"`
	`25`	`+ #include "osapi.h"`
	`26`	`+ #include "ets_sys.h"`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`#include "debug.h"`