adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

V4L/DVB (10931): zoran: Drop the lock_norm module parameter

Browse source 
The lock_norm module parameter doesn't look terribly useful. If you
don't want to change the norm, just don't change it. As a matter of
fact, no other v4l driver has such a parameter.

Cc: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean Delvare 2009-03-10 23:28:17 -03:00 committed by Mauro Carvalho Chehab
parent 1159b7f19f
commit 4dbf46a048
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Documentation/video4linux/Zoran
View file

@ -401,8 +401,7 @@ Additional notes for software developers:
first set the correct norm. Well, it seems logically correct: TV first set the correct norm. Well, it seems logically correct: TV
standard is "more constant" for current country than geometry standard is "more constant" for current country than geometry
settings of a variety of TV capture cards which may work in ITU or settings of a variety of TV capture cards which may work in ITU or
square pixel format. Remember that users now can lock the norm to square pixel format.
avoid any ambiguity.
-- --
Please note that lavplay/lavrec are also included in the MJPEG-tools Please note that lavplay/lavrec are also included in the MJPEG-tools
(http://mjpeg.sf.net/). (http://mjpeg.sf.net/).

20
drivers/media/video/zoran/zoran_driver.c
View file

@ -162,10 +162,6 @@ const struct zoran_format zoran_formats[] = {
}; };
#define NUM_FORMATS ARRAY_SIZE(zoran_formats) #define NUM_FORMATS ARRAY_SIZE(zoran_formats)
static int lock_norm; /* 0 = default 1 = Don't change TV standard (norm) */
module_param(lock_norm, int, 0644);
MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, >1 = fail)");
/* small helper function for calculating buffersizes for v4l2 /* small helper function for calculating buffersizes for v4l2
* we calculate the nearest higher power-of-two, which * we calculate the nearest higher power-of-two, which
* will be the recommended buffersize */ * will be the recommended buffersize */
@ -1483,22 +1479,6 @@ zoran_set_norm (struct zoran *zr,
return -EBUSY; return -EBUSY;
} }
if (lock_norm && norm != zr->norm) {
if (lock_norm > 1) {
dprintk(1,
KERN_WARNING
"%s: set_norm() - TV standard is locked, can not switch norm\n",
ZR_DEVNAME(zr));
return -EPERM;
} else {
dprintk(1,
KERN_WARNING
"%s: set_norm() - TV standard is locked, norm was not changed\n",
ZR_DEVNAME(zr));
norm = zr->norm;
}
}
if (!(norm & zr->card.norms)) { if (!(norm & zr->card.norms)) {
dprintk(1, dprintk(1,
KERN_ERR "%s: set_norm() - unsupported norm %llx\n", KERN_ERR "%s: set_norm() - unsupported norm %llx\n",