diff --git a/isp_wrapper/src/isp_wrapper.c b/isp_wrapper/src/isp_wrapper.c index b3b5629..83c44da 100644 --- a/isp_wrapper/src/isp_wrapper.c +++ b/isp_wrapper/src/isp_wrapper.c @@ -27,15 +27,11 @@ #include "imx335_isp_param_conf.h" #include "zephyr/drivers/video-controls.h" #include "zephyr/drivers/video.h" +#include "zephyr/drivers/video/stm32_dcmipp.h" #include LOG_MODULE_REGISTER(isp_wrapper); -extern void stm32_dcmipp_isp_vsync_update(DCMIPP_HandleTypeDef *hdcmipp, uint32_t Pipe); -extern int stm32_dcmipp_isp_init(DCMIPP_HandleTypeDef *hdcmipp, const struct device *sensor); -extern int stm32_dcmipp_isp_start(void); -extern int stm32_dcmipp_isp_stop(void); - static const struct device *sensor_i; static ISP_HandleTypeDef isp_i; static struct k_thread isp_thread; @@ -72,8 +68,6 @@ static ISP_StatusTypeDef isp_SetSensorGain(uint32_t Instance, int32_t Gain) struct video_control ctrl; int ret; - assert(sensor_i); - ctrl.id = VIDEO_CID_ANALOGUE_GAIN; ctrl.val = Gain; ret = video_set_ctrl(sensor_i, &ctrl); @@ -101,8 +95,6 @@ static ISP_StatusTypeDef isp_SetSensorExposure(uint32_t Instance, int32_t Exposu struct video_control ctrl; int ret; - assert(sensor_i); - ctrl.id = VIDEO_CID_EXPOSURE; ctrl.val = Exposure / IMX335_1H_PERIOD_USEC; ret = video_set_ctrl(sensor_i, &ctrl); @@ -152,6 +144,8 @@ int stm32_dcmipp_isp_init(DCMIPP_HandleTypeDef *hdcmipp, const struct device *se k_tid_t isp_tid; int res; + assert(sensor); + sensor_i = sensor; res = ISP_Init(&isp_i, hdcmipp, 0, &isp_helpers, &ISP_IQParamCacheInit_IMX335); if (res) @@ -180,8 +174,6 @@ int stm32_dcmipp_isp_start(void) int stm32_dcmipp_isp_stop(void) { - assert(0); - return 0; }