diff --git a/LICENSED-HARDWARE.txt b/LICENSED-HARDWARE.txt index fd9627c..93a21d0 100644 --- a/LICENSED-HARDWARE.txt +++ b/LICENSED-HARDWARE.txt @@ -25,4 +25,4 @@ Renesas: -------------------------------------------------------------------------------- -More coming soon. Please check back frequently for updates. +More coming soon. Please check back frequently for updates. \ No newline at end of file diff --git a/README.md b/README.md index 8f06b44..1117a3f 100755 --- a/README.md +++ b/README.md @@ -101,8 +101,9 @@ Professional support plans (https://azure.microsoft.com/en-us/support/options/) The following are references to additional Azure RTOS and Azure IoT in general: | | | |---|---| -| Azure RTOS Website: | https://azure.microsoft.com/en-us/services/rtos/ | +| Azure RTOS Documenation and Guides: | https://docs.microsoft.com/azure/rtos | +| Azure RTOS Website: | https://azure.microsoft.com/services/rtos/ | | Azure RTOS Sales Questions: | https://azure-rtos.ms-iot-contact.com/ | -| Microsoft Q/A for Azure IoT: | https://docs.microsoft.com/en-us/answers/products/azure?product=iot | -| Internet of Things Show: | https://aka.ms/iotshow | -| IoT Tech Community: | https://aka.ms/iottechcommunity | +| For technical questions check out Microsoft Q/A for Azure IoT: | https://aka.ms/QnA/azure-rtos | +| Internet of Things Show for latest announcements and online training: | https://aka.ms/iotshow | +| IoT Tech Community: | https://aka.ms/community/azure-rtos | \ No newline at end of file diff --git a/common/inc/fx_api.h b/common/inc/fx_api.h index c5580c4..ac55d2e 100644 --- a/common/inc/fx_api.h +++ b/common/inc/fx_api.h @@ -26,7 +26,7 @@ /* APPLICATION INTERFACE DEFINITION RELEASE */ /* */ /* fx_api.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -43,6 +43,12 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* updated product constants, */ +/* and added conditionals to */ +/* disable few declarations */ +/* for code size reduction, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ @@ -84,10 +90,13 @@ extern "C" { /* Define the major/minor version information that can be used by the application and the FileX source as well. */ -#define EL_PRODUCT_FILEX +#define AZURE_RTOS_FILEX #define FILEX_MAJOR_VERSION 6 -#define FILEX_MINOR_VERSION 0 +#define FILEX_MINOR_VERSION 1 +#define FILEX_PATCH_VERSION 0 +/* Define the following symbols for backward compatibility */ +#define EL_PRODUCT_FILEX /* Override the interrupt protection provided in FileX port files to simply use ThreadX protection, which is often in-line assembly. */ @@ -821,6 +830,10 @@ typedef struct FX_MEDIA_STRUCT UCHAR *fx_media_memory_buffer; ULONG fx_media_memory_size; +#ifdef FX_DISABLE_CACHE + ULONG64 fx_media_memory_buffer_sector; +#else + /* Define the flag that indicates whether the logical cache utilizes a hash function or is a linear search. If set, the logical cache is accessed via a hash function on the requested sector. */ @@ -847,6 +860,7 @@ typedef struct FX_MEDIA_STRUCT /* Define the outstanding dirty sector counter. This is used to optimize the searching of sectors to flush to the media. */ ULONG fx_media_sector_cache_dirty_count; +#endif /* FX_DISABLE_CACHE */ /* Define the basic information about the associated media. */ UINT fx_media_bytes_per_sector; @@ -1069,6 +1083,7 @@ typedef struct FX_MEDIA_STRUCT CHAR fx_media_rename_buffer[FX_MAXIMUM_PATH]; #endif +#ifndef FX_DISABLE_CACHE /* Define the sector cache control structures for this media. */ struct FX_CACHED_SECTOR_STRUCT fx_media_sector_cache[FX_MAX_SECTOR_CACHE]; @@ -1076,6 +1091,7 @@ typedef struct FX_MEDIA_STRUCT /* Define the sector cache hash mask so that the hash algorithm can be used with any power of 2 number of cache sectors. */ ULONG fx_media_sector_cache_hash_mask; +#endif /* FX_DISABLE_CACHE */ /* Define a variable to disable burst cache. This is used by the underlying driver. */ @@ -1215,6 +1231,13 @@ typedef FX_FILE *FX_FILE_PTR; #ifndef FX_SOURCE_CODE +#ifdef FX_DISABLE_ONE_LINE_FUNCTION +#define fx_file_seek(f, b) fx_file_extended_seek(f, (ULONG64)b) +#define fx_file_allocate(f, s) fx_file_extended_allocate(f, (ULONG64)s); +#define fx_file_truncate(f, s) fx_file_extended_truncate(f, (ULONG64)s); +#define fx_file_relative_seek(f, b, sf) fx_file_extended_relative_seek(f, (ULONG64)b, sf); +#define fx_file_truncate_release(f, s) fx_file_extended_truncate_release(f, (ULONG64)s); +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ /* Determine if error checking is desired. If so, map API functions to the appropriate error checking front-ends. Otherwise, map API @@ -1249,7 +1272,9 @@ typedef FX_FILE *FX_FILE_PTR; #define fx_directory_short_name_get _fx_directory_short_name_get #define fx_directory_short_name_get_extended _fx_directory_short_name_get_extended +#ifndef FX_DISABLE_ONE_LINE_FUNCTION #define fx_file_allocate _fx_file_allocate +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ #define fx_file_attributes_read _fx_file_attributes_read #define fx_file_attributes_set _fx_file_attributes_set #define fx_file_best_effort_allocate _fx_file_best_effort_allocate @@ -1259,11 +1284,15 @@ typedef FX_FILE *FX_FILE_PTR; #define fx_file_delete _fx_file_delete #define fx_file_open _fx_file_open #define fx_file_read _fx_file_read +#ifndef FX_DISABLE_ONE_LINE_FUNCTION #define fx_file_relative_seek _fx_file_relative_seek +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ #define fx_file_rename _fx_file_rename +#ifndef FX_DISABLE_ONE_LINE_FUNCTION #define fx_file_seek _fx_file_seek #define fx_file_truncate _fx_file_truncate #define fx_file_truncate_release _fx_file_truncate_release +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ #define fx_file_write _fx_file_write #define fx_file_write_notify_set _fx_file_write_notify_set #define fx_file_extended_allocate _fx_file_extended_allocate @@ -1342,7 +1371,9 @@ typedef FX_FILE *FX_FILE_PTR; #define fx_directory_short_name_get _fxe_directory_short_name_get #define fx_directory_short_name_get_extended _fxe_directory_short_name_get_extended +#ifndef FX_DISABLE_ONE_LINE_FUNCTION #define fx_file_allocate _fxe_file_allocate +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ #define fx_file_attributes_read _fxe_file_attributes_read #define fx_file_attributes_set _fxe_file_attributes_set #define fx_file_best_effort_allocate _fxe_file_best_effort_allocate @@ -1352,11 +1383,15 @@ typedef FX_FILE *FX_FILE_PTR; #define fx_file_delete _fxe_file_delete #define fx_file_open(m, f, n, t) _fxe_file_open(m, f, n, t, sizeof(FX_FILE)) #define fx_file_read _fxe_file_read +#ifndef FX_DISABLE_ONE_LINE_FUNCTION #define fx_file_relative_seek _fxe_file_relative_seek +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ #define fx_file_rename _fxe_file_rename +#ifndef FX_DISABLE_ONE_LINE_FUNCTION #define fx_file_seek _fxe_file_seek #define fx_file_truncate _fxe_file_truncate #define fx_file_truncate_release _fxe_file_truncate_release +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ #define fx_file_write _fxe_file_write #define fx_file_write_notify_set _fxe_file_write_notify_set #define fx_file_extended_allocate _fxe_file_extended_allocate @@ -1442,7 +1477,9 @@ UINT fx_directory_rename(FX_MEDIA *media_ptr, CHAR *old_directory_name, CHAR *ne UINT fx_directory_short_name_get(FX_MEDIA *media_ptr, CHAR *long_file_name, CHAR *short_file_name); UINT fx_directory_short_name_get_extended(FX_MEDIA* media_ptr, CHAR* long_file_name, CHAR* short_file_name, UINT short_file_name_length); +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT fx_file_allocate(FX_FILE *file_ptr, ULONG size); +#endif /* FX_DISABLE_ONE_LINE_FUNCTION*/ UINT fx_file_attributes_read(FX_MEDIA *media_ptr, CHAR *file_name, UINT *attributes_ptr); UINT fx_file_attributes_set(FX_MEDIA *media_ptr, CHAR *file_name, UINT attributes); UINT fx_file_best_effort_allocate(FX_FILE *file_ptr, ULONG size, ULONG *actual_size_allocated); @@ -1459,11 +1496,15 @@ UINT _fxe_file_open(FX_MEDIA *media_ptr, FX_FILE *file_ptr, CHAR *file_name, UINT open_type, UINT file_control_block_size); #endif UINT fx_file_read(FX_FILE *file_ptr, VOID *buffer_ptr, ULONG request_size, ULONG *actual_size); +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT fx_file_relative_seek(FX_FILE *file_ptr, ULONG byte_offset, UINT seek_from); +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ UINT fx_file_rename(FX_MEDIA *media_ptr, CHAR *old_file_name, CHAR *new_file_name); +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT fx_file_seek(FX_FILE *file_ptr, ULONG byte_offset); UINT fx_file_truncate(FX_FILE *file_ptr, ULONG size); UINT fx_file_truncate_release(FX_FILE *file_ptr, ULONG size); +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ UINT fx_file_write(FX_FILE *file_ptr, VOID *buffer_ptr, ULONG size); UINT fx_file_write_notify_set(FX_FILE *file_ptr, VOID (*file_write_notify)(FX_FILE *)); UINT fx_file_extended_allocate(FX_FILE *file_ptr, ULONG64 size); diff --git a/common/inc/fx_directory.h b/common/inc/fx_directory.h index 2163be2..c9b20dd 100644 --- a/common/inc/fx_directory.h +++ b/common/inc/fx_directory.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* fx_directory.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -42,6 +42,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ diff --git a/common/inc/fx_directory_exFAT.h b/common/inc/fx_directory_exFAT.h index 606a0a8..9683cc6 100644 --- a/common/inc/fx_directory_exFAT.h +++ b/common/inc/fx_directory_exFAT.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* fx_directory_exFAT.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -41,6 +41,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ diff --git a/common/inc/fx_fault_tolerant.h b/common/inc/fx_fault_tolerant.h index f887391..5b0f92b 100644 --- a/common/inc/fx_fault_tolerant.h +++ b/common/inc/fx_fault_tolerant.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* fx_fault_tolerant.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -42,6 +42,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ diff --git a/common/inc/fx_file.h b/common/inc/fx_file.h index 516b5d4..f7df51b 100644 --- a/common/inc/fx_file.h +++ b/common/inc/fx_file.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* fx_file.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -42,6 +42,10 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable one line function, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ @@ -51,7 +55,11 @@ /* Define the external File component function prototypes. */ +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT _fx_file_allocate(FX_FILE *file_ptr, ULONG size); +#else +#define _fx_file_allocate(f, s) _fx_file_extended_allocate(f, (ULONG64)s); +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ UINT _fx_file_attributes_read(FX_MEDIA *media_ptr, CHAR *file_name, UINT *attributes_ptr); UINT _fx_file_attributes_set(FX_MEDIA *media_ptr, CHAR *file_name, UINT attributes); UINT _fx_file_best_effort_allocate(FX_FILE *file_ptr, ULONG size, ULONG *actual_size_allocated); @@ -63,11 +71,21 @@ UINT _fx_file_delete(FX_MEDIA *media_ptr, CHAR *file_name); UINT _fx_file_open(FX_MEDIA *media_ptr, FX_FILE *file_ptr, CHAR *file_name, UINT open_type); UINT _fx_file_read(FX_FILE *file_ptr, VOID *buffer_ptr, ULONG request_size, ULONG *actual_size); +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT _fx_file_relative_seek(FX_FILE *file_ptr, ULONG byte_offset, UINT seek_from); +#else +#define _fx_file_relative_seek(f, b, sf) _fx_file_extended_relative_seek(f, (ULONG64)b, sf); +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ UINT _fx_file_rename(FX_MEDIA *media_ptr, CHAR *old_file_name, CHAR *new_file_name); +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT _fx_file_seek(FX_FILE *file_ptr, ULONG byte_offset); UINT _fx_file_truncate(FX_FILE *file_ptr, ULONG size); UINT _fx_file_truncate_release(FX_FILE *file_ptr, ULONG size); +#else +#define _fx_file_seek(f, b) _fx_file_extended_seek(f, (ULONG64)b) +#define _fx_file_truncate(f, s) _fx_file_extended_truncate(f, (ULONG64)s); +#define _fx_file_truncate_release(f, s) _fx_file_extended_truncate_release(f, (ULONG64)s); +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ UINT _fx_file_write(FX_FILE *file_ptr, VOID *buffer_ptr, ULONG size); UINT _fx_file_write_notify_set(FX_FILE *file_ptr, VOID (*file_write_notify)(FX_FILE *)); UINT _fx_file_extended_allocate(FX_FILE *file_ptr, ULONG64 size); diff --git a/common/inc/fx_media.h b/common/inc/fx_media.h index e719bf3..2fe13fe 100644 --- a/common/inc/fx_media.h +++ b/common/inc/fx_media.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* fx_media.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -42,6 +42,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ diff --git a/common/inc/fx_system.h b/common/inc/fx_system.h index 56270bc..a0b1547 100644 --- a/common/inc/fx_system.h +++ b/common/inc/fx_system.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* fx_system.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -42,6 +42,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ diff --git a/common/inc/fx_unicode.h b/common/inc/fx_unicode.h index 1d14386..2ff9212 100644 --- a/common/inc/fx_unicode.h +++ b/common/inc/fx_unicode.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* fx_unicode.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -42,6 +42,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ diff --git a/common/inc/fx_user_sample.h b/common/inc/fx_user_sample.h index 597d188..5335076 100644 --- a/common/inc/fx_user_sample.h +++ b/common/inc/fx_user_sample.h @@ -26,7 +26,7 @@ /* PORT SPECIFIC C INFORMATION RELEASE */ /* */ /* fx_user.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* */ /* AUTHOR */ /* */ @@ -45,6 +45,11 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added product constants */ +/* to enable code */ +/* size optimization, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ @@ -183,6 +188,53 @@ /*#define FX_FAULT_TOLERANT_BOOT_INDEX 116 */ +/* Below FX_DISABLE_XXX macros can be used for code size optimization required for memory + critical aplications */ + +/* Defined, error checking is disabled. */ + +/*#define FX_DISABLE_ERROR_CHECKING */ + + +/* Defined, cache is disabled. */ + +/*#define FX_DISABLE_CACHE */ + + +/* Defined, file close is disabled. */ + +/*#define FX_DISABLE_FILE_CLOSE */ + + +/* Defined, fast open is disabled. */ + +/*#define FX_DISABLE_FAST_OPEN */ + + +/* Defined, force memory operations are disabled. */ + +/*#define FX_DISABLE_FORCE_MEMORY_OPERATION */ + + +/* Defined, build options is disabled. */ + +/*#define FX_DISABLE_BUILD_OPTIONS */ + + +/* Defined, one line function is disabled. */ + +/*#define FX_DISABLE_ONE_LINE_FUNCTION */ + + +/* Defined, FAT entry refresh is disabled. */ + +/*#define FX_DIABLE_FAT_ENTRY_REFRESH */ + + +/* Defined, consecutive detect is disabled. */ + +/*#define FX_DISABLE_CONSECUTIVE_DETECT */ + #endif diff --git a/common/inc/fx_utility.h b/common/inc/fx_utility.h index c0d30fb..16421fc 100644 --- a/common/inc/fx_utility.h +++ b/common/inc/fx_utility.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* fx_utility.h PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -42,6 +42,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ diff --git a/common/src/fx_directory_attributes_read.c b/common/src/fx_directory_attributes_read.c index 15e76b0..3b4dfa6 100644 --- a/common/src/fx_directory_attributes_read.c +++ b/common/src/fx_directory_attributes_read.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_attributes_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_attributes_read(FX_MEDIA *media_ptr, CHAR *directory_name, UINT *attributes_ptr) diff --git a/common/src/fx_directory_attributes_set.c b/common/src/fx_directory_attributes_set.c index cedf1d0..d28d936 100644 --- a/common/src/fx_directory_attributes_set.c +++ b/common/src/fx_directory_attributes_set.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_attributes_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -82,6 +82,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_attributes_set(FX_MEDIA *media_ptr, CHAR *directory_name, UINT attributes) diff --git a/common/src/fx_directory_create.c b/common/src/fx_directory_create.c index e7faf09..6329651 100644 --- a/common/src/fx_directory_create.c +++ b/common/src/fx_directory_create.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -94,6 +94,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_create(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fx_directory_default_get.c b/common/src/fx_directory_default_get.c index d1fcb2f..bc7c224 100644 --- a/common/src/fx_directory_default_get.c +++ b/common/src/fx_directory_default_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_default_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_default_get(FX_MEDIA *media_ptr, CHAR **return_path_name) diff --git a/common/src/fx_directory_default_get_copy.c b/common/src/fx_directory_default_get_copy.c index 1551fd6..0eb9310 100644 --- a/common/src/fx_directory_default_get_copy.c +++ b/common/src/fx_directory_default_get_copy.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_default_get_copy PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_default_get_copy(FX_MEDIA *media_ptr, CHAR *return_path_name_buffer, UINT return_path_name_buffer_size) @@ -95,7 +98,7 @@ UINT path_name_length_with_null_terminator; { /* Copy the path name into the user's buffer. */ - _fx_utility_memory_copy((UCHAR *) return_path_name, (UCHAR *) return_path_name_buffer, path_name_length_with_null_terminator); + _fx_utility_memory_copy((UCHAR *) return_path_name, (UCHAR *) return_path_name_buffer, path_name_length_with_null_terminator); /* Use case of memcpy is verified. */ } else { diff --git a/common/src/fx_directory_default_set.c b/common/src/fx_directory_default_set.c index 1a15c50..90ba48c 100644 --- a/common/src/fx_directory_default_set.c +++ b/common/src/fx_directory_default_set.c @@ -44,7 +44,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_default_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -80,6 +80,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_default_set(FX_MEDIA *media_ptr, CHAR *new_path_name) diff --git a/common/src/fx_directory_delete.c b/common/src/fx_directory_delete.c index 0a98d44..196a477 100644 --- a/common/src/fx_directory_delete.c +++ b/common/src/fx_directory_delete.c @@ -43,7 +43,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_delete PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -92,6 +92,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_delete(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fx_directory_entry_read.c b/common/src/fx_directory_entry_read.c index 50f1db1..d7031f0 100644 --- a/common/src/fx_directory_entry_read.c +++ b/common/src/fx_directory_entry_read.c @@ -42,7 +42,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_entry_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -83,6 +83,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ #ifdef FX_ENABLE_EXFAT diff --git a/common/src/fx_directory_entry_write.c b/common/src/fx_directory_entry_write.c index 1f2cdc2..0c3fe4c 100644 --- a/common/src/fx_directory_entry_write.c +++ b/common/src/fx_directory_entry_write.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_entry_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -76,6 +76,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_entry_write(FX_MEDIA *media_ptr, FX_DIR_ENTRY *entry_ptr) diff --git a/common/src/fx_directory_exFAT_entry_read.c b/common/src/fx_directory_exFAT_entry_read.c index 68e9ba5..6f75d75 100644 --- a/common/src/fx_directory_exFAT_entry_read.c +++ b/common/src/fx_directory_exFAT_entry_read.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_exFAT_entry_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -86,6 +86,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_exFAT_entry_read(FX_MEDIA *media_ptr, FX_DIR_ENTRY *source_dir, diff --git a/common/src/fx_directory_exFAT_entry_write.c b/common/src/fx_directory_exFAT_entry_write.c index ac3ffd7..5a9562c 100644 --- a/common/src/fx_directory_exFAT_entry_write.c +++ b/common/src/fx_directory_exFAT_entry_write.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_exFAT_entry_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -81,6 +81,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_exFAT_entry_write(FX_MEDIA *media_ptr, FX_DIR_ENTRY *entry_ptr, UCHAR update_level) diff --git a/common/src/fx_directory_exFAT_free_search.c b/common/src/fx_directory_exFAT_free_search.c index d40b4af..fb1c7db 100644 --- a/common/src/fx_directory_exFAT_free_search.c +++ b/common/src/fx_directory_exFAT_free_search.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_free_search PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -80,6 +80,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_exFAT_free_search(FX_MEDIA *media_ptr, FX_DIR_ENTRY *directory_ptr, FX_DIR_ENTRY *entry_ptr) diff --git a/common/src/fx_directory_exFAT_unicode_entry_write.c b/common/src/fx_directory_exFAT_unicode_entry_write.c index 8a92349..00884de 100644 --- a/common/src/fx_directory_exFAT_unicode_entry_write.c +++ b/common/src/fx_directory_exFAT_unicode_entry_write.c @@ -42,7 +42,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_exFAT_unicode_entry_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -88,6 +88,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_exFAT_unicode_entry_write(FX_MEDIA *media_ptr, FX_DIR_ENTRY *entry_ptr, diff --git a/common/src/fx_directory_first_entry_find.c b/common/src/fx_directory_first_entry_find.c index c9bf75a..230dff9 100644 --- a/common/src/fx_directory_first_entry_find.c +++ b/common/src/fx_directory_first_entry_find.c @@ -40,7 +40,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_first_entry_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_first_entry_find(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fx_directory_first_full_entry_find.c b/common/src/fx_directory_first_full_entry_find.c index fd2c9f3..b6d8eb5 100644 --- a/common/src/fx_directory_first_full_entry_find.c +++ b/common/src/fx_directory_first_full_entry_find.c @@ -39,7 +39,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_first_full_entry_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -80,6 +80,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_first_full_entry_find(FX_MEDIA *media_ptr, diff --git a/common/src/fx_directory_free_search.c b/common/src/fx_directory_free_search.c index ecd850c..32833fa 100644 --- a/common/src/fx_directory_free_search.c +++ b/common/src/fx_directory_free_search.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_free_search PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -80,6 +80,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_free_search(FX_MEDIA *media_ptr, FX_DIR_ENTRY *directory_ptr, FX_DIR_ENTRY *entry_ptr) diff --git a/common/src/fx_directory_information_get.c b/common/src/fx_directory_information_get.c index 0aa5589..b9a4635 100644 --- a/common/src/fx_directory_information_get.c +++ b/common/src/fx_directory_information_get.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_information_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -80,6 +80,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_information_get(FX_MEDIA *media_ptr, CHAR *directory_name, @@ -149,7 +152,7 @@ FX_FILE *search_ptr; /* The file has been opened for writing by a previous call. Use the information used by the writer instead of what is currently on the media. */ - _fx_utility_memory_copy((UCHAR *)&search_ptr -> fx_file_dir_entry, (UCHAR *)&dir_entry, sizeof(FX_DIR_ENTRY)); + _fx_utility_memory_copy((UCHAR *)&search_ptr -> fx_file_dir_entry, (UCHAR *)&dir_entry, sizeof(FX_DIR_ENTRY)); /* Use case of memcpy is verified. */ break; } diff --git a/common/src/fx_directory_local_path_clear.c b/common/src/fx_directory_local_path_clear.c index db5baee..0d22b6e 100644 --- a/common/src/fx_directory_local_path_clear.c +++ b/common/src/fx_directory_local_path_clear.c @@ -41,7 +41,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_local_path_clear PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_local_path_clear(FX_MEDIA *media_ptr) diff --git a/common/src/fx_directory_local_path_get.c b/common/src/fx_directory_local_path_get.c index cf5b204..3be3921 100644 --- a/common/src/fx_directory_local_path_get.c +++ b/common/src/fx_directory_local_path_get.c @@ -40,7 +40,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_local_path_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_local_path_get(FX_MEDIA *media_ptr, CHAR **return_path_name) diff --git a/common/src/fx_directory_local_path_get_copy.c b/common/src/fx_directory_local_path_get_copy.c index 334fa5d..7f9a193 100644 --- a/common/src/fx_directory_local_path_get_copy.c +++ b/common/src/fx_directory_local_path_get_copy.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_local_path_get_copy PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_local_path_get_copy(FX_MEDIA *media_ptr, CHAR *return_path_name_buffer, UINT return_path_name_buffer_size) @@ -97,7 +100,7 @@ UINT path_name_length_with_null_terminator; { /* Copy the path name into the user's buffer. */ - _fx_utility_memory_copy((UCHAR *) return_path_name, (UCHAR *) return_path_name_buffer, path_name_length_with_null_terminator); + _fx_utility_memory_copy((UCHAR *) return_path_name, (UCHAR *) return_path_name_buffer, path_name_length_with_null_terminator); /* Use case of memcpy is verified. */ } else { diff --git a/common/src/fx_directory_local_path_restore.c b/common/src/fx_directory_local_path_restore.c index edd9dde..1c21176 100644 --- a/common/src/fx_directory_local_path_restore.c +++ b/common/src/fx_directory_local_path_restore.c @@ -40,7 +40,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_local_path_restore PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_local_path_restore(FX_MEDIA *media_ptr, FX_LOCAL_PATH *local_path_ptr) diff --git a/common/src/fx_directory_local_path_set.c b/common/src/fx_directory_local_path_set.c index 4dfe7e8..9a54d64 100644 --- a/common/src/fx_directory_local_path_set.c +++ b/common/src/fx_directory_local_path_set.c @@ -40,7 +40,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_local_path_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -76,6 +76,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_local_path_set(FX_MEDIA *media_ptr, FX_LOCAL_PATH *local_path_ptr, CHAR *new_path_name) diff --git a/common/src/fx_directory_long_name_get.c b/common/src/fx_directory_long_name_get.c index 438022f..49e4f31 100644 --- a/common/src/fx_directory_long_name_get.c +++ b/common/src/fx_directory_long_name_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_long_name_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_long_name_get(FX_MEDIA *media_ptr, CHAR *short_file_name, CHAR *long_file_name) diff --git a/common/src/fx_directory_long_name_get_extended.c b/common/src/fx_directory_long_name_get_extended.c index e15959b..b780565 100644 --- a/common/src/fx_directory_long_name_get_extended.c +++ b/common/src/fx_directory_long_name_get_extended.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_long_name_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_long_name_get_extended(FX_MEDIA *media_ptr, CHAR *short_file_name, CHAR *long_file_name, UINT long_file_name_buffer_length) diff --git a/common/src/fx_directory_name_extract.c b/common/src/fx_directory_name_extract.c index 23a89eb..48ebf4d 100644 --- a/common/src/fx_directory_name_extract.c +++ b/common/src/fx_directory_name_extract.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_name_extract PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ CHAR *_fx_directory_name_extract(CHAR *source_ptr, CHAR *dest_ptr) diff --git a/common/src/fx_directory_name_test.c b/common/src/fx_directory_name_test.c index 74dadc3..29e3cae 100644 --- a/common/src/fx_directory_name_test.c +++ b/common/src/fx_directory_name_test.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_name_test PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_name_test(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fx_directory_next_entry_find.c b/common/src/fx_directory_next_entry_find.c index ca070a0..606efc7 100644 --- a/common/src/fx_directory_next_entry_find.c +++ b/common/src/fx_directory_next_entry_find.c @@ -43,7 +43,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_next_entry_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -80,6 +80,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_next_entry_find(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fx_directory_next_full_entry_find.c b/common/src/fx_directory_next_full_entry_find.c index 7764781..26aa22b 100644 --- a/common/src/fx_directory_next_full_entry_find.c +++ b/common/src/fx_directory_next_full_entry_find.c @@ -43,7 +43,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_next_full_entry_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -89,6 +89,8 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_next_full_entry_find(FX_MEDIA *media_ptr, diff --git a/common/src/fx_directory_rename.c b/common/src/fx_directory_rename.c index 61de93f..782707d 100644 --- a/common/src/fx_directory_rename.c +++ b/common/src/fx_directory_rename.c @@ -43,7 +43,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_rename PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -88,6 +88,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_rename(FX_MEDIA *media_ptr, CHAR *old_directory_name, CHAR *new_directory_name) diff --git a/common/src/fx_directory_search.c b/common/src/fx_directory_search.c index 838d64d..dcf58b1 100644 --- a/common/src/fx_directory_search.c +++ b/common/src/fx_directory_search.c @@ -43,7 +43,7 @@ FX_LOCAL_PATH_SETUP /* FUNCTION RELEASE */ /* */ /* _fx_directory_search PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -86,6 +86,10 @@ FX_LOCAL_PATH_SETUP /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable media search cache, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_search(FX_MEDIA *media_ptr, CHAR *name_ptr, FX_DIR_ENTRY *entry_ptr, @@ -95,7 +99,9 @@ UINT _fx_directory_search(FX_MEDIA *media_ptr, CHAR *name_ptr, FX_DIR_ENTRY *en ULONG i, n; UINT found; UINT status; +#ifndef FX_MEDIA_DISABLE_SEARCH_CACHE UINT v, j; +#endif /* FX_MEDIA_DISABLE_SEARCH_CACHE */ ULONG cluster, next_cluster = 0; ULONG64 directory_size; CHAR *dir_name_ptr; diff --git a/common/src/fx_directory_short_name_get.c b/common/src/fx_directory_short_name_get.c index 09cda38..d63dd70 100644 --- a/common/src/fx_directory_short_name_get.c +++ b/common/src/fx_directory_short_name_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_short_name_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_short_name_get(FX_MEDIA *media_ptr, CHAR *long_file_name, CHAR *short_file_name) diff --git a/common/src/fx_directory_short_name_get_extended.c b/common/src/fx_directory_short_name_get_extended.c index b6cb8a9..74b9b18 100644 --- a/common/src/fx_directory_short_name_get_extended.c +++ b/common/src/fx_directory_short_name_get_extended.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_directory_short_name_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_directory_short_name_get_extended(FX_MEDIA *media_ptr, CHAR *long_file_name, CHAR *short_file_name, UINT short_file_name_length) diff --git a/common/src/fx_fault_tolerant_add_FAT_log.c b/common/src/fx_fault_tolerant_add_FAT_log.c index 545f7bb..6dcd92f 100644 --- a/common/src/fx_fault_tolerant_add_FAT_log.c +++ b/common/src/fx_fault_tolerant_add_FAT_log.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_add_FAT_log PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_add_FAT_log(FX_MEDIA *media_ptr, ULONG cluster, ULONG value) diff --git a/common/src/fx_fault_tolerant_add_bitmap_log.c b/common/src/fx_fault_tolerant_add_bitmap_log.c index a219726..a81db0d 100644 --- a/common/src/fx_fault_tolerant_add_bitmap_log.c +++ b/common/src/fx_fault_tolerant_add_bitmap_log.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_add_bitmap_log PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_add_bitmap_log(FX_MEDIA *media_ptr, ULONG cluster, ULONG value) diff --git a/common/src/fx_fault_tolerant_add_checksum_log.c b/common/src/fx_fault_tolerant_add_checksum_log.c index 9f8c93c..203f826 100644 --- a/common/src/fx_fault_tolerant_add_checksum_log.c +++ b/common/src/fx_fault_tolerant_add_checksum_log.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_add_checksum_log PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_add_checksum_log(FX_MEDIA *media_ptr, ULONG64 logical_sector, ULONG offset, USHORT checksum) diff --git a/common/src/fx_fault_tolerant_add_dir_log.c b/common/src/fx_fault_tolerant_add_dir_log.c index 68d4d55..989e2e9 100644 --- a/common/src/fx_fault_tolerant_add_dir_log.c +++ b/common/src/fx_fault_tolerant_add_dir_log.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_add_dir_log PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_add_dir_log(FX_MEDIA *media_ptr, ULONG64 logical_sector, ULONG offset, @@ -115,7 +118,7 @@ FX_FAULT_TOLERANT_DIR_LOG *dir_log; _fx_utility_64_unsigned_write((UCHAR *)&dir_log -> fx_fault_tolerant_dir_log_sector, logical_sector); _fx_utility_32_unsigned_write((UCHAR *)&dir_log -> fx_fault_tolerant_dir_log_offset, offset); - memcpy(media_ptr -> fx_media_fault_tolerant_memory_buffer + + memcpy(media_ptr -> fx_media_fault_tolerant_memory_buffer + /* Use case of memcpy is verified. */ media_ptr -> fx_media_fault_tolerant_file_size + FX_FAULT_TOLERANT_DIR_LOG_ENTRY_SIZE, data, data_size); diff --git a/common/src/fx_fault_tolerant_apply_logs.c b/common/src/fx_fault_tolerant_apply_logs.c index f247de7..e9df000 100644 --- a/common/src/fx_fault_tolerant_apply_logs.c +++ b/common/src/fx_fault_tolerant_apply_logs.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_apply_logs PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -78,6 +78,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_apply_logs(FX_MEDIA *media_ptr) @@ -212,8 +215,13 @@ ULONG tail_cluster; copy_size = log_len - FX_FAULT_TOLERANT_DIR_LOG_ENTRY_SIZE; + if ((copy_offset + copy_size) > media_ptr -> fx_media_memory_size) + { + return(FX_FILE_CORRUPT); + } + /* Copy data into destination sector. */ - memcpy(media_ptr -> fx_media_memory_buffer + copy_offset, + memcpy(media_ptr -> fx_media_memory_buffer + copy_offset, /* Use case of memcpy is verified. */ current_ptr + FX_FAULT_TOLERANT_DIR_LOG_ENTRY_SIZE, copy_size); diff --git a/common/src/fx_fault_tolerant_calculate_checksum.c b/common/src/fx_fault_tolerant_calculate_checksum.c index b7fd33e..13fca29 100644 --- a/common/src/fx_fault_tolerant_calculate_checksum.c +++ b/common/src/fx_fault_tolerant_calculate_checksum.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_calculate_checksum PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ USHORT _fx_fault_tolerant_calculate_checksum(UCHAR *data, UINT len) diff --git a/common/src/fx_fault_tolerant_cleanup_FAT_chain.c b/common/src/fx_fault_tolerant_cleanup_FAT_chain.c index 56e91c8..92cb001 100644 --- a/common/src/fx_fault_tolerant_cleanup_FAT_chain.c +++ b/common/src/fx_fault_tolerant_cleanup_FAT_chain.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_cleanup_FAT_chain PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -83,6 +83,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_cleanup_FAT_chain(FX_MEDIA *media_ptr, UINT operation) diff --git a/common/src/fx_fault_tolerant_create_log_file.c b/common/src/fx_fault_tolerant_create_log_file.c index 41fd676..166c739 100644 --- a/common/src/fx_fault_tolerant_create_log_file.c +++ b/common/src/fx_fault_tolerant_create_log_file.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_create_log_file PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -76,6 +76,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_create_log_file(FX_MEDIA *media_ptr) diff --git a/common/src/fx_fault_tolerant_enable.c b/common/src/fx_fault_tolerant_enable.c index ce7f9ac..f229ad9 100644 --- a/common/src/fx_fault_tolerant_enable.c +++ b/common/src/fx_fault_tolerant_enable.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_enable PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -84,6 +84,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_enable(FX_MEDIA *media_ptr, VOID *memory_buffer, UINT memory_size) diff --git a/common/src/fx_fault_tolerant_read_FAT.c b/common/src/fx_fault_tolerant_read_FAT.c index fcb3dd7..fa90b91 100644 --- a/common/src/fx_fault_tolerant_read_FAT.c +++ b/common/src/fx_fault_tolerant_read_FAT.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_read_FAT PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_read_FAT(FX_MEDIA *media_ptr, ULONG cluster, ULONG *value, ULONG log_type) diff --git a/common/src/fx_fault_tolerant_read_directory_sector.c b/common/src/fx_fault_tolerant_read_directory_sector.c index c7ab2a9..4493a2f 100644 --- a/common/src/fx_fault_tolerant_read_directory_sector.c +++ b/common/src/fx_fault_tolerant_read_directory_sector.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_read_directory_sector PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_read_directory_sector(FX_MEDIA *media_ptr, ULONG64 logical_sector, @@ -149,8 +152,13 @@ FX_FAULT_TOLERANT_DIR_LOG *dir_log; copy_size = log_len - FX_FAULT_TOLERANT_DIR_LOG_ENTRY_SIZE; + if ((copy_offset + copy_size) > media_ptr -> fx_media_bytes_per_sector) + { + return(FX_FILE_CORRUPT); + } + /* Copy data into destination sector. */ - memcpy(current_buffer_ptr + copy_offset, + memcpy(current_buffer_ptr + copy_offset, /* Use case of memcpy is verified. */ current_ptr + FX_FAULT_TOLERANT_DIR_LOG_ENTRY_SIZE, copy_size); } } diff --git a/common/src/fx_fault_tolerant_read_log_file.c b/common/src/fx_fault_tolerant_read_log_file.c index ca27b6d..9d0c16a 100644 --- a/common/src/fx_fault_tolerant_read_log_file.c +++ b/common/src/fx_fault_tolerant_read_log_file.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_read_log_file PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -64,6 +64,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_read_log_file(FX_MEDIA *media_ptr) diff --git a/common/src/fx_fault_tolerant_recover.c b/common/src/fx_fault_tolerant_recover.c index c74d33b..cf77b3e 100644 --- a/common/src/fx_fault_tolerant_recover.c +++ b/common/src/fx_fault_tolerant_recover.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_recover PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -87,6 +87,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_recover(FX_MEDIA *media_ptr) diff --git a/common/src/fx_fault_tolerant_reset_log_file.c b/common/src/fx_fault_tolerant_reset_log_file.c index f47d841..5cfb040 100644 --- a/common/src/fx_fault_tolerant_reset_log_file.c +++ b/common/src/fx_fault_tolerant_reset_log_file.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_reset_log_file PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -84,6 +84,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ diff --git a/common/src/fx_fault_tolerant_set_FAT_chain.c b/common/src/fx_fault_tolerant_set_FAT_chain.c index 56ed610..0679b8d 100644 --- a/common/src/fx_fault_tolerant_set_FAT_chain.c +++ b/common/src/fx_fault_tolerant_set_FAT_chain.c @@ -33,7 +33,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_set_FAT_chain PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -77,6 +77,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_set_FAT_chain(FX_MEDIA *media_ptr, UINT use_bitmap, ULONG insertion_front, diff --git a/common/src/fx_fault_tolerant_transaction_end.c b/common/src/fx_fault_tolerant_transaction_end.c index 3164477..56c0dfa 100644 --- a/common/src/fx_fault_tolerant_transaction_end.c +++ b/common/src/fx_fault_tolerant_transaction_end.c @@ -32,7 +32,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_transaction_end PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -89,6 +89,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_transaction_end(FX_MEDIA *media_ptr) diff --git a/common/src/fx_fault_tolerant_transaction_fail.c b/common/src/fx_fault_tolerant_transaction_fail.c index 1c72d0b..b0af1c9 100644 --- a/common/src/fx_fault_tolerant_transaction_fail.c +++ b/common/src/fx_fault_tolerant_transaction_fail.c @@ -31,7 +31,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_transaction_fail PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -76,6 +76,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_transaction_fail(FX_MEDIA *media_ptr) diff --git a/common/src/fx_fault_tolerant_transaction_start.c b/common/src/fx_fault_tolerant_transaction_start.c index ce40a24..f50506a 100644 --- a/common/src/fx_fault_tolerant_transaction_start.c +++ b/common/src/fx_fault_tolerant_transaction_start.c @@ -32,7 +32,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_transaction_start PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -78,6 +78,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_transaction_start(FX_MEDIA *media_ptr) diff --git a/common/src/fx_fault_tolerant_write_log_file.c b/common/src/fx_fault_tolerant_write_log_file.c index 75f6784..71f96f5 100644 --- a/common/src/fx_fault_tolerant_write_log_file.c +++ b/common/src/fx_fault_tolerant_write_log_file.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_fault_tolerant_write_log_file PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_fault_tolerant_write_log_file(FX_MEDIA *media_ptr, ULONG relative_sector) diff --git a/common/src/fx_file_allocate.c b/common/src/fx_file_allocate.c index 663c590..4b90dca 100644 --- a/common/src/fx_file_allocate.c +++ b/common/src/fx_file_allocate.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_allocate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,11 +69,16 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* Added conditional to */ +/* disable one line function, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT _fx_file_allocate(FX_FILE *file_ptr, ULONG size) { return(_fx_file_extended_allocate(file_ptr, (ULONG64)size)); } - +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ diff --git a/common/src/fx_file_attributes_read.c b/common/src/fx_file_attributes_read.c index cbae0b7..dbaa592 100644 --- a/common/src/fx_file_attributes_read.c +++ b/common/src/fx_file_attributes_read.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_attributes_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_attributes_read(FX_MEDIA *media_ptr, CHAR *file_name, UINT *attributes_ptr) diff --git a/common/src/fx_file_attributes_set.c b/common/src/fx_file_attributes_set.c index 246778e..7f18ff7 100644 --- a/common/src/fx_file_attributes_set.c +++ b/common/src/fx_file_attributes_set.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_attributes_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -82,6 +82,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_attributes_set(FX_MEDIA *media_ptr, CHAR *file_name, UINT attributes) diff --git a/common/src/fx_file_best_effort_allocate.c b/common/src/fx_file_best_effort_allocate.c index 6bc20b2..fcb935a 100644 --- a/common/src/fx_file_best_effort_allocate.c +++ b/common/src/fx_file_best_effort_allocate.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_best_effort_allocate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_best_effort_allocate(FX_FILE *file_ptr, ULONG size, ULONG *actual_size_allocated) diff --git a/common/src/fx_file_close.c b/common/src/fx_file_close.c index 2c67d67..0df298a 100644 --- a/common/src/fx_file_close.c +++ b/common/src/fx_file_close.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_close PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_close(FX_FILE *file_ptr) diff --git a/common/src/fx_file_create.c b/common/src/fx_file_create.c index 2206623..6ea3e19 100644 --- a/common/src/fx_file_create.c +++ b/common/src/fx_file_create.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -86,6 +86,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_create(FX_MEDIA *media_ptr, CHAR *file_name) diff --git a/common/src/fx_file_date_time_set.c b/common/src/fx_file_date_time_set.c index c9aa9f0..07e5ad0 100644 --- a/common/src/fx_file_date_time_set.c +++ b/common/src/fx_file_date_time_set.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_date_time_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_date_time_set(FX_MEDIA *media_ptr, CHAR *file_name, diff --git a/common/src/fx_file_delete.c b/common/src/fx_file_delete.c index 32cc946..8e8f1ca 100644 --- a/common/src/fx_file_delete.c +++ b/common/src/fx_file_delete.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_delete PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -87,6 +87,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_delete(FX_MEDIA *media_ptr, CHAR *file_name) diff --git a/common/src/fx_file_extended_allocate.c b/common/src/fx_file_extended_allocate.c index 0f94672..d9956f7 100644 --- a/common/src/fx_file_extended_allocate.c +++ b/common/src/fx_file_extended_allocate.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_extended_allocate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -90,6 +90,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_extended_allocate(FX_FILE *file_ptr, ULONG64 size) diff --git a/common/src/fx_file_extended_best_effort_allocate.c b/common/src/fx_file_extended_best_effort_allocate.c index 02f01b6..1760ccc 100644 --- a/common/src/fx_file_extended_best_effort_allocate.c +++ b/common/src/fx_file_extended_best_effort_allocate.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_extended_best_effort_allocate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -91,6 +91,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_extended_best_effort_allocate(FX_FILE *file_ptr, ULONG64 size, ULONG64 *actual_size_allocated) diff --git a/common/src/fx_file_extended_relative_seek.c b/common/src/fx_file_extended_relative_seek.c index 6c7eb3e..b11a424 100644 --- a/common/src/fx_file_extended_relative_seek.c +++ b/common/src/fx_file_extended_relative_seek.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_extended_relative_seek PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -77,6 +77,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_extended_relative_seek(FX_FILE *file_ptr, ULONG64 byte_offset, UINT seek_from) diff --git a/common/src/fx_file_extended_seek.c b/common/src/fx_file_extended_seek.c index c1d0496..05fb4cc 100644 --- a/common/src/fx_file_extended_seek.c +++ b/common/src/fx_file_extended_seek.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_extended_seek PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_extended_seek(FX_FILE *file_ptr, ULONG64 byte_offset) diff --git a/common/src/fx_file_extended_truncate.c b/common/src/fx_file_extended_truncate.c index 07df487..0e64f29 100644 --- a/common/src/fx_file_extended_truncate.c +++ b/common/src/fx_file_extended_truncate.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_extended_truncate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -79,6 +79,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_extended_truncate(FX_FILE *file_ptr, ULONG64 size) diff --git a/common/src/fx_file_extended_truncate_release.c b/common/src/fx_file_extended_truncate_release.c index 51ecfc3..b1cbf3a 100644 --- a/common/src/fx_file_extended_truncate_release.c +++ b/common/src/fx_file_extended_truncate_release.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_extended_truncate_release PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -86,6 +86,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_extended_truncate_release(FX_FILE *file_ptr, ULONG64 size) diff --git a/common/src/fx_file_open.c b/common/src/fx_file_open.c index a6b83b2..fef8850 100644 --- a/common/src/fx_file_open.c +++ b/common/src/fx_file_open.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_open PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,12 +75,20 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable fast open and */ +/* consecutive detect, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_open(FX_MEDIA *media_ptr, FX_FILE *file_ptr, CHAR *file_name, UINT open_type) { -UINT status, leading_consecutive; +UINT status; +#ifndef FX_DISABLE_CONSECUTIVE_DETECT +UINT leading_consecutive; +#endif /* FX_DISABLE_CONSECUTIVE_DETECT */ ULONG cluster; ULONG contents = 0; ULONG open_count; @@ -92,7 +100,9 @@ ULONG cluster_count; ULONG64 bytes_available; ULONG64 bytes_remaining; ULONG fat_last; +#ifndef FX_DISABLE_FAST_OPEN UINT fast_open; +#endif /* FX_DISABLE_FAST_OPEN */ UCHAR not_a_file_attr; @@ -134,6 +144,7 @@ UCHAR not_a_file_attr; not_a_file_attr = FX_DIRECTORY | FX_VOLUME; } +#ifndef FX_DISABLE_FAST_OPEN /* Determine if a fast open is selected. */ if (open_type == FX_OPEN_FOR_READ_FAST) { @@ -150,6 +161,7 @@ UCHAR not_a_file_attr; /* A fast open is not selected, set the flag to false. */ fast_open = FX_FALSE; } +#endif /* FX_DISABLE_FAST_OPEN */ /* If trace is enabled, register this object. */ FX_TRACE_OBJECT_REGISTER(FX_TRACE_OBJECT_TYPE_FILE, file_ptr, file_name, 0, 0) @@ -308,8 +320,12 @@ UCHAR not_a_file_attr; last_cluster = 0; cluster_count = 0; + +#ifndef FX_DISABLE_CONSECUTIVE_DETECT leading_consecutive = 1; +#endif /* FX_DISABLE_CONSECUTIVE_DETECT */ file_ptr -> fx_file_consecutive_cluster = 1; +#ifndef FX_DISABLE_FAST_OPEN /* Determine if the file is being open for reading with the fast option. */ if (fast_open) @@ -329,6 +345,7 @@ UCHAR not_a_file_attr; #endif /* FX_ENABLE_EXFAT */ } else +#endif /* FX_DISABLE_FAST_OPEN */ { #ifdef FX_ENABLE_EXFAT @@ -405,6 +422,8 @@ UCHAR not_a_file_attr; return(FX_FAT_READ_ERROR); } +#ifndef FX_DISABLE_CONSECUTIVE_DETECT + /* Check if present and next clusters are consecutive */ if (cluster + 1 == contents) { @@ -423,6 +442,7 @@ UCHAR not_a_file_attr; /* The clusters are no longer consecutive, clear the consecutive flag. */ leading_consecutive = 0; } +#endif /* FX_DISABLE_CONSECUTIVE_DETECT */ /* Save the last valid cluster. */ last_cluster = cluster; diff --git a/common/src/fx_file_read.c b/common/src/fx_file_read.c index f3fa3c6..b736e25 100644 --- a/common/src/fx_file_read.c +++ b/common/src/fx_file_read.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -76,6 +76,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_read(FX_FILE *file_ptr, VOID *buffer_ptr, ULONG request_size, ULONG *actual_size) @@ -193,7 +196,7 @@ ULONG trace_timestamp; } /* Actually perform the memory copy. */ - _fx_utility_memory_copy(((UCHAR *)media_ptr -> fx_media_memory_buffer) + + _fx_utility_memory_copy(((UCHAR *)media_ptr -> fx_media_memory_buffer) + /* Use case of memcpy is verified. */ file_ptr -> fx_file_current_logical_offset, destination_ptr, copy_bytes); @@ -291,7 +294,7 @@ ULONG trace_timestamp; } /* Actually perform the memory copy. */ - _fx_utility_memory_copy((UCHAR *)media_ptr -> fx_media_memory_buffer, destination_ptr, media_ptr -> fx_media_bytes_per_sector); + _fx_utility_memory_copy((UCHAR *)media_ptr -> fx_media_memory_buffer, destination_ptr, media_ptr -> fx_media_bytes_per_sector); /* Use case of memcpy is verified. */ } else { diff --git a/common/src/fx_file_relative_seek.c b/common/src/fx_file_relative_seek.c index c0d3e83..6de3248 100644 --- a/common/src/fx_file_relative_seek.c +++ b/common/src/fx_file_relative_seek.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_relative_seek PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,11 +74,17 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* Added conditional to */ +/* disable one line function, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT _fx_file_relative_seek(FX_FILE *file_ptr, ULONG byte_offset, UINT seek_from) { return(_fx_file_extended_relative_seek(file_ptr, (ULONG64)byte_offset, seek_from)); } +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ diff --git a/common/src/fx_file_rename.c b/common/src/fx_file_rename.c index 4971330..e64da59 100644 --- a/common/src/fx_file_rename.c +++ b/common/src/fx_file_rename.c @@ -43,7 +43,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_rename PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -87,6 +87,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_rename(FX_MEDIA *media_ptr, CHAR *old_file_name, CHAR *new_file_name) diff --git a/common/src/fx_file_seek.c b/common/src/fx_file_seek.c index 22f7c54..fe73e1a 100644 --- a/common/src/fx_file_seek.c +++ b/common/src/fx_file_seek.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_seek PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,11 +68,16 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* Added conditional to */ +/* disable one line function, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT _fx_file_seek(FX_FILE *file_ptr, ULONG byte_offset) { return(_fx_file_extended_seek(file_ptr, (ULONG64) byte_offset)); } - +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ diff --git a/common/src/fx_file_truncate.c b/common/src/fx_file_truncate.c index de63206..5622cf1 100644 --- a/common/src/fx_file_truncate.c +++ b/common/src/fx_file_truncate.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_truncate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,11 +68,16 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* Added conditional to */ +/* disable one line function, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT _fx_file_truncate(FX_FILE *file_ptr, ULONG size) { return(_fx_file_extended_truncate(file_ptr, (ULONG64)size)); } - +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ diff --git a/common/src/fx_file_truncate_release.c b/common/src/fx_file_truncate_release.c index 33d944a..03e029d 100644 --- a/common/src/fx_file_truncate_release.c +++ b/common/src/fx_file_truncate_release.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_truncate_release PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,11 +70,17 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* Added conditional to */ +/* disable one line function, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ +#ifndef FX_DISABLE_ONE_LINE_FUNCTION UINT _fx_file_truncate_release(FX_FILE *file_ptr, ULONG size) { return(_fx_file_extended_truncate_release(file_ptr, (ULONG64)size)); } +#endif /* FX_DISABLE_ONE_LINE_FUNCTION */ diff --git a/common/src/fx_file_write.c b/common/src/fx_file_write.c index 77e57c7..15830a5 100644 --- a/common/src/fx_file_write.c +++ b/common/src/fx_file_write.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -92,6 +92,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_write(FX_FILE *file_ptr, VOID *buffer_ptr, ULONG size) @@ -1291,7 +1294,7 @@ UCHAR dont_use_fat_old = FX_FALSE; /* Used by exFAT logic to in } /* Actually perform the memory copy. */ - _fx_utility_memory_copy(source_ptr, ((UCHAR *)media_ptr -> fx_media_memory_buffer) + + _fx_utility_memory_copy(source_ptr, ((UCHAR *)media_ptr -> fx_media_memory_buffer) + /* Use case of memcpy is verified. */ file_ptr -> fx_file_current_logical_offset, copy_bytes); diff --git a/common/src/fx_file_write_notify_set.c b/common/src/fx_file_write_notify_set.c index 406616a..abc4b49 100644 --- a/common/src/fx_file_write_notify_set.c +++ b/common/src/fx_file_write_notify_set.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_file_write_notify_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_file_write_notify_set(FX_FILE *file_ptr, VOID (*file_write_notify)(FX_FILE *file)) diff --git a/common/src/fx_media_abort.c b/common/src/fx_media_abort.c index defc329..c6dc86f 100644 --- a/common/src/fx_media_abort.c +++ b/common/src/fx_media_abort.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_abort PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_abort(FX_MEDIA *media_ptr) diff --git a/common/src/fx_media_boot_info_extract.c b/common/src/fx_media_boot_info_extract.c index d65dc38..b124869 100644 --- a/common/src/fx_media_boot_info_extract.c +++ b/common/src/fx_media_boot_info_extract.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_boot_info_extract PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -108,6 +108,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_boot_info_extract(FX_MEDIA *media_ptr) diff --git a/common/src/fx_media_cache_invalidate.c b/common/src/fx_media_cache_invalidate.c index 7c4099c..27c556d 100644 --- a/common/src/fx_media_cache_invalidate.c +++ b/common/src/fx_media_cache_invalidate.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_cache_invalidate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_cache_invalidate(FX_MEDIA *media_ptr) diff --git a/common/src/fx_media_check.c b/common/src/fx_media_check.c index 4b66237..a81a3c6 100644 --- a/common/src/fx_media_check.c +++ b/common/src/fx_media_check.c @@ -57,7 +57,7 @@ typedef struct CURRENT_DIRECTORY_ENTRY_STRUCT /* FUNCTION RELEASE */ /* */ /* _fx_media_check PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -163,6 +163,8 @@ typedef struct CURRENT_DIRECTORY_ENTRY_STRUCT /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_check(FX_MEDIA *media_ptr, UCHAR *scratch_memory_ptr, ULONG scratch_memory_size, ULONG error_correction_option, ULONG *errors_detected) diff --git a/common/src/fx_media_check_FAT_chain_check.c b/common/src/fx_media_check_FAT_chain_check.c index 2a9561a..5dcdb30 100644 --- a/common/src/fx_media_check_FAT_chain_check.c +++ b/common/src/fx_media_check_FAT_chain_check.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_check_FAT_chain_check PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ ULONG _fx_media_check_FAT_chain_check(FX_MEDIA *media_ptr, ULONG starting_cluster, ULONG *last_valid_cluster, ULONG *total_valid_clusters, UCHAR *logical_fat) diff --git a/common/src/fx_media_check_lost_cluster_check.c b/common/src/fx_media_check_lost_cluster_check.c index 70b07fd..4e6c911 100644 --- a/common/src/fx_media_check_lost_cluster_check.c +++ b/common/src/fx_media_check_lost_cluster_check.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_check_lost_cluster_check PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ ULONG _fx_media_check_lost_cluster_check(FX_MEDIA *media_ptr, UCHAR *logical_fat, ULONG total_clusters, ULONG error_correction_option) @@ -171,7 +173,7 @@ UINT status; /* FUNCTION RELEASE */ /* */ /* _fx_media_check_exFAT_lost_cluster_check PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -209,6 +211,8 @@ UINT status; /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ ULONG _fx_media_check_exFAT_lost_cluster_check(FX_MEDIA *media_ptr, UCHAR *logical_fat, ULONG total_clusters, ULONG error_correction_option) diff --git a/common/src/fx_media_close.c b/common/src/fx_media_close.c index 1457850..42693d2 100644 --- a/common/src/fx_media_close.c +++ b/common/src/fx_media_close.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_close PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -84,14 +84,22 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable file close */ +/* and cache, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_close(FX_MEDIA *media_ptr) { FX_INT_SAVE_AREA + +#ifndef FX_DISABLE_FILE_CLOSE ULONG open_count; FX_FILE *file_ptr; +#endif /* FX_DISABLE_FILE_CLOSE */ UINT status; @@ -112,6 +120,7 @@ UINT status; /* Protect against other threads accessing the media. */ FX_PROTECT +#ifndef FX_DISABLE_FILE_CLOSE /* Loop through the media's open files. */ open_count = media_ptr -> fx_media_opened_file_count; file_ptr = media_ptr -> fx_media_opened_file_list; @@ -178,6 +187,7 @@ UINT status; file_ptr = file_ptr -> fx_file_opened_next; open_count--; } +#endif /* FX_DISABLE_FILE_CLOSE */ /* Flush the cached individual FAT entries */ _fx_utility_FAT_flush(media_ptr); @@ -224,12 +234,16 @@ UINT status; ULONG signature; +#ifndef FX_DISABLE_CACHE /* Setup a pointer to the first cached entry's buffer. */ buffer_ptr = (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector_memory_buffer; /* Invalidate this cache entry. */ (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector = (~(ULONG64)0); (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector_valid = FX_FALSE; +#else + buffer_ptr = media_ptr -> fx_media_memory_buffer; +#endif /* FX_DISABLE_CACHE */ /* Read the FAT32 additional information sector from the device. */ media_ptr -> fx_media_driver_request = FX_DRIVER_READ; diff --git a/common/src/fx_media_close_notify_set.c b/common/src/fx_media_close_notify_set.c index 2e65d4f..556882a 100644 --- a/common/src/fx_media_close_notify_set.c +++ b/common/src/fx_media_close_notify_set.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_close_notif_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_close_notify_set(FX_MEDIA *media_ptr, VOID (*media_close_notify)(FX_MEDIA *media)) diff --git a/common/src/fx_media_exFAT_format.c b/common/src/fx_media_exFAT_format.c index 2b22d24..a9648c2 100644 --- a/common/src/fx_media_exFAT_format.c +++ b/common/src/fx_media_exFAT_format.c @@ -449,7 +449,7 @@ const ULONG UpCaseTableCheckSum = 0xE619D30D; /* FUNCTION RELEASE */ /* */ /* _fx_media_exFAT_format PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -510,6 +510,9 @@ const ULONG UpCaseTableCheckSum = 0xE619D30D; /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_exFAT_format(FX_MEDIA *media_ptr, @@ -628,11 +631,11 @@ UINT status; /* Clear work buffer. */ _fx_utility_memory_set(byte_ptr, 0x00, FX_BOOT_SECTOR_SIZE); - _fx_utility_memory_copy((UCHAR *)jump_boot, + _fx_utility_memory_copy((UCHAR *)jump_boot, /* Use case of memcpy is verified. */ &byte_ptr[FX_JUMP_INSTR], sizeof(jump_boot)); - _fx_utility_memory_copy((UCHAR *)file_system_name, + _fx_utility_memory_copy((UCHAR *)file_system_name, /* Use case of memcpy is verified. */ &byte_ptr[FX_OEM_NAME], sizeof(file_system_name)); @@ -800,7 +803,7 @@ UINT status; offset = sizeof(fat_init_mask); /* Copy the initial values for FAT table. */ - _fx_utility_memory_copy((UCHAR *)fat_init_mask, + _fx_utility_memory_copy((UCHAR *)fat_init_mask, /* Use case of memcpy is verified. */ byte_ptr, sizeof(fat_init_mask)); @@ -1076,7 +1079,7 @@ UINT status; _fx_utility_memory_set(byte_ptr, 0x00, media_ptr -> fx_media_bytes_per_sector); /* Copy the remaining bytes. */ - _fx_utility_memory_copy((UCHAR *)_fx_utility_exFAT_upcase_table_compressed + sizeof(_fx_utility_exFAT_upcase_table_compressed) - i, byte_ptr, i); + _fx_utility_memory_copy((UCHAR *)_fx_utility_exFAT_upcase_table_compressed + sizeof(_fx_utility_exFAT_upcase_table_compressed) - i, byte_ptr, i); /* Use case of memcpy is verified. */ /* Write out the sector. */ status = _fx_utility_exFAT_system_sector_write(media_ptr, byte_ptr, diff --git a/common/src/fx_media_extended_space_available.c b/common/src/fx_media_extended_space_available.c index 335f9d4..6ff37d3 100644 --- a/common/src/fx_media_extended_space_available.c +++ b/common/src/fx_media_extended_space_available.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_extended_space_available PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_extended_space_available(FX_MEDIA *media_ptr, ULONG64 *available_bytes_ptr) diff --git a/common/src/fx_media_flush.c b/common/src/fx_media_flush.c index f83bf8b..f8649e6 100644 --- a/common/src/fx_media_flush.c +++ b/common/src/fx_media_flush.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_flush PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -78,6 +78,10 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable cache, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_flush(FX_MEDIA *media_ptr) @@ -221,6 +225,7 @@ FX_INT_SAVE_AREA UCHAR *buffer_ptr; ULONG signature; +#ifndef FX_DISABLE_CACHE /* Setup a pointer to the first cached entry's buffer. */ buffer_ptr = (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector_memory_buffer; @@ -228,6 +233,9 @@ FX_INT_SAVE_AREA /* Invalidate this cache entry. */ (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector = (~(ULONG64)0); (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector_valid = FX_FALSE; +#else + buffer_ptr = media_ptr -> fx_media_memory_buffer; +#endif /* FX_DISABLE_CACHE */ /* Read the FAT32 additional information sector from the device. */ media_ptr -> fx_media_driver_request = FX_DRIVER_READ; diff --git a/common/src/fx_media_format.c b/common/src/fx_media_format.c index 306f79d..050597a 100644 --- a/common/src/fx_media_format.c +++ b/common/src/fx_media_format.c @@ -59,7 +59,7 @@ ULONG _fx_media_format_volume_id = 1; /* FUNCTION RELEASE */ /* */ /* _fx_media_format PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -112,6 +112,10 @@ ULONG _fx_media_format_volume_id = 1; /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable force memset, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_format(FX_MEDIA *media_ptr, VOID (*driver)(FX_MEDIA *media), VOID *driver_info_ptr, UCHAR *memory_ptr, UINT memory_size, @@ -178,6 +182,7 @@ UINT sectors_per_fat, f, s; /* Move the buffer pointer into a local copy. */ byte_ptr = media_ptr -> fx_media_driver_buffer; +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION /* Clear the buffer record out, assuming it is large enough for one sector. */ for (i = 0; i < bytes_per_sector; i++) { @@ -185,6 +190,9 @@ UINT sectors_per_fat, f, s; /* Clear each byte of the boot record. */ byte_ptr[i] = (UCHAR)0; } +#else + _fx_utility_memory_set(byte_ptr, 0, bytes_per_sector); +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ /* Set jump instruction at the beginning of the sector. */ byte_ptr[0] = (UCHAR)0xEB; @@ -417,13 +425,16 @@ UINT sectors_per_fat, f, s; } /* Now blank-pad the remainder of the volume name. */ +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION while (i < 11) { byte_ptr[j + i] = (UCHAR)' '; i++; } - +#else + _fx_utility_memory_set(&byte_ptr[j + i], ' ', (11 - i)); +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ #ifdef FX_FORCE_512_BYTE_BOOT_SECTOR @@ -466,11 +477,15 @@ UINT sectors_per_fat, f, s; if ((total_clusters >= FX_16_BIT_FAT_SIZE) && (bytes_per_sector == 512)) { +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION /* Clear sector buffer. */ for (i = 0; i < bytes_per_sector; i++) { byte_ptr[i] = (CHAR)0; } +#else + _fx_utility_memory_set(byte_ptr, 0, bytes_per_sector); +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ /* Build the FSINFO fields. */ @@ -584,11 +599,15 @@ UINT sectors_per_fat, f, s; i = 0; } +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION /* Clear remainder of sector buffer. */ for (; i < bytes_per_sector; i++) { byte_ptr[i] = (CHAR)0; } +#else + _fx_utility_memory_set(&byte_ptr[i], 0, (bytes_per_sector - i)); +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ /* Build sector write command. */ media_ptr -> fx_media_driver_logical_sector = reserved_sectors + (f * sectors_per_fat) + s; @@ -614,11 +633,15 @@ UINT sectors_per_fat, f, s; } } +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION /* Clear sector buffer. */ for (i = 0; i < bytes_per_sector; i++) { byte_ptr[i] = (CHAR)0; } +#else + _fx_utility_memory_set(byte_ptr, 0, bytes_per_sector); +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ /* Now clear the root directory sectors. */ for (s = 0; s < root_sectors; s++) diff --git a/common/src/fx_media_format_oem_name_set.c b/common/src/fx_media_format_oem_name_set.c index d6c0dcf..fea43a4 100644 --- a/common/src/fx_media_format_oem_name_set.c +++ b/common/src/fx_media_format_oem_name_set.c @@ -40,7 +40,7 @@ UINT fx_media_format_oem_name_set(UCHAR new_oem_name[8]); /* FUNCTION RELEASE */ /* */ /* _fx_media_format_oem_name_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ UINT fx_media_format_oem_name_set(UCHAR new_oem_name[8]); /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT fx_media_format_oem_name_set(UCHAR new_oem_name[8]) diff --git a/common/src/fx_media_format_type_set.c b/common/src/fx_media_format_type_set.c index 59c866c..69b8f59 100644 --- a/common/src/fx_media_format_type_set.c +++ b/common/src/fx_media_format_type_set.c @@ -40,7 +40,7 @@ UINT fx_media_format_type_set(UCHAR new_media_type); /* FUNCTION RELEASE */ /* */ /* _fx_media_format_type_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ UINT fx_media_format_type_set(UCHAR new_media_type); /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT fx_media_format_type_set(UCHAR new_media_type) diff --git a/common/src/fx_media_format_volume_id_set.c b/common/src/fx_media_format_volume_id_set.c index 66e548b..2728df4 100644 --- a/common/src/fx_media_format_volume_id_set.c +++ b/common/src/fx_media_format_volume_id_set.c @@ -40,7 +40,7 @@ UINT fx_media_format_volume_id_set(ULONG new_volume_id); /* FUNCTION RELEASE */ /* */ /* _fx_media_format_media_volume_id_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ UINT fx_media_format_volume_id_set(ULONG new_volume_id); /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT fx_media_format_volume_id_set(ULONG new_volume_id) diff --git a/common/src/fx_media_open.c b/common/src/fx_media_open.c index e015e68..9844780 100644 --- a/common/src/fx_media_open.c +++ b/common/src/fx_media_open.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_open PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -124,6 +124,11 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable force memset, */ +/* build options and cache, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_open(FX_MEDIA *media_ptr, CHAR *media_name, @@ -135,7 +140,9 @@ FX_MEDIA_PTR tail_ptr; ULONG cluster_number; ULONG FAT_entry, FAT_sector, FAT_read_sectors; ULONG i, j; +#ifndef FX_DISABLE_CACHE FX_CACHED_SECTOR *cache_entry_ptr; +#endif /* FX_DISABLE_CACHE */ UINT status; UINT additional_info_sector; UCHAR *original_memory_ptr; @@ -143,6 +150,7 @@ ULONG bytes_in_buffer; FX_INT_SAVE_AREA +#ifndef FX_DISABLE_BUILD_OPTIONS /* Reference the version ID and option words to ensure they are linked in. */ if ((_fx_system_build_options_1 | _fx_system_build_options_2 | _fx_system_build_options_3) == 0 || _fx_version_id[0] == 0) @@ -151,14 +159,24 @@ FX_INT_SAVE_AREA /* We should never get here! */ return(FX_NOT_IMPLEMENTED); } +#endif /* FX_DISABLE_BUILD_OPTIONS */ + +#ifdef FX_DISABLE_FORCE_MEMORY_OPERATION + _fx_utility_memory_set((UCHAR *)media_ptr, 0, sizeof(FX_MEDIA)); +#ifdef FX_DISABLE_CACHE + media_ptr -> fx_media_memory_buffer_sector = (ULONG64)-1; +#endif /* FX_DISABLE_CACHE */ +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ /* Save the basic information in the media control block. */ media_ptr -> fx_media_name = media_name; media_ptr -> fx_media_driver_entry = media_driver; media_ptr -> fx_media_memory_buffer = (UCHAR *)memory_ptr; media_ptr -> fx_media_memory_size = memory_size; +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION media_ptr -> fx_media_disable_burst_cache = FX_FALSE; media_ptr -> fx_media_FAT_type = 0; +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ /* Save the original memory pointer. */ original_memory_ptr = (UCHAR *)memory_ptr; @@ -234,9 +252,6 @@ FX_INT_SAVE_AREA media_ptr -> fx_media_fault_tolerant_state = 0; #endif /* FX_ENABLE_FAULT_TOLERANT */ - /* If trace is enabled, register this object. */ - FX_TRACE_OBJECT_REGISTER(FX_TRACE_OBJECT_TYPE_MEDIA, media_ptr, media_name, FX_MAX_FAT_CACHE, media_ptr -> fx_media_sector_cache_size) - /* If trace is enabled, insert this event into the trace buffer. */ FX_TRACE_IN_LINE_INSERT(FX_TRACE_MEDIA_OPEN, media_ptr, media_driver, memory_ptr, memory_size, FX_TRACE_MEDIA_EVENTS, 0, 0) @@ -322,6 +337,7 @@ FX_INT_SAVE_AREA /* Pickup the additional info sector number. This will only be used in FAT32 situations. */ additional_info_sector = _fx_utility_16_unsigned_read(&media_ptr -> fx_media_driver_buffer[48]); +#ifndef FX_DISABLE_CACHE /* Determine how many logical sectors can be cached with user's supplied buffer area - there must be at least enough for one sector! */ media_ptr -> fx_media_sector_cache_size = memory_size / media_ptr -> fx_media_bytes_per_sector; @@ -344,6 +360,9 @@ FX_INT_SAVE_AREA return(FX_BUFFER_ERROR); } + /* If trace is enabled, register this object. */ + FX_TRACE_OBJECT_REGISTER(FX_TRACE_OBJECT_TYPE_MEDIA, media_ptr, media_name, FX_MAX_FAT_CACHE, media_ptr -> fx_media_sector_cache_size) + /* Adjust the internal cache to fit the fixed number of sector cache control blocks built into the media control block. */ if (media_ptr -> fx_media_sector_cache_size > FX_MAX_SECTOR_CACHE) @@ -413,7 +432,11 @@ FX_INT_SAVE_AREA /* Clear the logical sector cache flag. */ media_ptr -> fx_media_sector_cache_hashed = FX_FALSE; } +#else + media_ptr -> fx_media_memory_buffer = memory_ptr; +#endif /* FX_DISABLE_CACHE */ +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION /* Initialize the FAT cache entry array. */ for (i = 0; i < FX_MAX_FAT_CACHE; i++) { @@ -431,6 +454,8 @@ FX_INT_SAVE_AREA /* Clear bit map entry for secondary FAT update. */ media_ptr -> fx_media_fat_secondary_update_map[i] = 0; } +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ + #ifdef FX_ENABLE_EXFAT if (media_ptr -> fx_media_FAT_type != FX_exFAT) { @@ -598,11 +623,13 @@ FX_INT_SAVE_AREA media_ptr -> fx_media_bytes_per_sector) / FX_DIR_ENTRY_SIZE; } +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION /* Calculate the number of available clusters. */ media_ptr -> fx_media_available_clusters = 0; /* Set the cluster search start to an invalid value. */ media_ptr -> fx_media_cluster_search_start = 0; +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ /* Determine if there is 32-bit FAT additional information sector. */ if (media_ptr -> fx_media_FAT32_additional_info_sector) @@ -615,12 +642,16 @@ FX_INT_SAVE_AREA /* Yes, read the FAT32 additional information sector to get the available cluster count and the hint for the first available cluster. */ +#ifndef FX_DISABLE_CACHE /* Setup a pointer to the first cached entry's buffer. */ buffer_ptr = (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector_memory_buffer; /* Invalidate this cache entry. */ (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector = (~((ULONG64) 0)); (media_ptr -> fx_media_sector_cache_list_ptr) -> fx_cached_sector_valid = FX_FALSE; +#else + buffer_ptr = media_ptr -> fx_media_memory_buffer; +#endif /* FX_DISABLE_CACHE */ /* Read the FAT32 additional information sector from the device. */ media_ptr -> fx_media_driver_request = FX_DRIVER_READ; @@ -785,6 +816,7 @@ FX_INT_SAVE_AREA /* Loop through all FAT sectors in the primary FAT. The first two entries are examined in this loop, but they are always unavailable. */ cluster_number = 0; +#ifndef FX_DISABLE_CACHE for (i = 0; i < media_ptr -> fx_media_sectors_per_FAT; i = i + media_ptr -> fx_media_sector_cache_size) { @@ -799,6 +831,16 @@ FX_INT_SAVE_AREA { FAT_read_sectors = media_ptr -> fx_media_sector_cache_size; } +#else + for (i = 0; i < media_ptr -> fx_media_sectors_per_FAT; i++) + { + + /* Calculate the starting next FAT sector. */ + FAT_sector = media_ptr -> fx_media_reserved_sectors + i; + + /* Calculate how many sectors to read. */ + FAT_read_sectors = 1; +#endif /* FX_DISABLE_CACHE */ /* Read the FAT sectors directly from the driver. */ media_ptr -> fx_media_driver_request = FX_DRIVER_READ; @@ -928,9 +970,11 @@ FX_INT_SAVE_AREA media_ptr -> fx_media_last_found_name[0] = 0; #endif +#ifndef FX_DISABLE_FORCE_MEMORY_OPERATION /* Initialize the opened file linked list and associated counter. */ media_ptr -> fx_media_opened_file_list = FX_NULL; media_ptr -> fx_media_opened_file_count = 0; +#endif /* FX_DISABLE_FORCE_MEMORY_OPERATION */ /* Create the media protection structure if FX_SINGLE_THREAD is not defined. */ diff --git a/common/src/fx_media_open_notify_set.c b/common/src/fx_media_open_notify_set.c index d98ea53..0a383d0 100644 --- a/common/src/fx_media_open_notify_set.c +++ b/common/src/fx_media_open_notify_set.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_open_notify_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_open_notify_set(FX_MEDIA *media_ptr, VOID (*media_open_notify)(FX_MEDIA *media)) diff --git a/common/src/fx_media_read.c b/common/src/fx_media_read.c index 70e3ae0..3e853f0 100644 --- a/common/src/fx_media_read.c +++ b/common/src/fx_media_read.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_read(FX_MEDIA *media_ptr, ULONG logical_sector, VOID *buffer_ptr) diff --git a/common/src/fx_media_space_available.c b/common/src/fx_media_space_available.c index 3409b53..7b619aa 100644 --- a/common/src/fx_media_space_available.c +++ b/common/src/fx_media_space_available.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_space_available PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_space_available(FX_MEDIA *media_ptr, ULONG *available_bytes_ptr) diff --git a/common/src/fx_media_volume_get.c b/common/src/fx_media_volume_get.c index 951bbfb..d41973e 100644 --- a/common/src/fx_media_volume_get.c +++ b/common/src/fx_media_volume_get.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_volume_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -79,6 +79,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_volume_get(FX_MEDIA *media_ptr, CHAR *volume_name, UINT volume_source) diff --git a/common/src/fx_media_volume_get_extended.c b/common/src/fx_media_volume_get_extended.c index 00ecd88..3e7bdab 100644 --- a/common/src/fx_media_volume_get_extended.c +++ b/common/src/fx_media_volume_get_extended.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_volume_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -77,6 +77,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_volume_get_extended(FX_MEDIA *media_ptr, CHAR *volume_name, UINT volume_name_buffer_length, UINT volume_source) diff --git a/common/src/fx_media_volume_set.c b/common/src/fx_media_volume_set.c index 3320d02..70cb313 100644 --- a/common/src/fx_media_volume_set.c +++ b/common/src/fx_media_volume_set.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_volume_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_volume_set(FX_MEDIA *media_ptr, CHAR *volume_name) diff --git a/common/src/fx_media_write.c b/common/src/fx_media_write.c index 49473ba..1693377 100644 --- a/common/src/fx_media_write.c +++ b/common/src/fx_media_write.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_media_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_media_write(FX_MEDIA *media_ptr, ULONG logical_sector, VOID *buffer_ptr) diff --git a/common/src/fx_partition_offset_calculate.c b/common/src/fx_partition_offset_calculate.c index 64bbb53..8136e62 100644 --- a/common/src/fx_partition_offset_calculate.c +++ b/common/src/fx_partition_offset_calculate.c @@ -52,7 +52,7 @@ UINT _fx_utility_partition_get(FX_MEDIA_PARTITION *partition_table, /* FUNCTION RELEASE */ /* */ /* _fx_partition_offset_calculate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -101,6 +101,8 @@ UINT _fx_utility_partition_get(FX_MEDIA_PARTITION *partition_table, /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_partition_offset_calculate(void *partition_sector, UINT partition, @@ -252,7 +254,7 @@ UCHAR *partition_sector_ptr; /* FUNCTION RELEASE */ /* */ /* _fx_utility_partition_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -287,6 +289,8 @@ UCHAR *partition_sector_ptr; /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_partition_get(FX_MEDIA_PARTITION *partition_table, diff --git a/common/src/fx_ram_driver.c b/common/src/fx_ram_driver.c index eaf34da..1ed73d7 100644 --- a/common/src/fx_ram_driver.c +++ b/common/src/fx_ram_driver.c @@ -57,7 +57,7 @@ VOID _fx_ram_driver(FX_MEDIA *media_ptr); /* FUNCTION RELEASE */ /* */ /* _fx_ram_driver PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -105,6 +105,8 @@ VOID _fx_ram_driver(FX_MEDIA *media_ptr); /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_ram_driver(FX_MEDIA *media_ptr) @@ -210,7 +212,7 @@ UINT bytes_per_sector; media_ptr -> fx_media_bytes_per_sector); /* Copy the RAM sector into the destination. */ - _fx_utility_memory_copy(source_buffer, media_ptr -> fx_media_driver_buffer, + _fx_utility_memory_copy(source_buffer, media_ptr -> fx_media_driver_buffer, media_ptr -> fx_media_driver_sectors * media_ptr -> fx_media_bytes_per_sector); diff --git a/common/src/fx_system_date_get.c b/common/src/fx_system_date_get.c index 144560e..32252ef 100644 --- a/common/src/fx_system_date_get.c +++ b/common/src/fx_system_date_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_system_date_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_system_date_get(UINT *year, UINT *month, UINT *day) diff --git a/common/src/fx_system_date_set.c b/common/src/fx_system_date_set.c index 25bc409..c5971fb 100644 --- a/common/src/fx_system_date_set.c +++ b/common/src/fx_system_date_set.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_system_date_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_system_date_set(UINT year, UINT month, UINT day) diff --git a/common/src/fx_system_initialize.c b/common/src/fx_system_initialize.c index c769d38..e7d7d6b 100644 --- a/common/src/fx_system_initialize.c +++ b/common/src/fx_system_initialize.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_system_initialize PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,10 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable build options, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_system_initialize(VOID) @@ -102,6 +106,7 @@ VOID _fx_system_initialize(VOID) FX_UPDATE_RATE_IN_TICKS, FX_UPDATE_RATE_IN_TICKS, TX_AUTO_ACTIVATE); #endif +#ifndef FX_DISABLE_BUILD_OPTIONS /* Setup the build options variables. */ /* Setup the first build options variable. */ @@ -197,5 +202,6 @@ VOID _fx_system_initialize(VOID) { _fx_system_build_options_3 = _fx_system_build_options_3 | ((ULONG)FX_UPDATE_RATE_IN_TICKS); } +#endif /* FX_DISABLE_BUILD_OPTIONS */ } diff --git a/common/src/fx_system_time_get.c b/common/src/fx_system_time_get.c index ec7eb62..1202705 100644 --- a/common/src/fx_system_time_get.c +++ b/common/src/fx_system_time_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_system_time_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_system_time_get(UINT *hour, UINT *minute, UINT *second) diff --git a/common/src/fx_system_time_set.c b/common/src/fx_system_time_set.c index 103685f..eaa4659 100644 --- a/common/src/fx_system_time_set.c +++ b/common/src/fx_system_time_set.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_system_time_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_system_time_set(UINT hour, UINT minute, UINT second) diff --git a/common/src/fx_system_timer_entry.c b/common/src/fx_system_timer_entry.c index 18e1aef..1b2e27e 100644 --- a/common/src/fx_system_timer_entry.c +++ b/common/src/fx_system_timer_entry.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_system_timer_entry PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_system_timer_entry(ULONG id) diff --git a/common/src/fx_trace_event_insert.c b/common/src/fx_trace_event_insert.c index e78329f..da9373d 100644 --- a/common/src/fx_trace_event_insert.c +++ b/common/src/fx_trace_event_insert.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_trace_event_insert PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -78,6 +78,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_trace_event_insert(ULONG event_id, ULONG info_field_1, ULONG info_field_2, ULONG info_field_3, ULONG info_field_4, ULONG filter, TX_TRACE_BUFFER_ENTRY **current_event, ULONG *current_timestamp) diff --git a/common/src/fx_trace_event_update.c b/common/src/fx_trace_event_update.c index 82ba9f0..c36fb7b 100644 --- a/common/src/fx_trace_event_update.c +++ b/common/src/fx_trace_event_update.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_trace_event_update PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, ULONG event_id, ULONG info_field_1, ULONG info_field_2, ULONG info_field_3, ULONG info_field_4) diff --git a/common/src/fx_trace_object_register.c b/common/src/fx_trace_object_register.c index 506c45f..a860ae9 100644 --- a/common/src/fx_trace_object_register.c +++ b/common/src/fx_trace_object_register.c @@ -42,7 +42,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_trace_object_register PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -76,6 +76,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_trace_object_register(UCHAR object_type, VOID *object_ptr, CHAR *object_name, ULONG parameter_1, ULONG parameter_2) diff --git a/common/src/fx_trace_object_unregister.c b/common/src/fx_trace_object_unregister.c index fdf4771..17a22c2 100644 --- a/common/src/fx_trace_object_unregister.c +++ b/common/src/fx_trace_object_unregister.c @@ -44,7 +44,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_trace_object_unregister PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_trace_object_unregister(VOID *object_ptr) diff --git a/common/src/fx_unicode_directory_create.c b/common/src/fx_unicode_directory_create.c index 88e2566..98e08fc 100644 --- a/common/src/fx_unicode_directory_create.c +++ b/common/src/fx_unicode_directory_create.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_directory_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -80,6 +80,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_directory_create(FX_MEDIA *media_ptr, UCHAR *source_unicode_name, ULONG source_unicode_length, CHAR *short_name) diff --git a/common/src/fx_unicode_directory_entry_change.c b/common/src/fx_unicode_directory_entry_change.c index c46cab9..1fbd3f9 100644 --- a/common/src/fx_unicode_directory_entry_change.c +++ b/common/src/fx_unicode_directory_entry_change.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_directory_entry_change PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_directory_entry_change(FX_MEDIA *media_ptr, FX_DIR_ENTRY *entry_ptr, UCHAR *unicode_name, ULONG unicode_name_length) diff --git a/common/src/fx_unicode_directory_entry_read.c b/common/src/fx_unicode_directory_entry_read.c index 687f1f2..46aa3c8 100644 --- a/common/src/fx_unicode_directory_entry_read.c +++ b/common/src/fx_unicode_directory_entry_read.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_directory_entry_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_directory_entry_read(FX_MEDIA *media_ptr, FX_DIR_ENTRY *source_dir, diff --git a/common/src/fx_unicode_directory_rename.c b/common/src/fx_unicode_directory_rename.c index 1091a6a..913505e 100644 --- a/common/src/fx_unicode_directory_rename.c +++ b/common/src/fx_unicode_directory_rename.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_directory_rename PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -82,6 +82,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_directory_rename(FX_MEDIA *media_ptr, UCHAR *old_unicode_name, ULONG old_unicode_length, diff --git a/common/src/fx_unicode_directory_search.c b/common/src/fx_unicode_directory_search.c index 104dba5..58af76e 100644 --- a/common/src/fx_unicode_directory_search.c +++ b/common/src/fx_unicode_directory_search.c @@ -46,7 +46,7 @@ UCHAR _fx_unicode_search_name[FX_MAX_LONG_NAME_LEN * 2]; /* FUNCTION RELEASE */ /* */ /* _fx_unicode_directory_search PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -98,6 +98,8 @@ UCHAR _fx_unicode_search_name[FX_MAX_LONG_NAME_LEN * 2]; /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_directory_search(FX_MEDIA *media_ptr, FX_DIR_ENTRY *entry_ptr, diff --git a/common/src/fx_unicode_file_create.c b/common/src/fx_unicode_file_create.c index 21e1aa4..7ecf4ef 100644 --- a/common/src/fx_unicode_file_create.c +++ b/common/src/fx_unicode_file_create.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_file_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -81,6 +81,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_file_create(FX_MEDIA *media_ptr, UCHAR *source_unicode_name, ULONG source_unicode_length, CHAR *short_name) diff --git a/common/src/fx_unicode_file_rename.c b/common/src/fx_unicode_file_rename.c index 9831df8..d50f93e 100644 --- a/common/src/fx_unicode_file_rename.c +++ b/common/src/fx_unicode_file_rename.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_file_rename PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -85,6 +85,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_file_rename(FX_MEDIA *media_ptr, UCHAR *old_unicode_name, ULONG old_unicode_length, diff --git a/common/src/fx_unicode_length_get.c b/common/src/fx_unicode_length_get.c index e800ca6..9cfd902 100644 --- a/common/src/fx_unicode_length_get.c +++ b/common/src/fx_unicode_length_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_length_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ ULONG _fx_unicode_length_get(UCHAR *unicode_name) diff --git a/common/src/fx_unicode_length_get_extended.c b/common/src/fx_unicode_length_get_extended.c index e0d6939..3838f02 100644 --- a/common/src/fx_unicode_length_get_extended.c +++ b/common/src/fx_unicode_length_get_extended.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_length_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -65,6 +65,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ ULONG _fx_unicode_length_get_extended(UCHAR *unicode_name, UINT buffer_length) diff --git a/common/src/fx_unicode_name_get.c b/common/src/fx_unicode_name_get.c index 094f76b..8f20ac8 100644 --- a/common/src/fx_unicode_name_get.c +++ b/common/src/fx_unicode_name_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_name_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_name_get(FX_MEDIA *media_ptr, CHAR *source_short_name, diff --git a/common/src/fx_unicode_name_get_extended.c b/common/src/fx_unicode_name_get_extended.c index ffc256e..2140f28 100644 --- a/common/src/fx_unicode_name_get_extended.c +++ b/common/src/fx_unicode_name_get_extended.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_name_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_name_get_extended(FX_MEDIA *media_ptr, CHAR *source_short_name, diff --git a/common/src/fx_unicode_short_name_get.c b/common/src/fx_unicode_short_name_get.c index 11d212b..d4dd144 100644 --- a/common/src/fx_unicode_short_name_get.c +++ b/common/src/fx_unicode_short_name_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_short_name_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_short_name_get(FX_MEDIA *media_ptr, UCHAR *source_unicode_name, ULONG source_unicode_length, diff --git a/common/src/fx_unicode_short_name_get_extended.c b/common/src/fx_unicode_short_name_get_extended.c index 8b97706..73c1056 100644 --- a/common/src/fx_unicode_short_name_get_extended.c +++ b/common/src/fx_unicode_short_name_get_extended.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_unicode_short_name_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_unicode_short_name_get_extended(FX_MEDIA *media_ptr, UCHAR *source_unicode_name, ULONG source_unicode_length, diff --git a/common/src/fx_utility_16_unsigned_read.c b/common/src/fx_utility_16_unsigned_read.c index 370d834..917641f 100644 --- a/common/src/fx_utility_16_unsigned_read.c +++ b/common/src/fx_utility_16_unsigned_read.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_16_unsigned_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_16_unsigned_read(UCHAR *source_ptr) diff --git a/common/src/fx_utility_16_unsigned_write.c b/common/src/fx_utility_16_unsigned_write.c index 361ab28..14bbe53 100644 --- a/common/src/fx_utility_16_unsigned_write.c +++ b/common/src/fx_utility_16_unsigned_write.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_16_unsigned_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_utility_16_unsigned_write(UCHAR *dest_ptr, UINT value) diff --git a/common/src/fx_utility_32_unsigned_read.c b/common/src/fx_utility_32_unsigned_read.c index cc7c247..058d056 100644 --- a/common/src/fx_utility_32_unsigned_read.c +++ b/common/src/fx_utility_32_unsigned_read.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_32_unsigned_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ ULONG _fx_utility_32_unsigned_read(UCHAR *source_ptr) diff --git a/common/src/fx_utility_32_unsigned_write.c b/common/src/fx_utility_32_unsigned_write.c index 8385398..70baa19 100644 --- a/common/src/fx_utility_32_unsigned_write.c +++ b/common/src/fx_utility_32_unsigned_write.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_32_unsigned_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_utility_32_unsigned_write(UCHAR *dest_ptr, ULONG value) diff --git a/common/src/fx_utility_64_unsigned_read.c b/common/src/fx_utility_64_unsigned_read.c index ae169ed..5749f58 100644 --- a/common/src/fx_utility_64_unsigned_read.c +++ b/common/src/fx_utility_64_unsigned_read.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_64_unsigned_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ ULONG64 _fx_utility_64_unsigned_read(UCHAR *source_ptr) diff --git a/common/src/fx_utility_64_unsigned_write.c b/common/src/fx_utility_64_unsigned_write.c index ca257c6..1719cc2 100644 --- a/common/src/fx_utility_64_unsigned_write.c +++ b/common/src/fx_utility_64_unsigned_write.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_64_unsigned_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_utility_64_unsigned_write(UCHAR *dest_ptr, ULONG64 value) diff --git a/common/src/fx_utility_FAT_entry_read.c b/common/src/fx_utility_FAT_entry_read.c index 17c635d..5a10df7 100644 --- a/common/src/fx_utility_FAT_entry_read.c +++ b/common/src/fx_utility_FAT_entry_read.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_FAT_entry_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -76,6 +76,10 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable fat entry refresh, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_FAT_entry_read(FX_MEDIA *media_ptr, ULONG cluster, ULONG *entry_ptr) @@ -121,6 +125,7 @@ FX_FAT_CACHE_ENTRY temp_cache_entry; /* Build a pointer to the cache entry. */ cache_entry_ptr = &media_ptr -> fx_media_fat_cache[index]; +#ifndef FX_DISABLE_FAT_ENTRY_REFRESH /* Determine if the FAT entry is in the cache - assuming the depth of the FAT cache is 4 entries. */ if ((cache_entry_ptr -> fx_fat_cache_entry_cluster) == cluster) @@ -179,6 +184,18 @@ FX_FAT_CACHE_ENTRY temp_cache_entry; /* Return a successful status. */ return(FX_SUCCESS); } +#else + for (UINT i = 0; i < 4; i++) + { + if (((cache_entry_ptr + i) -> fx_fat_cache_entry_cluster) == cluster) + { + *entry_ptr = (cache_entry_ptr + i) -> fx_fat_cache_entry_value; + + /* Return a successful status. */ + return(FX_SUCCESS); + } + } +#endif /* FX_DISABLE_FAT_ENTRY_REFRESH */ /* Determine if the oldest entry was modified, i.e. whether or not it is dirty. */ diff --git a/common/src/fx_utility_FAT_entry_write.c b/common/src/fx_utility_FAT_entry_write.c index 9302679..67d9254 100644 --- a/common/src/fx_utility_FAT_entry_write.c +++ b/common/src/fx_utility_FAT_entry_write.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_FAT_entry_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_FAT_entry_write(FX_MEDIA *media_ptr, ULONG cluster, ULONG next_cluster) diff --git a/common/src/fx_utility_FAT_flush.c b/common/src/fx_utility_FAT_flush.c index cb0711f..b5c06e2 100644 --- a/common/src/fx_utility_FAT_flush.c +++ b/common/src/fx_utility_FAT_flush.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_FAT_flush PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_FAT_flush(FX_MEDIA *media_ptr) diff --git a/common/src/fx_utility_FAT_map_flush.c b/common/src/fx_utility_FAT_map_flush.c index 52a2743..9ab3702 100644 --- a/common/src/fx_utility_FAT_map_flush.c +++ b/common/src/fx_utility_FAT_map_flush.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_FAT_map_flush PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_FAT_map_flush(FX_MEDIA *media_ptr) diff --git a/common/src/fx_utility_FAT_sector_get.c b/common/src/fx_utility_FAT_sector_get.c index 125cd4d..9d0cba6 100644 --- a/common/src/fx_utility_FAT_sector_get.c +++ b/common/src/fx_utility_FAT_sector_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_FAT_sector_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -64,6 +64,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ ULONG _fx_utility_FAT_sector_get(FX_MEDIA *media_ptr, ULONG cluster) diff --git a/common/src/fx_utility_absolute_path_get.c b/common/src/fx_utility_absolute_path_get.c index a2a6e28..c308219 100644 --- a/common/src/fx_utility_absolute_path_get.c +++ b/common/src/fx_utility_absolute_path_get.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_absolute_path_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_absolute_path_get(CHAR *base_path, CHAR *new_path, CHAR *absolute_path) diff --git a/common/src/fx_utility_exFAT_allocate_new_cluster.c b/common/src/fx_utility_exFAT_allocate_new_cluster.c index 0f39db6..222c9c1 100644 --- a/common/src/fx_utility_exFAT_allocate_new_cluster.c +++ b/common/src/fx_utility_exFAT_allocate_new_cluster.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_allocate_new_cluster PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -79,6 +79,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_allocate_new_cluster(FX_MEDIA *media_ptr, FX_DIR_ENTRY *directory_ptr, diff --git a/common/src/fx_utility_exFAT_bitmap_cache_prepare.c b/common/src/fx_utility_exFAT_bitmap_cache_prepare.c index 9789cde..fffeb4a 100644 --- a/common/src/fx_utility_exFAT_bitmap_cache_prepare.c +++ b/common/src/fx_utility_exFAT_bitmap_cache_prepare.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_bitmap_cache_prepare PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_bitmap_cache_prepare(FX_MEDIA *media_ptr, ULONG cluster) diff --git a/common/src/fx_utility_exFAT_bitmap_cache_update.c b/common/src/fx_utility_exFAT_bitmap_cache_update.c index ec5bb96..37f1a1a 100644 --- a/common/src/fx_utility_exFAT_bitmap_cache_update.c +++ b/common/src/fx_utility_exFAT_bitmap_cache_update.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_bitmap_cache_update PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_bitmap_cache_update(FX_MEDIA *media_ptr, ULONG cluster) diff --git a/common/src/fx_utility_exFAT_bitmap_flush.c b/common/src/fx_utility_exFAT_bitmap_flush.c index f9ac7b8..a87575a 100644 --- a/common/src/fx_utility_exFAT_bitmap_flush.c +++ b/common/src/fx_utility_exFAT_bitmap_flush.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_bitmap_flush PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_bitmap_flush(FX_MEDIA *media_ptr) diff --git a/common/src/fx_utility_exFAT_bitmap_free_cluster_find.c b/common/src/fx_utility_exFAT_bitmap_free_cluster_find.c index ba35a58..9d42d60 100644 --- a/common/src/fx_utility_exFAT_bitmap_free_cluster_find.c +++ b/common/src/fx_utility_exFAT_bitmap_free_cluster_find.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_bitmap_free_cluster_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_bitmap_free_cluster_find(FX_MEDIA *media_ptr, ULONG search_start_cluster, ULONG *free_cluster) diff --git a/common/src/fx_utility_exFAT_bitmap_initialize.c b/common/src/fx_utility_exFAT_bitmap_initialize.c index 80f692f..5cf0ecf 100644 --- a/common/src/fx_utility_exFAT_bitmap_initialize.c +++ b/common/src/fx_utility_exFAT_bitmap_initialize.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_bitmap_initialize PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_bitmap_initialize(FX_MEDIA *media_ptr) diff --git a/common/src/fx_utility_exFAT_bitmap_start_sector_get.c b/common/src/fx_utility_exFAT_bitmap_start_sector_get.c index b32dec7..de0ca4b 100644 --- a/common/src/fx_utility_exFAT_bitmap_start_sector_get.c +++ b/common/src/fx_utility_exFAT_bitmap_start_sector_get.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_bitmap_start_sector_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_bitmap_start_sector_get(FX_MEDIA *media_ptr, ULONG *bitmap_started_sector) diff --git a/common/src/fx_utility_exFAT_cluster_free.c b/common/src/fx_utility_exFAT_cluster_free.c index d068f25..5282ce7 100644 --- a/common/src/fx_utility_exFAT_cluster_free.c +++ b/common/src/fx_utility_exFAT_cluster_free.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_cluster_free PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_cluster_free(FX_MEDIA *media_ptr, UCHAR *work_ptr) diff --git a/common/src/fx_utility_exFAT_cluster_state_get.c b/common/src/fx_utility_exFAT_cluster_state_get.c index 95c4bb2..81bfd0e 100644 --- a/common/src/fx_utility_exFAT_cluster_state_get.c +++ b/common/src/fx_utility_exFAT_cluster_state_get.c @@ -41,7 +41,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_cluster_state_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_cluster_state_get(FX_MEDIA *media_ptr, ULONG cluster, UCHAR *cluster_state) diff --git a/common/src/fx_utility_exFAT_cluster_state_set.c b/common/src/fx_utility_exFAT_cluster_state_set.c index 32f39b7..a3dcc8d 100644 --- a/common/src/fx_utility_exFAT_cluster_state_set.c +++ b/common/src/fx_utility_exFAT_cluster_state_set.c @@ -42,7 +42,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_cluster_state_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_cluster_state_set(FX_MEDIA *media_ptr, ULONG cluster, UCHAR new_cluster_state) diff --git a/common/src/fx_utility_exFAT_geometry_check.c b/common/src/fx_utility_exFAT_geometry_check.c index a6eba89..5ec2597 100644 --- a/common/src/fx_utility_exFAT_geometry_check.c +++ b/common/src/fx_utility_exFAT_geometry_check.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_geometry_check PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_geometry_check(FX_MEDIA *media_ptr, UCHAR *sector_buffer) diff --git a/common/src/fx_utility_exFAT_name_hash_get.c b/common/src/fx_utility_exFAT_name_hash_get.c index 6594261..d7eb913 100644 --- a/common/src/fx_utility_exFAT_name_hash_get.c +++ b/common/src/fx_utility_exFAT_name_hash_get.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_name_hash_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ USHORT _fx_utility_exFAT_name_hash_get(CHAR *name) diff --git a/common/src/fx_utility_exFAT_size_calculate.c b/common/src/fx_utility_exFAT_size_calculate.c index 7280d7e..58678cd 100644 --- a/common/src/fx_utility_exFAT_size_calculate.c +++ b/common/src/fx_utility_exFAT_size_calculate.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_size_calculate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_utility_exFAT_size_calculate(ULONG boundary_unit, ULONG64 size_in_sectors, ULONG sectors_per_cluster, diff --git a/common/src/fx_utility_exFAT_system_area_checksum_verify.c b/common/src/fx_utility_exFAT_system_area_checksum_verify.c index 6bab8b9..ca6803a 100644 --- a/common/src/fx_utility_exFAT_system_area_checksum_verify.c +++ b/common/src/fx_utility_exFAT_system_area_checksum_verify.c @@ -39,7 +39,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_system_area_checksum_verify PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_system_area_checksum_verify(FX_MEDIA *media_ptr, UCHAR *sector_buffer, diff --git a/common/src/fx_utility_exFAT_system_area_checksum_write.c b/common/src/fx_utility_exFAT_system_area_checksum_write.c index 0574b0d..cfd1853 100644 --- a/common/src/fx_utility_exFAT_system_area_checksum_write.c +++ b/common/src/fx_utility_exFAT_system_area_checksum_write.c @@ -40,7 +40,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_system_area_checksum_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_system_area_checksum_write(FX_MEDIA *media_ptr, UCHAR *sector_buffer, ULONG *system_area_checksum_ptr) diff --git a/common/src/fx_utility_exFAT_system_area_format.c b/common/src/fx_utility_exFAT_system_area_format.c index 37992ed..b4b93f1 100644 --- a/common/src/fx_utility_exFAT_system_area_format.c +++ b/common/src/fx_utility_exFAT_system_area_format.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_system_area_format PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_system_area_format(FX_MEDIA *media_ptr, ULONG boundary_unit, diff --git a/common/src/fx_utility_exFAT_system_sector_write.c b/common/src/fx_utility_exFAT_system_sector_write.c index cded571..4243f68 100644 --- a/common/src/fx_utility_exFAT_system_sector_write.c +++ b/common/src/fx_utility_exFAT_system_sector_write.c @@ -32,7 +32,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_system_sector_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_exFAT_system_sector_write(FX_MEDIA *media_ptr, UCHAR *data_buffer, diff --git a/common/src/fx_utility_exFAT_unicode_name_hash_get.c b/common/src/fx_utility_exFAT_unicode_name_hash_get.c index 7fee621..c555163 100644 --- a/common/src/fx_utility_exFAT_unicode_name_hash_get.c +++ b/common/src/fx_utility_exFAT_unicode_name_hash_get.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_unicode_name_hash_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ USHORT _fx_utility_exFAT_unicode_name_hash_get(CHAR *unicode_name, ULONG unicode_length) diff --git a/common/src/fx_utility_exFAT_upcase_table.c b/common/src/fx_utility_exFAT_upcase_table.c index bbf4e8b..ac8f92a 100644 --- a/common/src/fx_utility_exFAT_upcase_table.c +++ b/common/src/fx_utility_exFAT_upcase_table.c @@ -196,7 +196,7 @@ static const USHORT diff_table_offset[] = /* FUNCTION RELEASE */ /* */ /* _fx_utility_exFAT_upcase_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -227,6 +227,8 @@ static const USHORT diff_table_offset[] = /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ USHORT _fx_utility_exFAT_upcase_get(USHORT character) diff --git a/common/src/fx_utility_logical_sector_cache_entry_read.c b/common/src/fx_utility_logical_sector_cache_entry_read.c index 4d96b17..e48f45a 100644 --- a/common/src/fx_utility_logical_sector_cache_entry_read.c +++ b/common/src/fx_utility_logical_sector_cache_entry_read.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_logical_sector_cache_entry_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,12 +71,17 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable cache, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ FX_CACHED_SECTOR *_fx_utility_logical_sector_cache_entry_read(FX_MEDIA *media_ptr, ULONG64 logical_sector, FX_CACHED_SECTOR **previous_cache_entry) { +#ifndef FX_DISABLE_CACHE FX_CACHED_SECTOR *cache_entry; FX_CACHED_SECTOR temp_storage; ULONG cache_size; @@ -341,5 +346,8 @@ ULONG index; /* The requested sector is not in cache, return the last cache entry. */ return(cache_entry); +#else + return(FX_NULL); +#endif /* FX_DISABLE_CACHE */ } diff --git a/common/src/fx_utility_logical_sector_flush.c b/common/src/fx_utility_logical_sector_flush.c index 00ffd72..2773abc 100644 --- a/common/src/fx_utility_logical_sector_flush.c +++ b/common/src/fx_utility_logical_sector_flush.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_logical_sector_flush PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,11 +72,16 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable cache, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_logical_sector_flush(FX_MEDIA *media_ptr, ULONG64 starting_sector, ULONG64 sectors, UINT invalidate) { +#ifndef FX_DISABLE_CACHE FX_CACHED_SECTOR *cache_entry; UINT cache_size; UINT i, bit_set, use_starting_sector; @@ -501,6 +506,7 @@ ULONG valid_bit_map; } } } +#endif /* FX_DISABLE_CACHE */ /* If we get here, return successful status to the caller. */ return(FX_SUCCESS); diff --git a/common/src/fx_utility_logical_sector_read.c b/common/src/fx_utility_logical_sector_read.c index ddf0740..15ffaee 100644 --- a/common/src/fx_utility_logical_sector_read.c +++ b/common/src/fx_utility_logical_sector_read.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_logical_sector_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -87,15 +87,21 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* verified memcpy usage, and */ +/* added conditional to */ +/* disable cache, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_logical_sector_read(FX_MEDIA *media_ptr, ULONG64 logical_sector, VOID *buffer_ptr, ULONG sectors, UCHAR sector_type) { - +#ifndef FX_DISABLE_CACHE FX_CACHED_SECTOR *cache_entry; FX_CACHED_SECTOR *previous_cache_entry; ULONG64 end_sector; +#endif /* FX_DISABLE_CACHE */ #ifdef FX_ENABLE_FAULT_TOLERANT UINT status; @@ -119,6 +125,7 @@ UINT status; /* Extended port-specific processing macro, which is by default defined to white space. */ FX_UTILITY_LOGICAL_SECTOR_READ_EXTENSION +#ifndef FX_DISABLE_CACHE /* Determine if the request is for the internal media buffer area. */ if ((((UCHAR *)buffer_ptr) >= media_ptr -> fx_media_memory_buffer) && (((UCHAR *)buffer_ptr) <= media_ptr -> fx_media_sector_cache_end)) @@ -328,6 +335,12 @@ UINT status; /* Return the driver status. */ return(media_ptr -> fx_media_driver_status); } +#else + if ((logical_sector == media_ptr -> fx_media_memory_buffer_sector) && (sectors == 1) && (buffer_ptr == media_ptr -> fx_media_memory_buffer)) + { + return(FX_SUCCESS); + } +#endif else { @@ -339,6 +352,7 @@ UINT status; return(FX_SECTOR_INVALID); } +#ifndef FX_DISABLE_CACHE /* Attempt to fill the beginning of the buffer from cached sectors. */ while (sectors) { @@ -352,7 +366,7 @@ UINT status; } /* Yes, sector is in the cache. Copy the data from the cache to the destination buffer. */ - _fx_utility_memory_copy(media_ptr -> fx_media_memory_buffer, buffer_ptr, media_ptr -> fx_media_bytes_per_sector); + _fx_utility_memory_copy(media_ptr -> fx_media_memory_buffer, buffer_ptr, media_ptr -> fx_media_bytes_per_sector); /* Use case of memcpy is verified. */ /* Advance the destination buffer. */ buffer_ptr = ((UCHAR *)buffer_ptr) + media_ptr -> fx_media_bytes_per_sector; @@ -378,7 +392,7 @@ UINT status; } /* Yes, sector is in the cache. Copy the data from the cache to the destination buffer. */ - _fx_utility_memory_copy(media_ptr -> fx_media_memory_buffer, + _fx_utility_memory_copy(media_ptr -> fx_media_memory_buffer, /* Use case of memcpy is verified. */ ((UCHAR *)buffer_ptr) + ((sectors - 1) * media_ptr -> fx_media_bytes_per_sector), media_ptr -> fx_media_bytes_per_sector); @@ -397,6 +411,7 @@ UINT status; /* Flush and invalidate any entries in the cache that are in this direct I/O read request range. */ _fx_utility_logical_sector_flush(media_ptr, logical_sector, (ULONG64) sectors, FX_TRUE); +#endif /* FX_DISABLE_CACHE */ #ifndef FX_MEDIA_STATISTICS_DISABLE @@ -433,6 +448,14 @@ UINT status; /* Clear data sector is present flag. */ media_ptr -> fx_media_driver_data_sector_read = FX_FALSE; +#ifdef FX_DISABLE_CACHE + if ((media_ptr -> fx_media_driver_status == FX_SUCCESS) && (sectors == 1) && (buffer_ptr == media_ptr -> fx_media_memory_buffer)) + { + media_ptr -> fx_media_memory_buffer_sector = logical_sector; + return(FX_SUCCESS); + } +#endif /* FX_DISABLE_CACHE */ + #ifndef FX_DISABLE_DIRECT_DATA_READ_CACHE_FILL /* Determine if the read was successful and if number of sectors just read will @@ -559,7 +582,7 @@ UINT status; } /* Copy the data from the destination buffer to the cache entry. */ - _fx_utility_memory_copy(buffer_ptr, + _fx_utility_memory_copy(buffer_ptr, /* Use case of memcpy is verified. */ cache_entry -> fx_cached_sector_memory_buffer, media_ptr -> fx_media_bytes_per_sector); diff --git a/common/src/fx_utility_logical_sector_write.c b/common/src/fx_utility_logical_sector_write.c index 84e77ca..4e3f274 100644 --- a/common/src/fx_utility_logical_sector_write.c +++ b/common/src/fx_utility_logical_sector_write.c @@ -38,7 +38,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_logical_sector_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -83,18 +83,23 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), and */ +/* added conditional to */ +/* disable cache, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_logical_sector_write(FX_MEDIA *media_ptr, ULONG64 logical_sector, VOID *buffer_ptr, ULONG sectors, UCHAR sector_type) { +#ifndef FX_DISABLE_CACHE FX_CACHED_SECTOR *cache_entry; UINT cache_size; UINT index; UINT i; UCHAR cache_found = FX_FALSE; - +#endif /* FX_DISABLE_CACHE */ #ifndef FX_MEDIA_STATISTICS_DISABLE @@ -113,6 +118,7 @@ UCHAR cache_found = FX_FALSE; /* Extended port-specific processing macro, which is by default defined to white space. */ FX_UTILITY_LOGICAL_SECTOR_WRITE_EXTENSION +#ifndef FX_DISABLE_CACHE /* Determine if the request is from the internal media buffer area. */ if ((((UCHAR *)buffer_ptr) >= media_ptr -> fx_media_memory_buffer) && (((UCHAR *)buffer_ptr) <= media_ptr -> fx_media_sector_cache_end)) @@ -362,6 +368,7 @@ UCHAR cache_found = FX_FALSE; return(FX_SUCCESS); } else +#endif /* FX_DISABLE_CACHE */ { /* Otherwise, the write request is being made directly from an application @@ -382,6 +389,13 @@ UCHAR cache_found = FX_FALSE; /* Flush and invalidate for any entries in the cache that are in this direct I/O read request range. */ _fx_utility_logical_sector_flush(media_ptr, logical_sector, (ULONG64) sectors, FX_TRUE); +#ifdef FX_DISABLE_CACHE + if ((logical_sector <= media_ptr -> fx_media_memory_buffer_sector) && (logical_sector + sectors >= media_ptr -> fx_media_memory_buffer_sector)) + { + media_ptr -> fx_media_memory_buffer_sector = (ULONG64)-1; + } +#endif /* FX_DISABLE_CACHE */ + #ifndef FX_MEDIA_STATISTICS_DISABLE /* Increment the number of driver write sector(s) requests. */ diff --git a/common/src/fx_utility_memory_copy.c b/common/src/fx_utility_memory_copy.c index 0f1d876..a5f7af0 100644 --- a/common/src/fx_utility_memory_copy.c +++ b/common/src/fx_utility_memory_copy.c @@ -42,7 +42,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_memory_copy PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,12 +75,15 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), verified */ +/* memcpy usage, */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_utility_memory_copy(UCHAR *source_ptr, UCHAR *dest_ptr, ULONG size) { /* Copy the memory. */ - memcpy(dest_ptr, source_ptr, size); + memcpy(dest_ptr, source_ptr, size); /* Use case of memcpy is verified. */ } diff --git a/common/src/fx_utility_memory_set.c b/common/src/fx_utility_memory_set.c index 3e385cc..a3be087 100644 --- a/common/src/fx_utility_memory_set.c +++ b/common/src/fx_utility_memory_set.c @@ -42,7 +42,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_memory_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ VOID _fx_utility_memory_set(UCHAR *dest_ptr, UCHAR value, ULONG size) diff --git a/common/src/fx_utility_string_length_get.c b/common/src/fx_utility_string_length_get.c index 3d43bbe..ff2de1f 100644 --- a/common/src/fx_utility_string_length_get.c +++ b/common/src/fx_utility_string_length_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_string_length_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_string_length_get(CHAR *string, UINT max_length) diff --git a/common/src/fx_utility_token_length_get.c b/common/src/fx_utility_token_length_get.c index 9c8d81a..630435a 100644 --- a/common/src/fx_utility_token_length_get.c +++ b/common/src/fx_utility_token_length_get.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _fx_utility_token_length_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fx_utility_token_length_get(CHAR *path) diff --git a/common/src/fxe_directory_attributes_read.c b/common/src/fxe_directory_attributes_read.c index c48f905..95d0c33 100644 --- a/common/src/fxe_directory_attributes_read.c +++ b/common/src/fxe_directory_attributes_read.c @@ -35,7 +35,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_attributes_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_attributes_read(FX_MEDIA *media_ptr, CHAR *directory_name, UINT *attributes_ptr) diff --git a/common/src/fxe_directory_attributes_set.c b/common/src/fxe_directory_attributes_set.c index 6e4fba1..ca14631 100644 --- a/common/src/fxe_directory_attributes_set.c +++ b/common/src/fxe_directory_attributes_set.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_attributes_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_attributes_set(FX_MEDIA *media_ptr, CHAR *directory_name, UINT attributes) diff --git a/common/src/fxe_directory_create.c b/common/src/fxe_directory_create.c index 29a22d6..1217b3f 100644 --- a/common/src/fxe_directory_create.c +++ b/common/src/fxe_directory_create.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_create(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fxe_directory_default_get.c b/common/src/fxe_directory_default_get.c index 76fea35..d92ba79 100644 --- a/common/src/fxe_directory_default_get.c +++ b/common/src/fxe_directory_default_get.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_default_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_default_get(FX_MEDIA *media_ptr, CHAR **return_path_name) diff --git a/common/src/fxe_directory_default_get_copy.c b/common/src/fxe_directory_default_get_copy.c index 9eef478..9c278e4 100644 --- a/common/src/fxe_directory_default_get_copy.c +++ b/common/src/fxe_directory_default_get_copy.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_default_get_copy PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_default_get_copy(FX_MEDIA *media_ptr, CHAR *return_path_name_buffer, UINT return_path_name_buffer_size) diff --git a/common/src/fxe_directory_default_set.c b/common/src/fxe_directory_default_set.c index 1cefcbe..19b6d9a 100644 --- a/common/src/fxe_directory_default_set.c +++ b/common/src/fxe_directory_default_set.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_default_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_default_set(FX_MEDIA *media_ptr, CHAR *new_path_name) diff --git a/common/src/fxe_directory_delete.c b/common/src/fxe_directory_delete.c index 3c210dd..6909e7b 100644 --- a/common/src/fxe_directory_delete.c +++ b/common/src/fxe_directory_delete.c @@ -35,7 +35,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_delete PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_delete(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fxe_directory_first_entry_find.c b/common/src/fxe_directory_first_entry_find.c index 77d012a..488617d 100644 --- a/common/src/fxe_directory_first_entry_find.c +++ b/common/src/fxe_directory_first_entry_find.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_first_entry_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_first_entry_find(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fxe_directory_first_full_entry_find.c b/common/src/fxe_directory_first_full_entry_find.c index ba54ba9..70b756e 100644 --- a/common/src/fxe_directory_first_full_entry_find.c +++ b/common/src/fxe_directory_first_full_entry_find.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_first_full_entry_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -77,6 +77,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_first_full_entry_find(FX_MEDIA *media_ptr, diff --git a/common/src/fxe_directory_information_get.c b/common/src/fxe_directory_information_get.c index 2b3ec7f..378bc28 100644 --- a/common/src/fxe_directory_information_get.c +++ b/common/src/fxe_directory_information_get.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_information_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -77,6 +77,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_information_get(FX_MEDIA *media_ptr, CHAR *directory_name, diff --git a/common/src/fxe_directory_local_path_clear.c b/common/src/fxe_directory_local_path_clear.c index 862ee09..3bd7985 100644 --- a/common/src/fxe_directory_local_path_clear.c +++ b/common/src/fxe_directory_local_path_clear.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fxe_directory_local_path_clear PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_local_path_clear(FX_MEDIA *media_ptr) diff --git a/common/src/fxe_directory_local_path_get.c b/common/src/fxe_directory_local_path_get.c index d5b8496..eb319fb 100644 --- a/common/src/fxe_directory_local_path_get.c +++ b/common/src/fxe_directory_local_path_get.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fxe_directory_local_path_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_local_path_get(FX_MEDIA *media_ptr, CHAR **return_path_name) diff --git a/common/src/fxe_directory_local_path_get_copy.c b/common/src/fxe_directory_local_path_get_copy.c index a63ad78..03a9902 100644 --- a/common/src/fxe_directory_local_path_get_copy.c +++ b/common/src/fxe_directory_local_path_get_copy.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_local_path_get_copy PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_local_path_get_copy(FX_MEDIA *media_ptr, CHAR *return_path_name_buffer, UINT return_path_name_buffer_size) diff --git a/common/src/fxe_directory_local_path_restore.c b/common/src/fxe_directory_local_path_restore.c index d2ad45d..223df30 100644 --- a/common/src/fxe_directory_local_path_restore.c +++ b/common/src/fxe_directory_local_path_restore.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fxe_directory_local_path_restore PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_local_path_restore(FX_MEDIA *media_ptr, FX_LOCAL_PATH *local_path_ptr) diff --git a/common/src/fxe_directory_local_path_set.c b/common/src/fxe_directory_local_path_set.c index 704e331..d7d293e 100644 --- a/common/src/fxe_directory_local_path_set.c +++ b/common/src/fxe_directory_local_path_set.c @@ -37,7 +37,7 @@ /* FUNCTION RELEASE */ /* */ /* _fxe_directory_local_path_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_local_path_set(FX_MEDIA *media_ptr, FX_LOCAL_PATH *local_path_ptr, CHAR *new_path_name, UINT local_path_control_block_size) diff --git a/common/src/fxe_directory_long_name_get.c b/common/src/fxe_directory_long_name_get.c index 800321f..8041d71 100644 --- a/common/src/fxe_directory_long_name_get.c +++ b/common/src/fxe_directory_long_name_get.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_long_name_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_long_name_get(FX_MEDIA *media_ptr, CHAR *short_file_name, CHAR *long_file_name) diff --git a/common/src/fxe_directory_long_name_get_extended.c b/common/src/fxe_directory_long_name_get_extended.c index 42a5346..a68d0d3 100644 --- a/common/src/fxe_directory_long_name_get_extended.c +++ b/common/src/fxe_directory_long_name_get_extended.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_long_name_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_long_name_get_extended(FX_MEDIA *media_ptr, CHAR *short_file_name, CHAR *long_file_name, UINT long_file_name_buffer_length) diff --git a/common/src/fxe_directory_name_test.c b/common/src/fxe_directory_name_test.c index 3b935ad..294f062 100644 --- a/common/src/fxe_directory_name_test.c +++ b/common/src/fxe_directory_name_test.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_name_test PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_name_test(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fxe_directory_next_entry_find.c b/common/src/fxe_directory_next_entry_find.c index d27a978..8eb66fb 100644 --- a/common/src/fxe_directory_next_entry_find.c +++ b/common/src/fxe_directory_next_entry_find.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_next_entry_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_next_entry_find(FX_MEDIA *media_ptr, CHAR *directory_name) diff --git a/common/src/fxe_directory_next_full_entry_find.c b/common/src/fxe_directory_next_full_entry_find.c index 9c2da16..ff44d44 100644 --- a/common/src/fxe_directory_next_full_entry_find.c +++ b/common/src/fxe_directory_next_full_entry_find.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_next_full_entry_find PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -77,6 +77,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_next_full_entry_find(FX_MEDIA *media_ptr, diff --git a/common/src/fxe_directory_rename.c b/common/src/fxe_directory_rename.c index 0edb123..ae95697 100644 --- a/common/src/fxe_directory_rename.c +++ b/common/src/fxe_directory_rename.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_rename PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_rename(FX_MEDIA *media_ptr, CHAR *old_directory_name, CHAR *new_directory_name) diff --git a/common/src/fxe_directory_short_name_get.c b/common/src/fxe_directory_short_name_get.c index f39feb0..11d647f 100644 --- a/common/src/fxe_directory_short_name_get.c +++ b/common/src/fxe_directory_short_name_get.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_short_name_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_short_name_get(FX_MEDIA *media_ptr, CHAR *long_file_name, CHAR *short_file_name) diff --git a/common/src/fxe_directory_short_name_get_extended.c b/common/src/fxe_directory_short_name_get_extended.c index c0758b7..ed90e5e 100644 --- a/common/src/fxe_directory_short_name_get_extended.c +++ b/common/src/fxe_directory_short_name_get_extended.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_directory_short_name_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_directory_short_name_get_extended(FX_MEDIA *media_ptr, CHAR *long_file_name, CHAR *short_file_name, UINT short_file_name_length) diff --git a/common/src/fxe_fault_tolerant_enable.c b/common/src/fxe_fault_tolerant_enable.c index 23af7bc..040071c 100644 --- a/common/src/fxe_fault_tolerant_enable.c +++ b/common/src/fxe_fault_tolerant_enable.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_fault_tolerant_enable PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_fault_tolerant_enable(FX_MEDIA *media_ptr, VOID *memory_buffer, UINT memory_size) diff --git a/common/src/fxe_file_allocate.c b/common/src/fxe_file_allocate.c index 620c249..c104487 100644 --- a/common/src/fxe_file_allocate.c +++ b/common/src/fxe_file_allocate.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_allocate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_allocate(FX_FILE *file_ptr, ULONG size) diff --git a/common/src/fxe_file_attributes_read.c b/common/src/fxe_file_attributes_read.c index a288704..51df19c 100644 --- a/common/src/fxe_file_attributes_read.c +++ b/common/src/fxe_file_attributes_read.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_attributes_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_attributes_read(FX_MEDIA *media_ptr, CHAR *file_name, UINT *attributes_ptr) diff --git a/common/src/fxe_file_attributes_set.c b/common/src/fxe_file_attributes_set.c index 0be6da6..f11b8da 100644 --- a/common/src/fxe_file_attributes_set.c +++ b/common/src/fxe_file_attributes_set.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_attributes_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_attributes_set(FX_MEDIA *media_ptr, CHAR *file_name, UINT attributes) diff --git a/common/src/fxe_file_best_effort_allocate.c b/common/src/fxe_file_best_effort_allocate.c index 958d848..1df5d3f 100644 --- a/common/src/fxe_file_best_effort_allocate.c +++ b/common/src/fxe_file_best_effort_allocate.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_best_effort_allocate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_best_effort_allocate(FX_FILE *file_ptr, ULONG size, ULONG *actual_size_allocated) diff --git a/common/src/fxe_file_close.c b/common/src/fxe_file_close.c index 5d2cae9..87e3586 100644 --- a/common/src/fxe_file_close.c +++ b/common/src/fxe_file_close.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_close PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_close(FX_FILE *file_ptr) diff --git a/common/src/fxe_file_create.c b/common/src/fxe_file_create.c index 903d809..e1a5170 100644 --- a/common/src/fxe_file_create.c +++ b/common/src/fxe_file_create.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_create(FX_MEDIA *media_ptr, CHAR *file_name) diff --git a/common/src/fxe_file_date_time_set.c b/common/src/fxe_file_date_time_set.c index 0516a6d..57ec4ba 100644 --- a/common/src/fxe_file_date_time_set.c +++ b/common/src/fxe_file_date_time_set.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_date_time_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_date_time_set(FX_MEDIA *media_ptr, CHAR *file_name, diff --git a/common/src/fxe_file_delete.c b/common/src/fxe_file_delete.c index 1f4395c..a515b17 100644 --- a/common/src/fxe_file_delete.c +++ b/common/src/fxe_file_delete.c @@ -35,7 +35,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_delete PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_delete(FX_MEDIA *media_ptr, CHAR *file_name) diff --git a/common/src/fxe_file_extended_allocate.c b/common/src/fxe_file_extended_allocate.c index 2cc0835..a82fae5 100644 --- a/common/src/fxe_file_extended_allocate.c +++ b/common/src/fxe_file_extended_allocate.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_extended_allocate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_extended_allocate(FX_FILE *file_ptr, ULONG64 size) diff --git a/common/src/fxe_file_extended_best_effort_allocate.c b/common/src/fxe_file_extended_best_effort_allocate.c index a15a33f..f3fb7ea 100644 --- a/common/src/fxe_file_extended_best_effort_allocate.c +++ b/common/src/fxe_file_extended_best_effort_allocate.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_extended_best_effort_allocate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_extended_best_effort_allocate(FX_FILE *file_ptr, ULONG64 size, ULONG64 *actual_size_allocated) diff --git a/common/src/fxe_file_extended_relative_seek.c b/common/src/fxe_file_extended_relative_seek.c index 610b897..1e9e2b8 100644 --- a/common/src/fxe_file_extended_relative_seek.c +++ b/common/src/fxe_file_extended_relative_seek.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_extended_relative_seek PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_extended_relative_seek(FX_FILE *file_ptr, ULONG64 byte_offset, UINT seek_from) diff --git a/common/src/fxe_file_extended_seek.c b/common/src/fxe_file_extended_seek.c index 3b3afb8..2750ff0 100644 --- a/common/src/fxe_file_extended_seek.c +++ b/common/src/fxe_file_extended_seek.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_extended_seek PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_extended_seek(FX_FILE *file_ptr, ULONG64 byte_offset) diff --git a/common/src/fxe_file_extended_truncate.c b/common/src/fxe_file_extended_truncate.c index d1c94fd..0e90056 100644 --- a/common/src/fxe_file_extended_truncate.c +++ b/common/src/fxe_file_extended_truncate.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_extended_truncate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_extended_truncate(FX_FILE *file_ptr, ULONG64 size) diff --git a/common/src/fxe_file_extended_truncate_release.c b/common/src/fxe_file_extended_truncate_release.c index 5aca1cf..3bd56f8 100644 --- a/common/src/fxe_file_extended_truncate_release.c +++ b/common/src/fxe_file_extended_truncate_release.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_extended_truncate_release PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_extended_truncate_release(FX_FILE *file_ptr, ULONG64 size) diff --git a/common/src/fxe_file_open.c b/common/src/fxe_file_open.c index 2cc3d00..bad1d84 100644 --- a/common/src/fxe_file_open.c +++ b/common/src/fxe_file_open.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_open PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_open(FX_MEDIA *media_ptr, FX_FILE *file_ptr, CHAR *file_name, UINT open_type, UINT file_control_block_size) diff --git a/common/src/fxe_file_read.c b/common/src/fxe_file_read.c index e0424eb..5a19afc 100644 --- a/common/src/fxe_file_read.c +++ b/common/src/fxe_file_read.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_read(FX_FILE *file_ptr, VOID *buffer_ptr, ULONG request_size, ULONG *actual_size) diff --git a/common/src/fxe_file_relative_seek.c b/common/src/fxe_file_relative_seek.c index e097e0c..aaf7b6d 100644 --- a/common/src/fxe_file_relative_seek.c +++ b/common/src/fxe_file_relative_seek.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_relative_seek PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_relative_seek(FX_FILE *file_ptr, ULONG byte_offset, UINT seek_from) diff --git a/common/src/fxe_file_rename.c b/common/src/fxe_file_rename.c index a8b3b11..7ecc297 100644 --- a/common/src/fxe_file_rename.c +++ b/common/src/fxe_file_rename.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_rename PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_rename(FX_MEDIA *media_ptr, CHAR *old_file_name, CHAR *new_file_name) diff --git a/common/src/fxe_file_seek.c b/common/src/fxe_file_seek.c index eae8579..d8402e2 100644 --- a/common/src/fxe_file_seek.c +++ b/common/src/fxe_file_seek.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_seek PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_seek(FX_FILE *file_ptr, ULONG byte_offset) diff --git a/common/src/fxe_file_truncate.c b/common/src/fxe_file_truncate.c index 20301ea..f2775a1 100644 --- a/common/src/fxe_file_truncate.c +++ b/common/src/fxe_file_truncate.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_truncate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_truncate(FX_FILE *file_ptr, ULONG size) diff --git a/common/src/fxe_file_truncate_release.c b/common/src/fxe_file_truncate_release.c index 8f91507..d3d01ab 100644 --- a/common/src/fxe_file_truncate_release.c +++ b/common/src/fxe_file_truncate_release.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_truncate_release PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_truncate_release(FX_FILE *file_ptr, ULONG size) diff --git a/common/src/fxe_file_write.c b/common/src/fxe_file_write.c index a6542ac..66eea04 100644 --- a/common/src/fxe_file_write.c +++ b/common/src/fxe_file_write.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_write(FX_FILE *file_ptr, VOID *buffer_ptr, ULONG size) diff --git a/common/src/fxe_file_write_notify_set.c b/common/src/fxe_file_write_notify_set.c index 4131e17..e075443 100644 --- a/common/src/fxe_file_write_notify_set.c +++ b/common/src/fxe_file_write_notify_set.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_file_write_notify_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_file_write_notify_set(FX_FILE *file_ptr, VOID (*file_write_notify)(FX_FILE *file)) diff --git a/common/src/fxe_media_abort.c b/common/src/fxe_media_abort.c index 1b93b76..1ca911f 100644 --- a/common/src/fxe_media_abort.c +++ b/common/src/fxe_media_abort.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_abort PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_abort(FX_MEDIA *media_ptr) diff --git a/common/src/fxe_media_cache_invalidate.c b/common/src/fxe_media_cache_invalidate.c index ae50235..d026360 100644 --- a/common/src/fxe_media_cache_invalidate.c +++ b/common/src/fxe_media_cache_invalidate.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_cache_invalidate PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_cache_invalidate(FX_MEDIA *media_ptr) diff --git a/common/src/fxe_media_check.c b/common/src/fxe_media_check.c index 1129183..b11f1e3 100644 --- a/common/src/fxe_media_check.c +++ b/common/src/fxe_media_check.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_check PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -108,6 +108,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_check(FX_MEDIA *media_ptr, UCHAR *scratch_memory_ptr, ULONG scratch_memory_size, ULONG error_correction_option, ULONG *errors_detected) diff --git a/common/src/fxe_media_close.c b/common/src/fxe_media_close.c index e9310db..3c0fc18 100644 --- a/common/src/fxe_media_close.c +++ b/common/src/fxe_media_close.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_close PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -66,6 +66,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_close(FX_MEDIA *media_ptr) diff --git a/common/src/fxe_media_close_notify_set.c b/common/src/fxe_media_close_notify_set.c index cc280bc..809fc4b 100644 --- a/common/src/fxe_media_close_notify_set.c +++ b/common/src/fxe_media_close_notify_set.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_close_notify_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_close_notify_set(FX_MEDIA *media_ptr, VOID (*media_close_notify)(FX_MEDIA *media)) diff --git a/common/src/fxe_media_exFAT_format.c b/common/src/fxe_media_exFAT_format.c index 9b0d527..49ebb2f 100644 --- a/common/src/fxe_media_exFAT_format.c +++ b/common/src/fxe_media_exFAT_format.c @@ -40,7 +40,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_exFAT_format PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -88,6 +88,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_exFAT_format(FX_MEDIA *media_ptr, VOID (*driver)(FX_MEDIA *media), VOID *driver_info_ptr, diff --git a/common/src/fxe_media_extended_space_available.c b/common/src/fxe_media_extended_space_available.c index e9e62e2..387cb51 100644 --- a/common/src/fxe_media_extended_space_available.c +++ b/common/src/fxe_media_extended_space_available.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_extended_space_available PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_extended_space_available(FX_MEDIA *media_ptr, ULONG64 *available_bytes_ptr) diff --git a/common/src/fxe_media_flush.c b/common/src/fxe_media_flush.c index 27ec3dc..72f5e19 100644 --- a/common/src/fxe_media_flush.c +++ b/common/src/fxe_media_flush.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_flush PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_flush(FX_MEDIA *media_ptr) diff --git a/common/src/fxe_media_format.c b/common/src/fxe_media_format.c index 3f346d4..af72fff 100644 --- a/common/src/fxe_media_format.c +++ b/common/src/fxe_media_format.c @@ -38,7 +38,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_format PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -87,6 +87,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_format(FX_MEDIA *media_ptr, VOID (*driver)(FX_MEDIA *media), VOID *driver_info_ptr, UCHAR *memory_ptr, UINT memory_size, diff --git a/common/src/fxe_media_open.c b/common/src/fxe_media_open.c index 857e29d..11e8cb8 100644 --- a/common/src/fxe_media_open.c +++ b/common/src/fxe_media_open.c @@ -38,7 +38,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_open PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -82,6 +82,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_open(FX_MEDIA *media_ptr, CHAR *media_name, diff --git a/common/src/fxe_media_open_notify_set.c b/common/src/fxe_media_open_notify_set.c index dcb3626..aa2e378 100644 --- a/common/src/fxe_media_open_notify_set.c +++ b/common/src/fxe_media_open_notify_set.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_open_notify_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_open_notify_set(FX_MEDIA *media_ptr, VOID (*media_open_notify)(FX_MEDIA *media)) diff --git a/common/src/fxe_media_read.c b/common/src/fxe_media_read.c index 3a20d6b..08fe46d 100644 --- a/common/src/fxe_media_read.c +++ b/common/src/fxe_media_read.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_read PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_read(FX_MEDIA *media_ptr, ULONG logical_sector, VOID *buffer_ptr) diff --git a/common/src/fxe_media_space_available.c b/common/src/fxe_media_space_available.c index 6fff416..169bf54 100644 --- a/common/src/fxe_media_space_available.c +++ b/common/src/fxe_media_space_available.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_space_available PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -68,6 +68,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_space_available(FX_MEDIA *media_ptr, ULONG *available_bytes_ptr) diff --git a/common/src/fxe_media_volume_get.c b/common/src/fxe_media_volume_get.c index 832241f..89a8966 100644 --- a/common/src/fxe_media_volume_get.c +++ b/common/src/fxe_media_volume_get.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_volume_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_volume_get(FX_MEDIA *media_ptr, CHAR *volume_name, UINT volume_source) diff --git a/common/src/fxe_media_volume_get_extended.c b/common/src/fxe_media_volume_get_extended.c index da61101..3943892 100644 --- a/common/src/fxe_media_volume_get_extended.c +++ b/common/src/fxe_media_volume_get_extended.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_volume_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_volume_get_extended(FX_MEDIA *media_ptr, CHAR *volume_name, UINT volume_name_buffer_length, UINT volume_source) diff --git a/common/src/fxe_media_volume_set.c b/common/src/fxe_media_volume_set.c index bc0424a..6d5e2bd 100644 --- a/common/src/fxe_media_volume_set.c +++ b/common/src/fxe_media_volume_set.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_volume_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_volume_set(FX_MEDIA *media_ptr, CHAR *volume_name) diff --git a/common/src/fxe_media_write.c b/common/src/fxe_media_write.c index 20d355e..1bc731b 100644 --- a/common/src/fxe_media_write.c +++ b/common/src/fxe_media_write.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_media_write PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_media_write(FX_MEDIA *media_ptr, ULONG logical_sector, VOID *buffer_ptr) diff --git a/common/src/fxe_system_date_get.c b/common/src/fxe_system_date_get.c index 1d2b277..79b25cd 100644 --- a/common/src/fxe_system_date_get.c +++ b/common/src/fxe_system_date_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fxe_system_date_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_system_date_get(UINT *year, UINT *month, UINT *day) diff --git a/common/src/fxe_system_date_set.c b/common/src/fxe_system_date_set.c index 351330b..dfdc737 100644 --- a/common/src/fxe_system_date_set.c +++ b/common/src/fxe_system_date_set.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fxe_system_date_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_system_date_set(UINT year, UINT month, UINT day) diff --git a/common/src/fxe_system_time_get.c b/common/src/fxe_system_time_get.c index f0027da..f18e333 100644 --- a/common/src/fxe_system_time_get.c +++ b/common/src/fxe_system_time_get.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fxe_system_time_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -67,6 +67,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_system_time_get(UINT *hour, UINT *minute, UINT *second) diff --git a/common/src/fxe_system_time_set.c b/common/src/fxe_system_time_set.c index 881a04d..1c431e2 100644 --- a/common/src/fxe_system_time_set.c +++ b/common/src/fxe_system_time_set.c @@ -34,7 +34,7 @@ /* FUNCTION RELEASE */ /* */ /* _fxe_system_time_set PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_system_time_set(UINT hour, UINT minute, UINT second) diff --git a/common/src/fxe_unicode_directory_create.c b/common/src/fxe_unicode_directory_create.c index d60ec5a..12d38af 100644 --- a/common/src/fxe_unicode_directory_create.c +++ b/common/src/fxe_unicode_directory_create.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_unicode_directory_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_unicode_directory_create(FX_MEDIA *media_ptr, UCHAR *source_unicode_name, ULONG source_unicode_length, CHAR *short_name) diff --git a/common/src/fxe_unicode_directory_rename.c b/common/src/fxe_unicode_directory_rename.c index 8e3e9f6..fd6d274 100644 --- a/common/src/fxe_unicode_directory_rename.c +++ b/common/src/fxe_unicode_directory_rename.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_unicode_directory_rename PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -74,6 +74,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_unicode_directory_rename(FX_MEDIA *media_ptr, UCHAR *old_unicode_name, ULONG old_unicode_length, diff --git a/common/src/fxe_unicode_file_create.c b/common/src/fxe_unicode_file_create.c index a9f0b92..135bdf5 100644 --- a/common/src/fxe_unicode_file_create.c +++ b/common/src/fxe_unicode_file_create.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_unicode_file_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_unicode_file_create(FX_MEDIA *media_ptr, UCHAR *source_unicode_name, ULONG source_unicode_length, CHAR *short_name) diff --git a/common/src/fxe_unicode_file_rename.c b/common/src/fxe_unicode_file_rename.c index 948f3f5..b98cb3e 100644 --- a/common/src/fxe_unicode_file_rename.c +++ b/common/src/fxe_unicode_file_rename.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_unicode_file_create PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_unicode_file_rename(FX_MEDIA *media_ptr, UCHAR *old_unicode_name, ULONG old_unicode_length, diff --git a/common/src/fxe_unicode_name_get.c b/common/src/fxe_unicode_name_get.c index 30b13f8..223502a 100644 --- a/common/src/fxe_unicode_name_get.c +++ b/common/src/fxe_unicode_name_get.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_unicode_name_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_unicode_name_get(FX_MEDIA *media_ptr, CHAR *source_short_name, diff --git a/common/src/fxe_unicode_name_get_extended.c b/common/src/fxe_unicode_name_get_extended.c index 9dc1a85..0a249ea 100644 --- a/common/src/fxe_unicode_name_get_extended.c +++ b/common/src/fxe_unicode_name_get_extended.c @@ -37,7 +37,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_unicode_name_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -73,6 +73,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_unicode_name_get_extended(FX_MEDIA *media_ptr, CHAR *source_short_name, diff --git a/common/src/fxe_unicode_short_name_get.c b/common/src/fxe_unicode_short_name_get.c index 9a997d8..ec7aa21 100644 --- a/common/src/fxe_unicode_short_name_get.c +++ b/common/src/fxe_unicode_short_name_get.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_unicode_short_name_get PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -71,6 +71,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_unicode_short_name_get(FX_MEDIA *media_ptr, UCHAR *source_unicode_name, ULONG source_unicode_length, diff --git a/common/src/fxe_unicode_short_name_get_extended.c b/common/src/fxe_unicode_short_name_get_extended.c index 781f718..d38d765 100644 --- a/common/src/fxe_unicode_short_name_get_extended.c +++ b/common/src/fxe_unicode_short_name_get_extended.c @@ -36,7 +36,7 @@ FX_CALLER_CHECKING_EXTERNS /* FUNCTION RELEASE */ /* */ /* _fxe_unicode_short_name_get_extended PORTABLE C */ -/* 6.0 */ +/* 6.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -72,6 +72,8 @@ FX_CALLER_CHECKING_EXTERNS /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ UINT _fxe_unicode_short_name_get_extended(FX_MEDIA *media_ptr, UCHAR *source_unicode_name, ULONG source_unicode_length, diff --git a/ports/cortex_m0/gnu/inc/fx_port.h b/ports/cortex_m0/gnu/inc/fx_port.h index 73b4b00..0edf665 100644 --- a/ports/cortex_m0/gnu/inc/fx_port.h +++ b/ports/cortex_m0/gnu/inc/fx_port.h @@ -26,7 +26,7 @@ /* PORT SPECIFIC C INFORMATION RELEASE */ /* */ /* fx_port.h Cortex-M0/GNU */ -/* 6.0 */ +/* 6.1 */ /* */ /* AUTHOR */ /* */ @@ -45,6 +45,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ @@ -156,7 +158,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.0 *"; + "Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M0/GNU Version 6.1 *"; #else extern CHAR _fx_version_id[]; #endif diff --git a/ports/cortex_m3/gnu/inc/fx_port.h b/ports/cortex_m3/gnu/inc/fx_port.h index d779ccd..2581390 100644 --- a/ports/cortex_m3/gnu/inc/fx_port.h +++ b/ports/cortex_m3/gnu/inc/fx_port.h @@ -26,7 +26,7 @@ /* PORT SPECIFIC C INFORMATION RELEASE */ /* */ /* fx_port.h Cortex-M3/GNU */ -/* 6.0 */ +/* 6.1 */ /* */ /* AUTHOR */ /* */ @@ -45,6 +45,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ @@ -156,7 +158,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.0 *"; + "Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M3/GNU Version 6.1 *"; #else extern CHAR _fx_version_id[]; #endif diff --git a/ports/cortex_m4/gnu/inc/fx_port.h b/ports/cortex_m4/gnu/inc/fx_port.h index acc9f62..43d9f72 100644 --- a/ports/cortex_m4/gnu/inc/fx_port.h +++ b/ports/cortex_m4/gnu/inc/fx_port.h @@ -26,7 +26,7 @@ /* PORT SPECIFIC C INFORMATION RELEASE */ /* */ /* fx_port.h Cortex-M4/GNU */ -/* 6.0 */ +/* 6.1 */ /* */ /* AUTHOR */ /* */ @@ -45,6 +45,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ @@ -156,12 +158,10 @@ 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.0 *"; + "Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M4/GNU Version 6.1 *"; #else extern CHAR _fx_version_id[]; #endif #endif - - diff --git a/ports/cortex_m7/gnu/inc/fx_port.h b/ports/cortex_m7/gnu/inc/fx_port.h index 0651183..be7f34a 100644 --- a/ports/cortex_m7/gnu/inc/fx_port.h +++ b/ports/cortex_m7/gnu/inc/fx_port.h @@ -26,7 +26,7 @@ /* PORT SPECIFIC C INFORMATION RELEASE */ /* */ /* fx_port.h Cortex-M7/GNU */ -/* 6.0 */ +/* 6.1 */ /* */ /* AUTHOR */ /* */ @@ -45,6 +45,8 @@ /* DATE NAME DESCRIPTION */ /* */ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ +/* 09-30-2020 William E. Lamie Modified comment(s), */ +/* resulting in version 6.1 */ /* */ /**************************************************************************/ @@ -156,12 +158,10 @@ 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.0 *"; + "Copyright (c) Microsoft Corporation. All rights reserved. * FileX Cortex-M7/GNU Version 6.1 *"; #else extern CHAR _fx_version_id[]; #endif #endif - - diff --git a/ports/linux/gnu/CMakeLists.txt b/ports/linux/gnu/CMakeLists.txt new file mode 100644 index 0000000..6bc1b86 --- /dev/null +++ b/ports/linux/gnu/CMakeLists.txt @@ -0,0 +1,10 @@ +target_sources(${PROJECT_NAME} PRIVATE + # {{BEGIN_TARGET_SOURCES}} + + # {{END_TARGET_SOURCES}} +) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}/inc +) diff --git a/ports/linux/gnu/inc/fx_port.h b/ports/linux/gnu/inc/fx_port.h new file mode 100644 index 0000000..be94c93 --- /dev/null +++ b/ports/linux/gnu/inc/fx_port.h @@ -0,0 +1,298 @@ +/**************************************************************************/ +/* */ +/* Copyright (c) Microsoft Corporation. All rights reserved. */ +/* */ +/* This software is licensed under the Microsoft Software License */ +/* Terms for Microsoft Azure RTOS. Full text of the license can be */ +/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */ +/* and in the root directory of this software. */ +/* */ +/**************************************************************************/ + + +/**************************************************************************/ +/**************************************************************************/ +/** */ +/** FileX Component */ +/** */ +/** Port Specific */ +/** */ +/**************************************************************************/ +/**************************************************************************/ + + +/**************************************************************************/ +/* */ +/* PORT SPECIFIC C INFORMATION RELEASE */ +/* */ +/* fx_port.h Linux/GCC */ +/* 6.1 */ +/* */ +/* AUTHOR */ +/* */ +/* William E. Lamie, Microsoft Corporation */ +/* */ +/* DESCRIPTION */ +/* */ +/* This file contains data type definitions that make the FileX FAT */ +/* compatible file system function identically on a variety of */ +/* different processor architectures. For example, the byte offset of */ +/* various entries in the boot record, and directory entries are */ +/* defined in this file. */ +/* */ +/* RELEASE HISTORY */ +/* */ +/* DATE NAME DESCRIPTION */ +/* */ +/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +/* */ +/**************************************************************************/ + +#ifndef FX_PORT_H +#define FX_PORT_H + + +/* Determine if the optional FileX user define file should be used. */ + +#ifdef FX_INCLUDE_USER_DEFINE_FILE + + +/* Yes, include the user defines in fx_user.h. The defines in this file may + alternately be defined on the command line. */ + +#include "fx_user.h" +#endif +#include + + +/* Include the ThreadX api file. */ + +#include "tx_api.h" + + +#ifdef FX_REGRESSION_TEST +/* Define parameters for regression test suite. */ + +#define FX_MAX_SECTOR_CACHE 256 +#define FX_MAX_FAT_CACHE 64 +#define FX_FAT_MAP_SIZE 1 + + +/* Define variables and macros used to introduce errors for the regression test suite. */ + +extern ULONG _fx_ram_driver_io_error_request; +extern ULONG _fx_ram_driver_io_request_count; +extern ULONG _fx_file_open_max_file_size_request; +extern ULONG _fx_directory_entry_read_count; +extern ULONG _fx_directory_entry_read_error_request; +extern ULONG _fx_directory_entry_write_count; +extern ULONG _fx_directory_entry_write_error_request; +extern ULONG _fx_utility_fat_entry_write_count; +extern ULONG _fx_utility_fat_entry_write_error_request; +extern ULONG _fx_utility_fat_entry_read_count; +extern ULONG _fx_utility_fat_entry_read_error_request; +extern ULONG _fx_utility_logical_sector_flush_count; +extern ULONG _fx_utility_logical_sector_flush_error_request; +extern ULONG _fx_utility_logical_sector_write_count; +extern ULONG _fx_utility_logical_sector_write_error_request; +extern ULONG _fx_utility_logical_sector_read_count; +extern ULONG _fx_utility_logical_sector_read_error_request; +extern ULONG _fx_utility_logical_sector_read_1_count; +extern ULONG _fx_utility_logical_sector_read_1_error_request; + +#ifdef FX_ENABLE_FAULT_TOLERANT +struct FX_MEDIA_STRUCT; +extern VOID fault_tolerant_enable_callback(struct FX_MEDIA_STRUCT *media_ptr, + UCHAR *fault_tolerant_memory_buffer, + ULONG log_size); +extern VOID fault_tolerant_apply_log_callback(struct FX_MEDIA_STRUCT *media_ptr, + UCHAR *fault_tolerant_memory_buffer, + ULONG log_size); +#endif /* FX_ENABLE_FAULT_TOLERANT */ + + +#define FX_DIRECTORY_ENTRY_READ_EXTENSION _fx_directory_entry_read_count++; \ + if (_fx_directory_entry_read_error_request) \ + { \ + _fx_directory_entry_read_error_request--; \ + if (_fx_directory_entry_read_error_request == 0) \ + { \ + return(FX_IO_ERROR); \ + } \ + } + +#define FX_DIRECTORY_ENTRY_WRITE_EXTENSION _fx_directory_entry_write_count++; \ + if (_fx_directory_entry_write_error_request) \ + { \ + _fx_directory_entry_write_error_request--; \ + if (_fx_directory_entry_write_error_request == 0) \ + { \ + return(FX_IO_ERROR); \ + } \ + } + +#define FX_UTILITY_FAT_ENTRY_READ_EXTENSION _fx_utility_fat_entry_read_count++; \ + if (_fx_utility_fat_entry_read_error_request) \ + { \ + _fx_utility_fat_entry_read_error_request--; \ + if (_fx_utility_fat_entry_read_error_request == 0) \ + { \ + return(FX_IO_ERROR); \ + } \ + if (_fx_utility_fat_entry_read_error_request == 10000) \ + { \ + *entry_ptr = 1; \ + _fx_utility_fat_entry_read_error_request = 0; \ + return(FX_SUCCESS); \ + } \ + if (_fx_utility_fat_entry_read_error_request == 20000) \ + { \ + *entry_ptr = media_ptr -> fx_media_fat_reserved; \ + _fx_utility_fat_entry_read_error_request = 0; \ + return(FX_SUCCESS); \ + } \ + if (_fx_utility_fat_entry_read_error_request == 30000) \ + { \ + *entry_ptr = cluster; \ + _fx_utility_fat_entry_read_error_request = 0; \ + return(FX_SUCCESS); \ + } \ + if (_fx_utility_fat_entry_read_error_request == 40000) \ + { \ + media_ptr -> fx_media_total_clusters = 0; \ + _fx_utility_fat_entry_read_error_request = 0; \ + return(FX_SUCCESS); \ + } \ + } + +#define FX_UTILITY_FAT_ENTRY_WRITE_EXTENSION _fx_utility_fat_entry_write_count++; \ + if (_fx_utility_fat_entry_write_error_request) \ + { \ + _fx_utility_fat_entry_write_error_request--; \ + if (_fx_utility_fat_entry_write_error_request == 0) \ + { \ + return(FX_IO_ERROR); \ + } \ + } + +#define FX_UTILITY_LOGICAL_SECTOR_FLUSH_EXTENSION _fx_utility_logical_sector_flush_count++; \ + if (_fx_utility_logical_sector_flush_error_request) \ + { \ + _fx_utility_logical_sector_flush_error_request--; \ + if (_fx_utility_logical_sector_flush_error_request == 0) \ + { \ + return(FX_IO_ERROR); \ + } \ + } + +#define FX_UTILITY_LOGICAL_SECTOR_READ_EXTENSION _fx_utility_logical_sector_read_count++; \ + if (_fx_utility_logical_sector_read_error_request) \ + { \ + _fx_utility_logical_sector_read_error_request--; \ + if (_fx_utility_logical_sector_read_error_request == 0) \ + { \ + return(FX_IO_ERROR); \ + } \ + } + +#define FX_UTILITY_LOGICAL_SECTOR_READ_EXTENSION_1 _fx_utility_logical_sector_read_1_count++; \ + if (_fx_utility_logical_sector_read_1_error_request) \ + { \ + _fx_utility_logical_sector_read_1_error_request--; \ + if (_fx_utility_logical_sector_read_1_error_request == 0) \ + { \ + cache_entry = FX_NULL; \ + } \ + } + +#define FX_UTILITY_LOGICAL_SECTOR_WRITE_EXTENSION _fx_utility_logical_sector_write_count++; \ + if (_fx_utility_logical_sector_write_error_request) \ + { \ + _fx_utility_logical_sector_write_error_request--; \ + if (_fx_utility_logical_sector_write_error_request == 0) \ + { \ + return(FX_IO_ERROR); \ + } \ + } + +#define FX_FAULT_TOLERANT_ENABLE_EXTENSION fault_tolerant_enable_callback(media_ptr, media_ptr -> fx_media_fault_tolerant_memory_buffer, total_size); +#define FX_FAULT_TOLERANT_APPLY_LOGS_EXTENSION fault_tolerant_apply_log_callback(media_ptr, media_ptr -> fx_media_fault_tolerant_memory_buffer, size); +#endif /* FX_REGRESSION_TEST */ + + + +/* Define FileX internal protection macros. If FX_SINGLE_THREAD is defined, + these protection macros are effectively disabled. However, for multi-thread + uses, the macros are setup to utilize a ThreadX mutex for multiple thread + access control into an open media. */ + +/* Reduce the mutex error checking for testing purpose. */ + +#ifdef FX_SINGLE_THREAD +#define FX_PROTECT +#define FX_UNPROTECT +#else +#define FX_PROTECT tx_mutex_get(&(media_ptr -> fx_media_protect), TX_WAIT_FOREVER); +#define FX_UNPROTECT tx_mutex_put(&(media_ptr -> fx_media_protect)); +#endif + + +/* Define interrupt lockout constructs to protect the system date/time from being updated + while they are being read. */ + +#define FX_INT_SAVE_AREA unsigned int old_interrupt_posture; +#define FX_DISABLE_INTS old_interrupt_posture = tx_interrupt_control(TX_INT_DISABLE); +#define FX_RESTORE_INTS tx_interrupt_control(old_interrupt_posture); + + +/* Define the error checking logic to determine if there is a caller error in the FileX API. + The default definitions assume ThreadX is being used. This code can be completely turned + off by just defining these macros to white space. */ + +#ifndef TX_TIMER_PROCESS_IN_ISR + +#define FX_CALLER_CHECKING_EXTERNS extern TX_THREAD *_tx_thread_current_ptr; \ + extern TX_THREAD _tx_timer_thread; \ + extern volatile ULONG _tx_thread_system_state; + +#define FX_CALLER_CHECKING_CODE if ((_tx_thread_system_state) || \ + (_tx_thread_current_ptr == TX_NULL) || \ + (_tx_thread_current_ptr == &_tx_timer_thread)) \ + return(FX_CALLER_ERROR); + +#else +#define FX_CALLER_CHECKING_EXTERNS extern TX_THREAD *_tx_thread_current_ptr; \ + extern volatile ULONG _tx_thread_system_state; + +#define FX_CALLER_CHECKING_CODE if ((_tx_thread_system_state) || \ + (_tx_thread_current_ptr == TX_NULL)) \ + return(FX_CALLER_ERROR); +#endif + + +/* Define the update rate of the system timer. These values may also be defined at the command + line when compiling the fx_system_initialize.c module in the FileX library build. Alternatively, they can + be modified in this file. Note: the update rate must be an even number of seconds greater + than or equal to 2, which is the minimal update rate for FAT time. */ + +#ifndef FX_UPDATE_RATE_IN_SECONDS +#define FX_UPDATE_RATE_IN_SECONDS 10 /* Update time at 10 second intervals */ +#endif + +#ifndef FX_UPDATE_RATE_IN_TICKS +#define FX_UPDATE_RATE_IN_TICKS 1000 /* Same update rate, but in ticks */ +#endif + +typedef unsigned long long UINT64; + +/* Define the version ID of FileX. This may be utilized by the application. */ + +#ifdef FX_SYSTEM_INIT +CHAR _fx_version_id[] = + "Copyright (c) Microsoft Corporation. All rights reserved. * FileX Linux/GCC Version 6.1 *"; +#else +extern CHAR _fx_version_id[]; +#endif + +#endif + diff --git a/ports/win32/vs_2019/inc/fx_port.h b/ports/win32/vs_2019/inc/fx_port.h new file mode 100644 index 0000000..ece09dd --- /dev/null +++ b/ports/win32/vs_2019/inc/fx_port.h @@ -0,0 +1,165 @@ +/**************************************************************************/ +/* */ +/* Copyright (c) Microsoft Corporation. All rights reserved. */ +/* */ +/* This software is licensed under the Microsoft Software License */ +/* Terms for Microsoft Azure RTOS. Full text of the license can be */ +/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */ +/* and in the root directory of this software. */ +/* */ +/**************************************************************************/ + + +/**************************************************************************/ +/**************************************************************************/ +/** */ +/** FileX Component */ +/** */ +/** Port Specific */ +/** */ +/**************************************************************************/ +/**************************************************************************/ + + +/**************************************************************************/ +/* */ +/* PORT SPECIFIC C INFORMATION RELEASE */ +/* */ +/* fx_port.h Win32/Visual */ +/* 6.1 */ +/* */ +/* AUTHOR */ +/* */ +/* William E. Lamie, Microsoft Corporation */ +/* */ +/* DESCRIPTION */ +/* */ +/* This file contains data type definitions that make the FileX FAT */ +/* compatible file system function identically on a variety of */ +/* different processor architectures. For example, the byte offset of */ +/* various entries in the boot record, and directory entries are */ +/* defined in this file. */ +/* */ +/* RELEASE HISTORY */ +/* */ +/* DATE NAME DESCRIPTION */ +/* */ +/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +/* */ +/**************************************************************************/ + +#ifndef FX_PORT_H +#define FX_PORT_H + + +/* Determine if the optional FileX user define file should be used. */ + +#ifdef FX_INCLUDE_USER_DEFINE_FILE + + +/* Yes, include the user defines in fx_user.h. The defines in this file may + alternately be defined on the command line. */ + +#include "fx_user.h" +#endif + + +/* Include the ThreadX api file. */ + +#include "tx_api.h" + + +/* Define ULONG64 typedef, if not already defined. */ + +#ifndef ULONG64_DEFINED +#define ULONG64_DEFINED +typedef unsigned long long ULONG64; +#endif + + +/* Define FileX internal protection macros. If FX_SINGLE_THREAD is defined, + these protection macros are effectively disabled. However, for multi-thread + uses, the macros are setup to utilize a ThreadX mutex for multiple thread + access control into an open media. */ + +#ifdef FX_SINGLE_THREAD +#define FX_PROTECT +#define FX_UNPROTECT +#else +#define FX_PROTECT if (media_ptr -> fx_media_id != FX_MEDIA_ID) return(FX_MEDIA_NOT_OPEN); \ + else if (tx_mutex_get(&(media_ptr -> fx_media_protect), TX_WAIT_FOREVER) != TX_SUCCESS) return(FX_MEDIA_NOT_OPEN); +#define FX_UNPROTECT tx_mutex_put(&(media_ptr -> fx_media_protect)); +#endif + + +/* Define interrupt lockout constructs to protect the system date/time from being updated + while they are being read. */ + +#define FX_INT_SAVE_AREA unsigned int old_interrupt_posture; +#define FX_DISABLE_INTS old_interrupt_posture = tx_interrupt_control(TX_INT_DISABLE); +#define FX_RESTORE_INTS tx_interrupt_control(old_interrupt_posture); + + +/* Define the error checking logic to determine if there is a caller error in the FileX API. + The default definitions assume ThreadX is being used. This code can be completely turned + off by just defining these macros to white space. */ + +#ifndef TX_TIMER_PROCESS_IN_ISR + +#define FX_CALLER_CHECKING_EXTERNS extern TX_THREAD *_tx_thread_current_ptr; \ + extern TX_THREAD _tx_timer_thread; \ + extern volatile ULONG _tx_thread_system_state; + +#define FX_CALLER_CHECKING_CODE if ((_tx_thread_system_state) || \ + (_tx_thread_current_ptr == TX_NULL) || \ + (_tx_thread_current_ptr == &_tx_timer_thread)) \ + return(FX_CALLER_ERROR); + +#else +#define FX_CALLER_CHECKING_EXTERNS extern TX_THREAD *_tx_thread_current_ptr; \ + extern volatile ULONG _tx_thread_system_state; + +#define FX_CALLER_CHECKING_CODE if ((_tx_thread_system_state) || \ + (_tx_thread_current_ptr == TX_NULL)) \ + return(FX_CALLER_ERROR); +#endif + + +/* Define the update rate of the system timer. These values may also be defined at the command + line when compiling the fx_system_initialize.c module in the FileX library build. Alternatively, they can + be modified in this file or fx_user.h. Note: the update rate must be an even number of seconds greater + than or equal to 2, which is the minimal update rate for FAT time. */ + +/* Define the number of seconds the timer parameters are updated in FileX. The default + value is 10 seconds. This value can be overwritten externally. */ + +#ifndef FX_UPDATE_RATE_IN_SECONDS +#define FX_UPDATE_RATE_IN_SECONDS 10 +#endif + + +/* Defines the number of ThreadX timer ticks required to achieve the update rate specified by + FX_UPDATE_RATE_IN_SECONDS defined previously. By default, the ThreadX timer tick is 10ms, + so the default value for this constant is 1000. If TX_TIMER_TICKS_PER_SECOND is defined, + this value is derived from TX_TIMER_TICKS_PER_SECOND. */ + +#ifndef FX_UPDATE_RATE_IN_TICKS +#ifdef TX_TIMER_TICKS_PER_SECOND +#define FX_UPDATE_RATE_IN_TICKS (TX_TIMER_TICKS_PER_SECOND * FX_UPDATE_RATE_IN_SECONDS) +#else +#define FX_UPDATE_RATE_IN_TICKS 1000 +#endif +#endif + + +/* Define the version ID of FileX. This may be utilized by the application. */ + +#ifdef FX_SYSTEM_INIT +CHAR _fx_version_id[] = + "Copyright (c) Microsoft Corporation. All rights reserved. * FileX Win32/Version 6.1 *"; +#else +extern CHAR _fx_version_id[]; +#endif + +#endif +