aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@qualcomm.com>2010-10-19 21:19:56 -0700
committerQuIC Gerrit Code Review <code-review@quicinc.com>2010-10-19 21:19:56 -0700
commit1d78d44bab42ee44c882ca1b7851c06449e0ba0e (patch)
treecdd985100c639551414218e47567e12e207bdd12
parent825d70eaefbc5e6bfd3bd0101c26b19e6897c876 (diff)
parent2017412bddfa0b1d705c315aea1c879ed9606594 (diff)
downloadandroid_bionic-1d78d44bab42ee44c882ca1b7851c06449e0ba0e.tar.gz
android_bionic-1d78d44bab42ee44c882ca1b7851c06449e0ba0e.tar.bz2
android_bionic-1d78d44bab42ee44c882ca1b7851c06449e0ba0e.zip
Merge "camera: Added new IOCTL to handle "Abort capture" usecase" into froyo
-rw-r--r--libc/kernel/common/media/msm_camera.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h
index 447b1abf5..f6397a237 100644
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -90,6 +90,8 @@
#define MSM_CAM_IOCTL_ERROR_CONFIG _IOW(MSM_CAM_IOCTL_MAGIC, 32, uint32_t *)
+#define MSM_CAM_IOCTL_ABORT_CAPTURE _IO(MSM_CAM_IOCTL_MAGIC, 33)
+
#define MSM_CAMERA_LED_OFF 0
#define MSM_CAMERA_LED_LOW 1
#define MSM_CAMERA_LED_HIGH 2