Skip to content

Commit 3ce6770

Browse files
kapi-nogalak
kapi-no
authored and
galak
committed
tests: drivers: flash_simulator: removing CONFIG_ prefix from defines
Removed the CONFIG_ prefix from definitions, which are declared in the test source file. They could be easily confused with Kconfig definitions. Signed-off-by: Kamil Piszczek <[email protected]>
1 parent 5fd99f5 commit 3ce6770

File tree

1 file changed

+51
-51
lines changed
  • tests/drivers/flash_simulator/src

1 file changed

+51
-51
lines changed

‎tests/drivers/flash_simulator/src/main.c‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
#include <device.h>
1010

1111
/* configuration derived from DT */
12-
#define CONFIG_FLASH_SIMULATOR_BASE_OFFSET DT_FLASH_BASE_ADDRESS
13-
#define CONFIG_FLASH_SIMULATOR_ERASE_UNIT DT_FLASH_ERASE_BLOCK_SIZE
14-
#define CONFIG_FLASH_SIMULATOR_PROG_UNIT DT_FLASH_WRITE_BLOCK_SIZE
15-
#define CONFIG_FLASH_SIMULATOR_FLASH_SIZE DT_FLASH_SIZE
12+
#define FLASH_SIMULATOR_BASE_OFFSET DT_FLASH_BASE_ADDRESS
13+
#define FLASH_SIMULATOR_ERASE_UNIT DT_FLASH_ERASE_BLOCK_SIZE
14+
#define FLASH_SIMULATOR_PROG_UNIT DT_FLASH_WRITE_BLOCK_SIZE
15+
#define FLASH_SIMULATOR_FLASH_SIZE DT_FLASH_SIZE
1616

1717
/* Offset between pages */
18-
#define TEST_SIM_FLASH_SIZE (CONFIG_FLASH_SIMULATOR_ERASE_UNIT *\
19-
CONFIG_FLASH_SIMULATOR_FLASH_SIZE)
18+
#define TEST_SIM_FLASH_SIZE (FLASH_SIMULATOR_ERASE_UNIT *\
19+
FLASH_SIMULATOR_FLASH_SIZE)
2020

2121
#define TEST_SIM_FLASH_END (TEST_SIM_FLASH_SIZE +\
22-
CONFIG_FLASH_SIMULATOR_BASE_OFFSET)
22+
FLASH_SIMULATOR_BASE_OFFSET)
2323

2424
static struct device *flash_dev;
2525
static u8_t test_read_buf[TEST_SIM_FLASH_SIZE];
@@ -69,7 +69,7 @@ static void test_int(void)
6969
zassert_true(flash_dev != NULL,
7070
"Simulated flash driver was not found!");
7171

72-
rc = flash_read(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET,
72+
rc = flash_read(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
7373
test_read_buf, sizeof(test_read_buf));
7474
zassert_equal(0, rc, "flash_read should succedd");
7575

@@ -89,19 +89,19 @@ static void test_write_read(void)
8989
for (off = 0; off < TEST_SIM_FLASH_SIZE; off += 4) {
9090
rc = flash_write_protection_set(flash_dev, false);
9191
zassert_equal(0, rc, NULL);
92-
rc = flash_write(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET +
92+
rc = flash_write(flash_dev, FLASH_SIMULATOR_BASE_OFFSET +
9393
off,
9494
&val32, sizeof(val32));
9595
zassert_equal(0, rc,
9696
"flash_write (%d) should succedd at off 0x%x", rc,
97-
CONFIG_FLASH_SIMULATOR_BASE_OFFSET + off);
97+
FLASH_SIMULATOR_BASE_OFFSET + off);
9898
val32++;
9999
}
100100

101101
val32 = 0;
102102

103103
for (off = 0; off < TEST_SIM_FLASH_SIZE; off += 4) {
104-
rc = flash_read(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET +
104+
rc = flash_read(flash_dev, FLASH_SIMULATOR_BASE_OFFSET +
105105
off,
106106
&r_val32, sizeof(r_val32));
107107
zassert_equal(0, rc, "flash_write should succedd");
@@ -116,28 +116,28 @@ static void test_erase(void)
116116
{
117117
int rc;
118118

119-
rc = flash_erase(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET +
120-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT,
121-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT);
119+
rc = flash_erase(flash_dev, FLASH_SIMULATOR_BASE_OFFSET +
120+
FLASH_SIMULATOR_ERASE_UNIT,
121+
FLASH_SIMULATOR_ERASE_UNIT);
122122
zassert_equal(0, rc, "flash_erase should succedd");
123123

124124
TC_PRINT("Incremental pattern expected\n");
125125
pattern32_ini(0);
126-
test_check_pattern32(CONFIG_FLASH_SIMULATOR_BASE_OFFSET, pattern32_inc,
127-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT);
126+
test_check_pattern32(FLASH_SIMULATOR_BASE_OFFSET, pattern32_inc,
127+
FLASH_SIMULATOR_ERASE_UNIT);
128128

129129
TC_PRINT("Erased area expected\n");
130130
pattern32_ini(0xffffffff);
131-
test_check_pattern32(CONFIG_FLASH_SIMULATOR_BASE_OFFSET +
132-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT, pattern32_flat,
133-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT);
131+
test_check_pattern32(FLASH_SIMULATOR_BASE_OFFSET +
132+
FLASH_SIMULATOR_ERASE_UNIT, pattern32_flat,
133+
FLASH_SIMULATOR_ERASE_UNIT);
134134

135135
TC_PRINT("Incremental pattern expected\n");
136-
pattern32_ini(CONFIG_FLASH_SIMULATOR_ERASE_UNIT*2 /
137-
CONFIG_FLASH_SIMULATOR_PROG_UNIT);
138-
test_check_pattern32(CONFIG_FLASH_SIMULATOR_BASE_OFFSET +
139-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT*2, pattern32_inc,
140-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT*2);
136+
pattern32_ini(FLASH_SIMULATOR_ERASE_UNIT*2 /
137+
FLASH_SIMULATOR_PROG_UNIT);
138+
test_check_pattern32(FLASH_SIMULATOR_BASE_OFFSET +
139+
FLASH_SIMULATOR_ERASE_UNIT*2, pattern32_inc,
140+
FLASH_SIMULATOR_ERASE_UNIT*2);
141141
}
142142

143143
static void test_access(void)
@@ -148,12 +148,12 @@ static void test_access(void)
148148
rc = flash_write_protection_set(flash_dev, true);
149149
zassert_equal(0, rc, NULL);
150150

151-
rc = flash_write(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET,
151+
rc = flash_write(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
152152
data, 4);
153153
zassert_equal(-EACCES, rc, "Unexpected error code (%d)", rc);
154154

155-
rc = flash_erase(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET,
156-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT);
155+
rc = flash_erase(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
156+
FLASH_SIMULATOR_ERASE_UNIT);
157157
zassert_equal(-EACCES, rc, "Unexpected error code (%d)", rc);
158158
}
159159

@@ -164,11 +164,11 @@ static void test_out_of_bounds(void)
164164

165165
rc = flash_write_protection_set(flash_dev, false);
166166

167-
rc = flash_write(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET - 4,
167+
rc = flash_write(flash_dev, FLASH_SIMULATOR_BASE_OFFSET - 4,
168168
data, 4);
169169
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
170170

171-
rc = flash_write(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET - 4,
171+
rc = flash_write(flash_dev, FLASH_SIMULATOR_BASE_OFFSET - 4,
172172
data, 8);
173173
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
174174

@@ -180,30 +180,30 @@ static void test_out_of_bounds(void)
180180
data, 8);
181181
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
182182

183-
rc = flash_erase(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET -
184-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT,
185-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT);
183+
rc = flash_erase(flash_dev, FLASH_SIMULATOR_BASE_OFFSET -
184+
FLASH_SIMULATOR_ERASE_UNIT,
185+
FLASH_SIMULATOR_ERASE_UNIT);
186186
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
187187

188188
rc = flash_erase(flash_dev, TEST_SIM_FLASH_END,
189-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT);
189+
FLASH_SIMULATOR_ERASE_UNIT);
190190
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
191191

192-
rc = flash_erase(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET -
193-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT*2,
194-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT*2);
192+
rc = flash_erase(flash_dev, FLASH_SIMULATOR_BASE_OFFSET -
193+
FLASH_SIMULATOR_ERASE_UNIT*2,
194+
FLASH_SIMULATOR_ERASE_UNIT*2);
195195
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
196196

197197
rc = flash_erase(flash_dev, TEST_SIM_FLASH_END -
198-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT,
199-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT*2);
198+
FLASH_SIMULATOR_ERASE_UNIT,
199+
FLASH_SIMULATOR_ERASE_UNIT*2);
200200
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
201201

202-
rc = flash_read(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET - 4,
202+
rc = flash_read(flash_dev, FLASH_SIMULATOR_BASE_OFFSET - 4,
203203
data, 4);
204204
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
205205

206-
rc = flash_read(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET - 4,
206+
rc = flash_read(flash_dev, FLASH_SIMULATOR_BASE_OFFSET - 4,
207207
data, 8);
208208
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
209209

@@ -220,25 +220,25 @@ static void test_align(void)
220220
int rc;
221221
u8_t data[4] = {0};
222222

223-
rc = flash_read(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET + 1,
223+
rc = flash_read(flash_dev, FLASH_SIMULATOR_BASE_OFFSET + 1,
224224
data, 4);
225225
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
226226

227-
rc = flash_write(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET + 1,
227+
rc = flash_write(flash_dev, FLASH_SIMULATOR_BASE_OFFSET + 1,
228228
data, 4);
229229
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
230230

231-
rc = flash_write(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET,
231+
rc = flash_write(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
232232
data, 3);
233233
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
234234

235-
rc = flash_erase(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET + 1,
236-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT);
235+
rc = flash_erase(flash_dev, FLASH_SIMULATOR_BASE_OFFSET + 1,
236+
FLASH_SIMULATOR_ERASE_UNIT);
237237

238238
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
239239

240-
rc = flash_erase(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET,
241-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT + 1);
240+
rc = flash_erase(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
241+
FLASH_SIMULATOR_ERASE_UNIT + 1);
242242

243243
zassert_equal(-EINVAL, rc, "Unexpected error code (%d)", rc);
244244
}
@@ -248,15 +248,15 @@ static void test_double_write(void)
248248
int rc;
249249
u8_t data[4] = {0};
250250

251-
rc = flash_erase(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET,
252-
CONFIG_FLASH_SIMULATOR_ERASE_UNIT);
251+
rc = flash_erase(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
252+
FLASH_SIMULATOR_ERASE_UNIT);
253253
zassert_equal(0, rc, "flash_erase should succedd");
254254

255-
rc = flash_write(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET,
255+
rc = flash_write(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
256256
data, 4);
257257
zassert_equal(0, rc, "flash_write should succedd");
258258

259-
rc = flash_write(flash_dev, CONFIG_FLASH_SIMULATOR_BASE_OFFSET,
259+
rc = flash_write(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
260260
data, 4);
261261
zassert_equal(-EIO, rc, "Unexpected error code (%d)", rc);
262262
}

0 commit comments

Comments
 (0)