Skip to content

Updates the Cypress WiFi Host Driver to 1.7.0 #12030

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.

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

Merged
merged 2 commits into from
Dec 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* MAC address is printed during WHD power up
*/

#define NVRAM_GENERATED_MAC_ADDRESS "macaddr=00:A0:50:d6:93:82"
#define NVRAM_GENERATED_MAC_ADDRESS "macaddr=00:A0:50:2f:32:99"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#define WHD_VERSION "v1.60.0-rc1"
#define WHD_BRANCH "v1.60.0-rc1"
#define WHD_DATE "2019-11-13 21:27:38 -0600"
#define WHD_VERSION "v1.70.0"
#define WHD_BRANCH "v1.70.0"
#define WHD_DATE "2019-12-02 04:14:53 -0600"
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,10 @@ typedef enum
WLC_E_PFN_SCAN_COMPLETE = 138, /* PFN completed scan of network list */
WLC_E_RMC_EVENT = 139, /* RMC Event */
WLC_E_DPSTA_INTF_IND = 140, /* DPSTA interface indication */
WLC_E_RRM = 141, /* RRM Event */
WLC_E_ULP = 146, /* ULP entry event */
WLC_E_LAST = 147, /** highest val + 1 for range checking */
WLC_E_RRM = 141, /* RRM Event */
WLC_E_ULP = 146, /* ULP entry event */
WLC_E_TKO = 151, /* TCP Keep Alive Offload Event */
WLC_E_LAST = 152, /* highest val + 1 for range checking */
} whd_event_num_t;

#define WLC_SUP_STATUS_OFFSET (256)
Expand Down
14 changes: 8 additions & 6 deletions targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_ap.c
Original file line number Diff line number Diff line change
Expand Up @@ -746,12 +746,14 @@ uint32_t whd_wifi_stop_ap(whd_interface_t ifp)
return result2;
}

/* Disable AP mode */
data = (uint32_t *)whd_cdc_get_ioctl_buffer(whd_driver, &buffer, (uint16_t)4);
CHECK_IOCTL_BUFFER_WITH_SEMAPHORE(data, &ap->whd_wifi_sleep_flag);
*data = 0; /* Turn off AP */
CHECK_RETURN_WITH_SEMAPHORE(whd_cdc_send_ioctl(ifp, CDC_SET, WLC_SET_AP, buffer, 0),
&ap->whd_wifi_sleep_flag);
/* Disable AP mode only if AP is on primary interface */
if (prim_ifp == ifp)
{
data = (uint32_t *)whd_cdc_get_ioctl_buffer(whd_driver, &buffer, (uint16_t)4);
CHECK_IOCTL_BUFFER(data);
*data = 0;
CHECK_RETURN(whd_cdc_send_ioctl(ifp, CDC_SET, WLC_SET_AP, buffer, 0) );
}

CHECK_RETURN(whd_wifi_deregister_event_handler(ifp, ifp->event_reg_list[WHD_AP_EVENT_ENTRY]) );
ifp->event_reg_list[WHD_AP_EVENT_ENTRY] = WHD_EVENT_NOT_REGISTERED;
Expand Down

This file was deleted.