dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

[media] tuner-core: simplify the standard fixup

Browse source 
Get rid of a number of unnecessary tuner_dbg messages by simplifying
the std fixup function.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2011-06-13 09:47:56 -03:00 committed by Mauro Carvalho Chehab
parent 338e9e1ad5
commit 487833018e
1 changed files with 28 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
drivers/media/video/tuner-core.c
View file

@ -823,7 +823,8 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
/** /**
* tuner_fixup_std - force a given video standard variant * tuner_fixup_std - force a given video standard variant
* *
* @t: tuner internal struct * @t: tuner internal struct
* @std: TV standard
* *
* A few devices or drivers have problem to detect some standard variations. * A few devices or drivers have problem to detect some standard variations.
* On other operational systems, the drivers generally have a per-country * On other operational systems, the drivers generally have a per-country
@ -833,57 +834,39 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
* to distinguish all video standard variations, a modprobe parameter can * to distinguish all video standard variations, a modprobe parameter can
* be used to force a video standard match. * be used to force a video standard match.
*/ */
static int tuner_fixup_std(struct tuner *t) static v4l2_std_id tuner_fixup_std(struct tuner *t, v4l2_std_id std)
{ {
if ((t->std & V4L2_STD_PAL) == V4L2_STD_PAL) { if (pal[0] != '-' && (std & V4L2_STD_PAL) == V4L2_STD_PAL) {
switch (pal[0]) { switch (pal[0]) {
case '6': case '6':
tuner_dbg("insmod fixup: PAL => PAL-60\n"); return V4L2_STD_PAL_60;
t->std = V4L2_STD_PAL_60;
break;
case 'b': case 'b':
case 'B': case 'B':
case 'g': case 'g':
case 'G': case 'G':
tuner_dbg("insmod fixup: PAL => PAL-BG\n"); return V4L2_STD_PAL_BG;
t->std = V4L2_STD_PAL_BG;
break;
case 'i': case 'i':
case 'I': case 'I':
tuner_dbg("insmod fixup: PAL => PAL-I\n"); return V4L2_STD_PAL_I;
t->std = V4L2_STD_PAL_I;
break;
case 'd': case 'd':
case 'D': case 'D':
case 'k': case 'k':
case 'K': case 'K':
tuner_dbg("insmod fixup: PAL => PAL-DK\n"); return V4L2_STD_PAL_DK;
t->std = V4L2_STD_PAL_DK;
break;
case 'M': case 'M':
case 'm': case 'm':
tuner_dbg("insmod fixup: PAL => PAL-M\n"); return V4L2_STD_PAL_M;
t->std = V4L2_STD_PAL_M;
break;
case 'N': case 'N':
case 'n': case 'n':
if (pal[1] == 'c' || pal[1] == 'C') { if (pal[1] == 'c' || pal[1] == 'C')
tuner_dbg("insmod fixup: PAL => PAL-Nc\n"); return V4L2_STD_PAL_Nc;
t->std = V4L2_STD_PAL_Nc; return V4L2_STD_PAL_N;
} else {
tuner_dbg("insmod fixup: PAL => PAL-N\n");
t->std = V4L2_STD_PAL_N;
}
break;
case '-':
/* default parameter, do nothing */
break;
default: default:
tuner_warn("pal= argument not recognised\n"); tuner_warn("pal= argument not recognised\n");
break; break;
} }
} }
if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) { if (secam[0] != '-' && (std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
switch (secam[0]) { switch (secam[0]) {
case 'b': case 'b':
case 'B': case 'B':
@ -891,63 +874,42 @@ static int tuner_fixup_std(struct tuner *t)
case 'G': case 'G':
case 'h': case 'h':
case 'H': case 'H':
tuner_dbg("insmod fixup: SECAM => SECAM-BGH\n"); return V4L2_STD_SECAM_B |
t->std = V4L2_STD_SECAM_B | V4L2_STD_SECAM_G |
V4L2_STD_SECAM_G | V4L2_STD_SECAM_H;
V4L2_STD_SECAM_H;
break;
case 'd': case 'd':
case 'D': case 'D':
case 'k': case 'k':
case 'K': case 'K':
tuner_dbg("insmod fixup: SECAM => SECAM-DK\n"); return V4L2_STD_SECAM_DK;
t->std = V4L2_STD_SECAM_DK;
break;
case 'l': case 'l':
case 'L': case 'L':
if ((secam[1] == 'C') || (secam[1] == 'c')) { if ((secam[1] == 'C') || (secam[1] == 'c'))
tuner_dbg("insmod fixup: SECAM => SECAM-L'\n"); return V4L2_STD_SECAM_LC;
t->std = V4L2_STD_SECAM_LC; return V4L2_STD_SECAM_L;
} else {
tuner_dbg("insmod fixup: SECAM => SECAM-L\n");
t->std = V4L2_STD_SECAM_L;
}
break;
case '-':
/* default parameter, do nothing */
break;
default: default:
tuner_warn("secam= argument not recognised\n"); tuner_warn("secam= argument not recognised\n");
break; break;
} }
} }
if ((t->std & V4L2_STD_NTSC) == V4L2_STD_NTSC) { if (ntsc[0] != '-' && (std & V4L2_STD_NTSC) == V4L2_STD_NTSC) {
switch (ntsc[0]) { switch (ntsc[0]) {
case 'm': case 'm':
case 'M': case 'M':
tuner_dbg("insmod fixup: NTSC => NTSC-M\n"); return V4L2_STD_NTSC_M;
t->std = V4L2_STD_NTSC_M;
break;
case 'j': case 'j':
case 'J': case 'J':
tuner_dbg("insmod fixup: NTSC => NTSC_M_JP\n"); return V4L2_STD_NTSC_M_JP;
t->std = V4L2_STD_NTSC_M_JP;
break;
case 'k': case 'k':
case 'K': case 'K':
tuner_dbg("insmod fixup: NTSC => NTSC_M_KR\n"); return V4L2_STD_NTSC_M_KR;
t->std = V4L2_STD_NTSC_M_KR;
break;
case '-':
/* default parameter, do nothing */
break;
default: default:
tuner_info("ntsc= argument not recognised\n"); tuner_info("ntsc= argument not recognised\n");
break; break;
} }
} }
return 0; return std;
} }
/* /*
@ -1102,8 +1064,9 @@ static int tuner_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
if (set_mode(t, V4L2_TUNER_ANALOG_TV)) if (set_mode(t, V4L2_TUNER_ANALOG_TV))
return 0; return 0;
t->std = std; t->std = tuner_fixup_std(t, std);
tuner_fixup_std(t); if (t->std != std)
tuner_dbg("Fixup standard %llx to %llx\n", std, t->std);
set_freq(t, 0); set_freq(t, 0);
return 0; return 0;
} }