[beken-72xx] Implement WiFi scanning

arduino/beken-72xx/cores/arduino/WVariant.h

@@ -13,6 +13,9 @@ extern "C" {
 void delayMilliseconds(unsigned long);
 #define delay delayMilliseconds
 
+// from fixups/arch_main.c
+extern unsigned char __bk_rf_is_init;
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

arduino/beken-72xx/libraries/WiFi/WiFi.cpp

@@ -0,0 +1,33 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-06-26. */
+
+#include "WiFiPriv.h"
+
+WiFiClass::WiFiClass() {
+	data.scanSem = xSemaphoreCreateBinary();
+}
+
+WiFiClass::~WiFiClass() {
+	vSemaphoreDelete(data.scanSem);
+}
+
+WiFiAuthMode securityTypeToAuthMode(uint8_t type) {
+	// wlan_ui_pub.h:62
+	switch (type) {
+		case BK_SECURITY_TYPE_NONE:
+			return WIFI_AUTH_OPEN;
+		case BK_SECURITY_TYPE_WEP:
+			return WIFI_AUTH_WEP;
+		case BK_SECURITY_TYPE_WPA_TKIP:
+		case BK_SECURITY_TYPE_WPA_AES:
+			return WIFI_AUTH_WPA_PSK;
+		case BK_SECURITY_TYPE_WPA2_TKIP:
+		case BK_SECURITY_TYPE_WPA2_AES:
+		case BK_SECURITY_TYPE_WPA2_MIXED:
+			return WIFI_AUTH_WPA2_PSK;
+		case BK_SECURITY_TYPE_WPA3_SAE:
+			return WIFI_AUTH_WPA3_PSK;
+		case BK_SECURITY_TYPE_WPA3_WPA2_MIXED:
+			return WIFI_AUTH_WPA2_WPA3_PSK;
+	}
+	return WIFI_AUTH_INVALID;
+}

arduino/beken-72xx/libraries/WiFi/WiFi.h

@@ -0,0 +1,6 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-06-26. */
+
+#pragma once
+
+#include <Arduino.h>
+#include <api/WiFi/WiFi.h>

arduino/beken-72xx/libraries/WiFi/WiFiData.h

@@ -0,0 +1,16 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-06-26. */
+
+#pragma once
+
+#include <Arduino.h>
+
+extern "C" {
+
+#include <FreeRTOS.h>
+#include <semphr.h>
+
+} // extern "C"
+
+typedef struct {
+	SemaphoreHandle_t scanSem;
+} WiFiData;

arduino/beken-72xx/libraries/WiFi/WiFiGeneric.cpp

@@ -0,0 +1,55 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-06-26. */
+
+#include "WiFiPriv.h"
+
+bool WiFiClass::modePriv(WiFiMode mode, WiFiModeAction sta, WiFiModeAction ap) {
+	__wrap_bk_printf_disable();
+
+	if (!__bk_rf_is_init) {
+		LT_D_WG("Initializing func&app");
+		func_init_extended();
+		app_pre_start();
+		__bk_rf_is_init = true;
+	}
+
+	LT_HEAP_I();
+
+	if (sta == WLMODE_ENABLE) {
+		LT_D_WG("Enabling STA");
+		bk_wlan_sta_init(NULL);
+	} else if (sta == WLMODE_DISABLE) {
+		LT_D_WG("Disabling STA");
+		bk_wlan_stop(BK_STATION);
+	}
+
+	LT_HEAP_I();
+
+	if (ap == WLMODE_ENABLE) {
+		LT_D_WG("Enabling AP");
+		bk_wlan_ap_init(NULL);
+	} else if (ap == WLMODE_DISABLE) {
+		LT_D_WG("Disabling AP");
+		bk_wlan_stop(BK_SOFT_AP);
+	}
+
+	LT_HEAP_I();
+
+	__wrap_bk_printf_enable();
+}
+
+WiFiMode WiFiClass::getMode() {
+	if (!g_wlan_general_param)
+		return WIFI_MODE_NULL;
+	uint8_t role = g_wlan_general_param->role;
+	// change 1->2, 2->1
+	return (WiFiMode)(role + (role == 1) - (role == 2));
+}
+
+WiFiStatus WiFiClass::status() {
+	// wpa_suppliant_ctrl_get_wpas()->disconnected;
+	if (wpas_connect_ssid && wpas_connect_ssid->ssid_len) {
+		return WL_CONNECTED;
+	} else {
+		return WL_DISCONNECTED;
+	}
+}

arduino/beken-72xx/libraries/WiFi/WiFiPriv.h

@@ -0,0 +1,35 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-06-26. */
+
+#pragma once
+
+#include "WiFi.h"
+
+extern "C" {
+
+#include <FreeRTOS.h>
+#include <semphr.h>
+
+#include <common.h>
+#include <main_none.h>
+#include <param_config.h>
+#include <rw_msg_rx.h>
+#include <wlan_ui_pub.h>
+#include <wpa_supplicant_i.h>
+
+extern void func_init_extended();
+extern void app_pre_start();
+extern void bk_wlan_ap_init(network_InitTypeDef_st *inNetworkInitPara);
+
+// func/hostapd-2.5/wpa_supplicant/main_supplicant.c
+extern struct wpa_ssid_value *wpas_connect_ssid;
+
+// app/param_config.c
+extern general_param_t *g_wlan_general_param;
+extern ap_param_t *g_ap_param_ptr;
+extern sta_param_t *g_sta_param_ptr;
+extern uint8_t system_mac[6];
+
+// WiFi.cpp
+WiFiAuthMode securityTypeToAuthMode(uint8_t type);
+
+} // extern "C"

arduino/beken-72xx/libraries/WiFi/WiFiScan.cpp

@@ -0,0 +1,79 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-06-27. */
+
+#include "WiFiPriv.h"
+
+static void scanHandler(void *ctx, uint8_t param) {
+	LT_HEAP_I();
+	WiFiClass *cls = (WiFiClass *)ctx;
+	if (!cls) {
+		LT_W("Called without ctx");
+		return;
+	}
+	WiFiScanData *scan = cls->scan;
+	if (!scan) {
+		LT_W("Called without cls->scan");
+		return;
+	}
+
+	struct sta_scan_res *result;
+	uint8_t count = bk_wlan_get_scan_ap_result_numbers();
+	if (count == 0) {
+		LT_D_WG("No APs found");
+		goto end;
+	}
+	LT_D_WG("Found %d APs", count);
+
+	result = (struct sta_scan_res *)malloc(sizeof(struct sta_scan_res) * count);
+	if (!result) {
+		LT_W("sta_scan_res alloc failed");
+		goto end;
+	}
+	bk_wlan_get_scan_ap_result(result, count);
+
+	cls->scanAlloc(count);
+	if (!scan->ap) {
+		LT_W("scan->ap alloc failed");
+		goto end;
+	}
+
+	for (uint8_t i = 0; i < count; i++) {
+		scan->ap[i].ssid	= strdup(result[i].ssid);
+		scan->ap[i].auth	= securityTypeToAuthMode(result[i].security);
+		scan->ap[i].rssi	= result[i].level;
+		scan->ap[i].channel = result[i].channel;
+		memcpy(scan->ap[i].bssid.addr, result[i].bssid, 6);
+	}
+
+end:
+	scan->running = false;
+	xSemaphoreGive(cls->data.scanSem);
+	LT_HEAP_I();
+	return;
+}
+
+int16_t WiFiClass::scanNetworks(bool async, bool showHidden, bool passive, uint32_t maxMsPerChannel, uint8_t channel) {
+	if (scan && scan->running)
+		return WIFI_SCAN_RUNNING;
+	enableSTA(true);
+	scanDelete();
+	scanInit();
+
+	LT_I("Starting WiFi scan");
+
+	__wrap_bk_printf_disable();
+	mhdr_scanu_reg_cb(scanHandler, this);
+	bk_wlan_start_scan();
+	__wrap_bk_printf_enable();
+
+	LT_HEAP_I();
+
+	scan->running = true;
+
+	if (!async) {
+		LT_I("Waiting for results");
+		xSemaphoreTake(data.scanSem, 1); // reset the semaphore quickly
+		xSemaphoreTake(data.scanSem, pdMS_TO_TICKS(maxMsPerChannel * 20));
+		return scan->count;
+	}
+	return WIFI_SCAN_RUNNING;
+}

arduino/realtek-ambz/libraries/WiFi/WiFiData.h

@@ -4,16 +4,12 @@
 
 #include <Arduino.h>
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 #include <FreeRTOS.h>
 #include <semphr.h>
 
-#ifdef __cplusplus
 } // extern "C"
-#endif
 
 typedef struct {
 	bool initialized;

builder/frameworks/beken-72xx-arduino.py

@@ -21,6 +21,7 @@ env.Append(
         "-Wno-write-strings",
         "-Wno-char-subscripts",
         "-Wno-missing-braces",
+        "-Wno-attributes",
     ],
     LINKFLAGS=[
         # stdio wrappers (port/printf/printf.c)

platform/beken-7231t/fixups/sys_config.h

@@ -87,7 +87,7 @@
 #define CFG_WIFI_RAW_TX_CMD				0
 #define CFG_WIFI_SENSOR					0
 #define CFG_WLAN_FAST_CONNECT			0
-#define CFG_WPA_CTRL_IFACE				1
+#define CFG_WPA_CTRL_IFACE				0
 #define CFG_WPA3						0
 #define CFG_XTAL_FREQUENCE				CFG_XTAL_FREQUENCE_26M
 #define CFG_XTAL_FREQUENCE_26M			26000000

platform/beken-72xx/fixups/arch_main.c

@@ -30,6 +30,8 @@ extern void main(void);
 __attribute__((weak)) void __wrap_bk_printf_disable();
 __attribute__((weak)) void __wrap_bk_printf_enable();
 
+unsigned char __bk_rf_is_init = 0;
+
 void entry_main(void) {
 	// compatibility with BK7231S_1.0.5
 #if CFG_SUPPORT_BOOTLOADER