Skip to content

Commit c611e76

Browse files
cy-opmKyle Kearney
cy-opm
authored and
Kyle Kearney
committed
Update WHD to latest 1.30 build
1 parent 33493b1 commit c611e76

File tree

9 files changed

+88
-87
lines changed

9 files changed

+88
-87
lines changed

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/generated_mac_address.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
* MAC address is printed during WHD power up
77
*/
88

9-
#define NVRAM_GENERATED_MAC_ADDRESS "macaddr=00:A0:50:8c:3c:1b"
9+
#define NVRAM_GENERATED_MAC_ADDRESS "macaddr=00:A0:50:d4:32:81"

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/inc/whd_version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#define WHD_VERSION "v1.30.0-rc1-4-g9bd856ef-dirty"
2-
#define WHD_BRANCH "master"
3-
#define WHD_DATE "2019-08-23 15:56:34 +0800"
1+
#define WHD_VERSION "v1.30.0-rc3-dirty"
2+
#define WHD_BRANCH "v1.30.0-rc3"
3+
#define WHD_DATE "2019-08-27 16:29:32 +0800"

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/nvram/TARGET_CY8CMOD_062S2_43012/wifi_nvram_image.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extern "C" {
3535
* cyw943012csp_ty1LV.TXT
3636
*/
3737
static const char wifi_nvram_image[] =
38-
"NVRAMRev=$Rev: 721914 $" "\x00"
38+
"NVRAMRev=$Rev:722123$" "\x00"
3939
"sromrev=11" "\x00"
4040
"cckdigfilttype=4" "\x00"
4141
"cckpwroffset0=2" "\x00"
@@ -58,7 +58,7 @@ static const char wifi_nvram_image[] =
5858
"extpagain5g=2" "\x00"
5959
"ccode=0" "\x00"
6060
"regrev=0" "\x00"
61-
"antswitch = 0" "\x00"
61+
"antswitch=0" "\x00"
6262
"rxgains2gelnagaina0=0" "\x00"
6363
"rxgains2gtrisoa0=15" "\x00"
6464
"rxgains2gtrelnabypa0=0" "\x00"
@@ -88,7 +88,7 @@ static const char wifi_nvram_image[] =
8888
"swctrlmap_2g=0x10101010,0x20202020,0x10101010,0x442020,0x3ff" "\x00"
8989
"swctrlmapext_2g=0x01000100,0x01000100,0x01000100,0x000000,0x301" "\x00"
9090
"swctrlmap_5g=0x80808080,0x00000000,0x80808080,0x442020,0x381" "\x00"
91-
"swctrlmapext_5g=0x01000100,0x01000100,0x00000000,0x000100,0x303" "\x00"
91+
"swctrlmapext_5g=0x01000100,0x01000100,0x00000000,0x000000,0x303" "\x00"
9292
"ulpnap=0" "\x00"
9393
"ulpadc=1" "\x00"
9494
"ssagc_en=0" "\x00"
@@ -106,11 +106,12 @@ static const char wifi_nvram_image[] =
106106
"mcsbw202gpo=0xCC864420" "\x00"
107107
"maxp5ga0=70,70,70,70" "\x00"
108108
"mcsbw205glpo=0xCC864220" "\x00"
109-
"mmcsbw205gmpo=0xCC864220" "\x00"
109+
"mcsbw205gmpo=0xCC864220" "\x00"
110110
"mcsbw205ghpo=0xCC864220" "\x00"
111111
"femctrlwar=0" "\x00"
112112
"use5gpllfor2g=1" "\x00"
113113
"pt5db_gaintbl=0" "\x00"
114+
"muxenab=0x01" "\x00"
114115
"txwbpapden=1" "\x00"
115116
"wb_rxattn=0x0303" "\x00"
116117
"wb_txattn=0x0203" "\x00"
@@ -137,17 +138,18 @@ static const char wifi_nvram_image[] =
137138
"lpo_select=4" "\x00"
138139
"paprrmcsgamma2g=450,500,550,600,675,950,950,950,950,950,950,950" "\x00"
139140
"paprrmcsgamma5g20=450,500,550,600,800,950,1100,1100,1100,1100,1100,1100" "\x00"
140-
"swdiv_en=0" "\x00"
141-
"swdiv_gpio=0" "\x00"
142-
"swdiv_swctrl_en=2" "\x00"
143-
"swdiv_swctrl_ant0=0" "\x00"
144-
"swdiv_swctrl_ant1=1" "\x00"
145-
"swdiv_antmap2g_main=1" "\x00"
146-
"swdiv_antmap5g_main=1" "\x00"
147-
"swdiv_snrlim=10000" "\x00"
148-
"swdiv_thresh=3000" "\x00"
149-
"swdiv_snrthresh=24" "\x00"
141+
"swdiv_en=0" "\x00"
142+
"swdiv_gpio=0" "\x00"
143+
"swdiv_swctrl_en=2" "\x00"
144+
"swdiv_swctrl_ant0=0" "\x00"
145+
"swdiv_swctrl_ant1=1" "\x00"
146+
"swdiv_antmap2g_main=1" "\x00"
147+
"swdiv_antmap5g_main=1" "\x00"
148+
"swdiv_snrlim=10000" "\x00"
149+
"swdiv_thresh=3000" "\x00"
150+
"swdiv_snrthresh=24" "\x00"
150151
"\x00\x00";
152+
151153
#ifdef __cplusplus
152154
} /*extern "C" */
153155
#endif

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/nvram/TARGET_CYW943012P6EVB_01/wifi_nvram_image.h

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,30 @@ extern "C" {
3838
* cyw943012csp_ty1LV.TXT
3939
*/
4040
static const char wifi_nvram_image[] =
41-
"NVRAMRev=$Rev: 351687 $" "\x00"
41+
"NVRAMRev=$Rev:722124$" "\x00"
4242
"sromrev=11" "\x00"
4343
"cckdigfilttype=4" "\x00"
44-
"cckpwroffset0=3" "\x00"
44+
"cckpwroffset0=2" "\x00"
4545
"bphyscale=0x20" "\x00"
4646
"boardflags3=0x40000100" "\x00"
4747
"vendid=0x14e4" "\x00"
4848
"devid=0xA804" "\x00"
4949
"manfid=0x2d0" "\x00"
5050
"prodid=0x052e" "\x00"
51-
"#macaddr=00:90:4c:2a:80:00" "\x00"
52-
"macaddr=00:90:4c:2a:9${maclo12}" "\x00"
53-
"#macaddr=00:90:4c:2a:80:80" "\x00"
51+
NVRAM_GENERATED_MAC_ADDRESS "\x00"
5452
"mac_clkgating=1" "\x00"
5553
"nocrc=1" "\x00"
56-
"boardtype=0x0842" "\x00"
57-
"boardrev=0x1100" "\x00"
54+
"boardtype=0x0871" "\x00"
55+
"boardrev=0x1202" "\x00"
5856
"xtalfreq=37400" "\x00"
5957
"boardflags2=0xc0000000" "\x00"
60-
"boardflags=0x00000000" "\x00"
58+
"boardflags=0x00000001" "\x00"
6159
"etmode=0x11" "\x00"
6260
"extpagain2g=2" "\x00"
6361
"extpagain5g=2" "\x00"
6462
"ccode=0" "\x00"
6563
"regrev=0" "\x00"
66-
"antswitch = 0" "\x00"
64+
"antswitch=0" "\x00"
6765
"rxgains2gelnagaina0=0" "\x00"
6866
"rxgains2gtrisoa0=15" "\x00"
6967
"rxgains2gtrelnabypa0=0" "\x00"
@@ -82,19 +80,18 @@ static const char wifi_nvram_image[] =
8280
"tssipos2g=0" "\x00"
8381
"femctrl=17" "\x00"
8482
"subband5gver=4" "\x00"
85-
"pa2ga0=-108,5627,-638" "\x00"
86-
"# pa5ga0=-23,5933,-815,-29,5959,-814,-60,6093,-813,-50,6414,-836" "\x00"
87-
"pa5ga0=-41,6533,-726,-29,6654,-746,9,6914,-772,12,7008,-806" "\x00"
83+
"pa2ga0=-108,6062,-661" "\x00"
84+
"pa5ga0=-82,6252,-698,-14,6722,-697,-92,6084,-710,-88,6465,-755" "\x00"
8885
"pdoffset40ma0=0" "\x00"
8986
"pdoffset80ma0=0" "\x00"
9087
"lowpowerrange2g=0" "\x00"
9188
"lowpowerrange5g=0" "\x00"
9289
"ed_thresh2g=-63" "\x00"
9390
"ed_thresh5g=-63" "\x00"
94-
"swctrlmap_2g=0x10101010,0x20202020,0x10101010,0x414040,0x3ff" "\x00"
95-
"swctrlmapext_2g=0x00000100,0x01000100,0x01000100,0x010000,0x301" "\x00"
96-
"swctrlmap_5g=0x80808080,0x00000000,0x80808080,0x404040,0x3ff" "\x00"
97-
"swctrlmapext_5g=0x01000100,0x01000100,0x00000000,0x000100,0x303" "\x00"
91+
"swctrlmap_2g=0x10101010,0x20202020,0x10101010,0x442020,0x3ff" "\x00"
92+
"swctrlmapext_2g=0x01000100,0x01000100,0x01000100,0x000000,0x301" "\x00"
93+
"swctrlmap_5g=0x80808080,0x00000000,0x80808080,0x442020,0x381" "\x00"
94+
"swctrlmapext_5g=0x01000100,0x01000100,0x00000000,0x000000,0x303" "\x00"
9895
"ulpnap=0" "\x00"
9996
"ulpadc=1" "\x00"
10097
"ssagc_en=0" "\x00"
@@ -106,19 +103,17 @@ static const char wifi_nvram_image[] =
106103
"epacal5g=0" "\x00"
107104
"papdcck=0" "\x00"
108105
"epacal2g_mask=0x3fff" "\x00"
109-
"maxp2ga0=82" "\x00"
110-
"ofdmlrbw202gpo=0x0077" "\x00"
111-
"dot11agofdmhrbw202gpo=0x8888" "\x00"
112-
"mcsbw202gpo=0x99999999" "\x00"
113-
"#mcsbw402gpo=0x99555533" "\x00"
114-
"maxp5ga0=82,82,82,82" "\x00"
115-
"mcsbw205glpo=0x99999999" "\x00"
116-
"mcsbw205gmpo=0x99999999" "\x00"
117-
"mcsbw205ghpo=0x99999999" "\x00"
106+
"maxp2ga0=74" "\x00"
107+
"ofdmlrbw202gpo=0x0020" "\x00"
108+
"dot11agofdmhrbw202gpo=0x6442" "\x00"
109+
"mcsbw202gpo=0xCC864420" "\x00"
110+
"maxp5ga0=70,70,70,70" "\x00"
111+
"mcsbw205glpo=0xCC864220" "\x00"
112+
"mcsbw205gmpo=0xCC864220" "\x00"
113+
"mcsbw205ghpo=0xCC864220" "\x00"
118114
"femctrlwar=0" "\x00"
119115
"use5gpllfor2g=1" "\x00"
120116
"pt5db_gaintbl=0" "\x00"
121-
122117
"txwbpapden=1" "\x00"
123118
"wb_rxattn=0x0303" "\x00"
124119
"wb_txattn=0x0203" "\x00"
@@ -141,19 +136,15 @@ static const char wifi_nvram_image[] =
141136
"nb_eps_offset=0x01d701d7" "\x00"
142137
"nb_bbmult=0x5A5A" "\x00"
143138
"nb_tia_gain_mode=0x0000" "\x00"
144-
"# AvVmid_c0=6,100,3,141,3,141,3,141,3,141" "\x00"
145139
"AvVmid_c0=6,100,7,70,7,70,7,70,7,70" "\x00"
146140

147141
"tssisleep_en=0x5" "\x00"
148142
"lpflags=0x28" "\x00"
149143
"lpo_select=4" "\x00"
150-
144+
"muxenab=0x01" "\x00"
151145
"paprrmcsgamma2g=450,500,550,600,675,950,950,950,950,950,950,950" "\x00"
152-
"paprrmcsgamma5g20=450,500,550,600,800,950,1100,1100,1100,1100,1100,1100" "\x00"
153-
"#paprdis=1" "\x00"
154-
155-
"#SW-Diversity Related parameters" "\x00"
156-
"swdiv_en=1 #To enable SW-DIV feature" "\x00"
146+
"paprrmcsgamma5g20=450,500,550,600,800,950,1100,1100,1100,1100,1100,1100" "\x00"
147+
"swdiv_en=0 #To enable SW-DIV feature" "\x00"
157148
"swdiv_gpio=0" "\x00"
158149
"swdiv_swctrl_en=2" "\x00"
159150
"swdiv_swctrl_ant0=0" "\x00"

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/resource_imp/whd_resources.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
/** @file
1919
* Defines WHD resource functions for BCM943340WCD1 platform
2020
*/
21-
#include "resources.h"
2221
#include "wifi_nvram_image.h"
2322
#include "whd_resource_api.h"
2423
#include "whd_debug.h"
2524
#include "whd.h"
25+
#include "resources.h"
2626

2727
/******************************************************
2828
* Macros

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/resources/resource_imp/wiced_resource.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@ extern "C" {
5656
#define RESULT_ENUM(prefix, name, value) prefix ## name = (value)
5757
#endif /* ifndef RESULT_ENUM */
5858

59+
#if !defined(CY_SECTION)
60+
#if defined(__ARMCC_VERSION)
61+
#define CY_SECTION(name) __attribute__ ( (section(name) ) )
62+
#elif defined (__GNUC__)
63+
#if defined (__clang__)
64+
#define CY_SECTION(name) __attribute__ ( (section("__DATA, "name) ) )
65+
#else
66+
#define CY_SECTION(name) __attribute__ ( (section(name) ) )
67+
#endif
68+
#elif defined (__ICCARM__)
69+
#define CY_SECTION(name) CY_PRAGMA(location = name)
70+
#else
71+
#error "An unsupported toolchain"
72+
#endif /* (__ARMCC_VERSION) */
73+
#endif /* !defined(CY_SECTION) */
5974

6075
/* These Enum result values are for Resource errors
6176
* Values: 4000 - 4999

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/src/whd_cdc_bdc.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,14 @@ void whd_cdc_bdc_info_deinit(whd_driver_t whd_driver)
9898
{
9999
whd_cdc_bdc_info_t *cdc_bdc_info = &whd_driver->cdc_bdc_info;
100100

101-
cy_rtos_deinit_semaphore(&cdc_bdc_info->ioctl_sleep);
102-
cy_rtos_deinit_semaphore(&cdc_bdc_info->ioctl_mutex);
101+
/* Delete the sleep mutex */
102+
(void)cy_rtos_deinit_semaphore(&cdc_bdc_info->ioctl_sleep);
103+
104+
/* Delete the queue mutex. */
105+
(void)cy_rtos_deinit_semaphore(&cdc_bdc_info->ioctl_mutex);
106+
107+
/* Delete the event list management mutex */
108+
(void)cy_rtos_deinit_semaphore(&cdc_bdc_info->event_list_mutex);
103109
}
104110

105111
whd_result_t whd_cdc_bdc_info_init(whd_driver_t whd_driver)

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_WHD/src/whd_events.c

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,18 @@ static uint8_t whd_find_number_of_events(const whd_event_num_t *event_nums)
8181
* This function registers a callback handler to be notified when
8282
* a particular event is received.
8383
*
84-
* Alternately the function clears callbacks for given event type.
84+
* @note : Currently there is a limit to the number of simultaneously
85+
* registered events
8586
*
86-
* @note : Currently each event may only be registered to one handler
87-
* and there is a limit to the number of simultaneously registered
88-
* events
89-
*
90-
* @param event_nums An array of event types that is to trigger the handler. The array must be terminated with a WLC_E_NONE event
91-
* See @ref whd_event_num_t for available events
92-
* @param handler_func A function pointer to the new handler callback,
93-
* or NULL if callbacks are to be disabled for the given event type
94-
* @param handler_user_data A pointer value which will be passed to the event handler function
87+
* @param ifp Pointer to handle instance of whd interface
88+
* @param event_nums An array of event types that is to trigger the handler.
89+
* The array must be terminated with a WLC_E_NONE event
90+
* See @ref whd_event_num_t for available events
91+
* @param handler_func A function pointer to the new handler callback,
92+
* or NULL if callbacks are to be disabled for the given event type
93+
* @param handler_user_data A pointer value which will be passed to the event handler function
9594
* at the time an event is triggered (NULL is allowed)
96-
* @param interface The interface to set the handler for.
95+
* @param[out] *event_index entry where the event handler is registered in the list
9796
*
9897
* @return WHD result code
9998
*/
@@ -246,20 +245,18 @@ static uint8_t *whd_management_alloc_event_msgs_buffer(whd_interface_t ifp, whd_
246245
* This function registers a callback handler to be notified when
247246
* a particular event is received.
248247
*
249-
* Alternately the function clears callbacks for given event type.
250-
*
251-
* @note : Currently each event may only be registered to one handler
252-
* and there is a limit to the number of simultaneously registered
253-
* events
248+
* @note : Currently there is a limit to the number of simultaneously
249+
* registered events
254250
*
255-
* @param event_nums An array of event types that is to trigger the handler.
256-
* The array must be terminated with a WLC_E_NONE event
257-
* See @ref whd_event_num_t for available events
258-
* @param handler_func A function pointer to the new handler callback,
259-
* or NULL if callbacks are to be disabled for the given event type
260-
* @param handler_user_data A pointer value which will be passed to the event handler function
251+
* @param ifp Pointer to handle instance of whd interface
252+
* @param event_nums An array of event types that is to trigger the handler.
253+
* The array must be terminated with a WLC_E_NONE event
254+
* See @ref whd_event_num_t for available events
255+
* @param handler_func A function pointer to the new handler callback,
256+
* or NULL if callbacks are to be disabled for the given event type
257+
* @param handler_user_data A pointer value which will be passed to the event handler function
261258
* at the time an event is triggered (NULL is allowed)
262-
* @param interface The interface to set the handler for.
259+
* @param[out] *event_index entry where the event handler is registered in the list
263260
*
264261
* @return WHD result code
265262
*/

0 commit comments

Comments
 (0)