From 1534bb80c981c77ec380dc7511ebd1f4adb6f3e3 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 14 Apr 2019 10:54:32 +0000
Subject: [PATCH] XML fixes and source re-alignment.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12741 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 test/mfs/configuration.xml                    | 47 +++++++++++--------
 test/mfs/source/test/mfs_test_sequence_002.c  |  3 +-
 ...t ELF file)(OpenOCD, Flash and Run).launch |  2 +-
 3 files changed, 31 insertions(+), 21 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_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++) {
diff --git a/testhal/STM32/multi/EFL-MFS/debug/STM32-EFL-MFS (Select ELF file)(OpenOCD, Flash and Run).launch b/testhal/STM32/multi/EFL-MFS/debug/STM32-EFL-MFS (Select ELF file)(OpenOCD, Flash and Run).launch
index 2f3684c3e..57ed48235 100644
--- a/testhal/STM32/multi/EFL-MFS/debug/STM32-EFL-MFS (Select ELF file)(OpenOCD, Flash and Run).launch	
+++ b/testhal/STM32/multi/EFL-MFS/debug/STM32-EFL-MFS (Select ELF file)(OpenOCD, Flash and Run).launch	
@@ -33,7 +33,7 @@
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;offset-flashGetSectorOffset-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[7]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[6]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[5]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[4]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[3]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[2]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[1]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[0]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;next_offset-mfsp-mfsWriteRecord-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;line-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;offset-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;mfs_buffer[447]-null-mfs_test_001_005_execute-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;mfs_buffer[507]-null-mfs_test_001_005_execute-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;rp[506]-rp-mfs_flash_read-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;rp[507]-rp-mfs_flash_read-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;rp-mfs_flash_read-(cast_to_array)&quot; val=&quot;0:511&quot;/&gt;&lt;content id=&quot;data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[0]-data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[1]-data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[2]-data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[3]-data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CR-flash-eflp-stm32_flash_check_errors-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;w[0]-w-line-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;w[1]-w-line-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;xPSR-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CR-flash-devp-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;offset-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;sr-stm32_flash_check_errors-(format)&quot; val=&quot;2&quot;/&gt;&lt;/contentList&gt;"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;sr-stm32_flash_check_errors-(format)&quot; val=&quot;2&quot;/&gt;&lt;content id=&quot;offset-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CR-flash-devp-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;xPSR-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;w[1]-w-line-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;w[0]-w-line-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;CR-flash-eflp-stm32_flash_check_errors-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[3]-data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[2]-data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[1]-data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[0]-data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32-buffer-mfsp-mfs_flash_write-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;rp-mfs_flash_read-(cast_to_array)&quot; val=&quot;0:511&quot;/&gt;&lt;content id=&quot;rp[507]-rp-mfs_flash_read-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;rp[506]-rp-mfs_flash_read-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;mfs_buffer[507]-null-mfs_test_001_005_execute-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;mfs_buffer[447]-null-mfs_test_001_005_execute-(format)&quot; val=&quot;0&quot;/&gt;&lt;content id=&quot;offset-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;line-efl_lld_program-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;next_offset-mfsp-mfsWriteRecord-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[0]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[1]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[2]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[3]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[4]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[5]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[6]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;data32[7]-data32-buffer-mfsp-mfs_bank_check_header-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;offset-flashGetSectorOffset-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;globalVariableList/&gt;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList&gt;&#10;&lt;memoryBlockExpressionItem&gt;&#10;&lt;expression text=&quot;0x8040000&quot;/&gt;&#10;&lt;/memoryBlockExpressionItem&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="${selected_resource_loc}"/>