Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24880d8f authored by Anomalchik's avatar Anomalchik
Browse files

HAX includes for markw camer 

need revert later
parent c852459a

include/media/msm_cam_sensor.h

+0 −16
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define __LINUX_MSM_CAM_SENSOR_H



#include <uapi/media/msm_cam_sensor.h>

#include <uapi/media/msm_camsensor_sdk.h>



#include <linux/compat.h>
@@ -73,16 +72,6 @@ struct csid_cfg_data32 { 
	} cfg;

};



struct msm_ir_led_cfg_data_t32 {

	enum msm_ir_led_cfg_type_t cfg_type;

	int32_t pwm_duty_on_ns;

	int32_t pwm_period_ns;

};



struct msm_ir_cut_cfg_data_t32 {

	enum msm_ir_cut_cfg_type_t cfg_type;

};



struct eeprom_read_t32 {

	compat_uptr_t dbuffer;

	uint32_t num_bytes;
@@ -270,11 +259,6 @@ struct msm_flash_cfg_data_t32 { 
#define VIDIOC_MSM_FLASH_CFG32 \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 13, struct msm_flash_cfg_data_t32)



#define VIDIOC_MSM_IR_LED_CFG32 \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 14, struct msm_ir_led_cfg_data_t32)



#define VIDIOC_MSM_IR_CUT_CFG32 \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_ir_cut_cfg_data_t32)

#endif



#endif

include/media/msmb_isp.h

+3 −14
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, 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
@@ -28,18 +28,7 @@ struct msm_isp_event_data32 { 
		struct msm_isp_sof_info sof_info;

	} u;

};



struct msm_isp32_event_data32 {

	struct compat_timeval timestamp;

	struct compat_timeval mono_timestamp;

	enum msm_vfe_input_src input_intf;

	uint32_t frame_id;

	union {

		struct msm_isp_stats_event stats;

		struct msm_isp_buf_event buf_done;

		struct msm_isp32_error_info error_info;

	} u;

};

#endif



#endif

#endif /* __MSMB_ISP__ */

include/uapi/media/msm_cam_sensor.h

+1 −19
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ enum sensor_sub_module_t { 
	SUB_MODULE_CSIPHY_3D,

	SUB_MODULE_OIS,

	SUB_MODULE_EXT,

	SUB_MODULE_IR_LED,

	SUB_MODULE_IR_CUT,

	SUB_MODULE_MAX,

};
@@ -288,21 +286,11 @@ struct msm_eeprom_info_t { 
	struct msm_eeprom_memory_map_array *mem_map_array;

};



struct msm_ir_led_cfg_data_t {

	enum msm_ir_led_cfg_type_t cfg_type;

	int32_t pwm_duty_on_ns;

	int32_t pwm_period_ns;

};



struct msm_ir_cut_cfg_data_t {

	enum msm_ir_cut_cfg_type_t cfg_type;

};



struct msm_eeprom_cfg_data {

	enum eeprom_cfg_type_t cfgtype;

	uint8_t is_supported;

	union {

		char eeprom_name[MAX_SENSOR_NAME];

		char eeprom_name[MAX_EEPROM_NAME];

		struct eeprom_get_t get_data;

		struct eeprom_read_t read_data;

		struct eeprom_write_t write_data;
@@ -598,11 +586,5 @@ struct sensor_init_cfg_data { 
#define VIDIOC_MSM_OIS_CFG_DOWNLOAD \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 14, struct msm_ois_cfg_download_data)



#define VIDIOC_MSM_IR_LED_CFG \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_ir_led_cfg_data_t)



#define VIDIOC_MSM_IR_CUT_CFG \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_ir_cut_cfg_data_t)



#endif

include/uapi/media/msm_camsensor_sdk.h

+0 −31
Original line number Diff line number Diff line
@@ -114,15 +114,6 @@ enum msm_sensor_power_seq_gpio_t { 
	SENSOR_GPIO_MAX,

};



enum msm_ir_cut_filter_gpio_t {

	IR_CUT_FILTER_GPIO_P = 0,

	IR_CUT_FILTER_GPIO_M,

	IR_CUT_FILTER_GPIO_MAX,

};

#define IR_CUT_FILTER_GPIO_P IR_CUT_FILTER_GPIO_P

#define IR_CUT_FILTER_GPIO_M IR_CUT_FILTER_GPIO_M

#define R_CUT_FILTER_GPIO_MAX IR_CUT_FILTER_GPIO_MAX



enum msm_camera_vreg_name_t {

	CAM_VDIG,

	CAM_VIO,
@@ -191,28 +182,6 @@ enum msm_flash_cfg_type_t { 
	CFG_FLASH_HIGH,

};



enum msm_ir_led_cfg_type_t {

	CFG_IR_LED_INIT = 0,

	CFG_IR_LED_RELEASE,

	CFG_IR_LED_OFF,

	CFG_IR_LED_ON,

};

#define CFG_IR_LED_INIT CFG_IR_LED_INIT

#define CFG_IR_LED_RELEASE CFG_IR_LED_RELEASE

#define CFG_IR_LED_OFF CFG_IR_LED_OFF

#define CFG_IR_LED_ON CFG_IR_LED_ON



enum msm_ir_cut_cfg_type_t {

	CFG_IR_CUT_INIT = 0,

	CFG_IR_CUT_RELEASE,

	CFG_IR_CUT_OFF,

	CFG_IR_CUT_ON,

};

#define CFG_IR_CUT_INIT CFG_IR_CUT_INIT

#define CFG_IR_CUT_RELEASE CFG_IR_CUT_RELEASE

#define CFG_IR_CUT_OFF CFG_IR_CUT_OFF

#define CFG_IR_CUT_ON CFG_IR_CUT_ON



enum msm_sensor_output_format_t {

	MSM_SENSOR_BAYER,

	MSM_SENSOR_YCBCR,

include/uapi/media/msm_jpeg_dma.h

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, 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
@@ -18,4 +18,10 @@ 
/* msm jpeg dma control ID's */

#define V4L2_CID_JPEG_DMA_SPEED (V4L2_CID_PRIVATE_BASE)



/* msm_jpeg_dma_buf */

struct msm_jpeg_dma_buff {

	int32_t fd;

	uint32_t offset;

};



#endif /* __UAPI_MSM_JPEG_DMA__ */