Fix network status callback layering

Author: Veijo Pesonen

ESP8266/ESP8266.cpp

@@ -774,14 +774,9 @@ void ESP8266::sigio(Callback<void()> func)
     _serial.sigio(func);
 }
 
-void ESP8266::attach(mbed::Callback<void(nsapi_event_t, intptr_t)> status_cb)
+void ESP8266::attach(Callback<void()> status_cb)
 {
-    _connection_status_cb = status_cb;
-}
-
-void ESP8266::attach_int(mbed::Callback<void()> status_cb)
-{
-    _conn_state_drv_cb = status_cb;
+    _conn_stat_cb = status_cb;
 }
 
 bool ESP8266::_recv_ap(nsapi_wifi_ap_t *ap)
@@ -872,11 +867,8 @@ void ESP8266::_oob_connection_status()
                 "ESP8266::_oob_connection_status: network status timed out\n");
     }
 
-    if(_connection_status_cb) {
-        _connection_status_cb(NSAPI_EVENT_CONNECTION_STATUS_CHANGE, _connection_status);
-    }
-
-    _conn_state_drv_cb();
+    MBED_ASSERT(_conn_stat_cb);
+    _conn_stat_cb();
 }
 
 int8_t ESP8266::default_wifi_mode()

ESP8266/ESP8266.h

@@ -294,22 +294,15 @@ class ESP8266
     }
 
     /**
-    * Attach a function to call whenever network state has changed. Driver external
+    * Attach a function to call whenever network state has changed.
     *
     * @param func A pointer to a void function, or 0 to set as none
     */
-    void attach(mbed::Callback<void(nsapi_event_t, intptr_t)> status_cb);
-
-    /**
-    * Attach a function to call whenever network state has changed. Driver internal
-    *
-    * @param func A pointer to a void function, or 0 to set as none
-    */
-    void attach_int(mbed::Callback<void()> status_cb);
+    void attach(mbed::Callback<void()> status_cb);
 
     template <typename T, typename M>
-    void attach_int(T *obj, M method) {
-        attach_int(Callback<void()>(obj, method));
+    void attach(T *obj, M method) {
+        attach(mbed::Callback<void()>(obj, method));
     }
 
     /**
@@ -424,8 +417,7 @@ class ESP8266
 
     // Connection state reporting
     nsapi_connection_status_t _connection_status;
-    Callback<void(nsapi_event_t, intptr_t)> _connection_status_cb; // Application registered
-    Callback<void()> _conn_state_drv_cb; // ESP8266Interface registered
+    Callback<void()> _conn_stat_cb; // ESP8266Interface registered
 };
 
 #endif

ESP8266Interface.cpp

@@ -47,7 +47,9 @@ ESP8266Interface::ESP8266Interface()
     : _esp(MBED_CONF_ESP8266_TX, MBED_CONF_ESP8266_RX, MBED_CONF_ESP8266_DEBUG, MBED_CONF_ESP8266_RTS, MBED_CONF_ESP8266_CTS),
       _initialized(false),
       _started(false),
-      _ap_sec(NSAPI_SECURITY_UNKNOWN)
+      _ap_sec(NSAPI_SECURITY_UNKNOWN),
+      _conn_stat(NSAPI_STATUS_DISCONNECTED),
+      _conn_stat_cb(NULL)
 {
     memset(_ids, 0, sizeof(_ids));
     memset(_cbs, 0, sizeof(_cbs));
@@ -57,7 +59,7 @@ ESP8266Interface::ESP8266Interface()
 
     _esp.sigio(this, &ESP8266Interface::event);
     _esp.set_timeout();
-    _esp.attach_int(this, &ESP8266Interface::update_conn_state_cb);
+    _esp.attach(this, &ESP8266Interface::update_conn_state_cb);
 }
 #endif
 
@@ -66,7 +68,9 @@ ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug, PinName r
     : _esp(tx, rx, debug, rts, cts),
       _initialized(false),
       _started(false),
-      _ap_sec(NSAPI_SECURITY_UNKNOWN)
+      _ap_sec(NSAPI_SECURITY_UNKNOWN),
+      _conn_stat(NSAPI_STATUS_DISCONNECTED),
+      _conn_stat_cb(NULL)
 {
     memset(_ids, 0, sizeof(_ids));
     memset(_cbs, 0, sizeof(_cbs));
@@ -76,7 +80,7 @@ ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug, PinName r
 
     _esp.sigio(this, &ESP8266Interface::event);
     _esp.set_timeout();
-    _esp.attach_int(this, &ESP8266Interface::update_conn_state_cb);
+    _esp.attach(this, &ESP8266Interface::update_conn_state_cb);
 }
 
 int ESP8266Interface::connect(const char *ssid, const char *pass, nsapi_security_t security,
@@ -579,12 +583,12 @@ void ESP8266Interface::event()
 
 void ESP8266Interface::attach(mbed::Callback<void(nsapi_event_t, intptr_t)> status_cb)
 {
-    _esp.attach(status_cb);
+    _conn_stat_cb = status_cb;
 }
 
 nsapi_connection_status_t ESP8266Interface::get_connection_status() const
 {
-    return _esp.connection_status();
+    return _conn_stat;
 }
 
 #if MBED_CONF_ESP8266_PROVIDE_DEFAULT
@@ -598,7 +602,9 @@ WiFiInterface *WiFiInterface::get_default_instance() {
 
 void ESP8266Interface::update_conn_state_cb()
 {
-    switch(_esp.connection_status()) {
+    _conn_stat = _esp.connection_status();
+
+    switch(_conn_stat) {
         // Doesn't require changes
         case NSAPI_STATUS_CONNECTING:
         case NSAPI_STATUS_GLOBAL_UP:
@@ -612,6 +618,11 @@ void ESP8266Interface::update_conn_state_cb()
         case NSAPI_STATUS_LOCAL_UP:
         case NSAPI_STATUS_ERROR_UNSUPPORTED:
         default:
-            break;
+            MBED_ASSERT(false);
+    }
+
+    // Inform upper layers
+    if (_conn_stat_cb) {
+        _conn_stat_cb(NSAPI_EVENT_CONNECTION_STATUS_CHANGE, _conn_stat);
     }
 }

ESP8266Interface.h

@@ -343,6 +343,10 @@ class ESP8266Interface : public NetworkStack, public WiFiInterface
         void (*callback)(void *);
         void *data;
     } _cbs[ESP8266_SOCKET_COUNT];
+
+    // Connection state reporting
+    nsapi_connection_status_t _conn_stat;
+    Callback<void(nsapi_event_t, intptr_t)> _conn_stat_cb; // Application registered
 };
 
 #endif