Skip to content

Commit d22f9a9

Browse files
committed
change(camera): change esp_cam_del_ctlr to esp_cam_ctlr_del
1 parent c706096 commit d22f9a9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

components/esp_driver_cam/esp_cam_ctlr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ esp_err_t esp_cam_ctlr_get_frame_buffer_len(esp_cam_ctlr_handle_t handle, size_t
8484
return handle->get_buffer_len(handle, ret_fb_len);
8585
}
8686

87-
esp_err_t esp_cam_del_ctlr(esp_cam_ctlr_handle_t handle)
87+
esp_err_t esp_cam_ctlr_del(esp_cam_ctlr_handle_t handle)
8888
{
8989
ESP_RETURN_ON_FALSE(handle, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
9090
ESP_RETURN_ON_FALSE(handle->del, ESP_ERR_NOT_SUPPORTED, TAG, "controller driver function not supported");

components/esp_driver_cam/include/esp_cam_ctlr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ esp_err_t esp_cam_ctlr_receive(esp_cam_ctlr_handle_t handle, esp_cam_ctlr_trans_
8787
* - ESP_ERR_INVALID_ARG: Invalid argument
8888
* - ESP_ERR_INVALID_STATE: Invalid state
8989
*/
90-
esp_err_t esp_cam_del_ctlr(esp_cam_ctlr_handle_t handle);
90+
esp_err_t esp_cam_ctlr_del(esp_cam_ctlr_handle_t handle);
9191

9292
/**
9393
* @brief Register ESP CAM controller event callbacks

components/esp_driver_cam/test_apps/csi/main/test_csi_driver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TEST_CASE("TEST CSI driver allocation", "[csi]")
3232
TEST_ESP_OK(esp_cam_ctlr_get_frame_buffer_len(handle, &bk_buffer_len));
3333
TEST_ASSERT_NOT_NULL(bk_buffer);
3434
TEST_ASSERT_EQUAL((csi_config.h_res * csi_config.v_res * 2), bk_buffer_len); // out type RGB565 using 2 byte / pixel
35-
TEST_ESP_OK(esp_cam_del_ctlr(handle));
35+
TEST_ESP_OK(esp_cam_ctlr_del(handle));
3636
}
3737

3838
TEST_CASE("TEST CSI driver no backup buffer usage", "[csi]")
@@ -59,5 +59,5 @@ TEST_CASE("TEST CSI driver no backup buffer usage", "[csi]")
5959
TEST_ESP_ERR(ESP_ERR_INVALID_STATE, esp_cam_ctlr_get_frame_buffer_len(handle, &bk_buffer_len));
6060
TEST_ASSERT_NULL(bk_buffer);
6161
TEST_ASSERT_EQUAL(0, bk_buffer_len);
62-
TEST_ESP_OK(esp_cam_del_ctlr(handle));
62+
TEST_ESP_OK(esp_cam_ctlr_del(handle));
6363
}

docs/en/api-reference/peripherals/camera_driver.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Resource Allocation
6060
Uninstall Camera Controller Driver
6161
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6262

63-
If a previously installed Camera Controller Driver is no longer needed, it's recommended to recycle the resource by calling :cpp:func:`esp_cam_del_ctlr`, so that to release the underlying hardware.
63+
If a previously installed Camera Controller Driver is no longer needed, it's recommended to recycle the resource by calling :cpp:func:`esp_cam_ctlr_del`, so that to release the underlying hardware.
6464

6565
.. _cam-enable-disable:
6666

@@ -127,7 +127,7 @@ After the Camera Controller Driver starts receiving, it can generate a specific
127127
Thread Safety
128128
^^^^^^^^^^^^^
129129

130-
The factory function :cpp:func:`esp_cam_new_csi_ctlr` and :cpp:func:`esp_cam_del_ctlr` are guaranteed to be thread safe by the driver, which means, user can call them from different RTOS tasks without protection by extra locks.
130+
The factory function :cpp:func:`esp_cam_new_csi_ctlr` and :cpp:func:`esp_cam_ctlr_del` are guaranteed to be thread safe by the driver, which means, user can call them from different RTOS tasks without protection by extra locks.
131131

132132
.. _cam-kconfig-options:
133133

0 commit comments

Comments
 (0)