fapi: using the slot PDU constants for UL_TTI.request, SRS.indication and UCI.indication

Author: AlaiaL

include/srsran/fapi/messages.h

@@ -781,14 +781,12 @@ struct ul_tti_request_message : public base_message {
 
   /// Maximum number of supported UL PDU types in this release.
   static constexpr unsigned MAX_NUM_UL_TYPES = 6;
-  /// Maximum number of supported UL PDUs in this message.
-  static constexpr unsigned MAX_NUM_UL_PDUS = 128;
-
-  uint16_t                                           sfn;
-  uint16_t                                           slot;
-  std::array<uint16_t, MAX_NUM_UL_TYPES>             num_pdus_of_each_type;
-  uint16_t                                           num_groups;
-  static_vector<ul_tti_request_pdu, MAX_NUM_UL_PDUS> pdus;
+
+  uint16_t                                                sfn;
+  uint16_t                                                slot;
+  std::array<uint16_t, MAX_NUM_UL_TYPES>                  num_pdus_of_each_type;
+  uint16_t                                                num_groups;
+  static_vector<ul_tti_request_pdu, MAX_UL_PDUS_PER_SLOT> pdus;
   //: TODO: groups array
 };
 
@@ -1036,13 +1034,9 @@ struct uci_indication_pdu {
 
 /// UCI indication message.
 struct uci_indication_message : public base_message {
-  /// Maximum number of supported UCI PDUs in this message.
-  //: TODO: shared with ul_dci_request_message
-  static constexpr unsigned MAX_NUM_UCI_PDUS = 128;
-
-  uint16_t                                            sfn;
-  uint16_t                                            slot;
-  static_vector<uci_indication_pdu, MAX_NUM_UCI_PDUS> pdus;
+  uint16_t                                                    sfn;
+  uint16_t                                                    slot;
+  static_vector<uci_indication_pdu, MAX_UCI_PDUS_PER_UCI_IND> pdus;
 };
 
 /// Encodes the PRGs.
@@ -1132,13 +1126,10 @@ struct srs_indication_pdu {
 
 /// SRS indication message.
 struct srs_indication_message : public base_message {
-  /// Maximum number of supported SRS PDUs in this message.
-  static constexpr unsigned MAX_NUM_SRS_PDUS = 32;
-
-  uint16_t                                            sfn;
-  uint16_t                                            slot;
-  uint16_t                                            control_length;
-  static_vector<srs_indication_pdu, MAX_NUM_SRS_PDUS> pdus;
+  uint16_t                                                    sfn;
+  uint16_t                                                    slot;
+  uint16_t                                                    control_length;
+  static_vector<srs_indication_pdu, MAX_SRS_PDUS_PER_SRS_IND> pdus;
 };
 
 /// RACH indication pdu preamble.

include/srsran/scheduler/scheduler_slot_handler.h

@@ -569,7 +569,7 @@ struct ul_sched_result {
   /// PUCCH grants allocated in the current slot.
   static_vector<pucch_info, MAX_PUCCH_PDUS_PER_SLOT> pucchs;
   /// SRS grants allocated in the current slot.
-  static_vector<srs_info, MAX_PUCCH_PDUS_PER_SLOT> srss;
+  static_vector<srs_info, MAX_SRS_PDUS_PER_SLOT> srss;
 };
 
 /// Scheduler decision made for DL and UL in a given slot.