This commit is contained in:
pvvx 2017-12-12 23:34:32 +03:00
parent b3dc0dda87
commit 0830a1244a
29 changed files with 240 additions and 152 deletions

View file

@ -30,6 +30,7 @@ extern int inic_stop(void);
#if CONFIG_DEBUG_LOG > 0
#undef printf
extern int rtl_printf(const char *fmt, ...);
#define printf(...) rtl_printf(__VA_ARGS__)
#else
#undef printf
@ -832,13 +833,13 @@ int wifi_on(rtw_mode_t mode) {
wifi_set_mib();
printf("Initializing WIFI ...\n");
for (idx = 0; idx < devnum; idx++) {
ret = rltk_wlan_init(idx, mode);
ret = rltk_wlan_init(idx, mode); // 56
if (ret < 0)
return ret;
}
for (idx = 0; idx < devnum; idx++)
for (idx = 0; idx < devnum; idx++) {
rltk_wlan_start(idx);
}
while (1) {
if (rltk_wlan_running(devnum - 1)) {
printf("WIFI initialized\n");

View file

@ -8,6 +8,7 @@
#include <osdep_service.h>
#include <wlan/wlan_test_inc.h>
#include <dhcp/dhcps.h>
#include <wifi_constants.h>
#include <wifi/wifi_conf.h>
#include <wifi/wifi_util.h>
#include <platform/platform_stdlib.h>
@ -382,7 +383,7 @@ static void cmd_wifi_connect(int argc, char **argv)
char *ssid;
rtw_security_t security_type;
char *password;
int ssid_len;
// int ssid_len;
int password_len;
int key_id;
void *semaphore;
@ -411,21 +412,21 @@ static void cmd_wifi_connect(int argc, char **argv)
if(argc == 2){
security_type = RTW_SECURITY_OPEN;
password = NULL;
ssid_len = strlen((const char *)argv[1]);
// ssid_len = strlen((const char *)argv[1]);
password_len = 0;
key_id = 0;
semaphore = NULL;
}else if(argc ==3){
security_type = RTW_SECURITY_WPA2_AES_PSK;
password = argv[2];
ssid_len = strlen((const char *)argv[1]);
// ssid_len = strlen((const char *)argv[1]);
password_len = strlen((const char *)argv[2]);
key_id = 0;
semaphore = NULL;
}else{
security_type = RTW_SECURITY_WEP_PSK;
password = argv[2];
ssid_len = strlen((const char *)argv[1]);
// ssid_len = strlen((const char *)argv[1]);
password_len = strlen((const char *)argv[2]);
key_id = atoi(argv[3]);
if(( password_len != 5) && (password_len != 13)) {