Diff
Modified: trunk/drivers/media/video/uvc/uvc_v4l2.c (9702 => 9703)
--- trunk/drivers/media/video/uvc/uvc_v4l2.c 2011-03-09 09:21:35 UTC (rev 9702)
+++ trunk/drivers/media/video/uvc/uvc_v4l2.c 2011-03-09 10:20:23 UTC (rev 9703)
@@ -1084,6 +1084,39 @@
return uvc_queue_poll(&stream->queue, file, wait);
}
+#ifndef CONFIG_MMU
+static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
+ unsigned long addr, unsigned long len, unsigned long pgoff,
+ unsigned long flags)
+{
+ struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
+ struct uvc_streaming *stream = handle->stream;
+ struct uvc_video_queue *queue = &stream->queue;
+ struct uvc_buffer *uninitialized_var(buffer);
+ unsigned int i;
+ int ret = 0;
+
+ mutex_lock(&queue->mutex);
+ for (i = 0; i < queue->count; ++i) {
+ buffer = &queue->buffer[i];
+ if ((buffer->buf.m.offset >> PAGE_SHIFT) == pgoff)
+ break;
+ }
+
+ if (i == queue->count ||
+ PAGE_ALIGN(len) != queue->buf_size) {
+ ret = -EINVAL;
+ goto done;
+ }
+
+ addr = (unsigned long)queue->mem + buffer->buf.m.offset;
+ ret = addr;
+done:
+ mutex_unlock(&queue->mutex);
+ return ret;
+}
+#endif
+
const struct v4l2_file_operations uvc_fops = {
.owner = THIS_MODULE,
.open = uvc_v4l2_open,
@@ -1092,5 +1125,8 @@
.read = uvc_v4l2_read,
.mmap = uvc_v4l2_mmap,
.poll = uvc_v4l2_poll,
+#ifndef CONFIG_MMU
+ .get_unmapped_area = uvc_v4l2_get_unmapped_area,
+#endif
};
Modified: trunk/drivers/media/video/v4l2-dev.c (9702 => 9703)
--- trunk/drivers/media/video/v4l2-dev.c 2011-03-09 09:21:35 UTC (rev 9702)
+++ trunk/drivers/media/video/v4l2-dev.c 2011-03-09 10:20:23 UTC (rev 9703)
@@ -299,6 +299,21 @@
return ret;
}
+#ifndef CONFIG_MMU
+static unsigned long v4l2_get_unmapped_area(struct file *filp,
+ unsigned long addr, unsigned long len, unsigned long pgoff,
+ unsigned long flags)
+{
+ struct video_device *vdev = video_devdata(filp);
+
+ if (!vdev->fops->get_unmapped_area)
+ return -ENOSYS;
+ if (!video_is_registered(vdev))
+ return -ENODEV;
+ return vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags);
+}
+#endif
+
/* Override for the open function */
static int v4l2_open(struct inode *inode, struct file *filp)
{
@@ -362,6 +377,9 @@
.write = v4l2_write,
.open = v4l2_open,
.mmap = v4l2_mmap,
+#ifndef CONFIG_MMU
+ .get_unmapped_area = v4l2_get_unmapped_area,
+#endif
.unlocked_ioctl = v4l2_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = v4l2_compat_ioctl32,
Modified: trunk/drivers/usb/gadget/uvc_queue.c (9702 => 9703)
--- trunk/drivers/usb/gadget/uvc_queue.c 2011-03-09 09:21:35 UTC (rev 9702)
+++ trunk/drivers/usb/gadget/uvc_queue.c 2011-03-09 10:20:23 UTC (rev 9703)
@@ -431,6 +431,7 @@
break;
}
+#ifdef CONFIG_MMU
if (i == queue->count || size != queue->buf_size) {
ret = -EINVAL;
goto done;
@@ -452,7 +453,21 @@
addr += PAGE_SIZE;
size -= PAGE_SIZE;
}
+#else
+ if (i == queue->count ||
+ PAGE_ALIGN(size) != queue->buf_size) {
+ ret = -EINVAL;
+ goto done;
+ }
+ /* documentation/nommu-mmap.txt */
+ vma->vm_flags |= VM_IO | VM_MAYSHARE;
+
+ addr = (unsigned long)queue->mem + buffer->buf.m.offset;
+ vma->vm_start = addr;
+ vma->vm_end = addr + queue->buf_size;
+#endif
+
vma->vm_ops = &uvc_vm_ops;
vma->vm_private_data = buffer;
uvc_vm_open(vma);
Modified: trunk/include/media/v4l2-dev.h (9702 => 9703)
--- trunk/include/media/v4l2-dev.h 2011-03-09 09:21:35 UTC (rev 9702)
+++ trunk/include/media/v4l2-dev.h 2011-03-09 10:20:23 UTC (rev 9703)
@@ -42,6 +42,8 @@
long (*ioctl) (struct file *, unsigned int, unsigned long);
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
int (*mmap) (struct file *, struct vm_area_struct *);
+ unsigned long (*get_unmapped_area) (struct file *, unsigned long,
+ unsigned long, unsigned long, unsigned long);
int (*open) (struct file *);
int (*release) (struct file *);
};
