Merge pull request ARMmbed#1578 from ARMmbed/IOTTHD-2286

FHSS: Added vendor defined CF support

Author: Jarkko Paso

nanostack/fhss_config.h

@@ -78,6 +78,17 @@ typedef struct fhss_configuration
 
 } fhss_configuration_t;
 
+/**
+ * @brief Get channel using vendor defined channel function.
+ * @param api FHSS instance.
+ * @param slot Slot number in channel schedule.
+ * @param eui64 EUI-64 address of node for which the (unicast) schedule is calculated. NULL for broadcast schedule.
+ * @param bsi Broadcast schedule identifier used in (broadcast) schedule calculation.
+ * @param number_of_channels Number of channels in schedule.
+ * @return Channel.
+ */
+typedef int32_t fhss_vendor_defined_cf(const fhss_api_t *api, uint16_t slot, uint8_t eui64[8], uint16_t bsi, uint16_t number_of_channels);
+
 /**
  * \brief Struct fhss_ws_configuration defines configuration of WS FHSS.
  */
@@ -101,6 +112,9 @@ typedef struct fhss_ws_configuration
     /** Channel mask. */
     uint32_t channel_mask[8];
 
+    /** Vendor defined channel function. */
+    fhss_vendor_defined_cf *vendor_defined_cf;
+
 } fhss_ws_configuration_t;
 
 /**

source/Service_Libs/fhss/fhss_ws.c

@@ -67,9 +67,8 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
 
 static void fhss_ws_update_bc_channel(fhss_structure_t *fhss_structure)
 {
-    uint8_t mac_address[8];
     int32_t next_channel;
-    fhss_structure->callbacks.read_mac_address(fhss_structure->fhss_api, mac_address);
+
     if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_FIXED_CHANNEL) {
 
     } else if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_TR51CF) {
@@ -81,7 +80,9 @@ static void fhss_ws_update_bc_channel(fhss_structure_t *fhss_structure)
         next_channel = dh1cf_get_bc_channel_index(fhss_structure->ws->bc_slot, fhss_structure->ws->fhss_configuration.bsi, fhss_structure->number_of_channels);
         fhss_structure->ws->bc_slot++;
     } else if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_VENDOR_DEF_CF) {
-        //TODO: Callback to get channel schedule from application
+        if (fhss_structure->ws->fhss_configuration.vendor_defined_cf) {
+            next_channel = fhss_structure->ws->fhss_configuration.vendor_defined_cf(fhss_structure->fhss_api, fhss_structure->ws->bc_slot, NULL, fhss_structure->ws->fhss_configuration.bsi, fhss_structure->number_of_channels);
+        }
     }
 #ifdef FHSS_CHANNEL_DEBUG
     tr_info("%"PRIu32" BC %u %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->bc_slot);
@@ -200,7 +201,9 @@ static void fhss_ws_update_uc_channel_callback(fhss_structure_t *fhss_structure)
         next_channel = fhss_structure->rx_channel = dh1cf_get_uc_channel_index(fhss_structure->ws->uc_slot, mac_address, fhss_structure->number_of_channels);
         fhss_structure->ws->uc_slot++;
     } else if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_VENDOR_DEF_CF) {
-        //TODO: Callback to get channel schedule from application
+        if (fhss_structure->ws->fhss_configuration.vendor_defined_cf) {
+            next_channel = fhss_structure->rx_channel = fhss_structure->ws->fhss_configuration.vendor_defined_cf(fhss_structure->fhss_api, fhss_structure->ws->bc_slot, mac_address, fhss_structure->ws->fhss_configuration.bsi, fhss_structure->number_of_channels);
+        }
     }
     // Do not switch unicast channel when broadcast channel is active.
     if (fhss_structure->ws->is_on_bc_channel == true) {
@@ -235,7 +238,9 @@ static int fhss_ws_tx_handle_callback(const fhss_api_t *api, bool is_broadcast_a
         } else if(fhss_structure->ws->fhss_configuration.ws_channel_function == WS_DH1CF) {
             tx_channel = dh1cf_get_uc_channel_index(destination_slot, destination_address, fhss_structure->number_of_channels);
         } else if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_VENDOR_DEF_CF) {
-
+            if (fhss_structure->ws->fhss_configuration.vendor_defined_cf) {
+                tx_channel = fhss_structure->ws->fhss_configuration.vendor_defined_cf(fhss_structure->fhss_api, fhss_structure->ws->bc_slot, destination_address, fhss_structure->ws->fhss_configuration.bsi, fhss_structure->number_of_channels);
+            }
         }
 #ifdef FHSS_CHANNEL_DEBUG
         tr_debug("TX channel: %u %u", tx_channel, destination_slot+1);