From 57f0f9a7ab6dcaa9bccf1e78c100dc0d3f9ca0a5 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 8 Mar 2021 17:19:43 +0800 Subject: [PATCH] camera_qcom: remove eeprom related stuff (#20254) old-commit-hash: e0cc95a56556b30421f7f24cd1caebd4c3a10125 --- selfdrive/camerad/cameras/camera_qcom.cc | 37 ------------------------ selfdrive/camerad/cameras/camera_qcom.h | 4 +-- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/selfdrive/camerad/cameras/camera_qcom.cc b/selfdrive/camerad/cameras/camera_qcom.cc index a053a8726f..8bfda480a8 100644 --- a/selfdrive/camerad/cameras/camera_qcom.cc +++ b/selfdrive/camerad/cameras/camera_qcom.cc @@ -328,28 +328,6 @@ static void do_autoexposure(CameraState *s, float grey_frac) { } } -static uint8_t* get_eeprom(int eeprom_fd, size_t *out_len) { - msm_eeprom_cfg_data cfg = {.cfgtype = CFG_EEPROM_GET_CAL_DATA}; - int err = ioctl(eeprom_fd, VIDIOC_MSM_EEPROM_CFG, &cfg); - assert(err >= 0); - - uint32_t num_bytes = cfg.cfg.get_data.num_bytes; - assert(num_bytes > 100); - - uint8_t* buffer = (uint8_t*)malloc(num_bytes); - assert(buffer); - memset(buffer, 0, num_bytes); - - cfg.cfgtype = CFG_EEPROM_READ_CAL_DATA; - cfg.cfg.read_data.num_bytes = num_bytes; - cfg.cfg.read_data.dbuffer = buffer; - err = ioctl(eeprom_fd, VIDIOC_MSM_EEPROM_CFG, &cfg); - assert(err >= 0); - - *out_len = num_bytes; - return buffer; -} - static void sensors_init(MultiCameraState *s) { unique_fd sensorinit_fd; sensorinit_fd = open("/dev/v4l-subdev11", O_RDWR | O_NONBLOCK); @@ -461,9 +439,6 @@ static void camera_open(CameraState *s, bool is_road_cam) { sensor_dev = "/dev/v4l-subdev17"; s->isp_fd = open("/dev/v4l-subdev13", O_RDWR | O_NONBLOCK); assert(s->isp_fd >= 0); - s->eeprom_fd = open("/dev/v4l-subdev8", O_RDWR | O_NONBLOCK); - assert(s->eeprom_fd >= 0); - s->actuator_fd = open("/dev/v4l-subdev7", O_RDWR | O_NONBLOCK); assert(s->actuator_fd >= 0); } else { @@ -474,8 +449,6 @@ static void camera_open(CameraState *s, bool is_road_cam) { sensor_dev = "/dev/v4l-subdev18"; s->isp_fd = open("/dev/v4l-subdev14", O_RDWR | O_NONBLOCK); assert(s->isp_fd >= 0); - s->eeprom_fd = open("/dev/v4l-subdev9", O_RDWR | O_NONBLOCK); - assert(s->eeprom_fd >= 0); } // wait for sensor device @@ -537,14 +510,6 @@ static void camera_open(CameraState *s, bool is_road_cam) { // **** GO GO GO **** LOG("******************** GO GO GO ************************"); - s->eeprom = get_eeprom(s->eeprom_fd, &s->eeprom_size); - - // printf("eeprom:\n"); - // for (int i=0; ieeprom_size; i++) { - // printf("%02x", s->eeprom[i]); - // } - // printf("\n"); - // CSID: init csid csid_cfg_data.cfgtype = CSID_INIT; err = ioctl(s->csid_fd, VIDIOC_MSM_CSID_IO_CFG, &csid_cfg_data); @@ -1083,8 +1048,6 @@ static void camera_close(CameraState *s) { LOG("isp release stream: %d", err); } } - - free(s->eeprom); } const char* get_isp_event_name(unsigned int type) { diff --git a/selfdrive/camerad/cameras/camera_qcom.h b/selfdrive/camerad/cameras/camera_qcom.h index 22da01d9e0..2f626c534e 100644 --- a/selfdrive/camerad/cameras/camera_qcom.h +++ b/selfdrive/camerad/cameras/camera_qcom.h @@ -75,7 +75,7 @@ typedef struct CameraState { camera_apply_exposure_func apply_exposure; // rear camera only,used for focusing - unique_fd actuator_fd, eeprom_fd; + unique_fd actuator_fd; std::atomic focus_err; std::atomic last_sag_acc_z; std::atomic lens_true_pos; @@ -85,8 +85,6 @@ typedef struct CameraState { int16_t focus[NUM_FOCUS]; uint8_t confidence[NUM_FOCUS]; uint16_t infinity_dac; - size_t eeprom_size; - uint8_t *eeprom; } CameraState;