Skip to content

Commit fe3c355

Browse files
author
Seppo Takalo
committed
TDBStore: Move Assert to init(), so Block parameter are initialised correctly
1 parent adf409f commit fe3c355

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

features/storage/kvstore/tdbstore/TDBStore.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <string.h>
2323
#include <stdio.h>
2424
#include "mbed_error.h"
25+
#include "mbed_assert.h"
2526
#include "mbed_wait_api.h"
2627
#include "MbedCRC.h"
2728
//Bypass the check of NVStore co existance if compiled for TARGET_TFM
@@ -135,11 +136,6 @@ TDBStore::TDBStore(BlockDevice *bd) : _ram_table(0), _max_keys(0),
135136
for (int i = 0; i < _max_open_iterators; i++) {
136137
_iterator_table[i] = { 0 };
137138
}
138-
139-
/* Minimum space required by Reserved area and master record */
140-
MBED_ASSERT(bd->size()
141-
>= (align_up(RESERVED_AREA_SIZE + sizeof(reserved_trailer_t), _prog_size)
142-
+ record_size(master_rec_key, sizeof(master_record_data_t))));
143139
}
144140

145141
TDBStore::~TDBStore()
@@ -1044,6 +1040,11 @@ int TDBStore::init()
10441040

10451041
calc_area_params();
10461042

1043+
/* Minimum space required by Reserved area and master record */
1044+
MBED_ASSERT(_bd->size()
1045+
>= (align_up(RESERVED_AREA_SIZE + sizeof(reserved_trailer_t), _prog_size)
1046+
+ record_size(master_rec_key, sizeof(master_record_data_t))));
1047+
10471048
for (uint8_t area = 0; area < _num_areas; area++) {
10481049
area_state[area] = TDBSTORE_AREA_STATE_NONE;
10491050
versions[area] = 0;

0 commit comments

Comments
 (0)