summaryrefslogtreecommitdiffstats
path: root/kstars
diff options
context:
space:
mode:
Diffstat (limited to 'kstars')
-rw-r--r--kstars/kstars/indi/skycommander.c2
-rw-r--r--kstars/kstars/indi/webcam/pwc-ioctl.h4
-rw-r--r--kstars/kstars/indi/webcam/v4l1_pwc.cpp4
-rw-r--r--kstars/kstars/indi/webcam/v4l2_base.cpp30
-rw-r--r--kstars/kstars/indi/webcam/videodev2.h18
5 files changed, 29 insertions, 29 deletions
diff --git a/kstars/kstars/indi/skycommander.c b/kstars/kstars/indi/skycommander.c
index 6bf23437..261b6808 100644
--- a/kstars/kstars/indi/skycommander.c
+++ b/kstars/kstars/indi/skycommander.c
@@ -54,7 +54,7 @@ INumber eq[] = {
{"DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0., 0, 0, 0},
};
INumberVectorProperty eqNum = {
- mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE,
+ mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE,
eq, NARRAY(eq), "", 0};
diff --git a/kstars/kstars/indi/webcam/pwc-ioctl.h b/kstars/kstars/indi/webcam/pwc-ioctl.h
index 6df68780..9b650298 100644
--- a/kstars/kstars/indi/webcam/pwc-ioctl.h
+++ b/kstars/kstars/indi/webcam/pwc-ioctl.h
@@ -121,9 +121,9 @@ struct pwc_leds
the preferred mode is not available.
*/
/* Set preferred compression quality (0 = uncompressed, 3 = highest compression) */
-#define VIDIOCPWCSCTQUAL _IOW('v', 195, int)
+#define VIDIOCPWCSCQUAL _IOW('v', 195, int)
/* Get preferred compression quality */
-#define VIDIOCPWCGCTQUAL _IOR('v', 195, int)
+#define VIDIOCPWCGCQUAL _IOR('v', 195, int)
/* This is a probe function; since so many devices are supported, it
diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.cpp b/kstars/kstars/indi/webcam/v4l1_pwc.cpp
index f87d9c82..9f644885 100644
--- a/kstars/kstars/indi/webcam/v4l1_pwc.cpp
+++ b/kstars/kstars/indi/webcam/v4l1_pwc.cpp
@@ -259,13 +259,13 @@ int V4L1_PWC::setExposure(int val, char *errmsg)
void V4L1_PWC::setCompression(int val)
{
- ioctl(fd, VIDIOCPWCSCTQUAL, &val);
+ ioctl(fd, VIDIOCPWCSCQUAL, &val);
}
int V4L1_PWC::getCompression()
{
int gain;
- ioctl(fd, VIDIOCPWCGCTQUAL , &gain);
+ ioctl(fd, VIDIOCPWCGCQUAL , &gain);
if (gain < 0) gain*=-1;
return gain;
}
diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp
index a4ba8d72..1c2a184c 100644
--- a/kstars/kstars/indi/webcam/v4l2_base.cpp
+++ b/kstars/kstars/indi/webcam/v4l2_base.cpp
@@ -453,8 +453,8 @@ int V4L2_Base::init_mmap(char *errmsg)
buf.memory = V4L2_MEMORY_MMAP;
buf.index = n_buffers;
- if (-1 == xioctl (fd, VIDIOC_TQUERYBUF, &buf))
- return errno_exit ("VIDIOC_TQUERYBUF", errmsg);
+ if (-1 == xioctl (fd, VIDIOC_QUERYBUF, &buf))
+ return errno_exit ("VIDIOC_QUERYBUF", errmsg);
buffers[n_buffers].length = buf.length;
buffers[n_buffers].start =
@@ -514,7 +514,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height
{
unsigned int min;
- if (-1 == xioctl (fd, VIDIOC_TQUERYCAP, &cap))
+ if (-1 == xioctl (fd, VIDIOC_QUERYCAP, &cap))
{
if (EINVAL == errno) {
fprintf (stderr, "%s is no V4L2 device\n",
@@ -522,7 +522,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height
snprintf(errmsg, ERRMSGSIZ, "%s is no V4L2 device\n", dev_name);
return -1;
} else {
- return errno_exit ("VIDIOC_TQUERYCAP", errmsg);
+ return errno_exit ("VIDIOC_QUERYCAP", errmsg);
}
}
@@ -953,7 +953,7 @@ void V4L2_Base::enumerate_ctrl (void)
for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++)
{
- if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl))
+ if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl))
{
cerr << "Control " << queryctrl.name << endl;
@@ -969,14 +969,14 @@ void V4L2_Base::enumerate_ctrl (void)
if (errno == EINVAL)
continue;
- errno_exit("VIDIOC_TQUERYCTRL", errmsg);
+ errno_exit("VIDIOC_QUERYCTRL", errmsg);
return;
}
}
for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++)
{
- if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl))
+ if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl))
{
cerr << "Private Control " << queryctrl.name << endl;
@@ -989,7 +989,7 @@ void V4L2_Base::enumerate_ctrl (void)
if (errno == EINVAL)
break;
- errno_exit ("VIDIOC_TQUERYCTRL", errmsg);
+ errno_exit ("VIDIOC_QUERYCTRL", errmsg);
return;
}
@@ -1007,12 +1007,12 @@ void V4L2_Base::enumerate_menu (void)
for (querymenu.index = queryctrl.minimum; querymenu.index <= queryctrl.maximum; querymenu.index++)
{
- if (0 == xioctl (fd, VIDIOC_TQUERYMENU, &querymenu))
+ if (0 == xioctl (fd, VIDIOC_QUERYMENU, &querymenu))
{
cerr << " " << querymenu.name << endl;
} else
{
- errno_exit("VIDIOC_TQUERYMENU", errmsg);
+ errno_exit("VIDIOC_QUERYMENU", errmsg);
return;
}
}
@@ -1027,10 +1027,10 @@ int V4L2_Base::query_ctrl(unsigned int ctrl_id, double & ctrl_min, double & ctr
queryctrl.id = ctrl_id;
- if (-1 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl))
+ if (-1 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl))
{
if (errno != EINVAL)
- return errno_exit ("VIDIOC_TQUERYCTRL", errmsg);
+ return errno_exit ("VIDIOC_QUERYCTRL", errmsg);
else
{
@@ -1074,7 +1074,7 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp)
for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++)
{
- if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl))
+ if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl))
{
if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED)
{
@@ -1113,13 +1113,13 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp)
}
} else if (errno != EINVAL)
- return errno_exit ("VIDIOC_TQUERYCTRL", errmsg);
+ return errno_exit ("VIDIOC_QUERYCTRL", errmsg);
}
for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++)
{
- if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl))
+ if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl))
{
if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED)
{
diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h
index b6a05dbd..27e2f74e 100644
--- a/kstars/kstars/indi/webcam/videodev2.h
+++ b/kstars/kstars/indi/webcam/videodev2.h
@@ -388,7 +388,7 @@ struct v4l2_buffer
/* Flags for 'flags' field */
#define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */
-#define V4L2_BUF_FLAG_TQUEUED 0x0002 /* Buffer is queued for processing */
+#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */
#define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */
#define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */
#define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */
@@ -448,7 +448,7 @@ struct v4l2_captureparm
__u32 reserved[4];
};
/* Flags for 'capability' and 'capturemode' fields */
-#define V4L2_MODE_HIGHTQUALITY 0x0001 /* High quality imaging mode */
+#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */
#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */
struct v4l2_outputparm
@@ -624,7 +624,7 @@ struct v4l2_control
__s32 value;
};
-/* Used in the VIDIOC_TQUERYCTRL ioctl for querying controls */
+/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
struct v4l2_queryctrl
{
__u32 id;
@@ -638,7 +638,7 @@ struct v4l2_queryctrl
__u32 reserved[2];
};
-/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */
+/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
struct v4l2_querymenu
{
__u32 id;
@@ -829,7 +829,7 @@ struct v4l2_streamparm
* I O C T L C O D E S F O R V I D E O D E V I C E S
*
*/
-#define VIDIOC_TQUERYCAP _IOR ('V', 0, struct v4l2_capability)
+#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability)
#define VIDIOC_RESERVED _IO ('V', 1)
#define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc)
#define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format)
@@ -839,7 +839,7 @@ struct v4l2_streamparm
#define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression)
#endif
#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers)
-#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer)
+#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)
#define VIDIOC_OVERLAY _IOW ('V', 14, int)
@@ -859,8 +859,8 @@ struct v4l2_streamparm
#define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner)
#define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio)
#define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio)
-#define VIDIOC_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl)
-#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu)
+#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl)
+#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu)
#define VIDIOC_G_INPUT _IOR ('V', 38, int)
#define VIDIOC_S_INPUT _IOWR ('V', 39, int)
#define VIDIOC_G_OUTPUT _IOR ('V', 46, int)
@@ -877,7 +877,7 @@ struct v4l2_streamparm
#define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop)
#define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression)
#define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_TQUERYSTD _IOR ('V', 63, v4l2_std_id)
+#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id)
#define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format)
#define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio)
#define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout)
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 06:53:52 +0000