diff options
| author | Kevin Chan <ktchan@codeaurora.org> | 2010-09-16 14:15:34 -0700 |
|---|---|---|
| committer | Ramakrishna Prasad N <crpn@codeaurora.org> | 2011-01-27 12:20:44 +0530 |
| commit | 873ec9034f01d82c6eabda2fdcd5c645e096bcc8 (patch) | |
| tree | fac27051993ddd6f4e823e23d8a38d1f9aa065a7 | |
| parent | 40f5459081698e19bbab6bb517c8c5bab2ccd0c2 (diff) | |
| download | bionic-M76XXTSNCJNLYA60401017.zip bionic-M76XXTSNCJNLYA60401017.tar.gz bionic-M76XXTSNCJNLYA60401017.tar.bz2 | |
camera: Support for enhanced ESD interfaceQ8650BSDCANLYA504030M76XXTSNCJNLYA6060M76XXTSNCJNLYA60501019M76XXTSNCJNLYA60501014M76XXTSNCJNLYA60501013M76XXTSNCJNLYA60501012M76XXTSNCJNLYA60501011M76XXTSNCJNLYA60501010M76XXTSNCJNLYA60501008M76XXTSNCJNLYA60501007M76XXTSNCJNLYA60401021M76XXTSNCJNLYA60401017M76XXTSNCJNLYA60401016M76XXTSNCJNLYA60401015M76XXTSNCJNLYA60401014M76XXTSNCJNLYA60401013M76XXTSNCJNLYA60401011M76XXTSNCJNLYA60401010
Support for enhanced ESD interface
Change-Id: Idb91ed577b46cd96263cf1bdf2e8c8d75c9ad023
CRs-fixed: 256140
| -rw-r--r-- | libc/kernel/common/media/msm_camera.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h index 0ee7a1a..655050a 100644 --- a/libc/kernel/common/media/msm_camera.h +++ b/libc/kernel/common/media/msm_camera.h @@ -64,10 +64,6 @@ #define MSM_CAM_IOCTL_SENSOR_IO_CFG _IOW(MSM_CAM_IOCTL_MAGIC, 21, struct sensor_cfg_data *) -#define MSM_CAMERA_LED_OFF 0 -#define MSM_CAMERA_LED_LOW 1 -#define MSM_CAMERA_LED_HIGH 2 - #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) @@ -75,8 +71,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 @@ -268,8 +284,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; |