Fixed FHSS configuration API

Disabled unicast and broadcast random fixed channel selection support.

Change-Id: I08c5750ddb0a29bb8faa7425ef9df18a80341abf

Author: Juha Heiskanen

nanostack/ws_management_api.h

@@ -246,9 +246,10 @@ int ws_management_fhss_timing_configure(
  * Change the default configuration for Wi-SUN FHSS operation.
  * if application defined is used the behaviour is undefined
  *
+ *
  * \param interface_id Network interface ID.
  * \param channel_function Unicast channel function.
- * \param fixed_channel Used channel when channel function is fixed channel. If 0xFFFF, randomly chosen channel is used.
+ * \param fixed_channel Used channel when channel function is fixed channel.
  * \param dwell_interval Used dwell interval when channel function is TR51 or DH1.
  *
  * \return 0, Init OK.
@@ -266,9 +267,10 @@ int ws_management_fhss_unicast_channel_function_configure(
  * Change the default configuration for Wi-SUN FHSS operation.
  * if application defined is used the behaviour is undefined
  *
+ *
  * \param interface_id Network interface ID.
  * \param channel_function Broadcast channel function.
- * \param fixed_channel Used channel when channel function is fixed channel. If 0xFFFF, randomly chosen channel is used.
+ * \param fixed_channel Used channel when channel function is fixed channel.
  * \param dwell_interval Broadcast channel dwell interval.
  * \param broadcast_interval Broadcast interval.
  *

source/6LoWPAN/ws/ws_management_api.c

@@ -241,8 +241,20 @@ int ws_management_fhss_unicast_channel_function_configure(
             channel_function != WS_TR51CF) {
         return -2;
     }
+
+    if (channel_function == WS_FIXED_CHANNEL && fixed_channel == 0xffff) {
+        fixed_channel = 0;
+        tr_warn("Fixed channel not configured. Set to 0");
+    }
+
+
     cur->ws_info->fhss_uc_channel_function = channel_function;
-    cur->ws_info->fhss_uc_fixed_channel = fixed_channel;
+    if (cur->ws_info->fhss_uc_channel_function == WS_FIXED_CHANNEL) {
+        cur->ws_info->fhss_uc_fixed_channel = fixed_channel;
+    } else {
+        cur->ws_info->fhss_uc_fixed_channel = 0xffff;
+    }
+
     cur->ws_info->fhss_uc_dwell_interval = dwell_interval;
 
     // if settings change reset_restart for the settings needed
@@ -273,8 +285,19 @@ int ws_management_fhss_broadcast_channel_function_configure(
             channel_function != WS_TR51CF) {
         return -2;
     }
+
+    if (channel_function == WS_FIXED_CHANNEL && fixed_channel == 0xffff) {
+        fixed_channel = 0;
+        tr_warn("Fixed channel not configured. Set to 0");
+    }
+
     cur->ws_info->fhss_bc_channel_function = channel_function;
-    cur->ws_info->fhss_bc_fixed_channel = fixed_channel;
+    if (cur->ws_info->fhss_bc_channel_function == WS_FIXED_CHANNEL) {
+        cur->ws_info->fhss_bc_fixed_channel = fixed_channel;
+    } else {
+        cur->ws_info->fhss_bc_fixed_channel = 0xffff;
+    }
+
     cur->ws_info->fhss_bc_dwell_interval = dwell_interval;
     cur->ws_info->fhss_bc_interval = broadcast_interval;
 

test/nanostack/unittest/6LoWPAN/ws_management_api/Makefile

@@ -11,6 +11,7 @@ TEST_SRC_FILES = \
         ws_management_api_test.cpp \
         test_ws_management_api.c \
         ../../stub/protocol_core_stub.c \
+        ../../stub/mbed_trace_stub.c \
         ../../stub/ws_common_stub.c \
         ../../stub/ws_bootstrap_stub.c \