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

Commit 2f03ee8e authored by C.Y.M's avatar C.Y.M Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3671): New module parameter 'tv_standard' (dvb-ttpci driver) 



This attached patch was originally proposed by Anssi Hannula to the dvb-kernel
user to choose the default broadcast mode when using the ttpci driver.
NTSC users need to only add the following line to modprobe.d:
options dvb-ttpci tv_standard=1 
PAL users will not need to change anything, for this will be the default.

Signed-off-by: default avatarC.Y.M <syphir@syphir.sytes.net>
Signed-off-by: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent f3688fc8

drivers/media/dvb/ttpci/av7110.c

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static int volume = 255; 
static int budgetpatch;

static int wss_cfg_4_3 = 0x4008;

static int wss_cfg_16_9 = 0x0007;

static int tv_standard;



module_param_named(debug, av7110_debug, int, 0644);

MODULE_PARM_DESC(debug, "debug level (bitmask, default 0)");
@@ -109,6 +110,8 @@ module_param(wss_cfg_4_3, int, 0444); 
MODULE_PARM_DESC(wss_cfg_4_3, "WSS 4:3 - default 0x4008 - bit 15: disable, 14: burst mode, 13..0: wss data");

module_param(wss_cfg_16_9, int, 0444);

MODULE_PARM_DESC(wss_cfg_16_9, "WSS 16:9 - default 0x0007 - bit 15: disable, 14: burst mode, 13..0: wss data");

module_param(tv_standard, int, 0444);

MODULE_PARM_DESC(tv_standard, "TV standard: 0 PAL (default), 1 NTSC");



static void restart_feeds(struct av7110 *av7110);
@@ -2543,6 +2546,9 @@ static int __devinit av7110_attach(struct saa7146_dev* dev, 
	av7110->osdwin = 1;

	mutex_init(&av7110->osd_mutex);



	/* TV standard */

	av7110->vidmode = tv_standard == 1 ? VIDEO_MODE_NTSC : VIDEO_MODE_PAL;



	/* ARM "watchdog" */

	init_waitqueue_head(&av7110->arm_wait);

	av7110->arm_thread = NULL;

drivers/media/dvb/ttpci/av7110_av.c

+0 −2
Original line number Diff line number Diff line
@@ -1479,8 +1479,6 @@ int av7110_av_init(struct av7110 *av7110) 
	void (*play[])(u8 *, int, void *) = { play_audio_cb, play_video_cb };

	int i, ret;



	av7110->vidmode = VIDEO_MODE_PAL;



	for (i = 0; i < 2; i++) {

		struct ipack *ipack = av7110->ipack + i;