Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Commit

Permalink
Release 6.1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuxin-azrtos
yuxin-azrtos committed Apr 20, 2022
1 parent 68af5f6 commit e1a6566
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 24 deletions.
7 changes: 5 additions & 2 deletions common/inc/fx_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* fx_api.h PORTABLE C */
/* 6.1.10 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -71,6 +71,9 @@
/* size in exFAT, fixed */
/* errors without cache, */
/* resulting in version 6.1.10 */
/* 04-25-2022 William E. Lamie Modified comment(s), and */
/* updated product constants, */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -120,7 +123,7 @@ extern "C" {
#define AZURE_RTOS_FILEX
#define FILEX_MAJOR_VERSION 6
#define FILEX_MINOR_VERSION 1
#define FILEX_PATCH_VERSION 10
#define FILEX_PATCH_VERSION 11

/* Define the following symbols for backward compatibility */
#define EL_PRODUCT_FILEX
Expand Down
6 changes: 4 additions & 2 deletions common/src/fx_fault_tolerant_create_log_file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/* FUNCTION RELEASE */
/* */
/* _fx_fault_tolerant_create_log_file PORTABLE C */
/* 6.1.10 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -81,6 +81,8 @@
/* 01-31-2022 Bhupendra Naphade Modified comment(s), replaced */
/* sector size constant, */
/* resulting in version 6.1.10 */
/* 04-25-2022 William E. Lamie Modified comment(s), */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/
UINT _fx_fault_tolerant_create_log_file(FX_MEDIA *media_ptr)
Expand Down Expand Up @@ -307,7 +309,7 @@ UCHAR cluster_state;
_fx_utility_exFAT_bitmap_flush(media_ptr);
}
#endif /* FX_ENABLE_EXFAT */
#endif
#endif /* FX_FAULT_TOLERANT */

/* Write start cluster for the file tolerant log file into the boot sector. */
_fx_utility_32_unsigned_write(media_ptr -> fx_media_fault_tolerant_memory_buffer + FX_FAULT_TOLERANT_BOOT_INDEX, FAT_index);
Expand Down
24 changes: 14 additions & 10 deletions common/src/fx_media_format.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ ULONG _fx_media_format_volume_id = 1;
/* FUNCTION RELEASE */
/* */
/* _fx_media_format PORTABLE C */
/* 6.1.8 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -120,6 +120,10 @@ ULONG _fx_media_format_volume_id = 1;
/* 08-02-2021 Bhupendra Naphade Modified comment(s), and */
/* updated boot write logic, */
/* resulting in version 6.1.8 */
/* 04-25-2022 Bhupendra Naphade Modified comment(s), and */
/* updated reserved FAT entry */
/* value, */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/
UINT _fx_media_format(FX_MEDIA *media_ptr, VOID (*driver)(FX_MEDIA *media), VOID *driver_info_ptr, UCHAR *memory_ptr, UINT memory_size,
Expand Down Expand Up @@ -557,8 +561,8 @@ UINT sectors_per_fat, f, s;
{

/* Reserve the first two FAT-12 entries. */
byte_ptr[0] = (UCHAR)0x0F;
byte_ptr[1] = (UCHAR)0x0F;
byte_ptr[0] = _fx_media_format_media_type;
byte_ptr[1] = (UCHAR)0xFF;
byte_ptr[2] = (UCHAR)0xFF;

/* Start clearing at FAT entry 3. */
Expand All @@ -568,8 +572,8 @@ UINT sectors_per_fat, f, s;
{

/* Reserve the first two FAT-16 entries. */
byte_ptr[0] = (UCHAR)0xF0;
byte_ptr[1] = (UCHAR)0x00;
byte_ptr[0] = _fx_media_format_media_type;
byte_ptr[1] = (UCHAR)0xFF;
byte_ptr[2] = (UCHAR)0xFF;
byte_ptr[3] = (UCHAR)0xFF;

Expand All @@ -580,14 +584,14 @@ UINT sectors_per_fat, f, s;
{

/* Reserve the first two FAT-32 entries. */
byte_ptr[0] = (UCHAR)0xF0;
byte_ptr[1] = (UCHAR)0x00;
byte_ptr[2] = (UCHAR)0x00;
byte_ptr[3] = (UCHAR)0x00;
byte_ptr[0] = _fx_media_format_media_type;
byte_ptr[1] = (UCHAR)0xFF;
byte_ptr[2] = (UCHAR)0xFF;
byte_ptr[3] = (UCHAR)0x0F;
byte_ptr[4] = (UCHAR)0xFF;
byte_ptr[5] = (UCHAR)0xFF;
byte_ptr[6] = (UCHAR)0xFF;
byte_ptr[7] = (UCHAR)0xFF;
byte_ptr[7] = (UCHAR)0x0F;

/* Preallocate the first cluster for the root directory. */
byte_ptr[8] = (UCHAR)0xFF;
Expand Down
11 changes: 8 additions & 3 deletions common/src/fx_media_volume_get_extended.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/* FUNCTION RELEASE */
/* */
/* _fx_media_volume_get_extended PORTABLE C */
/* 6.1 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -79,6 +79,10 @@
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
/* 09-30-2020 William E. Lamie Modified comment(s), */
/* resulting in version 6.1 */
/* 04-25-2022 Bhupendra Naphade Modified comment(s), and */
/* updated check for */
/* volume name, */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/
UINT _fx_media_volume_get_extended(FX_MEDIA *media_ptr, CHAR *volume_name, UINT volume_name_buffer_length, UINT volume_source)
Expand Down Expand Up @@ -151,9 +155,10 @@ FX_DIR_ENTRY dir_entry;

/* Check for a volume name. */
#ifdef FX_ENABLE_EXFAT
if (dir_entry.fx_dir_entry_attributes & FX_VOLUME || dir_entry.fx_dir_entry_type == FX_EXFAT_DIR_ENTRY_TYPE_VOLUME_LABEL)
if (((media_ptr -> fx_media_FAT_type == FX_exFAT) && ((dir_entry.fx_dir_entry_attributes & FX_VOLUME) || (dir_entry.fx_dir_entry_type == FX_EXFAT_DIR_ENTRY_TYPE_VOLUME_LABEL)))
|| ((media_ptr -> fx_media_FAT_type != FX_exFAT) && (dir_entry.fx_dir_entry_attributes & FX_VOLUME) && ((UCHAR)dir_entry.fx_dir_entry_name[0] != (UCHAR)FX_DIR_ENTRY_FREE)))
#else
if (dir_entry.fx_dir_entry_attributes & FX_VOLUME)
if ((dir_entry.fx_dir_entry_attributes & FX_VOLUME) && ((UCHAR)dir_entry.fx_dir_entry_name[0] != (UCHAR)FX_DIR_ENTRY_FREE))
#endif /* FX_ENABLE_EXFAT */
{

Expand Down
2 changes: 1 addition & 1 deletion ports/cortex_m0/gnu/inc/fx_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ typedef unsigned long long ULONG64;

#ifdef FX_SYSTEM_INIT
CHAR _fx_version_id[] =
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M0/GNU Version 6.1.10 *";
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M0/GNU Version 6.1.11 *";
#else
extern CHAR _fx_version_id[];
#endif
Expand Down
2 changes: 1 addition & 1 deletion ports/cortex_m3/gnu/inc/fx_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ typedef unsigned long long ULONG64;

#ifdef FX_SYSTEM_INIT
CHAR _fx_version_id[] =
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M3/GNU Version 6.1.10 *";
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M3/GNU Version 6.1.11 *";
#else
extern CHAR _fx_version_id[];
#endif
Expand Down
2 changes: 1 addition & 1 deletion ports/cortex_m4/gnu/inc/fx_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ typedef unsigned long long ULONG64;

#ifdef FX_SYSTEM_INIT
CHAR _fx_version_id[] =
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M4/GNU Version 6.1.10 *";
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M4/GNU Version 6.1.11 *";
#else
extern CHAR _fx_version_id[];
#endif
Expand Down
2 changes: 1 addition & 1 deletion ports/cortex_m7/gnu/inc/fx_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ typedef unsigned long long ULONG64;

#ifdef FX_SYSTEM_INIT
CHAR _fx_version_id[] =
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M7/GNU Version 6.1.10 *";
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M7/GNU Version 6.1.11 *";
#else
extern CHAR _fx_version_id[];
#endif
Expand Down
2 changes: 1 addition & 1 deletion ports/generic/inc/fx_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ typedef unsigned long long ULONG64;

#ifdef FX_SYSTEM_INIT
CHAR _fx_version_id[] =
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Generic Version 6.1.10 *";
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Generic Version 6.1.11 *";
#else
extern CHAR _fx_version_id[];
#endif
Expand Down
2 changes: 1 addition & 1 deletion ports/linux/gnu/inc/fx_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ extern VOID fault_tolerant_apply_log_callback(struct FX_MEDIA_STRUCT *media_ptr,

#ifdef FX_SYSTEM_INIT
CHAR _fx_version_id[] =
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Linux/GCC Version 6.1.10 *";
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Linux/GCC Version 6.1.11 *";
#else
extern CHAR _fx_version_id[];
#endif
Expand Down
2 changes: 1 addition & 1 deletion ports/win32/vs_2019/inc/fx_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ typedef unsigned long long ULONG64;

#ifdef FX_SYSTEM_INIT
CHAR _fx_version_id[] =
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Win32/Version 6.1.10 *";
"Copyright (c) Microsoft Corporation. All rights reserved. * FileX Win32/Version 6.1.11 *";
#else
extern CHAR _fx_version_id[];
#endif
Expand Down

0 comments on commit e1a6566

Please sign in to comment.