diff options
Diffstat (limited to 'original-kernel-headers/media/msm_fd.h')
| -rw-r--r-- | original-kernel-headers/media/msm_fd.h | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/original-kernel-headers/media/msm_fd.h b/original-kernel-headers/media/msm_fd.h index 229ee32..eb3bd78 100644 --- a/original-kernel-headers/media/msm_fd.h +++ b/original-kernel-headers/media/msm_fd.h @@ -1,18 +1,8 @@ -/* Copyright (c) 2014, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ #ifndef __UAPI_MSM_FD__ #define __UAPI_MSM_FD__ #include <linux/videodev2.h> +#include <linux/types.h> /* * struct msm_fd_event - Structure contain event info. @@ -66,25 +56,6 @@ struct msm_fd_result { struct msm_fd_face_data __user *face_data; }; -#ifdef CONFIG_COMPAT -/* - * struct msm_fd_result32 - Compat structure contain detected faces result. - * @frame_id: Frame id of requested result. - * @face_cnt: Number of result faces, driver can modify this value (to smaller) - * @face_data: Pointer to array of face data structures. - * Array size should not be smaller then face_cnt. - */ -struct msm_fd_result32 { - __u32 frame_id; - __u32 face_cnt; - compat_uptr_t face_data; -}; - -/* MSM FD compat private ioctl ID */ -#define VIDIOC_MSM_FD_GET_RESULT32 \ - _IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_fd_result32) -#endif - /* MSM FD private ioctl ID */ #define VIDIOC_MSM_FD_GET_RESULT \ _IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_fd_result) @@ -101,4 +72,5 @@ struct msm_fd_result32 { #define V4L2_CID_FD_WORK_MEMORY_SIZE (V4L2_CID_PRIVATE_BASE + 5) #define V4L2_CID_FD_WORK_MEMORY_FD (V4L2_CID_PRIVATE_BASE + 6) -#endif /* __UAPI_MSM_FD__ */ +#endif + |