video: stm32_dcmi: snapshot check returned buffer

If we had a timeout it would not check to see on next call
if maybe it had completed.

Signed-off-by: Kurt Eckhardt <[email protected]>

Author: KurtE

drivers/video/video_stm32_dcmi.c

@@ -45,7 +45,7 @@ struct video_stm32_dcmi_data {
 	struct k_fifo fifo_in;
 	struct k_fifo fifo_out;
 	struct video_buffer *vbuf;
-	bool snapshot_mode : 1;
+	bool snapshot_mode;
 };
 
 struct video_stm32_dcmi_config {
@@ -62,21 +62,21 @@ static void stm32_dcmi_process_dma_error(DCMI_HandleTypeDef *hdcmi)
 	struct video_stm32_dcmi_data *dev_data =
 		CONTAINER_OF(hdcmi, struct video_stm32_dcmi_data, hdcmi);
 
-       LOG_WRN("Restart DMA after Error!");
-       /* Lets try to recover by stopping and maybe restart */
-       if (HAL_DCMI_Stop(&dev_data->hdcmi) != HAL_OK) {
-	       LOG_WRN("HAL_DCMI_Stop FAILED!");
-	       return;
-       }
+	LOG_WRN("Restart DMA after Error!");
+	/* Lets try to recover by stopping and maybe restart */
+	if (HAL_DCMI_Stop(&dev_data->hdcmi) != HAL_OK) {
+	LOG_WRN("HAL_DCMI_Stop FAILED!");
+		return;
+	}
 
-       /* error on last transfer try to restart it */
-       if (HAL_DCMI_Start_DMA(&dev_data->hdcmi,
+	/* error on last transfer try to restart it */
+	if (HAL_DCMI_Start_DMA(&dev_data->hdcmi,
        			      dev_data->snapshot_mode ? DCMI_MODE_SNAPSHOT : DCMI_MODE_CONTINUOUS,
 			      (uint32_t)dev_data->vbuf->buffer,
 			      dev_data->vbuf->size / 4) != HAL_OK) {
 	       LOG_WRN("Continuous: HAL_DCMI_Start_DMA FAILED!");
 	       return;
-       }
+	}
 }
 
 void HAL_DCMI_ErrorCallback(DCMI_HandleTypeDef *hdcmi)
@@ -315,7 +315,6 @@ static int video_stm32_dcmi_enqueue(const struct device *dev, struct video_buffe
 {
 	struct video_stm32_dcmi_data *data = dev->data;
 	const uint32_t buffer_size = data->fmt.pitch * data->fmt.height;
-
 	if (buffer_size > vbuf->size) {
 		return -EINVAL;
 	}
@@ -334,11 +333,20 @@ static int video_stm32_dcmi_dequeue(const struct device *dev, struct video_buffe
 	struct video_stm32_dcmi_data *data = dev->data;
 
 	if (data->snapshot_mode) {
-		printk("dequeue snapshot: %p %llu\n", data->vbuf, timeout.ticks);
+		LOG_DBG("dequeue snapshot: %p %llu\n", data->vbuf, timeout.ticks);
 		/* See if we were already called and have an active buffer */
 		if (data->vbuf == NULL) {
+			/* check first to see if we already have a buffer returned */
+			*vbuf = k_fifo_get(&data->fifo_out, K_NO_WAIT);
+			if (*vbuf != NULL) {
+				LOG_DBG("k_fifo_get returned: %p\n", *vbuf);
+				if (HAL_DCMI_Stop(&data->hdcmi) != HAL_OK) {
+					LOG_WRN("Snapshot: HAL_DCMI_Stop FAILED!");
+				}
+				return 0;
+			}
 			data->vbuf = k_fifo_get(&data->fifo_in, K_NO_WAIT);
-			printk("\tcamera buf: %p\n", data->vbuf);
+			LOG_DBG("\tcamera buf: %p\n", data->vbuf);
 			if (data->vbuf == NULL) {
 				LOG_WRN("Snapshot: No Buffers available!");
 				return -ENOMEM;
@@ -356,7 +364,7 @@ static int video_stm32_dcmi_dequeue(const struct device *dev, struct video_buffe
 	}
 
 	*vbuf = k_fifo_get(&data->fifo_out, timeout);
-	printk("k_fifo_get returned: %p\n", *vbuf);
+	LOG_DBG("k_fifo_get returned: %p\n", *vbuf);
 
 	if (*vbuf == NULL) {
 		return -EAGAIN;