From 03c99e7cd2ac0cc51a23fa009222c13226b4b1bf Mon Sep 17 00:00:00 2001 From: yang_hongliang Date: Sun, 13 Mar 2022 15:57:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?p2p=20=E5=85=BC=E5=AE=B9rk3568?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang_hongliang --- .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 3 +++ .../wifi_framework/wifi_manage/wifi_p2p/p2p_define.h | 6 +++++- services/wifi_standard/wifi_hal/BUILD.gn | 4 +++- .../wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c | 4 ++++ .../wifi_standard/wifi_hal/wifi_hal_p2p_interface.c | 10 +++++++++- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 613262648..00c961752 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -53,6 +53,9 @@ config("wifi_manager_service_header") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", ] + if (defined(product_name) && product_name == "rk3568") { + defines = [ "PRODUCT_RK" ] + } } config("wifi_manager_service_config") { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h index e56b8a70d..52116c764 100644 --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h @@ -22,7 +22,11 @@ namespace OHOS { namespace Wifi { +#ifdef PRODUCT_RK +const std::string P2P_INTERFACE("wlan0"); +#else const std::string P2P_INTERFACE("p2p0"); +#endif /* The timeout interval of enable p2p */ constexpr long ENABLE_P2P_TIMED_OUT__INTERVAL = 5000; /* The time of clears service requests processed in records. */ @@ -152,4 +156,4 @@ using HandlerMethod = void(P2P_STATE_MACHINE_CMD, int, int, const std::any &); } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/services/wifi_standard/wifi_hal/BUILD.gn b/services/wifi_standard/wifi_hal/BUILD.gn index 9e78ec5e3..6812acac1 100755 --- a/services/wifi_standard/wifi_hal/BUILD.gn +++ b/services/wifi_standard/wifi_hal/BUILD.gn @@ -67,7 +67,9 @@ ohos_executable("wifi_hal_service") { cflags_cc = [ "-fno-rtti" ] - defines = [] + if (defined(product_name) && product_name == "rk3568") { + defines = [ "PRODUCT_RK" ] + } part_name = "wifi_standard" subsystem_name = "communication" diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c index 730ba4d64..4caec3fe6 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c @@ -1305,7 +1305,11 @@ WifiWpaP2pInterface *GetWifiWapP2pInterface() LOGE("alloc memory for p2p interface failed!"); return NULL; } +#ifdef PRODUCT_RK + StrSafeCopy(g_wpaP2pInterface->ifName, sizeof(g_wpaP2pInterface->ifName), "wlan0"); +#else StrSafeCopy(g_wpaP2pInterface->ifName, sizeof(g_wpaP2pInterface->ifName), "p2p0"); +#endif InitGlobalWpaP2pFunc(); return g_wpaP2pInterface; } diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c b/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c index 8c4d08bf0..88cf63a2d 100644 --- a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c +++ b/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c @@ -97,7 +97,11 @@ static WifiErrorNo StopP2pWpaAndWpaHal(void) } WifiWpaInterface *pWpaInterface = GetWifiWapGlobalInterface(); if (pWpaInterface != NULL) { +#ifdef PRODUCT_RK + pWpaInterface->wpaCliRemoveIface(pWpaInterface, "p2p-wlan0-0"); +#else pWpaInterface->wpaCliRemoveIface(pWpaInterface, "p2p0"); +#endif } if (P2pStopSupplicant() != WIFI_HAL_SUCCESS) { LOGE("p2p_wpa_supplicant stop failed!"); @@ -120,7 +124,11 @@ static WifiErrorNo AddP2pIface(void) return WIFI_HAL_FAILED; } AddInterfaceArgv argv; +#ifdef PRODUCT_RK + if (strcpy_s(argv.name, sizeof(argv.name), "wlan0") != EOK || +#else if (strcpy_s(argv.name, sizeof(argv.name), "p2p0") != EOK || +#endif strcpy_s(argv.confName, sizeof(argv.confName), "/data/misc/wifi/wpa_supplicant/p2p_supplicant.conf") != EOK) { return WIFI_HAL_FAILED; } @@ -1028,4 +1036,4 @@ WifiErrorNo P2pHid2dConnect(Hid2dConnectInfo *info) return ConvertP2pErrCode(ret); } return WIFI_HAL_SUCCESS; -} \ No newline at end of file +} -- Gitee From 8bd4c7bcef846e26237a6b345dfca258c7a44f4c Mon Sep 17 00:00:00 2001 From: yang_hongliang Date: Sun, 13 Mar 2022 21:37:56 +0800 Subject: [PATCH 2/3] fix BUILD.gn Signed-off-by: yang_hongliang --- services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 4 ++++ .../wifi_framework/wifi_manage/wifi_p2p/BUILD.gn | 3 +++ services/wifi_standard/wifi_hal/BUILD.gn | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) mode change 100644 => 100755 services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn diff --git a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 00c961752..eec2d869d 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -69,6 +69,10 @@ config("wifi_manager_service_config") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } + + if (product_name == "rk3568") { + defines = [ "PRODUCT_RK" ] + } } ohos_source_set("wifi_scan_service_impl") { diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn old mode 100644 new mode 100755 index 08a93fb4c..703232f6d --- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -95,6 +95,9 @@ ohos_shared_library("wifi_p2p_service") { ] defines = [ "AP_NOT_DIRECT_USE_DHCP" ] + if (product_name == "rk3568") { + defines += [ "PRODUCT_RK" ] + } external_deps = [ "hiviewdfx_hilog_native:libhilog", diff --git a/services/wifi_standard/wifi_hal/BUILD.gn b/services/wifi_standard/wifi_hal/BUILD.gn index 6812acac1..1785fc4d8 100755 --- a/services/wifi_standard/wifi_hal/BUILD.gn +++ b/services/wifi_standard/wifi_hal/BUILD.gn @@ -66,9 +66,9 @@ ohos_executable("wifi_hal_service") { ] cflags_cc = [ "-fno-rtti" ] - - if (defined(product_name) && product_name == "rk3568") { - defines = [ "PRODUCT_RK" ] + defines = [] + if (product_name == "rk3568") { + defines += [ "PRODUCT_RK" ] } part_name = "wifi_standard" -- Gitee From 212e1d4dad8c0816b543f5bba3241970e67b8d79 Mon Sep 17 00:00:00 2001 From: yang_hongliang Date: Sun, 13 Mar 2022 21:39:45 +0800 Subject: [PATCH 3/3] fix BUILD.gn Signed-off-by: yang_hongliang --- services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index eec2d869d..3890b6fe8 100755 --- a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -53,9 +53,6 @@ config("wifi_manager_service_header") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys", ] - if (defined(product_name) && product_name == "rk3568") { - defines = [ "PRODUCT_RK" ] - } } config("wifi_manager_service_config") { -- Gitee