iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (3663): Fix msp3400c wait time and better audio mode fallbacks

Browse Source 
- The wait time until the first time the audio mode was detected was
  1+5=6 seconds instead of just 1 second (wrong statement order).
  msp3400c specific bug.
- Implemented audio mode fallback for msp3400c/d just like the msp3400g
  does automatically. E.g. fallback to stereo if no second language exists,
  etc.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2006-03-29 14:31:44 -03:00 committed by Mauro Carvalho Chehab
parent dc555aa63c
commit 7061561e64
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/video/msp3400-kthreads.c
View File

@ -228,6 +228,7 @@ static void msp3400c_set_audmode(struct i2c_client *client)
char *modestr = (state->audmode >= 0 && state->audmode < 5) ? char *modestr = (state->audmode >= 0 && state->audmode < 5) ?
strmode[state->audmode] : "unknown"; strmode[state->audmode] : "unknown";
int src = 0; /* channel source: FM/AM, nicam or SCART */ int src = 0; /* channel source: FM/AM, nicam or SCART */
int audmode = state->audmode;
if (state->opmode == OPMODE_AUTOSELECT) { if (state->opmode == OPMODE_AUTOSELECT) {
/* this method would break everything, let's make sure /* this method would break everything, let's make sure
@ -239,11 +240,22 @@ static void msp3400c_set_audmode(struct i2c_client *client)
return; return;
} }
/* If no second language is available, switch to the first language */
if ((audmode == V4L2_TUNER_MODE_LANG2 ||
audmode == V4L2_TUNER_MODE_LANG1_LANG2) &&
!(state->rxsubchans & V4L2_TUNER_SUB_LANG2))
audmode = V4L2_TUNER_MODE_LANG1;
/* switch to stereo for stereo transmission, otherwise
keep first language */
if (audmode == V4L2_TUNER_MODE_LANG1 &&
(state->rxsubchans & V4L2_TUNER_SUB_STEREO))
audmode = V4L2_TUNER_MODE_STEREO;
/* switch demodulator */ /* switch demodulator */
switch (state->mode) { switch (state->mode) {
case MSP_MODE_FM_TERRA: case MSP_MODE_FM_TERRA:
v4l_dbg(1, msp_debug, client, "FM set_audmode: %s\n", modestr); v4l_dbg(1, msp_debug, client, "FM set_audmode: %s\n", modestr);
switch (state->audmode) { switch (audmode) {
case V4L2_TUNER_MODE_STEREO: case V4L2_TUNER_MODE_STEREO:
msp_write_dsp(client, 0x000e, 0x3001); msp_write_dsp(client, 0x000e, 0x3001);
break; break;
@ -257,7 +269,7 @@ static void msp3400c_set_audmode(struct i2c_client *client)
break; break;
case MSP_MODE_FM_SAT: case MSP_MODE_FM_SAT:
v4l_dbg(1, msp_debug, client, "SAT set_audmode: %s\n", modestr); v4l_dbg(1, msp_debug, client, "SAT set_audmode: %s\n", modestr);
switch (state->audmode) { switch (audmode) {
case V4L2_TUNER_MODE_MONO: case V4L2_TUNER_MODE_MONO:
msp3400c_set_carrier(client, MSP_CARRIER(6.5), MSP_CARRIER(6.5)); msp3400c_set_carrier(client, MSP_CARRIER(6.5), MSP_CARRIER(6.5));
break; break;
@ -296,7 +308,7 @@ static void msp3400c_set_audmode(struct i2c_client *client)
} }
/* switch audio */ /* switch audio */
switch (state->audmode) { switch (audmode) {
case V4L2_TUNER_MODE_STEREO: case V4L2_TUNER_MODE_STEREO:
case V4L2_TUNER_MODE_LANG1_LANG2: case V4L2_TUNER_MODE_LANG1_LANG2:
src |= 0x0020; src |= 0x0020;
@ -314,10 +326,6 @@ static void msp3400c_set_audmode(struct i2c_client *client)
src = 0x0030; src = 0x0030;
break; break;
case V4L2_TUNER_MODE_LANG1: case V4L2_TUNER_MODE_LANG1:
/* switch to stereo for stereo transmission, otherwise
keep first language */
if (state->rxsubchans & V4L2_TUNER_SUB_STEREO)
src |= 0x0020;
break; break;
case V4L2_TUNER_MODE_LANG2: case V4L2_TUNER_MODE_LANG2:
src |= 0x0010; src |= 0x0010;
@ -612,9 +620,9 @@ int msp3400c_thread(void *data)
if (msp_sleep(state, 1000)) if (msp_sleep(state, 1000))
goto restart; goto restart;
while (state->watch_stereo) { while (state->watch_stereo) {
watch_stereo(client);
if (msp_sleep(state, 5000)) if (msp_sleep(state, 5000))
goto restart; goto restart;
watch_stereo(client);
} }
} }
v4l_dbg(1, msp_debug, client, "thread: exit\n"); v4l_dbg(1, msp_debug, client, "thread: exit\n");