aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-09-11 14:36:37 (GMT)
committerHans Verkuil <hverkuil@xs4all.nl>2010-09-11 14:36:37 (GMT)
commitb2a54510fb03706ba2e54928b06bd50d4ca8d95d (patch)
treefd2c30201e9c34f6c92e6f80c9ad0fa9da28dbcf
parenta59c98e343b960ce1f2520cd2595073c5e695765 (diff)
libv4l2: Update the list of ioctls to the latest videodev2.h
This list in log.c was quite old and seriously out of date with videodev2.h. Added the newer ioctls and removed the unnecessary test against VIDIOC_ENUM_FRAMESIZES. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-rw-r--r--lib/libv4l2/log.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/libv4l2/log.c b/lib/libv4l2/log.c
index 91b0e3d..4c3a52e 100644
--- a/lib/libv4l2/log.c
+++ b/lib/libv4l2/log.c
@@ -88,10 +88,24 @@ static const char *v4l2_ioctls[] = {
[_IOC_NR(VIDIOC_G_EXT_CTRLS)] = "VIDIOC_G_EXT_CTRLS",
[_IOC_NR(VIDIOC_S_EXT_CTRLS)] = "VIDIOC_S_EXT_CTRLS",
[_IOC_NR(VIDIOC_TRY_EXT_CTRLS)] = "VIDIOC_TRY_EXT_CTRLS",
-#ifdef VIDIOC_ENUM_FRAMESIZES
[_IOC_NR(VIDIOC_ENUM_FRAMESIZES)] = "VIDIOC_ENUM_FRAMESIZES",
[_IOC_NR(VIDIOC_ENUM_FRAMEINTERVALS)] = "VIDIOC_ENUM_FRAMEINTERVALS",
-#endif
+ [_IOC_NR(VIDIOC_G_ENC_INDEX)] = "VIDIOC_G_ENC_INDEX",
+ [_IOC_NR(VIDIOC_ENCODER_CMD)] = "VIDIOC_ENCODER_CMD",
+ [_IOC_NR(VIDIOC_TRY_ENCODER_CMD)] = "VIDIOC_TRY_ENCODER_CMD",
+ [_IOC_NR(VIDIOC_DBG_S_REGISTER)] = "VIDIOC_DBG_S_REGISTER",
+ [_IOC_NR(VIDIOC_DBG_G_REGISTER)] = "VIDIOC_DBG_G_REGISTER",
+ [_IOC_NR(VIDIOC_DBG_G_CHIP_IDENT)] = "VIDIOC_DBG_G_CHIP_IDENT",
+ [_IOC_NR(VIDIOC_S_HW_FREQ_SEEK)] = "VIDIOC_S_HW_FREQ_SEEK",
+ [_IOC_NR(VIDIOC_ENUM_DV_PRESETS)] = "VIDIOC_ENUM_DV_PRESETS",
+ [_IOC_NR(VIDIOC_S_DV_PRESET)] = "VIDIOC_S_DV_PRESET",
+ [_IOC_NR(VIDIOC_G_DV_PRESET)] = "VIDIOC_G_DV_PRESET",
+ [_IOC_NR(VIDIOC_QUERY_DV_PRESET)] = "VIDIOC_QUERY_DV_PRESET",
+ [_IOC_NR(VIDIOC_S_DV_TIMINGS)] = "VIDIOC_S_DV_TIMINGS",
+ [_IOC_NR(VIDIOC_G_DV_TIMINGS)] = "VIDIOC_G_DV_TIMINGS",
+ [_IOC_NR(VIDIOC_DQEVENT)] = "VIDIOC_DQEVENT",
+ [_IOC_NR(VIDIOC_SUBSCRIBE_EVENT)] = "VIDIOC_SUBSCRIBE_EVENT",
+ [_IOC_NR(VIDIOC_UNSUBSCRIBE_EVENT)] = "VIDIOC_UNSUBSCRIBE_EVENT",
};
void v4l2_log_ioctl(unsigned long int request, void *arg, int result)
@@ -150,7 +164,6 @@ void v4l2_log_ioctl(unsigned long int request, void *arg, int result)
req->count, (int)req->type, (int)req->memory);
break;
}
-#ifdef VIDIOC_ENUM_FRAMESIZES
case VIDIOC_ENUM_FRAMESIZES: {
struct v4l2_frmsizeenum *frmsize = arg;
int pixfmt = frmsize->pixel_format;
@@ -203,7 +216,6 @@ void v4l2_log_ioctl(unsigned long int request, void *arg, int result)
}
break;
}
-#endif
}
if (result < 0)

Privacy Policy