diff options
| author | Zhijun He <zhijunhe@google.com> | 2018-01-08 18:39:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-08 18:39:19 +0000 |
| commit | dd8e8afc1db52176846963d4073d5f007481351e (patch) | |
| tree | cd8aeec0b63687ba620c281666a9bc993b1c2954 /sdm845 | |
| parent | d40272b72d3b9c7527aad3cd67eb9febe041d9a7 (diff) | |
| parent | 7ca5caa00f22b9b24c5d57b89346ae0f4beef949 (diff) | |
| download | bonito-dd8e8afc1db52176846963d4073d5f007481351e.tar.gz | |
Merge "camera kernel header update"
Diffstat (limited to 'sdm845')
| -rw-r--r-- | sdm845/kernel-headers/media/cam_defs.h | 2 | ||||
| -rw-r--r-- | sdm845/kernel-headers/media/cam_req_mgr.h | 1 | ||||
| -rw-r--r-- | sdm845/original-kernel-headers/media/cam_defs.h | 3 | ||||
| -rw-r--r-- | sdm845/original-kernel-headers/media/cam_req_mgr.h | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/sdm845/kernel-headers/media/cam_defs.h b/sdm845/kernel-headers/media/cam_defs.h index f646d881..e2fdda47 100644 --- a/sdm845/kernel-headers/media/cam_defs.h +++ b/sdm845/kernel-headers/media/cam_defs.h @@ -30,6 +30,8 @@ #define CAM_RELEASE_DEV (CAM_COMMON_OPCODE_BASE + 0x6) #define CAM_SD_SHUTDOWN (CAM_COMMON_OPCODE_BASE + 0x7) #define CAM_COMMON_OPCODE_MAX (CAM_COMMON_OPCODE_BASE + 0x8) +#define CAM_EXT_OPCODE_BASE 0x200 +#define CAM_CONFIG_DEV_EXTERNAL (CAM_EXT_OPCODE_BASE + 0x1) #define CAM_HANDLE_USER_POINTER 1 #define CAM_HANDLE_MEM_HANDLE 2 #define CAM_GENERIC_BLOB_CMDBUFFER_SIZE_MASK 0xFFFFFF00 diff --git a/sdm845/kernel-headers/media/cam_req_mgr.h b/sdm845/kernel-headers/media/cam_req_mgr.h index 0a31b731..1ca71f30 100644 --- a/sdm845/kernel-headers/media/cam_req_mgr.h +++ b/sdm845/kernel-headers/media/cam_req_mgr.h @@ -206,6 +206,7 @@ struct cam_req_mgr_frame_msg { }; struct cam_req_mgr_message { int32_t session_hdl; + int32_t reserved; union { struct cam_req_mgr_error_msg err_msg; struct cam_req_mgr_frame_msg frame_msg; diff --git a/sdm845/original-kernel-headers/media/cam_defs.h b/sdm845/original-kernel-headers/media/cam_defs.h index 9a767ddf..cabf0a84 100644 --- a/sdm845/original-kernel-headers/media/cam_defs.h +++ b/sdm845/original-kernel-headers/media/cam_defs.h @@ -17,6 +17,9 @@ #define CAM_SD_SHUTDOWN (CAM_COMMON_OPCODE_BASE + 0x7) #define CAM_COMMON_OPCODE_MAX (CAM_COMMON_OPCODE_BASE + 0x8) +#define CAM_EXT_OPCODE_BASE 0x200 +#define CAM_CONFIG_DEV_EXTERNAL (CAM_EXT_OPCODE_BASE + 0x1) + /* camera handle type */ #define CAM_HANDLE_USER_POINTER 1 #define CAM_HANDLE_MEM_HANDLE 2 diff --git a/sdm845/original-kernel-headers/media/cam_req_mgr.h b/sdm845/original-kernel-headers/media/cam_req_mgr.h index 6846b8f7..3f1facdf 100644 --- a/sdm845/original-kernel-headers/media/cam_req_mgr.h +++ b/sdm845/original-kernel-headers/media/cam_req_mgr.h @@ -424,6 +424,7 @@ struct cam_req_mgr_frame_msg { */ struct cam_req_mgr_message { int32_t session_hdl; + int32_t reserved; union { struct cam_req_mgr_error_msg err_msg; struct cam_req_mgr_frame_msg frame_msg; |