sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(msm_sensor_power_setting*) type conversions are not required (#20191)

Browse Source 
old-commit-hash: e6c47916a2
commatwo_master
Dean Lee 4 years ago committed by GitHub
parent 89f6aedd8c
commit ca8207b5c0
1 changed files with 4 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      selfdrive/camerad/cameras/camera_qcom.cc

12
selfdrive/camerad/cameras/camera_qcom.cc
Unescape View File

@ -604,10 +604,8 @@ static void sensors_init(MultiCameraState *s) {
.output_format = MSM_SENSOR_BAYER, .output_format = MSM_SENSOR_BAYER,
}; };
} }
slave_info.power_setting_array.power_setting = slave_info.power_setting_array.power_setting = &slave_info.power_setting_array.power_setting_a[0];
(struct msm_sensor_power_setting *)&slave_info.power_setting_array.power_setting_a[0]; slave_info.power_setting_array.power_down_setting = &slave_info.power_setting_array.power_down_setting_a[0];
slave_info.power_setting_array.power_down_setting =
(struct msm_sensor_power_setting *)&slave_info.power_setting_array.power_down_setting_a[0];
sensor_init_cfg_data sensor_init_cfg = {.cfgtype = CFG_SINIT_PROBE, .cfg.setting = &slave_info}; sensor_init_cfg_data sensor_init_cfg = {.cfgtype = CFG_SINIT_PROBE, .cfg.setting = &slave_info};
err = ioctl(sensorinit_fd, VIDIOC_MSM_SENSOR_INIT_CFG, &sensor_init_cfg); err = ioctl(sensorinit_fd, VIDIOC_MSM_SENSOR_INIT_CFG, &sensor_init_cfg);
LOG("sensor init cfg (road camera): %d", err); LOG("sensor init cfg (road camera): %d", err);
@ -719,10 +717,8 @@ static void sensors_init(MultiCameraState *s) {
.output_format = MSM_SENSOR_BAYER, .output_format = MSM_SENSOR_BAYER,
}; };
} }
slave_info2.power_setting_array.power_setting = slave_info2.power_setting_array.power_setting = &slave_info2.power_setting_array.power_setting_a[0];
(struct msm_sensor_power_setting *)&slave_info2.power_setting_array.power_setting_a[0]; slave_info2.power_setting_array.power_down_setting = &slave_info2.power_setting_array.power_down_setting_a[0];
slave_info2.power_setting_array.power_down_setting =
(struct msm_sensor_power_setting *)&slave_info2.power_setting_array.power_down_setting_a[0];
sensor_init_cfg.cfgtype = CFG_SINIT_PROBE; sensor_init_cfg.cfgtype = CFG_SINIT_PROBE;
sensor_init_cfg.cfg.setting = &slave_info2; sensor_init_cfg.cfg.setting = &slave_info2;
err = ioctl(sensorinit_fd, VIDIOC_MSM_SENSOR_INIT_CFG, &sensor_init_cfg); err = ioctl(sensorinit_fd, VIDIOC_MSM_SENSOR_INIT_CFG, &sensor_init_cfg);

Write Preview
Loading…
Cancel
Save