Merge pull request #2163 from ARMmbed/IOTTHD-3558

Iotthd 3558

Author: Jarkko Paso

nanostack/mlme.h

@@ -264,6 +264,8 @@ typedef enum {
     macAutoRequestKeyIndex = 0x7b,  /*<The index of the key used for automatic data*/
     macDefaultKeySource = 0x7c,      /*<Default key source*/
     //NON standard extension
+    macTXPower = 0xf8,              /*<TX output power*/
+    macCCAThreshold = 0xf9,         /*<CCA threshold*/
     macMultiCSMAParameters = 0xfa,  /*<Multi CSMA parameters*/
     macRfConfiguration = 0xfb,      /*<RF channel configuration parameters*/
     macAcceptByPassUnknowDevice = 0xfc,  /*< Accept data trough MAC if packet is data can be authenticated by group key nad MIC. Security enforsment point must be handled carefully these packets */

nanostack/net_interface.h

@@ -1093,6 +1093,34 @@ extern void net_get_version_information(uint8_t *ptr);
 
 extern int arm_nwk_sleepy_device_parent_buffer_size_set(int8_t interface_id, uint16_t big_packet_threshold, uint16_t small_packets_per_child_count, uint16_t big_packets_total_count);
 
+/**
+ * \brief Set CCA threshold.
+ *
+ * This function can be used to set CCA threshold to PHY layer. Threshold is given as percentage of maximum threshold.
+ * 0 is the lowest(strictest) possible threshold and 100 is the highest possible threshold.
+ *
+ * Note! Software MAC must be created and registered before using this function.
+ *
+ * \param interface_id Network interface ID.
+ * \param cca_threshold CCA threshold (%).
+ * \return 0 on success, <0 on errors.
+ */
+extern int8_t arm_nwk_set_cca_threshold(int8_t interface_id, uint8_t cca_threshold);
+
+/**
+ * \brief Set TX output power.
+ *
+ * This function can be used to set TX output power to PHY layer. TX power is given as percentage of maximum output power.
+ * 0 is the lowest possible TX power and 100 is the highest possible TX power.
+ *
+ * Note! Software MAC must be created and registered before using this function.
+ *
+ * \param interface_id Network interface ID.
+ * \param tx_power TX output power (%).
+ * \return 0 on success, <0 on errors.
+ */
+extern int8_t arm_nwk_set_tx_output_power(int8_t interface_id, uint8_t tx_power);
+
 
 #ifdef __cplusplus
 }

nanostack/platform/arm_hal_phy.h

@@ -76,8 +76,10 @@ typedef enum {
     PHY_EXTENSION_GET_TIMESTAMP, /**<  Read 32-bit constant monotonic time stamp in us */
     PHY_EXTENSION_SET_CSMA_PARAMETERS, /**< CSMA parameter's are given by phy_csma_params_t structure remember type cast uint8_t pointer to structure type*/
     PHY_EXTENSION_GET_SYMBOLS_PER_SECOND, /**<  Read Symbols per seconds which will help to convert symbol time to real time  */
-    PHY_EXTENSION_SET_RF_CONFIGURATION,  /**<  Set RF configuration using phy_rf_channel_parameters_s structure */
-    PHY_EXTENSION_FILTERING_SUPPORT /**<  Return filtering modes that can be supported by the PHY driver. See phy_link_filters_e */
+    PHY_EXTENSION_SET_RF_CONFIGURATION,  /**<  Set RF configuration using phy_rf_channel_configuration_s structure */
+    PHY_EXTENSION_FILTERING_SUPPORT, /**<  Return filtering modes that can be supported by the PHY driver. See phy_link_filters_e */
+    PHY_EXTENSION_SET_TX_POWER, /**<  Set TX output power which is given as percentage of maximum. 0 is the lowest possible TX power and 100 is the highest possible TX power */
+    PHY_EXTENSION_SET_CCA_THRESHOLD /**<  Set CCA threshold which is given as percentage of maximum threshold. 0 is the lowest(strictest) possible threshold and 100 is the highest possible threshold */
 } phy_extension_type_e;
 
 /** Address types */

source/MAC/IEEE802_15_4/mac_mlme.c

@@ -738,7 +738,7 @@ int8_t mac_mlme_set_req(protocol_interface_rf_mac_setup_s *rf_mac_setup, const m
     if (!set_req || !rf_mac_setup || !rf_mac_setup->dev_driver || !rf_mac_setup->dev_driver->phy_driver) {
         return -1;
     }
-
+    uint8_t *pu8 = NULL;
     switch (set_req->attr) {
         case macAckWaitDuration:
             return mac_mlme_set_ack_wait_duration(rf_mac_setup, set_req);
@@ -758,11 +758,29 @@ int8_t mac_mlme_set_req(protocol_interface_rf_mac_setup_s *rf_mac_setup, const m
                 memcpy(rf_mac_setup->coord_long_address, set_req->value_pointer, 8);
             }
             return 0;
+        case macTXPower:
+            pu8 = (uint8_t *) set_req->value_pointer;
+            rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_TX_POWER, pu8);
+            tr_debug("Set TX output power to %u%%", *pu8);
+            return 0;
+        case macCCAThreshold:
+            pu8 = (uint8_t *) set_req->value_pointer;
+            rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_CCA_THRESHOLD, pu8);
+            tr_debug("Set CCA threshold to %u%%", *pu8);
+            return 0;
         case macMultiCSMAParameters:
             return mac_mlme_set_multi_csma_parameters(rf_mac_setup, set_req);
         case macRfConfiguration:
             rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_RF_CONFIGURATION, (uint8_t *) set_req->value_pointer);
             mac_mlme_set_symbol_rate(rf_mac_setup);
+            phy_rf_channel_configuration_s *config_params = (phy_rf_channel_configuration_s *)set_req->value_pointer;
+            tr_info("RF config update:");
+            tr_info("Frequency(ch0): %"PRIu32"Hz", config_params->channel_0_center_frequency);
+            tr_info("Channel spacing: %"PRIu32"Hz", config_params->channel_spacing);
+            tr_info("Datarate: %"PRIu32"bps", config_params->datarate);
+            tr_info("Number of channels: %u", config_params->number_of_channels);
+            tr_info("Modulation: %u", config_params->modulation);
+            tr_info("Modulation index: %u", config_params->modulation_index);
             return 0;
         default:
             return mac_mlme_handle_set_values(rf_mac_setup, set_req);

source/Service_Libs/fhss/fhss_ws.c

@@ -88,6 +88,9 @@ static uint32_t fhss_set_txrx_slot_length(fhss_structure_t *fhss_structure);
 // This function supports rounding up
 static int64_t divide_integer(int64_t dividend, int32_t divisor)
 {
+    if (!divisor) {
+        return dividend;
+    }
     if (dividend < 0) {
         return (dividend - divisor / 2) / divisor;
     }

source/libNET/src/ns_net.c

@@ -1497,3 +1497,34 @@ int arm_nwk_sleepy_device_parent_buffer_size_set(int8_t interface_id, uint16_t b
     return -1;
 }
 
+int8_t arm_nwk_set_cca_threshold(int8_t interface_id, uint8_t cca_threshold)
+{
+    protocol_interface_info_entry_t *cur;
+    cur = protocol_stack_interface_info_get_by_id(interface_id);
+    if (!cur || !cur->mac_api || (cca_threshold > 100)) {
+        return -1;
+    }
+    mlme_set_t set_req;
+    set_req.attr = macCCAThreshold;
+    set_req.attr_index = 0;
+    set_req.value_pointer = &cca_threshold;
+    set_req.value_size = sizeof(cca_threshold);
+    cur->mac_api->mlme_req(cur->mac_api, MLME_SET, &set_req);
+    return 0;
+}
+
+int8_t arm_nwk_set_tx_output_power(int8_t interface_id, uint8_t tx_power)
+{
+    protocol_interface_info_entry_t *cur;
+    cur = protocol_stack_interface_info_get_by_id(interface_id);
+    if (!cur || !cur->mac_api || (tx_power > 100)) {
+        return -1;
+    }
+    mlme_set_t set_req;
+    set_req.attr = macTXPower;
+    set_req.attr_index = 0;
+    set_req.value_pointer = &tx_power;
+    set_req.value_size = sizeof(tx_power);
+    cur->mac_api->mlme_req(cur->mac_api, MLME_SET, &set_req);
+    return 0;
+}