Kaynağa Gözat

Release 6.1.7

Bo Chen 4 yıl önce
ebeveyn
işleme
d4089f56e3
56 değiştirilmiş dosya ile 399 ekleme ve 176 silme
  1. 32 5
      CMakeLists.txt
  2. 66 2
      common/inc/lx_api.h
  3. 8 1
      common/inc/lx_user_sample.h
  4. 3 2
      common/src/fx_nand_flash_simulated_driver.c
  5. 3 2
      common/src/fx_nor_flash_simulator_driver.c
  6. 5 3
      common/src/lx_nand_flash_256byte_ecc_check.c
  7. 5 3
      common/src/lx_nand_flash_256byte_ecc_compute.c
  8. 5 3
      common/src/lx_nand_flash_block_full_update.c
  9. 5 3
      common/src/lx_nand_flash_block_obsoleted_check.c
  10. 5 3
      common/src/lx_nand_flash_block_reclaim.c
  11. 8 6
      common/src/lx_nand_flash_close.c
  12. 5 3
      common/src/lx_nand_flash_defragment.c
  13. 5 3
      common/src/lx_nand_flash_driver_block_erase.c
  14. 5 3
      common/src/lx_nand_flash_driver_block_erased_verify.c
  15. 5 3
      common/src/lx_nand_flash_driver_block_status_get.c
  16. 5 3
      common/src/lx_nand_flash_driver_block_status_set.c
  17. 5 3
      common/src/lx_nand_flash_driver_extra_bytes_get.c
  18. 5 3
      common/src/lx_nand_flash_driver_extra_bytes_set.c
  19. 5 3
      common/src/lx_nand_flash_driver_page_erased_verify.c
  20. 5 3
      common/src/lx_nand_flash_driver_read.c
  21. 5 3
      common/src/lx_nand_flash_driver_write.c
  22. 9 7
      common/src/lx_nand_flash_extended_cache_enable.c
  23. 5 3
      common/src/lx_nand_flash_logical_sector_find.c
  24. 5 3
      common/src/lx_nand_flash_next_block_to_erase_find.c
  25. 10 8
      common/src/lx_nand_flash_open.c
  26. 5 3
      common/src/lx_nand_flash_page_ecc_check.c
  27. 5 3
      common/src/lx_nand_flash_page_ecc_compute.c
  28. 5 3
      common/src/lx_nand_flash_partial_defragment.c
  29. 5 3
      common/src/lx_nand_flash_physical_page_allocate.c
  30. 5 3
      common/src/lx_nand_flash_sector_mapping_cache_invalidate.c
  31. 5 3
      common/src/lx_nand_flash_sector_read.c
  32. 5 3
      common/src/lx_nand_flash_sector_release.c
  33. 5 3
      common/src/lx_nand_flash_sector_write.c
  34. 0 1
      common/src/lx_nand_flash_simulator.c
  35. 5 3
      common/src/lx_nand_flash_system_error.c
  36. 5 3
      common/src/lx_nor_flash_block_reclaim.c
  37. 8 6
      common/src/lx_nor_flash_close.c
  38. 5 3
      common/src/lx_nor_flash_defragment.c
  39. 5 3
      common/src/lx_nor_flash_driver_block_erase.c
  40. 5 3
      common/src/lx_nor_flash_driver_read.c
  41. 5 3
      common/src/lx_nor_flash_driver_write.c
  42. 6 3
      common/src/lx_nor_flash_extended_cache_enable.c
  43. 3 1
      common/src/lx_nor_flash_initialize.c
  44. 5 3
      common/src/lx_nor_flash_logical_sector_find.c
  45. 5 3
      common/src/lx_nor_flash_next_block_to_erase_find.c
  46. 11 8
      common/src/lx_nor_flash_open.c
  47. 5 3
      common/src/lx_nor_flash_partial_defragment.c
  48. 5 3
      common/src/lx_nor_flash_physical_sector_allocate.c
  49. 5 3
      common/src/lx_nor_flash_sector_mapping_cache_invalidate.c
  50. 5 3
      common/src/lx_nor_flash_sector_read.c
  51. 5 3
      common/src/lx_nor_flash_sector_release.c
  52. 5 3
      common/src/lx_nor_flash_sector_write.c
  53. 0 1
      common/src/lx_nor_flash_simulator.c
  54. 5 3
      common/src/lx_nor_flash_system_error.c
  55. 16 2
      samples/demo_filex_nand_flash.c
  56. 16 1
      samples/demo_filex_nor_flash.c

+ 32 - 5
CMakeLists.txt

@@ -6,6 +6,8 @@ project(levelx
     LANGUAGES C ASM
 )
 
+option(LX_STANDALONE_ENABLE "Enable LevelX in standalone mode" OFF)
+
 if(NOT DEFINED THREADX_ARCH)
     message(FATAL_ERROR "Error: THREADX_ARCH not defined")
 endif()
@@ -19,14 +21,38 @@ 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 
-    "azrtos::threadx"
-    "azrtos::filex"
-)
+if(NOT LX_STANDALONE_ENABLE)
+    target_link_libraries(${PROJECT_NAME} PUBLIC 
+        "azrtos::threadx")
+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
@@ -39,4 +65,5 @@ set(CPACK_SOURCE_IGNORE_FILES
   ".*~$"
 )
 set(CPACK_VERBATIM_VARIABLES YES)
-include(CPack)
+include(CPack)
+

+ 66 - 2
common/inc/lx_api.h

@@ -26,7 +26,7 @@
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*                                                                        */
 /*    lx_api.h                                            PORTABLE C      */
-/*                                                           6.1.3        */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -52,6 +52,9 @@
 /*  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  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -71,7 +74,9 @@ extern   "C" {
 
 /* Include necessary system files.  */
 
+#ifndef LX_STANDALONE_ENABLE
 #include "tx_api.h"
+#endif
 
 /* Determine if the optional LevelX user define file should be used.  */
 
@@ -85,6 +90,65 @@ extern   "C" {
 #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
 #define LX_PARAMETER_NOT_USED(p) ((void)(p))
@@ -95,7 +159,7 @@ extern   "C" {
 #define AZURE_RTOS_LEVELX
 #define LEVELX_MAJOR_VERSION                        6
 #define LEVELX_MINOR_VERSION                        1
-#define LEVELX_PATCH_VERSION                        3
+#define LEVELX_PATCH_VERSION                        7
 
 
 /* Define general LevelX Constants.  */

+ 8 - 1
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

+ 3 - 2
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)

+ 3 - 2
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)

+ 5 - 3
common/src/lx_nand_flash_256byte_ecc_check.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_256byte_ecc_compute.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_block_full_update.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_block_obsoleted_check.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -84,6 +84,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_block_obsoleted_check(LX_NAND_FLASH *nand_flash, ULONG block)

+ 5 - 3
common/src/lx_nand_flash_block_reclaim.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -86,6 +86,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_reclaim(LX_NAND_FLASH *nand_flash)

+ 8 - 6
common/src/lx_nand_flash_close.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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
 

+ 5 - 3
common/src/lx_nand_flash_defragment.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_block_erase.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_block_erased_verify.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_block_status_get.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_block_status_set.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_extra_bytes_get.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_extra_bytes_set.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_page_erased_verify.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_read.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_driver_write.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 9 - 7
common/src/lx_nand_flash_extended_cache_enable.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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_page_extra_bytes_cache =  TX_NULL;
-        nand_flash -> lx_nand_flash_page_0_cache =            TX_NULL;
+        nand_flash -> lx_nand_flash_block_status_cache =      LX_NULL;
+        nand_flash -> lx_nand_flash_page_extra_bytes_cache =  LX_NULL;
+        nand_flash -> lx_nand_flash_page_0_cache =            LX_NULL;
         
         /* Return success!  */
         return(LX_SUCCESS);   

+ 5 - 3
common/src/lx_nand_flash_logical_sector_find.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_next_block_to_erase_find.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 10 - 8
common/src/lx_nand_flash_open.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -92,6 +92,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_open(LX_NAND_FLASH  *nand_flash, CHAR *name, UINT (*nand_driver_initialize)(LX_NAND_FLASH *))
@@ -115,12 +117,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);
@@ -905,7 +907,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 +929,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 +968,7 @@ TX_INTERRUPT_SAVE_AREA
     _lx_nand_flash_opened_count++;
 
     /* Restore interrupts.  */
-    TX_RESTORE
+    LX_RESTORE
 
     /* Return a successful completion.  */
     return(LX_SUCCESS);

+ 5 - 3
common/src/lx_nand_flash_page_ecc_check.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_page_ecc_compute.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_partial_defragment.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_physical_page_allocate.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_sector_mapping_cache_invalidate.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_sector_read.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_sector_release.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nand_flash_sector_write.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 0 - 1
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. */

+ 5 - 3
common/src/lx_nand_flash_system_error.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_block_reclaim.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 8 - 6
common/src/lx_nor_flash_close.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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
 

+ 5 - 3
common/src/lx_nor_flash_defragment.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_driver_block_erase.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_driver_read.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_driver_write.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 6 - 3
common/src/lx_nor_flash_extended_cache_enable.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -77,6 +77,9 @@
 /*  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  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nor_flash_extended_cache_enable(LX_NOR_FLASH *nor_flash, VOID *memory, ULONG size)

+ 3 - 1
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)

+ 5 - 3
common/src/lx_nor_flash_logical_sector_find.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_next_block_to_erase_find.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 11 - 8
common/src/lx_nor_flash_open.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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);

+ 5 - 3
common/src/lx_nor_flash_partial_defragment.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_physical_sector_allocate.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_sector_mapping_cache_invalidate.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_sector_read.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_sector_release.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 5 - 3
common/src/lx_nor_flash_sector_write.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 0 - 1
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. */

+ 5 - 3
common/src/lx_nor_flash_system_error.c

@@ -25,8 +25,8 @@
 
 /* Disable ThreadX error checking.  */
 
-#ifndef TX_DISABLE_ERROR_CHECKING
-#define TX_DISABLE_ERROR_CHECKING
+#ifndef LX_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)

+ 16 - 2
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)

+ 16 - 1
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 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)
 {
 
@@ -70,6 +84,7 @@ void    tx_application_define(void *first_unused_memory)
     /* Initialize FileX.  */
     fx_system_initialize();
 }
+#endif