diff options
| author | Ajay Dudani <adudani@codeaurora.org> | 2013-09-25 22:32:40 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2013-09-25 23:53:04 -0700 |
| commit | b690f7c292b0d03576f44f737940480c1eecd278 (patch) | |
| tree | 1fa4de157f900e40f84690caae13f39160e3c53b | |
| parent | d1d83fe741fda73cc77dca3112b8e2c1034ba98d (diff) | |
| download | msm8x74-b690f7c292b0d03576f44f737940480c1eecd278.tar.gz | |
msm8x74: Update msmb_pproc.h
Bug: 10844261
Change-Id: Idf3fb249a9113a81447279daaf355995480f0b2a
| -rw-r--r-- | kernel-headers/media/msmb_pproc.h | 6 | ||||
| -rw-r--r-- | original-kernel-headers/media/msmb_pproc.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/kernel-headers/media/msmb_pproc.h b/kernel-headers/media/msmb_pproc.h index 0d582f6..ebd04c7 100644 --- a/kernel-headers/media/msmb_pproc.h +++ b/kernel-headers/media/msmb_pproc.h @@ -216,14 +216,16 @@ struct msm_vpe_frame_info_t { #define VIDIOC_MSM_VPE_DEQUEUE_STREAM_BUFF_INFO _IOWR('V', BASE_VIDIOC_PRIVATE + 13, struct msm_camera_v4l2_ioctl_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 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 { - uint32_t id; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + 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 */ +}; #endif + diff --git a/original-kernel-headers/media/msmb_pproc.h b/original-kernel-headers/media/msmb_pproc.h index c47c9da..a2bc57f 100644 --- a/original-kernel-headers/media/msmb_pproc.h +++ b/original-kernel-headers/media/msmb_pproc.h @@ -221,6 +221,9 @@ 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) +#define VIDIOC_MSM_CPP_POP_STREAM_BUFFER \ + _IOWR('V', BASE_VIDIOC_PRIVATE + 15, 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) |