WIP: fixes from @igrr's review

Author: d-a-v

cores/esp8266/cont.h

@@ -27,6 +27,10 @@
 #define CONT_STACKSIZE 4096
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct cont_ {
         void (*pc_ret)(void);
         unsigned* sp_ret;
@@ -74,4 +78,8 @@ int cont_get_free_stack(cont_t* cont);
 // continuation stack
 bool cont_can_yield(cont_t* cont);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* CONT_H_ */

cores/esp8266/core_esp8266_app_entry_noextra4k.cpp

@@ -10,7 +10,7 @@
 #include "cont.h"
 #include "coredecls.h"
 
-// calls to this function must *always* be inlined
+// callers to this function must *always* be inlined
 void disable_extra4k_at_link_time (void)
 {
     /*
@@ -30,7 +30,6 @@ static cont_t g_cont __attribute__ ((aligned (16)));
 
 extern "C" void ICACHE_RAM_ATTR app_entry_redefinable(void)
 {
-    /* this is the default NONOS-SDK user's heap location */
     g_pcont = &g_cont;
 
     /* Call the entry point of the SDK code. */

cores/esp8266/core_esp8266_postmortem.c

@@ -32,8 +32,6 @@
 
 extern void __real_system_restart_local();
 
-extern cont_t* g_pcont;
-
 // These will be pointers to PROGMEM const strings
 static const char* s_panic_file = 0;
 static int s_panic_line = 0;

cores/esp8266/coredecls.h

@@ -8,6 +8,8 @@ extern "C" {
 
 // TODO: put declarations here, get rid of -Wno-implicit-function-declaration
 
+#include <cont.h> // g_pcont declaration
+
 extern bool timeshift64_is_set;
 
 void esp_yield();

libraries/ESP8266WiFi/src/ESP8266WiFiSTA-WPS.cpp

@@ -1,23 +1,48 @@
+/*
+ ESP8266WiFiSTA-WPS.cpp - WiFi library for esp8266
+
+ Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+ This file is part of the esp8266 core for Arduino environment.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Reworked on 28 Dec 2015 by Markus Sattler
+
+ */
+
 
 #include "ESP8266WiFi.h"
 #include "ESP8266WiFiGeneric.h"
 #include "ESP8266WiFiSTA.h"
 
-void wifi_wps_status_cb(wps_cb_status status);
-
 /**
  * WPS config
  * so far only WPS_TYPE_PBC is supported (SDK 1.2.0)
  * @return ok
  */
-bool beginWPSConfig(void) {
+bool ESP8266WiFiSTAClass::beginWPSConfig(void) {
+
+    // SYS ram is used by WPS, let's configure user stack inside user's HEAP
+    disable_extra4k_at_link_time();
 
     if(!WiFi.enableSTA(true)) {
         // enable STA failed
         return false;
     }
 
-    WiFi.disconnect();
+    disconnect();
 
     DEBUGV("wps begin\n");
 
@@ -32,7 +57,7 @@ bool beginWPSConfig(void) {
         return false;
     }
 
-    if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) {
+    if(!wifi_set_wps_cb((wps_st_cb_t) &WPSStatusCB)) {
         DEBUGV("wps cb failed\n");
         return false;
     }
@@ -52,7 +77,7 @@ bool beginWPSConfig(void) {
  * WPS callback
  * @param status wps_cb_status
  */
-void wifi_wps_status_cb(wps_cb_status status) {
+void ESP8266WiFiSTAClass::WPSStatusCB(wps_cb_status status) {
     DEBUGV("wps cb status: %d\r\n", status);
     switch(status) {
         case WPS_CB_ST_SUCCESS:
@@ -81,4 +106,3 @@ void wifi_wps_status_cb(wps_cb_status status) {
 
     esp_schedule(); // resume the beginWPSConfig function
 }
-

libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h

@@ -87,20 +87,19 @@ class ESP8266WiFiSTAClass {
 
     protected:
 
-      static bool _useStaticIp;
+        static bool _useStaticIp;
 
     // ----------------------------------------------------------------------------------------------
     // ------------------------------------ STA remote configure  -----------------------------------
     // ----------------------------------------------------------------------------------------------
 
-    public:
+    protected:
+    
+        static void WPSStatusCB(wps_cb_status status);
 
-        inline bool beginWPSConfig(void) __attribute__((always_inline))
-        {
-            disable_extra4k_at_link_time(); // this call must always be inlined
-            return ::beginWPSConfig();
-        }
+    public:
 
+        bool beginWPSConfig(void);
         bool beginSmartConfig();
         bool stopSmartConfig();
         bool smartConfigDone();

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

@@ -1259,8 +1259,6 @@ bool WiFiClientSecure::loadPrivateKey(Stream& stream, size_t size) {
 // SSL debugging which should focus on the WiFiClientBearSSL objects.
 
 extern "C" {
-#include <cont.h>
-  extern cont_t *g_pcont;
   extern size_t br_esp8266_stack_proxy_usage();
 
   void _BearSSLCheckStack(const char *fcn, const char *file, int line) {

libraries/esp8266/examples/extra4kchecker/extra4kchecker.ino

@@ -15,8 +15,6 @@
 
 #define USE_WPS 0 // try me with 0 or 1
 
-extern cont_t* g_pcont;
-
 void setup() {
 
   Serial.begin(115200);