LLC delete added for test purpose

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_llc.h

@@ -94,6 +94,13 @@ int8_t ws_llc_create(struct protocol_interface_info_entry *interface, ws_asynch_
  */
 void ws_llc_reset(struct protocol_interface_info_entry *interface);
 
+/**
+ * @brief ws_llc_delete Delete LLC interface. ONLY for Test purpose.
+ * @param interface Interface pointer
+ *
+ */
+int8_t ws_llc_delete(struct protocol_interface_info_entry *interface);
+
 /**
  * @brief ws_llc_asynch_request ws asynch message request to all giving channels
  * @param interface Interface pointer
@@ -144,13 +151,13 @@ void ws_llc_set_network_name(struct protocol_interface_info_entry *interface, ui
 void ws_llc_set_broadcast_schecudule_info(struct protocol_interface_info_entry *interface, uint16_t length, uint8_t *schedule_info);
 
 /**
- * @brief @brief ws_llc_set_unitcast_secudule_info data for braodcast schedule WP_PAYLOAD_IE_US_TYPE
+ * @brief @brief ws_llc_set_unicast_secudule_info data for braodcast schedule WP_PAYLOAD_IE_US_TYPE
  * @param interface Interface pointer
  * @param schedule_info pointer to Configured shedule data
  * @param length configured unicast schedule length
  *
  */
-void ws_llc_set_unitcast_schecudule_info(struct protocol_interface_info_entry *interface, uint8_t *schedule_info, uint16_t length);
+void ws_llc_set_unicast_schecudule_info(struct protocol_interface_info_entry *interface, uint8_t *schedule_info, uint16_t length);
 
 /**
  * @brief ws_llc_set_gtkhash Configure WS GTK hash information (Data of WP_PAYLOAD_IE_GTKHASH_TYPE IE element)

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -638,6 +638,19 @@ static int8_t ws_llc_mpx_init(mpx_class_t *mpx_class, int8_t interface_id)
     return lowpan_adaptation_interface_mpx_register(interface_id, &mpx_class->mpx_api, MPX_LOWPAN_ENC_USER_ID);
 }
 
+static void ws_llc_clean(llc_data_base_t *base)
+{
+    //Clean Message queue's
+    mcps_purge_t purge_req;
+    ns_list_foreach_safe(llc_message_t, message, &base->llc_message_list) {
+        purge_req.msduHandle = message->msg_handle;
+        llc_message_free(message, base);
+        base->interface_ptr->mac_api->mcps_purge_req(base->interface_ptr->mac_api, &purge_req);
+
+    }
+    memset(&base->ie_params, 0, sizeof(llc_ie_params_t));
+}
+
 
 int8_t ws_llc_create(struct protocol_interface_info_entry *interface, ws_asynch_ind *asynch_ind_cb, ws_asynch_confirm *asynch_cnf_cb)
 {
@@ -667,21 +680,33 @@ int8_t ws_llc_create(struct protocol_interface_info_entry *interface, ws_asynch_
     return 0;
 }
 
-void ws_llc_reset(struct protocol_interface_info_entry *interface)
+int8_t ws_llc_delete(struct protocol_interface_info_entry *interface)
 {
     llc_data_base_t *base = ws_llc_discover_by_interface(interface);
     if (!base) {
-        return;
+        return -1;
     }
-    //Clean Message queue's
-    mcps_purge_t purge_req;
-    ns_list_foreach_safe(llc_message_t, message, &base->llc_message_list) {
-        purge_req.msduHandle = message->msg_handle;
-        llc_message_free(message, base);
-        base->interface_ptr->mac_api->mcps_purge_req(base->interface_ptr->mac_api, &purge_req);
 
+    ws_llc_clean(base);
+
+    ns_list_remove(&llc_data_base_list, base);
+    //Disable Mac extension
+    base->interface_ptr->mac_api->mac_mcps_extension_enable(base->interface_ptr->mac_api, NULL, NULL);
+    //Disable Adaptation MPX
+    lowpan_adaptation_interface_mpx_register(base->interface_ptr->id, NULL, 0);
+    ns_dyn_mem_free(base);
+    return 0;
+}
+
+
+
+void ws_llc_reset(struct protocol_interface_info_entry *interface)
+{
+    llc_data_base_t *base = ws_llc_discover_by_interface(interface);
+    if (!base) {
+        return;
     }
-    memset(&base->ie_params, 0, sizeof(llc_ie_params_t));
+    ws_llc_clean(base);
 }
 
 int8_t ws_llc_asynch_request(struct protocol_interface_info_entry *interface, asynch_request_t *request)
@@ -834,7 +859,7 @@ void ws_llc_set_broadcast_schecudule_info(struct protocol_interface_info_entry *
 }
 
 
-void ws_llc_set_unitcast_schecudule_info(struct protocol_interface_info_entry *interface, uint8_t *schedule_info, uint16_t length)
+void ws_llc_set_unicast_schecudule_info(struct protocol_interface_info_entry *interface, uint8_t *schedule_info, uint16_t length)
 {
     llc_data_base_t *base = ws_llc_discover_by_interface(interface);
     if (!base) {

source/MAC/IEEE802_15_4/sw_mac.c

@@ -227,7 +227,11 @@ static int8_t ns_sw_mac_api_enable_mcps_ext(mac_api_t *api, mcps_data_indication
 
     cur->data_conf_ext_cb = data_cnf_cb;
     cur->data_ind_ext_cb = data_ind_cb;
-    mac_store.setup->mac_extension_enabled = true;
+    if (data_cnf_cb && data_ind_cb) {
+        mac_store.setup->mac_extension_enabled = true;
+    } else {
+        mac_store.setup->mac_extension_enabled = false;
+    }
     return 0;
 }