FHSS: ws struct to hold ws specific parameters

Author: Jarkko Paso

source/Service_Libs/fhss/fhss.c

@@ -780,10 +780,11 @@ static void fhss_update_channel_callback(fhss_structure_t *fhss_structure)
     }
 }
 
-void fhss_set_internal_callbacks(fhss_structure_t *fhss_structure)
+int fhss_set_internal_callbacks(fhss_structure_t *fhss_structure)
 {
     fhss_structure->update_channel = fhss_update_channel_callback;
     fhss_structure->update_superframe = fhss_superframe_callback;
     fhss_structure->read_compensation = fhss_get_compensation;
     fhss_structure->handle_state_set = fhss_handle_state_set;
+    return 0;
 }

source/Service_Libs/fhss/fhss.h

@@ -41,7 +41,7 @@ int fhss_failed_handle_add(fhss_structure_t *fhss_structure, uint8_t handle);
 int fhss_failed_handle_remove(fhss_structure_t *fhss_structure, uint8_t handle);
 void fhss_failed_list_free(fhss_structure_t *fhss_structure);
 int fhss_reset_synch_monitor(fhss_synch_monitor_s *synch_monitor);
-void fhss_set_internal_callbacks(fhss_structure_t *fhss_structure);
+int fhss_set_internal_callbacks(fhss_structure_t *fhss_structure);
 
 #define MAX_FHSS_TIMER_DIVIDER  100
 #define SYNCH_MONITOR_AVG_SAMPLES   5

source/Service_Libs/fhss/fhss_common.c

@@ -232,6 +232,7 @@ int8_t fhss_disable(fhss_structure_t *fhss_structure)
         return -1;
     }
     fhss_destroy_scramble_table(fhss_structure);
+    ns_dyn_mem_free(fhss_structure->ws);
     ns_dyn_mem_free(fhss_structure);
     fhss_structure = 0;
     fhss_struct = 0;

source/Service_Libs/fhss/fhss_common.h

@@ -22,6 +22,7 @@
 #define FHSS_UPDATE_SYNCH_INFO_STORAGE      4
 
 typedef struct fhss_structure fhss_structure_t;
+struct fhss_ws;
 
 typedef struct fhss_beacon_info
 {
@@ -137,6 +138,8 @@ struct fhss_structure
     fhss_beacon_info_t *fhss_beacon_info_store;
     fhss_failed_tx_list_t fhss_failed_tx_list;
     fhss_statistics_t *fhss_stats_ptr;
+
+    struct fhss_ws *ws;
     fhss_update_channel_cb *update_channel;    /**< Update listening channel */
     fhss_update_superframe_cb *update_superframe;    /**< Update superframe */
     fhss_read_compensation_cb *read_compensation;    /**< Read FHSS compensation */

source/Service_Libs/fhss/fhss_ws.c

@@ -20,7 +20,10 @@
 #include "fhss_config.h"
 #include "fhss_common.h"
 #include "channel_functions.h"
+#include "fhss_ws.h"
+#include "nsdynmemLIB.h"
 #include "ns_trace.h"
+#include <string.h>
 
 #define TRACE_GROUP "fhss"
 
@@ -42,19 +45,34 @@ static void fhss_ws_superframe_callback(fhss_structure_t *fhss_structure)
 static void fhss_ws_update_channel_callback(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);
-    int32_t next_channel = fhss_structure->rx_channel = dh1cf_get_uc_channel_index(fhss_structure->uc_channel_index, mac_address, fhss_structure->number_of_channels);
-    fhss_structure->uc_channel_index++;
+    if (fhss_structure->ws->channel_function == WS_FIXED_CHANNEL) {
+
+    } else if (fhss_structure->ws->channel_function == WS_TR51CF) {
+
+    } else if (fhss_structure->ws->channel_function == WS_DH1CF) {
+        next_channel = fhss_structure->rx_channel = dh1cf_get_uc_channel_index(fhss_structure->ws->slot, mac_address, fhss_structure->number_of_channels);
+    } else if (fhss_structure->ws->channel_function == WS_VENDOR_DEF_CF) {
+        //TODO: Callback to get channel schedule from application
+    }
+    fhss_structure->ws->slot++;
 #ifdef FHSS_CHANNEL_DEBUG
-    tr_info("%"PRIu32" UC %u %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), fhss_structure->uc_channel_index-1, next_channel);
+    tr_info("%"PRIu32" UC %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), next_channel);
 #endif /*FHSS_CHANNEL_DEBUG*/
     fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, next_channel);
 }
 
-void fhss_ws_set_internal_callbacks(fhss_structure_t *fhss_structure)
+int fhss_ws_set_internal_callbacks(fhss_structure_t *fhss_structure)
 {
     fhss_structure->update_channel = fhss_ws_update_channel_callback;
     fhss_structure->update_superframe = fhss_ws_superframe_callback;
     fhss_structure->read_compensation = NULL;
     fhss_structure->handle_state_set = fhss_ws_handle_state_set;
+    fhss_structure->ws = ns_dyn_mem_alloc(sizeof(fhss_ws_t));
+    if (!fhss_structure->ws) {
+        return -1;
+    }
+    memset(fhss_structure->ws, 0, sizeof(fhss_ws_t));
+    return 0;
 }

source/Service_Libs/fhss/fhss_ws.h

@@ -14,5 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+typedef struct fhss_ws fhss_ws_t;
 
-void fhss_ws_set_internal_callbacks(fhss_structure_t *fhss_structure);
+#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;
+    uint16_t slot;
+};
+
+int fhss_ws_set_internal_callbacks(fhss_structure_t *fhss_structure);

test/nanostack/unittest/stub/fhss_stub.c

@@ -200,7 +200,7 @@ int fhss_handle_state_set(fhss_structure_t *fhss_structure, fhss_states fhss_sta
     return 0;
 }
 
-void fhss_set_internal_callbacks(fhss_structure_t *fhss_structure)
+int fhss_set_internal_callbacks(fhss_structure_t *fhss_structure)
 {
 
 }

test/nanostack/unittest/stub/fhss_ws_stub.c

@@ -23,7 +23,7 @@
 #include "Service_Libs/fhss/fhss.h"
 #include "Service_Libs/fhss/fhss_beacon.h"
 
-void fhss_ws_set_internal_callbacks(fhss_structure_t *fhss_structure)
+int fhss_ws_set_internal_callbacks(fhss_structure_t *fhss_structure)
 {
 
 }