evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: sensor: Add support for front aux sensor"

Browse source
This commit is contained in:
Linux Build Service Account 2018-08-02 07:10:35 -07:00 • committed by Gerrit - the friendly Code Review server
commit bf90c1b1f5
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/uapi/media/msm_camera.h
View file

@ -263,7 +263,7 @@ struct msm_mctl_post_proc_cmd {
#define MSM_CAMERA_STROBE_FLASH_NONE 0 #define MSM_CAMERA_STROBE_FLASH_NONE 0
#define MSM_CAMERA_STROBE_FLASH_XENON 1 #define MSM_CAMERA_STROBE_FLASH_XENON 1
#define MSM_MAX_CAMERA_SENSORS 5 #define MSM_MAX_CAMERA_SENSORS 6
#define MAX_SENSOR_NAME 32 #define MAX_SENSOR_NAME 32
#define MAX_CAM_NAME_SIZE 32 #define MAX_CAM_NAME_SIZE 32
#define MAX_ACT_MOD_NAME_SIZE 32 #define MAX_ACT_MOD_NAME_SIZE 32

3
include/uapi/media/msm_camsensor_sdk.h
View file

@ -50,6 +50,8 @@
#define MSM_SENSOR_BYPASS_VIDEO_NODE 1 #define MSM_SENSOR_BYPASS_VIDEO_NODE 1
#define FRONT_AUX_SENSOR_SUPPORT
enum msm_sensor_camera_id_t { enum msm_sensor_camera_id_t {
CAMERA_0, CAMERA_0,
CAMERA_1, CAMERA_1,
@ -70,6 +72,7 @@ enum camb_position_t {
BACK_CAMERA_B, BACK_CAMERA_B,
FRONT_CAMERA_B, FRONT_CAMERA_B,
AUX_CAMERA_B = 0x100, AUX_CAMERA_B = 0x100,
FRONT_AUX_CAMERA_B,
INVALID_CAMERA_B, INVALID_CAMERA_B,
}; };

2
include/uapi/media/msmb_camera.h
View file

@ -53,7 +53,7 @@
#define MSM_CAMERA_SUBDEV_EXT 19 #define MSM_CAMERA_SUBDEV_EXT 19
#define MSM_CAMERA_SUBDEV_TOF 20 #define MSM_CAMERA_SUBDEV_TOF 20
#define MSM_CAMERA_SUBDEV_LASER_LED 21 #define MSM_CAMERA_SUBDEV_LASER_LED 21
#define MSM_MAX_CAMERA_SENSORS 5 #define MSM_MAX_CAMERA_SENSORS 6
/* The below macro is defined to put an upper limit on maximum /* The below macro is defined to put an upper limit on maximum
* number of buffer requested per stream. In case of extremely * number of buffer requested per stream. In case of extremely