soc: silabs: siwx91x: removed sscanf for nwp firmware version check

This patch removes the use of sscanf to maintain compatibility with
tests that use the minimal cpp library. The expected version is now
defined using multiple individual values rather than a single
formatted string.

Signed-off-by: Martin Hoff <[email protected]>

Author: Martinhoff-maker

modules/hal_silabs/wiseconnect/nwp_fw_version.h

@@ -5,6 +5,12 @@
  */
 
 /* This value needs to be updated when the Wiseconnect SDK (hal_silabs/wiseconnect) is updated
- * Actually mapped to Wiseconnect SDK 3.5.0
+ * Actually mapped to Wiseconnect SDK 3.5.2
  */
-#define SIWX91X_NWP_FW_EXPECTED_VERSION "B.2.14.5.2.0.7"
+#define SIWX91X_NWP_FW_EXPECTED_ROM_ID 		 11
+#define SIWX91X_NWP_FW_EXPECTED_MAJOR 		 2
+#define SIWX91X_NWP_FW_EXPECTED_MINOR 		 14
+#define SIWX91X_NWP_FW_EXPECTED_SECURITY_VERSION 5
+#define SIWX91X_NWP_FW_EXPECTED_PATCH_NUM 	 2
+#define SIWX91X_NWP_FW_EXPECTED_CUSTOMER_ID      0
+#define SIWX91X_NWP_FW_EXPECTED_BUILD_NUM        7

soc/silabs/silabs_siwx91x/siwg917/siwx91x_nwp.c

@@ -261,24 +261,23 @@ static void siwx91x_configure_network_stack(sl_si91x_boot_configuration_t *boot_
 
 static int siwx91x_check_nwp_version(void)
 {
-	sl_wifi_firmware_version_t expected_version;
 	sl_wifi_firmware_version_t version;
+	sl_wifi_firmware_version_t expected_version = {
+		.rom_id = SIWX91X_NWP_FW_EXPECTED_ROM_ID,
+		.major = SIWX91X_NWP_FW_EXPECTED_MAJOR,
+		.minor = SIWX91X_NWP_FW_EXPECTED_MINOR,
+		.security_version = SIWX91X_NWP_FW_EXPECTED_SECURITY_VERSION,
+		.patch_num = SIWX91X_NWP_FW_EXPECTED_PATCH_NUM,
+		.customer_id = SIWX91X_NWP_FW_EXPECTED_CUSTOMER_ID,
+		.build_num = SIWX91X_NWP_FW_EXPECTED_BUILD_NUM,
+	};
 	int ret;
 
 	ret = sl_wifi_get_firmware_version(&version);
 	if (ret != SL_STATUS_OK) {
 		return -EINVAL;
 	}
 
-	sscanf(SIWX91X_NWP_FW_EXPECTED_VERSION, "%hhX.%hhd.%hhd.%hhd.%hhd.%hhd.%hd",
-	       &expected_version.rom_id,
-	       &expected_version.major,
-	       &expected_version.minor,
-	       &expected_version.security_version,
-	       &expected_version.patch_num,
-	       &expected_version.customer_id,
-	       &expected_version.build_num);
-
 	/* Ignore rom_id:
 	 * B is parsed as an hex value and we get 11 in expected_version.rom_id
 	 * We received rom_id=17 in version.rom_id, we suspect a double hex->decimal conversion
@@ -414,8 +413,15 @@ static int siwx91x_nwp_init(const struct device *dev)
 	/* Check if the NWP firmware version is correct */
 	ret = siwx91x_check_nwp_version();
 	if (ret < 0) {
-		LOG_ERR("Unexpected NWP firmware version (expected: %s)",
-			SIWX91X_NWP_FW_EXPECTED_VERSION);
+		LOG_ERR("Unexpected NWP firmware version (expected: %X.%d.%d.%d.%d.%d.%d)",
+			SIWX91X_NWP_FW_EXPECTED_ROM_ID,
+			SIWX91X_NWP_FW_EXPECTED_MAJOR,
+			SIWX91X_NWP_FW_EXPECTED_MINOR,
+			SIWX91X_NWP_FW_EXPECTED_SECURITY_VERSION,
+			SIWX91X_NWP_FW_EXPECTED_PATCH_NUM,
+			SIWX91X_NWP_FW_EXPECTED_CUSTOMER_ID,
+			SIWX91X_NWP_FW_EXPECTED_BUILD_NUM);
+		return -EINVAL;
 	}
 
 	if (IS_ENABLED(CONFIG_SOC_SIWX91X_PM_BACKEND_PMGR)) {