From f054a08b17a3bdf49a8c1fb78fb9c3497fa14ab4 Mon Sep 17 00:00:00 2001 From: Yumi Yukimura Date: Tue, 12 Mar 2024 20:58:29 +0800 Subject: [PATCH] clover: camera: Fix duplicated symbol `mm_camera_shim_module_init` Change-Id: I50cb2116bd289b16ec90c0c1700bf100f19c6c2d --- camera/QCamera2/stack/common/mm_camera_shim.h | 2 +- .../stack/mm-camera-interface/src/mm_camera_interface.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/camera/QCamera2/stack/common/mm_camera_shim.h b/camera/QCamera2/stack/common/mm_camera_shim.h index d134114..76917cb 100644 --- a/camera/QCamera2/stack/common/mm_camera_shim.h +++ b/camera/QCamera2/stack/common/mm_camera_shim.h @@ -94,6 +94,6 @@ typedef struct { int32_t (*mm_camera_shim_send_cmd)(cam_shim_packet_t *event); } mm_camera_shim_ops_t; -int32_t (*mm_camera_shim_module_init)(mm_camera_shim_ops_t *shim_ops); +extern int32_t (*mm_camera_shim_module_init)(mm_camera_shim_ops_t *shim_ops); #endif /*__MM_CAMERA_SHIMLAYER_H_*/ diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c index f76fa56..2b4c0f3 100644 --- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c +++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c @@ -51,6 +51,8 @@ #include "mm_camera.h" #include "mm_camera_muxer.h" +int32_t (*mm_camera_shim_module_init)(mm_camera_shim_ops_t *shim_ops); + static pthread_mutex_t g_intf_lock = PTHREAD_MUTEX_INITIALIZER; static mm_camera_ctrl_t g_cam_ctrl;