ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix the CI build issue

pull/12598/head
Rajkumar Kanagaraj 2020-03-10 07:50:32 -07:00
parent 30852be00a
commit 2f4cf1a052
1 changed files with 24 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/ublox-odin-w2-drivers/OdinWiFiInterface.cpp
View File

@ -231,15 +231,13 @@ nsapi_error_t OdinWiFiInterface::set_credentials(const char *ssid, const char *p
return NSAPI_ERROR_PARAMETER; return NSAPI_ERROR_PARAMETER;
} }
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
strncpy(_sta.ssid, ssid, cbWLAN_SSID_MAX_LENGTH); strncpy(_sta.ssid, ssid, cbWLAN_SSID_MAX_LENGTH);
strncpy(_sta.passwd, pass, cbWLAN_MAX_PASSPHRASE_LENGTH); strncpy(_sta.passwd, pass, cbWLAN_MAX_PASSPHRASE_LENGTH);
_sta.security = security; _sta.security = security;
res = _mutex.unlock(); _mutex.unlock();
MBED_ASSERT(res == osOK);
return NSAPI_ERROR_OK; return NSAPI_ERROR_OK;
} }
@ -275,26 +273,18 @@ nsapi_error_t OdinWiFiInterface::set_channel(uint8_t channel)
return NSAPI_ERROR_PARAMETER; return NSAPI_ERROR_PARAMETER;
} }
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
_sta.channel = channel; _sta.channel = channel;
_mutex.unlock();
res = _mutex.unlock();
MBED_ASSERT(res == osOK);
return NSAPI_ERROR_OK; return NSAPI_ERROR_OK;
} }
nsapi_error_t OdinWiFiInterface::set_timeout(int ms) nsapi_error_t OdinWiFiInterface::set_timeout(int ms)
{ {
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
_sta.timeout_ms = ms; _sta.timeout_ms = ms;
_mutex.unlock();
res = _mutex.unlock();
MBED_ASSERT(res == osOK);
return NSAPI_ERROR_OK; return NSAPI_ERROR_OK;
} }
@ -560,8 +550,7 @@ nsapi_error_t OdinWiFiInterface::set_ap_network(const char *ip_address, const ch
{ {
nsapi_error_t result = NSAPI_ERROR_PARAMETER; nsapi_error_t result = NSAPI_ERROR_PARAMETER;
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
if ((ip_address != NULL) && (netmask != NULL) && (gateway != NULL)) if ((ip_address != NULL) && (netmask != NULL) && (gateway != NULL))
{ {
@ -583,8 +572,7 @@ nsapi_error_t OdinWiFiInterface::set_ap_network(const char *ip_address, const ch
result = NSAPI_ERROR_OK; result = NSAPI_ERROR_OK;
} }
res = _mutex.unlock(); _mutex.unlock();
MBED_ASSERT(res == osOK);
return result; return result;
} }
@ -593,28 +581,22 @@ nsapi_error_t OdinWiFiInterface::set_ap_network(const char *ip_address, const ch
nsapi_error_t OdinWiFiInterface::set_ap_credentials(const char *ssid, const char *pass, nsapi_error_t OdinWiFiInterface::set_ap_credentials(const char *ssid, const char *pass,
nsapi_security_t security) nsapi_security_t security)
{ {
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
_ap.ssid = ssid; _ap.ssid = ssid;
_ap.passwd = pass; _ap.passwd = pass;
_ap.security = security; _ap.security = security;
res = _mutex.unlock(); _mutex.unlock();
MBED_ASSERT(res == osOK);
return NSAPI_ERROR_OK; return NSAPI_ERROR_OK;
} }
nsapi_error_t OdinWiFiInterface::set_ap_channel(uint8_t channel) nsapi_error_t OdinWiFiInterface::set_ap_channel(uint8_t channel)
{ {
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
_ap.channel = channel; _ap.channel = channel;
_mutex.unlock();
res = _mutex.unlock();
MBED_ASSERT(res == osOK);
return NSAPI_ERROR_OK; return NSAPI_ERROR_OK;
} }
@ -623,13 +605,9 @@ int OdinWiFiInterface::get_ap_connection_count()
{ {
int cnt; int cnt;
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
cnt = _ap.cnt_connected; cnt = _ap.cnt_connected;
_mutex.unlock();
res = _mutex.unlock();
MBED_ASSERT(res == osOK);
return cnt; return cnt;
} }
@ -641,13 +619,9 @@ int OdinWiFiInterface::get_ap_max_connection_count()
nsapi_error_t OdinWiFiInterface::set_ap_dhcp(bool dhcp) nsapi_error_t OdinWiFiInterface::set_ap_dhcp(bool dhcp)
{ {
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
_ap.use_dhcp = dhcp; _ap.use_dhcp = dhcp;
_mutex.unlock();
res = _mutex.unlock();
MBED_ASSERT(res == osOK);
return NSAPI_ERROR_OK; return NSAPI_ERROR_OK;
} }
@ -739,13 +713,9 @@ nsapi_error_t OdinWiFiInterface::ap_stop()
nsapi_error_t OdinWiFiInterface::set_ap_beacon_interval(uint16_t interval) nsapi_error_t OdinWiFiInterface::set_ap_beacon_interval(uint16_t interval)
{ {
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
_ap.beacon_interval = interval; _ap.beacon_interval = interval;
_mutex.unlock();
res = _mutex.unlock();
MBED_ASSERT(res == osOK);
return NSAPI_ERROR_OK; return NSAPI_ERROR_OK;
} }
@ -860,8 +830,7 @@ void OdinWiFiInterface::handle_in_msg(void)
struct odin_wifi_msg_s *msg = (odin_wifi_msg_s*)evt.value.p; struct odin_wifi_msg_s *msg = (odin_wifi_msg_s*)evt.value.p;
MBED_ASSERT(msg != 0); MBED_ASSERT(msg != 0);
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
switch(msg->type) { switch(msg->type) {
case ODIN_WIFI_MSG_USER_CONNECT: case ODIN_WIFI_MSG_USER_CONNECT:
@ -949,8 +918,7 @@ void OdinWiFiInterface::handle_in_msg(void)
break; break;
} }
res = _mutex.unlock(); _mutex.unlock();
MBED_ASSERT(res == osOK);
if(msg != 0) { if(msg != 0) {
_msg_pool->free(msg); _msg_pool->free(msg);
@ -1530,8 +1498,7 @@ void OdinWiFiInterface::handle_wlan_status_ap_down()
void OdinWiFiInterface::init(bool debug = false) void OdinWiFiInterface::init(bool debug = false)
{ {
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
// Initialise internal variables // Initialise internal variables
_state = S_NOT_INITIALISED; _state = S_NOT_INITIALISED;
@ -1595,8 +1562,7 @@ void OdinWiFiInterface::init(bool debug = false)
_thread.start(callback(wlan_callb_s::odin_thread_fcn, this)); _thread.start(callback(wlan_callb_s::odin_thread_fcn, this));
res = _mutex.unlock(); _mutex.unlock();
MBED_ASSERT(res == osOK);
} }
void OdinWiFiInterface::send_user_response_msg(unsigned int type, nsapi_error_t error_code) void OdinWiFiInterface::send_user_response_msg(unsigned int type, nsapi_error_t error_code)
@ -1817,14 +1783,12 @@ void OdinWiFiInterface::wlan_scan_indication(cbWLAN_ScanIndicationInfo *scan_inf
MBED_ASSERT(ok == osOK); MBED_ASSERT(ok == osOK);
} }
else { else {
osStatus res = _mutex.lock(); _mutex.lock();
MBED_ASSERT(res == osOK);
// Add scan result to scan_list // Add scan result to scan_list
update_scan_list(scan_info); update_scan_list(scan_info);
res = _mutex.unlock(); _mutex.unlock();
MBED_ASSERT(res == osOK);
} }
} }
else { else {