[Feature][ZXW-265]merge P56U03 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I873f6df64e2605a77b8b8bfec35b21e7f33c5444
diff --git a/ap/app/include/at_msg.h b/ap/app/include/at_msg.h
index 024dcca..5c1b3a3 100755
--- a/ap/app/include/at_msg.h
+++ b/ap/app/include/at_msg.h
@@ -268,6 +268,7 @@
MSG_CMD_VSIMDEBUG_IND, //VSIMDEBUG
MSG_CMD_ZSCISCAN_REQ, //VSIM cell info
MSG_CMD_ZSCISCAN_IND, //VSIM cell info
+ MSG_CMD_PPP_TURN_CMD, //PPP tty turn cmd
};
#endif
diff --git a/ap/app/include/wifi_msg.h b/ap/app/include/wifi_msg.h
index 4f7b354..03df513 100755
--- a/ap/app/include/wifi_msg.h
+++ b/ap/app/include/wifi_msg.h
@@ -520,8 +520,8 @@
typedef enum
{
IN_WIFI_AP_INDEX_MIN = -1,
- IN_WIFI_AP_INDEX_AP0 = 0,
- //IN_WIFI_AP_INDEX_AP1,
+ IN_WIFI_AP_INDEX_AP0 = 0, //2.4G
+ IN_WIFI_AP_INDEX_AP1, //5G
IN_WIFI_AP_INDEX_MAX
} inner_wifi_ap_id_e;
@@ -591,8 +591,8 @@
typedef enum
{
IN_WIFI_WORK_MODE_MIN = -1,
- IN_WIFI_WORK_MODE_AP0 = 0,
- IN_WIFI_WORK_MODE_AP0_STA,
+ IN_WIFI_WORK_MODE_AP0 = 0, //2.4G single ap / ap+sta
+ IN_WIFI_WORK_MODE_AP1, //5G single ap / ap+sta
IN_WIFI_WORK_MODE_MAX
} inner_wifi_work_mode_e;
@@ -709,4 +709,8 @@
wlan_sta_scan_info_t info[CAP_WIFI_MAX_SCAN_CNT];
} wlan_sta_scan_list_t;
+typedef struct {
+ int work_mode;
+} wlan_work_mode_t;//scwifi_workmode_t
+
#endif