Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / drivers / media / video / bt8xx / bttv-vbi.c

diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 93e35de5a1811de578b03b5344ba173ab0d39263..1f0cc79e2a33e8e75c969f7e003d62d7abd0e793 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -24,7 +24,6 @@
 */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
@@ -143,7 +142,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
                redo_dma_risc = 1;
        }
 
-       if (STATE_NEEDS_INIT == buf->vb.state) {
+       if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
                redo_dma_risc = 1;
                if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL)))
                        goto fail;
@@ -151,13 +150,14 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
 
        if (redo_dma_risc) {
                unsigned int bpl, padding, offset;
+               struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
 
                bpl = 2044; /* max. vbipack */
                padding = VBI_BPL - bpl;
 
                if (fh->vbi_fmt.fmt.count[0] > 0) {
                        rc = bttv_risc_packed(btv, &buf->top,
-                                             buf->vb.dma.sglist,
+                                             dma->sglist,
                                              /* offset */ 0, bpl,
                                              padding, skip_lines0,
                                              fh->vbi_fmt.fmt.count[0]);
@@ -169,7 +169,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
                        offset = fh->vbi_fmt.fmt.count[0] * VBI_BPL;
 
                        rc = bttv_risc_packed(btv, &buf->bottom,
-                                             buf->vb.dma.sglist,
+                                             dma->sglist,
                                              offset, bpl,
                                              padding, skip_lines1,
                                              fh->vbi_fmt.fmt.count[1]);
@@ -189,7 +189,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
        /* For bttv_buffer_activate_vbi(). */
        buf->geo.vdelay = min_vdelay;
 
-       buf->vb.state = STATE_PREPARED;
+       buf->vb.state = VIDEOBUF_PREPARED;
        buf->vb.field = field;
        dprintk("buf prepare %p: top=%p bottom=%p field=%s\n",
                vb, &buf->top, &buf->bottom,
@@ -209,7 +209,7 @@ vbi_buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
        struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
 
        dprintk("queue %p\n",vb);
-       buf->vb.state = STATE_QUEUED;
+       buf->vb.state = VIDEOBUF_QUEUED;
        list_add_tail(&buf->vb.queue,&btv->vcapture);
        if (NULL == btv->cvbi) {
                fh->btv->loop_irq |= 4;
@@ -236,10 +236,8 @@ struct videobuf_queue_ops bttv_vbi_qops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int
-try_fmt                        (struct v4l2_vbi_format *       f,
-                        const struct bttv_tvnorm *     tvnorm,
-                        __s32                          crop_start)
+static int try_fmt(struct v4l2_vbi_format *f, const struct bttv_tvnorm *tvnorm,
+                       __s32 crop_start)
 {
        __s32 min_start, max_start, max_end, f2_offset;
        unsigned int i;
@@ -305,10 +303,9 @@ try_fmt                    (struct v4l2_vbi_format *       f,
        return 0;
 }
 
-int
-bttv_vbi_try_fmt       (struct bttv_fh *               fh,
-                        struct v4l2_vbi_format *       f)
+int bttv_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
 {
+       struct bttv_fh *fh = f;
        struct bttv *btv = fh->btv;
        const struct bttv_tvnorm *tvnorm;
        __s32 crop_start;
@@ -320,13 +317,13 @@ bttv_vbi_try_fmt  (struct bttv_fh *               fh,
 
        mutex_unlock(&btv->lock);
 
-       return try_fmt(f, tvnorm, crop_start);
+       return try_fmt(&frt->fmt.vbi, tvnorm, crop_start);
 }
 
-int
-bttv_vbi_set_fmt       (struct bttv_fh *               fh,
-                        struct v4l2_vbi_format *       f)
+
+int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
 {
+       struct bttv_fh *fh = f;
        struct bttv *btv = fh->btv;
        const struct bttv_tvnorm *tvnorm;
        __s32 start1, end;
@@ -340,11 +337,12 @@ bttv_vbi_set_fmt  (struct bttv_fh *               fh,
 
        tvnorm = &bttv_tvnorms[btv->tvnorm];
 
-       rc = try_fmt(f, tvnorm, btv->crop_start);
+       rc = try_fmt(&frt->fmt.vbi, tvnorm, btv->crop_start);
        if (0 != rc)
                goto fail;
 
-       start1 = f->start[1] - tvnorm->vbistart[1] + tvnorm->vbistart[0];
+       start1 = frt->fmt.vbi.start[1] - tvnorm->vbistart[1] +
+               tvnorm->vbistart[0];
 
        /* First possible line of video capturing. Should be
           max(f->start[0] + f->count[0], start1 + f->count[1]) * 2
@@ -352,11 +350,11 @@ bttv_vbi_set_fmt  (struct bttv_fh *               fh,
           pretend the VBI and video capture window may overlap,
           so end = start + 1, the lowest possible value, times two
           because vbi_fmt.end counts field lines times two. */
-       end = max(f->start[0], start1) * 2 + 2;
+       end = max(frt->fmt.vbi.start[0], start1) * 2 + 2;
 
        mutex_lock(&fh->vbi.lock);
 
-       fh->vbi_fmt.fmt    = *f;
+       fh->vbi_fmt.fmt    = frt->fmt.vbi;
        fh->vbi_fmt.tvnorm = tvnorm;
        fh->vbi_fmt.end    = end;
 
@@ -370,13 +368,13 @@ bttv_vbi_set_fmt  (struct bttv_fh *               fh,
        return rc;
 }
 
-void
-bttv_vbi_get_fmt       (struct bttv_fh *               fh,
-                        struct v4l2_vbi_format *       f)
+
+int bttv_g_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
 {
+       struct bttv_fh *fh = f;
        const struct bttv_tvnorm *tvnorm;
 
-       *f = fh->vbi_fmt.fmt;
+       frt->fmt.vbi = fh->vbi_fmt.fmt;
 
        tvnorm = &bttv_tvnorms[fh->btv->tvnorm];
 
@@ -391,28 +389,28 @@ bttv_vbi_get_fmt  (struct bttv_fh *               fh,
                max_end = (tvnorm->cropcap.bounds.top
                           + tvnorm->cropcap.bounds.height) >> 1;
 
-               f->sampling_rate = tvnorm->Fsc;
+               frt->fmt.vbi.sampling_rate = tvnorm->Fsc;
 
                for (i = 0; i < 2; ++i) {
                        __s32 new_start;
 
-                       new_start = f->start[i]
+                       new_start = frt->fmt.vbi.start[i]
                                + tvnorm->vbistart[i]
                                - fh->vbi_fmt.tvnorm->vbistart[i];
 
-                       f->start[i] = min(new_start, max_end - 1);
-                       f->count[i] = min((__s32) f->count[i],
-                                         max_end - f->start[i]);
+                       frt->fmt.vbi.start[i] = min(new_start, max_end - 1);
+                       frt->fmt.vbi.count[i] =
+                               min((__s32) frt->fmt.vbi.count[i],
+                                         max_end - frt->fmt.vbi.start[i]);
 
                        max_end += tvnorm->vbistart[1]
                                - tvnorm->vbistart[0];
                }
        }
+       return 0;
 }
 
-void
-bttv_vbi_fmt_reset     (struct bttv_vbi_fmt *          f,
-                        int                            norm)
+void bttv_vbi_fmt_reset(struct bttv_vbi_fmt *f, int norm)
 {
        const struct bttv_tvnorm *tvnorm;
        unsigned int real_samples_per_line;