include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / drivers / media / video / pvrusb2 / pvrusb2-video-v4l.c
index 4127c82..2e205c9 100644 (file)
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -29,7 +28,7 @@
 */
 
 #include "pvrusb2-video-v4l.h"
-#include "pvrusb2-i2c-cmd-v4l2.h"
+
 
 
 #include "pvrusb2-hdw-internal.h"
 #include <media/v4l2-common.h>
 #include <media/saa7115.h>
 #include <linux/errno.h>
-#include <linux/slab.h>
-
-struct pvr2_v4l_decoder {
-       struct pvr2_i2c_handler handler;
-       struct pvr2_decoder_ctrl ctrl;
-       struct pvr2_i2c_client *client;
-       struct pvr2_hdw *hdw;
-       unsigned long stale_mask;
-};
-
-
-static void set_input(struct pvr2_v4l_decoder *ctxt)
-{
-       struct pvr2_hdw *hdw = ctxt->hdw;
-       struct v4l2_routing route;
-
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_input(%d)",hdw->input_val);
-       switch(hdw->input_val) {
-       case PVR2_CVAL_INPUT_TV:
-               route.input = SAA7115_COMPOSITE4;
-               break;
-       case PVR2_CVAL_INPUT_COMPOSITE:
-               route.input = SAA7115_COMPOSITE5;
-               break;
-       case PVR2_CVAL_INPUT_SVIDEO:
-               route.input = SAA7115_SVIDEO2;
-               break;
-       case PVR2_CVAL_INPUT_RADIO:
-               // ????? No idea yet what to do here
-       default:
-               return;
-       }
-       route.output = 0;
-       pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_VIDEO_ROUTING,&route);
-}
-
 
-static int check_input(struct pvr2_v4l_decoder *ctxt)
-{
-       struct pvr2_hdw *hdw = ctxt->hdw;
-       return hdw->input_dirty != 0;
-}
-
-
-static void set_audio(struct pvr2_v4l_decoder *ctxt)
-{
-       u32 val;
-       struct pvr2_hdw *hdw = ctxt->hdw;
-
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_audio %d",
-                  hdw->srate_val);
-       switch (hdw->srate_val) {
-       default:
-       case PVR2_CVAL_SRATE_48:
-               val = 48000;
-               break;
-       case PVR2_CVAL_SRATE_44_1:
-               val = 44100;
-               break;
-       }
-       pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_AUDIO_CLOCK_FREQ,&val);
-}
-
-
-static int check_audio(struct pvr2_v4l_decoder *ctxt)
-{
-       struct pvr2_hdw *hdw = ctxt->hdw;
-       return hdw->srate_dirty != 0;
-}
+struct routing_scheme {
+       const int *def;
+       unsigned int cnt;
+};
 
 
-struct pvr2_v4l_decoder_ops {
-       void (*update)(struct pvr2_v4l_decoder *);
-       int (*check)(struct pvr2_v4l_decoder *);
+static const int routing_scheme0[] = {
+       [PVR2_CVAL_INPUT_TV] = SAA7115_COMPOSITE4,
+       /* In radio mode, we mute the video, but point at one
+          spot just to stay consistent */
+       [PVR2_CVAL_INPUT_RADIO] = SAA7115_COMPOSITE5,
+       [PVR2_CVAL_INPUT_COMPOSITE] = SAA7115_COMPOSITE5,
+       [PVR2_CVAL_INPUT_SVIDEO] =  SAA7115_SVIDEO2,
 };
 
-
-static const struct pvr2_v4l_decoder_ops decoder_ops[] = {
-       { .update = set_input, .check = check_input},
-       { .update = set_audio, .check = check_audio},
+static const struct routing_scheme routing_def0 = {
+       .def = routing_scheme0,
+       .cnt = ARRAY_SIZE(routing_scheme0),
 };
 
+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 void decoder_detach(struct pvr2_v4l_decoder *ctxt)
-{
-       ctxt->client->handler = 0;
-       ctxt->hdw->decoder_ctrl = 0;
-       kfree(ctxt);
-}
+static const struct routing_scheme routing_def1 = {
+       .def = routing_scheme1,
+       .cnt = ARRAY_SIZE(routing_scheme1),
+};
 
+static const struct routing_scheme *routing_schemes[] = {
+       [PVR2_ROUTING_SCHEME_HAUPPAUGE] = &routing_def0,
+       [PVR2_ROUTING_SCHEME_ONAIR] = &routing_def1,
+};
 
-static int decoder_check(struct pvr2_v4l_decoder *ctxt)
+void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
-       unsigned long msk;
-       unsigned int idx;
-
-       for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
-            idx++) {
-               msk = 1 << idx;
-               if (ctxt->stale_mask & msk) continue;
-               if (decoder_ops[idx].check(ctxt)) {
-                       ctxt->stale_mask |= msk;
+       if (hdw->input_dirty || hdw->force_dirty) {
+               const struct routing_scheme *sp;
+               unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+               u32 input;
+
+               pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
+                          hdw->input_val);
+
+               sp = (sid < ARRAY_SIZE(routing_schemes)) ?
+                       routing_schemes[sid] : NULL;
+               if ((sp == NULL) ||
+                   (hdw->input_val < 0) ||
+                   (hdw->input_val >= sp->cnt)) {
+                       pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+                                  "*** WARNING *** subdev v4l2 set_input:"
+                                  " Invalid routing scheme (%u)"
+                                  " and/or input (%d)",
+                                  sid, hdw->input_val);
+                       return;
                }
+               input = sp->def[hdw->input_val];
+               sd->ops->video->s_routing(sd, input, 0, 0);
        }
-       return ctxt->stale_mask != 0;
-}
-
-
-static void decoder_update(struct pvr2_v4l_decoder *ctxt)
-{
-       unsigned long msk;
-       unsigned int idx;
-
-       for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
-            idx++) {
-               msk = 1 << idx;
-               if (!(ctxt->stale_mask & msk)) continue;
-               ctxt->stale_mask &= ~msk;
-               decoder_ops[idx].update(ctxt);
-       }
-}
-
-
-static int decoder_detect(struct pvr2_i2c_client *cp)
-{
-       /* Attempt to query the decoder - let's see if it will answer */
-       struct v4l2_tuner vt;
-       int ret;
-
-       memset(&vt,0,sizeof(vt));
-       ret = pvr2_i2c_client_cmd(cp,VIDIOC_G_TUNER,&vt);
-       return ret == 0; /* Return true if it answered */
 }
 
 
-static void decoder_enable(struct pvr2_v4l_decoder *ctxt,int fl)
-{
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 decoder_enable(%d)",fl);
-       pvr2_v4l2_cmd_stream(ctxt->client,fl);
-}
-
-
-static int decoder_is_tuned(struct pvr2_v4l_decoder *ctxt)
-{
-       struct v4l2_tuner vt;
-       int ret;
-
-       memset(&vt,0,sizeof(vt));
-       ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_G_TUNER,&vt);
-       if (ret < 0) return -EINVAL;
-       return vt.signal ? 1 : 0;
-}
-
-
-static unsigned int decoder_describe(struct pvr2_v4l_decoder *ctxt,char *buf,unsigned int cnt)
-{
-       return scnprintf(buf,cnt,"handler: pvrusb2-video-v4l");
-}
-
-
-const static struct pvr2_i2c_handler_functions hfuncs = {
-       .detach = (void (*)(void *))decoder_detach,
-       .check = (int (*)(void *))decoder_check,
-       .update = (void (*)(void *))decoder_update,
-       .describe = (unsigned int (*)(void *,char *,unsigned int))decoder_describe,
-};
-
-
-int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw,
-                              struct pvr2_i2c_client *cp)
-{
-       struct pvr2_v4l_decoder *ctxt;
-
-       if (hdw->decoder_ctrl) return 0;
-       if (cp->handler) return 0;
-       if (!decoder_detect(cp)) return 0;
-
-       ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);
-       if (!ctxt) return 0;
-       memset(ctxt,0,sizeof(*ctxt));
-
-       ctxt->handler.func_data = ctxt;
-       ctxt->handler.func_table = &hfuncs;
-       ctxt->ctrl.ctxt = ctxt;
-       ctxt->ctrl.detach = (void (*)(void *))decoder_detach;
-       ctxt->ctrl.enable = (void (*)(void *,int))decoder_enable;
-       ctxt->ctrl.tuned = (int (*)(void *))decoder_is_tuned;
-       ctxt->client = cp;
-       ctxt->hdw = hdw;
-       ctxt->stale_mask = (1 << (sizeof(decoder_ops)/
-                                 sizeof(decoder_ops[0]))) - 1;
-       hdw->decoder_ctrl = &ctxt->ctrl;
-       cp->handler = &ctxt->handler;
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x saa711x V4L2 handler set up",
-                  cp->client->addr);
-       return !0;
-}
-
-
-
-
 /*
   Stuff for Emacs to see, in order to encourage consistent editing style:
   *** Local Variables: ***