chentianya/filex
1
0
Fork 0
mirror of https://github.com/eclipse-threadx/filex.git synced 2026-09-14 12:36:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84 from eclipse-threadx/dev

Browse Source 
Merge changes ahead of the 202504 release
This commit is contained in:
Frédéric Desbiens
2026-01-12 17:50:04 -05:00
committed by GitHub
parent 048a01ed64 1839526557
commit 454d0fed31
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/inc/fx_api.h
+2 -2
View File
@@ -138,8 +138,8 @@ extern "C" {
#define AZURE_RTOS_FILEX #define AZURE_RTOS_FILEX
#define FILEX_MAJOR_VERSION 6 #define FILEX_MAJOR_VERSION 6
#define FILEX_MINOR_VERSION 4 #define FILEX_MINOR_VERSION 4
#define FILEX_PATCH_VERSION 2 #define FILEX_PATCH_VERSION 5
#define FILEX_BUILD_VERSION 202503 #define FILEX_BUILD_VERSION 202504
#define FILEX_HOTFIX_VERSION ' ' #define FILEX_HOTFIX_VERSION ' '
/* Define the following symbols for backward compatibility */ /* Define the following symbols for backward compatibility */
common/src/fx_media_format.c
+4 -2
View File
@@ -161,9 +161,11 @@ UINT sectors_per_fat, f, s;
media_ptr -> fx_media_hidden_sectors = hidden_sectors; media_ptr -> fx_media_hidden_sectors = hidden_sectors;
/* Initialize the supplied media I/O driver. First, build the /* Initialize the supplied media I/O driver. First, build the
initialize driver request. */ initialize driver request. Set the fx_media_driver_status to FX_MEDIA_INVALID
to let the driver know that the request is issued from a fx_media_format() call
*/
media_ptr -> fx_media_driver_request = FX_DRIVER_INIT; media_ptr -> fx_media_driver_request = FX_DRIVER_INIT;
media_ptr -> fx_media_driver_status = FX_IO_ERROR; media_ptr -> fx_media_driver_status = FX_MEDIA_INVALID;
media_ptr -> fx_media_driver_info = driver_info_ptr; media_ptr -> fx_media_driver_info = driver_info_ptr;
media_ptr -> fx_media_driver_write_protect = FX_FALSE; media_ptr -> fx_media_driver_write_protect = FX_FALSE;
media_ptr -> fx_media_driver_free_sector_update = FX_FALSE; media_ptr -> fx_media_driver_free_sector_update = FX_FALSE;
common/src/fx_media_open.c
+4 -2
View File
@@ -261,9 +261,11 @@ FX_INT_SAVE_AREA
FX_TRACE_IN_LINE_INSERT(FX_TRACE_MEDIA_OPEN, media_ptr, media_driver, memory_ptr, memory_size, FX_TRACE_MEDIA_EVENTS, 0, 0) FX_TRACE_IN_LINE_INSERT(FX_TRACE_MEDIA_OPEN, media_ptr, media_driver, memory_ptr, memory_size, FX_TRACE_MEDIA_EVENTS, 0, 0)
/* Initialize the supplied media I/O driver. First, build the /* Initialize the supplied media I/O driver. First, build the
initialize driver request. */ initialize driver request. Set the fx_media_driver_status to FX_MEDIA_NOT_OPEN
to let the driver understand that the request is issued from a fx_media_open() call.
*/
media_ptr -> fx_media_driver_request = FX_DRIVER_INIT; media_ptr -> fx_media_driver_request = FX_DRIVER_INIT;
media_ptr -> fx_media_driver_status = FX_IO_ERROR; media_ptr -> fx_media_driver_status = FX_MEDIA_NOT_OPEN;
media_ptr -> fx_media_driver_info = driver_info_ptr; media_ptr -> fx_media_driver_info = driver_info_ptr;
media_ptr -> fx_media_driver_write_protect = FX_FALSE; media_ptr -> fx_media_driver_write_protect = FX_FALSE;
media_ptr -> fx_media_driver_free_sector_update = FX_FALSE; media_ptr -> fx_media_driver_free_sector_update = FX_FALSE;