diff options
| author | Kevin Chan <ktchan@codeaurora.org> | 2010-09-16 14:15:34 -0700 |
|---|---|---|
| committer | Kevin Chan <ktchan@codeaurora.org> | 2010-09-16 14:15:34 -0700 |
| commit | fd700bfcbe758a42fa7aa3d36a35ce77529357db (patch) | |
| tree | 41111fb745924affe0a6fa8936f877c0be08c2ea | |
| parent | ec9dbc893f663662fcf5deb35fd95a85a0d8e5ab (diff) | |
| download | bionic-fd700bfcbe758a42fa7aa3d36a35ce77529357db.zip bionic-fd700bfcbe758a42fa7aa3d36a35ce77529357db.tar.gz bionic-fd700bfcbe758a42fa7aa3d36a35ce77529357db.tar.bz2 | |
camera: Support for enhanced ESD interface
Support for enhanced ESD interface
Change-Id: Ibcd88862d43bf1fe95be842766fb3f8f004025f3
CRs-fixed: 256140
| -rw-r--r-- | libc/kernel/common/media/msm_camera.h | 28 |
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; |