Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48129d77 authored by Yue Ma's avatar Yue Ma
Browse files

cnss2: Update board data file name format 



If board ID is larger than 0xFF (e.g. 0xABCD), the proper BDF file
name format should be updated to bdwlanAB.bCD or bdwlanAB.eCD based
on corresponding BDF types.

Change-Id: I837c2a0e69221a9ab92d9d969641d3925716882f
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent b8cd1590

drivers/net/wireless/cnss2/qmi.c

+9 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#define WLFW_SERVICE_INS_ID_V01		1

#define WLFW_CLIENT_ID			0x4b4e454c

#define BDF_FILE_NAME_PREFIX		"bdwlan"

#define ELF_BDF_FILE_NAME		"bdwlan.elf"

#define ELF_BDF_FILE_NAME_PREFIX	"bdwlan.e"

#define BIN_BDF_FILE_NAME		"bdwlan.bin"
@@ -456,8 +457,10 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv, 
				 fw_path, plat_priv->board_info.board_id);

		else

			snprintf(filename, sizeof(filename),

				 "%s" ELF_BDF_FILE_NAME_PREFIX "%04x",

				 fw_path, plat_priv->board_info.board_id);

				 "%s" BDF_FILE_NAME_PREFIX "%02x.e%02x",

				 fw_path,

				 plat_priv->board_info.board_id >> 8 & 0xFF,

				 plat_priv->board_info.board_id & 0xFF);

		break;

	case CNSS_BDF_BIN:

		if (plat_priv->board_info.board_id == 0xFF)
@@ -469,8 +472,10 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv, 
				 fw_path, plat_priv->board_info.board_id);

		else

			snprintf(filename, sizeof(filename),

				 "%s" BIN_BDF_FILE_NAME_PREFIX "%04x",

				 fw_path, plat_priv->board_info.board_id);

				 "%s" BDF_FILE_NAME_PREFIX "%02x.b%02x",

				 fw_path,

				 plat_priv->board_info.board_id >> 8 & 0xFF,

				 plat_priv->board_info.board_id & 0xFF);

		break;

	case CNSS_BDF_REGDB:

		snprintf(filename, sizeof(filename), REGDB_FILE_NAME);