gnb,rrc_nr: move location of creation of nr srb PDCP configs to rrc_nr_utils.cc

lib/include/srsran/asn1/rrc_utils.h

@@ -94,7 +94,6 @@ void         to_asn1(asn1::rrc::rlc_cfg_c* asn1_type, const rlc_config_t& cfg);
  *      PDCP Config
  **************************/
 srsran::pdcp_config_t make_srb_pdcp_config_t(const uint8_t bearer_id, bool is_ue);
-srsran::pdcp_config_t make_nr_srb_pdcp_config_t(const uint8_t bearer_id, bool is_ue);
 srsran::pdcp_config_t make_drb_pdcp_config_t(const uint8_t bearer_id, bool is_ue);
 uint8_t               get_pdcp_drb_sn_len(const asn1::rrc::pdcp_cfg_s& pdcp_cfg);
 srsran::pdcp_config_t

lib/src/asn1/rrc_nr_utils.cc

@@ -163,6 +163,20 @@ int make_rlc_config_t(const rlc_cfg_c& asn1_type, uint8_t bearer_id, rlc_config_
   return SRSRAN_SUCCESS;
 }
 
+srsran::pdcp_config_t make_nr_srb_pdcp_config_t(const uint8_t bearer_id, bool is_ue)
+{
+  pdcp_config_t cfg(bearer_id,
+                    PDCP_RB_IS_SRB,
+                    is_ue ? SECURITY_DIRECTION_UPLINK : SECURITY_DIRECTION_DOWNLINK,
+                    is_ue ? SECURITY_DIRECTION_DOWNLINK : SECURITY_DIRECTION_UPLINK,
+                    PDCP_SN_LEN_12,
+                    pdcp_t_reordering_t::ms500,
+                    pdcp_discard_timer_t::infinity,
+                    false,
+                    srsran_rat_t::lte);
+  return cfg;
+}
+
 srsran::pdcp_config_t make_drb_pdcp_config_t(const uint8_t bearer_id, bool is_ue, const pdcp_cfg_s& pdcp_cfg)
 {
   // TODO: complete config processing

lib/src/asn1/rrc_utils.cc

@@ -215,20 +215,6 @@ srsran::pdcp_config_t make_srb_pdcp_config_t(const uint8_t bearer_id, bool is_ue
   return cfg;
 }
 
-srsran::pdcp_config_t make_nr_srb_pdcp_config_t(const uint8_t bearer_id, bool is_ue)
-{
-  pdcp_config_t cfg(bearer_id,
-                    PDCP_RB_IS_SRB,
-                    is_ue ? SECURITY_DIRECTION_UPLINK : SECURITY_DIRECTION_DOWNLINK,
-                    is_ue ? SECURITY_DIRECTION_DOWNLINK : SECURITY_DIRECTION_UPLINK,
-                    PDCP_SN_LEN_12,
-                    pdcp_t_reordering_t::ms500,
-                    pdcp_discard_timer_t::infinity,
-                    false,
-                    srsran_rat_t::lte);
-  return cfg;
-}
-
 srsran::pdcp_config_t make_drb_pdcp_config_t(const uint8_t bearer_id, bool is_ue)
 {
   pdcp_config_t cfg(bearer_id,