Thread combined nvm test (ARMmbed#1507)

hread nvm support for active/pending conf, device data, link info

Author: Kari Severinkangas

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -1771,7 +1771,11 @@ void thread_bootstrap_attached_finish(protocol_interface_info_entry_t *cur)
     if (cur->thread_info->releaseRouterId) {
         thread_router_bootstrap_router_id_release(cur);
     }
-    thread_nvm_store_link_info_file_write(cur);
+    uint8_t *parent_mac_addr = NULL;
+    if (cur->thread_info->thread_endnode_parent) {
+        parent_mac_addr = cur->thread_info->thread_endnode_parent->mac64;
+    }
+    thread_nvm_store_link_info_write(parent_mac_addr, mac_helper_mac16_address_get(cur));
     thread_bootstrap_ready(cur);
 
     if(thread_is_router_addr(mac_helper_mac16_address_get(cur))) {
@@ -2221,17 +2225,23 @@ static bool thread_bootstrap_sync_after_reset_start(protocol_interface_info_entr
     uint16_t my_short_address;
     uint8_t parent_mac64[8];
 
-    if (!thread_nvm_store_link_info_get(parent_mac64, &my_short_address)) {
+    int link_info_err = thread_nvm_store_link_info_get(parent_mac64, &my_short_address);
+    if ( link_info_err!= THREAD_NVM_FILE_SUCCESS) {
+        tr_warning("thread_nvm_store_link_info_get returned %d", link_info_err);
         return false;
     }
-    thread_nvm_store_link_info_clear();
+    link_info_err = thread_nvm_store_link_info_clear();
+    if ( link_info_err!= THREAD_NVM_FILE_SUCCESS) {
+        tr_warning("thread_nvm_store_link_info_clear returned %d", link_info_err);
+        }
     if (thread_is_router_addr(my_short_address)) {
         thread_info(cur)->routerShortAddress = my_short_address;
         thread_dynamic_storage_build_mle_table(cur->id);
         thread_router_bootstrap_link_synch_start(cur);
         return true;
     }
     if (!thread_parent_data_allocate(cur->thread_info)) {
+        tr_info("parent alloc failed");
         return false;
     }
 
@@ -2294,16 +2304,6 @@ void thread_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
             tr_debug("Thread SM:Active Scan");
 
             thread_joiner_application_nvm_link_configuration_load(cur->id);
-
-            if (thread_joiner_application_nvm_operation_in_progress(cur->id)) {
-                /*
-                 *  joiner application has pending NVM operation in progress,
-                 *  wait it to complete before continuing startup
-                 */
-                cur->bootsrap_state_machine_cnt = 1;
-                return;
-            }
-
             linkConfiguration = thread_joiner_application_get_config(cur->id);
             if (!linkConfiguration) {
                 thread_bootstrap_start_network_discovery(cur);
@@ -3023,10 +3023,10 @@ void thread_bootstrap_dynamic_configuration_save(protocol_interface_info_entry_t
     // in error situation this returns 0 !!!!
     uint32_t mle_frame_counter = mle_service_security_get_frame_counter(cur->id);
     if (linkConfiguration) {
-            thread_nvm_store_fast_data_check_and_store(mac_frame_counter, mle_frame_counter, linkConfiguration->key_sequence);
+            thread_nvm_store_fast_data_check_and_write(mac_frame_counter, mle_frame_counter, linkConfiguration->key_sequence);
     }
     else {
-        thread_nvm_store_frame_counters_check_and_store(mac_frame_counter, mle_frame_counter);
+        thread_nvm_store_frame_counters_check_and_write(mac_frame_counter, mle_frame_counter);
     }
 }
 

source/6LoWPAN/Thread/thread_common.c

@@ -245,7 +245,8 @@ int8_t thread_bootstrap_down(protocol_interface_info_entry_t *cur)
         }
         mac_helper_link_frame_counter_read(cur->id, &fast_data.mac_frame_counter);
         fast_data.mle_frame_counter=mle_service_security_get_frame_counter(cur->id);
-        thread_nvm_store_fast_data_store(&fast_data);
+        thread_nvm_store_fast_data_write(&fast_data);
+        thread_joiner_application_configuration_nvm_save(cur->id);
         mac_pairwise_key_flush_list(cur->id);
         thread_discovery_reset(cur->id);
         thread_bootstrap_stop(cur);
@@ -981,6 +982,7 @@ void thread_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t ticks)
     thread_border_router_seconds_timer(cur->id, ticks);
     thread_bbr_seconds_timer(cur->id, ticks);
     thread_lowpower_timer(cur, ticks);
+    thread_nvm_store_seconds_timer(ticks);
 
     if (cur->lowpan_info & INTERFACE_NWK_BOOTSRAP_ACTIVE) {
         nwk_bootsrap_state_update(ARM_NWK_BOOTSTRAP_READY, cur);

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -63,7 +63,6 @@
 #include "6LoWPAN/Thread/thread_management_client.h"
 #include "6LoWPAN/Thread/thread_network_data_lib.h"
 #include "6LoWPAN/Thread/thread_tmfcop_lib.h"
-#include "6LoWPAN/Thread/thread_nvm_store.h"
 #include "thread_management_if.h"
 #include "Common_Protocols/ipv6.h"
 #include "MPL/mpl.h"