change: airlink,把最常用的g_airlink_ext_dev_info提取到头文件里

components/airlink/binding/luat_lib_airlink.c

@@ -33,7 +33,6 @@
 extern airlink_statistic_t g_airlink_statistic;
 extern uint32_t g_airlink_spi_task_mode;
 extern uint32_t g_airlink_pause;
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
 extern luat_airlink_irq_ctx_t g_airlink_wakeup_irq_ctx;
 
 /*

components/airlink/include/luat_airlink.h

@@ -318,6 +318,8 @@ int luat_airlink_has_wifi(void);
 
 uint32_t luat_airlink_sversion(void);
 
+extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
+
 typedef void (*AIRLINK_DEV_INFO_UPDATE_CB)(void);
 
 #ifdef TYPE_EC718M

components/airlink/src/driver/luat_airlink_drv_gpio.c

@@ -54,7 +54,6 @@ int luat_airlink_drv_gpio_set(int pin, int level) {
 
 luat_rtos_semaphore_t g_drv_gpio_sem;
 uint64_t g_drv_gpio_input_level = 0;
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
 int luat_airlink_drv_gpio_get(int pin, int* val) {
     int ret = 0;
     if (pin >= 128) {

components/airlink/src/driver/luat_airlink_drv_mobile.c

@@ -20,8 +20,6 @@
 #define LLOGD(...) 
 luat_airlink_mobile_evt_cb g_airlink_mobile_evt_cb;
 
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
-
 int luat_airlink_mobile_event_callback(LUAT_MOBILE_EVENT_E event, uint8_t index, uint8_t status, void* ptr) {
 	if (g_airlink_mobile_evt_cb) {
 		g_airlink_mobile_evt_cb(event, index, status, ptr);

components/airlink/src/exec/luat_airlink_cmd_exec_info.c

@@ -21,8 +21,6 @@
 #define LUAT_LOG_TAG "airlink"
 #include "luat_log.h"
 
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
-
 __AIRLINK_CODE_IN_RAM__ int luat_airlink_cmd_exec_dev_info(luat_airlink_cmd_t* cmd, void* userdata) {
     luat_airlink_dev_info_t* dev = cmd->data;
     luat_netdrv_t* drv = NULL;

components/airlink/src/exec/luat_airlink_cmd_exec_mobile.c

@@ -15,9 +15,6 @@
 #define LUAT_LOG_TAG "airlink"
 #include "luat_log.h"
 
-
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
-
 int luat_airlink_cmd_exec_mobile_imei(luat_airlink_cmd_t* cmd, void* userdata) {
     int ret = 0;
     uint8_t index = cmd->data[8];

components/airlink/src/luat_airlink.c

@@ -29,7 +29,6 @@ luat_rtos_queue_t airlink_ippkg_queue;
 extern int luat_airlink_start_slave(void);
 extern int luat_airlink_start_master(void);
 extern int luat_airlink_start_uart(void);
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
 luat_airlink_newdata_notify_cb g_airlink_newdata_notify_cb;
 luat_airlink_spi_conf_t g_airlink_spi_conf;
 airlink_statistic_t g_airlink_statistic;

components/airlink/src/luat_airlink_fota.c

@@ -9,7 +9,6 @@
 #include "luat_log.h"
 
 luat_airlink_fota_t *g_airlink_fota;
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
 
 int luat_airlink_fota_init(luat_airlink_fota_t *ctx)
 {

components/airlink/src/task/luat_airlink_task.c

@@ -103,11 +103,10 @@ __AIRLINK_CODE_IN_RAM__ static int luat_airlink_task(void *param) {
                 goto clean;
             }
 
-            exec_cmd(ptr);
-            
+            // 更新最后通讯时间
             if (g_airlink_last_cmd_timestamp == 0) {
                 g_airlink_last_cmd_timestamp = luat_mcu_tick64_ms();
-                extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
+                
                 if (g_airlink_ext_dev_info.tp == 0x01) {
                     uint32_t tmpv = 0;
                     memcpy(&tmpv, g_airlink_ext_dev_info.wifi.version, 4);
@@ -126,6 +125,9 @@ __AIRLINK_CODE_IN_RAM__ static int luat_airlink_task(void *param) {
             else {
                 g_airlink_last_cmd_timestamp = luat_mcu_tick64_ms();
             }
+
+            exec_cmd(ptr);
+
             clean:
             // 处理完成, 释放内存
             luat_heap_opt_free(AIRLINK_MEM_TYPE, ptr);

components/bluetooth/drv/luat_drv_ble_port.c

@@ -24,16 +24,6 @@ luat_ble_cb_t g_drv_ble_cb;
 #undef LLOGD
 #define LLOGD(...)
 
-// 读取wifi固件版本, 控制API适配状态
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
-static uint32_t get_ble_version(void) {
-    uint32_t version = 0;
-    if (g_airlink_ext_dev_info.tp == 1) {
-        memcpy(&version, g_airlink_ext_dev_info.wifi.version, 4);
-    }
-    return version;
-}
-
 int luat_ble_init(void* args, luat_ble_cb_t luat_ble_cb) {
     LLOGD("执行luat_ble_init %p", luat_ble_cb);
     g_drv_ble_cb = luat_ble_cb;
@@ -534,8 +524,8 @@ int luat_ble_delete_scanning(void* args) {
 
 int luat_ble_connect(void* args, luat_ble_connect_req_t *conn) {
     LLOGD("执行luat_ble_connect");
-    if (get_ble_version() < 11) {
-        LLOGE("ble:connect not support, ble version is %d", get_ble_version());
+    if (luat_airlink_sversion() < 11) {
+        LLOGE("ble:connect not support, ble version is %d", luat_airlink_sversion());
         return -1;
     }
     uint64_t seq = luat_airlink_get_next_cmd_id();
@@ -562,8 +552,8 @@ int luat_ble_connect(void* args, luat_ble_connect_req_t *conn) {
 
 int luat_ble_disconnect(void* args) {
     LLOGD("执行luat_ble_disconnect");
-    if (get_ble_version() < 11) {
-        LLOGE("ble:disconnect not support, ble version is %d", get_ble_version());
+    if (luat_airlink_sversion() < 11) {
+        LLOGE("ble:disconnect not support, ble version is %d", luat_airlink_sversion());
         return -1;
     }
     uint64_t seq = luat_airlink_get_next_cmd_id();
@@ -585,8 +575,8 @@ int luat_ble_disconnect(void* args) {
 
 int luat_ble_read_value(luat_ble_uuid_t* uuid_service, luat_ble_uuid_t* uuid_characteristic, luat_ble_uuid_t* uuid_descriptor, uint8_t **data, uint16_t* len) {
     LLOGD("执行luat_ble_read_value");
-    if (get_ble_version() < 11) {
-        LLOGE("ble:read_value not support, ble version is %d", get_ble_version());
+    if (luat_airlink_sversion() < 11) {
+        LLOGE("ble:read_value not support, ble version is %d", luat_airlink_sversion());
         return -1;
     }
     uint16_t tmp = 0;
@@ -634,8 +624,8 @@ int luat_ble_read_value(luat_ble_uuid_t* uuid_service, luat_ble_uuid_t* uuid_cha
 
 int luat_ble_notify_enable(luat_ble_uuid_t* uuid_service, luat_ble_uuid_t* uuid_characteristic, uint8_t enable) {
     LLOGD("执行luat_ble_notify_enable %d", enable);
-    if (get_ble_version() < 11) {
-        LLOGE("ble:notify_enable not support, ble version is %d", get_ble_version());
+    if (luat_airlink_sversion() < 11) {
+        LLOGE("ble:notify_enable not support, ble version is %d", luat_airlink_sversion());
         return -1;
     }
     uint16_t tmp = 0;
@@ -676,8 +666,8 @@ int luat_ble_notify_enable(luat_ble_uuid_t* uuid_service, luat_ble_uuid_t* uuid_
 
 int luat_ble_indicate_enable(luat_ble_uuid_t* uuid_service, luat_ble_uuid_t* uuid_characteristic, uint8_t enable) {
     LLOGD("执行luat_ble_indicate_enable %d", enable);
-    if (get_ble_version() < 15) {
-        LLOGE("ble:indicate_enable not support, ble version is %d", get_ble_version());
+    if (luat_airlink_sversion() < 15) {
+        LLOGE("ble:indicate_enable not support, ble version is %d", luat_airlink_sversion());
         return -1;
     }
     uint16_t tmp = 0;

components/bluetooth/drv/luat_drv_bt_port.c

@@ -13,8 +13,6 @@
 #define LUAT_LOG_TAG "drv.bt"
 #include "luat_log.h"
 
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
-
 int luat_bluetooth_init(void* args) {
     LLOGD("执行luat_bluetooth_init");
     uint64_t luat_airlink_next_cmd_id = luat_airlink_get_next_cmd_id();

components/drv/src/luat_drv_wlan.c

@@ -16,8 +16,6 @@
 // #undef LLOGD
 // #define LLOGD(...) 
 
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
-
 int luat_drv_wlan_init(luat_wlan_config_t *conf) {
     return luat_airlink_drv_wlan_init(conf);
 }

components/mreport/src/luat_mreport.c

@@ -22,7 +22,6 @@
 // #define MREPORT_DOMAIN "112.125.89.8"
 // #define MREPORT_PORT (42919)
 
-extern luat_airlink_dev_info_t g_airlink_ext_dev_info;
 static struct udp_pcb* mreport_pcb;
 static luat_rtos_timer_t mreport_timer;
 const char *project_name = "unkonw";             // luatos项目名称