lib,rlc_am_nr: cleanup logging of configuration

lib/src/rlc/rlc_am_base.cc

@@ -77,14 +77,30 @@ bool rlc_am::configure(const rlc_config_t& cfg_)
     return false;
   }
 
-  RlcInfo("configured - t_poll_retx=%d, poll_pdu=%d, poll_byte=%d, max_retx_thresh=%d, "
+  if (cfg.rat == srsran_rat_t::lte) {
-          "t_reordering=%d, t_status_prohibit=%d",
+    RlcInfo("AM LTE configured - t_poll_retx=%d, poll_pdu=%d, poll_byte=%d, max_retx_thresh=%d, "
-          cfg.am.t_poll_retx,
+            "t_reordering=%d, t_status_prohibit=%d",
-          cfg.am.poll_pdu,
+            cfg.am.t_poll_retx,
-          cfg.am.poll_byte,
+            cfg.am.poll_pdu,
-          cfg.am.max_retx_thresh,
+            cfg.am.poll_byte,
-          cfg.am.t_reordering,
+            cfg.am.max_retx_thresh,
-          cfg.am.t_status_prohibit);
+            cfg.am.t_reordering,
+            cfg.am.t_status_prohibit);
+  } else if (cfg.rat == srsran_rat_t::nr) {
+    RlcInfo("AM NR configured - tx_sn_field_length=%d, rx_sn_field_length=%d, "
+            "t_poll_retx=%d, poll_pdu=%d, poll_byte=%d, "
+            "max_retx_thresh=%d, t_reassembly=%d, t_status_prohibit=%d",
+            to_number(cfg.am_nr.tx_sn_field_length),
+            to_number(cfg.am_nr.rx_sn_field_length),
+            cfg.am_nr.t_poll_retx,
+            cfg.am_nr.poll_pdu,
+            cfg.am_nr.poll_byte,
+            cfg.am_nr.max_retx_thresh,
+            cfg.am_nr.t_reassembly,
+            cfg.am_nr.t_status_prohibit);
+  } else {
+    RlcError("Invalid RAT at entity configuration");
+  }
   return true;
 }
 

lib/src/rlc/rlc_am_nr.cc

@@ -71,7 +71,7 @@ bool rlc_am_nr_tx::configure(const rlc_config_t& cfg_)
 
   tx_enabled = true;
 
-  RlcDebug("RLC AM NR tx entity configured.");
+  RlcDebug("RLC AM NR configured tx entity.");
   return true;
 }
 
@@ -1034,7 +1034,6 @@ bool rlc_am_nr_rx::configure(const rlc_config_t& cfg_)
   // Configure t_reassembly timer
   if (cfg.t_reassembly > 0) {
     reassembly_timer.set(static_cast<uint32_t>(cfg.t_reassembly), [this](uint32_t timerid) { timer_expired(timerid); });
-    RlcInfo("configured reassembly timer. t-Reassembly=%d ms", cfg.t_reassembly);
   }
 
   mod_nr = cardinality(cfg.rx_sn_field_length);
@@ -1155,7 +1154,7 @@ void rlc_am_nr_rx::handle_data_pdu(uint8_t* payload, uint32_t nof_bytes)
      *     have been received.
      */
     if (rx_mod_base_nr(header.sn) == rx_mod_base_nr(st.rx_next)) {
-      uint32_t sn_upd     = 0;
+      uint32_t sn_upd = 0;
       // move rx_next forward and remove all fully received SDUs from rx_window
       for (sn_upd = (st.rx_next) % mod_nr; rx_mod_base_nr(sn_upd) < rx_mod_base_nr(st.rx_next_highest);
            sn_upd = (sn_upd + 1) % mod_nr) {