diff options
| author | Linux Build Service Account <lnxbuild@qualcomm.com> | 2010-09-07 16:01:13 -0700 |
|---|---|---|
| committer | QuIC Gerrit Code Review <code-review@quicinc.com> | 2010-09-07 16:01:13 -0700 |
| commit | ec9dbc893f663662fcf5deb35fd95a85a0d8e5ab (patch) | |
| tree | 73ce22419a1df152f811bc53ef9873d601183270 /libc/kernel | |
| parent | 03b624ef4d8d73ec4d1ca9c5c3cdf2c96ee3b44d (diff) | |
| parent | 9b6ea21f354e2c4fab87ff593f07ce9b57cfa96d (diff) | |
| download | bionic-ec9dbc893f663662fcf5deb35fd95a85a0d8e5ab.zip bionic-ec9dbc893f663662fcf5deb35fd95a85a0d8e5ab.tar.gz bionic-ec9dbc893f663662fcf5deb35fd95a85a0d8e5ab.tar.bz2 | |
Merge "bionic: Add support for Xenon Flash." into froyoM8660AAABQNLYA104615M7630AABBQVLZA3020CM7630AABBQVLZA30208004
Diffstat (limited to 'libc/kernel')
| -rw-r--r-- | libc/kernel/common/media/msm_camera.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h index 5a07ac9..6bcddcf 100644 --- a/libc/kernel/common/media/msm_camera.h +++ b/libc/kernel/common/media/msm_camera.h @@ -76,6 +76,9 @@ #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) @@ -85,6 +88,12 @@ #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_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 MAX_SENSOR_NUM 3 #define MAX_SENSOR_NAME 32 |