diff --git a/test/mfs/configuration.xml b/test/mfs/configuration.xml
index 5e0b64cff..979f60655 100644
--- a/test/mfs/configuration.xml
+++ b/test/mfs/configuration.xml
@@ -42,7 +42,7 @@
extern mfs_nocache_buffer_t __nocache_mfsbuf1;
extern const MFSConfig mfscfg1;
extern MFSDriver mfs1;
-extern uint8_t mfs_buffer[512];
+extern uint8_t __nocache_mfs_buffer[512];
extern const uint8_t mfs_pattern16[16];
extern const uint8_t mfs_pattern32[32];
extern const uint8_t mfs_pattern10[10];
@@ -57,7 +57,7 @@ void test_print_mfs_info(void);]]>
mfs_nocache_buffer_t __nocache_mfsbuf1;
MFSDriver mfs1;
-uint8_t mfs_buffer[512];
+uint8_t __nocache_mfs_buffer[512];
const uint8_t mfs_pattern16[16] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
@@ -291,8 +291,8 @@ mfs_id_t id;
size_t size;
for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND,
"found a record that should not exists");
}]]>
@@ -332,8 +332,8 @@ for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {
-
@@ -351,11 +351,11 @@ test_assert(err == MFS_ERR_NOT_FOUND , "record was already present");]]>
err = mfsWriteRecord(&mfs1, 1, sizeof mfs_pattern16, mfs_pattern16);
test_assert(err == MFS_NO_ERROR, "error creating the record");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
-test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");]]>
+test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");]]>
@@ -372,11 +372,11 @@ test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content"
err = mfsWriteRecord(&mfs1, 1, sizeof mfs_pattern32, mfs_pattern32);
test_assert(err == MFS_NO_ERROR, "error updating the record");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern32, "unexpected record length");
-test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content");]]>
+test_assert(memcmp(mfs_pattern32, __nocache_mfs_buffer, size) == 0, "wrong record content");]]>
@@ -393,8 +393,8 @@ test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content"
err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");]]>
@@ -456,14 +456,14 @@ test_assert(err == MFS_NO_ERROR, "error creating record 3");]]>
@@ -480,14 +480,14 @@ size_t size;
err = mfsStart(&mfs1, &mfscfg1);
test_assert(err == MFS_NO_ERROR, "re-mount failed");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 0 not present");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 1 not present");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 2 not present");]]>
@@ -506,14 +506,14 @@ size_t size;
err = mfsErase(&mfs1);
test_assert(err == MFS_NO_ERROR, "storage erase error");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record 0 still present");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record 1 still present");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record 2 still present");]]>
@@ -563,13 +563,13 @@ for (id = 1; id <= id_max; id++) {
err = mfsWriteRecord(&mfs1, id, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_NO_ERROR, "error creating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR,
"record not found");
test_assert(size == sizeof mfs_pattern512,
"unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}]]>
@@ -682,13 +682,13 @@ for (id = 1; id <= id_max; id++) {
err = mfsWriteRecord(&mfs1, id, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_NO_ERROR, "error creating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR,
"record not found");
test_assert(size == sizeof mfs_pattern512,
"unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}]]>
@@ -707,8 +707,8 @@ size_t size;
err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");]]>
@@ -729,11 +729,11 @@ test_assert(mfs1.current_counter == 1, "not first instance");
err = mfsWriteRecord(&mfs1, 1, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_WARN_GC, "error creating the record");
test_assert(mfs1.current_counter == 2, "not second instance");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern512, "unexpected record length");
-test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
test_assert(mfs1.current_bank == MFS_BANK_1, "unexpected bank");
test_assert(bank_verify_erased(MFS_BANK_0) == FLASH_NO_ERROR, "bank 0 not erased");]]>
@@ -758,16 +758,16 @@ for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {
size_t size;
if (id <= id_max) {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern512, "unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}
else {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "found unexpected record");
}
}]]>
@@ -787,8 +787,8 @@ size_t size;
err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");]]>
@@ -810,11 +810,11 @@ test_assert(mfs1.current_counter == 2, "not second instance");
err = mfsWriteRecord(&mfs1, 1, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_WARN_GC, "error creating the record");
test_assert(mfs1.current_counter == 3, "not third instance");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern512, "unexpected record length");
-test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
test_assert(mfs1.current_bank == MFS_BANK_0, "unexpected bank");
test_assert(bank_verify_erased(MFS_BANK_1) == FLASH_NO_ERROR, "bank 1 not erased");]]>
@@ -839,16 +839,16 @@ for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {
size_t size;
if (id <= id_max) {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern512, "unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}
else {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "found unexpected record");
}
}]]>
@@ -901,11 +901,11 @@ for (id = 1; id <= id_max; id++) {
err = mfsWriteRecord(&mfs1, id, (sizeof mfs_pattern512 / 4), mfs_pattern512);
test_assert(err == MFS_NO_ERROR, "error creating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == (sizeof mfs_pattern512 / 4), "unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}]]>
@@ -932,8 +932,8 @@ mfs_id_t n = ((mfscfg1.bank_size - sizeof (mfs_bank_header_t)) -
for (id = 1; id <= n; id++) {
err = mfsEraseRecord(&mfs1, id);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");
}]]>
@@ -958,8 +958,8 @@ test_assert(mfs1.current_counter == 1, "not first instance");
err = mfsEraseRecord(&mfs1, id_max);
test_assert(err == MFS_WARN_GC, "error erasing the record");
test_assert(mfs1.current_counter == 2, "not second instance");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, id_max, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, id_max, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");
test_assert(mfs1.current_bank == MFS_BANK_1, "unexpected bank");
test_assert(bank_verify_erased(MFS_BANK_0) == FLASH_NO_ERROR, "bank 0 not erased");]]>
@@ -1047,14 +1047,14 @@ test_assert(err == MFS_NO_ERROR, "error creating record 3");]]>
@@ -1089,11 +1089,11 @@ err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing record 1");
err = mfsWriteRecord(&mfs1, 2, sizeof mfs_pattern32, mfs_pattern32);
test_assert(err == MFS_NO_ERROR, "error writing record 2");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
-test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");]]>
+test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");]]>
@@ -1129,23 +1129,23 @@ used_space = mfs1.used_space;]]>
size_t size;
/* Record 1 must not be present.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record found");
/* Record 2 must contain the new value.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern32, "unexpected record length");
-test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content");
+test_assert(memcmp(mfs_pattern32, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Record 3 must be unchanged.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
-test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Checking internal data.*/
test_assert(MFS_BANK_0 == mfs1.current_bank, "internal data mismatch");
@@ -1180,23 +1180,23 @@ test_assert(err == MFS_NO_ERROR, "re-start failed");]]>
size_t size;
/* Record 1 must not be present.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record found");
/* Record 2 must contain the new value.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern32, "unexpected record length");
-test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content");
+test_assert(memcmp(mfs_pattern32, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Record 3 must be unchanged.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
-test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Checking internal data.*/
test_assert(MFS_BANK_0 == mfs1.current_bank, "internal data mismatch");
@@ -1233,23 +1233,23 @@ test_assert(err == MFS_NO_ERROR, "garbage collection failed");]]>
size_t size;
/* Record 1 must not be present.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record found");
/* Record 2 must contain the new value.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern32, "unexpected record length");
-test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content");
+test_assert(memcmp(mfs_pattern32, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Record 3 must be unchanged.*/
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
-test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Checking internal data.*/
test_assert(MFS_BANK_1 == mfs1.current_bank, "internal data mismatch");
@@ -1317,14 +1317,14 @@ test_assert(err == MFS_NO_ERROR, "error creating record 3");]]>
@@ -1360,11 +1360,11 @@ err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing record 1");
err = mfsWriteRecord(&mfs1, 2, sizeof mfs_pattern32, mfs_pattern32);
test_assert(err == MFS_NO_ERROR, "error writing record 2");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
-test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Saving some internal state for successive checks.*/
current_counter = mfs1.current_counter;
@@ -1398,16 +1398,16 @@ test_assert(err == MFS_NO_ERROR, "error rolling back transaction");]]>
@@ -1490,8 +1490,8 @@ size_t size;
err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
-size = sizeof mfs_buffer;
-err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+size = sizeof __nocache_mfs_buffer;
+err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");]]>
@@ -1626,7 +1626,7 @@ test_assert(err == MFS_ERR_INV_STATE, "mfsErase() returned wrong status");]]>
-
@@ -1652,8 +1652,8 @@ test_assert(err == MFS_ERR_INV_STATE, "mfsEraseRecord() returned wrong status");
-
diff --git a/test/mfs/source/test/mfs_test_root.c b/test/mfs/source/test/mfs_test_root.c
index f7611ca8d..fd76ea661 100644
--- a/test/mfs/source/test/mfs_test_root.c
+++ b/test/mfs/source/test/mfs_test_root.c
@@ -67,7 +67,7 @@ const testsuite_t mfs_test_suite = {
mfs_nocache_buffer_t __nocache_mfsbuf1;
MFSDriver mfs1;
-uint8_t mfs_buffer[512];
+uint8_t __nocache_mfs_buffer[512];
const uint8_t mfs_pattern16[16] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
diff --git a/test/mfs/source/test/mfs_test_root.h b/test/mfs/source/test/mfs_test_root.h
index dc3f88352..7c7497f72 100644
--- a/test/mfs/source/test/mfs_test_root.h
+++ b/test/mfs/source/test/mfs_test_root.h
@@ -56,7 +56,7 @@ extern "C" {
extern mfs_nocache_buffer_t __nocache_mfsbuf1;
extern const MFSConfig mfscfg1;
extern MFSDriver mfs1;
-extern uint8_t mfs_buffer[512];
+extern uint8_t __nocache_mfs_buffer[512];
extern const uint8_t mfs_pattern16[16];
extern const uint8_t mfs_pattern32[32];
extern const uint8_t mfs_pattern10[10];
diff --git a/test/mfs/source/test/mfs_test_sequence_001.c b/test/mfs/source/test/mfs_test_sequence_001.c
index 7c0ccc551..be1437c89 100644
--- a/test/mfs/source/test/mfs_test_sequence_001.c
+++ b/test/mfs/source/test/mfs_test_sequence_001.c
@@ -152,8 +152,8 @@ static void mfs_test_001_002_execute(void) {
size_t size;
for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND,
"found a record that should not exists");
}
@@ -205,8 +205,8 @@ static void mfs_test_001_003_execute(void) {
expected.*/
test_set_step(1);
{
- size = sizeof mfs_buffer;
- mfs_error_t err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ mfs_error_t err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND , "record was already present");
}
test_end_step(1);
@@ -220,11 +220,11 @@ static void mfs_test_001_003_execute(void) {
err = mfsWriteRecord(&mfs1, 1, sizeof mfs_pattern16, mfs_pattern16);
test_assert(err == MFS_NO_ERROR, "error creating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
- test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
}
test_end_step(2);
@@ -237,11 +237,11 @@ static void mfs_test_001_003_execute(void) {
err = mfsWriteRecord(&mfs1, 1, sizeof mfs_pattern32, mfs_pattern32);
test_assert(err == MFS_NO_ERROR, "error updating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern32, "unexpected record length");
- test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern32, __nocache_mfs_buffer, size) == 0, "wrong record content");
}
test_end_step(3);
@@ -254,8 +254,8 @@ static void mfs_test_001_003_execute(void) {
err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");
}
test_end_step(4);
@@ -316,14 +316,14 @@ static void mfs_test_001_004_execute(void) {
mfs_error_t err;
size_t size;
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 0 not present");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 1 not present");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 2 not present");
}
test_end_step(2);
@@ -336,14 +336,14 @@ static void mfs_test_001_004_execute(void) {
err = mfsStart(&mfs1, &mfscfg1);
test_assert(err == MFS_NO_ERROR, "re-mount failed");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 0 not present");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 1 not present");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record 2 not present");
}
test_end_step(3);
@@ -358,14 +358,14 @@ static void mfs_test_001_004_execute(void) {
err = mfsErase(&mfs1);
test_assert(err == MFS_NO_ERROR, "storage erase error");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record 0 still present");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record 1 still present");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record 2 still present");
}
test_end_step(4);
@@ -421,13 +421,13 @@ static void mfs_test_001_005_execute(void) {
err = mfsWriteRecord(&mfs1, id, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_NO_ERROR, "error creating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR,
"record not found");
test_assert(size == sizeof mfs_pattern512,
"unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}
}
@@ -544,13 +544,13 @@ static void mfs_test_001_006_execute(void) {
err = mfsWriteRecord(&mfs1, id, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_NO_ERROR, "error creating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR,
"record not found");
test_assert(size == sizeof mfs_pattern512,
"unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}
}
@@ -564,8 +564,8 @@ static void mfs_test_001_006_execute(void) {
err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");
}
test_end_step(2);
@@ -582,11 +582,11 @@ static void mfs_test_001_006_execute(void) {
err = mfsWriteRecord(&mfs1, 1, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_WARN_GC, "error creating the record");
test_assert(mfs1.current_counter == 2, "not second instance");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern512, "unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
test_assert(mfs1.current_bank == MFS_BANK_1, "unexpected bank");
test_assert(bank_verify_erased(MFS_BANK_0) == FLASH_NO_ERROR, "bank 0 not erased");
@@ -607,16 +607,16 @@ static void mfs_test_001_006_execute(void) {
size_t size;
if (id <= id_max) {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern512, "unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}
else {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "found unexpected record");
}
}
@@ -631,8 +631,8 @@ static void mfs_test_001_006_execute(void) {
err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");
}
test_end_step(5);
@@ -649,11 +649,11 @@ static void mfs_test_001_006_execute(void) {
err = mfsWriteRecord(&mfs1, 1, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_WARN_GC, "error creating the record");
test_assert(mfs1.current_counter == 3, "not third instance");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern512, "unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
test_assert(mfs1.current_bank == MFS_BANK_0, "unexpected bank");
test_assert(bank_verify_erased(MFS_BANK_1) == FLASH_NO_ERROR, "bank 1 not erased");
@@ -674,16 +674,16 @@ static void mfs_test_001_006_execute(void) {
size_t size;
if (id <= id_max) {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern512, "unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}
else {
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "found unexpected record");
}
}
@@ -741,11 +741,11 @@ static void mfs_test_001_007_execute(void) {
err = mfsWriteRecord(&mfs1, id, (sizeof mfs_pattern512 / 4), mfs_pattern512);
test_assert(err == MFS_NO_ERROR, "error creating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == (sizeof mfs_pattern512 / 4), "unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}
}
@@ -767,8 +767,8 @@ static void mfs_test_001_007_execute(void) {
for (id = 1; id <= n; id++) {
err = mfsEraseRecord(&mfs1, id);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");
}
}
@@ -789,8 +789,8 @@ static void mfs_test_001_007_execute(void) {
err = mfsEraseRecord(&mfs1, id_max);
test_assert(err == MFS_WARN_GC, "error erasing the record");
test_assert(mfs1.current_counter == 2, "not second instance");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id_max, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id_max, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");
test_assert(mfs1.current_bank == MFS_BANK_1, "unexpected bank");
test_assert(bank_verify_erased(MFS_BANK_0) == FLASH_NO_ERROR, "bank 0 not erased");
diff --git a/test/mfs/source/test/mfs_test_sequence_002.c b/test/mfs/source/test/mfs_test_sequence_002.c
index 93206cbe4..2561d5cc9 100644
--- a/test/mfs/source/test/mfs_test_sequence_002.c
+++ b/test/mfs/source/test/mfs_test_sequence_002.c
@@ -110,14 +110,14 @@ static void mfs_test_002_001_execute(void) {
mfs_error_t err;
size_t size;
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
}
test_end_step(2);
@@ -144,11 +144,11 @@ static void mfs_test_002_001_execute(void) {
test_assert(err == MFS_NO_ERROR, "error erasing record 1");
err = mfsWriteRecord(&mfs1, 2, sizeof mfs_pattern32, mfs_pattern32);
test_assert(err == MFS_NO_ERROR, "error writing record 2");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
- test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
}
test_end_step(4);
@@ -174,23 +174,23 @@ static void mfs_test_002_001_execute(void) {
size_t size;
/* Record 1 must not be present.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record found");
/* Record 2 must contain the new value.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern32, "unexpected record length");
- test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern32, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Record 3 must be unchanged.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
- test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Checking internal data.*/
test_assert(MFS_BANK_0 == mfs1.current_bank, "internal data mismatch");
@@ -217,23 +217,23 @@ static void mfs_test_002_001_execute(void) {
size_t size;
/* Record 1 must not be present.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record found");
/* Record 2 must contain the new value.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern32, "unexpected record length");
- test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern32, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Record 3 must be unchanged.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
- test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Checking internal data.*/
test_assert(MFS_BANK_0 == mfs1.current_bank, "internal data mismatch");
@@ -260,23 +260,23 @@ static void mfs_test_002_001_execute(void) {
size_t size;
/* Record 1 must not be present.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record found");
/* Record 2 must contain the new value.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern32, "unexpected record length");
- test_assert(memcmp(mfs_pattern32, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern32, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Record 3 must be unchanged.*/
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
- test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Checking internal data.*/
test_assert(MFS_BANK_1 == mfs1.current_bank, "internal data mismatch");
@@ -351,14 +351,14 @@ static void mfs_test_002_002_execute(void) {
mfs_error_t err;
size_t size;
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
}
test_end_step(2);
@@ -385,11 +385,11 @@ static void mfs_test_002_002_execute(void) {
test_assert(err == MFS_NO_ERROR, "error erasing record 1");
err = mfsWriteRecord(&mfs1, 2, sizeof mfs_pattern32, mfs_pattern32);
test_assert(err == MFS_NO_ERROR, "error writing record 2");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "unexpected record length");
- test_assert(memcmp(mfs_pattern16, mfs_buffer, size) == 0, "wrong record content");
+ test_assert(memcmp(mfs_pattern16, __nocache_mfs_buffer, size) == 0, "wrong record content");
/* Saving some internal state for successive checks.*/
current_counter = mfs1.current_counter;
@@ -414,16 +414,16 @@ static void mfs_test_002_002_execute(void) {
mfs_error_t err;
size_t size;
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "size changed");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 2, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 2, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "size changed");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 3, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 3, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR, "record not found");
test_assert(size == sizeof mfs_pattern16, "size changed");
@@ -490,13 +490,13 @@ static void mfs_test_002_003_execute(void) {
err = mfsWriteRecord(&mfs1, id, sizeof mfs_pattern512, mfs_pattern512);
test_assert(err == MFS_NO_ERROR, "error creating the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, id, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, id, &size, __nocache_mfs_buffer);
test_assert(err == MFS_NO_ERROR,
"record not found");
test_assert(size == sizeof mfs_pattern512,
"unexpected record length");
- test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,
+ test_assert(memcmp(mfs_pattern512, __nocache_mfs_buffer, size) == 0,
"wrong record content");
}
}
@@ -510,8 +510,8 @@ static void mfs_test_002_003_execute(void) {
err = mfsEraseRecord(&mfs1, 1);
test_assert(err == MFS_NO_ERROR, "error erasing the record");
- size = sizeof mfs_buffer;
- err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size = sizeof __nocache_mfs_buffer;
+ err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_NOT_FOUND, "record not erased");
}
test_end_step(2);
diff --git a/test/mfs/source/test/mfs_test_sequence_003.c b/test/mfs/source/test/mfs_test_sequence_003.c
index e31f53bab..693f468c1 100644
--- a/test/mfs/source/test/mfs_test_sequence_003.c
+++ b/test/mfs/source/test/mfs_test_sequence_003.c
@@ -80,7 +80,7 @@ static void mfs_test_003_001_execute(void) {
is expected.*/
test_set_step(2);
{
- mfs_error_t err = mfsWriteRecord(&mfs1, 1, 16, mfs_buffer);
+ mfs_error_t err = mfsWriteRecord(&mfs1, 1, 16, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_INV_STATE, "mfsWriteRecord() returned wrong status");
}
test_end_step(2);
@@ -98,8 +98,8 @@ static void mfs_test_003_001_execute(void) {
is expected.*/
test_set_step(4);
{
- size_t size = sizeof mfs_buffer;
- mfs_error_t err = mfsReadRecord(&mfs1, 1, &size, mfs_buffer);
+ size_t size = sizeof __nocache_mfs_buffer;
+ mfs_error_t err = mfsReadRecord(&mfs1, 1, &size, __nocache_mfs_buffer);
test_assert(err == MFS_ERR_INV_STATE, "mfsReadRecord() returned wrong status");
}
test_end_step(4);
diff --git a/testhal/STM32/multi/WSPI-MFS/.project b/testhal/STM32/multi/WSPI-MFS/.project
index 68106fb4f..7372a37d8 100644
--- a/testhal/STM32/multi/WSPI-MFS/.project
+++ b/testhal/STM32/multi/WSPI-MFS/.project
@@ -86,11 +86,6 @@
2
CHIBIOS/test/mfs
-
- test/lib
- 2
- CHIBIOS/test/lib
-
test/mfs
2