Explorar el Código

update to v6.1.3

Scott Larson hace 5 años
padre
commit
6eadbd6d97

+ 5 - 2
common/inc/lx_api.h

@@ -26,7 +26,7 @@
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*                                                                        */
 /*                                                                        */
 /*    lx_api.h                                            PORTABLE C      */
 /*    lx_api.h                                            PORTABLE C      */
-/*                                                           6.1.2        */
+/*                                                           6.1.3        */
 /*  AUTHOR                                                                */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -49,6 +49,9 @@
 /*                                            added support for lx_user.h */
 /*                                            added support for lx_user.h */
 /*                                            so user can specify values, */
 /*                                            so user can specify values, */
 /*                                            resulting in version 6.1.2  */
 /*                                            resulting in version 6.1.2  */
+/*  12-31-2020     William E. Lamie         Modified comment(s), and      */
+/*                                            updated product constants,  */
+/*                                            resulting in version 6.1.3  */
 /*                                                                        */
 /*                                                                        */
 /**************************************************************************/
 /**************************************************************************/
 
 
@@ -92,7 +95,7 @@ extern   "C" {
 #define AZURE_RTOS_LEVELX
 #define AZURE_RTOS_LEVELX
 #define LEVELX_MAJOR_VERSION                        6
 #define LEVELX_MAJOR_VERSION                        6
 #define LEVELX_MINOR_VERSION                        1
 #define LEVELX_MINOR_VERSION                        1
-#define LEVELX_PATCH_VERSION                        2
+#define LEVELX_PATCH_VERSION                        3
 
 
 
 
 /* Define general LevelX Constants.  */
 /* Define general LevelX Constants.  */

+ 8 - 1
common/src/lx_nor_flash_extended_cache_enable.c

@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_extended_cache_enable                 PORTABLE C      */ 
 /*    _lx_nor_flash_extended_cache_enable                 PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.3        */
 /*  AUTHOR                                                                */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -74,6 +74,9 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*  09-30-2020     William E. Lamie         Modified comment(s),          */
 /*                                            resulting in version 6.1    */
 /*                                            resulting in version 6.1    */
+/*  12-31-2020     William E. Lamie         Modified comment(s),          */
+/*                                            fixed compiler warnings,    */
+/*                                            resulting in version 6.1.3  */
 /*                                                                        */
 /*                                                                        */
 /**************************************************************************/
 /**************************************************************************/
 UINT  _lx_nor_flash_extended_cache_enable(LX_NOR_FLASH *nor_flash, VOID *memory, ULONG size)
 UINT  _lx_nor_flash_extended_cache_enable(LX_NOR_FLASH *nor_flash, VOID *memory, ULONG size)
@@ -141,6 +144,10 @@ ULONG   *cache_memory;
     return(LX_SUCCESS);
     return(LX_SUCCESS);
 #else
 #else
 
 
+    LX_PARAMETER_NOT_USED(nor_flash);
+    LX_PARAMETER_NOT_USED(memory);
+    LX_PARAMETER_NOT_USED(size);
+
     /* Return disabled error message.  */
     /* Return disabled error message.  */
     return(LX_DISABLED);
     return(LX_DISABLED);
 #endif
 #endif

+ 5 - 2
common/src/lx_nor_flash_open.c

@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*                                                                        */ 
 /*    _lx_nor_flash_open                                  PORTABLE C      */ 
 /*    _lx_nor_flash_open                                  PORTABLE C      */ 
-/*                                                           6.1.2        */
+/*                                                           6.1.3        */
 /*  AUTHOR                                                                */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -86,6 +86,9 @@
 /*  11-09-2020     William E. Lamie         Modified comment(s),          */
 /*  11-09-2020     William E. Lamie         Modified comment(s),          */
 /*                                            fixed compiler warnings,    */
 /*                                            fixed compiler warnings,    */
 /*                                            resulting in version 6.1.2  */
 /*                                            resulting in version 6.1.2  */
+/*  12-30-2020     William E. Lamie         Modified comment(s),          */
+/*                                            fixed compiler warnings,    */
+/*                                            resulting in version 6.1.3  */
 /*                                                                        */
 /*                                                                        */
 /**************************************************************************/
 /**************************************************************************/
 UINT  _lx_nor_flash_open(LX_NOR_FLASH  *nor_flash, CHAR *name, UINT (*nor_driver_initialize)(LX_NOR_FLASH *))
 UINT  _lx_nor_flash_open(LX_NOR_FLASH  *nor_flash, CHAR *name, UINT (*nor_driver_initialize)(LX_NOR_FLASH *))
@@ -751,7 +754,7 @@ TX_INTERRUPT_SAVE_AREA
                             /* Read the word directly.  */
                             /* Read the word directly.  */
                             sector_word =  *(sector_word_ptr);
                             sector_word =  *(sector_word_ptr);
 #else
 #else
-                            status =  _lx_nor_flash_driver_read((sector_word_ptr), &sector_word, 1);
+                            status =  _lx_nor_flash_driver_read(nor_flash, (sector_word_ptr), &sector_word, 1);
 
 
                             /* Check for an error from flash driver. Drivers should never return an error..  */
                             /* Check for an error from flash driver. Drivers should never return an error..  */
                             if (status)
                             if (status)