More clang-format for PDCP

master
Pedro Alvarez 6 years ago committed by Andre Puschmann
parent 491695ab77
commit f90b69e5f4

@ -63,6 +63,6 @@ inline void uint24_to_uint8(uint32_t i, uint8_t* buf)
buf[1] = (i >> 8) & 0xFF; buf[1] = (i >> 8) & 0xFF;
buf[2] = i & 0xFF; buf[2] = i & 0xFF;
} }
}; //namespace
} // namespace srslte
#endif // SRSLTE_INT_HELPERS_H #endif // SRSLTE_INT_HELPERS_H

@ -88,6 +88,4 @@ private:
}; };
} // namespace srslte } // namespace srslte
#endif // SRSLTE_PDCP_H #endif // SRSLTE_PDCP_H

@ -89,13 +89,13 @@ private:
* Ref: 3GPP TS 36.323 v10.1.0 * Ref: 3GPP TS 36.323 v10.1.0
***************************************************************************/ ***************************************************************************/
void pdcp_pack_control_pdu(uint32_t sn, byte_buffer_t *sdu); void pdcp_pack_control_pdu(uint32_t sn, byte_buffer_t* sdu);
void pdcp_unpack_control_pdu(byte_buffer_t *sdu, uint32_t *sn); void pdcp_unpack_control_pdu(byte_buffer_t* sdu, uint32_t* sn);
void pdcp_pack_data_pdu_short_sn(uint32_t sn, byte_buffer_t *sdu); void pdcp_pack_data_pdu_short_sn(uint32_t sn, byte_buffer_t* sdu);
void pdcp_unpack_data_pdu_short_sn(byte_buffer_t *sdu, uint32_t *sn); void pdcp_unpack_data_pdu_short_sn(byte_buffer_t* sdu, uint32_t* sn);
void pdcp_pack_data_pdu_long_sn(uint32_t sn, byte_buffer_t *sdu); void pdcp_pack_data_pdu_long_sn(uint32_t sn, byte_buffer_t* sdu);
void pdcp_unpack_data_pdu_long_sn(byte_buffer_t *sdu, uint32_t *sn); void pdcp_unpack_data_pdu_long_sn(byte_buffer_t* sdu, uint32_t* sn);
} // namespace srslte } // namespace srslte
#endif // SRSLTE_PDCP_ENTITY_LTE_H #endif // SRSLTE_PDCP_ENTITY_LTE_H

@ -60,12 +60,11 @@ public:
void enable_encryption(uint16_t rnti, uint32_t lcid); void enable_encryption(uint16_t rnti, uint32_t lcid);
private: private:
class user_interface_rlc : public srsue::rlc_interface_pdcp class user_interface_rlc : public srsue::rlc_interface_pdcp
{ {
public: public:
uint16_t rnti; uint16_t rnti;
srsenb::rlc_interface_pdcp *rlc; srsenb::rlc_interface_pdcp* rlc;
// rlc_interface_pdcp // rlc_interface_pdcp
void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, bool blocking); void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu, bool blocking);
bool rb_is_um(uint32_t lcid); bool rb_is_um(uint32_t lcid);
@ -75,7 +74,7 @@ private:
{ {
public: public:
uint16_t rnti; uint16_t rnti;
srsenb::gtpu_interface_pdcp *gtpu; srsenb::gtpu_interface_pdcp* gtpu;
// gw_interface_pdcp // gw_interface_pdcp
void write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t pdu); void write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t pdu);
void write_pdu_mch(uint32_t lcid, srslte::unique_byte_buffer_t sdu) {} void write_pdu_mch(uint32_t lcid, srslte::unique_byte_buffer_t sdu) {}
@ -85,7 +84,7 @@ private:
{ {
public: public:
uint16_t rnti; uint16_t rnti;
srsenb::rrc_interface_pdcp *rrc; srsenb::rrc_interface_pdcp* rrc;
// rrc_interface_pdcp // rrc_interface_pdcp
void write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t pdu); void write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t pdu);
void write_pdu_bcch_bch(srslte::unique_byte_buffer_t pdu); void write_pdu_bcch_bch(srslte::unique_byte_buffer_t pdu);
@ -101,22 +100,21 @@ private:
user_interface_rlc rlc_itf; user_interface_rlc rlc_itf;
user_interface_gtpu gtpu_itf; user_interface_gtpu gtpu_itf;
user_interface_rrc rrc_itf; user_interface_rrc rrc_itf;
srslte::pdcp *pdcp; srslte::pdcp* pdcp;
}; };
void clear_user(user_interface *ue); void clear_user(user_interface* ue);
std::map<uint32_t,user_interface> users; std::map<uint32_t, user_interface> users;
pthread_rwlock_t rwlock; pthread_rwlock_t rwlock;
rlc_interface_pdcp *rlc; rlc_interface_pdcp* rlc;
rrc_interface_pdcp *rrc; rrc_interface_pdcp* rrc;
gtpu_interface_pdcp *gtpu; gtpu_interface_pdcp* gtpu;
srslte::log *log_h; srslte::log* log_h;
srslte::byte_buffer_pool *pool; srslte::byte_buffer_pool* pool;
}; };
} } // namespace srsenb
#endif // SRSENB_PDCP_H #endif // SRSENB_PDCP_H

Loading…
Cancel
Save