Skip to content

Fix greentea test mbed-os-tests-netsocket-connectivity #5649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 20, 2017
Merged

Fix greentea test mbed-os-tests-netsocket-connectivity #5649

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1fcfced
Fixing changes to make greentea test mbed-os-tests-netsocket-connecti…
prashantrar Dec 4, 2017
199ab87
Revert "Fixing changes to make greentea test mbed-os-tests-netsocket-…
prashantrar Dec 12, 2017
01808db
Moving changes to RTW driver
prashantrar Dec 12, 2017
01ec0da
Replacing formatting issues
prashantrar Dec 12, 2017
a4ce936
reverting all tabs to spaces
prashantrar Dec 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions targets/TARGET_Realtek/TARGET_AMEBA/RTWInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,16 @@ typedef struct _wifi_scan_hdl {

#define MAX_SCAN_TIMEOUT (15000)

static bool _inited = false;

static rtw_result_t scan_result_handler( rtw_scan_handler_result_t* malloced_scan_result )
{
wifi_scan_hdl *scan_handler = (wifi_scan_hdl *)malloced_scan_result->user_data;
if (malloced_scan_result->scan_complete != RTW_TRUE) {
if(scan_handler->ap_details && scan_handler->scan_num > scan_handler->ap_num){
nsapi_wifi_ap_t ap;
nsapi_wifi_ap_t ap;
rtw_scan_result_t* record = &malloced_scan_result->ap_details;
record->SSID.val[record->SSID.len] = 0; /* Ensure the SSID is null terminated */
record->SSID.val[record->SSID.len] = 0; /* Ensure the SSID is null terminated */
memset((void*)&ap, 0x00, sizeof(nsapi_wifi_ap_t));
memcpy(ap.ssid, record->SSID.val, record->SSID.len);
memcpy(ap.bssid, record->BSSID.octet, 6);
Expand Down Expand Up @@ -88,7 +90,7 @@ RTWInterface::RTWInterface(bool debug)
{
emac_interface_t *emac;
int ret;
extern u32 GlobalDebugEnable;
extern u32 GlobalDebugEnable;

GlobalDebugEnable = debug?1:0;
emac = wlan_emac_init_interface();
Expand All @@ -97,10 +99,13 @@ RTWInterface::RTWInterface(bool debug)
return;
}
emac->ops.power_up(emac);
ret = mbed_lwip_init(emac);
if (ret != 0) {
printf("Error init RTWInterface!(%d)\r\n", ret);
return;
if (_inited == false) {
ret = mbed_lwip_init(emac);
if (ret != 0) {
printf("Error init RTWInterface!(%d)\r\n", ret);
return;
}
_inited = true;
}
}

Expand Down Expand Up @@ -158,7 +163,7 @@ nsapi_error_t RTWInterface::connect()
break;
case NSAPI_SECURITY_NONE:
sec = RTW_SECURITY_OPEN;
break;
break;
default:
return NSAPI_ERROR_PARAMETER;
}
Expand All @@ -167,7 +172,7 @@ nsapi_error_t RTWInterface::connect()
uint8_t pscan_config = PSCAN_ENABLE;
wifi_set_pscan_chan(&_channel, &pscan_config, 1);
}

ret = wifi_connect(_ssid, sec, _pass, strlen(_ssid), strlen(_pass), 0, (void *)NULL);
if (ret != RTW_SUCCESS) {
printf("failed: %d\r\n", ret);
Expand Down Expand Up @@ -218,7 +223,7 @@ int8_t RTWInterface::get_rssi()
}

nsapi_error_t RTWInterface::connect(const char *ssid, const char *pass,
nsapi_security_t security, uint8_t channel)
nsapi_security_t security, uint8_t channel)
{
set_credentials(ssid, pass, security);
set_channel(channel);
Expand All @@ -230,9 +235,10 @@ nsapi_error_t RTWInterface::disconnect()
char essid[33];

wlan_emac_link_change(false);
mbed_lwip_bringdown();
if(wifi_is_connected_to_ap() != RTW_SUCCESS)
return NSAPI_ERROR_NO_CONNECTION;
if(wifi_disconnect()<0){
if(wifi_disconnect()<0){
return NSAPI_ERROR_DEVICE_ERROR;
}
while(1){
Expand Down