FHSS: Implemented WS configuration structure

Author: Jarkko Paso

nanostack/fhss_config.h

@@ -28,6 +28,21 @@
 extern "C" {
 #endif
 
+/**
+ * @brief WS channel functions.
+ */
+typedef enum
+{
+    /** Fixed channel. */
+    WS_FIXED_CHANNEL,
+    /** TR51 channel function. */
+    WS_TR51CF,
+    /** Direct Hash channel function. */
+    WS_DH1CF,
+    /** Vendor Defined channel function. */
+    WS_VENDOR_DEF_CF
+} fhss_ws_channel_functions;
+
 /**
  * \brief Struct fhss_tuning_parameter defines FHSS tuning parameters.
  * All delays are given in microseconds.
@@ -63,6 +78,28 @@ typedef struct fhss_configuration
 
 } fhss_configuration_t;
 
+/**
+ * \brief Struct fhss_ws_configuration defines configuration of WS FHSS.
+ */
+typedef struct fhss_ws_configuration
+{
+    /** WS channel function. */
+    fhss_ws_channel_functions ws_channel_function;
+
+    /** Unicast dwell interval. Range: 15-250 milliseconds. */
+    uint8_t fhss_uc_dwell_interval;
+
+    /** Broadcast interval. Duration between broadcast dwell intervals. Range: 0-16777216 milliseconds. */
+    uint32_t fhss_broadcast_interval;
+
+    /** Broadcast dwell interval. Range: 15-250 milliseconds. */
+    uint8_t fhss_bc_dwell_interval;
+
+    /** Channel mask. */
+    uint32_t channel_mask[8];
+
+} fhss_ws_configuration_t;
+
 /**
  * \brief Struct fhss_timer defines interface between FHSS and FHSS platform timer.
  * Application must implement FHSS timer driver which is then used by FHSS with this interface.
@@ -103,12 +140,6 @@ typedef struct fhss_synch_configuration
 
     /** Number of superframes. */
     uint8_t fhss_number_of_superframes;
-
-    /** Broadcast interval. Interval between started broadcast channels. (milliseconds) */
-    uint32_t fhss_broadcast_interval;
-
-    /** Broadcast dwell time. (milliseconds) */
-    uint8_t fhss_bc_dwell_interval;
 } fhss_synch_configuration_t;
 
 

nanostack/net_fhss.h

@@ -45,7 +45,7 @@ extern fhss_api_t *ns_fhss_create(const fhss_configuration_t *fhss_configuration
  * @param fhss_statistics FHSS statistics storage.
  * @return New FHSS instance if successful, NULL otherwise.
  */
-extern fhss_api_t *ns_fhss_ws_create(const fhss_configuration_t *fhss_configuration, const fhss_timer_t *fhss_timer, fhss_statistics_t *fhss_statistics);
+extern fhss_api_t *ns_fhss_ws_create(const fhss_ws_configuration_t *fhss_configuration, const fhss_timer_t *fhss_timer);
 
 /**
  * @brief Set synchronization time configuration for FHSS network. Should be only called from Border router.

source/Service_Libs/fhss/fhss_configuration_interface.c

@@ -46,14 +46,14 @@ fhss_api_t *ns_fhss_create(const fhss_configuration_t *fhss_configuration, const
     return this;
 }
 
-fhss_api_t *ns_fhss_ws_create(const fhss_configuration_t *fhss_configuration, const fhss_timer_t *fhss_timer, fhss_statistics_t *fhss_statistics)
+fhss_api_t *ns_fhss_ws_create(const fhss_ws_configuration_t *fhss_configuration, const fhss_timer_t *fhss_timer)
 {
     fhss_api_t *this = ns_dyn_mem_alloc(sizeof(fhss_api_t));
     if (!this) {
         return NULL;
     }
     // Create FHSS object
-    fhss_structure_t *fhss_struct = fhss_enable(this, fhss_configuration, fhss_timer, fhss_statistics);
+    fhss_structure_t *fhss_struct = fhss_enable(this, fhss_configuration, fhss_timer);
     if (!fhss_struct) {
         tr_err("Failed to enable FHSS");
         ns_dyn_mem_free(this);

source/Service_Libs/fhss/fhss_ws.h

@@ -18,14 +18,9 @@
 #define FHSS_WS_H_
 typedef struct fhss_ws fhss_ws_t;
 
-#define WS_FIXED_CHANNEL    0
-#define WS_TR51CF           1
-#define WS_DH1CF            2
-#define WS_VENDOR_DEF_CF    3
-
 struct fhss_ws
 {
-    uint8_t channel_function;
+    fhss_ws_channel_functions channel_function;
     uint16_t slot;
 };