- patches.arch/x86_mce_intel_decode_physical_address.patch:
[linux-flexiantxendom0-3.2.10.git] / drivers / media / video / videobuf-dma-sg.c
index fcd045e..8359e6b 100644 (file)
 #define MAGIC_DMABUF 0x19721112
 #define MAGIC_SG_MEM 0x17890714
 
-#define MAGIC_CHECK(is,should) if (unlikely((is) != (should))) \
-       { printk(KERN_ERR "magic mismatch: %x (expected %x)\n",is,should); BUG(); }
+#define MAGIC_CHECK(is, should)                                                \
+       if (unlikely((is) != (should))) {                               \
+               printk(KERN_ERR "magic mismatch: %x (expected %x)\n",   \
+                               is, should);                            \
+               BUG();                                                  \
+       }
 
 static int debug;
 module_param(debug, int, 0644);
@@ -47,13 +51,13 @@ MODULE_DESCRIPTION("helper module to manage video4linux dma sg buffers");
 MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
 MODULE_LICENSE("GPL");
 
-#define dprintk(level, fmt, arg...)    if (debug >= level) \
-       printk(KERN_DEBUG "vbuf-sg: " fmt , ## arg)
+#define dprintk(level, fmt, arg...)                                    \
+       if (debug >= level)                                             \
+               printk(KERN_DEBUG "vbuf-sg: " fmt , ## arg)
 
 /* --------------------------------------------------------------------- */
 
-struct scatterlist*
-videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
+struct scatterlist *videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
 {
        struct scatterlist *sglist;
        struct page *pg;
@@ -73,13 +77,14 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
        }
        return sglist;
 
- err:
+err:
        vfree(sglist);
        return NULL;
 }
+EXPORT_SYMBOL_GPL(videobuf_vmalloc_to_sg);
 
-struct scatterlist*
-videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset)
+struct scatterlist *videobuf_pages_to_sg(struct page **pages, int nr_pages,
+                                        int offset)
 {
        struct scatterlist *sglist;
        int i;
@@ -104,20 +109,20 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset)
        }
        return sglist;
 
- nopage:
-       dprintk(2,"sgl: oops - no page\n");
+nopage:
+       dprintk(2, "sgl: oops - no page\n");
        vfree(sglist);
        return NULL;
 
- highmem:
-       dprintk(2,"sgl: oops - highmem page\n");
+highmem:
+       dprintk(2, "sgl: oops - highmem page\n");
        vfree(sglist);
        return NULL;
 }
 
 /* --------------------------------------------------------------------- */
 
-struct videobuf_dmabuf *videobuf_to_dma (struct videobuf_buffer *buf)
+struct videobuf_dmabuf *videobuf_to_dma(struct videobuf_buffer *buf)
 {
        struct videobuf_dma_sg_memory *mem = buf->priv;
        BUG_ON(!mem);
@@ -126,17 +131,19 @@ struct videobuf_dmabuf *videobuf_to_dma (struct videobuf_buffer *buf)
 
        return &mem->dma;
 }
+EXPORT_SYMBOL_GPL(videobuf_to_dma);
 
 void videobuf_dma_init(struct videobuf_dmabuf *dma)
 {
-       memset(dma,0,sizeof(*dma));
+       memset(dma, 0, sizeof(*dma));
        dma->magic = MAGIC_DMABUF;
 }
+EXPORT_SYMBOL_GPL(videobuf_dma_init);
 
 static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma,
                        int direction, unsigned long data, unsigned long size)
 {
-       unsigned long first,last;
+       unsigned long first, last;
        int err, rw = 0;
 
        dma->direction = direction;
@@ -155,21 +162,21 @@ static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma,
        last  = ((data+size-1) & PAGE_MASK) >> PAGE_SHIFT;
        dma->offset   = data & ~PAGE_MASK;
        dma->nr_pages = last-first+1;
-       dma->pages = kmalloc(dma->nr_pages * sizeof(struct page*),
-                            GFP_KERNEL);
+       dma->pages = kmalloc(dma->nr_pages * sizeof(struct page *), GFP_KERNEL);
        if (NULL == dma->pages)
                return -ENOMEM;
-       dprintk(1,"init user [0x%lx+0x%lx => %d pages]\n",
-               data,size,dma->nr_pages);
 
-       err = get_user_pages(current,current->mm,
+       dprintk(1, "init user [0x%lx+0x%lx => %d pages]\n",
+               data, size, dma->nr_pages);
+
+       err = get_user_pages(current, current->mm,
                             data & PAGE_MASK, dma->nr_pages,
                             rw == READ, 1, /* force */
                             dma->pages, NULL);
 
        if (err != dma->nr_pages) {
                dma->nr_pages = (err >= 0) ? err : 0;
-               dprintk(1,"get_user_pages: err=%d [%d]\n",err,dma->nr_pages);
+               dprintk(1, "get_user_pages: err=%d [%d]\n", err, dma->nr_pages);
                return err < 0 ? err : -EINVAL;
        }
        return 0;
@@ -179,48 +186,58 @@ int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
                           unsigned long data, unsigned long size)
 {
        int ret;
+
        down_read(&current->mm->mmap_sem);
        ret = videobuf_dma_init_user_locked(dma, direction, data, size);
        up_read(&current->mm->mmap_sem);
 
        return ret;
 }
+EXPORT_SYMBOL_GPL(videobuf_dma_init_user);
 
 int videobuf_dma_init_kernel(struct videobuf_dmabuf *dma, int direction,
                             int nr_pages)
 {
-       dprintk(1,"init kernel [%d pages]\n",nr_pages);
+       dprintk(1, "init kernel [%d pages]\n", nr_pages);
+
        dma->direction = direction;
        dma->vmalloc = vmalloc_32(nr_pages << PAGE_SHIFT);
        if (NULL == dma->vmalloc) {
-               dprintk(1,"vmalloc_32(%d pages) failed\n",nr_pages);
+               dprintk(1, "vmalloc_32(%d pages) failed\n", nr_pages);
                return -ENOMEM;
        }
-       dprintk(1,"vmalloc is at addr 0x%08lx, size=%d\n",
+
+       dprintk(1, "vmalloc is at addr 0x%08lx, size=%d\n",
                                (unsigned long)dma->vmalloc,
                                nr_pages << PAGE_SHIFT);
-       memset(dma->vmalloc,0,nr_pages << PAGE_SHIFT);
+
+       memset(dma->vmalloc, 0, nr_pages << PAGE_SHIFT);
        dma->nr_pages = nr_pages;
+
        return 0;
 }
+EXPORT_SYMBOL_GPL(videobuf_dma_init_kernel);
 
 int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction,
                              dma_addr_t addr, int nr_pages)
 {
-       dprintk(1,"init overlay [%d pages @ bus 0x%lx]\n",
-               nr_pages,(unsigned long)addr);
+       dprintk(1, "init overlay [%d pages @ bus 0x%lx]\n",
+               nr_pages, (unsigned long)addr);
        dma->direction = direction;
+
        if (0 == addr)
                return -EINVAL;
 
        dma->bus_addr = addr;
        dma->nr_pages = nr_pages;
+
        return 0;
 }
+EXPORT_SYMBOL_GPL(videobuf_dma_init_overlay);
 
-int videobuf_dma_map(struct videobuf_queue* q, struct videobuf_dmabuf *dma)
+int videobuf_dma_map(struct videobuf_queue *q, struct videobuf_dmabuf *dma)
 {
-       MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
+       MAGIC_CHECK(dma->magic, MAGIC_DMABUF);
        BUG_ON(0 == dma->nr_pages);
 
        if (dma->pages) {
@@ -228,20 +245,21 @@ int videobuf_dma_map(struct videobuf_queue* q, struct videobuf_dmabuf *dma)
                                                   dma->offset);
        }
        if (dma->vmalloc) {
-               dma->sglist = videobuf_vmalloc_to_sg
-                                               (dma->vmalloc,dma->nr_pages);
+               dma->sglist = videobuf_vmalloc_to_sg(dma->vmalloc,
+                                                    dma->nr_pages);
        }
        if (dma->bus_addr) {
                dma->sglist = vmalloc(sizeof(*dma->sglist));
                if (NULL != dma->sglist) {
-                       dma->sglen  = 1;
-                       sg_dma_address(&dma->sglist[0]) = dma->bus_addr & PAGE_MASK;
-                       dma->sglist[0].offset           = dma->bus_addr & ~PAGE_MASK;
-                       sg_dma_len(&dma->sglist[0])     = dma->nr_pages * PAGE_SIZE;
+                       dma->sglen = 1;
+                       sg_dma_address(&dma->sglist[0]) = dma->bus_addr
+                                                       & PAGE_MASK;
+                       dma->sglist[0].offset = dma->bus_addr & ~PAGE_MASK;
+                       sg_dma_len(&dma->sglist[0]) = dma->nr_pages * PAGE_SIZE;
                }
        }
        if (NULL == dma->sglist) {
-               dprintk(1,"scatterlist is NULL\n");
+               dprintk(1, "scatterlist is NULL\n");
                return -ENOMEM;
        }
        if (!dma->bus_addr) {
@@ -249,47 +267,43 @@ int videobuf_dma_map(struct videobuf_queue* q, struct videobuf_dmabuf *dma)
                                        dma->nr_pages, dma->direction);
                if (0 == dma->sglen) {
                        printk(KERN_WARNING
-                              "%s: videobuf_map_sg failed\n",__func__);
+                              "%s: videobuf_map_sg failed\n", __func__);
                        vfree(dma->sglist);
                        dma->sglist = NULL;
                        dma->sglen = 0;
                        return -ENOMEM;
                }
        }
-       return 0;
-}
-
-int videobuf_dma_sync(struct videobuf_queue *q, struct videobuf_dmabuf *dma)
-{
-       MAGIC_CHECK(dma->magic, MAGIC_DMABUF);
-       BUG_ON(!dma->sglen);
 
-       dma_sync_sg_for_cpu(q->dev, dma->sglist, dma->nr_pages, dma->direction);
        return 0;
 }
+EXPORT_SYMBOL_GPL(videobuf_dma_map);
 
-int videobuf_dma_unmap(struct videobuf_queue* q,struct videobuf_dmabuf *dma)
+int videobuf_dma_unmap(struct videobuf_queue *q, struct videobuf_dmabuf *dma)
 {
        MAGIC_CHECK(dma->magic, MAGIC_DMABUF);
+
        if (!dma->sglen)
                return 0;
 
-       dma_unmap_sg(q->dev, dma->sglist, dma->nr_pages, dma->direction);
+       dma_unmap_sg(q->dev, dma->sglist, dma->sglen, dma->direction);
 
        vfree(dma->sglist);
        dma->sglist = NULL;
        dma->sglen = 0;
+
        return 0;
 }
+EXPORT_SYMBOL_GPL(videobuf_dma_unmap);
 
 int videobuf_dma_free(struct videobuf_dmabuf *dma)
 {
-       MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
+       int i;
+       MAGIC_CHECK(dma->magic, MAGIC_DMABUF);
        BUG_ON(dma->sglen);
 
        if (dma->pages) {
-               int i;
-               for (i=0; i < dma->nr_pages; i++)
+               for (i = 0; i < dma->nr_pages; i++)
                        page_cache_release(dma->pages[i]);
                kfree(dma->pages);
                dma->pages = NULL;
@@ -298,12 +312,13 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)
        vfree(dma->vmalloc);
        dma->vmalloc = NULL;
 
-       if (dma->bus_addr) {
+       if (dma->bus_addr)
                dma->bus_addr = 0;
-       }
        dma->direction = DMA_NONE;
+
        return 0;
 }
+EXPORT_SYMBOL_GPL(videobuf_dma_free);
 
 /* --------------------------------------------------------------------- */
 
@@ -315,6 +330,7 @@ int videobuf_sg_dma_map(struct device *dev, struct videobuf_dmabuf *dma)
 
        return videobuf_dma_map(&q, dma);
 }
+EXPORT_SYMBOL_GPL(videobuf_sg_dma_map);
 
 int videobuf_sg_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma)
 {
@@ -324,49 +340,48 @@ int videobuf_sg_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma)
 
        return videobuf_dma_unmap(&q, dma);
 }
+EXPORT_SYMBOL_GPL(videobuf_sg_dma_unmap);
 
 /* --------------------------------------------------------------------- */
 
-static void
-videobuf_vm_open(struct vm_area_struct *vma)
+static void videobuf_vm_open(struct vm_area_struct *vma)
 {
        struct videobuf_mapping *map = vma->vm_private_data;
 
-       dprintk(2,"vm_open %p [count=%d,vma=%08lx-%08lx]\n",map,
-               map->count,vma->vm_start,vma->vm_end);
+       dprintk(2, "vm_open %p [count=%d,vma=%08lx-%08lx]\n", map,
+               map->count, vma->vm_start, vma->vm_end);
+
        map->count++;
 }
 
-static void
-videobuf_vm_close(struct vm_area_struct *vma)
+static void videobuf_vm_close(struct vm_area_struct *vma)
 {
        struct videobuf_mapping *map = vma->vm_private_data;
        struct videobuf_queue *q = map->q;
        struct videobuf_dma_sg_memory *mem;
        int i;
 
-       dprintk(2,"vm_close %p [count=%d,vma=%08lx-%08lx]\n",map,
-               map->count,vma->vm_start,vma->vm_end);
+       dprintk(2, "vm_close %p [count=%d,vma=%08lx-%08lx]\n", map,
+               map->count, vma->vm_start, vma->vm_end);
 
        map->count--;
        if (0 == map->count) {
-               dprintk(1,"munmap %p q=%p\n",map,q);
+               dprintk(1, "munmap %p q=%p\n", map, q);
                mutex_lock(&q->vb_lock);
                for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                        if (NULL == q->bufs[i])
                                continue;
-                       mem=q->bufs[i]->priv;
-
+                       mem = q->bufs[i]->priv;
                        if (!mem)
                                continue;
 
-                       MAGIC_CHECK(mem->magic,MAGIC_SG_MEM);
+                       MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);
 
                        if (q->bufs[i]->map != map)
                                continue;
                        q->bufs[i]->map   = NULL;
                        q->bufs[i]->baddr = 0;
-                       q->ops->buf_release(q,q->bufs[i]);
+                       q->ops->buf_release(q, q->bufs[i]);
                }
                mutex_unlock(&q->vb_lock);
                kfree(map);
@@ -380,26 +395,27 @@ videobuf_vm_close(struct vm_area_struct *vma)
  * now ...).  Bounce buffers don't work very well for the data rates
  * video capture has.
  */
-static int
-videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        struct page *page;
 
-       dprintk(3,"fault: fault @ %08lx [vma %08lx-%08lx]\n",
-               (unsigned long)vmf->virtual_address,vma->vm_start,vma->vm_end);
+       dprintk(3, "fault: fault @ %08lx [vma %08lx-%08lx]\n",
+               (unsigned long)vmf->virtual_address,
+               vma->vm_start, vma->vm_end);
+
        page = alloc_page(GFP_USER | __GFP_DMA32);
        if (!page)
                return VM_FAULT_OOM;
        clear_user_highpage(page, (unsigned long)vmf->virtual_address);
        vmf->page = page;
+
        return 0;
 }
 
-static const struct vm_operations_struct videobuf_vm_ops =
-{
-       .open     = videobuf_vm_open,
-       .close    = videobuf_vm_close,
-       .fault    = videobuf_vm_fault,
+static const struct vm_operations_struct videobuf_vm_ops = {
+       .open   = videobuf_vm_open,
+       .close  = videobuf_vm_close,
+       .fault  = videobuf_vm_fault,
 };
 
 /* ---------------------------------------------------------------------
@@ -412,28 +428,28 @@ static const struct vm_operations_struct videobuf_vm_ops =
        struct videobuf_dma_sg_memory
  */
 
-static void *__videobuf_alloc(size_t size)
+static struct videobuf_buffer *__videobuf_alloc(size_t size)
 {
        struct videobuf_dma_sg_memory *mem;
        struct videobuf_buffer *vb;
 
-       vb = kzalloc(size+sizeof(*mem),GFP_KERNEL);
+       vb = kzalloc(size + sizeof(*mem), GFP_KERNEL);
        if (!vb)
                return vb;
 
-       mem = vb->priv = ((char *)vb)+size;
-       mem->magic=MAGIC_SG_MEM;
+       mem = vb->priv = ((char *)vb) + size;
+       mem->magic = MAGIC_SG_MEM;
 
        videobuf_dma_init(&mem->dma);
 
-       dprintk(1,"%s: allocated at %p(%ld+%ld) & %p(%ld)\n",
-               __func__,vb,(long)sizeof(*vb),(long)size-sizeof(*vb),
-               mem,(long)sizeof(*mem));
+       dprintk(1, "%s: allocated at %p(%ld+%ld) & %p(%ld)\n",
+               __func__, vb, (long)sizeof(*vb), (long)size - sizeof(*vb),
+               mem, (long)sizeof(*mem));
 
        return vb;
 }
 
-static void *__videobuf_to_vmalloc (struct videobuf_buffer *buf)
+static void *__videobuf_to_vaddr(struct videobuf_buffer *buf)
 {
        struct videobuf_dma_sg_memory *mem = buf->priv;
        BUG_ON(!mem);
@@ -443,11 +459,11 @@ static void *__videobuf_to_vmalloc (struct videobuf_buffer *buf)
        return mem->dma.vmalloc;
 }
 
-static int __videobuf_iolock (struct videobuf_queue* q,
-                             struct videobuf_buffer *vb,
-                             struct v4l2_framebuffer *fbuf)
+static int __videobuf_iolock(struct videobuf_queue *q,
+                            struct videobuf_buffer *vb,
+                            struct v4l2_framebuffer *fbuf)
 {
-       int err,pages;
+       int err, pages;
        dma_addr_t bus;
        struct videobuf_dma_sg_memory *mem = vb->priv;
        BUG_ON(!mem);
@@ -460,16 +476,16 @@ static int __videobuf_iolock (struct videobuf_queue* q,
                if (0 == vb->baddr) {
                        /* no userspace addr -- kernel bounce buffer */
                        pages = PAGE_ALIGN(vb->size) >> PAGE_SHIFT;
-                       err = videobuf_dma_init_kernel( &mem->dma,
-                                                       DMA_FROM_DEVICE,
-                                                       pages );
+                       err = videobuf_dma_init_kernel(&mem->dma,
+                                                      DMA_FROM_DEVICE,
+                                                      pages);
                        if (0 != err)
                                return err;
                } else if (vb->memory == V4L2_MEMORY_USERPTR) {
                        /* dma directly to userspace */
-                       err = videobuf_dma_init_user( &mem->dma,
-                                                     DMA_FROM_DEVICE,
-                                                     vb->baddr,vb->bsize );
+                       err = videobuf_dma_init_user(&mem->dma,
+                                                    DMA_FROM_DEVICE,
+                                                    vb->baddr, vb->bsize);
                        if (0 != err)
                                return err;
                } else {
@@ -515,43 +531,27 @@ static int __videobuf_sync(struct videobuf_queue *q,
                           struct videobuf_buffer *buf)
 {
        struct videobuf_dma_sg_memory *mem = buf->priv;
-       BUG_ON(!mem);
-       MAGIC_CHECK(mem->magic,MAGIC_SG_MEM);
+       BUG_ON(!mem || !mem->dma.sglen);
 
-       return  videobuf_dma_sync(q,&mem->dma);
-}
-
-static int __videobuf_mmap_free(struct videobuf_queue *q)
-{
-       int i;
+       MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);
+       MAGIC_CHECK(mem->dma.magic, MAGIC_DMABUF);
 
-       for (i = 0; i < VIDEO_MAX_FRAME; i++) {
-               if (q->bufs[i]) {
-                       if (q->bufs[i]->map)
-                               return -EBUSY;
-               }
-       }
+       dma_sync_sg_for_cpu(q->dev, mem->dma.sglist,
+                           mem->dma.sglen, mem->dma.direction);
 
        return 0;
 }
 
 static int __videobuf_mmap_mapper(struct videobuf_queue *q,
-                        struct vm_area_struct *vma)
+                                 struct videobuf_buffer *buf,
+                                 struct vm_area_struct *vma)
 {
-       struct videobuf_dma_sg_memory *mem;
+       struct videobuf_dma_sg_memory *mem = buf->priv;
        struct videobuf_mapping *map;
-       unsigned int first,last,size,i;
+       unsigned int first, last, size = 0, i;
        int retval;
 
        retval = -EINVAL;
-       if (!(vma->vm_flags & VM_WRITE)) {
-               dprintk(1,"mmap app bug: PROT_WRITE please\n");
-               goto done;
-       }
-       if (!(vma->vm_flags & VM_SHARED)) {
-               dprintk(1,"mmap app bug: MAP_SHARED please\n");
-               goto done;
-       }
 
        /* This function maintains backwards compatibility with V4L1 and will
         * map more than one buffer if the vma length is equal to the combined
@@ -561,48 +561,52 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
         * TODO: Allow drivers to specify if they support this mode
         */
 
+       BUG_ON(!mem);
+       MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);
+
        /* look for first buffer to map */
        for (first = 0; first < VIDEO_MAX_FRAME; first++) {
-               if (NULL == q->bufs[first])
-                       continue;
-               mem=q->bufs[first]->priv;
-               BUG_ON(!mem);
-               MAGIC_CHECK(mem->magic,MAGIC_SG_MEM);
-
-               if (V4L2_MEMORY_MMAP != q->bufs[first]->memory)
-                       continue;
-               if (q->bufs[first]->boff == (vma->vm_pgoff << PAGE_SHIFT))
+               if (buf == q->bufs[first]) {
+                       size = PAGE_ALIGN(q->bufs[first]->bsize);
                        break;
+               }
        }
-       if (VIDEO_MAX_FRAME == first) {
-               dprintk(1,"mmap app bug: offset invalid [offset=0x%lx]\n",
-                       (vma->vm_pgoff << PAGE_SHIFT));
+
+       /* paranoia, should never happen since buf is always valid. */
+       if (!size) {
+               dprintk(1, "mmap app bug: offset invalid [offset=0x%lx]\n",
+                               (vma->vm_pgoff << PAGE_SHIFT));
                goto done;
        }
 
-       /* look for last buffer to map */
-       for (size = 0, last = first; last < VIDEO_MAX_FRAME; last++) {
-               if (NULL == q->bufs[last])
-                       continue;
-               if (V4L2_MEMORY_MMAP != q->bufs[last]->memory)
-                       continue;
-               if (q->bufs[last]->map) {
-                       retval = -EBUSY;
+       last = first;
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       if (size != (vma->vm_end - vma->vm_start)) {
+               /* look for last buffer to map */
+               for (last = first + 1; last < VIDEO_MAX_FRAME; last++) {
+                       if (NULL == q->bufs[last])
+                               continue;
+                       if (V4L2_MEMORY_MMAP != q->bufs[last]->memory)
+                               continue;
+                       if (q->bufs[last]->map) {
+                               retval = -EBUSY;
+                               goto done;
+                       }
+                       size += PAGE_ALIGN(q->bufs[last]->bsize);
+                       if (size == (vma->vm_end - vma->vm_start))
+                               break;
+               }
+               if (VIDEO_MAX_FRAME == last) {
+                       dprintk(1, "mmap app bug: size invalid [size=0x%lx]\n",
+                                       (vma->vm_end - vma->vm_start));
                        goto done;
                }
-               size += PAGE_ALIGN(q->bufs[last]->bsize);
-               if (size == (vma->vm_end - vma->vm_start))
-                       break;
-       }
-       if (VIDEO_MAX_FRAME == last) {
-               dprintk(1,"mmap app bug: size invalid [size=0x%lx]\n",
-                       (vma->vm_end - vma->vm_start));
-               goto done;
        }
+#endif
 
        /* create mapping + update buffer list */
        retval = -ENOMEM;
-       map = kmalloc(sizeof(struct videobuf_mapping),GFP_KERNEL);
+       map = kmalloc(sizeof(struct videobuf_mapping), GFP_KERNEL);
        if (NULL == map)
                goto done;
 
@@ -623,72 +627,22 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
        vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
        vma->vm_flags &= ~VM_IO; /* using shared anonymous pages */
        vma->vm_private_data = map;
-       dprintk(1,"mmap %p: q=%p %08lx-%08lx pgoff %08lx bufs %d-%d\n",
-               map,q,vma->vm_start,vma->vm_end,vma->vm_pgoff,first,last);
+       dprintk(1, "mmap %p: q=%p %08lx-%08lx pgoff %08lx bufs %d-%d\n",
+               map, q, vma->vm_start, vma->vm_end, vma->vm_pgoff, first, last);
        retval = 0;
 
- done:
+done:
        return retval;
 }
 
-static int __videobuf_copy_to_user ( struct videobuf_queue *q,
-                               char __user *data, size_t count,
-                               int nonblocking )
-{
-       struct videobuf_dma_sg_memory *mem = q->read_buf->priv;
-       BUG_ON(!mem);
-       MAGIC_CHECK(mem->magic,MAGIC_SG_MEM);
-
-       /* copy to userspace */
-       if (count > q->read_buf->size - q->read_off)
-               count = q->read_buf->size - q->read_off;
-
-       if (copy_to_user(data, mem->dma.vmalloc+q->read_off, count))
-               return -EFAULT;
-
-       return count;
-}
-
-static int __videobuf_copy_stream ( struct videobuf_queue *q,
-                               char __user *data, size_t count, size_t pos,
-                               int vbihack, int nonblocking )
-{
-       unsigned int  *fc;
-       struct videobuf_dma_sg_memory *mem = q->read_buf->priv;
-       BUG_ON(!mem);
-       MAGIC_CHECK(mem->magic,MAGIC_SG_MEM);
-
-       if (vbihack) {
-               /* dirty, undocumented hack -- pass the frame counter
-                       * within the last four bytes of each vbi data block.
-                       * We need that one to maintain backward compatibility
-                       * to all vbi decoding software out there ... */
-               fc  = (unsigned int*)mem->dma.vmalloc;
-               fc += (q->read_buf->size>>2) -1;
-               *fc = q->read_buf->field_count >> 1;
-               dprintk(1,"vbihack: %d\n",*fc);
-       }
-
-       /* copy stuff using the common method */
-       count = __videobuf_copy_to_user (q,data,count,nonblocking);
-
-       if ( (count==-EFAULT) && (0 == pos) )
-               return -EFAULT;
-
-       return count;
-}
-
 static struct videobuf_qtype_ops sg_ops = {
        .magic        = MAGIC_QTYPE_OPS,
 
        .alloc        = __videobuf_alloc,
        .iolock       = __videobuf_iolock,
        .sync         = __videobuf_sync,
-       .mmap_free    = __videobuf_mmap_free,
        .mmap_mapper  = __videobuf_mmap_mapper,
-       .video_copy_to_user = __videobuf_copy_to_user,
-       .copy_stream  = __videobuf_copy_stream,
-       .vmalloc      = __videobuf_to_vmalloc,
+       .vaddr        = __videobuf_to_vaddr,
 };
 
 void *videobuf_sg_alloc(size_t size)
@@ -702,8 +656,9 @@ void *videobuf_sg_alloc(size_t size)
 
        return videobuf_alloc(&q);
 }
+EXPORT_SYMBOL_GPL(videobuf_sg_alloc);
 
-void videobuf_queue_sg_init(struct videobuf_queue* q,
+void videobuf_queue_sg_init(struct videobuf_queue *q,
                         const struct videobuf_queue_ops *ops,
                         struct device *dev,
                         spinlock_t *irqlock,
@@ -715,29 +670,5 @@ void videobuf_queue_sg_init(struct videobuf_queue* q,
        videobuf_queue_core_init(q, ops, dev, irqlock, type, field, msize,
                                 priv, &sg_ops);
 }
-
-/* --------------------------------------------------------------------- */
-
-EXPORT_SYMBOL_GPL(videobuf_vmalloc_to_sg);
-
-EXPORT_SYMBOL_GPL(videobuf_to_dma);
-EXPORT_SYMBOL_GPL(videobuf_dma_init);
-EXPORT_SYMBOL_GPL(videobuf_dma_init_user);
-EXPORT_SYMBOL_GPL(videobuf_dma_init_kernel);
-EXPORT_SYMBOL_GPL(videobuf_dma_init_overlay);
-EXPORT_SYMBOL_GPL(videobuf_dma_map);
-EXPORT_SYMBOL_GPL(videobuf_dma_sync);
-EXPORT_SYMBOL_GPL(videobuf_dma_unmap);
-EXPORT_SYMBOL_GPL(videobuf_dma_free);
-
-EXPORT_SYMBOL_GPL(videobuf_sg_dma_map);
-EXPORT_SYMBOL_GPL(videobuf_sg_dma_unmap);
-EXPORT_SYMBOL_GPL(videobuf_sg_alloc);
-
 EXPORT_SYMBOL_GPL(videobuf_queue_sg_init);
 
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */