Release 6.2.0

CMakeLists.txt

@@ -2,10 +2,12 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
 
 # Set up the project
 project(levelx
-    VERSION 6.0.0 
     LANGUAGES C ASM
 )
 
+option(LX_STANDALONE_ENABLE "Enable LevelX in standalone mode" OFF)
+option(LX_ENABLE_FILE_SERVERS "Includes a dependency on FileX" ON)
+
 if(NOT DEFINED THREADX_ARCH)
     message(FATAL_ERROR "Error: THREADX_ARCH not defined")
 endif()
@@ -19,14 +21,43 @@ add_library(${PROJECT_NAME})
 add_library("azrtos::${PROJECT_NAME}" ALIAS ${PROJECT_NAME})
 
 # Define any required dependencies between this library and others
-target_link_libraries(${PROJECT_NAME} PUBLIC 
+if(NOT LX_STANDALONE_ENABLE)
-    "azrtos::threadx"
+    target_link_libraries(${PROJECT_NAME} PUBLIC 
-    "azrtos::filex"
+        "azrtos::threadx")
-)
+endif()
+
+if(LX_ENABLE_FILE_SERVERS)
+    message(STATUS "LX_ENABLE_FILE_SERVERS - defined")
+    target_link_libraries(${PROJECT_NAME} PUBLIC "azrtos::filex")
+endif()
+
+# A place for generated/copied include files (no need to change)
+set(CUSTOM_INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/custom_inc)
 
 # Pick up the common stuff
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/common)
 
+# Include the user's override file if required
+if (NOT LX_USER_FILE)
+    message(STATUS "Using default lx_user.h file")
+    set(LX_USER_FILE ${CMAKE_CURRENT_LIST_DIR}/common/inc/lx_user_sample.h)
+else()
+    message(STATUS "Using custom lx_user.h file from ${LX_USER_FILE}")
+endif()
+configure_file(${LX_USER_FILE} ${CUSTOM_INC_DIR}/lx_user.h COPYONLY)
+target_include_directories(${PROJECT_NAME} 
+    PUBLIC 
+    ${CUSTOM_INC_DIR}
+)
+
+if(NOT LX_STANDALONE_ENABLE)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC "LX_INCLUDE_USER_DEFINE_FILE" )
+else()
+    # Enable LevelX and FileX standalone support (No Azure RTOS support)
+    set(FX_STANDALONE_ENABLE ON CACHE BOOL "Standalone enable")
+    target_compile_definitions(${PROJECT_NAME} PUBLIC "LX_INCLUDE_USER_DEFINE_FILE" -DLX_STANDALONE_ENABLE -DFX_STANDALONE_ENABLE)
+endif()
+
 # Enable a build target that produces a ZIP file of all sources
 set(CPACK_SOURCE_GENERATOR "ZIP")
 set(CPACK_SOURCE_IGNORE_FILES
@@ -40,3 +71,4 @@ set(CPACK_SOURCE_IGNORE_FILES
 )
 set(CPACK_VERBATIM_VARIABLES YES)
 include(CPack)
+

LICENSED-HARDWARE.txt

@@ -1,6 +1,6 @@
 LICENSED HARDWARE LIST
 
-Last Updated: 2020-12-15
+Last Updated: 2021-04-01
 
 Microsoft has entered into OEM Agreements with manufacturers of the following
 microprocessors and microcontrollers (the “hardware”) to enable those
@@ -29,12 +29,15 @@ Microchip:
 
 NXP:
 
-    NXP i.MX RT10xx series crossover MCUs
+    i.MX RT10xx and RT116x/7x series crossover MCUs
+    LPC5500 series
+
 
 Renesas:
 
     Synergy Platform
     RX Family of MCUs
+    RA Family of MCUs
     RZ Family of MPUs
 
 --------------------------------------------------------------------------------

README.md

@@ -1,91 +1,98 @@
 # Azure RTOS LevelX
 
-LevelX provides NAND and NOR flash wear leveling facilities to embedded applications. Since both NAND and NOR flash memory can only be erased a finite number of times, it’s critical to distribute the flash memory use evenly. This is typically called “wear leveling” and is the purpose behind LevelX. LevelX presents to the user an array of logical sectors that are mapped to physical flash memory inside of LevelX. Applications may use LevelX in conjunction with FileX or may read/write logical sectors directly. LevelX is designed for fault tolerance. Flash updates are performed in a multiple-step process that can be interrupted in each step. LevelX automatically recovers to the optimal state during the next operation.
+LevelX provides NAND and NOR flash wear leveling facilities to embedded applications. Since both NAND and NOR flash memory can only be erased a finite number of times, it’s critical to distribute the flash memory use evenly. This is typically called **wear leveling** and is the purpose behind LevelX. LevelX presents to the user an array of logical sectors that are mapped to physical flash memory inside of LevelX. Applications may use LevelX in conjunction with FileX or may read/write logical sectors directly. LevelX is designed for fault tolerance. Flash updates are performed in a multiple-step process that can be interrupted in each step. LevelX automatically recovers to the optimal state during the next operation.
 
-## Documentation
+## Getting Started
 
-Documentation for this library can be found here: https://github.com/azure-rtos/levelx/releases/download/v6.0_rel/Azure_RTOS_LevelX_User_Guide.pdf
+Azure RTOS LevelX as part of Azure RTOS has been integrated to the semiconductor's SDKs and development environment. You can develop using the tools of choice from [STMicroelectronics](https://www.st.com/content/st_com/en/campaigns/x-cube-azrtos-azure-rtos-stm32.html), [NXP](https://www.nxp.com/design/software/embedded-software/azure-rtos-for-nxp-microcontrollers:AZURE-RTOS), [Renesas](https://github.com/renesas/azure-rtos) and [Microchip](https://mu.microchip.com/get-started-simplifying-your-iot-design-with-azure-rtos).
 
-# Understanding inter-component dependencies
+See [Overview of Azure RTOS LevelX](https://learn.microsoft.com/azure/rtos/levelx/overview-levelx) for the high-level overview, and all documentation and APIs can be found in: [Azure RTOS LevelX documentation](https://learn.microsoft.com/azure/rtos/levelx/).
 
-The main components of Azure RTOS are each provided in their own repository, but there are dependencies between them--shown in the following graph--that are important to understand when setting up your builds.
+## Repository Structure and Usage
+
+### Directory layout
+
+    .
+    ├── cmake                   # CMakeList files for building the project
+    ├── common                  # Core LevelX files
+    ├── samples                 # Sample codes
+    ├── LICENSE.txt             # License terms
+    ├── LICENSE-HARDWARE.txt    # Licensed hardware from semiconductors
+    ├── CONTRIBUTING.md         # Contribution guidance
+    └── SECURITY.md             # Microsoft repo security guidance
+
+### Branches & Releases
+
+The master branch has the most recent code with all new features and bug fixes. It does not represent the latest General Availability (GA) release of the library. Each official release (preview or GA) will be tagged to mark the commit and push it into the Github releases tab, e.g. `v6.2-rel`.
+
+## Component dependencies
+
+The main components of Azure RTOS are each provided in their own repository, but there are dependencies between them, as shown in the following graph. This is important to understand when setting up your builds.
 
 ![dependency graph](docs/deps.png)
 
-# Building and using the library
+> You will have to take the dependency graph above into account when building anything other than ThreadX itself.
 
-## Prerequisites
+### Building and using the library
 
-Install the following tools:
+Instruction for building the LevelX as static library using Arm GNU Toolchain and CMake. If you are using toolchain and IDE from semiconductor, you might follow its own instructions to use Azure RTOS components as explained in the [Getting Started](#getting-started) section.
 
-* [CMake](https://cmake.org/download/) version 3.0 or later
+1. Install the following tools:
-* [GCC compilers for arm-none-eabi](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads)
-* [Ninja](https://ninja-build.org/)
 
-## Cloning the repo
+    * [CMake](https://cmake.org/download/) version 3.0 or later
+    * [Arm GNU Toolchain for arm-none-eabi](https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads)
+    * [Ninja](https://ninja-build.org/)
 
-```bash
+1. Build the [ThreadX library](https://github.com/azure-rtos/threadx#building-and-using-the-library) as the dependency.
-$ git clone https://github.com/azure-rtos/levelx.git
-```
 
-## Building as a static library
+1. Cloning the repo.
 
-Each component of Azure RTOS comes with a composible CMake-based build system that supports many different MCUs and host systems. Integrating any of these components into your device app code is as simple as adding a git submodule and then including it in your build using the CMake command `add_subdirectory()`.
+    ```bash
+    $ git clone --recursive https://github.com/azure-rtos/levelx.git
+    ```
 
-While the typical usage pattern is to include threadx into your device code source tree to be built & linked with your code, you can compile this project as a standalone static library to confirm your build is set up correctly.
+1. Define the features and addons you need in `lx_user.h` and build together with the component source code. You can refer to [`lx_user_sample.h`](https://github.com/azure-rtos/levelx/blob/master/common/inc/lx_user_sample.h) as an example.
 
-```bash
+1. Building as a static library
-$ cmake -Bbuild -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake -GNinja .
 
-$ cmake --build ./build
+    Each component of Azure RTOS comes with a composable CMake-based build system that supports many different MCUs and host systems. Integrating any of these components into your device app code is as simple as adding a git submodule and then including it in your build using the CMake `add_subdirectory()`.
-```
 
-NOTE: You will have to take the dependency graph above into account when building anything other than threadx itself.
+    While the typical usage pattern is to include LevelX into your device code source tree to be built & linked with your code, you can compile this project as a standalone static library to confirm your build is set up correctly.
 
-# Repository Structure and Usage
+    An example of building the library for Cortex-M4:
 
-## Branches & Releases
+    ```bash
+    $ cmake -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake .
 
-The master branch has the most recent code with all new features and bug fixes. It does not represent the latest General Availability (GA) release of the library.
+    $ cmake --build ./build
+    ```
 
-## Releases
+## Professional support
 
-Each official release (preview or GA) will be tagged to mark the commit and push it into the Github releases tab, e.g. `v6.0-rel`.
+[Professional support plans](https://azure.microsoft.com/support/options/) are available from Microsoft. For community support and others, see the [Resources](#resources) section below.
 
-## Directory layout
+## Licensing
 
-```
+License terms for using Azure RTOS are defined in the LICENSE.txt file of this repo. Please refer to this file for all definitive licensing information. No additional license fees are required for deploying Azure RTOS on hardware defined in the [LICENSED-HARDWARE.txt](./LICENSED-HARDWARE.txt) file. If you are using hardware not listed in the file or having licensing questions in general, please contact Microsoft directly at https://aka.ms/azrtos-license.
-- cmake
-- common
-  - inc
-  - src
-- samples
-```
 
-# Security
+## Resources
+
+The following are references to additional Azure RTOS resources:
+
+- **Product introduction and white papers**: https://azure.com/rtos
+- **General technical questions**: https://aka.ms/QnA/azure-rtos
+- **Product issues and bugs, or feature requests**: https://github.com/azure-rtos/levelx/issues
+- **Licensing and sales questions**: https://aka.ms/azrtos-license
+- **Product roadmap and support policy**: https://aka.ms/azrtos/lts
+- **Blogs and videos**: http://msiotblog.com and https://aka.ms/iotshow
+- **Azure RTOS TraceX Installer**: https://aka.ms/azrtos-tracex-installer
+
+You can also check [previous questions](https://stackoverflow.com/questions/tagged/azure-rtos+levelx) or ask new ones on StackOverflow using the `azure-rtos` and `levelx` tags.
+
+## Security
 
 Azure RTOS provides OEMs with components to secure communication and to create code and data isolation using underlying MCU/MPU hardware protection mechanisms. It is ultimately the responsibility of the device builder to ensure the device fully meets the evolving security requirements associated with its specific use case.
 
-# Licensing
+## Contribution
 
-License terms for using Azure RTOS are defined in the LICENSE.txt file of this repo. Please refer to this file for all definitive licensing information. No additional license fees are required for deploying Azure RTOS on hardware defined in the LICENSED-HARDWARE.txt file. If you are using hardware not defined in the LICENSED-HARDWARE.txt file or have licensing questions in general, please contact Microsoft directly at https://azure-rtos.ms-iot-contact.com/
+Please follow the instructions provided in the [CONTRIBUTING.md](./CONTRIBUTING.md) for the corresponding repository.
-
-# Contribution, feedback, issues, and professional support
-
-If you encounter any bugs, have suggestions for new features, or if you would like to become an active contributor to this project, please follow the instructions provided in the contribution guideline for the corresponding repo.
-
-For basic support, click Issues in the command bar or post a question to [Stack Overflow](http://stackoverflow.com/questions/tagged/azure-rtos+threadx) using the `threadx` and `azure-rtos` tags.
-
-Professional support plans (https://azure.microsoft.com/en-us/support/options/) are available from Microsoft.
-
-# Additional Resources
-
-The following are references to additional Azure RTOS and Azure IoT in general:
-|   |   |
-|---|---|
-| 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/ |
-| 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 |

common/inc/lx_api.h

@@ -26,7 +26,7 @@
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*                                                                        */
 /*    lx_api.h                                            PORTABLE C      */
-/*                                                           6.1.3        */
+/*                                                           6.2.0        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -52,6 +52,29 @@
 /*  12-31-2020     William E. Lamie         Modified comment(s), and      */
 /*                                            updated product constants,  */
 /*                                            resulting in version 6.1.3  */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            added standalone support,   */
+/*                                            resulting in version 6.1.7  */
+/*  08-02-2021     William E. Lamie         Modified comment(s), and      */
+/*                                            updated product constants,  */
+/*                                            resulting in version 6.1.8  */
+/*  10-15-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            updated configuration for   */
+/*                                            nand flash                  */
+/*                                            resulting in version 6.1.9  */
+/*  01-31-2022     Bhupendra Naphade        Modified comment(s),          */
+/*                                            updated include order for   */
+/*                                            standalone mode,            */
+/*                                            resulting in version 6.1.10 */
+/*  04-25-2022     William E. Lamie         Modified comment(s), and      */
+/*                                            updated product constants,  */
+/*                                            resulting in version 6.1.11 */
+/*  07-29-2022     William E. Lamie         Modified comment(s), and      */
+/*                                            updated product constants,  */
+/*                                            resulting in version 6.1.12 */
+/*  10-31-2022     Xiuwen Cai               Modified comment(s), and      */
+/*                                            updated product constants,  */
+/*                                            resulting in version 6.2.0  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -69,10 +92,6 @@ extern   "C" {
 
 #endif
 
-/* Include necessary system files.  */
-
-#include "tx_api.h"
-
 /* Determine if the optional LevelX user define file should be used.  */
 
 #ifdef LX_INCLUDE_USER_DEFINE_FILE
@@ -84,6 +103,71 @@ extern   "C" {
 #include "lx_user.h"
 #endif
 
+/* Include the ThreadX api file.  */
+
+#ifndef LX_STANDALONE_ENABLE
+#include "tx_api.h"
+#endif
+
+
+#ifdef LX_STANDALONE_ENABLE
+
+/* Define compiler library include files.  */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef VOID
+#define VOID                                    void
+typedef char                                    CHAR;
+typedef char                                    BOOL;
+typedef unsigned char                           UCHAR;
+typedef int                                     INT;
+typedef unsigned int                            UINT;
+typedef long                                    LONG;
+typedef unsigned long                           ULONG;
+typedef short                                   SHORT;
+typedef unsigned short                          USHORT;
+#endif
+
+#ifndef ULONG64_DEFINED
+#define ULONG64_DEFINED
+typedef unsigned long long                      ULONG64;
+#endif
+
+/* Define basic alignment type used in block and byte pool operations. This data type must
+   be at least 32-bits in size and also be large enough to hold a pointer type.  */
+
+#ifndef ALIGN_TYPE_DEFINED
+#define ALIGN_TYPE_DEFINED
+#define ALIGN_TYPE                              ULONG
+#endif
+
+/* Define the LX_MEMSET macro to the standard library function, if not already defined.  */
+#ifndef LX_MEMSET
+#define LX_MEMSET(a,b,c)                        memset((a),(b),(c))
+#endif
+
+/* Disable usage of ThreadX mutex in standalone mode */
+#ifdef LX_THREAD_SAFE_ENABLE
+#undef LX_THREAD_SAFE_ENABLE
+#endif
+
+#define LX_INTERRUPT_SAVE_AREA
+#define LX_DISABLE
+#define LX_RESTORE
+
+#else
+
+#define LX_MEMSET                               TX_MEMSET
+
+#define LX_INTERRUPT_SAVE_AREA                  TX_INTERRUPT_SAVE_AREA
+#define LX_DISABLE                              TX_DISABLE
+#define LX_RESTORE                              TX_RESTORE
+
+#endif
+
 
 /* Disable warning of parameter not used. */
 #ifndef LX_PARAMETER_NOT_USED
@@ -94,8 +178,8 @@ extern   "C" {
 /* Define basic constants for the LevelX Stack.  */
 #define AZURE_RTOS_LEVELX
 #define LEVELX_MAJOR_VERSION                        6
-#define LEVELX_MINOR_VERSION                        1
+#define LEVELX_MINOR_VERSION                        2
-#define LEVELX_PATCH_VERSION                        3
+#define LEVELX_PATCH_VERSION                        0
 
 
 /* Define general LevelX Constants.  */
@@ -187,6 +271,10 @@ extern   "C" {
 #define LX_NAND_ERASE_COUNT_WRITE_SIZE              (nand_flash -> lx_nand_flash_pages_per_block + 1)
 #endif  
 
+#ifndef LX_NAND_FLASH_MAPPING_LIST_UPDATE_DISABLE
+#define LX_NAND_FLASH_MAPPING_LIST_UPDATE_DISABLE
+#endif 
+
 
 /* Define the mask for the hash index into the NAND sector mapping cache table.  The sector mapping cache is divided 
    into 4 entry pieces that are indexed by the formula:  

common/inc/lx_user_sample.h

@@ -26,7 +26,7 @@
 /*  PORT SPECIFIC C INFORMATION                            RELEASE        */
 /*                                                                        */
 /*    lx_user.h                                           PORTABLE C      */
-/*                                                           6.1.2        */
+/*                                                           6.1.7        */
 /*                                                                        */
 /*  AUTHOR                                                                */
 /*                                                                        */
@@ -45,6 +45,9 @@
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
 /*  11-09-2020     William E. Lamie         Initial Version 6.1.2         */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s), and      */
+/*                                            added standalone support,   */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -113,6 +116,10 @@
 #define LX_THREAD_SAFE_ENABLE
 */
 
+/* Defined, LevelX will be used in standalone mode (without Azure RTOS ThreadX) */
+
+/* #define LX_STANDALONE_ENABLE */
+
 
 
 #endif

common/src/fx_nand_flash_simulated_driver.c

@@ -23,7 +23,6 @@
 
 /* Include necessary system files.  */
 
-#include "tx_api.h"
 #include "fx_api.h"
 #include "lx_api.h"
 
@@ -69,7 +68,7 @@ VOID  _fx_nand_flash_simulator_driver(FX_MEDIA *media_ptr);
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _fx_nand_simulator_driver                           PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -122,6 +121,8 @@ VOID  _fx_nand_flash_simulator_driver(FX_MEDIA *media_ptr);
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _fx_nand_flash_simulator_driver(FX_MEDIA *media_ptr)

common/src/fx_nor_flash_simulator_driver.c

@@ -23,7 +23,6 @@
 
 /* Include necessary system files.  */
 
-#include "tx_api.h"
 #include "fx_api.h"
 #include "lx_api.h"
 
@@ -65,7 +64,7 @@ VOID  _fx_nor_flash_simulator_driver(FX_MEDIA *media_ptr);
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _fx_nor_flash_simulator_driver                      PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -118,6 +117,8 @@ VOID  _fx_nor_flash_simulator_driver(FX_MEDIA *media_ptr);
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _fx_nor_flash_simulator_driver(FX_MEDIA *media_ptr)

common/src/lx_nand_flash_256byte_ecc_check.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_256byte_ecc_check                    PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -74,6 +74,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_256byte_ecc_check(UCHAR *page_buffer, UCHAR *ecc_buffer)

common/src/lx_nand_flash_256byte_ecc_compute.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_256byte_ecc_compute                  PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_256byte_ecc_compute(UCHAR *page_buffer, UCHAR *ecc_buffer)

common/src/lx_nand_flash_block_full_update.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_block_full_update                    PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -78,6 +78,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_block_full_update(LX_NAND_FLASH *nand_flash, ULONG block, ULONG erase_count)

common/src/lx_nand_flash_block_obsoleted_check.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_block_obsoleted_check                PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -84,6 +84,12 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
+/*  10-15-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            removed multiple write      */
+/*                                            to page 0,                  */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _lx_nand_flash_block_obsoleted_check(LX_NAND_FLASH *nand_flash, ULONG block)
@@ -314,22 +320,11 @@ UINT                                status;
                 }
 
                 /* Now store the erase count.  */
-                page_word_ptr[0] =  (erase_count | LX_BLOCK_ERASED);
+                page_word_ptr[0] =  (erase_count);
         
                 /* Write the erase count for the block.  */
                 status =  _lx_nand_flash_driver_write(nand_flash, block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
 
-                /* Check to see if the write was successful.  */
-                if (status == LX_SUCCESS)
-                {
-                
-                    /* Now store the erase count.  */
-                    page_word_ptr[0] =  erase_count;
-        
-                    /* Write the erase count for the block.  */
-                    status =  _lx_nand_flash_driver_write(nand_flash, block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
-                }
-
                 /* Check for an error from flash driver.   */
                 if (status)
                 {

common/src/lx_nand_flash_block_reclaim.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_block_reclaim                        PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -86,6 +86,15 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
+/*  08-02-2021     Bhupendra Naphade        Modified comment(s), updated  */
+/*                                            obselete page count check,  */
+/*                                            resulting in version 6.1.8  */
+/*  10-15-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            removed multiple write      */
+/*                                            to page 0,                  */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_block_reclaim(LX_NAND_FLASH *nand_flash)
@@ -129,7 +138,7 @@ UINT                    status;
     }
 
     /* Determine if this block is completely obsolete.  */
-    if (obsolete_pages == nand_flash -> lx_nand_flash_pages_per_block)
+    if (obsolete_pages == nand_flash -> lx_nand_flash_pages_per_block - 1)
     {
 
         /* Read page 0 of the block, which has the erase count in the first 4 bytes. */
@@ -213,22 +222,11 @@ UINT                    status;
             }
 
             /* Now store the erase count.  */
-            page_word_ptr[0] =  (erase_count | LX_BLOCK_ERASED);
+            page_word_ptr[0] =  (erase_count);
         
             /* Write the erase count for the block.  */
             status =  _lx_nand_flash_driver_write(nand_flash, erase_block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
 
-            /* Check the status.  */
-            if (status == LX_SUCCESS)
-            {
-            
-                /* Now store the erase count.  */
-                page_word_ptr[0] =  erase_count;
-        
-                /* Write the erase count for the block.  */
-                status =  _lx_nand_flash_driver_write(nand_flash, erase_block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
-            }
-
             /* Check for an error from flash driver.   */
             if (status)
             {
@@ -573,22 +571,11 @@ UINT                    status;
                 }
 
                 /* Now store the erase count.  */
-                page_word_ptr[0] =  (erase_count | LX_BLOCK_ERASED);
+                page_word_ptr[0] =  (erase_count);
         
                 /* Write the erase count for the block.  */
                 status =  _lx_nand_flash_driver_write(nand_flash, erase_block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
 
-                /* Determine if the write was successful.  */
-                if (status == LX_SUCCESS)
-                {
-
-                    /* Now store the erase count.  */
-                    page_word_ptr[0] =  erase_count;
-        
-                    /* Write the erase count for the block.  */
-                    status =  _lx_nand_flash_driver_write(nand_flash, erase_block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
-                }
-
                 /* Check for an error from flash driver.   */
                 if (status)
                 {

common/src/lx_nand_flash_close.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_close                                PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -72,16 +72,18 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_close(LX_NAND_FLASH *nand_flash)
 {
 
-TX_INTERRUPT_SAVE_AREA
+LX_INTERRUPT_SAVE_AREA
 
 
     /* Lockout interrupts for NAND flash close.  */
-    TX_DISABLE
+    LX_DISABLE
 
     /* See if the media is the only one on the media opened list.  */
     if ((_lx_nand_flash_opened_ptr == nand_flash) &&
@@ -117,7 +119,7 @@ TX_INTERRUPT_SAVE_AREA
     nand_flash -> lx_nand_flash_state =  LX_NAND_FLASH_CLOSED;
     
     /* Restore interrupt posture.  */
-    TX_RESTORE
+    LX_RESTORE
 
 #ifdef LX_THREAD_SAFE_ENABLE
 

common/src/lx_nand_flash_defragment.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_defragment                           PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_defragment(LX_NAND_FLASH *nand_flash)

common/src/lx_nand_flash_driver_block_erase.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_block_erase                   PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -74,6 +74,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_block_erase(LX_NAND_FLASH *nand_flash, ULONG block, ULONG erase_count)

common/src/lx_nand_flash_driver_block_erased_verify.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_block_erased_verify           PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_block_erased_verify(LX_NAND_FLASH *nand_flash, ULONG block)

common/src/lx_nand_flash_driver_block_status_get.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_block_status_get              PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -76,6 +76,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_block_status_get(LX_NAND_FLASH *nand_flash, ULONG block, UCHAR *bad_block_flag)

common/src/lx_nand_flash_driver_block_status_set.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_block_status_set              PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -76,6 +76,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_block_status_set(LX_NAND_FLASH *nand_flash, ULONG block, UCHAR bad_block_flag)

common/src/lx_nand_flash_driver_extra_bytes_get.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_extra_bytes_get               PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -77,6 +77,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_extra_bytes_get(LX_NAND_FLASH *nand_flash, ULONG block, ULONG page, UCHAR *destination, UINT size)

common/src/lx_nand_flash_driver_extra_bytes_set.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_extra_bytes_set               PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -78,6 +78,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_extra_bytes_set(LX_NAND_FLASH *nand_flash, ULONG block, ULONG page, UCHAR *source, UINT size)

common/src/lx_nand_flash_driver_page_erased_verify.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_page_erased_verify            PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_page_erased_verify(LX_NAND_FLASH *nand_flash, ULONG block, ULONG page)

common/src/lx_nand_flash_driver_read.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_read                          PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -76,6 +76,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_read(LX_NAND_FLASH *nand_flash, ULONG block, ULONG page, ULONG *destination, ULONG words)

common/src/lx_nand_flash_driver_write.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_driver_write                         PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -76,6 +76,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_driver_write(LX_NAND_FLASH *nand_flash, ULONG block, ULONG page, ULONG *source, ULONG words)

common/src/lx_nand_flash_extended_cache_enable.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_extended_cache_enable                PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -77,6 +77,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_extended_cache_enable(LX_NAND_FLASH  *nand_flash, VOID *memory, ULONG size)
@@ -91,13 +93,13 @@ ULONG   i;
     working_ptr =  (UCHAR *) memory;
     
     /* Check for a NULL pointer. If NULL, disable all the caches.  */
-    if (working_ptr == TX_NULL)
+    if (working_ptr == LX_NULL)
     {
     
         /* Disable all extended caches.  */
-        nand_flash -> lx_nand_flash_block_status_cache =      TX_NULL;
+        nand_flash -> lx_nand_flash_block_status_cache =      LX_NULL;
-        nand_flash -> lx_nand_flash_page_extra_bytes_cache =  TX_NULL;
+        nand_flash -> lx_nand_flash_page_extra_bytes_cache =  LX_NULL;
-        nand_flash -> lx_nand_flash_page_0_cache =            TX_NULL;
+        nand_flash -> lx_nand_flash_page_0_cache =            LX_NULL;
         
         /* Return success!  */
         return(LX_SUCCESS);   

common/src/lx_nand_flash_logical_sector_find.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_logical_sector_find                  PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -85,6 +85,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_logical_sector_find(LX_NAND_FLASH *nand_flash, ULONG logical_sector, ULONG superceded_check, ULONG *block, ULONG *page)

common/src/lx_nand_flash_next_block_to_erase_find.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_next_block_to_erase_find             PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -82,6 +82,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_next_block_to_erase_find(LX_NAND_FLASH *nand_flash, ULONG *return_erase_block, ULONG *return_erase_count, ULONG *return_mapped_pages, ULONG *return_obsolete_pages)

common/src/lx_nand_flash_open.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_open                                 PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -92,6 +92,12 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
+/*  10-15-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            removed multiple write      */
+/*                                            to page 0,                  */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_open(LX_NAND_FLASH  *nand_flash, CHAR *name, UINT (*nand_driver_initialize)(LX_NAND_FLASH *))
@@ -115,12 +121,12 @@ LX_NAND_FLASH               *tail_ptr;
 ULONG                       logical_sector;
 #endif
 
-TX_INTERRUPT_SAVE_AREA
+LX_INTERRUPT_SAVE_AREA
 
     LX_PARAMETER_NOT_USED(name);
 
     /* Clear the NAND flash control block.  */
-    TX_MEMSET(nand_flash, 0, sizeof(LX_NAND_FLASH));
+    LX_MEMSET(nand_flash, 0, sizeof(LX_NAND_FLASH));
     
     /* Call the flash driver's initialization function.  */
     (nand_driver_initialize)(nand_flash);
@@ -280,22 +286,11 @@ TX_INTERRUPT_SAVE_AREA
             }
   
             /* Setup the initial erase count to 1.  */
-            page_word_ptr[0] =  (((ULONG) 1) | LX_BLOCK_ERASED);
+            page_word_ptr[0] =  (((ULONG) 1));
 
             /* Write the initial erase count for the block.  */            
             status =  _lx_nand_flash_driver_write(nand_flash, block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
 
-            /* Check for status after the block erase.  */
-            if (status == LX_SUCCESS)
-            {
-
-                /* Setup the initial erase count to 1.  */
-                page_word_ptr[0] =  ((ULONG) 1);
-
-                /* Write the initial erase count for the block.  */            
-                status =  _lx_nand_flash_driver_write(nand_flash, block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
-            }
-
             /* Check for an error from flash driver.   */
             if (status)
             {
@@ -496,18 +491,9 @@ TX_INTERRUPT_SAVE_AREA
                     continue;
                 }
               
-                /* Write the initial erase count for the block.  */            
+                /* Write the final erase count for the block.  */            
-                page_word_ptr[0] =  (max_erased_count | LX_BLOCK_ERASED);
-                status =  _lx_nand_flash_driver_write(nand_flash, block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
-
-                /* Determine if the write was successful. */
-                if (status == LX_SUCCESS)
-                {
-                
-                    /* Write the initial erase count for the block.  */            
                 page_word_ptr[0] =  max_erased_count;
-                    status =  _lx_nand_flash_driver_write(nand_flash, block, 0, page_word_ptr, LX_NAND_ERASE_COUNT_WRITE_SIZE);
+                status =  _lx_nand_flash_driver_write(nand_flash, block, 0, page_word_ptr, 1);
-                }
 
                 /* Check for an error from flash driver.   */
                 if (status)
@@ -905,7 +891,7 @@ TX_INTERRUPT_SAVE_AREA
     status =  tx_mutex_create(&nand_flash -> lx_nand_flash_mutex, "NAND Flash Mutex", TX_NO_INHERIT);
 
     /* Determine if the mutex creation encountered an error.  */
-    if (status != TX_SUCCESS)
+    if (status != LX_SUCCESS)
     {
     
         /* Call system error handler, since this should not happen.  */
@@ -927,7 +913,7 @@ TX_INTERRUPT_SAVE_AREA
     nand_flash -> lx_nand_flash_max_mapped_sector =  max_mapped_sector;
 
     /* Lockout interrupts.  */
-    TX_DISABLE
+    LX_DISABLE
 
     /* At this point, the NAND flash has been opened successfully.  Place the 
        NAND flash control block on the linked list of currently opened NAND flashes.  */
@@ -966,7 +952,7 @@ TX_INTERRUPT_SAVE_AREA
     _lx_nand_flash_opened_count++;
 
     /* Restore interrupts.  */
-    TX_RESTORE
+    LX_RESTORE
 
     /* Return a successful completion.  */
     return(LX_SUCCESS);

common/src/lx_nand_flash_page_ecc_check.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_page_ecc_check                       PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_page_ecc_check(LX_NAND_FLASH *nand_flash, UCHAR *page_buffer, UCHAR *ecc_buffer)

common/src/lx_nand_flash_page_ecc_compute.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_page_ecc_compute                     PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -74,6 +74,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_page_ecc_compute(LX_NAND_FLASH *nand_flash, UCHAR *page_buffer, UCHAR *ecc_buffer)

common/src/lx_nand_flash_partial_defragment.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_partial_defragment                   PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -78,6 +78,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_partial_defragment(LX_NAND_FLASH *nand_flash, UINT max_blocks)

common/src/lx_nand_flash_physical_page_allocate.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_physical_page_allocate               PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -85,6 +85,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_physical_page_allocate(LX_NAND_FLASH *nand_flash, ULONG *block, ULONG *page, ULONG *erase_count)

common/src/lx_nand_flash_sector_mapping_cache_invalidate.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_sector_mapping_cache_invalidate      PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -74,6 +74,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _lx_nand_flash_sector_mapping_cache_invalidate(LX_NAND_FLASH *nand_flash, ULONG logical_sector)

common/src/lx_nand_flash_sector_read.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_sector_read                          PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -80,6 +80,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_sector_read(LX_NAND_FLASH *nand_flash, ULONG logical_sector, VOID *buffer)

common/src/lx_nand_flash_sector_release.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_sector_release                       PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -85,6 +85,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_sector_release(LX_NAND_FLASH *nand_flash, ULONG logical_sector)

common/src/lx_nand_flash_sector_write.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_sector_write                         PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -90,6 +90,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_sector_write(LX_NAND_FLASH *nand_flash, ULONG logical_sector, VOID *buffer)

common/src/lx_nand_flash_simulator.c

@@ -23,7 +23,6 @@
 
 /* Include necessary files.  */
 
-#include "tx_api.h"
 #include "lx_api.h"
 
 /* Define constants for the NAND flash simulation. */
@@ -38,7 +37,6 @@
 #define EXTRA_BYTE_POSITION                 2           /*      2 is the extra bytes starting byte postion              */ 
 #define ECC_BYTE_POSITION                   40          /*      40 is the ECC starting byte position                    */ 
 
-
 /* Definition of the spare area is relative to the block size of the NAND part and perhaps manufactures of the NAND part. 
    Here are some common definitions:
    
@@ -170,7 +168,13 @@ UINT  _lx_nand_flash_simulator_write(ULONG block, ULONG page, ULONG *source, ULO
 {
 
 ULONG   *flash_address;
-
+UCHAR   *flash_spare_address;
+UINT    bytes_computed;
+UINT    ecc_bytes =0;
+UCHAR   new_ecc_buffer[24];
+UCHAR   *new_ecc_buffer_ptr = new_ecc_buffer;
+UCHAR   *ecc_buffer_ptr = new_ecc_buffer_ptr;
+ULONG   *page_ptr = &(nand_memory_area[block].physical_pages[page].memory[0]);
 
     /* Increment the diag info.  */
     nand_block_diag[block].page_writes[page]++;
@@ -193,6 +197,41 @@ ULONG   *flash_address;
         *flash_address++ =  *source++;
     }
 
+    /* Loop to compute the ECC over the entire NAND flash page.  */
+    bytes_computed =  0;
+    
+    while (bytes_computed < BYTES_PER_PHYSICAL_PAGE)
+    { 
+    
+        /* Compute the ECC for this 256 byte piece of the page.  */
+        _lx_nand_flash_256byte_ecc_compute((UCHAR *)page_ptr, (UCHAR *)new_ecc_buffer_ptr);
+        
+        /* Move to the next 256 byte portion of the page.  */
+        bytes_computed =  bytes_computed + 256;
+        
+        /* Move the page buffer forward.  */
+        page_ptr =  page_ptr + 256;
+    
+        ecc_bytes = ecc_bytes + 3;
+
+        /* Move the ECC buffer forward, note there are 3 bytes of ECC per page. */
+        new_ecc_buffer_ptr =   new_ecc_buffer_ptr + 3;
+    }
+    
+    /* Setup destination pointer in the spare area.  */
+    flash_spare_address =  (UCHAR *) &(nand_memory_area[block].physical_pages[page].spare[ECC_BYTE_POSITION]);
+    while(ecc_bytes--)
+    {
+
+        /* Can the word be written?  We can clear new bits, but just can't unclear
+           in a NAND device.  */
+        if ((*ecc_buffer_ptr & *flash_spare_address) != *ecc_buffer_ptr)
+           return(LX_INVALID_WRITE);
+
+        /* Set an ecc byte in the spare area.  */
+       *flash_spare_address++ =  *ecc_buffer_ptr++;
+
+    }
     return(LX_SUCCESS);
 }
 
@@ -246,7 +285,7 @@ UINT    i, j;
     pointer =  (ULONG *) &nand_memory_area[0];
 
     /* Loop to erase block.  */
-    words =  sizeof(nand_memory_area)/sizeof(ULONG);
+    words =  sizeof(nand_memory_area)/(sizeof(ULONG));
     while (words--)
     {
         

common/src/lx_nand_flash_system_error.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_system_error                         PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _lx_nand_flash_system_error(LX_NAND_FLASH *nand_flash, UINT error_code, ULONG block, ULONG page)

common/src/lx_nor_flash_block_reclaim.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_block_reclaim                         PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -81,6 +81,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_block_reclaim(LX_NOR_FLASH *nor_flash)

common/src/lx_nor_flash_close.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_close                                 PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -72,16 +72,18 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_close(LX_NOR_FLASH *nor_flash)
 {
 
-TX_INTERRUPT_SAVE_AREA
+LX_INTERRUPT_SAVE_AREA
 
 
     /* Lockout interrupts for NOR flash close.  */
-    TX_DISABLE
+    LX_DISABLE
 
     /* See if the media is the only one on the media opened list.  */
     if ((_lx_nor_flash_opened_ptr == nor_flash) &&
@@ -117,7 +119,7 @@ TX_INTERRUPT_SAVE_AREA
     nor_flash -> lx_nor_flash_state =  LX_NOR_FLASH_CLOSED;
     
     /* Restore interrupt posture.  */
-    TX_RESTORE
+    LX_RESTORE
 
 #ifdef LX_THREAD_SAFE_ENABLE
 

common/src/lx_nor_flash_defragment.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_defragment                            PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_defragment(LX_NOR_FLASH *nor_flash)

common/src/lx_nor_flash_driver_block_erase.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_driver_block_erase                    PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -74,6 +74,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_driver_block_erase(LX_NOR_FLASH *nor_flash, ULONG block, ULONG erase_count)

common/src/lx_nor_flash_driver_read.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_extended_cache_read                  PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_driver_read(LX_NOR_FLASH *nor_flash, ULONG *flash_address, ULONG *destination, ULONG words)

common/src/lx_nor_flash_driver_write.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_driver_write                          PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -75,6 +75,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_driver_write(LX_NOR_FLASH *nor_flash, ULONG *flash_address, ULONG *source, ULONG words)

common/src/lx_nor_flash_extended_cache_enable.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_extended_cache_enable                 PORTABLE C      */ 
-/*                                                           6.1.3        */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -77,6 +77,13 @@
 /*  12-31-2020     William E. Lamie         Modified comment(s),          */
 /*                                            fixed compiler warnings,    */
 /*                                            resulting in version 6.1.3  */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s), and      */
+/*                                            updated product constants   */
+/*                                            resulting in version 6.1.7  */
+/*  10-15-2021     Bhupendra Naphade        Modified comment(s), and      */
+/*                                            added check for out of      */
+/*                                            bound memory access,        */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_extended_cache_enable(LX_NOR_FLASH *nor_flash, VOID *memory, ULONG size)
@@ -132,7 +139,16 @@ ULONG   *cache_memory;
     }
     
     /* Save the number of cache entries.  */
+    if(i > LX_NOR_EXTENDED_CACHE_SIZE)
+    {
+
+        nor_flash -> lx_nor_flash_extended_cache_entries =  LX_NOR_EXTENDED_CACHE_SIZE;
+    }
+    else
+    {
+
         nor_flash -> lx_nor_flash_extended_cache_entries =  i;
+    }  
 
 #ifdef LX_THREAD_SAFE_ENABLE
 

common/src/lx_nor_flash_initialize.c

@@ -39,7 +39,7 @@ ULONG           _lx_nor_flash_opened_count;
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_initialize                            PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -71,6 +71,8 @@ ULONG           _lx_nor_flash_opened_count;
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_initialize(void)

common/src/lx_nor_flash_logical_sector_find.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_logical_sector_find                   PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -83,6 +83,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_logical_sector_find(LX_NOR_FLASH *nor_flash, ULONG logical_sector, ULONG superceded_check, ULONG **physical_sector_map_entry, ULONG **physical_sector_address)

common/src/lx_nor_flash_next_block_to_erase_find.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_next_block_to_erase_find              PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -79,6 +79,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_next_block_to_erase_find(LX_NOR_FLASH *nor_flash, ULONG *return_erase_block, ULONG *return_erase_count, ULONG *return_mapped_sectors, ULONG *return_obsolete_sectors)

common/src/lx_nor_flash_open.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_open                                  PORTABLE C      */ 
-/*                                                           6.1.3        */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -89,6 +89,9 @@
 /*  12-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            fixed compiler warnings,    */
 /*                                            resulting in version 6.1.3  */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s), and      */
+/*                                            updated product constants   */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_open(LX_NOR_FLASH  *nor_flash, CHAR *name, UINT (*nor_driver_initialize)(LX_NOR_FLASH *))
@@ -114,12 +117,12 @@ ULONG           *sector_word_ptr;
 ULONG           sector_word;
 #endif
 LX_NOR_FLASH   *tail_ptr;
-TX_INTERRUPT_SAVE_AREA
+LX_INTERRUPT_SAVE_AREA
 
     LX_PARAMETER_NOT_USED(name);
 
     /* Clear the NOR flash control block.  */
-    TX_MEMSET(nor_flash, 0, sizeof(LX_NOR_FLASH));
+    LX_MEMSET(nor_flash, 0, sizeof(LX_NOR_FLASH));
    
     /* Call the flash driver's initialization function.  */
     (nor_driver_initialize)(nor_flash);
@@ -814,7 +817,7 @@ TX_INTERRUPT_SAVE_AREA
     status =  tx_mutex_create(&nor_flash -> lx_nor_flash_mutex, "NOR Flash Mutex", TX_NO_INHERIT);
 
     /* Determine if the mutex creation encountered an error.  */
-    if (status != TX_SUCCESS)
+    if (status != LX_SUCCESS)
     {
     
         /* Call system error handler, since this should not happen.  */
@@ -833,7 +836,7 @@ TX_INTERRUPT_SAVE_AREA
     nor_flash -> lx_nor_flash_found_sector_search =  0;
 
     /* Lockout interrupts.  */
-    TX_DISABLE
+    LX_DISABLE
 
     /* At this point, the NOR flash has been opened successfully.  Place the 
        NOR flash control block on the linked list of currently opened NOR flashes.  */
@@ -872,7 +875,7 @@ TX_INTERRUPT_SAVE_AREA
     _lx_nor_flash_opened_count++;
 
     /* Restore interrupts.  */
-    TX_RESTORE
+    LX_RESTORE
 
     /* Return a successful completion.  */
     return(LX_SUCCESS);

common/src/lx_nor_flash_partial_defragment.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_partial_defragment                    PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -78,6 +78,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_partial_defragment(LX_NOR_FLASH *nor_flash, UINT max_blocks)

common/src/lx_nor_flash_physical_sector_allocate.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_physical_sector_allocate              PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -78,6 +78,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_physical_sector_allocate(LX_NOR_FLASH *nor_flash, ULONG logical_sector, ULONG **physical_sector_map_entry, ULONG **physical_sector_address)

common/src/lx_nor_flash_sector_mapping_cache_invalidate.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_sector_mapping_cache_invalidate       PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -74,6 +74,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _lx_nor_flash_sector_mapping_cache_invalidate(LX_NOR_FLASH *nor_flash, ULONG logical_sector)

common/src/lx_nor_flash_sector_read.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_sector_read                           PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -82,6 +82,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_sector_read(LX_NOR_FLASH *nor_flash, ULONG logical_sector, VOID *buffer)

common/src/lx_nor_flash_sector_release.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_sector_release                        PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -82,6 +82,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_sector_release(LX_NOR_FLASH *nor_flash, ULONG logical_sector)

common/src/lx_nor_flash_sector_write.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_sector_write                          PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -85,6 +85,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_sector_write(LX_NOR_FLASH *nor_flash, ULONG logical_sector, VOID *buffer)

common/src/lx_nor_flash_simulator.c

@@ -23,7 +23,6 @@
 
 /* Include necessary files.  */
 
-#include "tx_api.h"
 #include "lx_api.h"
 
 /* Define constants for the NOR flash simulation. */
@@ -157,7 +156,7 @@ ULONG   words;
     pointer =  (ULONG *) &nor_memory_area[0];
 
     /* Loop to erase block.  */
-    words =  sizeof(nor_memory_area)/sizeof(ULONG);
+    words =  sizeof(nor_memory_area)/(sizeof(ULONG));
     while (words--)
     {
         

common/src/lx_nor_flash_system_error.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
+#ifndef LX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#define LX_DISABLE_ERROR_CHECKING
 #endif
 
 
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_system_error                          PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -73,6 +73,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _lx_nor_flash_system_error(LX_NOR_FLASH *nor_flash, UINT error_code)

samples/demo_filex_nand_flash.c

@@ -40,20 +40,34 @@ FX_FILE                 my_file1;
 
 /* Define ThreadX global data structures.  */
 
+#ifndef LX_STANDALONE_ENABLE
 TX_THREAD       thread_0;
+#endif
 ULONG           thread_0_counter;
 
 
 int  main(void)
 {
-
     /* Enter the ThreadX kernel.  */
+#ifndef LX_STANDALONE_ENABLE
     tx_kernel_enter();
+#else
+
+    /* Initialize NAND flash.  */
+    lx_nand_flash_initialize();    
+    
+    /* Initialize FileX.  */
+    fx_system_initialize();
+
+    thread_0_entry(0);
+#endif
+
 }
 
 
 /* Define what the initial system looks like.  */
 
+#ifndef LX_STANDALONE_ENABLE
 void    tx_application_define(void *first_unused_memory)
 {
 
@@ -72,7 +86,7 @@ void    tx_application_define(void *first_unused_memory)
     /* Initialize FileX.  */
     fx_system_initialize();
 }
-
+#endif
 
 
 void    thread_0_entry(ULONG thread_input)

samples/demo_filex_nor_flash.c

@@ -39,20 +39,34 @@ FX_FILE         my_file;
 
 /* Define ThreadX global data structures.  */
 
+#ifndef LX_STANDALONE_ENABLE
 TX_THREAD       thread_0;
+#endif
 ULONG           thread_0_counter;
 
 
 int  main(void)
 {
-
     /* Enter the ThreadX kernel.  */
+#ifndef LX_STANDALONE_ENABLE
     tx_kernel_enter();
+#else
+
+    /* Initialize NOR flash.  */
+    lx_nor_flash_initialize();    
+    
+    /* Initialize FileX.  */
+    fx_system_initialize();
+
+    thread_0_entry(0);
+#endif
+
 }
 
 
 /* Define what the initial system looks like.  */
 
+#ifndef LX_STANDALONE_ENABLE
 void    tx_application_define(void *first_unused_memory)
 {
 
@@ -70,6 +84,7 @@ void    tx_application_define(void *first_unused_memory)
     /* Initialize FileX.  */
     fx_system_initialize();
 }
+#endif