diff options
author | C.Y.M <syphir@syphir.sytes.net> | 2006-03-30 02:31:48 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 03:55:59 -0400 |
commit | 2f03ee8e6bd7c6f40a1a0583662308e002d357da (patch) | |
tree | 1dd3b00445967f6f33746324cd476aa4d7427697 /drivers | |
parent | f3688fc8d391f50dee45bd3bf04bdeab1c16c3c0 (diff) |
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: C.Y.M <syphir@syphir.sytes.net>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 6 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_av.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index 088f03caa64f..d028245c8eed 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -87,6 +87,7 @@ static int volume = 255; | |||
87 | static int budgetpatch; | 87 | static int budgetpatch; |
88 | static int wss_cfg_4_3 = 0x4008; | 88 | static int wss_cfg_4_3 = 0x4008; |
89 | static int wss_cfg_16_9 = 0x0007; | 89 | static int wss_cfg_16_9 = 0x0007; |
90 | static int tv_standard; | ||
90 | 91 | ||
91 | module_param_named(debug, av7110_debug, int, 0644); | 92 | module_param_named(debug, av7110_debug, int, 0644); |
92 | MODULE_PARM_DESC(debug, "debug level (bitmask, default 0)"); | 93 | MODULE_PARM_DESC(debug, "debug level (bitmask, default 0)"); |
@@ -109,6 +110,8 @@ module_param(wss_cfg_4_3, int, 0444); | |||
109 | MODULE_PARM_DESC(wss_cfg_4_3, "WSS 4:3 - default 0x4008 - bit 15: disable, 14: burst mode, 13..0: wss data"); | 110 | MODULE_PARM_DESC(wss_cfg_4_3, "WSS 4:3 - default 0x4008 - bit 15: disable, 14: burst mode, 13..0: wss data"); |
110 | module_param(wss_cfg_16_9, int, 0444); | 111 | module_param(wss_cfg_16_9, int, 0444); |
111 | MODULE_PARM_DESC(wss_cfg_16_9, "WSS 16:9 - default 0x0007 - bit 15: disable, 14: burst mode, 13..0: wss data"); | 112 | MODULE_PARM_DESC(wss_cfg_16_9, "WSS 16:9 - default 0x0007 - bit 15: disable, 14: burst mode, 13..0: wss data"); |
113 | module_param(tv_standard, int, 0444); | ||
114 | MODULE_PARM_DESC(tv_standard, "TV standard: 0 PAL (default), 1 NTSC"); | ||
112 | 115 | ||
113 | static void restart_feeds(struct av7110 *av7110); | 116 | static void restart_feeds(struct av7110 *av7110); |
114 | 117 | ||
@@ -2543,6 +2546,9 @@ static int __devinit av7110_attach(struct saa7146_dev* dev, | |||
2543 | av7110->osdwin = 1; | 2546 | av7110->osdwin = 1; |
2544 | mutex_init(&av7110->osd_mutex); | 2547 | mutex_init(&av7110->osd_mutex); |
2545 | 2548 | ||
2549 | /* TV standard */ | ||
2550 | av7110->vidmode = tv_standard == 1 ? VIDEO_MODE_NTSC : VIDEO_MODE_PAL; | ||
2551 | |||
2546 | /* ARM "watchdog" */ | 2552 | /* ARM "watchdog" */ |
2547 | init_waitqueue_head(&av7110->arm_wait); | 2553 | init_waitqueue_head(&av7110->arm_wait); |
2548 | av7110->arm_thread = NULL; | 2554 | av7110->arm_thread = NULL; |
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c index 400facec7407..2eff09f638d3 100644 --- a/drivers/media/dvb/ttpci/av7110_av.c +++ b/drivers/media/dvb/ttpci/av7110_av.c | |||
@@ -1479,8 +1479,6 @@ int av7110_av_init(struct av7110 *av7110) | |||
1479 | void (*play[])(u8 *, int, void *) = { play_audio_cb, play_video_cb }; | 1479 | void (*play[])(u8 *, int, void *) = { play_audio_cb, play_video_cb }; |
1480 | int i, ret; | 1480 | int i, ret; |
1481 | 1481 | ||
1482 | av7110->vidmode = VIDEO_MODE_PAL; | ||
1483 | |||
1484 | for (i = 0; i < 2; i++) { | 1482 | for (i = 0; i < 2; i++) { |
1485 | struct ipack *ipack = av7110->ipack + i; | 1483 | struct ipack *ipack = av7110->ipack + i; |
1486 | 1484 | ||