From: Bryan Wu <cooloney@kernel.org>
To: laurent.pinchart@skynet.be, linux-uvc-devel@lists.berlios.de,
video4linux-list@redhat.com
Cc: linux-kernel@vger.kernel.org,
Michael Hennerich <michael.hennerich@analog.com>,
Bryan Wu <cooloney@kernel.org>
Subject: [PATCH] Video/UVC: Port mainlined uvc video driver to NOMMU
Date: Thu, 6 Nov 2008 17:18:50 +0800 [thread overview]
Message-ID: <1225963130-6784-1-git-send-email-cooloney@kernel.org> (raw)
From: Michael Hennerich <michael.hennerich@analog.com>
Add NOMMU mmap support.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
drivers/media/video/uvc/uvc_v4l2.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 758dfef..2237f5e 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -1050,6 +1050,7 @@ static int uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
break;
}
+#ifdef CONFIG_MMU
if (i == video->queue.count || size != video->queue.buf_size) {
ret = -EINVAL;
goto done;
@@ -1071,7 +1072,20 @@ static int uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
addr += PAGE_SIZE;
size -= PAGE_SIZE;
}
+#else
+ if (i == video->queue.count ||
+ PAGE_ALIGN(size) != video->queue.buf_size) {
+ ret = -EINVAL;
+ goto done;
+ }
+
+ vma->vm_flags |= VM_IO | VM_MAYSHARE; /* documentation/nommu-mmap.txt */
+
+ addr = (unsigned long)video->queue.mem + buffer->buf.m.offset;
+ vma->vm_start = addr;
+ vma->vm_end = addr + video->queue.buf_size;
+#endif
vma->vm_ops = &uvc_vm_ops;
vma->vm_private_data = buffer;
uvc_vm_open(vma);
--
1.5.6.3
next reply other threads:[~2008-11-06 9:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-06 9:18 Bryan Wu [this message]
2008-11-09 21:22 ` [PATCH] Video/UVC: Port mainlined uvc video driver to NOMMU Laurent Pinchart
2008-11-10 11:30 ` Hennerich, Michael
2008-11-13 23:52 ` Laurent Pinchart
2008-11-18 12:40 ` Hennerich, Michael
2008-11-18 13:39 ` Paul Mundt
2009-02-05 9:10 ` Bryan Wu
2009-02-05 17:12 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1225963130-6784-1-git-send-email-cooloney@kernel.org \
--to=cooloney@kernel.org \
--cc=laurent.pinchart@skynet.be \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-uvc-devel@lists.berlios.de \
--cc=michael.hennerich@analog.com \
--cc=video4linux-list@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox