[COMMON] fimc-is2: use same 'frame state' enum. in H/W control

Change-Id: I0e882c329037bca51e59417b5aa114af9d498fd3
Signed-off-by: Jeongtae Park <jtp.park@samsung.com>

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-framemgr.h b/drivers/media/platform/exynos/fimc-is2/fimc-is-framemgr.h
index cef9be565b21f2ed99ce0a7ff8614c6224fabad0..31da4381bbcee4726fe73a9fbe0077923315bf5e 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-framemgr.h
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-framemgr.h
@@ -154,13 +154,11 @@ enum fimc_is_frame_state {
        FS_INVALID
 };
 
-enum fimc_is_hw_frame_state {
-       FS_HW_FREE,
-       FS_HW_REQUEST,
-       FS_HW_CONFIGURE,
-       FS_HW_WAIT_DONE,
-       FS_HW_INVALID
-};
+#define FS_HW_FREE     FS_FREE
+#define FS_HW_REQUEST  FS_REQUEST
+#define FS_HW_CONFIGURE        FS_PROCESS
+#define FS_HW_WAIT_DONE        FS_COMPLETE
+#define FS_HW_INVALID  FS_INVALID
 
 #define NR_FRAME_STATE FS_INVALID
 

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c
index ff8971af86b05dca763d599f5da4065e2e35aaee..977179fb083b6175cafe9fb1076d86a3da2f9354 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c
@@ -360,7 +360,7 @@ void print_all_hw_frame_count(struct fimc_is_hardware *hardware)
 }
 
 void fimc_is_hardware_flush_frame(struct fimc_is_hw_ip *hw_ip,
-       enum fimc_is_hw_frame_state state,
+       enum fimc_is_frame_state state,
        enum ShotErrorType done_type)
 {
        int ret = 0;
@@ -1763,7 +1763,7 @@ int fimc_is_hardware_process_start(struct fimc_is_hardware *hardware, u32 instan
 
 static int flush_frames_in_instance(struct fimc_is_hw_ip *hw_ip,
        struct fimc_is_framemgr *framemgr, u32 instance,
-       enum fimc_is_hw_frame_state state, enum ShotErrorType done_type)
+       enum fimc_is_frame_state state, enum ShotErrorType done_type)
 {
        int retry = 150;
        struct fimc_is_frame *frame;
@@ -1827,7 +1827,7 @@ void fimc_is_hardware_force_stop(struct fimc_is_hardware *hardware,
        int ret = 0;
        struct fimc_is_framemgr *framemgr;
        struct fimc_is_framemgr *framemgr_late;
-       enum fimc_is_hw_frame_state state;
+       enum fimc_is_frame_state state;
 
        FIMC_BUG_VOID(!hw_ip);
 

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.h b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.h
index d9f7413de2379b8effc11674ea6f5dc97339ac6d..33a967e45892ce689bab053e7b50ad23d8d17763 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.h
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.h
@@ -372,7 +372,7 @@ void framemgr_e_barrier_common(struct fimc_is_framemgr *this, u32 index, ulong f
 void framemgr_x_barrier_common(struct fimc_is_framemgr *this, u32 index, ulong flag);
 u32 get_hw_id_from_group(u32 group_id);
 void fimc_is_hardware_flush_frame(struct fimc_is_hw_ip *hw_ip,
-       enum fimc_is_hw_frame_state state,
+       enum fimc_is_frame_state state,
        enum ShotErrorType done_type);
 int fimc_is_hardware_probe(struct fimc_is_hardware *hardware,
        struct fimc_is_interface *itf, struct fimc_is_interface_ischain *itfc);