fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 18:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

modules: dataman: ram_flash: No need to write/erase data that do not need to persist

Browse Source 
Just update in RAM is enough.
This commit is contained in:
José Roberto de Souza
2017-07-13 15:21:26 +02:00
committed by Beat Küng
parent 10f54e718e
commit 2f2e3a7e7c
1 changed files with 5 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/dataman/dataman.c
+5 -42
View File
@@ -569,7 +569,10 @@ _ram_flash_write(dm_item_t item, unsigned index, dm_persitence_t persistence, co
return ret; return ret;
} }
_ram_flash_update_flush_timeout(); if (persistence == DM_PERSIST_POWER_ON_RESET) {
_ram_flash_update_flush_timeout();
}
return ret; return ret;
} }
#endif #endif
@@ -883,47 +886,7 @@ _file_restart(dm_reset_reason reason)
static int static int
_ram_flash_restart(dm_reset_reason reason) _ram_flash_restart(dm_reset_reason reason)
{ {
uint8_t *buffer = dm_operations_data.ram.data; return dm_ram_operations.restart(reason);
bool need_flush = false;
/* We need to scan the entire file and invalidate and data that should not persist after the last reset */
/* Loop through all of the data segments and delete those that are not persistent */
for (dm_item_t item = DM_KEY_SAFE_POINTS; item < DM_KEY_NUM_KEYS; item++) {
for (unsigned i = 0; i < g_per_item_max_index[item]; i++) {
/* check if segment contains data */
if (buffer[0]) {
bool clear_entry = false;
/* Whether data gets deleted depends on reset type and data segment's persistence setting */
if (reason == DM_INIT_REASON_POWER_ON) {
if (buffer[1] > DM_PERSIST_POWER_ON_RESET) {
clear_entry = true;
}
} else {
if (buffer[1] > DM_PERSIST_IN_FLIGHT_RESET) {
clear_entry = true;
}
}
/* Set segment to unused if data does not persist */
if (clear_entry) {
buffer[0] = 0;
need_flush = true;
}
}
buffer += g_per_item_size[item];
}
}
if (need_flush) {
_ram_flash_update_flush_timeout();
}
return 0;
} }
#endif #endif