added additional error message and disabled RSI_PS_SkipXtalWaitTime(1…

…); for dual flash
SiliconLabs · Jul 12, 2023 · 2d67c59 · 2d67c59
1 parent 9921ba0
commit 2d67c59
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/components/protocol/wifi/si91x/sl_wifi.c b/components/protocol/wifi/si91x/sl_wifi.c
@@ -342,7 +342,7 @@ sl_status_t sl_wifi_connect(sl_wifi_interface_t interface,
     } else if (SL_WIFI_PEAP_MSCHAPV2_ENCRYPTION == ap->encryption) {
       strcpy((char *)eap_req.eap_method, SL_EAP_PEAP_METHOD);
     } else {
-      return SL_STATUS_NOT_SUPPORTED;
+      return SL_STATUS_WIFI_INVALID_ENCRYPTION_METHOD;
     }
 
     strcpy((char *)eap_req.inner_method, SL_EAP_INNER_METHOD);
@@ -377,6 +377,8 @@ sl_status_t sl_wifi_connect(sl_wifi_interface_t interface,
                                           NULL,
                                           NULL);
     VERIFY_STATUS_AND_RETURN(status);
+  } else {
+	  return SL_STATUS_WIFI_UNKNOWN_SECURITY_TYPE;
   }
 
   memset(&join_request, 0, sizeof(join_request));

diff --git a/components/si91x_support/inc/sl_additional_status.h b/components/si91x_support/inc/sl_additional_status.h
@@ -74,14 +74,15 @@
 #define SL_STATUS_WIFI_SECURE_LINK_DECRYPT_ERROR           ((sl_status_t)0x0B57) ///< Error while decryption over secure link.
 #define SL_STATUS_WIFI_SECURE_LINK_KEY_RENEGOTIATION_ERROR ((sl_status_t)0x0B59) ///< Error while renegotiation of key over secure link.
 #define SL_STATUS_WIFI_INVALID_OPERMODE                    ((sl_status_t)0x0B60) ///< Invalid opermode provided.
+#define SL_STATUS_WIFI_INVALID_ENCRYPTION_METHOD           ((sl_status_t)0x0B61) ///< Invalid security encryption method provided.
 
 // Si91X Wi-Fi Firmware errors
 #define SL_STATUS_SI91X_SCAN_ISSUED_IN_ASSOCIATED_STATE                         ((sl_status_t)0x10002) ///< Scan command issued while device is already associated with an access point.
 #define SL_STATUS_SI91X_NO_AP_FOUND                                             ((sl_status_t)0x10003) ///< No AP found.
 #define SL_STATUS_SI91X_INVALID_PSK_IN_WEP_SECURITY                             ((sl_status_t)0x10004) ///< Wrong PSK is issued while the device client tries to join an access point with WEP security enabled.
 #define SL_STATUS_SI91X_INVALID_BAND                                            ((sl_status_t)0x10005) ///< Invalid band.
 #define SL_STATUS_SI91X_UNASSOCIATED                                            ((sl_status_t)0x10006) ///< Association not done or in unassociated state.
-#define SL_STATUS_SI91X_DEAUTHENTICATION                                        ((sl_status_t)0x10008) ///< De-authentication received from AP.
+#define SL_STATUS_SI91X_DEAUTHENTICATION_RECEIVED_FROM_AP                       ((sl_status_t)0x10008) ///< De-authentication received from AP.
 #define SL_STATUS_SI91X_ASSOCIATION_FAILED                                      ((sl_status_t)0x10009) ///< Failed to associate to access point during "Join".
 #define SL_STATUS_SI91X_INVALID_CHANNEL                                         ((sl_status_t)0x1000A) ///< Invalid channel.
 #define SL_STATUS_SI91X_JOIN_AUTHENTICATION_FAILED                              ((sl_status_t)0x1000E) ///< Authentication failure during "Join". Unable to find AP during join which was found during scan.

diff --git a/components/siwx917_soc/sl_platform_wireless.c b/components/siwx917_soc/sl_platform_wireless.c
@@ -136,8 +136,10 @@ void sl_si91x_hardware_setup(void)
   RSI_PS_XtalGoodTimeDurationConfig(XTAL_GOOD_TIME);
   /*Enable first boot up*/
   RSI_PS_EnableFirstBootUp(1);
+#ifdef COMMON_FLASH_EN
   /* Skip XTAL wait time because RC_32MHZ Clock is used for Processor on Wake-up*/
   RSI_PS_SkipXtalWaitTime(1);
+#endif
 }
 
 /**