Merge "msm-camera: Add placeholders for 3A features in YUV sensor for 8916" (fc0c93bc) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/sensor/ov5645.c

+13 −22

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@ int32_t ov5645_sensor_config(struct msm_sensor_ctrl_t *s_ctrl,
		{
		struct sensorb_cfg_data cdata = (struct sensorb_cfg_data )argp;
		long rc = 0;
		int32_t i = 0, shp_lev = 0, con_lev = 0, sat_lev = 0;
		int32_t i = 0;
		mutex_lock(s_ctrl->msm_sensor_mutex);
		CDBG("%s:%d %s cfgtype = %d\n", __func__, __LINE__,
		s_ctrl->sensordata->sensor_name, cdata->cfgtype);
		@@ -858,31 +858,10 @@ int32_t ov5645_sensor_config(struct msm_sensor_ctrl_t *s_ctrl,
		break;
		}
		case CFG_SET_SATURATION:
		if (copy_from_user(&sat_lev, (void *)cdata->cfg.setting,
		sizeof(int32_t))) {
		pr_err("%s:%d failed\n", __func__, __LINE__);
		rc = -EFAULT;
		break;
		}
		pr_debug("%s: Saturation Value is %d", __func__, sat_lev);
		break;
		case CFG_SET_CONTRAST:
		if (copy_from_user(&con_lev, (void *)cdata->cfg.setting,
		sizeof(int32_t))) {
		pr_err("%s:%d failed\n", __func__, __LINE__);
		rc = -EFAULT;
		break;
		}
		pr_debug("%s: Contrast Value is %d", __func__, con_lev);
		break;
		case CFG_SET_SHARPNESS:
		if (copy_from_user(&shp_lev, (void *)cdata->cfg.setting,
		sizeof(int32_t))) {
		pr_err("%s:%d failed\n", __func__, __LINE__);
		rc = -EFAULT;
		break;
		}
		pr_debug("%s: Sharpness Value is %d", __func__, shp_lev);
		break;
		case CFG_SET_AUTOFOCUS:
		/* TO-DO: set the Auto Focus */
		@@ -892,6 +871,18 @@ int32_t ov5645_sensor_config(struct msm_sensor_ctrl_t *s_ctrl,
		/* TO-DO: Cancel the Auto Focus */
		pr_debug("%s: Cancelling Auto Focus", __func__);
		break;
		case CFG_SET_ISO:
		break;
		case CFG_SET_EXPOSURE_COMPENSATION:
		break;
		case CFG_SET_EFFECT:
		break;
		case CFG_SET_ANTIBANDING:
		break;
		case CFG_SET_BESTSHOT_MODE:
		break;
		case CFG_SET_WHITE_BALANCE:
		break;
		default:
		rc = -EFAULT;
		break;