removed commented code and fixed interfaces

lib/include/srslte/interfaces/gnb_interfaces.h

@@ -81,7 +81,9 @@ public:
   virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0;
 };
 
-/* PDCP Interfaces */
+/*****************************
+ *      PDCP INTERFACES
+ ****************************/
 class pdcp_interface_rlc_nr
 {
 public:
@@ -106,14 +108,6 @@ public:
   virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t pdu) = 0;
 };
 
-class s1ap_interface_rrc_nr
-{};
-class gtpu_interface_sdap_nr
-{
-public:
-  virtual void write_pdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t pdu) = 0;
-};
-
 /*****************************
  *      SDAP INTERFACES
  ****************************/
@@ -136,6 +130,12 @@ class gtpu_interface_rrc_nr
 public:
 };
 
+class gtpu_interface_sdap_nr
+{
+public:
+  virtual void write_pdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t pdu) = 0;
+};
+
 /*****************************
  *      RRC INTERFACES
  ****************************/

lib/include/srslte/interfaces/ue_interfaces.h

@@ -162,11 +162,11 @@ public:
 
   const static int MAX_FOUND_PLMNS = 16;
 
-  virtual ~rrc_interface_nas()                                                           = default;
-  virtual void        write_sdu(srslte::unique_byte_buffer_t sdu)                        = 0;
-  virtual uint16_t    get_mcc()                                                          = 0;
-  virtual uint16_t    get_mnc()                                                          = 0;
-  virtual void        enable_capabilities()                                              = 0;
+  virtual ~rrc_interface_nas()                                                          = default;
+  virtual void        write_sdu(srslte::unique_byte_buffer_t sdu)                       = 0;
+  virtual uint16_t    get_mcc()                                                         = 0;
+  virtual uint16_t    get_mnc()                                                         = 0;
+  virtual void        enable_capabilities()                                             = 0;
   virtual bool        plmn_search()                                                     = 0;
   virtual void        plmn_select(srslte::plmn_id_t plmn_id)                            = 0;
   virtual bool        connection_request(srslte::establishment_cause_t cause,
@@ -613,8 +613,7 @@ public:
 };
 
 class gw_interface_stack : public gw_interface_nas, public gw_interface_rrc, public gw_interface_pdcp
-{
-};
+{};
 
 // STACK interface for RRC
 class stack_interface_rrc : public srslte::task_handler_interface
@@ -635,8 +634,7 @@ public:
 
 // Combined interface for stack (MAC and RRC) to access PHY
 class phy_interface_stack_lte : public phy_interface_mac_lte, public phy_interface_rrc_lte
-{
-};
+{};
 
 } // namespace srsue
 

lib/src/asn1/rrc_asn1_utils.cc

@@ -64,7 +64,6 @@ plmn_id_t make_plmn_id_t(const asn1::fixed_octstring<3, true>& asn1_type) // use
   plmn_id_t plmn;
   uint16_t  mcc, mnc;
   uint32_t  encoded_plmn = asn1_type.to_number();
-  //  uint32_t encoded_plmn = (asn1_type[0] << 16u) + (asn1_type[1] << 8u) + (asn1_type[2] << 0u);
   s1ap_plmn_to_mccmnc(encoded_plmn, &mcc, &mnc);
   plmn.from_number(mcc, mnc);
   return plmn;
@@ -76,7 +75,6 @@ void to_asn1(asn1::fixed_octstring<3, true>* asn1_type, const plmn_id_t& cfg)
   cfg.to_number(&mcc, &mnc);
   uint32_t encoded_plmn;
   s1ap_mccmnc_to_plmn(mcc, mnc, &encoded_plmn);
-  //  uint32_t tmp32        = htonl(encoded_plmn);
   asn1_type->from_number(encoded_plmn);
 }