libv4l: initial support for compiling on FreeBSD

From: Hans Petter Selasky <hselasky@freebsd.org>

Add a patch by Hans Petter Selasky <hselasky@freebsd.org>, which should
lead to allowing use of libv4l (and the Linux webcam drivers ported
to userspace usb drivers) on FreeBSd, this is a work in progress

Priority: normal

Signed-off-by: Hans Petter Selasky <hselasky@freebsd.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

4 files changed, 51 insertions, 67 deletions

diff --git a/v4l2-apps/libv4l/libv4l2/libv4l2-priv.h b/v4l2-apps/libv4l/libv4l2/libv4l2-priv.h
index 8724832e1..0bfd53e2a 100644
--- a/v4l2-apps/libv4l/libv4l2/libv4l2-priv.h
+++ b/v4l2-apps/libv4l/libv4l2/libv4l2-priv.h
@@ -23,14 +23,7 @@
 #include <pthread.h>
 #include <libv4lconvert.h> /* includes videodev2.h for us */
 
-/* On 32 bits archs we always use mmap2, on 64 bits archs there is no mmap2 */
-#ifdef __NR_mmap2
-#define SYS_mmap2 __NR_mmap2
-#define MMAP2_PAGE_SHIFT 12
-#else
-#define SYS_mmap2 SYS_mmap
-#define MMAP2_PAGE_SHIFT 0
-#endif
+#include "../libv4lconvert/libv4lsyscall-priv.h"
 
 #define V4L2_MAX_DEVICES 16
 /* Warning when making this larger the frame_queued and frame_mapped members of
diff --git a/v4l2-apps/libv4l/libv4l2/libv4l2.c b/v4l2-apps/libv4l/libv4l2/libv4l2.c
index 382dc405b..a12b41c2c 100644
--- a/v4l2-apps/libv4l/libv4l2/libv4l2.c
+++ b/v4l2-apps/libv4l/libv4l2/libv4l2.c
@@ -59,7 +59,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <syscall.h>
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
@@ -100,7 +99,7 @@ static int v4l2_request_read_buffers(int index)
 					  devices[index].nreadbuffers;
   req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   req.memory = V4L2_MEMORY_MMAP;
-  if ((result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_REQBUFS, &req)) < 0){
+  if ((result = SYS_IOCTL(devices[index].fd, VIDIOC_REQBUFS, &req)) < 0){
     int saved_err = errno;
     V4L2_LOG_ERR("requesting %u buffers: %s\n", req.count, strerror(errno));
     errno = saved_err;
@@ -127,7 +126,7 @@ static void v4l2_unrequest_read_buffers(int index)
   req.count = 0;
   req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   req.memory = V4L2_MEMORY_MMAP;
-  if(syscall(SYS_ioctl, devices[index].fd, VIDIOC_REQBUFS, &req) < 0)
+  if(SYS_IOCTL(devices[index].fd, VIDIOC_REQBUFS, &req) < 0)
     return;
 
   devices[index].no_frames = MIN(req.count, V4L2_MAX_NO_FRAMES);
@@ -148,7 +147,7 @@ static int v4l2_map_buffers(int index)
     buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     buf.memory = V4L2_MEMORY_MMAP;
     buf.index = i;
-    result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_QUERYBUF, &buf);
+    result = SYS_IOCTL(devices[index].fd, VIDIOC_QUERYBUF, &buf);
     if (result) {
       int saved_err = errno;
       V4L2_LOG_ERR("querying buffer %u: %s\n", i, strerror(errno));
@@ -156,9 +155,9 @@ static int v4l2_map_buffers(int index)
       break;
     }
 
-    devices[index].frame_pointers[i] = (void *)syscall(SYS_mmap2, NULL,
+    devices[index].frame_pointers[i] = (void *)SYS_MMAP(NULL,
       (size_t)buf.length, PROT_READ|PROT_WRITE, MAP_SHARED, devices[index].fd,
-      (__off_t)(buf.m.offset >> MMAP2_PAGE_SHIFT));
+      buf.m.offset);
     if (devices[index].frame_pointers[i] == MAP_FAILED) {
       int saved_err = errno;
       V4L2_LOG_ERR("mmapping buffer %u: %s\n", i, strerror(errno));
@@ -182,7 +181,7 @@ static void v4l2_unmap_buffers(int index)
   /* unmap the buffers */
   for (i = 0; i < devices[index].no_frames; i++) {
     if (devices[index].frame_pointers[i] != MAP_FAILED) {
-      syscall(SYS_munmap, devices[index].frame_pointers[i],
+      SYS_MUNMAP(devices[index].frame_pointers[i],
 	      devices[index].frame_sizes[i]);
       devices[index].frame_pointers[i] = MAP_FAILED;
       V4L2_LOG("unmapped buffer %u\n", i);
@@ -196,7 +195,7 @@ static int v4l2_streamon(int index)
   enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
   if (!(devices[index].flags & V4L2_STREAMON)) {
-    if ((result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_STREAMON,
+    if ((result = SYS_IOCTL(devices[index].fd, VIDIOC_STREAMON,
 			  &type))) {
       int saved_err = errno;
       V4L2_LOG_ERR("turning on stream: %s\n", strerror(errno));
@@ -215,7 +214,7 @@ static int v4l2_streamoff(int index)
   enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
   if (devices[index].flags & V4L2_STREAMON) {
-    if ((result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_STREAMOFF,
+    if ((result = SYS_IOCTL(devices[index].fd, VIDIOC_STREAMOFF,
 			  &type))) {
       int saved_err = errno;
       V4L2_LOG_ERR("turning off stream: %s\n", strerror(errno));
@@ -243,7 +242,7 @@ static int v4l2_queue_read_buffer(int index, int buffer_index)
   buf.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   buf.memory = V4L2_MEMORY_MMAP;
   buf.index  = buffer_index;
-  if ((result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_QBUF, &buf))) {
+  if ((result = SYS_IOCTL(devices[index].fd, VIDIOC_QBUF, &buf))) {
     int saved_err = errno;
     V4L2_LOG_ERR("queuing buf %d: %s\n", buffer_index, strerror(errno));
     errno = saved_err;
@@ -265,7 +264,7 @@ static int v4l2_dequeue_and_convert(int index, struct v4l2_buffer *buf,
     return result;
 
   do {
-    if ((result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_DQBUF, buf))) {
+    if ((result = SYS_IOCTL(devices[index].fd, VIDIOC_DQBUF, buf))) {
       if (errno != EAGAIN) {
 	int saved_err = errno;
 	V4L2_LOG_ERR("dequeuing buf: %s\n", strerror(errno));
@@ -386,7 +385,7 @@ static int v4l2_buffers_mapped(int index)
       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
       buf.memory = V4L2_MEMORY_MMAP;
       buf.index = i;
-      if (syscall(SYS_ioctl, devices[index].fd, VIDIOC_QUERYBUF, &buf)) {
+      if (SYS_IOCTL(devices[index].fd, VIDIOC_QUERYBUF, &buf)) {
 	int saved_err = errno;
 	V4L2_LOG_ERR("querying buffer %u: %s\n", i, strerror(errno));
 	errno = saved_err;
@@ -422,12 +421,12 @@ int v4l2_open (const char *file, int oflag, ...)
     va_start (ap, oflag);
     mode = va_arg (ap, mode_t);
 
-    fd = syscall(SYS_open, file, oflag, mode);
+    fd = SYS_OPEN(file, oflag, mode);
 
     va_end(ap);
   }
   else
-    fd = syscall(SYS_open, file, oflag);
+    fd = SYS_OPEN(file, oflag, 0);
   /* end of original open code */
 
   if (fd == -1)
@@ -435,7 +434,7 @@ int v4l2_open (const char *file, int oflag, ...)
 
   if (v4l2_fd_open(fd, 0) == -1) {
     int saved_err = errno;
-    syscall(SYS_close, fd);
+    SYS_CLOSE(fd);
     errno = saved_err;
     return -1;
   }
@@ -457,7 +456,7 @@ int v4l2_fd_open(int fd, int v4l2_flags)
     v4l2_log_file = fopen(lfname, "w");
 
   /* check that this is an v4l2 device */
-  if (syscall(SYS_ioctl, fd, VIDIOC_QUERYCAP, &cap)) {
+  if (SYS_IOCTL(fd, VIDIOC_QUERYCAP, &cap)) {
     int saved_err = errno;
     V4L2_LOG_ERR("getting capabilities: %s\n", strerror(errno));
     errno = saved_err;
@@ -472,7 +471,7 @@ int v4l2_fd_open(int fd, int v4l2_flags)
 
   /* Get current cam format */
   fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-  if (syscall(SYS_ioctl, fd, VIDIOC_G_FMT, &fmt)) {
+  if (SYS_IOCTL(fd, VIDIOC_G_FMT, &fmt)) {
     int saved_err = errno;
     V4L2_LOG_ERR("getting pixformat: %s\n", strerror(errno));
     errno = saved_err;
@@ -553,7 +552,7 @@ int v4l2_close(int fd)
   int index, result;
 
   if ((index = v4l2_get_index(fd)) == -1)
-    return syscall(SYS_close, fd);
+    return SYS_CLOSE(fd);
 
   /* Abuse stream_lock to stop 2 closes from racing and trying to free the
      resources twice */
@@ -571,7 +570,7 @@ int v4l2_close(int fd)
     if (v4l2_buffers_mapped(index))
       V4L2_LOG_WARN("v4l2 mmap buffers still mapped on close()\n");
     else
-      syscall(SYS_munmap, devices[index].convert_mmap_buf,
+      SYS_MUNMAP(devices[index].convert_mmap_buf,
 	      devices[index].no_frames * V4L2_FRAME_BUF_SIZE);
     devices[index].convert_mmap_buf = MAP_FAILED;
   }
@@ -585,7 +584,7 @@ int v4l2_close(int fd)
   /* Since we've marked the fd as no longer used, and freed the resources,
      redo the close in case it was interrupted */
   do {
-    result = syscall(SYS_close, fd);
+    result = SYS_CLOSE(fd);
   } while (result == -1 && errno == EINTR);
 
   V4L2_LOG("close: %d\n", fd);
@@ -622,7 +621,7 @@ static int v4l2_check_buffer_change_ok(int index)
   /* We may change from convert to non conversion mode and
      v4l2_unrequest_read_buffers may change the no_frames, so free the
      convert mmap buffer */
-  syscall(SYS_munmap, devices[index].convert_mmap_buf,
+  SYS_MUNMAP(devices[index].convert_mmap_buf,
     devices[index].no_frames * V4L2_FRAME_BUF_SIZE);
   devices[index].convert_mmap_buf = MAP_FAILED;
 
@@ -676,7 +675,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
   va_end (ap);
 
   if ((index = v4l2_get_index(fd)) == -1)
-    return syscall(SYS_ioctl, fd, request, arg);
+    return SYS_IOCTL(fd, request, arg);
 
   /* Appearantly the kernel and / or glibc ignore the 32 most significant bits
      when long = 64 bits, and some applications pass an int holding the req to
@@ -740,7 +739,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
   }
 
   if (!is_capture_request) {
-    result = syscall(SYS_ioctl, fd, request, arg);
+    result = SYS_IOCTL(fd, request, arg);
     saved_err = errno;
     v4l2_log_ioctl(request, arg, result);
     errno = saved_err;
@@ -787,7 +786,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
       {
 	struct v4l2_capability *cap = arg;
 
-	result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_QUERYCAP, cap);
+	result = SYS_IOCTL(devices[index].fd, VIDIOC_QUERYCAP, cap);
 	if (result == 0)
 	  /* We always support read() as we fake it using mmap mode */
 	  cap->capabilities |= V4L2_CAP_READWRITE;
@@ -838,7 +837,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
 	}
 
 	if (devices[index].flags & V4L2_DISABLE_CONVERSION) {
-	  result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_TRY_FMT,
+	  result = SYS_IOCTL(devices[index].fd, VIDIOC_TRY_FMT,
 			   dest_fmt);
 	  src_fmt = *dest_fmt;
 	} else {
@@ -878,7 +877,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
 	  break;
 
 	req_pix_fmt = src_fmt.fmt.pix;
-	result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_S_FMT, &src_fmt);
+	result = SYS_IOCTL(devices[index].fd, VIDIOC_S_FMT, &src_fmt);
 	if (result) {
 	  saved_err = errno;
 	  V4L2_LOG_ERR("setting pixformat: %s\n", strerror(errno));
@@ -928,7 +927,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
 	if (req->count > V4L2_MAX_NO_FRAMES)
 	  req->count = V4L2_MAX_NO_FRAMES;
 
-	result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_REQBUFS, req);
+	result = SYS_IOCTL(devices[index].fd, VIDIOC_REQBUFS, req);
 	if (result < 0)
 	  break;
 	result = 0; /* some drivers return the number of buffers on success */
@@ -948,7 +947,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
 
 	/* Do a real query even when converting to let the driver fill in
 	   things like buf->field */
-	result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_QUERYBUF, buf);
+	result = SYS_IOCTL(devices[index].fd, VIDIOC_QUERYBUF, buf);
 	if (result || !v4l2_needs_conversion(index))
 	  break;
 
@@ -971,7 +970,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
 	if ((result = v4l2_map_buffers(index)))
 	  break;
 
-      result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_QBUF, arg);
+      result = SYS_IOCTL(devices[index].fd, VIDIOC_QBUF, arg);
       break;
 
     case VIDIOC_DQBUF:
@@ -983,7 +982,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
 	    break;
 
 	if (!v4l2_needs_conversion(index)) {
-	  result = syscall(SYS_ioctl, devices[index].fd, VIDIOC_DQBUF, buf);
+	  result = SYS_IOCTL(devices[index].fd, VIDIOC_DQBUF, buf);
 	  if (result) {
 	    int saved_err = errno;
 	    V4L2_LOG_ERR("dequeuing buf: %s\n", strerror(errno));
@@ -996,7 +995,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
 	   but we need the buffer _now_ to write our converted data
 	   to it! */
 	if (devices[index].convert_mmap_buf == MAP_FAILED) {
-	  devices[index].convert_mmap_buf = (void *)syscall(SYS_mmap2, NULL,
+	  devices[index].convert_mmap_buf = (void *)SYS_MMAP(NULL,
 						   (size_t)(
 						     devices[index].no_frames *
 						     V4L2_FRAME_BUF_SIZE),
@@ -1041,7 +1040,7 @@ int v4l2_ioctl (int fd, unsigned long int request, ...)
       break;
 
     default:
-      result = syscall(SYS_ioctl, fd, request, arg);
+      result = SYS_IOCTL(fd, request, arg);
   }
 
   if (stream_needs_locking)
@@ -1062,7 +1061,7 @@ ssize_t v4l2_read (int fd, void* dest, size_t n)
   struct v4l2_buffer buf;
 
   if ((index = v4l2_get_index(fd)) == -1)
-    return syscall(SYS_read, fd, dest, n);
+    return SYS_READ(fd, dest, n);
 
   pthread_mutex_lock(&devices[index].stream_lock);
 
@@ -1070,7 +1069,7 @@ ssize_t v4l2_read (int fd, void* dest, size_t n)
      it */
   if ((devices[index].flags & V4L2_SUPPORTS_READ) &&
       !v4l2_needs_conversion(index)) {
-    result = syscall(SYS_read, fd, dest, n);
+    result = SYS_READ(fd, dest, n);
     goto leave;
   }
 
@@ -1099,7 +1098,7 @@ leave:
 }
 
 void *v4l2_mmap(void *start, size_t length, int prot, int flags, int fd,
-  __off64_t offset)
+  int64_t offset)
 {
   int index;
   unsigned int buffer_index;
@@ -1119,8 +1118,7 @@ void *v4l2_mmap(void *start, size_t length, int prot, int flags, int fd,
       return MAP_FAILED;
     }
 
-    return (void *)syscall(SYS_mmap2, start, length, prot, flags, fd,
-			   (__off_t)(offset >> MMAP2_PAGE_SHIFT));
+    return (void *)SYS_MMAP(start, length, prot, flags, fd, offset);
   }
 
   pthread_mutex_lock(&devices[index].stream_lock);
@@ -1135,7 +1133,7 @@ void *v4l2_mmap(void *start, size_t length, int prot, int flags, int fd,
   }
 
   if (devices[index].convert_mmap_buf == MAP_FAILED) {
-    devices[index].convert_mmap_buf = (void *)syscall(SYS_mmap2, NULL,
+    devices[index].convert_mmap_buf = (void *)SYS_MMAP(NULL,
 					     (size_t)(
 					       devices[index].no_frames *
 					       V4L2_FRAME_BUF_SIZE),
@@ -1208,7 +1206,7 @@ int v4l2_munmap(void *_start, size_t length)
 
   V4L2_LOG("v4l2 unknown munmap %p, %d\n", start, (int)length);
 
-  return syscall(SYS_munmap, _start, length);
+  return SYS_MUNMAP(_start, length);
 }
 
 /* Misc utility functions */
@@ -1218,7 +1216,7 @@ int v4l2_set_control(int fd, int cid, int value)
   struct v4l2_control ctrl = { .id = cid };
   int result;
 
-  if ((result = syscall(SYS_ioctl, fd, VIDIOC_QUERYCTRL, &qctrl)))
+  if ((result = SYS_IOCTL(fd, VIDIOC_QUERYCTRL, &qctrl)))
     return result;
 
   if (!(qctrl.flags & V4L2_CTRL_FLAG_DISABLED) &&
@@ -1229,7 +1227,7 @@ int v4l2_set_control(int fd, int cid, int value)
       ctrl.value = (value * (qctrl.maximum - qctrl.minimum) + 32767) / 65535 +
 		   qctrl.minimum;
 
-    result = syscall(SYS_ioctl, fd, VIDIOC_S_CTRL, &ctrl);
+    result = SYS_IOCTL(fd, VIDIOC_S_CTRL, &ctrl);
   }
 
   return result;
@@ -1240,13 +1238,13 @@ int v4l2_get_control(int fd, int cid)
   struct v4l2_queryctrl qctrl = { .id = cid };
   struct v4l2_control ctrl = { .id = cid };
 
-  if (syscall(SYS_ioctl, fd, VIDIOC_QUERYCTRL, &qctrl))
+  if (SYS_IOCTL(fd, VIDIOC_QUERYCTRL, &qctrl))
     return 0;
 
   if (qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
     return 0;
 
-  if (syscall(SYS_ioctl, fd, VIDIOC_G_CTRL, &ctrl))
+  if (SYS_IOCTL(fd, VIDIOC_G_CTRL, &ctrl))
     return 0;
 
   return ((ctrl.value - qctrl.minimum) * 65535 +
diff --git a/v4l2-apps/libv4l/libv4l2/log.c b/v4l2-apps/libv4l/libv4l2/log.c
index a08ae3554..86d71b64e 100644
--- a/v4l2-apps/libv4l/libv4l2/log.c
+++ b/v4l2-apps/libv4l/libv4l2/log.c
@@ -22,12 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <linux/ioctl.h>
-/* These headers are not needed by us, but by linux/videodev2.h,
-   which is broken on some systems and doesn't include them itself :( */
-#include <sys/time.h>
-#include <asm/types.h>
-/* end broken header workaround includes */
+#include "../libv4lconvert/libv4lsyscall-priv.h"
 #include <linux/videodev2.h>
 #include "libv4l2.h"
 #include "libv4l2-priv.h"
diff --git a/v4l2-apps/libv4l/libv4l2/v4l2convert.c b/v4l2-apps/libv4l/libv4l2/v4l2convert.c
index b1354772d..4b75a5ebf 100644
--- a/v4l2-apps/libv4l/libv4l2/v4l2convert.c
+++ b/v4l2-apps/libv4l/libv4l2/v4l2convert.c
@@ -24,17 +24,11 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
-#include <syscall.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-/* These headers are not needed by us, but by linux/videodev2.h,
-   which is broken on some systems and doesn't include them itself :( */
-#include <sys/time.h>
-#include <asm/types.h>
-#include <linux/ioctl.h>
-/* end broken header workaround includes */
+#include "../libv4lconvert/libv4lsyscall-priv.h"
 #include <linux/videodev2.h>
 #include <libv4l2.h>
 
@@ -72,18 +66,18 @@ LIBV4L_PUBLIC int open (const char *file, int oflag, ...)
     va_start (ap, oflag);
     mode = va_arg (ap, mode_t);
 
-    fd = syscall(SYS_open, file, oflag, mode);
+    fd = SYS_OPEN(file, oflag, mode);
 
     va_end(ap);
   } else
-    fd = syscall(SYS_open, file, oflag);
+    fd = SYS_OPEN(file, oflag, 0);
   /* end of original open code */
 
   if (fd == -1 || !v4l_device)
     return fd;
 
   /* check that this is an v4l2 device, libv4l2 only supports v4l2 devices */
-  if (syscall(SYS_ioctl, fd, VIDIOC_QUERYCAP, &cap))
+  if (SYS_IOCTL(fd, VIDIOC_QUERYCAP, &cap))
     return fd;
 
   /* libv4l2 only adds functionality to capture capable devices */
@@ -97,6 +91,7 @@ LIBV4L_PUBLIC int open (const char *file, int oflag, ...)
   return fd;
 }
 
+#ifdef linux
 LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
 {
   int fd;
@@ -119,6 +114,7 @@ LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
 
   return fd;
 }
+#endif
 
 LIBV4L_PUBLIC int close(int fd)
 {
@@ -153,11 +149,13 @@ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd
   return v4l2_mmap(start, length, prot, flags, fd, offset);
 }
 
+#ifdef linux
 LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
   __off64_t offset)
 {
   return v4l2_mmap(start, length, prot, flags, fd, offset);
 }
+#endif
 
 LIBV4L_PUBLIC int munmap(void *start, size_t length)
 {