Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git] / drivers / media / video / pvrusb2 / pvrusb2-cx2584x-v4l.c
index 895859e..4e017ff 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "pvrusb2-cx2584x-v4l.h"
 #include "pvrusb2-video-v4l.h"
-#include "pvrusb2-i2c-cmd-v4l2.h"
 
 
 #include "pvrusb2-hdw-internal.h"
 #include <linux/errno.h>
 #include <linux/slab.h>
 
-struct pvr2_v4l_cx2584x {
-       struct pvr2_i2c_handler handler;
-       struct pvr2_decoder_ctrl ctrl;
-       struct pvr2_i2c_client *client;
-       struct pvr2_hdw *hdw;
-       unsigned long stale_mask;
-};
-
 
 struct routing_scheme_item {
        int vid;
@@ -110,218 +101,44 @@ static const struct routing_scheme routing_schemes[] = {
        },
 };
 
-static void set_input(struct pvr2_v4l_cx2584x *ctxt)
-{
-       struct pvr2_hdw *hdw = ctxt->hdw;
-       struct v4l2_routing route;
-       enum cx25840_video_input vid_input;
-       enum cx25840_audio_input aud_input;
-       const struct routing_scheme *sp;
-       unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
-
-       memset(&route,0,sizeof(route));
-
-       if ((sid < ARRAY_SIZE(routing_schemes)) &&
-           ((sp = routing_schemes + sid) != NULL) &&
-           (hdw->input_val >= 0) &&
-           (hdw->input_val < sp->cnt)) {
-               vid_input = sp->def[hdw->input_val].vid;
-               aud_input = sp->def[hdw->input_val].aud;
-       } else {
-               pvr2_trace(PVR2_TRACE_ERROR_LEGS,
-                          "*** WARNING *** i2c cx2584x set_input:"
-                          " Invalid routing scheme (%u) and/or input (%d)",
-                          sid,hdw->input_val);
-               return;
-       }
-
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx2584x set_input vid=0x%x aud=0x%x",
-                  vid_input,aud_input);
-       route.input = (u32)vid_input;
-       pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_VIDEO_ROUTING,&route);
-       route.input = (u32)aud_input;
-       pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route);
-}
-
-
-static int check_input(struct pvr2_v4l_cx2584x *ctxt)
-{
-       struct pvr2_hdw *hdw = ctxt->hdw;
-       return hdw->input_dirty != 0;
-}
-
-
-static void set_audio(struct pvr2_v4l_cx2584x *ctxt)
-{
-       u32 val;
-       struct pvr2_hdw *hdw = ctxt->hdw;
-
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx2584x set_audio %d",
-                  hdw->srate_val);
-       switch (hdw->srate_val) {
-       default:
-       case V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000:
-               val = 48000;
-               break;
-       case V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100:
-               val = 44100;
-               break;
-       case V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000:
-               val = 32000;
-               break;
-       }
-       pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_AUDIO_CLOCK_FREQ,&val);
-}
-
-
-static int check_audio(struct pvr2_v4l_cx2584x *ctxt)
-{
-       struct pvr2_hdw *hdw = ctxt->hdw;
-       return hdw->srate_dirty != 0;
-}
-
-
-struct pvr2_v4l_cx2584x_ops {
-       void (*update)(struct pvr2_v4l_cx2584x *);
-       int (*check)(struct pvr2_v4l_cx2584x *);
-};
-
-
-static const struct pvr2_v4l_cx2584x_ops decoder_ops[] = {
-       { .update = set_input, .check = check_input},
-       { .update = set_audio, .check = check_audio},
-};
-
-
-static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt)
+void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
 {
-       ctxt->client->handler = NULL;
-       pvr2_hdw_set_decoder(ctxt->hdw,NULL);
-       kfree(ctxt);
-}
-
-
-static int decoder_check(struct pvr2_v4l_cx2584x *ctxt)
-{
-       unsigned long msk;
-       unsigned int idx;
-
-       for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {
-               msk = 1 << idx;
-               if (ctxt->stale_mask & msk) continue;
-               if (decoder_ops[idx].check(ctxt)) {
-                       ctxt->stale_mask |= msk;
+       pvr2_trace(PVR2_TRACE_CHIPS, "subdev cx2584x update...");
+       if (hdw->input_dirty || hdw->force_dirty) {
+               struct v4l2_routing route;
+               enum cx25840_video_input vid_input;
+               enum cx25840_audio_input aud_input;
+               const struct routing_scheme *sp;
+               unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+
+               memset(&route, 0, sizeof(route));
+
+               if ((sid < ARRAY_SIZE(routing_schemes)) &&
+                   ((sp = routing_schemes + sid) != NULL) &&
+                   (hdw->input_val >= 0) &&
+                   (hdw->input_val < sp->cnt)) {
+                       vid_input = sp->def[hdw->input_val].vid;
+                       aud_input = sp->def[hdw->input_val].aud;
+               } else {
+                       pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+                                  "*** WARNING *** subdev cx2584x set_input:"
+                                  " Invalid routing scheme (%u)"
+                                  " and/or input (%d)",
+                                  sid, hdw->input_val);
+                       return;
                }
-       }
-       return ctxt->stale_mask != 0;
-}
-
 
-static void decoder_update(struct pvr2_v4l_cx2584x *ctxt)
-{
-       unsigned long msk;
-       unsigned int idx;
-
-       for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {
-               msk = 1 << idx;
-               if (!(ctxt->stale_mask & msk)) continue;
-               ctxt->stale_mask &= ~msk;
-               decoder_ops[idx].update(ctxt);
+               pvr2_trace(PVR2_TRACE_CHIPS,
+                          "subdev cx2584x set_input vid=0x%x aud=0x%x",
+                          vid_input, aud_input);
+               route.input = (u32)vid_input;
+               sd->ops->video->s_routing(sd, &route);
+               route.input = (u32)aud_input;
+               sd->ops->audio->s_routing(sd, &route);
        }
 }
 
 
-static void decoder_enable(struct pvr2_v4l_cx2584x *ctxt,int fl)
-{
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_enable(%d)",fl);
-       pvr2_v4l2_cmd_stream(ctxt->client,fl);
-}
-
-
-static int decoder_detect(struct pvr2_i2c_client *cp)
-{
-       int ret;
-       /* Attempt to query the decoder - let's see if it will answer */
-       struct v4l2_queryctrl qc;
-
-       memset(&qc,0,sizeof(qc));
-
-       qc.id = V4L2_CID_BRIGHTNESS;
-
-       ret = pvr2_i2c_client_cmd(cp,VIDIOC_QUERYCTRL,&qc);
-       return ret == 0; /* Return true if it answered */
-}
-
-
-static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt,
-                                    char *buf,unsigned int cnt)
-{
-       return scnprintf(buf,cnt,"handler: pvrusb2-cx2584x-v4l");
-}
-
-
-static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)
-{
-       int ret;
-       ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL);
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret);
-}
-
-
-static const 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_cx2584x_v4l_setup(struct pvr2_hdw *hdw,
-                              struct pvr2_i2c_client *cp)
-{
-       struct pvr2_v4l_cx2584x *ctxt;
-
-       if (hdw->decoder_ctrl) return 0;
-       if (cp->handler) return 0;
-       if (!decoder_detect(cp)) return 0;
-
-       ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL);
-       if (!ctxt) return 0;
-
-       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.force_reset = (void (*)(void*))decoder_reset;
-       ctxt->client = cp;
-       ctxt->hdw = hdw;
-       ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1;
-       pvr2_hdw_set_decoder(hdw,&ctxt->ctrl);
-       cp->handler = &ctxt->handler;
-       {
-               /*
-                 Mike Isely <isely@pobox.com> 19-Nov-2006 - This bit
-                 of nuttiness for cx25840 causes that module to
-                 correctly set up its video scaling.  This is really
-                 a problem in the cx25840 module itself, but we work
-                 around it here.  The problem has not been seen in
-                 ivtv because there VBI is supported and set up.  We
-                 don't do VBI here (at least not yet) and thus we
-                 never attempted to even set it up.
-                */
-               struct v4l2_format fmt;
-               memset(&fmt,0,sizeof(fmt));
-               fmt.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
-               pvr2_i2c_client_cmd(ctxt->client,VIDIOC_S_FMT,&fmt);
-       }
-       pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x cx2584x V4L2 handler set up",
-                  cp->client->addr);
-       return !0;
-}
-
-
-
 
 /*
   Stuff for Emacs to see, in order to encourage consistent editing style: