Adjust WS build configurations (ARMmbed#1744)

Arto Kinnunen · web-flow · commit 9ac47a8cb7cb · 2018-07-10T15:10:46.000+03:00
-Add ws_empty_functions to contain empty WS API functions
-Add fhss_ws_empty_functions to contain empty FHSS WS API functions
-Fix unused parameter warning
diff --git a/source/6LoWPAN/ws/ws_empty_functions.c b/source/6LoWPAN/ws/ws_empty_functions.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string.h>
+#include "nsconfig.h"
+#include "ns_types.h"
+#include "ns_trace.h"
+#include <ns_list.h>
+#include <nsdynmemLIB.h>
+#include "NWK_INTERFACE/Include/protocol.h"
+#include "6LoWPAN/ws/ws_common.h"
+
+#include "ws_management_api.h"
+
+#ifndef HAVE_WS
+int ws_management_node_init(
+    int8_t interface_id,
+    char *network_name_ptr,
+    fhss_timer_t *fhss_timer_ptr)
+{
+    (void)interface_id;
+    (void)network_name_ptr;
+    (void)fhss_timer_ptr;
+    return -1;
+}
+
+int ws_management_regulatory_domain_set(
+    int8_t interface_id,
+    uint8_t regulatory_domain,
+    uint8_t operating_class,
+    uint8_t operating_mode)
+{
+    (void)interface_id;
+    (void)regulatory_domain;
+    (void)operating_class;
+    (void)operating_mode;
+    return -1;
+}
+
+int ws_management_channel_mask_set(
+    int8_t interface_id,
+    uint32_t channel_mask[8])
+{
+    (void)interface_id;
+    (void)channel_mask;
+    return -1;
+}
+
+int ws_management_channel_plan_set(
+    int8_t interface_id,
+    uint8_t channel_plan,
+    uint8_t channel_function,
+    uint32_t ch0_freq, // Stack can not modify this
+    uint8_t channel_spacing,// Stack can not modify this
+    uint8_t number_of_channels)
+{
+    (void)interface_id;
+    (void)channel_plan;
+    (void)channel_function;
+    (void)ch0_freq;
+    (void)channel_spacing;
+    (void)number_of_channels;
+    return -1;
+}
+
+int ws_management_fhss_timing_configure(
+    int8_t interface_id,
+    uint8_t fhss_uc_dwell_interval,
+    uint32_t fhss_broadcast_interval,
+    uint8_t fhss_bc_dwell_interval)
+{
+    (void)interface_id;
+    (void)fhss_uc_dwell_interval;
+    (void)fhss_broadcast_interval;
+    (void)fhss_bc_dwell_interval;
+    return -1;
+}
+/* ### test api ### */
+int ws_test_pan_size_set(int8_t interface_id, uint16_t pan_size)
+{
+    (void) interface_id;
+    (void) pan_size;
+    return -1;
+}
+
+#endif // no HAVE_WS
+
diff --git a/source/6LoWPAN/ws/ws_management_api.c b/source/6LoWPAN/ws/ws_management_api.c
@@ -28,12 +28,13 @@
 
 #define TRACE_GROUP "wsmg"
 
+#ifdef HAVE_WS
+
 int ws_management_node_init(
     int8_t interface_id,
     char *network_name_ptr,
     fhss_timer_t *fhss_timer_ptr)
 {
-#ifdef HAVE_WS
     protocol_interface_info_entry_t *cur;
 
     cur = protocol_stack_interface_info_get_by_id(interface_id);
@@ -46,12 +47,6 @@ int ws_management_node_init(
     strncpy(cur->ws_info->network_name,network_name_ptr,32);
     cur->ws_info->fhss_timer_ptr = fhss_timer_ptr;
     return 0;
-#else
-    (void)interface_id;
-    (void)network_name_ptr;
-    (void)fhss_timer_ptr;
-    return -1;
-#endif
 }
 
 int ws_management_regulatory_domain_set(
@@ -60,7 +55,6 @@ int ws_management_regulatory_domain_set(
     uint8_t operating_class,
     uint8_t operating_mode)
 {
-#ifdef HAVE_WS
     uint8_t regulatory_domain_saved;
     uint8_t operating_class_saved;
     uint8_t operating_mode_saved;
@@ -87,20 +81,12 @@ int ws_management_regulatory_domain_set(
     // TODO update fields to llc
 
     return 0;
-#else
-    (void)interface_id;
-    (void)regulatory_domain;
-    (void)operating_class;
-    (void)operating_mode;
-    return -1;
-#endif
 }
 
 int ws_management_channel_mask_set(
     int8_t interface_id,
     uint32_t channel_mask[8])
 {
-#ifdef HAVE_WS
     protocol_interface_info_entry_t *cur;
 
     cur = protocol_stack_interface_info_get_by_id(interface_id);
@@ -109,12 +95,6 @@ int ws_management_channel_mask_set(
     }
     memcpy(cur->ws_info->hopping_schdule.channel_mask, channel_mask, sizeof(uint32_t)*8);
     return 0;
-
-#else
-    (void)interface_id;
-    (void)channel_mask;
-    return -1;
-#endif
 }
 
 int ws_management_channel_plan_set(
@@ -125,7 +105,6 @@ int ws_management_channel_plan_set(
     uint8_t channel_spacing,// Stack can not modify this
     uint8_t number_of_channels)
 {
-#ifdef HAVE_WS
     protocol_interface_info_entry_t *cur;
 
     cur = protocol_stack_interface_info_get_by_id(interface_id);
@@ -140,15 +119,6 @@ int ws_management_channel_plan_set(
 
     // TODO update fields to llc
     return 0;
-#else
-    (void)interface_id;
-    (void)channel_plan;
-    (void)channel_function;
-    (void)ch0_freq;
-    (void)channel_spacing;
-    (void)number_of_channels;
-    return -1;
-#endif
 }
 
 int ws_management_fhss_timing_configure(
@@ -157,7 +127,6 @@ int ws_management_fhss_timing_configure(
     uint32_t fhss_broadcast_interval,
     uint8_t fhss_bc_dwell_interval)
 {
-#ifdef HAVE_WS
     protocol_interface_info_entry_t *cur;
 
     cur = protocol_stack_interface_info_get_by_id(interface_id);
@@ -168,11 +137,6 @@ int ws_management_fhss_timing_configure(
     cur->ws_info->hopping_schdule.fhss_broadcast_interval = fhss_broadcast_interval;
     cur->ws_info->hopping_schdule.fhss_bc_dwell_interval = fhss_bc_dwell_interval;
     return 0;
-#else
-    (void)interface_id;
-    (void)fhss_uc_dwell_interval;
-    (void)fhss_broadcast_interval;
-    (void)fhss_bc_dwell_interval;
-    return -1;
-#endif
 }
+
+#endif // HAVE_WS
diff --git a/source/6LoWPAN/ws/ws_test_api.c b/source/6LoWPAN/ws/ws_test_api.c
@@ -42,16 +42,14 @@
 
 #define TRACE_GROUP "wste"
 
+#ifdef HAVE_WS
 
 int ws_test_pan_size_set(int8_t interface_id, uint16_t pan_size)
 {
-#ifdef HAVE_WS
+
     (void) interface_id;
     test_pan_size_override = pan_size;
     return 0;
-#else
-    (void) interface_id;
-    (void) pan_size;
-    return -1;
-#endif
 }
+
+#endif // HAVE_WS
diff --git a/source/NWK_INTERFACE/protocol_core.c b/source/NWK_INTERFACE/protocol_core.c
@@ -777,6 +777,8 @@ protocol_interface_info_entry_t *protocol_stack_interface_info_get_by_fhss_api(c
             return cur;
         }
     }
+#else
+    (void)fhss_api;
 #endif //HAVE_WS
     return NULL;
 }
diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
@@ -42,6 +42,8 @@
 #define WH_SUB_ID_UTT   1
 #define WH_SUB_ID_BT    2
 
+#ifdef HAVE_WS
+
 struct ws_ie_t {
     uint8_t *content_ptr;
     unsigned length:7;
@@ -629,3 +631,5 @@ int fhss_ws_set_hop_count(fhss_structure_t *fhss_structure, const uint8_t hop_co
     fhss_structure->own_hop = hop_count;
     return 0;
 }
+
+#endif // HAVE_WS
diff --git a/source/Service_Libs/fhss/fhss_ws_empty_functions.c b/source/Service_Libs/fhss/fhss_ws_empty_functions.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "nsconfig.h"
+#include "ns_types.h"
+#include "fhss_api.h"
+#include "fhss_config.h"
+#include "fhss.h"
+#include "fhss_common.h"
+#include "channel_list.h"
+#include "channel_functions.h"
+#include "fhss_ws.h"
+#include "nsdynmemLIB.h"
+#include "common_functions.h"
+#include "eventOS_callback_timer.h"
+#include "randLIB.h"
+#include <string.h>
+
+#ifndef HAVE_WS
+
+fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configuration_t *fhss_configuration, const fhss_timer_t *fhss_timer)
+{
+    (void) fhss_api;
+    (void) fhss_configuration;
+    (void) fhss_timer;
+
+    return NULL;
+}
+
+int fhss_ws_set_callbacks(fhss_structure_t *fhss_structure)
+{
+    (void) fhss_structure;
+    return -1;
+}
+
+int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8], const broadcast_timing_info_t *bc_timing_info)
+{
+    (void) fhss_structure;
+    (void) eui64;
+    (void) bc_timing_info;
+
+    return -1;
+}
+
+int fhss_ws_remove_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8])
+{
+    (void) fhss_structure;
+    (void) eui64;
+
+    return -1;
+}
+
+int fhss_ws_configuration_set(fhss_structure_t *fhss_structure, const fhss_ws_configuration_t *fhss_configuration)
+{
+    (void) fhss_structure;
+    (void) fhss_configuration;
+
+    return -1;
+}
+
+int fhss_ws_set_hop_count(fhss_structure_t *fhss_structure, const uint8_t hop_count)
+{
+    (void) fhss_structure;
+    (void) hop_count;
+
+    return -1;
+}
+
+#endif // HAVE_WS
+
diff --git a/sources.mk b/sources.mk
@@ -27,6 +27,7 @@ SRCS += \
 	source/6LoWPAN/ws/ws_management_api.c \
 	source/6LoWPAN/ws/ws_bbr_api.c \
 	source/6LoWPAN/ws/ws_test_api.c \
+	source/6LoWPAN/ws/ws_empty_functions.c \
 	source/BorderRouter/border_router.c \
 	source/Common_Protocols/icmpv6.c \
 	source/Common_Protocols/icmpv6_prefix.c \
@@ -99,6 +100,7 @@ SRCS += \
 	source/Service_Libs/fhss/fhss_statistics.c \
 	source/Service_Libs/fhss/fhss.c \
 	source/Service_Libs/fhss/fhss_ws.c \
+	source/Service_Libs/fhss/fhss_ws_empty_functions.c \
 	source/Service_Libs/fhss/fhss_common.c \
 	source/Service_Libs/fhss/channel_functions.c \
 	source/Service_Libs/fhss/channel_list.c \

Original file line number	Diff line number	Diff line change
`@@ -777,6 +777,8 @@ protocol_interface_info_entry_t *protocol_stack_interface_info_get_by_fhss_api(c`
`777`	`777`	`return cur;`
`778`	`778`	`}`
`779`	`779`	`}`
	`780`	`+#else`
	`781`	`+ (void)fhss_api;`
`780`	`782`	`#endif //HAVE_WS`
`781`	`783`	`return NULL;`
`782`	`784`	`}`