Re-merged MFS from trunk.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_19.1.x@12742 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

3 files changed, 52 insertions, 34 deletions

diff --git a/test/mfs/configuration.xml b/test/mfs/configuration.xml
index 070066b52..089f95f10 100644
--- a/test/mfs/configuration.xml
+++ b/test/mfs/configuration.xml
@@ -533,8 +533,9 @@ mfsErase(&mfs1);]]></value>
                     </tags>

                     <code>

                       <value><![CDATA[mfs_id_t id;
-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /
-                  (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);
+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

+                  (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 
 for (id = 1; id <= id_max; id++) {
   mfs_error_t err;
@@ -562,8 +563,9 @@ for (id = 1; id <= id_max; id++) {
                     </tags>

                     <code>

                       <value><![CDATA[mfs_error_t err;
-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /
-                  (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);
+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

+                  (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 
 err = mfsWriteRecord(&mfs1, id_max, sizeof mfs_pattern512 , mfs_pattern512);
 test_assert(err == MFS_ERR_OUT_OF_MEM, "creation didn't fail");]]></value>

@@ -644,8 +646,9 @@ mfsErase(&mfs1);]]></value>
                     </tags>

                     <code>

                       <value><![CDATA[mfs_id_t id;
-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /
-                  (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);
+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

+                  (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 
 for (id = 1; id <= id_max; id++) {
   mfs_error_t err;
@@ -716,8 +719,9 @@ test_assert(bank_verify_erased(MFS_BANK_0) == FLASH_NO_ERROR, "bank 0 not erased
                     </tags>

                     <code>

                       <value><![CDATA[mfs_id_t id;
-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /
-                  (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);
+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

+                  (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 
 for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {
   mfs_error_t err;
@@ -791,7 +795,8 @@ test_assert(bank_verify_erased(MFS_BANK_1) == FLASH_NO_ERROR, "bank 1 not erased
                     </tags>

                     <code>

                       <value><![CDATA[mfs_id_t id;
-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

                   (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 
 for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {
@@ -848,19 +853,20 @@ mfsErase(&mfs1);]]></value>
                     </tags>

                     <code>

                       <value><![CDATA[mfs_id_t id;
-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

-                  (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 2));

+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

+                  (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 4));

 
 for (id = 1; id <= id_max; id++) {
   mfs_error_t err;
   size_t size;
 
-  err = mfsWriteRecord(&mfs1, id, (sizeof mfs_pattern512 / 2), mfs_pattern512);
+  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);
   test_assert(err == MFS_NO_ERROR, "record not found");
-  test_assert(size == (sizeof mfs_pattern512 / 2), "unexpected record length");
+  test_assert(size == (sizeof mfs_pattern512 / 4), "unexpected record length");
   test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,

               "wrong record content");
 }]]></value>

@@ -877,10 +883,11 @@ for (id = 1; id <= id_max; id++) {
                       <value><![CDATA[mfs_error_t err;
 size_t size;
 mfs_id_t id;
-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

-                  (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 2));

+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

+                  (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 4));

 mfs_id_t n = ((mfscfg1.bank_size - sizeof (mfs_bank_header_t)) -
-              (id_max * (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 2)))) /
+              (id_max * (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 4)))) /
              sizeof (mfs_data_header_t);
 
 for (id = 1; id <= n; id++) {
@@ -902,8 +909,9 @@ for (id = 1; id <= n; id++) {
                     <code>

                       <value><![CDATA[mfs_error_t err;
 size_t size;
-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

-                  (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 2));

+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

+                  (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 4));

 
 test_assert(mfs1.current_counter == 1, "not first instance");
 err = mfsEraseRecord(&mfs1, id_max);
@@ -1380,7 +1388,8 @@ mfsStart(&mfs1, &mfscfg1);]]></value>
                     </tags>

                     <code>

                       <value><![CDATA[mfs_id_t id;

-mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

+mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                        sizeof (mfs_data_header_t))) /

                   (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 

 for (id = 1; id <= id_max; id++) {

diff --git a/test/mfs/source/test/mfs_test_sequence_001.c b/test/mfs/source/test/mfs_test_sequence_001.c
index 7c6d929ee..7b9017769 100644
--- a/test/mfs/source/test/mfs_test_sequence_001.c
+++ b/test/mfs/source/test/mfs_test_sequence_001.c
@@ -411,7 +411,8 @@ static void mfs_test_001_005_execute(void) {
   test_set_step(1);

   {

     mfs_id_t id;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

                       (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 

     for (id = 1; id <= id_max; id++) {

@@ -437,7 +438,8 @@ static void mfs_test_001_005_execute(void) {
   test_set_step(2);

   {

     mfs_error_t err;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

                       (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 

     err = mfsWriteRecord(&mfs1, id_max, sizeof mfs_pattern512 , mfs_pattern512);

@@ -532,7 +534,8 @@ static void mfs_test_001_006_execute(void) {
   test_set_step(1);

   {

     mfs_id_t id;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

                       (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 

     for (id = 1; id <= id_max; id++) {

@@ -595,7 +598,8 @@ static void mfs_test_001_006_execute(void) {
   test_set_step(4);

   {

     mfs_id_t id;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

                       (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 

     for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {

@@ -661,7 +665,8 @@ static void mfs_test_001_006_execute(void) {
   test_set_step(7);

   {

     mfs_id_t id;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

                       (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 

     for (id = 1; id <= MFS_CFG_MAX_RECORDS; id++) {

@@ -726,19 +731,20 @@ static void mfs_test_001_007_execute(void) {
   test_set_step(1);

   {

     mfs_id_t id;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

-                      (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 2));

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

+                      (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 4));

 

     for (id = 1; id <= id_max; id++) {

       mfs_error_t err;

       size_t size;

 

-      err = mfsWriteRecord(&mfs1, id, (sizeof mfs_pattern512 / 2), mfs_pattern512);

+      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);

       test_assert(err == MFS_NO_ERROR, "record not found");

-      test_assert(size == (sizeof mfs_pattern512 / 2), "unexpected record length");

+      test_assert(size == (sizeof mfs_pattern512 / 4), "unexpected record length");

       test_assert(memcmp(mfs_pattern512, mfs_buffer, size) == 0,

                   "wrong record content");

     }

@@ -751,10 +757,11 @@ static void mfs_test_001_007_execute(void) {
     mfs_error_t err;

     size_t size;

     mfs_id_t id;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

-                      (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 2));

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

+                      (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 4));

     mfs_id_t n = ((mfscfg1.bank_size - sizeof (mfs_bank_header_t)) -

-                  (id_max * (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 2)))) /

+                  (id_max * (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 4)))) /

                  sizeof (mfs_data_header_t);

 

     for (id = 1; id <= n; id++) {

@@ -774,8 +781,9 @@ static void mfs_test_001_007_execute(void) {
   {

     mfs_error_t err;

     size_t size;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

-                      (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 2));

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

+                      (sizeof (mfs_data_header_t) + (sizeof mfs_pattern512 / 4));

 

     test_assert(mfs1.current_counter == 1, "not first instance");

     err = mfsEraseRecord(&mfs1, id_max);

diff --git a/test/mfs/source/test/mfs_test_sequence_002.c b/test/mfs/source/test/mfs_test_sequence_002.c
index c75858ea2..93206cbe4 100644
--- a/test/mfs/source/test/mfs_test_sequence_002.c
+++ b/test/mfs/source/test/mfs_test_sequence_002.c
@@ -480,7 +480,8 @@ static void mfs_test_002_003_execute(void) {
   test_set_step(1);

   {

     mfs_id_t id;

-    mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) /

+    mfs_id_t id_max = (mfscfg1.bank_size - (sizeof (mfs_bank_header_t) +

+                                            sizeof (mfs_data_header_t))) /

                       (sizeof (mfs_data_header_t) + sizeof mfs_pattern512);

 

     for (id = 1; id <= id_max; id++) {