V4L/DVB (5049): Pvrusb2: Enable radio mode for 24xxx devices
These changes implement correct audio routing for radio mode on a 24xxx device. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
c0e69315ed
commit
2083230084
drivers/media/video/pvrusb2
|
@ -63,6 +63,7 @@ static void set_input(struct pvr2_v4l_cx2584x *ctxt)
|
||||||
vid_input = CX25840_COMPOSITE7;
|
vid_input = CX25840_COMPOSITE7;
|
||||||
aud_input = CX25840_AUDIO8;
|
aud_input = CX25840_AUDIO8;
|
||||||
break;
|
break;
|
||||||
|
case PVR2_CVAL_INPUT_RADIO: // Treat same as composite
|
||||||
case PVR2_CVAL_INPUT_COMPOSITE:
|
case PVR2_CVAL_INPUT_COMPOSITE:
|
||||||
vid_input = CX25840_COMPOSITE3;
|
vid_input = CX25840_COMPOSITE3;
|
||||||
aud_input = CX25840_AUDIO_SERIAL;
|
aud_input = CX25840_AUDIO_SERIAL;
|
||||||
|
@ -71,7 +72,6 @@ static void set_input(struct pvr2_v4l_cx2584x *ctxt)
|
||||||
vid_input = CX25840_SVIDEO1;
|
vid_input = CX25840_SVIDEO1;
|
||||||
aud_input = CX25840_AUDIO_SERIAL;
|
aud_input = CX25840_AUDIO_SERIAL;
|
||||||
break;
|
break;
|
||||||
case PVR2_CVAL_INPUT_RADIO:
|
|
||||||
default:
|
default:
|
||||||
// Just set it to be composite input for now...
|
// Just set it to be composite input for now...
|
||||||
vid_input = CX25840_COMPOSITE3;
|
vid_input = CX25840_COMPOSITE3;
|
||||||
|
|
|
@ -50,15 +50,21 @@ static void set_input(struct pvr2_v4l_wm8775 *ctxt)
|
||||||
{
|
{
|
||||||
struct v4l2_routing route;
|
struct v4l2_routing route;
|
||||||
struct pvr2_hdw *hdw = ctxt->hdw;
|
struct pvr2_hdw *hdw = ctxt->hdw;
|
||||||
int msk = 0;
|
|
||||||
|
|
||||||
memset(&route,0,sizeof(route));
|
memset(&route,0,sizeof(route));
|
||||||
|
|
||||||
pvr2_trace(PVR2_TRACE_CHIPS,"i2c wm8775 set_input(val=%d msk=0x%x)",
|
switch(hdw->input_val) {
|
||||||
hdw->input_val,msk);
|
case PVR2_CVAL_INPUT_RADIO:
|
||||||
|
route.input = 1;
|
||||||
// Always point to input #1 no matter what
|
break;
|
||||||
|
default:
|
||||||
|
/* All other cases just use the second input */
|
||||||
route.input = 2;
|
route.input = 2;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
pvr2_trace(PVR2_TRACE_CHIPS,"i2c wm8775 set_input(val=%d route=0x%x)",
|
||||||
|
hdw->input_val,route.input);
|
||||||
|
|
||||||
pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route);
|
pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue