[HACK][9610] fimc-is2: add sensor interface that transmit crop value for Troika
authorDohyun Kim <dh5.kim@samsung.com>
Mon, 8 Apr 2019 08:37:10 +0000 (17:37 +0900)
committerKim Gunho <gunho.kim@samsung.com>
Wed, 7 Aug 2019 13:00:23 +0000 (22:00 +0900)
Change-Id: I2ab248a42145ff71f5194d1ef38c331ab7a19287
Signed-off-by: Dohyun Kim <dh5.kim@samsung.com>
drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c
drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.h

index 19c80dcf97438a7125bb965f2dc5090c4f28646d..bcc05155793cdef3e31831f32cab3e6706b0b58c 100755 (executable)
@@ -1320,8 +1320,10 @@ int get_sensor_frame_timing(struct fimc_is_sensor_interface *itf,
 }
 
 int get_sensor_cur_size(struct fimc_is_sensor_interface *itf,
+#ifdef CONFIG_CAMERA_CIS_12A10_OBJ
                        u32 *cur_pos_x,
                        u32 *cur_pos_y,
+#endif
                        u32 *cur_width,
                        u32 *cur_height)
 {
@@ -1336,8 +1338,10 @@ int get_sensor_cur_size(struct fimc_is_sensor_interface *itf,
        FIMC_BUG(!sensor_peri);
        FIMC_BUG(!sensor_peri->cis.cis_data);
 
+#ifdef CONFIG_CAMERA_CIS_12A10_OBJ
        *cur_pos_x = sensor_peri->cis.cis_data->cur_pos_x;
        *cur_pos_y = sensor_peri->cis.cis_data->cur_pos_y;
+#endif
        *cur_width = sensor_peri->cis.cis_data->cur_width;
        *cur_height = sensor_peri->cis.cis_data->cur_height;
 
index 8f4a651de0dab9971f34986c70dfea8850349080..7f9a4170649ed451b46f8a258a49bfeb44c69cd3 100755 (executable)
@@ -806,8 +806,10 @@ struct fimc_is_cis_interface_ops {
                                u32 *max_margin_cit);
 
        int (*get_sensor_cur_size)(struct fimc_is_sensor_interface *itf,
+#ifdef CONFIG_CAMERA_CIS_12A10_OBJ
                                u32 *cur_pos_x,
                                u32 *cur_pos_y,
+#endif
                                u32 *cur_width,
                                u32 *cur_height);