FHSS WS: Initialize broadcast channel count when enabling FHSS (ARMmbed#2642)

Author: Jarkko Paso

source/Service_Libs/fhss/fhss_ws.c

@@ -130,10 +130,10 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
         tr_err("Invalid FHSS enable configuration");
         return NULL;
     }
-    int channel_count = channel_list_count_channels(fhss_configuration->channel_mask);
+    int bc_channel_count = channel_list_count_channels(fhss_configuration->channel_mask);
     int uc_channel_count = channel_list_count_channels(fhss_configuration->unicast_channel_mask);
 
-    if (channel_count <= 0) {
+    if (bc_channel_count <= 0) {
         // There must be at least one configured channel in channel list
         return NULL;
     }
@@ -147,7 +147,7 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
         return NULL;
     }
     memset(fhss_struct->ws, 0, sizeof(fhss_ws_t));
-    if (fhss_ws_manage_channel_table_allocation(fhss_struct, channel_count)) {
+    if (fhss_ws_manage_channel_table_allocation(fhss_struct, uc_channel_count > bc_channel_count ? uc_channel_count : bc_channel_count)) {
         ns_dyn_mem_free(fhss_struct->ws);
         fhss_free_instance(fhss_api);
         tr_error("Failed to allocate channel tables");
@@ -161,10 +161,12 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
         for (uint8_t i = 0; i < 8; i++) {
             fhss_struct->ws->fhss_configuration.unicast_channel_mask[i] = fhss_configuration->channel_mask[i];
         }
-        uc_channel_count = channel_count;
+        uc_channel_count = bc_channel_count;
     }
-    fhss_struct->number_of_channels = channel_count;
+
+    fhss_struct->number_of_channels = fhss_configuration->channel_mask_size;
     fhss_struct->number_of_uc_channels = uc_channel_count;
+    fhss_struct->number_of_bc_channels = bc_channel_count;
     fhss_struct->optimal_packet_length = OPTIMAL_PACKET_LENGTH;
     fhss_ws_set_hop_count(fhss_struct, 0xff);
     fhss_struct->rx_channel = fhss_configuration->unicast_fixed_channel;