Skip to content

Commit c634279

Browse files
jerome-pouillerjhedberg
jerome-pouiller
authored and
jhedberg
committed
wiseconnect: Fix typo in EXTENTION
Zephyr CI raise errors for misspelled words. So, the Zephyr code uses "EXTENSION" while HAL still use "EXTENTION". Note, the upstream tried to fix the issue by adding a bunch of #ifdef __ZEPHYR__. Unfortunately, it produce these kind of errors: .../sl_net.c: In function 'sl_net_init': .../sl_net.c:57:40: error: 'sl_wifi_default_client_configuration' undeclared (first use in this function); did you mean 'sl_wifi_advanced_client_configuration_t'? 57 | configuration = (const void *)&sl_wifi_default_client_configuration; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | sl_wifi_advanced_client_configuration_t .../sl_net.c:57:40: note: each undeclared identifier is reported only once for each function it appears in .../sl_net.c:100:40: error: 'sl_wifi_default_ap_configuration' undeclared (first use in this function); did you mean 'sl_wifi_advanced_ap_configuration_t'? 100 | configuration = (const void *)&sl_wifi_default_ap_configuration; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | sl_wifi_advanced_ap_configuration_t ... so this patch also undoes this change. Upstream-status: Pending Signed-off-by: Jérôme Pouiller <[email protected]>
1 parent 3678a98 commit c634279

File tree

2 files changed

+15
-33
lines changed

2 files changed

+15
-33
lines changed

‎wiseconnect/components/device/silabs/si91x/wireless/inc/sl_wifi_device.h‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,16 +1152,12 @@
11521152
#define SL_SI91X_CUSTOM_FEAT_BT_IAP BIT(29)
11531153

11541154
/**
1155-
* @def SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID
1155+
* @def SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID
11561156
* @brief Validates the use of extended custom feature bitmap.
11571157
* @details The bit indicates the extended custom feature bitmap is valid.
11581158
* If this bit is enabled then only, the features present in the extended custom feature bitmap can be used.
11591159
*/
1160-
#ifndef __ZEPHYR__
1161-
#define SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID BIT(31)
1162-
#else
11631160
#define SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID BIT(31)
1164-
#endif
11651161
/** @} */
11661162

11671163
/** \addtogroup SI91X_EXTENDED_CUSTOM_FEATURE_BITMAP
@@ -1763,14 +1759,14 @@
17631759
#define SL_SI91X_EXT_TCP_IP_FEAT_SSL_MEMORY_CLOUD BIT(30)
17641760

17651761
/**
1766-
* @def SL_SI91X_CONFIG_FEAT_EXTENTION_VALID
1762+
* @def SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID
17671763
* @brief Config feature bit map validity.
17681764
* @details
17691765
* This feature validates the configuration feature bit map.
17701766
* If this bit is enabled then only, the features present in the configuration feature bitmap can be used.
17711767
*/
17721768
#ifndef __ZEPHYR__
1773-
#define SL_SI91X_CONFIG_FEAT_EXTENTION_VALID BIT(31)
1769+
#define SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID BIT(31)
17741770
#else
17751771
#define SL_SI91X_CONFIG_FEAT_EXTENSION_VALID BIT(31)
17761772
#endif
@@ -2622,7 +2618,6 @@ typedef struct {
26222618
uint8_t data[]; ///< Data to be transmitted or received
26232619
} sl_wifi_packet_t;
26242620

2625-
#ifndef __ZEPHYR__
26262621
/** \addtogroup SL_SI91X_DEFAULT_DEVICE_CONFIGURATION
26272622
* @{ */
26282623
/// Default Wi-Fi client configuration
@@ -2645,7 +2640,7 @@ static const sl_wifi_device_configuration_t sl_wifi_default_client_configuration
26452640
| SL_SI91X_TCP_IP_FEAT_DHCPV6_CLIENT | SL_SI91X_TCP_IP_FEAT_IPV6
26462641
#endif
26472642
| SL_SI91X_TCP_IP_FEAT_ICMP | SL_SI91X_TCP_IP_FEAT_EXTENSION_VALID),
2648-
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID,
2643+
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
26492644
.ext_custom_feature_bit_map =
26502645
(SL_SI91X_EXT_FEAT_XTAL_CLK | SL_SI91X_EXT_FEAT_UART_SEL_FOR_DEBUG_PRINTS | MEMORY_CONFIG
26512646
#if defined(SLI_SI917) || defined(SLI_SI915)
@@ -2659,9 +2654,7 @@ static const sl_wifi_device_configuration_t sl_wifi_default_client_configuration
26592654
.ble_ext_feature_bit_map = 0,
26602655
.config_feature_bit_map = 0 }
26612656
};
2662-
#endif
26632657

2664-
#ifndef __ZEPHYR__
26652658
/// Default Wi-Fi enterprise client configuration
26662659
static const sl_wifi_device_configuration_t sl_wifi_default_enterprise_client_configuration = {
26672660
.boot_option = LOAD_NWP_FW,
@@ -2673,7 +2666,7 @@ static const sl_wifi_device_configuration_t sl_wifi_default_enterprise_client_co
26732666
.feature_bit_map = (SL_WIFI_FEAT_SECURITY_OPEN | SL_WIFI_FEAT_AGGREGATION),
26742667
.tcp_ip_feature_bit_map = (SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT | SL_SI91X_TCP_IP_FEAT_ICMP
26752668
| SL_SI91X_TCP_IP_FEAT_EXTENSION_VALID),
2676-
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID,
2669+
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
26772670
.ext_custom_feature_bit_map =
26782671
(SL_SI91X_EXT_FEAT_XTAL_CLK | SL_SI91X_EXT_FEAT_UART_SEL_FOR_DEBUG_PRINTS | MEMORY_CONFIG
26792672
#if defined(SLI_SI917) || defined(SLI_SI915)
@@ -2687,9 +2680,7 @@ static const sl_wifi_device_configuration_t sl_wifi_default_enterprise_client_co
26872680
.ble_ext_feature_bit_map = 0,
26882681
.config_feature_bit_map = 0 }
26892682
};
2690-
#endif
26912683

2692-
#ifndef __ZEPHYR__
26932684
/// Default Wi-Fi ap configuration
26942685
static const sl_wifi_device_configuration_t sl_wifi_default_ap_configuration = {
26952686
.boot_option = LOAD_NWP_FW,
@@ -2701,7 +2692,7 @@ static const sl_wifi_device_configuration_t sl_wifi_default_ap_configuration = {
27012692
.feature_bit_map = SL_WIFI_FEAT_SECURITY_OPEN,
27022693
.tcp_ip_feature_bit_map =
27032694
(SL_SI91X_TCP_IP_FEAT_DHCPV4_SERVER | SL_SI91X_TCP_IP_FEAT_EXTENSION_VALID),
2704-
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID,
2695+
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
27052696
.ext_custom_feature_bit_map = (SL_SI91X_EXT_FEAT_XTAL_CLK | MEMORY_CONFIG
27062697
#if defined(SLI_SI917) || defined(SLI_SI915)
27072698
| SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0
@@ -2713,9 +2704,7 @@ static const sl_wifi_device_configuration_t sl_wifi_default_ap_configuration = {
27132704
.ble_ext_feature_bit_map = 0,
27142705
.config_feature_bit_map = 0 }
27152706
};
2716-
#endif
27172707

2718-
#ifndef __ZEPHYR__
27192708
/// Default Wi-Fi concurrent (AP + STATION) configuration
27202709
static const sl_wifi_device_configuration_t sl_wifi_default_concurrent_configuration = {
27212710
.boot_option = LOAD_NWP_FW,
@@ -2727,21 +2716,19 @@ static const sl_wifi_device_configuration_t sl_wifi_default_concurrent_configura
27272716
.feature_bit_map = SL_WIFI_FEAT_AGGREGATION,
27282717
.tcp_ip_feature_bit_map = (SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT | SL_SI91X_TCP_IP_FEAT_DHCPV4_SERVER
27292718
| SL_SI91X_TCP_IP_FEAT_ICMP | SL_SI91X_TCP_IP_FEAT_EXTENSION_VALID),
2730-
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID,
2719+
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
27312720
.ext_custom_feature_bit_map = (SL_SI91X_EXT_FEAT_XTAL_CLK | MEMORY_CONFIG
27322721
#if defined(SLI_SI917) || defined(SLI_SI915)
27332722
| SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0
27342723
#endif
27352724
),
27362725
.bt_feature_bit_map = 0,
2737-
.ext_tcp_ip_feature_bit_map = SL_SI91X_CONFIG_FEAT_EXTENTION_VALID,
2726+
.ext_tcp_ip_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
27382727
.ble_feature_bit_map = 0,
27392728
.ble_ext_feature_bit_map = 0,
27402729
.config_feature_bit_map = SL_SI91X_FEAT_SLEEP_GPIO_SEL_BITMAP }
27412730
};
2742-
#endif
27432731

2744-
#ifndef __ZEPHYR__
27452732
/// Default Wi-Fi concurrent (AP + STATION) configuration
27462733
static const sl_wifi_device_configuration_t sl_wifi_default_concurrent_v6_configuration = {
27472734
.boot_option = LOAD_NWP_FW,
@@ -2756,21 +2743,19 @@ static const sl_wifi_device_configuration_t sl_wifi_default_concurrent_v6_config
27562743
| SL_SI91X_TCP_IP_FEAT_DHCPV6_CLIENT | SL_SI91X_TCP_IP_FEAT_DHCPV6_SERVER
27572744
| SL_SI91X_TCP_IP_FEAT_IPV6 | SL_SI91X_TCP_IP_FEAT_ICMP | SL_SI91X_TCP_IP_FEAT_EXTENSION_VALID
27582745
| SL_SI91X_TCP_IP_FEAT_HTTP_CLIENT),
2759-
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID,
2746+
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
27602747
.ext_custom_feature_bit_map = (SL_SI91X_EXT_FEAT_XTAL_CLK | MEMORY_CONFIG
27612748
#if defined(SLI_SI917) || defined(SLI_SI915)
27622749
| SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0
27632750
#endif
27642751
),
27652752
.bt_feature_bit_map = 0,
2766-
.ext_tcp_ip_feature_bit_map = SL_SI91X_CONFIG_FEAT_EXTENTION_VALID,
2753+
.ext_tcp_ip_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
27672754
.ble_feature_bit_map = 0,
27682755
.ble_ext_feature_bit_map = 0,
27692756
.config_feature_bit_map = SL_SI91X_FEAT_SLEEP_GPIO_SEL_BITMAP }
27702757
};
2771-
#endif
27722758

2773-
#ifndef __ZEPHYR__
27742759
/// Default Wi-Fi transmit configuration
27752760
static const sl_wifi_device_configuration_t sl_wifi_default_transmit_test_configuration = {
27762761
.boot_option = LOAD_NWP_FW,
@@ -2787,21 +2772,19 @@ static const sl_wifi_device_configuration_t sl_wifi_default_transmit_test_config
27872772
#endif
27882773
.tcp_ip_feature_bit_map =
27892774
(SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT | SL_SI91X_TCP_IP_FEAT_EXTENSION_VALID),
2790-
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID,
2775+
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
27912776
.ext_custom_feature_bit_map = (MEMORY_CONFIG
27922777
#if defined(SLI_SI917) || defined(SLI_SI915)
27932778
| SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0
27942779
#endif
27952780
),
27962781
.bt_feature_bit_map = SL_SI91X_BT_RF_TYPE,
2797-
.ext_tcp_ip_feature_bit_map = SL_SI91X_CONFIG_FEAT_EXTENTION_VALID,
2782+
.ext_tcp_ip_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
27982783
.ble_feature_bit_map = 0,
27992784
.ble_ext_feature_bit_map = 0,
28002785
.config_feature_bit_map = SL_SI91X_FEAT_SLEEP_GPIO_SEL_BITMAP }
28012786
};
2802-
#endif
28032787

2804-
#ifndef __ZEPHYR__
28052788
/// Default Wi-Fi transceiver mode configuration
28062789
static const sl_wifi_device_configuration_t sl_wifi_default_transceiver_configuration = {
28072790
.boot_option = LOAD_NWP_FW,
@@ -2816,20 +2799,19 @@ static const sl_wifi_device_configuration_t sl_wifi_default_transceiver_configur
28162799
.feature_bit_map = SL_WIFI_FEAT_SECURITY_OPEN,
28172800
#endif
28182801
.tcp_ip_feature_bit_map = SL_SI91X_TCP_IP_FEAT_BYPASS,
2819-
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENTION_VALID,
2802+
.custom_feature_bit_map = SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID,
28202803
.ext_custom_feature_bit_map =
28212804
(SL_SI91X_EXT_FEAT_XTAL_CLK | SL_SI91X_EXT_FEAT_UART_SEL_FOR_DEBUG_PRINTS
28222805
#if defined(SLI_SI917) || defined(SLI_SI915)
28232806
| SL_SI91X_EXT_FEAT_FRONT_END_SWITCH_PINS_ULP_GPIO_4_5_0
28242807
#endif
28252808
),
28262809
.bt_feature_bit_map = 0,
2827-
.ext_tcp_ip_feature_bit_map = (SL_SI91X_CONFIG_FEAT_EXTENTION_VALID),
2810+
.ext_tcp_ip_feature_bit_map = (SL_SI91X_CUSTOM_FEAT_EXTENSION_VALID),
28282811
.ble_feature_bit_map = 0,
28292812
.ble_ext_feature_bit_map = 0,
28302813
.config_feature_bit_map = 0 }
28312814
};
2832-
#endif
28332815

28342816
/// The typdefs in the below header depends on the structs defination in this .h
28352817
#include "sl_si91x_types.h"

‎wiseconnect/components/service/network_manager/src/sl_net.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,4 +260,4 @@ sl_status_t sl_net_inet_addr(const char *addr, uint32_t *value)
260260
*value |= (uint32_t)(ip_bytes[3] << 24);
261261

262262
return SL_STATUS_OK;
263-
}
263+
}

0 commit comments

Comments
 (0)