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

Commit fa285bc1 authored by Istvan Varga's avatar Istvan Varga Committed by Mauro Carvalho Chehab
Browse files

[media] xc4000: added firmware_name parameter 



The firmware_name module parameter makes it possible to set the firmware
file name. It defaults to "xc4000.fw" if not specified.

Signed-off-by: default avatarIstvan Varga <istvan_v@mailbox.hu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1368ceb2

drivers/media/common/tuners/xc4000.c

+12 −5
Original line number Diff line number Diff line
@@ -47,16 +47,20 @@ MODULE_PARM_DESC(no_poweroff, "0 (default) powers device off when not used.\n" 
	"\t\t1 keep device energized and with tuner ready all the times.\n"

	"\t\tFaster, but consumes more power and keeps the device hotter");



#define XC4000_DEFAULT_FIRMWARE "xc4000.fw"



static char firmware_name[30];

module_param_string(firmware_name, firmware_name, sizeof(firmware_name), 0);

MODULE_PARM_DESC(firmware_name, "\n\t\tFirmware file name. Allows overriding "

	"the default firmware\n"

	"\t\tname.");



static DEFINE_MUTEX(xc4000_list_mutex);

static LIST_HEAD(hybrid_tuner_instance_list);



#define dprintk(level, fmt, arg...) if (debug >= level) \

	printk(KERN_INFO "%s: " fmt, "xc4000", ## arg)



/* Note that the last version digit is my internal build number (so I can

   rev the firmware even if the core Xceive firmware was unchanged) */

#define XC4000_DEFAULT_FIRMWARE "dvb-fe-xc4000-1.4.1.fw"



/* struct for storing firmware table */

struct firmware_description {

	unsigned int  type;
@@ -715,6 +719,9 @@ static int xc4000_fwupload(struct dvb_frontend *fe) 
	char		      name[33];

	const char	      *fname;



	if (firmware_name[0] != '\0')

		fname = firmware_name;

	else

		fname = XC4000_DEFAULT_FIRMWARE;



	printk("Reading firmware %s\n",  fname);