Skip to content

Commit a46b74f

Browse files
authored
Merge pull request #69 from eclipse-threadx/dev
Merge changes ahead of the v6.5.0.202601 release
2 parents 1751446 + b80f28e commit a46b74f

File tree

71 files changed

+3147
-3737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3147
-3737
lines changed

common/inc/lx_api.h

Lines changed: 41 additions & 96 deletions
Large diffs are not rendered by default.

common/inc/lx_user_sample.h

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -39,46 +40,29 @@
3940
/* Note that all the defines in this file may also be made on the */
4041
/* command line when building LevelX library and application objects. */
4142
/* */
42-
/* RELEASE HISTORY */
43-
/* */
44-
/* DATE NAME DESCRIPTION */
45-
/* */
46-
/* 11-09-2020 William E. Lamie Initial Version 6.1.2 */
47-
/* 06-02-2021 Bhupendra Naphade Modified comment(s), and */
48-
/* added standalone support, */
49-
/* resulting in version 6.1.7 */
50-
/* 03-08-2023 Xiuwen Cai Modified comment(s), and */
51-
/* added new NAND options, */
52-
/* resulting in version 6.2.1 */
53-
/* 10-31-2023 Xiuwen Cai Modified comment(s), */
54-
/* added options for mapping , */
55-
/* bitmap cache and obsolete */
56-
/* count cache, */
57-
/* resulting in version 6.3.0 */
58-
/* */
5943
/**************************************************************************/
6044

6145
#ifndef LX_USER_H
6246
#define LX_USER_H
6347

6448

6549

66-
/* Defined, this option bypasses the NOR flash driver read routine in favor or reading
67-
the NOR memory directly, resulting in a significant performance increase.
50+
/* Defined, this option bypasses the NOR flash driver read routine in favor or reading
51+
the NOR memory directly, resulting in a significant performance increase.
6852
*/
6953
/*
7054
#define LX_DIRECT_READ
7155
*/
7256

7357

74-
/* Defined, this causes the LevelX NOR instance open logic to verify free NOR
58+
/* Defined, this causes the LevelX NOR instance open logic to verify free NOR
7559
sectors are all ones.
7660
*/
7761
/*
78-
#define LX_FREE_SECTOR_DATA_VERIFY
62+
#define LX_FREE_SECTOR_DATA_VERIFY
7963
*/
8064

81-
/* By default this value is 4, which represents a maximum of 4 blocks that
65+
/* By default this value is 4, which represents a maximum of 4 blocks that
8266
can be allocated for metadata.
8367
*/
8468
/*
@@ -90,23 +74,23 @@
9074
#define LX_NOR_DISABLE_EXTENDED_CACHE
9175
*/
9276

93-
/* By default this value is 8, which represents a maximum of 8 sectors that
77+
/* By default this value is 8, which represents a maximum of 8 sectors that
9478
can be cached in a NOR instance.
9579
*/
9680
/*
97-
#define LX_NOR_EXTENDED_CACHE_SIZE 8
81+
#define LX_NOR_EXTENDED_CACHE_SIZE 8
9882
*/
9983

10084

101-
/* By default this value is 16 and defines the logical sector mapping cache size.
102-
Large values improve performance, but cost memory. The minimum size is 8 and all
85+
/* By default this value is 16 and defines the logical sector mapping cache size.
86+
Large values improve performance, but cost memory. The minimum size is 8 and all
10387
values must be a power of 2.
10488
*/
10589
/*
10690
#define LX_NOR_SECTOR_MAPPING_CACHE_SIZE 16
10791
*/
10892

109-
/* Defined, this makes LevelX thread-safe by using a ThreadX mutex object
93+
/* Defined, this makes LevelX thread-safe by using a ThreadX mutex object
11094
throughout the API.
11195
*/
11296
/*
@@ -118,34 +102,34 @@
118102
/* #define LX_STANDALONE_ENABLE */
119103

120104
/* Define user extension for NOR flash control block. User extension is placed at the end of flash control block and it is not cleared on opening flash. */
121-
/*
105+
/*
122106
#define LX_NOR_FLASH_USER_EXTENSION ????
123107
*/
124108

125109
/* Define user extension for NAND flash control block. User extension is placed at the end of flash control block and it is not cleared on opening flash. */
126-
/*
110+
/*
127111
#define LX_NAND_FLASH_USER_EXTENSION ????
128112
*/
129113

130-
/* Determine if logical sector mapping bitmap should be enabled in extended cache.
114+
/* Determine if logical sector mapping bitmap should be enabled in extended cache.
131115
Cache memory will be allocated to sector mapping bitmap first. One bit can be allocated for each physical sector. */
132-
/*
116+
/*
133117
#define LX_NOR_ENABLE_MAPPING_BITMAP
134118
*/
135119

136-
/* Determine if obsolete count cache should be enabled in extended cache.
137-
Cache memory will be allocated to obsolete count cache after the mapping bitmap if enabled,
120+
/* Determine if obsolete count cache should be enabled in extended cache.
121+
Cache memory will be allocated to obsolete count cache after the mapping bitmap if enabled,
138122
and the rest of the cache memory is allocated to sector cache. */
139-
/*
123+
/*
140124
#define LX_NOR_ENABLE_OBSOLETE_COUNT_CACHE
141125
*/
142126

143127
/* Defines obsolete count cache element size. If number of sectors per block is greater than 256, use USHORT instead of UCHAR. */
144-
/*
128+
/*
145129
#define LX_NOR_OBSOLETE_COUNT_CACHE_TYPE UCHAR
146130
*/
147131

148-
/* Define the logical sector size for NOR flash. The sector size is in units of 32-bit words.
132+
/* Define the logical sector size for NOR flash. The sector size is in units of 32-bit words.
149133
This sector size should match the sector size used in file system. */
150134
/*
151135
#define LX_NOR_SECTOR_SIZE (512/sizeof(ULONG))

0 commit comments

Comments
 (0)