Revert "Camera Bring-up MR1."
This reverts commit 5cf67b1a1f82e20e9659a4a120c67abe4f918893.
Change-Id: If4e182553f46918e5b7a84e9f915039a52541ebb
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
diff --git a/include/media/msm_camera.h b/include/media/msm_camera.h
old mode 100755
new mode 100644
index a94dc66..d1d4eaa
--- a/include/media/msm_camera.h
+++ b/include/media/msm_camera.h
@@ -16,7 +16,6 @@
#ifdef MSM_CAMERA_BIONIC
#include <sys/types.h>
#endif
-#include <linux/videodev2.h>
#include <linux/types.h>
#include <linux/ioctl.h>
#ifdef __KERNEL__
@@ -28,14 +27,12 @@
#include <linux/time.h>
#endif
-#include <linux/msm_ion.h>
+#include <linux/ion.h>
#define BIT(nr) (1UL << (nr))
#define MSM_CAM_IOCTL_MAGIC 'm'
-#define MAX_SERVER_PAYLOAD_LENGTH 8192
-
#define MSM_CAM_IOCTL_GET_SENSOR_INFO \
_IOR(MSM_CAM_IOCTL_MAGIC, 1, struct msm_camsensor_info *)
@@ -154,7 +151,7 @@
_IOW(MSM_CAM_IOCTL_MAGIC, 39, struct msm_camera_st_frame *)
#define MSM_CAM_IOCTL_V4L2_EVT_NOTIFY \
- _IOW(MSM_CAM_IOCTL_MAGIC, 40, struct v4l2_event_and_payload)
+ _IOR(MSM_CAM_IOCTL_MAGIC, 40, struct v4l2_event *)
#define MSM_CAM_IOCTL_SET_MEM_MAP_INFO \
_IOR(MSM_CAM_IOCTL_MAGIC, 41, struct msm_mem_map_info *)
@@ -219,47 +216,6 @@
#define MSM_CAM_IOCTL_STATS_UNREG_BUF \
_IOR(MSM_CAM_IOCTL_MAGIC, 61, struct msm_stats_flush_bufq *)
-#define MSM_CAM_IOCTL_CSIC_IO_CFG \
- _IOWR(MSM_CAM_IOCTL_MAGIC, 62, struct csic_cfg_data *)
-
-#define MSM_CAM_IOCTL_CSID_IO_CFG \
- _IOWR(MSM_CAM_IOCTL_MAGIC, 63, struct csid_cfg_data *)
-
-#define MSM_CAM_IOCTL_CSIPHY_IO_CFG \
- _IOR(MSM_CAM_IOCTL_MAGIC, 64, struct csiphy_cfg_data *)
-
-#define MSM_CAM_IOCTL_OEM \
- _IOW(MSM_CAM_IOCTL_MAGIC, 65, struct sensor_cfg_data *)
-
-#define MSM_CAM_IOCTL_AXI_INIT \
- _IOWR(MSM_CAM_IOCTL_MAGIC, 66, uint8_t *)
-
-#define MSM_CAM_IOCTL_AXI_RELEASE \
- _IO(MSM_CAM_IOCTL_MAGIC, 67)
-
-#define MSM_CAM_IOCTL_V4L2_EVT_NATIVE_CMD \
- _IOWR(MSM_CAM_IOCTL_MAGIC, 68, struct msm_camera_v4l2_ioctl_t)
-
-#define MSM_CAM_IOCTL_V4L2_EVT_NATIVE_FRONT_CMD \
- _IOWR(MSM_CAM_IOCTL_MAGIC, 69, struct msm_camera_v4l2_ioctl_t)
-
-#define MSM_CAM_IOCTL_INTF_MCTL_MAPPING_CFG \
- _IOR(MSM_CAM_IOCTL_MAGIC, 70, struct intf_mctl_mapping_cfg *)
-
-struct ioctl_native_cmd {
- unsigned short mode;
- unsigned short address;
- unsigned short value_1;
- unsigned short value_2;
- unsigned short value_3;
-};
-
-struct v4l2_event_and_payload {
- struct v4l2_event evt;
- uint32_t payload_length;
- uint32_t transaction_id;
- void *payload;
-};
struct msm_stats_reqbuf {
int num_buf; /* how many buffers requested */
@@ -394,27 +350,6 @@
uint32_t inst_handle;
};
-struct msm_pp_crop {
- uint32_t src_x;
- uint32_t src_y;
- uint32_t src_w;
- uint32_t src_h;
- uint32_t dst_x;
- uint32_t dst_y;
- uint32_t dst_w;
- uint32_t dst_h;
- uint8_t update_flag;
-};
-
-struct msm_mctl_pp_frame_cmd {
- uint32_t cookie;
- uint8_t vpe_output_action;
- struct msm_pp_frame src_frame;
- struct msm_pp_frame dest_frame;
- struct msm_pp_crop crop;
- int path;
-};
-
struct msm_cam_evt_divert_frame {
unsigned short image_mode;
unsigned short op_mode;
@@ -503,11 +438,11 @@
#define CMD_STATS_AF_ENABLE 13
#define CMD_STATS_AEC_ENABLE 14
#define CMD_STATS_AWB_ENABLE 15
-#define CMD_STATS_ENABLE 16
+#define CMD_STATS_ENABLE 16
#define CMD_STATS_AXI_CFG 17
#define CMD_STATS_AEC_AXI_CFG 18
-#define CMD_STATS_AF_AXI_CFG 19
+#define CMD_STATS_AF_AXI_CFG 19
#define CMD_STATS_AWB_AXI_CFG 20
#define CMD_STATS_RS_AXI_CFG 21
#define CMD_STATS_CS_AXI_CFG 22
@@ -551,8 +486,8 @@
#define CMD_STATS_BG_BUF_RELEASE 56
#define CMD_STATS_BF_BUF_RELEASE 57
#define CMD_STATS_BHIST_BUF_RELEASE 58
-#define CMD_VFE_PIX_SOF_COUNT_UPDATE 59
-#define CMD_VFE_COUNT_PIX_SOF_ENABLE 60
+#define CMD_VFE_SOF_COUNT_UPDATE 59
+#define CMD_VFE_COUNT_SOF_ENABLE 60
#define CMD_AXI_CFG_PRIM BIT(8)
#define CMD_AXI_CFG_PRIM_ALL_CHNLS BIT(9)
@@ -560,13 +495,10 @@
#define CMD_AXI_CFG_SEC_ALL_CHNLS BIT(11)
#define CMD_AXI_CFG_TERT1 BIT(12)
#define CMD_AXI_CFG_TERT2 BIT(13)
-#define CMD_AXI_CFG_TERT3 BIT(14)
#define CMD_AXI_START 0xE1
#define CMD_AXI_STOP 0xE2
#define CMD_AXI_RESET 0xE3
-#define CMD_AXI_ABORT 0xE4
-
#define AXI_CMD_PREVIEW BIT(0)
@@ -651,7 +583,6 @@
MSM_STATS_TYPE_BF, /* Bayer Focus */
MSM_STATS_TYPE_BHIST, /* Bayer Hist */
MSM_STATS_TYPE_AE_AW, /* legacy stats for vfe 2.x*/
- MSM_STATS_TYPE_COMP, /* Composite stats */
MSM_STATS_TYPE_MAX /* MAX */
};
@@ -714,7 +645,8 @@
#define OUTPUT_SEC_ALL_CHNLS BIT(11)
#define OUTPUT_TERT1 BIT(12)
#define OUTPUT_TERT2 BIT(13)
-#define OUTPUT_TERT3 BIT(14)
+
+
#define MSM_FRAME_PREV_1 0
#define MSM_FRAME_PREV_2 1
@@ -730,12 +662,8 @@
#define OUTPUT_TYPE_ST_D BIT(7)
#define OUTPUT_TYPE_R BIT(8)
#define OUTPUT_TYPE_R1 BIT(9)
-#define OUTPUT_TYPE_SAEC BIT(10)
-#define OUTPUT_TYPE_SAFC BIT(11)
-#define OUTPUT_TYPE_SAWB BIT(12)
-#define OUTPUT_TYPE_IHST BIT(13)
-#define OUTPUT_TYPE_CSTA BIT(14)
-#define OUTPUT_TYPE_R2 BIT(15)
+
+
struct fd_roi_info {
void *info;
@@ -850,39 +778,27 @@
/* extendedmode for the thumb nail image in VIDIOC_S_PARM */
#define MSM_V4L2_EXT_CAPTURE_MODE_THUMBNAIL \
(MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+4)
-/* ISP_PIX_OUTPUT1: no pp, directly send output1 buf to user */
-#define MSM_V4L2_EXT_CAPTURE_MODE_ISP_PIX_OUTPUT1 \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+5)
-/* ISP_PIX_OUTPUT2: no pp, directly send output2 buf to user */
-#define MSM_V4L2_EXT_CAPTURE_MODE_ISP_PIX_OUTPUT2 \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+6)
-/* raw image type */
#define MSM_V4L2_EXT_CAPTURE_MODE_RAW \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+7)
-/* RDI dump */
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+5)
#define MSM_V4L2_EXT_CAPTURE_MODE_RDI \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+8)
-/* RDI dump 1 */
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+6)
#define MSM_V4L2_EXT_CAPTURE_MODE_RDI1 \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+9)
-/* RDI dump 2 */
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+7)
#define MSM_V4L2_EXT_CAPTURE_MODE_RDI2 \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+10)
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+8)
#define MSM_V4L2_EXT_CAPTURE_MODE_AEC \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+11)
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+9)
#define MSM_V4L2_EXT_CAPTURE_MODE_AWB \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+12)
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+10)
#define MSM_V4L2_EXT_CAPTURE_MODE_AF \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+13)
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+11)
#define MSM_V4L2_EXT_CAPTURE_MODE_IHIST \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+14)
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+12)
#define MSM_V4L2_EXT_CAPTURE_MODE_CS \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+15)
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+13)
#define MSM_V4L2_EXT_CAPTURE_MODE_RS \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+16)
-#define MSM_V4L2_EXT_CAPTURE_MODE_CSTA \
- (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+17)
-#define MSM_V4L2_EXT_CAPTURE_MODE_MAX (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+18)
+ (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+14)
+#define MSM_V4L2_EXT_CAPTURE_MODE_MAX (MSM_V4L2_EXT_CAPTURE_MODE_DEFAULT+15)
#define MSM_V4L2_PID_MOTION_ISO V4L2_CID_PRIVATE_BASE
#define MSM_V4L2_PID_EFFECT (V4L2_CID_PRIVATE_BASE+1)
@@ -935,8 +851,7 @@
#define MSM_V4L2_CLOSE 11
#define MSM_V4L2_SET_CTRL_CMD 12
#define MSM_V4L2_EVT_SUB_MASK 13
-#define MSM_V4L2_PRIVATE_CMD 14
-#define MSM_V4L2_MAX 15
+#define MSM_V4L2_MAX 14
#define V4L2_CAMERA_EXIT 43
struct crop_info {
@@ -1003,15 +918,7 @@
#define CFG_START_STREAM 44
#define CFG_STOP_STREAM 45
#define CFG_GET_CSI_PARAMS 46
-#define CFG_POWER_UP 47
-#define CFG_POWER_DOWN 48
-#define CFG_WRITE_I2C_ARRAY 49
-#define CFG_READ_I2C_ARRAY 50
-#define CFG_PCLK_CHANGE 51
-#define CFG_CONFIG_VREG_ARRAY 52
-#define CFG_CONFIG_CLK_ARRAY 53
-#define CFG_GPIO_OP 54
-#define CFG_MAX 55
+#define CFG_MAX 47
#define MOVE_NEAR 0
@@ -1255,7 +1162,7 @@
uint16_t gb_gain;
uint16_t gain_adjust;
};
-struct sensor_3d_cali_data_t {
+struct sensor_3d_cali_data_t{
unsigned char left_p_matrix[3][4][8];
unsigned char right_p_matrix[3][4][8];
unsigned char square_len[8];
@@ -1285,6 +1192,17 @@
uint8_t pict_res;
};
+#define ROLLOFF_CALDATA_SIZE (17 * 13)
+typedef struct
+{
+ unsigned short mesh_rolloff_table_size; // TableSize
+ uint8_t r_gain[ROLLOFF_CALDATA_SIZE]; // RGain
+ uint8_t gr_gain[ROLLOFF_CALDATA_SIZE]; // GRGain
+ uint8_t gb_gain[ROLLOFF_CALDATA_SIZE]; // GBGain
+ uint8_t b_gain[ROLLOFF_CALDATA_SIZE]; // BGain
+ uint8_t red_ref[17];
+} rolloff_caldata_array_type;
+
struct sensor_calib_data {
/* Color Related Measurements */
uint16_t r_over_g;
@@ -1297,6 +1215,8 @@
uint16_t stroke_amt;
uint16_t af_pos_1m;
uint16_t af_pos_inf;
+ /* Lens Shading Calibration Data */
+ rolloff_caldata_array_type rolloff;
};
enum msm_sensor_resolution_t {
@@ -1326,33 +1246,6 @@
uint16_t num_info;
};
-struct msm_sensor_exp_gain_info_t {
- uint16_t coarse_int_time_addr;
- uint16_t global_gain_addr;
- uint16_t vert_offset;
-};
-
-struct msm_sensor_output_reg_addr_t {
- uint16_t x_output;
- uint16_t y_output;
- uint16_t line_length_pclk;
- uint16_t frame_length_lines;
-};
-
-struct sensor_driver_params_type {
- struct msm_camera_i2c_reg_setting *init_settings;
- uint16_t init_settings_size;
- struct msm_camera_i2c_reg_setting *mode_settings;
- uint16_t mode_settings_size;
- struct msm_sensor_output_reg_addr_t *sensor_output_reg_addr;
- struct msm_camera_i2c_reg_setting *start_settings;
- struct msm_camera_i2c_reg_setting *stop_settings;
- struct msm_camera_i2c_reg_setting *groupon_settings;
- struct msm_camera_i2c_reg_setting *groupoff_settings;
- struct msm_sensor_exp_gain_info_t *sensor_exp_gain_info;
- struct msm_sensor_output_info_t *output_info;
-};
-
struct mirror_flip {
int32_t x_mirror;
int32_t y_flip;
@@ -1375,82 +1268,11 @@
};
struct csi_lane_params_t {
- uint16_t csi_lane_assign;
+ uint8_t csi_lane_assign;
uint8_t csi_lane_mask;
uint8_t csi_if;
- uint8_t csid_core[2];
- uint8_t csi_phy_sel;
-};
-
-struct msm_camera_csid_lut_params {
- uint8_t num_cid;
- struct msm_camera_csid_vc_cfg *vc_cfg;
-};
-
-struct msm_camera_csid_params {
- uint8_t lane_cnt;
- uint16_t lane_assign;
- uint8_t phy_sel;
- struct msm_camera_csid_lut_params lut_params;
-};
-
-struct msm_camera_csiphy_params {
- uint8_t lane_cnt;
- uint8_t settle_cnt;
- uint16_t lane_mask;
- uint8_t combo_mode;
-};
-
-struct msm_camera_csi2_params {
- struct msm_camera_csid_params csid_params;
- struct msm_camera_csiphy_params csiphy_params;
-};
-
-enum msm_camera_csi_data_format {
- CSI_8BIT,
- CSI_10BIT,
- CSI_12BIT,
-};
-
-struct msm_camera_csi_params {
- enum msm_camera_csi_data_format data_format;
- uint8_t lane_cnt;
- uint8_t lane_assign;
- uint8_t settle_cnt;
- uint8_t dpcm_scheme;
-};
-
-enum csic_cfg_type_t {
- CSIC_INIT,
- CSIC_CFG,
-};
-
-struct csic_cfg_data {
- enum csic_cfg_type_t cfgtype;
- struct msm_camera_csi_params *csic_params;
-};
-
-enum csid_cfg_type_t {
- CSID_INIT,
- CSID_CFG,
-};
-
-struct csid_cfg_data {
- enum csid_cfg_type_t cfgtype;
- union {
- uint32_t csid_version;
- struct msm_camera_csid_params *csid_params;
- } cfg;
-};
-
-enum csiphy_cfg_type_t {
- CSIPHY_INIT,
- CSIPHY_CFG,
-};
-
-struct csiphy_cfg_data {
- enum csiphy_cfg_type_t cfgtype;
- struct msm_camera_csiphy_params *csiphy_params;
+ uint8_t csid_core;
+ uint32_t csid_version;
};
#define CSI_EMBED_DATA 0x12
@@ -1459,9 +1281,6 @@
#define CSI_RAW8 0x2A
#define CSI_RAW10 0x2B
#define CSI_RAW12 0x2C
-#define CSI_YUV420_Y_8 0x30
-#define CSI_YUV420_UV_8 0x31
-#define CSI_YUV420_JM_8 0x32
#define CSI_DECODE_6BIT 0
#define CSI_DECODE_8BIT 1
@@ -1553,81 +1372,6 @@
} cfg;
};
-enum msm_camera_i2c_reg_addr_type {
- MSM_CAMERA_I2C_BYTE_ADDR = 1,
- MSM_CAMERA_I2C_WORD_ADDR,
-};
-
-struct msm_camera_i2c_reg_array {
- uint16_t reg_addr;
- uint16_t reg_data;
-};
-
-enum msm_camera_i2c_data_type {
- MSM_CAMERA_I2C_BYTE_DATA = 1,
- MSM_CAMERA_I2C_WORD_DATA,
- MSM_CAMERA_I2C_SET_BYTE_MASK,
- MSM_CAMERA_I2C_UNSET_BYTE_MASK,
- MSM_CAMERA_I2C_SET_WORD_MASK,
- MSM_CAMERA_I2C_UNSET_WORD_MASK,
- MSM_CAMERA_I2C_SET_BYTE_WRITE_MASK_DATA,
-};
-
-struct msm_camera_i2c_reg_setting {
- struct msm_camera_i2c_reg_array *reg_setting;
- uint16_t size;
- enum msm_camera_i2c_reg_addr_type addr_type;
- enum msm_camera_i2c_data_type data_type;
- uint16_t delay;
-};
-
-enum oem_setting_type {
- I2C_READ = 1,
- I2C_WRITE,
- GPIO_OP,
- EEPROM_READ,
- VREG_SET,
- CLK_SET,
-};
-
-struct sensor_oem_setting {
- enum oem_setting_type type;
- void *data;
-};
-
-enum camera_vreg_type {
- REG_LDO,
- REG_VS,
- REG_GPIO,
-};
-
-struct camera_vreg_t {
- const char *reg_name;
- enum camera_vreg_type type;
- int min_voltage;
- int max_voltage;
- int op_mode;
- uint32_t delay;
-};
-
-struct msm_camera_vreg_setting {
- struct camera_vreg_t *cam_vreg;
- uint16_t num_vreg;
- uint8_t enable;
-};
-
-struct msm_cam_clk_info {
- const char *clk_name;
- long clk_rate;
- uint32_t delay;
-};
-
-struct msm_cam_clk_setting {
- struct msm_cam_clk_info *clk_info;
- uint16_t num_clk_info;
- uint8_t enable;
-};
-
struct sensor_cfg_data {
int cfgtype;
int mode;
@@ -1664,30 +1408,12 @@
int ae_mode;
uint8_t wb_val;
int8_t exp_compensation;
- uint32_t pclk;
struct cord aec_cord;
int is_autoflash;
struct mirror_flip mirror_flip;
- void *setting;
} cfg;
};
-enum gpio_operation_type {
- GPIO_REQUEST,
- GPIO_FREE,
- GPIO_SET_DIRECTION_OUTPUT,
- GPIO_SET_DIRECTION_INPUT,
- GPIO_GET_VALUE,
- GPIO_SET_VALUE,
-};
-
-struct msm_cam_gpio_operation {
- enum gpio_operation_type op_type;
- unsigned address;
- int value;
- const char *tag;
-};
-
struct damping_params_t {
uint32_t damping_step;
uint32_t damping_delay;
@@ -1844,17 +1570,11 @@
struct pixel_t video_coord[128];
};
-struct msm_calib_raw {
- uint8_t *data;
- uint32_t size;
-};
-
struct msm_camera_eeprom_info_t {
struct msm_eeprom_support af;
struct msm_eeprom_support wb;
struct msm_eeprom_support lsc;
struct msm_eeprom_support dpc;
- struct msm_eeprom_support raw;
};
struct msm_eeprom_cfg_data {
@@ -2027,9 +1747,6 @@
#define MSM_CAM_V4L2_IOCTL_PRIVATE_G_CTRL \
_IOWR('V', BASE_VIDIOC_PRIVATE + 9, struct msm_camera_v4l2_ioctl_t)
-#define MSM_CAM_V4L2_IOCTL_PRIVATE_GENERAL \
- _IOW('V', BASE_VIDIOC_PRIVATE + 10, struct msm_camera_v4l2_ioctl_t)
-
#define VIDIOC_MSM_VPE_INIT \
_IO('V', BASE_VIDIOC_PRIVATE + 15)
@@ -2040,7 +1757,7 @@
_IOWR('V', BASE_VIDIOC_PRIVATE + 17, struct msm_mctl_pp_params *)
#define VIDIOC_MSM_AXI_INIT \
- _IOWR('V', BASE_VIDIOC_PRIVATE + 18, uint8_t *)
+ _IO('V', BASE_VIDIOC_PRIVATE + 18)
#define VIDIOC_MSM_AXI_RELEASE \
_IO('V', BASE_VIDIOC_PRIVATE + 19)
@@ -2054,27 +1771,22 @@
#define VIDIOC_MSM_AXI_BUF_CFG \
_IOWR('V', BASE_VIDIOC_PRIVATE + 22, void *)
-#define VIDIOC_MSM_AXI_RDI_COUNT_UPDATE \
- _IOWR('V', BASE_VIDIOC_PRIVATE + 23, struct rdi_count_msg)
-
#define VIDIOC_MSM_VFE_INIT \
- _IO('V', BASE_VIDIOC_PRIVATE + 24)
+ _IO('V', BASE_VIDIOC_PRIVATE + 22)
#define VIDIOC_MSM_VFE_RELEASE \
- _IO('V', BASE_VIDIOC_PRIVATE + 25)
+ _IO('V', BASE_VIDIOC_PRIVATE + 23)
struct msm_camera_v4l2_ioctl_t {
uint32_t id;
- uint32_t len;
- uint32_t trans_code;
void __user *ioctl_ptr;
+ uint32_t len;
};
struct msm_camera_vfe_params_t {
uint32_t operation_mode;
uint32_t capture_count;
- uint8_t skip_reset;
- uint8_t stop_immediately;
+ uint32_t skip_abort;
uint16_t port_info;
uint32_t inst_handle;
uint16_t cmd_type;
@@ -2219,13 +1931,6 @@
uint32_t rev;
};
-struct intf_mctl_mapping_cfg {
- int is_bayer_sensor;
- int vnode_id;
- int num_entries;
- uint32_t image_modes[MSM_V4L2_EXT_CAPTURE_MODE_MAX];
-};
-
#define VIDIOC_MSM_CPP_CFG \
_IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_camera_v4l2_ioctl_t)
@@ -2245,8 +1950,7 @@
* ------------------------------------
* Bits : Purpose
* ------------------------------------
- * 31 : is Dev ID valid?
- * 30 - 24 : Dev ID.
+ * 31 - 24 : Reserved.
* 23 : is Image mode valid?
* 22 - 16 : Image mode.
* 15 : is MCTL PP inst idx valid?
@@ -2254,12 +1958,6 @@
* 7 : is Video inst idx valid?
* 6 - 0 : Video inst idx.
*/
-#define CLR_DEVID_MODE(handle) (handle &= 0x00FFFFFF)
-#define SET_DEVID_MODE(handle, data) \
- (handle |= ((0x1 << 31) | ((data & 0x7F) << 24)))
-#define GET_DEVID_MODE(handle) \
- ((handle & 0x80000000) ? ((handle & 0x7F000000) >> 24) : 0xFF)
-
#define CLR_IMG_MODE(handle) (handle &= 0xFF00FFFF)
#define SET_IMG_MODE(handle, data) \
(handle |= ((0x1 << 23) | ((data & 0x7F) << 16)))