summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunid Wilson <sunid@codeaurora.org>2010-11-15 17:10:02 -0800
committerSunid Wilson <sunid@codeaurora.org>2010-12-01 16:07:11 -0800
commit9c066520aa3be8b86d57b063683ba550bc48fa77 (patch)
treeb8c3918f45da54a93d25b0e5dd01903d446eb301
parent3071cfc69df2523dfe7bf7f04eb631b9bddea008 (diff)
downloadbionic-9c066520aa3be8b86d57b063683ba550bc48fa77.zip
bionic-9c066520aa3be8b86d57b063683ba550bc48fa77.tar.gz
bionic-9c066520aa3be8b86d57b063683ba550bc48fa77.tar.bz2
camera: interface for dual camera and 3d camera
Added ioctl to query the camera info and the required data structures. Change-Id: I1eb48232784dc9956b0048276453b5868559383d
-rwxr-xr-x[-rw-r--r--]libc/kernel/common/media/msm_camera.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h
index e55315d..f5d01e5 100644..100755
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -96,6 +96,8 @@
#define MSM_CAM_IOCTL_SET_FD_ROI _IOW(MSM_CAM_IOCTL_MAGIC, 35, struct fd_roi_info *)
+#define MSM_CAM_IOCTL_GET_CAMERA_INFO _IOR(MSM_CAM_IOCTL_MAGIC, 36, struct msm_camera_info *)
+
#define MSM_CAMERA_LED_OFF 0
#define MSM_CAMERA_LED_LOW 1
#define MSM_CAMERA_LED_HIGH 2
@@ -103,7 +105,7 @@
#define MSM_CAMERA_STROBE_FLASH_NONE 0
#define MSM_CAMERA_STROBE_FLASH_XENON 1
-#define MAX_SENSOR_NUM 3
+#define MSM_MAX_CAMERA_SENSORS 5
#define MAX_SENSOR_NAME 32
#define PP_SNAP 0x01
@@ -478,6 +480,12 @@ struct strobe_flash_ctrl_data {
int charge_en;
};
+struct msm_camera_info {
+ int num_cameras;
+ uint8_t has_3d_support[MSM_MAX_CAMERA_SENSORS];
+ uint8_t is_internal_cam[MSM_MAX_CAMERA_SENSORS];
+};
+
struct flash_ctrl_data {
int flashtype;
union {