sched: add enum for pucch resource set id

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

include/srsran/ran/pucch/pucch_configuration.h

@@ -168,7 +168,7 @@ struct pucch_resource {
 /// \ref pucch_config.
 struct pucch_resource_set {
   /// \c PUCCH-ResourceSetId.
-  uint8_t pucch_res_set_id;
+  pucch_res_set_idx pucch_res_set_id;
   /// \c resourceList.
   static_vector<pucch_res_id_t, MAX_NOF_PUCCH_RESOURCES_PER_PUCCH_RESOURCE_SET> pucch_res_id_list;
   /// \c maxPayloadSize.

include/srsran/ran/pucch/pucch_mapping.h

@@ -24,6 +24,15 @@ enum class pucch_group_hopping {
   DISABLE
 };
 
+/// \brief PUCCH resource set index, as per \c PUCCH-ResourceSetId, TS 38.331.
+/// At the moment, we only supports PUCCH resource set index 0 and 1.
+enum class pucch_res_set_idx : uint8_t { set_0 = 0, set_1 };
+
+inline uint8_t pucch_res_set_idx_to_uint(pucch_res_set_idx format)
+{
+  return static_cast<uint8_t>(format);
+}
+
 /// \brief PUCCH Formats as described in TS38.213 Section 9.2.
 enum class pucch_format : uint8_t { FORMAT_0, FORMAT_1, FORMAT_2, FORMAT_3, FORMAT_4, NOF_FORMATS };
 

lib/du_manager/converters/asn1_rrc_config_helpers.cpp

@@ -1289,7 +1289,7 @@ static bool calculate_bwp_dl_dedicated_diff(asn1::rrc_nr::bwp_dl_ded_s&   out,
 asn1::rrc_nr::pucch_res_set_s srsran::srs_du::make_asn1_rrc_pucch_resource_set(const pucch_resource_set& cfg)
 {
   pucch_res_set_s pucch_res_set;
-  pucch_res_set.pucch_res_set_id = cfg.pucch_res_set_id;
+  pucch_res_set.pucch_res_set_id = static_cast<uint8_t>(cfg.pucch_res_set_id);
   for (const auto& it : cfg.pucch_res_id_list) {
     pucch_res_set.res_list.push_back(it.ue_res_id);
   }
@@ -1517,7 +1517,7 @@ calculate_pucch_config_diff(asn1::rrc_nr::pucch_cfg_s& out, const pucch_config&
       src.pucch_res_set,
       dest.pucch_res_set,
       [](const pucch_resource_set& res_set) { return make_asn1_rrc_pucch_resource_set(res_set); },
-      [](const pucch_resource_set& res_set) { return res_set.pucch_res_set_id; });
+      [](const pucch_resource_set& res_set) { return static_cast<uint8_t>(res_set.pucch_res_set_id); });
 
   // PUCCH Resource.
   calculate_addmodremlist_diff(

lib/du_manager/ran_resource_management/pucch_resource_generator.cpp

@@ -573,22 +573,21 @@ bool srsran::srs_du::ue_pucch_config_builder(serving_cell_config&
     return false;
   }
 
-  const unsigned f1_pucch_res_set_id = 0;
-  const unsigned f2_pucch_res_set_id = 1;
-
   // PUCCH resource ID corresponding to \c pucch-ResourceId, as part of \c PUCCH-Resource, in \c PUCCH-Config,
   // TS 38.331. By default, we index the PUCCH resource ID for ASN1 message from 0 to pucch_res_list.size() - 1.
   unsigned ue_pucch_res_id = 0;
 
   pucch_config& pucch_cfg = serv_cell_cfg.ul_config.value().init_ul_bwp.pucch_cfg.value();
   // Clears current PUCCH resource list and PUCCH resource list set 0 and 1.
   pucch_cfg.pucch_res_list.clear();
-  pucch_cfg.pucch_res_set[f1_pucch_res_set_id].pucch_res_id_list.clear();
-  pucch_cfg.pucch_res_set[f2_pucch_res_set_id].pucch_res_id_list.clear();
+  pucch_cfg.pucch_res_set[pucch_res_set_idx_to_uint(pucch_res_set_idx::set_0)].pucch_res_id_list.clear();
+  pucch_cfg.pucch_res_set[pucch_res_set_idx_to_uint(pucch_res_set_idx::set_1)].pucch_res_id_list.clear();
 
   // Ensure the PUCCH resource sets ID are 0 and 1.
-  pucch_cfg.pucch_res_set[f1_pucch_res_set_id].pucch_res_set_id = f1_pucch_res_set_id;
-  pucch_cfg.pucch_res_set[f2_pucch_res_set_id].pucch_res_set_id = f2_pucch_res_set_id;
+  pucch_cfg.pucch_res_set[pucch_res_set_idx_to_uint(pucch_res_set_idx::set_0)].pucch_res_set_id =
+      pucch_res_set_idx::set_0;
+  pucch_cfg.pucch_res_set[pucch_res_set_idx_to_uint(pucch_res_set_idx::set_1)].pucch_res_set_id =
+      pucch_res_set_idx::set_1;
 
   // Add F1 for HARQ.
   const unsigned f1_idx_offset = (du_harq_set_idx % nof_harq_pucch_sets) * nof_ue_pucch_f1_res_harq.to_uint();
@@ -603,7 +602,7 @@ bool srsran::srs_du::ue_pucch_config_builder(serving_cell_config&
                                                          .format_params  = cell_res.format_params});
 
     // Add PUCCH resource index to pucch_res_id_list of PUCCH resource set id=0.
-    pucch_cfg.pucch_res_set[f1_pucch_res_set_id].pucch_res_id_list.emplace_back(
+    pucch_cfg.pucch_res_set[pucch_res_set_idx_to_uint(pucch_res_set_idx::set_0)].pucch_res_id_list.emplace_back(
         pucch_res_id_t{cell_res.res_id.cell_res_id, ue_pucch_res_id});
 
     // Increment the PUCCH resource ID for ASN1 message.
@@ -635,7 +634,7 @@ bool srsran::srs_du::ue_pucch_config_builder(serving_cell_config&
                                                          .format_params  = cell_res.format_params});
 
     // Add PUCCH resource index to pucch_res_id_list of PUCCH resource set id=1.
-    pucch_cfg.pucch_res_set[f2_pucch_res_set_id].pucch_res_id_list.emplace_back(
+    pucch_cfg.pucch_res_set[pucch_res_set_idx_to_uint(pucch_res_set_idx::set_1)].pucch_res_id_list.emplace_back(
         pucch_res_id_t{cell_res.res_id.cell_res_id, ue_pucch_res_id});
     // Increment the PUCCH resource ID for ASN1 message.
     ++ue_pucch_res_id;

lib/scheduler/config/serving_cell_config_factory.cpp

@@ -527,14 +527,14 @@ uplink_config srsran::config_helpers::make_default_ue_uplink_config(const cell_c
 
   // PUCCH Resource Set ID 0. This is for PUCCH Format 1 only (Format 0 not yet supported), used for HARQ-ACK only.
   auto& pucch_res_set_0            = pucch_cfg.pucch_res_set.emplace_back();
-  pucch_res_set_0.pucch_res_set_id = 0;
+  pucch_res_set_0.pucch_res_set_id = pucch_res_set_idx::set_0;
   pucch_res_set_0.pucch_res_id_list.emplace_back(pucch_res_id_t{0, 0});
   pucch_res_set_0.pucch_res_id_list.emplace_back(pucch_res_id_t{1, 1});
   pucch_res_set_0.pucch_res_id_list.emplace_back(pucch_res_id_t{2, 2});
 
   // PUCCH Resource Set ID 1. This is for PUCCH Format 2 only and used for HARQ-ACK + optionally SR and/or CSI.
   auto& pucch_res_set_1            = pucch_cfg.pucch_res_set.emplace_back();
-  pucch_res_set_1.pucch_res_set_id = 1;
+  pucch_res_set_1.pucch_res_set_id = pucch_res_set_idx::set_1;
   pucch_res_set_1.pucch_res_id_list.emplace_back(pucch_res_id_t{3, 3});
   pucch_res_set_1.pucch_res_id_list.emplace_back(pucch_res_id_t{4, 4});
   pucch_res_set_1.pucch_res_id_list.emplace_back(pucch_res_id_t{5, 5});

lib/scheduler/config/serving_cell_config_validator.cpp

@@ -138,7 +138,8 @@ validator_result srsran::config_validators::validate_pucch_cfg(const serving_cel
   // Verify that the PUCCH resources IDs of each PUCCH resource set point at a corresponding item in the PUCCH reource
   // list.
   VERIFY(pucch_cfg.pucch_res_set.size() >= 2, "At least 2 PUCCH resource sets need to be configured in PUCCH-Config");
-  VERIFY(pucch_cfg.pucch_res_set[0].pucch_res_set_id == 0 and pucch_cfg.pucch_res_set[1].pucch_res_set_id == 1,
+  VERIFY(pucch_cfg.pucch_res_set[0].pucch_res_set_id == pucch_res_set_idx::set_0 and
+             pucch_cfg.pucch_res_set[1].pucch_res_set_id == pucch_res_set_idx::set_1,
          "PUCCH resouce sets 0 and 1 are expected to have PUCCH-ResourceSetId 0 and 1, respectively");
   VERIFY((not pucch_cfg.pucch_res_set[0].pucch_res_id_list.empty()) and
              (not pucch_cfg.pucch_res_set[1].pucch_res_id_list.empty()),

lib/scheduler/pucch_scheduling/pucch_allocator_impl.h

@@ -87,9 +87,6 @@ class pucch_allocator_impl final : public pucch_allocator
     unsigned r_pucch;
   };
 
-  // At the moment, we only supports PUCCH resource set index 0 and 1.
-  enum class pucch_res_set_idx : uint8_t { set_0 = 0, set_1 };
-
   struct harq_res_id {
     pucch_res_set_idx pucch_set_idx = pucch_res_set_idx::set_0;
     uint8_t           pucch_res_ind = 0;

tests/unittests/du_manager/serving_cell_config_converter_test.cpp

@@ -403,7 +403,7 @@ TEST(serving_cell_config_converter_test, test_ue_custom_pucch_cfg_conversion)
 
   // >> PUCCH Resource Set 1.
   dest_pucch_cfg.pucch_res_set.emplace_back();
-  dest_pucch_cfg.pucch_res_set.back().pucch_res_set_id = 1;
+  dest_pucch_cfg.pucch_res_set.back().pucch_res_set_id = srsran::pucch_res_set_idx::set_1;
   dest_pucch_cfg.pucch_res_set.back().pucch_res_id_list.emplace_back(pucch_res_id_t{1, 1});
   // Remove first element.
   dest_pucch_cfg.pucch_res_set.erase(dest_pucch_cfg.pucch_res_set.begin());

tests/unittests/scheduler/test_utils/config_generators.h

@@ -134,13 +134,13 @@ inline uplink_config make_test_ue_uplink_config(const config_helpers::cell_confi
   auto& pucch_cfg = ul_config.init_ul_bwp.pucch_cfg.value();
   // PUCCH Resource Set ID 0.
   auto& pucch_res_set_0            = pucch_cfg.pucch_res_set.emplace_back();
-  pucch_res_set_0.pucch_res_set_id = 0;
+  pucch_res_set_0.pucch_res_set_id = pucch_res_set_idx::set_0;
   pucch_res_set_0.pucch_res_id_list.emplace_back(pucch_res_id_t{0, 0});
   pucch_res_set_0.pucch_res_id_list.emplace_back(pucch_res_id_t{1, 1});
   pucch_res_set_0.pucch_res_id_list.emplace_back(pucch_res_id_t{2, 2});
 
   auto& pucch_res_set_1            = pucch_cfg.pucch_res_set.emplace_back();
-  pucch_res_set_1.pucch_res_set_id = 1;
+  pucch_res_set_1.pucch_res_set_id = pucch_res_set_idx::set_1;
   pucch_res_set_1.pucch_res_id_list.emplace_back(pucch_res_id_t{3, 3});
   pucch_res_set_1.pucch_res_id_list.emplace_back(pucch_res_id_t{4, 4});
   pucch_res_set_1.pucch_res_id_list.emplace_back(pucch_res_id_t{5, 5});

tests/unittests/scheduler/uci_and_pucch/pucch_res_manager_test.cpp

@@ -425,8 +425,8 @@ class test_pucch_res_manager_multiple_cfg : public test_pucch_resource_manager
     default_pucch_cfg.pucch_res_set[1].pucch_res_id_list.clear();
 
     // Ensure the PUCCH resource sets ID are 0 and 1.
-    default_pucch_cfg.pucch_res_set[0].pucch_res_set_id = 0;
-    default_pucch_cfg.pucch_res_set[1].pucch_res_set_id = 1;
+    default_pucch_cfg.pucch_res_set[0].pucch_res_set_id = srsran::pucch_res_set_idx::set_0;
+    default_pucch_cfg.pucch_res_set[1].pucch_res_set_id = srsran::pucch_res_set_idx::set_1;
 
     const unsigned tot_ue_f1_res = nof_ue_pucch_f1_res_harq + nof_ue_pucch_f1_res_sr;
     const unsigned tot_ue_f2_res = nof_ue_pucch_f2_res_harq + nof_ue_pucch_f2_res_csi;