Move some storage functions to internal/utils.cpp

Author: Seppo Takalo

UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake

@@ -14,6 +14,7 @@ set(unittest-sources
   ../features/storage/blockdevice/HeapBlockDevice.cpp
   ../features/storage/blockdevice/BufferedBlockDevice.cpp
   ../features/storage/kvstore/tdbstore/TDBStore.cpp
+  ../features/storage/internal/utils.cpp
   ../features/frameworks/mbed-trace/source/mbed_trace.c
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp

features/storage/internal/utils.cpp

@@ -0,0 +1,22 @@
+#include "utils.h"
+#include "MbedCRC.h"
+
+using namespace mbed;
+
+uint32_t align_up(uint64_t val, uint64_t size)
+{
+    return (((val - 1) / size) + 1) * size;
+}
+
+uint32_t align_down(uint64_t val, uint64_t size)
+{
+    return (((val) / size)) * size;
+}
+
+uint32_t calc_crc(uint32_t init_crc, uint32_t data_size, const void *data_buf)
+{
+    uint32_t crc;
+    MbedCRC<POLY_32BIT_ANSI, 32> ct(init_crc, 0x0, true, false);
+    ct.compute(data_buf, data_size, &crc);
+    return crc;
+}

features/storage/internal/utils.h

@@ -0,0 +1,10 @@
+#ifndef STORAGE_UTILS_H
+#define STORAGE_UTILS_H
+
+#include <stdint.h>
+
+uint32_t align_up(uint64_t val, uint64_t size);
+uint32_t align_down(uint64_t val, uint64_t size);
+uint32_t calc_crc(uint32_t init_crc, uint32_t data_size, const void *data_buf);
+
+#endif

features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp

@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include "mbed_error.h"
 #include "MbedCRC.h"
+#include "features/storage/internal/utils.h"
 #include "mbed_trace.h"
 #define TRACE_GROUP "DADK"
 
@@ -51,9 +52,6 @@ static int calc_area_params(FlashIAP *flash, uint32_t out_tdb_start_offset, uint
                             tdbstore_area_data_t *area_params);
 static int reserved_data_get(FlashIAP *flash, tdbstore_area_data_t *area_params, void *reserved_data_buf,
                              size_t reserved_data_buf_size, size_t *actual_data_size_ptr);
-static inline uint32_t align_up(uint64_t val, uint64_t size);
-static inline uint32_t align_down(uint64_t val, uint64_t size);
-static uint32_t calc_crc(uint32_t init_crc, uint32_t data_size, const void *data_buf);
 
 // -------------------------------------------------- API Functions Implementation ----------------------------------------------------
 int direct_access_to_devicekey(uint32_t tdb_start_offset, uint32_t tdb_end_offset, void *data_buf,
@@ -295,21 +293,4 @@ static int reserved_data_get(FlashIAP *flash, tdbstore_area_data_t *area_params,
     return status;
 }
 
-static inline uint32_t align_up(uint64_t val, uint64_t size)
-{
-    return (((val - 1) / size) + 1) * size;
-}
-
-static inline uint32_t align_down(uint64_t val, uint64_t size)
-{
-    return (((val) / size)) * size;
-}
-
-static uint32_t calc_crc(uint32_t init_crc, uint32_t data_size, const void *data_buf)
-{
-    uint32_t crc;
-    MbedCRC<POLY_32BIT_ANSI, 32> ct(init_crc, 0x0, true, false);
-    ct.compute(data_buf, data_size, &crc);
-    return crc;
-}
 #endif // DEVICE_FLASH

features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h

@@ -24,7 +24,7 @@
  *
  * @param[in]  tdb_start_offset     FlashIAP Start address offset of tdb store
  * @param[in]  tdb_end_offset       FlashIAP End address offset of tdb store
- * @param[in]  data_buf             Buffer to store devicekey data
+ * @param[out] data_buf             Buffer to store devicekey data
  * @param[in]  data_buf_size        Max expected size of buffer to store the devicekey data
  * @param[out] actual_data_size_ptr Actual retrieved devicekey size
  *

features/storage/kvstore/tdbstore/TDBStore.cpp

@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include "mbed_error.h"
 #include "mbed_wait_api.h"
-#include "MbedCRC.h"
 //Bypass the check of NVStore co existance if compiled for TARGET_TFM
 #if !(BYPASS_NVSTORE_CHECK)
 #include "features/storage/system_storage/SystemStorage.h"
 #endif
+#include "features/storage/internal/utils.h"
 
 using namespace mbed;
 
@@ -103,25 +103,6 @@ typedef struct {
 
 } // anonymous namespace
 
-
-// -------------------------------------------------- Local Functions Declaration ----------------------------------------------------
-
-// -------------------------------------------------- Functions Implementation ----------------------------------------------------
-
-static inline uint32_t align_up(uint32_t val, uint32_t size)
-{
-    return (((val - 1) / size) + 1) * size;
-}
-
-
-static uint32_t calc_crc(uint32_t init_crc, uint32_t data_size, const void *data_buf)
-{
-    uint32_t crc;
-    MbedCRC<POLY_32BIT_ANSI, 32> ct(init_crc, 0x0, true, false);
-    ct.compute(data_buf, data_size, &crc);
-    return crc;
-}
-
 // Class member functions
 
 TDBStore::TDBStore(BlockDevice *bd) : _ram_table(0), _max_keys(0),
@@ -856,7 +837,6 @@ int TDBStore::garbage_collection()
 {
     ram_table_entry_t *ram_table = (ram_table_entry_t *) _ram_table;
     uint32_t to_offset, to_next_offset;
-    uint32_t chunk_size, reserved_size;
     int ret;
     size_t ind;
 
@@ -992,7 +972,7 @@ int TDBStore::init()
     uint32_t next_offset;
     uint32_t flags, hash;
     uint32_t actual_data_size;
-    int os_ret, ret = MBED_SUCCESS;
+    int ret;
     uint16_t versions[_num_areas];
 
     _mutex.lock();