in tests for programData, move initialization of buffer just before calling ProgramData

Author: Rohit Grover

TESTS/storage_abstraction/basicAPI/basicAPI.cpp

@@ -297,6 +297,14 @@ void programDataCompleteCallback(int32_t status, ARM_STORAGE_OPERATION operation
     TEST_ASSERT((operation == ARM_STORAGE_OPERATION_ERASE) || (operation == ARM_STORAGE_OPERATION_PROGRAM_DATA));
     if (operation == ARM_STORAGE_OPERATION_ERASE) {
         // printf("programming %u bytes at address %lu with pattern 0x%" PRIx32 "\n", sizeofData, (uint32_t)addr, BYTE_PATTERN);
+
+        size_t sizeofData = info.program_unit;
+        TEST_ASSERT(BUFFER_SIZE >= sizeofData);
+        TEST_ASSERT((sizeofData % sizeof(uint32_t)) == 0);
+        for (size_t index = 0; index < sizeofData / sizeof(uint32_t); index++) {
+            ((uint32_t *)buffer)[index] = BYTE_PATTERN;
+        }
+
         status = drv->ProgramData(addr, buffer, sizeofData);
         if (status < ARM_DRIVER_OK) {
             return; /* failure. this will trigger a timeout and cause test failure. */
@@ -345,13 +353,6 @@ control_t test_programDataUsingProgramUnit(const size_t call_count)
 
     /* initialize the buffer to hold the pattern. */
     ARM_STORAGE_CAPABILITIES capabilities = drv->GetCapabilities();
-    static const uint32_t BYTE_PATTERN = 0xAA551122;
-    size_t sizeofData = info.program_unit;
-    TEST_ASSERT(BUFFER_SIZE >= sizeofData);
-    TEST_ASSERT((sizeofData % sizeof(uint32_t)) == 0);
-    for (size_t index = 0; index < sizeofData / sizeof(uint32_t); index++) {
-        ((uint32_t *)buffer)[index] = BYTE_PATTERN;
-    }
 
     /* Update the completion callback to 'programDataCompleteCallback'. */
     if (call_count == 2) {
@@ -373,6 +374,14 @@ control_t test_programDataUsingProgramUnit(const size_t call_count)
     } else {
         TEST_ASSERT_EQUAL(firstBlock.attributes.erase_unit, rc);
 
+        static const uint32_t BYTE_PATTERN = 0xAA551122;
+        size_t sizeofData = info.program_unit;
+        TEST_ASSERT(BUFFER_SIZE >= sizeofData);
+        TEST_ASSERT((sizeofData % sizeof(uint32_t)) == 0);
+        for (size_t index = 0; index < sizeofData / sizeof(uint32_t); index++) {
+            ((uint32_t *)buffer)[index] = BYTE_PATTERN;
+        }
+
         /* program the sector at addr */
         // printf("programming %u bytes at address %lu with pattern 0x%" PRIx32 "\n", sizeofData, (uint32_t)addr, BYTE_PATTERN);
         rc = drv->ProgramData((uint32_t)addr, buffer, sizeofData);
@@ -413,6 +422,10 @@ void programDataOptimalCompleteCallback(int32_t status, ARM_STORAGE_OPERATION op
 #ifndef __CC_ARM
         printf("programming %u bytes at address %lu with pattern 0x%x\n", sizeofData, (uint32_t)addr, BYTE_PATTERN);
 #endif
+        size_t sizeofData = info.optimal_program_unit;
+        TEST_ASSERT(BUFFER_SIZE >= sizeofData);
+        memset(buffer, BYTE_PATTERN, sizeofData);
+
         status = drv->ProgramData(addr, buffer, sizeofData);
         if (status < ARM_DRIVER_OK) {
             return; /* failure. this will trigger a timeout and cause test failure. */
@@ -461,10 +474,6 @@ control_t test_programDataUsingOptimalProgramUnit(const size_t call_count)
 
     /* initialize the buffer to hold the pattern. */
     ARM_STORAGE_CAPABILITIES capabilities = drv->GetCapabilities();
-    static const uint8_t BYTE_PATTERN = 0xAA;
-    size_t sizeofData = info.optimal_program_unit;
-    TEST_ASSERT(BUFFER_SIZE >= sizeofData);
-    memset(buffer, BYTE_PATTERN, sizeofData);
 
     /* Update the completion callback to 'programDataCompleteCallback'. */
     if (call_count == 2) {
@@ -487,6 +496,11 @@ control_t test_programDataUsingOptimalProgramUnit(const size_t call_count)
         TEST_ASSERT_EQUAL(firstBlock.attributes.erase_unit, rc);
         verifyBytePattern(addr, firstBlock.attributes.erase_unit, (uint8_t)0xFF);
 
+        static const uint8_t BYTE_PATTERN = 0xAA;
+        size_t sizeofData = info.optimal_program_unit;
+        TEST_ASSERT(BUFFER_SIZE >= sizeofData);
+        memset(buffer, BYTE_PATTERN, sizeofData);
+
         /* program the sector at addr */
         printf("programming %u bytes at address %lu with pattern 0x%x\n", sizeofData, (uint32_t)addr, BYTE_PATTERN);
         rc = drv->ProgramData((uint32_t)addr, buffer, sizeofData);