Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zephyr: enable CONFIG_NXP_WIFI_BUILD_ONLY_MODE #454

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −23
Open

zephyr: enable CONFIG_NXP_WIFI_BUILD_ONLY_MODE #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1168caa
middleware: wifi_nxp: remove signal_change_callbk_fn definition
danieldegrasse Oct 18, 2024
1055bd9
zephyr: enable CONFIG_NXP_WIFI_BUILD_ONLY_MODE
danieldegrasse Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions mcux/middleware/wifi_nxp/wifidriver/wpa_supp_if/rtos_wpa_supp_if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2669,25 +2669,6 @@ void wifi_nxp_wpa_supp_event_proc_dfs_cac_finished(void *if_priv, nxp_wifi_dfs_c
}
}

void wifi_nxp_wpa_supp_event_signal_change(void *if_priv, t_s16 *curr_rssi)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The related hostap PR is still under review, which can fix the build error:
zephyrproject-rtos/hostap#38

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the heads up- if the support for 11kvr roaming merges in HostAP first, we can drop this change. I just want to get the upstream WiFi support to a point where it builds and works correctly.

{
struct wifi_nxp_ctx_rtos *wifi_if_ctx_rtos = NULL;
union wpa_event_data event;

wifi_if_ctx_rtos = (struct wifi_nxp_ctx_rtos *)if_priv;

if (wifi_if_ctx_rtos == NULL)
{
wifi_e("%s: wifi_if_ctx_rtos is NULL", __func__);
return;
}
memset(&event, 0, sizeof(event));
event.signal_change.above_threshold = 0;
event.signal_change.current_signal = abs(*curr_rssi);

wifi_if_ctx_rtos->supp_callbk_fns.signal_change(wifi_if_ctx_rtos->supp_drv_if_ctx, &event);
}

#if CONFIG_WIFI_SOFTAP_SUPPORT
int wifi_nxp_wpa_supp_init_ap(void *if_priv, struct wpa_driver_associate_params *params)
{
Expand Down
1 change: 0 additions & 1 deletion mcux/middleware/wifi_nxp/wifidriver/wpa_supp_if/wifi_nxp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ static const wifi_nxp_callbk_fns_t supp_callbk_fns = {
.mgmt_rx_callbk_fn = wifi_nxp_wpa_supp_event_proc_mgmt_rx,
.get_wiphy_callbk_fn = wifi_nxp_wpa_supp_event_get_wiphy,
.is_supp_scan_in_progress_callbk_fn = wifi_nxp_wpa_is_supp_scan_in_progress,
.signal_change_callbk_fn = wifi_nxp_wpa_supp_event_signal_change,
};

int wifi_supp_init(void)
Expand Down
12 changes: 9 additions & 3 deletions zephyr/src/rw61x/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ if(CONFIG_NXP_MONOLITHIC_WIFI OR CONFIG_NXP_MONOLITHIC_BT OR CONFIG_NXP_MONOLITH
foreach(i RANGE ${count})
list(GET signed_binary_blobs_list ${i} signed_binary_blob)
if(EXISTS ${signed_binary_blob})
set(binary_blob ${signed_binary_blob})
list(APPEND binary_blobs_list ${signed_binary_blob})
elseif(CONFIG_NXP_WIFI_BUILD_ONLY_MODE)
message(WARNING "Couldn't find signed firmware ! ${signed_binary_blob}")
list(APPEND binary_blobs_list "NOTFOUND")
else()
message(FATAL_ERROR "Couldn't find signed firmware ! ${signed_binary_blob}")
endif()

list(APPEND binary_blobs_list ${binary_blob})
endforeach()

list(LENGTH binary_blobs_list count)
Expand All @@ -51,6 +53,10 @@ if(CONFIG_NXP_MONOLITHIC_WIFI OR CONFIG_NXP_MONOLITHIC_BT OR CONFIG_NXP_MONOLITH
list(GET binary_blobs_list ${i} binary_blob)
list(GET output_includes_list ${i} output_include)
message(STATUS " generate include of binary blob: ${binary_blob}")
generate_inc_file_for_target(${ZEPHYR_CURRENT_LIBRARY} ${binary_blob} ${output_include})
if(${binary_blob} STREQUAL "NOTFOUND")
file(TOUCH ${output_include})
else()
generate_inc_file_for_target(${ZEPHYR_CURRENT_LIBRARY} ${binary_blob} ${output_include})
endif()
endforeach()
endif()