From 8e611a7fe3737e9157e441ad1cde5f751e20ce61 Mon Sep 17 00:00:00 2001 From: Bruin06 <419738327@qq.com> Date: Wed, 3 Sep 2025 15:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E9=99=90=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bruin06 <419738327@qq.com> --- .../src/ap/drv_callbacks.c | 9 +++++++++ .../src/drivers/driver_nl80211_event.c | 6 +++++- wpa_supplicant-2.9_standard/src/p2p/p2p.c | 12 ++++++++++- .../wpa_supplicant/wpa_supplicant.c | 20 +++++++++++++++++++ .../wpa_supplicant_lib/driver_nl80211_hisi.c | 12 +++++++++++ 5 files changed, 57 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant-2.9_standard/src/ap/drv_callbacks.c b/wpa_supplicant-2.9_standard/src/ap/drv_callbacks.c index ac6b492..a9aae38 100755 --- a/wpa_supplicant-2.9_standard/src/ap/drv_callbacks.c +++ b/wpa_supplicant-2.9_standard/src/ap/drv_callbacks.c @@ -60,6 +60,10 @@ #include "wpa_hw_p2p_chr.h" #endif +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) +#include "hm_miracast_sink.h" +#endif + #ifdef CONFIG_FILS void hostapd_notify_assoc_fils_finish(struct hostapd_data *hapd, struct sta_info *sta) @@ -2559,8 +2563,13 @@ void wpa_supplicant_event_hapd(void *ctx, enum wpa_event_type event, level = MSG_EXCESSIVE; } +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log(hapd->msg_ctx, level, "Event %s (%d) received", + event_to_string(event), event); +#else wpa_dbg(hapd->msg_ctx, level, "Event %s (%d) received", event_to_string(event), event); +#endif #endif /* CONFIG_NO_STDOUT_DEBUG */ switch (event) { diff --git a/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211_event.c b/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211_event.c index 32c6764..23ff8ab 100644 --- a/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211_event.c +++ b/wpa_supplicant-2.9_standard/src/drivers/driver_nl80211_event.c @@ -3947,9 +3947,13 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd, int external_scan_event = 0; struct nlattr *frame = tb[NL80211_ATTR_FRAME]; +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("nl80211: Drv Event %d (%s) received for %s", + cmd, nl80211_command_to_string(cmd), bss->ifname); +#else wpa_printf(MSG_INFO, "nl80211: Drv Event %d (%s) received for %s", cmd, nl80211_command_to_string(cmd), bss->ifname); - +#endif #ifdef CONFIG_DRIVER_NL80211_QCA if (cmd == NL80211_CMD_ROAM && (drv->capa.flags & WPA_DRIVER_FLAGS_KEY_MGMT_OFFLOAD)) { diff --git a/wpa_supplicant-2.9_standard/src/p2p/p2p.c b/wpa_supplicant-2.9_standard/src/p2p/p2p.c index abe83b0..4c9a095 100644 --- a/wpa_supplicant-2.9_standard/src/p2p/p2p.c +++ b/wpa_supplicant-2.9_standard/src/p2p/p2p.c @@ -249,10 +249,15 @@ void p2p_clear_provisioning_info(struct p2p_data *p2p, const u8 *addr) void p2p_set_state(struct p2p_data *p2p, int new_state) { +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("State %s -> %s", + p2p_state_txt(p2p->state), p2p_state_txt(new_state)); + p2p->state = new_state; +#else p2p_info(p2p, "State %s -> %s", p2p_state_txt(p2p->state), p2p_state_txt(new_state)); p2p->state = new_state; - +#endif if (new_state == P2P_IDLE && p2p->pending_channel) { p2p_dbg(p2p, "Apply change in listen channel"); p2p->cfg->reg_class = p2p->pending_reg_class; @@ -265,8 +270,13 @@ void p2p_set_state(struct p2p_data *p2p, int new_state) void p2p_set_timeout(struct p2p_data *p2p, unsigned int sec, unsigned int usec) { +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("Set timeout (state=%s): %u.%06u sec", + p2p_state_txt(p2p->state), sec, usec); +#else p2p_info(p2p, "Set timeout (state=%s): %u.%06u sec", p2p_state_txt(p2p->state), sec, usec); +#endif eloop_cancel_timeout(p2p_state_timeout, p2p, NULL); eloop_register_timeout(sec, usec, p2p_state_timeout, p2p, NULL); } diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c index e6a603f..ae4ba1a 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c @@ -94,6 +94,9 @@ #ifdef DFR_HANDLER #include "ap_error.h" #endif +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) +#include "hm_miracast_sink.h" +#endif const char *const wpa_supplicant_version = "wpa_supplicant v" VERSION_STR "\n" @@ -7245,9 +7248,14 @@ static void radio_start_next_work(void *eloop_ctx, void *timeout_ctx) wpa_s = work->wpa_s; os_get_reltime(&now); os_reltime_sub(&now, &work->time, &diff); +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("Starting radio work '%s'@%p after %ld.%06ld second wait", + work->type, work, diff.sec, diff.usec); +#else wpa_dbg(wpa_s, MSG_INFO, "Starting radio work '%s'@%p after %ld.%06ld second wait", work->type, work, diff.sec, diff.usec); +#endif work->started = 1; work->time = now; radio->num_active_works++; @@ -7343,7 +7351,11 @@ void radio_work_check_next(struct wpa_supplicant *wpa_s) struct wpa_radio *radio = wpa_s->radio; if (dl_list_empty(&radio->work)) { +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("The radio work list is empty"); +#else wpa_printf(MSG_INFO, "The radio work list is empty"); +#endif return; } if (wpa_s->ext_work_in_progress) { @@ -7393,7 +7405,11 @@ int radio_add_work(struct wpa_supplicant *wpa_s, unsigned int freq, work = os_zalloc(sizeof(*work)); if (work == NULL) return -1; +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("Add radio work '%s'@%p", type, work); +#else wpa_dbg(wpa_s, MSG_INFO, "Add radio work '%s'@%p", type, work); +#endif os_get_reltime(&work->time); work->freq = freq; work->type = type; @@ -7418,7 +7434,11 @@ int radio_add_work(struct wpa_supplicant *wpa_s, unsigned int freq, dl_list_add_tail(&wpa_s->radio->work, &work->list); if (was_empty) { +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("First radio work item in the queue - schedule start immediately"); +#else wpa_dbg(wpa_s, MSG_INFO, "First radio work item in the queue - schedule start immediately"); +#endif radio_work_check_next(wpa_s); } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_OFFCHANNEL_SIMULTANEOUS) && radio->num_active_works < MAX_ACTIVE_WORKS) { diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant_lib/driver_nl80211_hisi.c b/wpa_supplicant-2.9_standard/wpa_supplicant_lib/driver_nl80211_hisi.c index 75a3d84..66d225b 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant_lib/driver_nl80211_hisi.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant_lib/driver_nl80211_hisi.c @@ -16,6 +16,10 @@ #include "hm_miracast_sink.h" #endif +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) +#include "hm_miracast_sink.h" +#endif + #define WPA_PS_ENABLED 0 #define WPA_PS_DISABLED 1 @@ -126,7 +130,11 @@ int wpa_driver_nl80211_driver_cmd(void *priv, char *cmd, char *buf, size_t buf_l char temp_cmd[MAX_PRIV_CMD_SIZE] = {0}; #endif +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("wpa_driver_nl80211_driver_cmd:cmd = %s", cmd); +#else wpa_printf(MSG_ERROR, "wpa_driver_nl80211_driver_cmd:cmd = %s", cmd); +#endif if (os_strcasecmp(cmd, "STOP") == 0) { linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 0); wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "STOPPED"); @@ -341,7 +349,11 @@ int wpa_driver_set_ap_wps_p2p_ie(void *priv, {-1, NULL} }; +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + miracast_sink_log("%s: Entry", __func__); +#else wpa_printf(MSG_ERROR, "%s: Entry", __func__); +#endif for (i = 0; cmd_arr[i].cmd != -1; i++) { ret_s = memset_s(buf, sizeof(buf), 0, sizeof(buf)); if (ret_s != EOK) { -- Gitee