Merge pull request ARMmbed#67 from linlingao/debug_dns

Rewrite code to put semaphore in a class

Author: linlingao

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/CC3220SF_WiFiInterface.cpp

@@ -17,19 +17,21 @@
 #include "cc3200_simplelink.h"
 #include "CC3220SF_WiFiInterface.h"
 
-Semaphore connect_sem(0, 1);
-Semaphore ip_set_sem(0, 1);
 #define CONNECT_TIMEOUT_MS 2000
 #define IP_SET_TIMEOUT_MS  2000
+CC3220SFInterface * CC3220SFInterface::cc3200sf_wifi_instance;
 
 CC3220SFInterface::CC3220SFInterface():
     _initialized(false),
-    _started(false)
+    _started(false),
+    _connect_sem(0, 1),
+    _ip_set_sem(0, 1)
 {
     //memset(_cbs, 0, sizeof(_cbs));
     memset(_ssid, 0, sizeof(_ssid));
     memset(_pass, 0, sizeof(_pass));
     _security = NSAPI_SECURITY_UNKNOWN;
+    cc3200sf_wifi_instance = this;
     _cc3200_simplelink.initialize();
 }
 
@@ -85,11 +87,11 @@ nsapi_error_t CC3220SFInterface::connect()
     }
 
     // Connect is async call. Wait till connection completes
-    if (connect_sem.wait(CONNECT_TIMEOUT_MS) != 1)
+    if (_connect_sem.wait(CONNECT_TIMEOUT_MS) != 1)
     {
         printf("Connection timed out\n");
     }
-    if (ip_set_sem.wait(IP_SET_TIMEOUT_MS) != 1)
+    if (_ip_set_sem.wait(IP_SET_TIMEOUT_MS) != 1)
     {
         printf("IP address set timed out\n");
     }
@@ -131,8 +133,8 @@ nsapi_error_t CC3220SFInterface::set_credentials(const char *ssid, const char *p
         }
     }
 
-    strncpy(_ssid, ssid, 255);;
-    strncpy(_pass, pass, 255);
+    strncpy(_ssid, ssid, sizeof(_ssid));
+    strncpy(_pass, pass, sizeof(_pass));
     _security = security;
 
     return NSAPI_ERROR_OK;

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/CC3220SF_WiFiInterface.h

@@ -339,5 +339,10 @@ class CC3220SFInterface: public NetworkStack, public WiFiInterface
 
     nsapi_error_t _init(void);
     nsapi_error_t _startup(const int8_t wifi_mode);
+    Semaphore _connect_sem;
+    Semaphore _ip_set_sem;
+    static CC3220SFInterface * cc3200sf_wifi_instance;
+    friend void SimpleLinkNetAppEventHandler(SlNetAppEvent_t *pNetAppEvent);
+    friend void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent);
 };
 #endif

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/wifi_event_handler.cpp

@@ -53,11 +53,9 @@
 #include <stdarg.h>
 #include "rtos.h"
 
+#include <CC3220SF_WiFiInterface.h>
 #include <ti/drivers/net/wifi/simplelink.h>
 
-extern Semaphore connect_sem;
-extern Semaphore ip_set_sem;
-
 #define HANDLER_TRACE_ENABLE 0
 
 /****************************************************************************
@@ -119,8 +117,8 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent)
                       pWlanEvent->Data.Connect.Bssid[3],pWlanEvent->Data.Connect.Bssid[4],
                       pWlanEvent->Data.Connect.Bssid[5]);
             #endif
-            connect_sem.release();
-		}
+            CC3220SFInterface::cc3200sf_wifi_instance->_connect_sem.release();
+        }
         break;
 
         case SL_WLAN_EVENT_DISCONNECT:
@@ -283,7 +281,7 @@ void SimpleLinkNetAppEventHandler(SlNetAppEvent_t *pNetAppEvent)
                     (unsigned int)SL_IPV4_BYTE(pEventData->Gateway,1),
                     (unsigned int)SL_IPV4_BYTE(pEventData->Gateway,0));
             #endif
-            ip_set_sem.release();
+            CC3220SFInterface::cc3200sf_wifi_instance->_ip_set_sem.release();
         }
         break;