camera: add function to de-initialize the driver

Author: igrr

components/camera/camera.c

@@ -345,18 +345,39 @@ esp_err_t camera_init(const camera_config_t* config)
     return ESP_OK;
 
 fail:
-    free(s_state->fb);
+    camera_deinit();
+    return err;
+}
+
+esp_err_t camera_deinit()
+{
+    if (s_state == NULL) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    if (s_state->dma_filter_task) {
+        vTaskDelete(s_state->dma_filter_task);
+    }
     if (s_state->data_ready) {
         vQueueDelete(s_state->data_ready);
     }
     if (s_state->frame_ready) {
         vSemaphoreDelete(s_state->frame_ready);
     }
-    if (s_state->dma_filter_task) {
-        vTaskDelete(s_state->dma_filter_task);
+    if (s_state->vsync_intr_handle) {
+        esp_intr_disable(s_state->vsync_intr_handle);
+        esp_intr_free(s_state->vsync_intr_handle);
+    }
+    if (s_state->i2s_intr_handle) {
+        esp_intr_disable(s_state->i2s_intr_handle);
+        esp_intr_free(s_state->i2s_intr_handle);
     }
     dma_desc_deinit();
-    return err;
+    free(s_state->fb);
+    free(s_state);
+    s_state = NULL;
+    camera_disable_out_clock();
+    periph_module_disable(PERIPH_I2S0_MODULE);
+    return ESP_OK;
 }
 
 uint8_t* camera_get_fb()

components/camera/include/camera.h

@@ -87,7 +87,7 @@ typedef struct {
 esp_err_t camera_probe(const camera_config_t* config, camera_model_t* out_camera_model);
 
 /**
- * @brief Initialize the camera
+ * @brief Initialize the camera driver
  *
  * @note call camera_probe before calling this function
  *
@@ -103,6 +103,15 @@ esp_err_t camera_probe(const camera_config_t* config, camera_model_t* out_camera
  */
 esp_err_t camera_init(const camera_config_t* config);
 
+/**
+ * Deinitialize the camera driver
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_STATE if the driver hasn't been initialized yet
+ */
+esp_err_t camera_deinit();
+
 /**
  * @brief Obtain the pointer to framebuffer allocated by camera_init function.
  *

components/camera/xclk.c

@@ -36,3 +36,7 @@ esp_err_t camera_enable_out_clock(camera_config_t* config)
     return ESP_OK;
 }
 
+void camera_disable_out_clock()
+{
+    periph_module_disable(PERIPH_LEDC_MODULE);
+}

components/camera/xclk.h

@@ -3,3 +3,5 @@
 #include "camera_common.h"
 
 esp_err_t camera_enable_out_clock();
+
+void camera_disable_out_clock();