FHSS: Do not use broadcast queue when fixed channel

Author: Jarkko Paso

source/Service_Libs/fhss/fhss.c

@@ -1200,6 +1200,20 @@ static bool fhss_is_broadcast_channel_callback(const fhss_api_t *api)
     return fhss_is_current_channel_broadcast(fhss_structure);
 }
 
+static bool fhss_use_broadcast_queue_cb(const fhss_api_t *api, bool is_broadcast_addr, int frame_type)
+{
+    fhss_structure_t *fhss_structure = fhss_get_object_with_api(api);
+    if (!fhss_structure) {
+        return false;
+    }
+    // Synch requests are always stored in unicast queue
+    if (frame_type == FHSS_SYNCH_REQUEST_FRAME) {
+        return false;
+    }
+    // Broadcast packets are stored in broadcast queue
+    return is_broadcast_addr;
+}
+
 static void fhss_superframe_handler(const fhss_api_t *fhss_api, uint16_t delay)
 {
     uint32_t timeout = 0;

source/Service_Libs/fhss/fhss_common.c

@@ -239,20 +239,6 @@ int fhss_compare_with_synch_parent_address(fhss_structure_t *fhss_structure, con
     return ret_val;
 }
 
-bool fhss_use_broadcast_queue_cb(const fhss_api_t *api, bool is_broadcast_addr, int frame_type)
-{
-    fhss_structure_t *fhss_structure = fhss_get_object_with_api(api);
-    if (!fhss_structure) {
-        return false;
-    }
-    // Synch requests are always stored in unicast queue
-    if (frame_type == FHSS_SYNCH_REQUEST_FRAME) {
-        return false;
-    }
-    // Broadcast packets are stored in broadcast queue
-    return is_broadcast_addr;
-}
-
 uint32_t fhss_read_timestamp_cb(const fhss_api_t *api)
 {
     fhss_structure_t *fhss_structure = fhss_get_object_with_api(api);

source/Service_Libs/fhss/fhss_common.h

@@ -67,7 +67,6 @@ int fhss_update_synch_parent_address(fhss_structure_t *fhss_structure);
 void fhss_trig_event(fhss_structure_t *fhss_structure, uint8_t event_type);
 int fhss_get_parent_address(fhss_structure_t *fhss_structure, uint8_t *p_addr);
 int fhss_compare_with_synch_parent_address(fhss_structure_t *fhss_structure, const uint8_t *source_addr);
-bool fhss_use_broadcast_queue_cb(const fhss_api_t *api, bool is_broadcast_addr, int frame_type);
 uint32_t fhss_read_timestamp_cb(const fhss_api_t *api);
 int fhss_init_callbacks_cb(const fhss_api_t *api, fhss_callback_t *callbacks);
 int fhss_failed_handle_remove(fhss_structure_t *fhss_structure, uint8_t handle);

source/Service_Libs/fhss/fhss_ws.c

@@ -455,6 +455,21 @@ static bool fhss_ws_is_broadcast_channel_callback(const fhss_api_t *api)
     return fhss_structure->ws->is_on_bc_channel;
 }
 
+static bool fhss_ws_use_broadcast_queue_cb(const fhss_api_t *api, bool is_broadcast_addr, int frame_type)
+{
+    (void) frame_type;
+    fhss_structure_t *fhss_structure = fhss_get_object_with_api(api);
+    if (!fhss_structure) {
+        return false;
+    }
+    // Do not use broadcast queue when fixed channel
+    if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_FIXED_CHANNEL) {
+        return false;
+    }
+    // Broadcast packets are stored in broadcast queue
+    return is_broadcast_addr;
+}
+
 static void fhss_unicast_handler(const fhss_api_t *fhss_api, uint16_t delay)
 {
     uint32_t timeout = 0;
@@ -489,7 +504,7 @@ int fhss_ws_set_callbacks(fhss_structure_t *fhss_structure)
 {
     // Set external API
     fhss_structure->fhss_api->is_broadcast_channel = &fhss_ws_is_broadcast_channel_callback;
-    fhss_structure->fhss_api->use_broadcast_queue = &fhss_use_broadcast_queue_cb;
+    fhss_structure->fhss_api->use_broadcast_queue = &fhss_ws_use_broadcast_queue_cb;
     fhss_structure->fhss_api->tx_handle = &fhss_ws_tx_handle_callback;
     fhss_structure->fhss_api->check_tx_conditions = &fhss_ws_check_tx_conditions_callback;
     fhss_structure->fhss_api->receive_frame = &fhss_ws_receive_frame_callback;