summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAjay Dudani <adudani@codeaurora.org>2013-10-12 23:44:20 -0700
committerIliyan Malchev <malchev@google.com>2013-10-13 01:42:24 -0700
commit211a4480f5e2deb61fd0c531943d7204da23a77a (patch)
tree7b4c3cb007dd018ac1dc5a6bce24d1c4961b99e8
parente29237feab2ae0aa7f1496c33361fe84d424dba6 (diff)
downloadmsm8x74-211a4480f5e2deb61fd0c531943d7204da23a77a.tar.gz
Update kernel headers for post proc modules.
Change-Id: Ib037dccfc7fe50f985a0ee5efa48cce693be1e77
-rw-r--r--kernel-headers/media/msmb_pproc.h6
-rw-r--r--original-kernel-headers/media/msmb_pproc.h3
2 files changed, 6 insertions, 3 deletions
diff --git a/kernel-headers/media/msmb_pproc.h b/kernel-headers/media/msmb_pproc.h
index ebd04c7..91c1fd6 100644
--- a/kernel-headers/media/msmb_pproc.h
+++ b/kernel-headers/media/msmb_pproc.h
@@ -217,15 +217,15 @@ struct msm_vpe_frame_info_t {
#define VIDIOC_MSM_CPP_SEND_BUF_DONE _IOWR('V', BASE_VIDIOC_PRIVATE + 14, struct msm_camera_v4l2_ioctl_t)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define VIDIOC_MSM_CPP_POP_STREAM_BUFFER _IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_camera_v4l2_ioctl_t)
+#define VIDIOC_MSM_CPP_SET_CLOCK _IOWR('V', BASE_VIDIOC_PRIVATE + 16, struct msm_camera_v4l2_ioctl_t)
#define V4L2_EVENT_CPP_FRAME_DONE (V4L2_EVENT_PRIVATE_START + 0)
#define V4L2_EVENT_VPE_FRAME_DONE (V4L2_EVENT_PRIVATE_START + 1)
-struct msm_camera_v4l2_ioctl_t {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct msm_camera_v4l2_ioctl_t {
uint32_t id;
uint32_t len;
int32_t trans_code;
- void __user *ioctl_ptr;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ void __user *ioctl_ptr;
};
#endif
-
diff --git a/original-kernel-headers/media/msmb_pproc.h b/original-kernel-headers/media/msmb_pproc.h
index a2bc57f..4c719a2 100644
--- a/original-kernel-headers/media/msmb_pproc.h
+++ b/original-kernel-headers/media/msmb_pproc.h
@@ -224,6 +224,9 @@ struct msm_vpe_frame_info_t {
#define VIDIOC_MSM_CPP_POP_STREAM_BUFFER \
_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_camera_v4l2_ioctl_t)
+#define VIDIOC_MSM_CPP_SET_CLOCK \
+ _IOWR('V', BASE_VIDIOC_PRIVATE + 16, struct msm_camera_v4l2_ioctl_t)
+
#define V4L2_EVENT_CPP_FRAME_DONE (V4L2_EVENT_PRIVATE_START + 0)
#define V4L2_EVENT_VPE_FRAME_DONE (V4L2_EVENT_PRIVATE_START + 1)