feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

pick better name for unregister function and update docs

Browse Source
This commit is contained in:
me-no-dev
2017-02-02 12:24:38 +02:00
parent 972c6f0cae
commit 0eeda99a8c
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fatfs/src/esp_vfs_fat.h
View File

@@ -75,7 +75,7 @@ esp_err_t esp_vfs_fat_unregister() __attribute__((deprecated));
* - ESP_OK on success * - ESP_OK on success
* - ESP_ERR_INVALID_STATE if FATFS is not registered in VFS * - ESP_ERR_INVALID_STATE if FATFS is not registered in VFS
*/ */
esp_err_t esp_vfs_fat_unregister_ctx(const char* base_path); esp_err_t esp_vfs_fat_unregister_path(const char* base_path);
/** /**
* @brief Configuration arguments for esp_vfs_fat_sdmmc_mount function * @brief Configuration arguments for esp_vfs_fat_sdmmc_mount function

4
components/fatfs/src/vfs_fat.c
View File

@@ -147,7 +147,7 @@ esp_err_t esp_vfs_fat_register(const char* base_path, const char* fat_drive, siz
return ESP_OK; return ESP_OK;
} }
esp_err_t esp_vfs_fat_unregister_ctx(const char* base_path) esp_err_t esp_vfs_fat_unregister_path(const char* base_path)
{ {
size_t ctx = find_context_index_by_path(base_path); size_t ctx = find_context_index_by_path(base_path);
if (ctx == _VOLUMES) { if (ctx == _VOLUMES) {
@@ -169,7 +169,7 @@ esp_err_t esp_vfs_fat_unregister()
if (s_fat_ctx == NULL) { if (s_fat_ctx == NULL) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
} }
esp_err_t err = esp_vfs_fat_unregister_ctx(s_fat_ctx->base_path); esp_err_t err = esp_vfs_fat_unregister_path(s_fat_ctx->base_path);
if (err != ESP_OK) { if (err != ESP_OK) {
return err; return err;
} }

4
components/fatfs/src/vfs_fat_sdmmc.c
View File

@@ -123,7 +123,7 @@ esp_err_t esp_vfs_fat_sdmmc_mount(const char* base_path,
fail: fail:
free(workbuf); free(workbuf);
esp_vfs_fat_unregister_ctx(base_path); esp_vfs_fat_unregister_path(base_path);
ff_diskio_unregister(pdrv); ff_diskio_unregister(pdrv);
free(s_card); free(s_card);
s_card = NULL; s_card = NULL;
@@ -143,7 +143,7 @@ esp_err_t esp_vfs_fat_sdmmc_unmount()
free(s_card); free(s_card);
s_card = NULL; s_card = NULL;
sdmmc_host_deinit(); sdmmc_host_deinit();
esp_err_t err = esp_vfs_fat_unregister_ctx(s_base_path); esp_err_t err = esp_vfs_fat_unregister_path(s_base_path);
free(s_base_path); free(s_base_path);
s_base_path = NULL; s_base_path = NULL;
return err; return err;

6
docs/api/storage/fatfs.rst
View File

@@ -8,7 +8,7 @@ Additionally, FatFs has been modified to support run-time pluggable disk IO laye
Using FatFs with VFS Using FatFs with VFS
-------------------- --------------------
``esp_vfs_fat.h`` header file defines functions to connect FatFs with VFS. ``esp_vfs_fat_register`` function allocates a ``FATFS`` structure, and registers a given path prefix in VFS. Subsequent operations on files starting with this prefix are forwarded to FatFs APIs. ``esp_vfs_fat_unregister`` function deletes the registration with VFS, and frees the ``FATFS`` structure. ``esp_vfs_fat.h`` header file defines functions to connect FatFs with VFS. ``esp_vfs_fat_register`` function allocates a ``FATFS`` structure, and registers a given path prefix in VFS. Subsequent operations on files starting with this prefix are forwarded to FatFs APIs. ``esp_vfs_fat_unregister_path`` function deletes the registration with VFS, and frees the ``FATFS`` structure.
Most applications will use the following flow when working with ``esp_vfs_fat_`` functions: Most applications will use the following flow when working with ``esp_vfs_fat_`` functions:
@@ -28,12 +28,12 @@ Most applications will use the following flow when working with ``esp_vfs_fat_``
8. Call ``ff_diskio_register`` with NULL ``ff_diskio_impl_t*`` argument and the same drive number. 8. Call ``ff_diskio_register`` with NULL ``ff_diskio_impl_t*`` argument and the same drive number.
9. Call ``esp_vfs_fat_unregister`` to remove FatFs from VFS, and free the ``FATFS`` structure allocated on step 1. 9. Call ``esp_vfs_fat_unregister_path`` with the path where the file system is mounted to remove FatFs from VFS, and free the ``FATFS`` structure allocated on step 1.
Convenience functions, ``esp_vfs_fat_sdmmc_mount`` and ``esp_vfs_fat_sdmmc_unmount``, which wrap these steps and also handle SD card initialization, are described in the next section. Convenience functions, ``esp_vfs_fat_sdmmc_mount`` and ``esp_vfs_fat_sdmmc_unmount``, which wrap these steps and also handle SD card initialization, are described in the next section.
.. doxygenfunction:: esp_vfs_fat_register .. doxygenfunction:: esp_vfs_fat_register
.. doxygenfunction:: esp_vfs_fat_unregister .. doxygenfunction:: esp_vfs_fat_unregister_path
Using FatFs with VFS and SD cards Using FatFs with VFS and SD cards