summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2014-02-16 11:27:39 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2014-02-16 11:27:39 -0600
commit201d8ca42546e590aec3ff820e511ab47f183ca1 (patch)
treeb448ad7c0879f40de6f9a4a62c1bfc3abb433f58
parent2f4437e4f1694228777b706c5372f3626631e4f4 (diff)
downloadtdeedu-201d8ca42546e590aec3ff820e511ab47f183ca1.tar.gz
tdeedu-201d8ca42546e590aec3ff820e511ab47f183ca1.zip
Fix unintended renaming
-rw-r--r--kstars/kstars/indi/webcam/v4l2_base.cpp8
-rw-r--r--kstars/kstars/indi/webcam/videodev2.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp
index 1c2a184c..ffb168ec 100644
--- a/kstars/kstars/indi/webcam/v4l2_base.cpp
+++ b/kstars/kstars/indi/webcam/v4l2_base.cpp
@@ -414,7 +414,7 @@ int V4L2_Base::init_mmap(char *errmsg)
req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
req.memory = V4L2_MEMORY_MMAP;
- if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) {
+ if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) {
if (EINVAL == errno) {
fprintf (stderr, "%s does not support "
"memory mapping\n", dev_name);
@@ -422,7 +422,7 @@ int V4L2_Base::init_mmap(char *errmsg)
"memory mapping\n", dev_name);
return -1;
} else {
- return errno_exit ("VIDIOC_RETQBUFS", errmsg);
+ return errno_exit ("VIDIOC_REQBUFS", errmsg);
}
}
@@ -482,13 +482,13 @@ void V4L2_Base::init_userp(unsigned int buffer_size)
req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
req.memory = V4L2_MEMORY_USERPTR;
- if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) {
+ if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) {
if (EINVAL == errno) {
fprintf (stderr, "%s does not support "
"user pointer i/o\n", dev_name);
exit (EXIT_FAILURE);
} else {
- errno_exit ("VIDIOC_RETQBUFS", errmsg);
+ errno_exit ("VIDIOC_REQBUFS", errmsg);
}
}
diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h
index 27e2f74e..a82697b9 100644
--- a/kstars/kstars/indi/webcam/videodev2.h
+++ b/kstars/kstars/indi/webcam/videodev2.h
@@ -838,7 +838,7 @@ struct v4l2_streamparm
#define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression)
#define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression)
#endif
-#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers)
+#define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers)
#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer)
#define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer)
#define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer)