V4L/DVB (11207): pvrusb2: Add composite and s-video input support for OnAir devices

[safe/jmp/linux-2.6] / drivers / media / video / pvrusb2 / pvrusb2-video-v4l.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index ce8332d..b3862f5 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -54,11 +54,22 @@ static const int routing_scheme0[] = {
        [PVR2_CVAL_INPUT_SVIDEO] =  SAA7115_SVIDEO2,
 };
 
+static const int routing_scheme1[] = {
+       [PVR2_CVAL_INPUT_TV] = SAA7115_COMPOSITE4,
+       [PVR2_CVAL_INPUT_RADIO] = SAA7115_COMPOSITE5,
+       [PVR2_CVAL_INPUT_COMPOSITE] = SAA7115_COMPOSITE3,
+       [PVR2_CVAL_INPUT_SVIDEO] =  SAA7115_SVIDEO2, /* or SVIDEO0, it seems */
+};
+
 static const struct routing_scheme routing_schemes[] = {
        [PVR2_ROUTING_SCHEME_HAUPPAUGE] = {
                .def = routing_scheme0,
                .cnt = ARRAY_SIZE(routing_scheme0),
        },
+       [PVR2_ROUTING_SCHEME_ONAIR] = {
+               .def = routing_scheme1,
+               .cnt = ARRAY_SIZE(routing_scheme1),
+       },
 };
 
 void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)