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

Commit 00c556b0 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Add support for more board data file extensions"

parents f88276f5 5cd7bf09

drivers/net/wireless/cnss2/qmi.c

+11 −3
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 




#define WLFW_SERVICE_INS_ID_V01		1

#define WLFW_SERVICE_INS_ID_V01		1

#define WLFW_CLIENT_ID			0x4b4e454c

#define WLFW_CLIENT_ID			0x4b4e454c

#define MAX_BDF_FILE_NAME		11

#define MAX_BDF_FILE_NAME		13

#define ELF_BDF_FILE_NAME		"bdwlan.elf"

#define ELF_BDF_FILE_NAME		"bdwlan.elf"

#define ELF_BDF_FILE_NAME_PREFIX	"bdwlan.e"

#define ELF_BDF_FILE_NAME_PREFIX	"bdwlan.e"

#define BIN_BDF_FILE_NAME		"bdwlan.bin"

#define BIN_BDF_FILE_NAME		"bdwlan.bin"
@@ -424,18 +424,26 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv) 
	case CNSS_BDF_ELF:

	case CNSS_BDF_ELF:

		if (plat_priv->board_info.board_id == 0xFF)

		if (plat_priv->board_info.board_id == 0xFF)

			snprintf(filename, sizeof(filename), ELF_BDF_FILE_NAME);

			snprintf(filename, sizeof(filename), ELF_BDF_FILE_NAME);

		else

		else if (plat_priv->board_info.board_id < 0xFF)

			snprintf(filename, sizeof(filename),

			snprintf(filename, sizeof(filename),

				 ELF_BDF_FILE_NAME_PREFIX "%02x",

				 ELF_BDF_FILE_NAME_PREFIX "%02x",

				 plat_priv->board_info.board_id);

				 plat_priv->board_info.board_id);

		else

			snprintf(filename, sizeof(filename),

				 ELF_BDF_FILE_NAME_PREFIX "%04x",

				 plat_priv->board_info.board_id);

		break;

		break;

	case CNSS_BDF_BIN:

	case CNSS_BDF_BIN:

		if (plat_priv->board_info.board_id == 0xFF)

		if (plat_priv->board_info.board_id == 0xFF)

			snprintf(filename, sizeof(filename), BIN_BDF_FILE_NAME);

			snprintf(filename, sizeof(filename), BIN_BDF_FILE_NAME);

		else

		else if (plat_priv->board_info.board_id < 0xFF)

			snprintf(filename, sizeof(filename),

			snprintf(filename, sizeof(filename),

				 BIN_BDF_FILE_NAME_PREFIX "%02x",

				 BIN_BDF_FILE_NAME_PREFIX "%02x",

				 plat_priv->board_info.board_id);

				 plat_priv->board_info.board_id);

		else

			snprintf(filename, sizeof(filename),

				 BIN_BDF_FILE_NAME_PREFIX "%04x",

				 plat_priv->board_info.board_id);

		break;

		break;

	case CNSS_BDF_DUMMY:

	case CNSS_BDF_DUMMY:

		cnss_pr_dbg("CNSS_BDF_DUMMY is set, sending dummy BDF\n");

		cnss_pr_dbg("CNSS_BDF_DUMMY is set, sending dummy BDF\n");