msm8994: update kernel headerandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41nougat-mr1-wear-releasen-iot-preview-2marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-dev

Update msmb_generic_buf_mgr.h

Bug: 24134544
Change-Id: Ib99c8a67ca3fb5f36ac3f6de330e7e94842f1997

2 files changed, 30 insertions, 27 deletions

diff --git a/kernel-headers/media/msmb_generic_buf_mgr.h b/kernel-headers/media/msmb_generic_buf_mgr.h
index 0f9b31e..b5e48f0 100644
--- a/kernel-headers/media/msmb_generic_buf_mgr.h
+++ b/kernel-headers/media/msmb_generic_buf_mgr.h
@@ -21,46 +21,47 @@
 #include <media/msmb_camera.h>
 enum msm_camera_buf_mngr_cmd {
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_CAMERA_BUF_MNGR_CONT_MAP,
- MSM_CAMERA_BUF_MNGR_CONT_UNMAP,
- MSM_CAMERA_BUF_MNGR_CONT_MAX,
+  MSM_CAMERA_BUF_MNGR_CONT_MAP,
+  MSM_CAMERA_BUF_MNGR_CONT_UNMAP,
+  MSM_CAMERA_BUF_MNGR_CONT_MAX,
 };
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 enum msm_camera_buf_mngr_buf_type {
- MSM_CAMERA_BUF_MNGR_BUF_PLANAR,
- MSM_CAMERA_BUF_MNGR_BUF_USER,
- MSM_CAMERA_BUF_MNGR_BUF_INVALID,
+  MSM_CAMERA_BUF_MNGR_BUF_PLANAR,
+  MSM_CAMERA_BUF_MNGR_BUF_USER,
+  MSM_CAMERA_BUF_MNGR_BUF_INVALID,
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 struct msm_buf_mngr_info {
- uint32_t session_id;
- uint32_t stream_id;
+  uint32_t session_id;
+  uint32_t stream_id;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t frame_id;
- struct timeval timestamp;
- uint32_t index;
- uint32_t reserved;
+  uint32_t frame_id;
+  uint32_t flags;
+  struct timeval timestamp;
+  uint32_t index;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- enum msm_camera_buf_mngr_buf_type type;
- struct msm_camera_user_buf_cont_t user_buf;
+  uint32_t reserved;
+  enum msm_camera_buf_mngr_buf_type type;
+  struct msm_camera_user_buf_cont_t user_buf;
 };
-struct msm_buf_mngr_main_cont_info {
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t session_id;
- uint32_t stream_id;
- enum msm_camera_buf_mngr_cmd cmd;
- uint32_t cnt;
+struct msm_buf_mngr_main_cont_info {
+  uint32_t session_id;
+  uint32_t stream_id;
+  enum msm_camera_buf_mngr_cmd cmd;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int32_t cont_fd;
+  uint32_t cnt;
+  int32_t cont_fd;
 };
-struct v4l2_subdev *msm_buf_mngr_get_subdev(void);
-#define VIDIOC_MSM_BUF_MNGR_GET_BUF   _IOWR('V', BASE_VIDIOC_PRIVATE + 33, struct msm_buf_mngr_info)
+struct v4l2_subdev * msm_buf_mngr_get_subdev(void);
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_BUF_MNGR_PUT_BUF   _IOWR('V', BASE_VIDIOC_PRIVATE + 34, struct msm_buf_mngr_info)
-#define VIDIOC_MSM_BUF_MNGR_BUF_DONE   _IOWR('V', BASE_VIDIOC_PRIVATE + 35, struct msm_buf_mngr_info)
-#define VIDIOC_MSM_BUF_MNGR_CONT_CMD   _IOWR('V', BASE_VIDIOC_PRIVATE + 36, struct msm_buf_mngr_main_cont_info)
-#define VIDIOC_MSM_BUF_MNGR_INIT   _IOWR('V', BASE_VIDIOC_PRIVATE + 37, struct msm_buf_mngr_info)
+#define VIDIOC_MSM_BUF_MNGR_GET_BUF _IOWR('V', BASE_VIDIOC_PRIVATE + 33, struct msm_buf_mngr_info)
+#define VIDIOC_MSM_BUF_MNGR_PUT_BUF _IOWR('V', BASE_VIDIOC_PRIVATE + 34, struct msm_buf_mngr_info)
+#define VIDIOC_MSM_BUF_MNGR_BUF_DONE _IOWR('V', BASE_VIDIOC_PRIVATE + 35, struct msm_buf_mngr_info)
+#define VIDIOC_MSM_BUF_MNGR_CONT_CMD _IOWR('V', BASE_VIDIOC_PRIVATE + 36, struct msm_buf_mngr_main_cont_info)
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_BUF_MNGR_DEINIT   _IOWR('V', BASE_VIDIOC_PRIVATE + 38, struct msm_buf_mngr_info)
+#define VIDIOC_MSM_BUF_MNGR_INIT _IOWR('V', BASE_VIDIOC_PRIVATE + 37, struct msm_buf_mngr_info)
+#define VIDIOC_MSM_BUF_MNGR_DEINIT _IOWR('V', BASE_VIDIOC_PRIVATE + 38, struct msm_buf_mngr_info)
 #endif
 
diff --git a/original-kernel-headers/media/msmb_generic_buf_mgr.h b/original-kernel-headers/media/msmb_generic_buf_mgr.h
index 8645e95..008e1a4 100644
--- a/original-kernel-headers/media/msmb_generic_buf_mgr.h
+++ b/original-kernel-headers/media/msmb_generic_buf_mgr.h
@@ -19,6 +19,7 @@ struct msm_buf_mngr_info {
 	uint32_t session_id;
 	uint32_t stream_id;
 	uint32_t frame_id;
+	uint32_t flags;
 	struct timeval timestamp;
 	uint32_t index;
 	uint32_t reserved;
@@ -60,6 +61,7 @@ struct msm_buf_mngr_info32_t {
 	uint32_t session_id;
 	uint32_t stream_id;
 	uint32_t frame_id;
+	uint32_t flags;
 	struct compat_timeval timestamp;
 	uint32_t index;
 	uint32_t reserved;