summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Chan <ktchan@codeaurora.org>2010-09-16 14:15:34 -0700
committerMansoor Aftab <maftab@codeaurora.org>2010-10-05 12:32:50 -0700
commit64421100ecb17fd676815c686b3ce7db81c17576 (patch)
tree7e83abf4cb06487d98ab76a18883ddb36db6b087
parentaf7bc59d67ae4ef269a2e51378fe7f59f5ce3661 (diff)
downloadbionic-64421100ecb17fd676815c686b3ce7db81c17576.zip
bionic-64421100ecb17fd676815c686b3ce7db81c17576.tar.gz
bionic-64421100ecb17fd676815c686b3ce7db81c17576.tar.bz2
camera: Support for enhanced ESD interfaceQ8650DTBCANLYA2060M7630AABBQVLGA302514
Support for enhanced ESD interface Change-Id: If1f6a5784d37f5ae41e4faa598633dc6f5aa4a33 CRs-fixed: 256140
-rw-r--r--libc/kernel/common/media/msm_camera.h28
1 files changed, 17 insertions, 11 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h
index 6bcddcf..447b1ab 100644
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -68,17 +68,6 @@
#define MSM_CAM_IOCTL_SENSOR_IO_CFG _IOW(MSM_CAM_IOCTL_MAGIC, 21, struct sensor_cfg_data *)
-#define MSM_CAM_IOCTL_CONFIG_VPE _IOW(MSM_CAM_IOCTL_MAGIC, 27, struct msm_camera_vpe_cfg_cmd *)
-
-#define MSM_CAM_IOCTL_AXI_VPE_CONFIG _IOW(MSM_CAM_IOCTL_MAGIC, 28, struct msm_camera_vpe_cfg_cmd *)
-
-#define MSM_CAMERA_LED_OFF 0
-#define MSM_CAMERA_LED_LOW 1
-#define MSM_CAMERA_LED_HIGH 2
-
-#define MSM_CAMERA_STROBE_FLASH_NONE 0
-#define MSM_CAMERA_STROBE_FLASH_XENON 1
-
#define MSM_CAM_IOCTL_FLASH_LED_CFG _IOW(MSM_CAM_IOCTL_MAGIC, 22, unsigned *)
#define MSM_CAM_IOCTL_UNBLOCK_POLL_FRAME _IO(MSM_CAM_IOCTL_MAGIC, 23)
@@ -86,14 +75,28 @@
#define MSM_CAM_IOCTL_CTRL_COMMAND_2 _IOW(MSM_CAM_IOCTL_MAGIC, 24, struct msm_ctrl_cmd *)
#define MSM_CAM_IOCTL_AF_CTRL _IOR(MSM_CAM_IOCTL_MAGIC, 25, struct msm_ctrl_cmt_t *)
+
#define MSM_CAM_IOCTL_AF_CTRL_DONE _IOW(MSM_CAM_IOCTL_MAGIC, 26, struct msm_ctrl_cmt_t *)
+#define MSM_CAM_IOCTL_CONFIG_VPE _IOW(MSM_CAM_IOCTL_MAGIC, 27, struct msm_camera_vpe_cfg_cmd *)
+
+#define MSM_CAM_IOCTL_AXI_VPE_CONFIG _IOW(MSM_CAM_IOCTL_MAGIC, 28, struct msm_camera_vpe_cfg_cmd *)
+
#define MSM_CAM_IOCTL_STROBE_FLASH_CFG _IOW(MSM_CAM_IOCTL_MAGIC, 29, uint32_t *)
#define MSM_CAM_IOCTL_STROBE_FLASH_CHARGE _IOW(MSM_CAM_IOCTL_MAGIC, 30, uint32_t *)
#define MSM_CAM_IOCTL_STROBE_FLASH_RELEASE _IO(MSM_CAM_IOCTL_MAGIC, 31)
+#define MSM_CAM_IOCTL_ERROR_CONFIG _IOW(MSM_CAM_IOCTL_MAGIC, 32, uint32_t *)
+
+#define MSM_CAMERA_LED_OFF 0
+#define MSM_CAMERA_LED_LOW 1
+#define MSM_CAMERA_LED_HIGH 2
+
+#define MSM_CAMERA_STROBE_FLASH_NONE 0
+#define MSM_CAMERA_STROBE_FLASH_XENON 1
+
#define MAX_SENSOR_NUM 3
#define MAX_SENSOR_NAME 32
@@ -304,8 +307,11 @@ struct msm_frame {
void *cropinfo;
int croplen;
+ uint32_t error_code;
};
+#define MSM_CAMERA_ERR_MASK (0xFFFFFFFF & 1)
+
struct msm_stats_buf {
int type;
unsigned long buffer;