rfidrig/ChameleonUltra
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonUltra.git synced 2026-05-12 11:22:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix factory reset hang/wdt reset

Browse Source 
fds_util event handler was ignoring all the events related to
peer_manager files and that was causing a deadlock while waiting for
record deletion that in turn caused a wdt reset, usually this resulted in
a partially done factory reset.
The fix adds a `ignore_pm` flag to op_info struct that gets cleared by
fds_wipe allowing for a true reset to happen.
This commit is contained in:
Augusto Zanellato
2023-10-13 00:26:32 +02:00
parent 15bcae78be
commit c1c10e9ba3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/src/utils/fds_util.c
+6 -1
View File
@@ -15,6 +15,7 @@ static struct {
uint16_t key; // file key
bool success; // task is success
bool waiting; // task waiting done.
bool ignore_pm; // ignore peer manager records, defaults to true, set to false by fds_wipe
} fds_operation_info;
@@ -192,10 +193,12 @@ static bool is_peer_manager_record(uint16_t id_or_key) {
*/
static void fds_evt_handler(fds_evt_t const *p_evt) {
// Skip peermanager event
if (is_peer_manager_record(p_evt->write.record_key)
if (fds_operation_info.ignore_pm && (
is_peer_manager_record(p_evt->write.record_key)
|| is_peer_manager_record(p_evt->write.file_id)
|| is_peer_manager_record(p_evt->del.record_key)
|| is_peer_manager_record(p_evt->del.file_id)
)
) {
return;
}
@@ -264,6 +267,7 @@ static void fds_evt_handler(fds_evt_t const *p_evt) {
*Initialize the FDS library of NRF52
*/
void fds_util_init() {
fds_operation_info.ignore_pm = true;
// reset waiting flag
fds_operation_info.waiting = false;
//Register the incident first
@@ -311,6 +315,7 @@ static bool fds_next_record_delete_sync() {
bool fds_wipe(void) {
NRF_LOG_INFO("Full fds wipe requested");
fds_operation_info.ignore_pm = false; // wipe should also delete peer manager files.
while (fds_next_record_delete_sync()) {
bsp_wdt_feed();
}