Corrected defects and coding style

artokin · Oct 6, 2020 · a0b112a · a0b112a
1 parent 2f4678a
commit a0b112a
Showing 1 changed file with 20 additions and 28 deletions.
diff --git a/source/6LoWPAN/ws/ws_pae_key_storage.c b/source/6LoWPAN/ws/ws_pae_key_storage.c
@@ -101,7 +101,6 @@ typedef struct {
     uint16_t store_timer;                               /**< Storing timer */
     uint32_t restart_cnt;                               /**< Re-start counter */
     uint32_t scatter_timer;                             /**< NVM storing scatter timer */
-    bool scatter_timer_running : 1;                     /**< NVM storing scatter timer is running */
 } key_storage_params_t;
 
 static key_storage_params_t key_storage_params;
@@ -170,7 +169,6 @@ void ws_pae_key_storage_init(void)
     key_storage_params.store_bitfield = 0,
     key_storage_params.restart_cnt = 0;
     key_storage_params.scatter_timer = 0;
-    key_storage_params.scatter_timer_running = false;
 }
 
 void ws_pae_key_storage_delete(void)
@@ -720,31 +718,30 @@ static void ws_pae_key_storage_scatter_timer_timeout(void)
     bool pending_entry = false;
 
     ns_list_foreach(key_storage_array_t, entry, &key_storage_array_list) {
-         if (!entry->pending_storing) {
-             entry_offset++;
-             continue;
-         }
-         pending_entry = true;
-
-         char filename[KEY_STORAGE_FILE_LEN];
-         ws_pae_key_storage_filename_set(filename, entry_offset);
-         tr_info("KeyS write array: %p file: %s", (void *) entry->storage_array, filename);
-         nvm_tlv_t *tlv = (nvm_tlv_t *) entry->storage_array_handle;
-         ws_pae_nvm_store_tlv_file_write(filename, tlv);
-
-         // Item has been stored, reset pending storing and modified flag
-         entry->pending_storing = false;
-         entry->modified = false;
-         break;
-     }
+        if (!entry->pending_storing) {
+            entry_offset++;
+            continue;
+        }
+        pending_entry = true;
+
+        char filename[KEY_STORAGE_FILE_LEN];
+        ws_pae_key_storage_filename_set(filename, entry_offset);
+        tr_info("KeyS write array: %p file: %s", (void *) entry->storage_array, filename);
+        nvm_tlv_t *tlv = (nvm_tlv_t *) entry->storage_array_handle;
+        ws_pae_nvm_store_tlv_file_write(filename, tlv);
+
+        // Item has been stored, reset pending storing and modified flag
+        entry->pending_storing = false;
+        entry->modified = false;
+        break;
+    }
 
     if (pending_entry) {
         ws_pae_key_storage_fast_timer_ticks_set();
         return;
     }
 
     tr_info("KeyS all pending entries stored");
-    key_storage_params.scatter_timer_running = false;
 }
 
 void ws_pae_key_storage_read(uint32_t restart_cnt)
@@ -897,11 +894,9 @@ void ws_pae_key_storage_timer(uint16_t seconds)
 
 void ws_pae_key_storage_fast_timer(uint16_t ticks)
 {
-    if (!key_storage_params.scatter_timer_running) {
+    if (key_storage_params.scatter_timer == 0) {
         return;
-    }
-
-    if (key_storage_params.scatter_timer > ticks) {
+    } else if (key_storage_params.scatter_timer > ticks) {
         key_storage_params.scatter_timer -= ticks;
     } else {
         key_storage_params.scatter_timer = 0;
@@ -911,10 +906,7 @@ void ws_pae_key_storage_fast_timer(uint16_t ticks)
 
 static void ws_pae_key_storage_fast_timer_start(void)
 {
-    if (!key_storage_params.scatter_timer_running) {
-        key_storage_params.scatter_timer_running = true;
-        ws_pae_key_storage_fast_timer_ticks_set();
-    }
+    ws_pae_key_storage_fast_timer_ticks_set();
 }
 
 static void ws_pae_key_storage_fast_timer_ticks_set(void)