LLC Neighbor, Mac packet rebuild, mac timer update and phy Extension.

Added PHY_LINK_CCA_PREPARE RF event type to indicate RX Tx timeout
prepare operation like channel switch to Tx channel from Receive one.

Packet build process splitted to common functions and main packet build
have been splitted Init and rebuild.

FHSS support now packet rebuild if aftre every CCA Process Start.

MAC_TIMER_CCA is not used anymore with FHSS and that affect that RF
driver must support tx_time set and new radio drivent callback event for
chennel switch.

LLC create updated by neighbour request information for allocate and
discover neighbor.

Change-Id: I41553ac5e5c945a188bc168426bd94b16eddbe74

Author: Juha Heiskanen

nanostack/platform/arm_hal_phy.h

@@ -45,6 +45,7 @@ typedef enum {
     PHY_LINK_TX_SUCCESS,        /**< MAC TX complete. MAC will a make decision to enter wait ACK or TX done state. */
     PHY_LINK_TX_FAIL,           /**< Link TX process fail. */
     PHY_LINK_CCA_FAIL,          /**< RF link CCA process fail. */
+    PHY_LINK_CCA_PREPARE,       /**< RX Tx timeout prepare operation like channel switch to Tx channel from Receive one If operation fail must return not zero*/
 } phy_link_tx_status_e;
 
 /** Extension types */

source/6LoWPAN/ws/ws_bootstrap.c

@@ -84,12 +84,16 @@ static bool ws_bootstrap_state_discovery(struct protocol_interface_info_entry *c
 static bool ws_bootstrap_state_wait_rpl(struct protocol_interface_info_entry *cur);
 static int8_t ws_bootsrap_event_trig(ws_bootsrap_event_type_e event_type, int8_t interface_id, arm_library_event_priority_e priority, void *event_data);
 
-static mac_neighbor_table_entry_t * ws_bootstrap_mac_neighbor_add(struct protocol_interface_info_entry *interface, const uint8_t *src64)
+static bool ws_bootstrap_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t * neighbor_buffer, bool request_new);
+
+mac_neighbor_table_entry_t * ws_bootstrap_mac_neighbor_add(struct protocol_interface_info_entry *interface, const uint8_t *src64)
 {
     mac_neighbor_table_entry_t *neighbor = mac_neighbor_table_address_discover(interface->mac_parameters->mac_neighbor_table, src64, MAC_ADDR_MODE_64_BIT);
-    if (!neighbor) {
-        neighbor = mac_neighbor_table_entry_allocate(interface->mac_parameters->mac_neighbor_table, src64);
+    if (neighbor) {
+        return neighbor;
     }
+
+    neighbor = mac_neighbor_table_entry_allocate(interface->mac_parameters->mac_neighbor_table, src64);
     if (!neighbor) {
         return NULL;
     }
@@ -101,21 +105,6 @@ static mac_neighbor_table_entry_t * ws_bootstrap_mac_neighbor_add(struct protoco
     return neighbor;
 }
 
-static ws_neighbor_class_entry_t * ws_bootstrap_neighbor_add(struct protocol_interface_info_entry *interface, const uint8_t *src64)
-{
-    mac_neighbor_table_entry_t *neighbor = ws_bootstrap_mac_neighbor_add(interface, src64);
-    if (!neighbor) {
-        return NULL;
-    }
-
-    ws_neighbor_class_entry_t *ws_neighbor =  ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor->index);
-    if (!ws_neighbor) {
-        mac_neighbor_table_neighbor_remove(interface->mac_parameters->mac_neighbor_table, neighbor);
-        return NULL;
-    }
-    return ws_neighbor;
-}
-
 static void ws_bootstrap_neighbor_delete(struct protocol_interface_info_entry *interface, uint8_t attribute_index)
 {
     mac_helper_devicetable_remove(interface->mac_api, attribute_index);
@@ -487,18 +476,17 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
         tr_error("No broadcast schedule");
         return;
     }
-
-    ws_neighbor_class_entry_t *neighbor = ws_bootstrap_neighbor_add(cur, data->SrcAddr);
-    if (!neighbor) {
+    llc_neighbour_req_t neighbor_info;
+    if (!ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, true) ) {
         return;
     }
 
-    etx_lqi_dbm_update(cur->id, data->mpduLinkQuality, data->signal_dbm, ws_neighbor_class_entry_index_get(&cur->ws_info->neighbor_storage,neighbor));
+    etx_lqi_dbm_update(cur->id, data->mpduLinkQuality, data->signal_dbm, neighbor_info.neighbor->index);
     //Update Neighbor Broadcast and Unicast Parameters
-    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor, ws_utt, data->timestamp);
-    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor, ws_us);
-    ws_neighbor_class_neighbor_broadcast_time_info_update(neighbor, &ws_bt_ie, data->timestamp);
-    ws_neighbor_class_neighbor_broadcast_schedule_set(neighbor, &ws_bs_ie);
+    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor_info.ws_neighbor, ws_utt, data->timestamp);
+    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, ws_us);
+    ws_neighbor_class_neighbor_broadcast_time_info_update(neighbor_info.ws_neighbor, &ws_bt_ie, data->timestamp);
+    ws_neighbor_class_neighbor_broadcast_schedule_set(neighbor_info.ws_neighbor, &ws_bs_ie);
 
     if (cur->ws_info->configuration_learned &&
         common_serial_number_greater_16(cur->ws_info->pan_configuration.pan_version, pan_version)) {
@@ -537,7 +525,7 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
 
     cur->ws_info->hopping_schdule.channel_function = ws_bs_ie.channel_function;
     // TODO: Restart unicast schedule if configuration changed
-    ns_fhss_ws_set_parent(cur->ws_info->fhss_api, data->SrcAddr, &neighbor->fhss_data.bc_timing_info);
+    ns_fhss_ws_set_parent(cur->ws_info->fhss_api, data->SrcAddr, &neighbor_info.ws_neighbor->fhss_data.bc_timing_info);
 
     if (!cur->ws_info->configuration_learned) {
         // Generate own hopping schedules Follow first parent broadcast and plans and also use same unicast dwell
@@ -563,13 +551,14 @@ static void ws_bootstrap_pan_config_solicit_analyse(struct protocol_interface_in
      *
      */
 
-    ws_neighbor_class_entry_t *neighbor = ws_bootstrap_neighbor_add(cur, data->SrcAddr);
-    if (!neighbor) {
+    llc_neighbour_req_t neighbor_info;
+    if (!ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, true) ) {
         return;
     }
 
-    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor, ws_utt, data->timestamp);
-    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor, ws_us);
+    etx_lqi_dbm_update(cur->id, data->mpduLinkQuality, data->signal_dbm, neighbor_info.neighbor->index);
+    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor_info.ws_neighbor, ws_utt, data->timestamp);
+    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, ws_us);
 
     /*
      * A consistent transmission is defined as a PAN Configuration Solicit with
@@ -665,6 +654,35 @@ static void ws_bootstrap_asynch_confirm(struct protocol_interface_info_entry *in
     (void)asynch_message;
 }
 
+static bool ws_bootstrap_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t * neighbor_buffer, bool request_new)
+{
+    neighbor_buffer->neighbor = mac_neighbor_table_address_discover(interface->mac_parameters->mac_neighbor_table, mac_64, ADDR_802_15_4_LONG);
+    if (neighbor_buffer->neighbor) {
+        neighbor_buffer->ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor_buffer->neighbor->index);
+        if (!neighbor_buffer->ws_neighbor) {
+            return false;
+        }
+        return true;
+    }
+    if (!request_new) {
+        return false;
+    }
+
+    neighbor_buffer->neighbor = ws_bootstrap_mac_neighbor_add(interface, mac_64);
+
+    if (!neighbor_buffer->neighbor) {
+        return false;
+    }
+
+    neighbor_buffer->ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor_buffer->neighbor->index);
+    if (!neighbor_buffer->ws_neighbor) {
+        mac_helper_devicetable_remove(interface->mac_api, neighbor_buffer->neighbor->index);
+        mac_neighbor_table_neighbor_remove(interface->mac_parameters->mac_neighbor_table, neighbor_buffer->neighbor);
+        return false;
+    }
+    return true;
+}
+
 
 static void ws_neighbor_entry_remove_notify(mac_neighbor_table_entry_t *entry_ptr, void *user_data)
 {
@@ -761,7 +779,7 @@ int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode)
         goto init_fail;
     }
 
-    ws_llc_create(cur, &ws_bootstrap_asynch_ind, &ws_bootstrap_asynch_confirm);
+    ws_llc_create(cur, &ws_bootstrap_asynch_ind, &ws_bootstrap_asynch_confirm, &ws_bootstrap_neighbor_info_request);
 
     mpx_api_t *mpx_api = ws_llc_mpx_api_get(cur);
     if (!mpx_api) {
@@ -1227,13 +1245,13 @@ void ws_bootstrap_network_scan_process(protocol_interface_info_entry_t *cur)
     tr_info("select network");
 
     // Add EAPOL neighbour
-    ws_neighbor_class_entry_t *neighbor = ws_bootstrap_neighbor_add(cur, cur->ws_info->parent_info.addr);
-    if (!neighbor) {
+    llc_neighbour_req_t neighbor_info;
+    if (!ws_bootstrap_neighbor_info_request(cur, cur->ws_info->parent_info.addr, &neighbor_info, true) ) {
         return;
     }
 
-    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor, &cur->ws_info->parent_info.ws_utt, cur->ws_info->parent_info.timestamp);
-    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor, &cur->ws_info->parent_info.ws_us);
+    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor_info.ws_neighbor, &cur->ws_info->parent_info.ws_utt, cur->ws_info->parent_info.timestamp);
+    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, &cur->ws_info->parent_info.ws_us);
 
     ws_bootstrap_network_information_learn(cur);
     ws_bootstrap_fhss_activate(cur);

source/6LoWPAN/ws/ws_llc.h

@@ -18,13 +18,18 @@
 #ifndef WS_LLC_H_
 #define WS_LLC_H_
 
+#include "6LoWPAN/ws/ws_neighbor_class.h"
+#include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
+
 struct protocol_interface_info_entry;
 struct mcps_data_ind_s;
 struct mcps_data_ie_list;
 struct channel_list_s;
 struct ws_pan_information_s;
 struct mlme_security_s;
 struct ws_hopping_schedule_s;
+struct ws_neighbor_class_entry;
+struct mac_neighbor_table_entry;
 
 
 /**
@@ -62,6 +67,15 @@ typedef struct asynch_request_s {
     struct channel_list_s channel_list;                     /**< Channel List. */
 } asynch_request_t;
 
+
+/**
+ * @brief LLC neighbour info request parameters
+ */
+typedef struct llc_neighbour_req {
+    struct mac_neighbor_table_entry *neighbor;         /**< Generic Link Layer Neighbor information entry. */
+    struct ws_neighbor_class_entry *ws_neighbor;       /**< Wi-sun Neighbor information entry. */
+} llc_neighbour_req_t;
+
 /**
  * @brief ws_asynch_ind ws asynch data indication
  * @param interface Interface pointer
@@ -78,15 +92,27 @@ typedef void ws_asynch_ind(struct protocol_interface_info_entry *interface, cons
  */
 typedef void ws_asynch_confirm(struct protocol_interface_info_entry *interface, uint8_t asynch_message);
 
+/**
+ * @brief ws_asynch_confirm ws asynch data confirmation to asynch message request
+ * @param interface The interface pointer
+ * @param mac_64 Neighbor 64-bit address
+ * @param neighbor_buffer Buffer where neighbor infor is buffered
+ * @param request_new true if is possible to allocate new entry
+ *
+ * @return true when neighbor info is available
+ * @return false when no neighbor info
+ */
+typedef bool ws_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t * neighbor_buffer, bool request_new);
+
 /**
  * @brief ws_llc_create ws LLC module create
  * @param interface Interface pointer
- * @param data MCPS-DATA.indication specific values
+ * @param asynch_ind_cb Asynch indication
  * @param ie_ext Information element list
  *
  * Function allocate and init LLC class and init it 2 supported 2 API: ws asynch and MPX user are internally registered.
  */
-int8_t ws_llc_create(struct protocol_interface_info_entry *interface, ws_asynch_ind *asynch_ind_cb, ws_asynch_confirm *asynch_cnf_cb);
+int8_t ws_llc_create(struct protocol_interface_info_entry *interface, ws_asynch_ind *asynch_ind_cb, ws_asynch_confirm *asynch_cnf_cb, ws_neighbor_info_request *ws_neighbor_info_request_cb);
 
 /**
  * @brief ws_llc_reset Reset ws LLC parametrs and clean messages