Video: stm32_dcmi: Have snaphshot recover like continuous

As suggested, I am trying the changes suggested, and have the error recovery code run in both
modes, instead of returning an error condition in snapshot mode.

Now testing

Author: KurtE

drivers/video/video_stm32_dcmi.c

@@ -46,7 +46,6 @@ struct video_stm32_dcmi_data {
 	struct k_fifo fifo_out;
 	struct video_buffer *vbuf;
 	bool snapshot_mode : 1;
-	bool dma_error_detected : 1;
 };
 
 struct video_stm32_dcmi_config {
@@ -63,25 +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);
 
-	if (dev_data->snapshot_mode) {
-	       dev_data->dma_error_detected = true;
-	       k_fifo_cancel_wait(&dev_data->fifo_out);
-	} else {
-	       LOG_ERR("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, 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;
-	       }
-	}
+       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,
+       			      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)
@@ -363,23 +358,6 @@ 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);
 
-	if (data->dma_error_detected) {
-		data->dma_error_detected = false;
-		printk("\tDMA Error detected\n");
-
-		/* Should only happen in snapshot mode */
-		if (data->snapshot_mode) {
-			if (HAL_DCMI_Stop(&data->hdcmi) != HAL_OK) {
-				LOG_WRN("HAL_DCMI_Stop FAILED!");
-			}
-			if (data->vbuf != NULL) {
-				printk("\treturn buffer: %p\n", data->vbuf);
-				k_fifo_put(&data->fifo_in, data->vbuf);
-				data->vbuf = NULL;
-			}
-		}
-	}
-
 	if (*vbuf == NULL) {
 		return -EAGAIN;
 	}
@@ -646,7 +624,6 @@ static int video_stm32_dcmi_init(const struct device *dev)
 	}
 
 	/* See if we should initialize to only support snapshot mode or not */
-	data->dma_error_detected = false;
 	data->snapshot_mode = config->snapshot_mode;
 	if (CONFIG_VIDEO_BUFFER_POOL_NUM_MAX == 1) {
 		LOG_DBG("Only one buffer so snapshot mode only");