@@ -126,7 +126,7 @@ static uint32_t calc_crc(uint32_t init_crc, uint32_t data_size, const void *data
126
126
TDBStore::TDBStore (BlockDevice *bd) : _ram_table(0 ), _max_keys(0 ),
127
127
_num_keys(0 ), _bd(bd), _buff_bd(0 ), _free_space_offset(0 ), _master_record_offset(0 ),
128
128
_master_record_size(0 ), _is_initialized(false ), _active_area(0 ), _active_area_version(0 ), _size(0 ),
129
- _area_params{}, _prog_size(0 ), _work_buf(0 ), _key_buf(0 ), _variant_bd_erase_unit_size( false ), _inc_set_handle(0 )
129
+ _area_params{}, _prog_size(0 ), _work_buf(0 ), _key_buf(0 ), _inc_set_handle(0 )
130
130
{
131
131
for (int i = 0 ; i < _num_areas; i++) {
132
132
_area_params[i] = { 0 };
@@ -186,19 +186,19 @@ void TDBStore::calc_area_params()
186
186
187
187
memset (_area_params, 0 , sizeof (_area_params));
188
188
size_t area_0_size = 0 ;
189
- bd_size_t prev_erase_unit_size = _bd->get_erase_size (area_0_size);
190
- _variant_bd_erase_unit_size = 0 ;
191
189
192
190
while (area_0_size < bd_size / 2 ) {
193
191
bd_size_t erase_unit_size = _bd->get_erase_size (area_0_size);
194
- _variant_bd_erase_unit_size |= (erase_unit_size != prev_erase_unit_size);
195
192
area_0_size += erase_unit_size;
196
193
}
197
194
198
195
_area_params[0 ].address = 0 ;
199
196
_area_params[0 ].size = area_0_size;
200
197
_area_params[1 ].address = area_0_size;
201
198
_area_params[1 ].size = bd_size - area_0_size;
199
+
200
+ // The areas must be of same size
201
+ MBED_ASSERT (_area_params[0 ].size == _area_params[1 ].size );
202
202
}
203
203
204
204
@@ -1487,14 +1487,8 @@ void TDBStore::offset_in_erase_unit(uint8_t area, uint32_t offset,
1487
1487
uint32_t &offset_from_start, uint32_t &dist_to_end)
1488
1488
{
1489
1489
uint32_t bd_offset = _area_params[area].address + offset;
1490
- if (!_variant_bd_erase_unit_size) {
1491
- uint32_t eu_size = _buff_bd->get_erase_size ();
1492
- offset_from_start = bd_offset % eu_size;
1493
- dist_to_end = eu_size - offset_from_start;
1494
- return ;
1495
- }
1496
-
1497
1490
uint32_t agg_offset = 0 ;
1491
+
1498
1492
while (bd_offset >= agg_offset + _buff_bd->get_erase_size (agg_offset)) {
1499
1493
agg_offset += _buff_bd->get_erase_size (agg_offset);
1500
1494
}
0 commit comments