From d86fc4c75c61fb092406bc1048448c8e9e0f05bb Mon Sep 17 00:00:00 2001 From: Jake Carter Date: Thu, 13 Jul 2023 16:21:05 -0500 Subject: [PATCH] fix(ignore): Fix MAX78002 Build Regression When OV5640_DVP is Defined (#667) --- Libraries/MiscDrivers/Camera/mipi_camera.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Libraries/MiscDrivers/Camera/mipi_camera.c b/Libraries/MiscDrivers/Camera/mipi_camera.c index e2fc2e35a6d..29b15fadff8 100644 --- a/Libraries/MiscDrivers/Camera/mipi_camera.c +++ b/Libraries/MiscDrivers/Camera/mipi_camera.c @@ -70,9 +70,11 @@ extern int mipi_sensor_register(mipi_camera_t *camera); static mipi_camera_t camera; +#ifndef OV5640_DVP static mxc_csi2_req_t g_req; static mxc_csi2_ctrl_cfg_t g_ctrl_cfg; static mxc_csi2_vfifo_cfg_t g_vfifo_cfg; +#endif static mipi_camera_settings_t g_camera_settings; static char g_image_header[256]; @@ -215,6 +217,7 @@ int mipi_camera_init(mipi_camera_settings_t camera_settings) // Link function pointers from camera drivers mipi_sensor_register(&camera); +#ifndef OV5640_DVP error = camera.init(); if (error) return error; @@ -280,6 +283,7 @@ int mipi_camera_init(mipi_camera_settings_t camera_settings) if (error != E_NO_ERROR) { return error; } +#endif return error; }