removed commented code and fixed interfaces

master
Francisco Paisana 5 years ago committed by Francisco Paisana
parent b4b5cd7cd6
commit 2da8c923b1

@ -81,7 +81,9 @@ public:
virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0; 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 class pdcp_interface_rlc_nr
{ {
public: public:
@ -106,14 +108,6 @@ public:
virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t pdu) = 0; 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 * SDAP INTERFACES
****************************/ ****************************/
@ -136,6 +130,12 @@ class gtpu_interface_rrc_nr
public: 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 * RRC INTERFACES
****************************/ ****************************/

@ -613,8 +613,7 @@ public:
}; };
class gw_interface_stack : public gw_interface_nas, public gw_interface_rrc, public gw_interface_pdcp class gw_interface_stack : public gw_interface_nas, public gw_interface_rrc, public gw_interface_pdcp
{ {};
};
// STACK interface for RRC // STACK interface for RRC
class stack_interface_rrc : public srslte::task_handler_interface class stack_interface_rrc : public srslte::task_handler_interface
@ -635,8 +634,7 @@ public:
// Combined interface for stack (MAC and RRC) to access PHY // 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 class phy_interface_stack_lte : public phy_interface_mac_lte, public phy_interface_rrc_lte
{ {};
};
} // namespace srsue } // namespace srsue

@ -64,7 +64,6 @@ plmn_id_t make_plmn_id_t(const asn1::fixed_octstring<3, true>& asn1_type) // use
plmn_id_t plmn; plmn_id_t plmn;
uint16_t mcc, mnc; uint16_t mcc, mnc;
uint32_t encoded_plmn = asn1_type.to_number(); 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); s1ap_plmn_to_mccmnc(encoded_plmn, &mcc, &mnc);
plmn.from_number(mcc, mnc); plmn.from_number(mcc, mnc);
return plmn; 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); cfg.to_number(&mcc, &mnc);
uint32_t encoded_plmn; uint32_t encoded_plmn;
s1ap_mccmnc_to_plmn(mcc, mnc, &encoded_plmn); s1ap_mccmnc_to_plmn(mcc, mnc, &encoded_plmn);
// uint32_t tmp32 = htonl(encoded_plmn);
asn1_type->from_number(encoded_plmn); asn1_type->from_number(encoded_plmn);
} }

Loading…
Cancel
Save