From 0539d932b819f775daa6971c8aefcdf76ad7242a Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Mon, 18 Nov 2019 11:43:31 +0000 Subject: [PATCH] clang format on the interface files --- .../srslte/interfaces/enb_interfaces.h | 138 +++++++++--------- .../srslte/interfaces/enb_metrics_interface.h | 8 +- .../srslte/interfaces/rrc_interface_types.h | 10 +- 3 files changed, 76 insertions(+), 80 deletions(-) diff --git a/lib/include/srslte/interfaces/enb_interfaces.h b/lib/include/srslte/interfaces/enb_interfaces.h index c2c7bcbd5..b94f99646 100644 --- a/lib/include/srslte/interfaces/enb_interfaces.h +++ b/lib/include/srslte/interfaces/enb_interfaces.h @@ -79,30 +79,29 @@ public: virtual int sr_detected(uint32_t tti, uint16_t rnti) = 0; virtual int rach_detected(uint32_t tti, uint32_t primary_cc_idx, uint32_t preamble_idx, uint32_t time_adv) = 0; - virtual int ri_info(uint32_t tti, uint16_t rnti, uint32_t ri_value) = 0; - virtual int pmi_info(uint32_t tti, uint16_t rnti, uint32_t pmi_value) = 0; - virtual int cqi_info(uint32_t tti, uint16_t rnti, uint32_t cqi_value) = 0; - virtual int snr_info(uint32_t tti, uint16_t rnti, float snr_db) = 0; - virtual int ack_info(uint32_t tti, uint16_t rnti, uint32_t tb_idx, bool ack) = 0; - virtual int crc_info(uint32_t tti, uint16_t rnti, uint32_t nof_bytes, bool crc_res) = 0; - - virtual int get_dl_sched(uint32_t tti, dl_sched_t *dl_sched_res) = 0; - virtual int get_mch_sched(uint32_t tti, bool is_mcch, dl_sched_t* dl_sched_res) = 0; - virtual int get_ul_sched(uint32_t tti, ul_sched_t *ul_sched_res) = 0; + virtual int ri_info(uint32_t tti, uint16_t rnti, uint32_t ri_value) = 0; + virtual int pmi_info(uint32_t tti, uint16_t rnti, uint32_t pmi_value) = 0; + virtual int cqi_info(uint32_t tti, uint16_t rnti, uint32_t cqi_value) = 0; + virtual int snr_info(uint32_t tti, uint16_t rnti, float snr_db) = 0; + virtual int ack_info(uint32_t tti, uint16_t rnti, uint32_t tb_idx, bool ack) = 0; + virtual int crc_info(uint32_t tti, uint16_t rnti, uint32_t nof_bytes, bool crc_res) = 0; + + virtual int get_dl_sched(uint32_t tti, dl_sched_t* dl_sched_res) = 0; + virtual int get_mch_sched(uint32_t tti, bool is_mcch, dl_sched_t* dl_sched_res) = 0; + virtual int get_ul_sched(uint32_t tti, ul_sched_t* ul_sched_res) = 0; virtual void set_sched_dl_tti_mask(uint8_t* tti_mask, uint32_t nof_sfs) = 0; - // Radio-Link status + // Radio-Link status virtual void rl_failure(uint16_t rnti) = 0; - virtual void rl_ok(uint16_t rnti) = 0; + virtual void rl_ok(uint16_t rnti) = 0; - virtual void tti_clock() = 0; + virtual void tti_clock() = 0; }; /* Interface MAC -> PHY */ class phy_interface_mac_lte { public: - /* MAC adds/removes an RNTI to the list of active RNTIs */ virtual int add_rnti(uint16_t rnti, bool is_temporal = false) = 0; virtual void rem_rnti(uint16_t rnti) = 0; @@ -121,59 +120,56 @@ public: }; typedef struct { - phy_cfg_mbsfn_t mbsfn; + phy_cfg_mbsfn_t mbsfn; } phy_rrc_cfg_t; - virtual void configure_mbsfn(asn1::rrc::sib_type2_s* sib2, asn1::rrc::sib_type13_r9_s* sib13, - asn1::rrc::mcch_msg_s mcch) = 0; + virtual void + configure_mbsfn(asn1::rrc::sib_type2_s* sib2, asn1::rrc::sib_type13_r9_s* sib13, asn1::rrc::mcch_msg_s mcch) = 0; virtual void set_config_dedicated(uint16_t rnti, asn1::rrc::phys_cfg_ded_s* dedicated) = 0; }; class mac_interface_rrc { -public: +public: /* Provides cell configuration including SIB periodicity, etc. */ - virtual int cell_cfg(sched_interface::cell_cfg_t *cell_cfg) = 0; - virtual void reset() = 0; + virtual int cell_cfg(sched_interface::cell_cfg_t* cell_cfg) = 0; + virtual void reset() = 0; /* Manages UE configuration context */ - virtual int ue_cfg(uint16_t rnti, sched_interface::ue_cfg_t *cfg) = 0; - virtual int ue_rem(uint16_t rnti) = 0; + virtual int ue_cfg(uint16_t rnti, sched_interface::ue_cfg_t* cfg) = 0; + virtual int ue_rem(uint16_t rnti) = 0; /* Manages UE bearers and associated configuration */ - virtual int bearer_ue_cfg(uint16_t rnti, uint32_t lc_id, sched_interface::ue_bearer_cfg_t *cfg) = 0; - virtual int bearer_ue_rem(uint16_t rnti, uint32_t lc_id) = 0; + virtual int bearer_ue_cfg(uint16_t rnti, uint32_t lc_id, sched_interface::ue_bearer_cfg_t* cfg) = 0; + virtual int bearer_ue_rem(uint16_t rnti, uint32_t lc_id) = 0; virtual int set_dl_ant_info(uint16_t rnti, asn1::rrc::phys_cfg_ded_s::ant_info_c_* dl_ant_info) = 0; - virtual void phy_config_enabled(uint16_t rnti, bool enabled) = 0; - virtual void write_mcch(asn1::rrc::sib_type2_s* sib2, asn1::rrc::sib_type13_r9_s* sib13, - asn1::rrc::mcch_msg_s* mcch) = 0; + virtual void phy_config_enabled(uint16_t rnti, bool enabled) = 0; + virtual void + write_mcch(asn1::rrc::sib_type2_s* sib2, asn1::rrc::sib_type13_r9_s* sib13, asn1::rrc::mcch_msg_s* mcch) = 0; }; -class mac_interface_rlc +class mac_interface_rlc { -public: - virtual int rlc_buffer_state(uint16_t rnti, uint32_t lc_id, uint32_t tx_queue, uint32_t retx_queue) = 0; +public: + virtual int rlc_buffer_state(uint16_t rnti, uint32_t lc_id, uint32_t tx_queue, uint32_t retx_queue) = 0; }; -//RLC interface for MAC +// RLC interface for MAC class rlc_interface_mac { public: - /* MAC calls RLC to get RLC segment of nof_bytes length. * Segmentation happens in this function. RLC PDU is stored in payload. */ - virtual int read_pdu(uint16_t rnti, uint32_t lcid, uint8_t *payload, uint32_t nof_bytes) = 0; + virtual int read_pdu(uint16_t rnti, uint32_t lcid, uint8_t* payload, uint32_t nof_bytes) = 0; + + virtual void read_pdu_bcch_dlsch(uint32_t sib_index, uint8_t* payload) = 0; + virtual void read_pdu_pcch(uint8_t* payload, uint32_t buffer_size) = 0; - virtual void read_pdu_bcch_dlsch(uint32_t sib_index, uint8_t *payload) = 0; - virtual void read_pdu_pcch(uint8_t* payload, uint32_t buffer_size) = 0; - /* MAC calls RLC to push an RLC PDU. This function is called from an independent MAC thread. * PDU gets placed into the buffer and higher layer thread gets notified. */ - virtual void write_pdu(uint16_t rnti, uint32_t lcid, uint8_t *payload, uint32_t nof_bytes) = 0; - + virtual void write_pdu(uint16_t rnti, uint32_t lcid, uint8_t* payload, uint32_t nof_bytes) = 0; }; - // RLC interface for PDCP class rlc_interface_pdcp { @@ -181,20 +177,20 @@ public: /* PDCP calls RLC to push an RLC SDU. SDU gets placed into the RLC buffer and MAC pulls * RLC PDUs according to TB size. */ virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0; - virtual bool rb_is_um(uint16_t rnti, uint32_t lcid) = 0; + virtual bool rb_is_um(uint16_t rnti, uint32_t lcid) = 0; }; // RLC interface for RRC class rlc_interface_rrc { public: - virtual void clear_buffer(uint16_t rnti) = 0; - virtual void add_user(uint16_t rnti) = 0; - virtual void rem_user(uint16_t rnti) = 0; - virtual void add_bearer(uint16_t rnti, uint32_t lcid, srslte::rlc_config_t cnfg) = 0; - virtual void add_bearer_mrb(uint16_t rnti, uint32_t lcid) = 0; - virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0; - virtual bool has_bearer(uint16_t rnti, uint32_t lcid) = 0; + virtual void clear_buffer(uint16_t rnti) = 0; + virtual void add_user(uint16_t rnti) = 0; + virtual void rem_user(uint16_t rnti) = 0; + virtual void add_bearer(uint16_t rnti, uint32_t lcid, srslte::rlc_config_t cnfg) = 0; + virtual void add_bearer_mrb(uint16_t rnti, uint32_t lcid) = 0; + virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0; + virtual bool has_bearer(uint16_t rnti, uint32_t lcid) = 0; }; // PDCP interface for GTPU @@ -208,20 +204,20 @@ public: class pdcp_interface_rrc { public: - virtual void reset(uint16_t rnti) = 0; - virtual void add_user(uint16_t rnti) = 0; - virtual void rem_user(uint16_t rnti) = 0; - virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0; - virtual void add_bearer(uint16_t rnti, uint32_t lcid, srslte::pdcp_config_t cnfg) = 0; + virtual void reset(uint16_t rnti) = 0; + virtual void add_user(uint16_t rnti) = 0; + virtual void rem_user(uint16_t rnti) = 0; + virtual void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0; + virtual void add_bearer(uint16_t rnti, uint32_t lcid, srslte::pdcp_config_t cnfg) = 0; virtual void config_security(uint16_t rnti, uint32_t lcid, uint8_t* k_rrc_enc_, uint8_t* k_rrc_int_, uint8_t* k_up_enc_, srslte::CIPHERING_ALGORITHM_ID_ENUM cipher_algo_, - srslte::INTEGRITY_ALGORITHM_ID_ENUM integ_algo_) = 0; - virtual void enable_integrity(uint16_t rnti, uint32_t lcid) = 0; - virtual void enable_encryption(uint16_t rnti, uint32_t lcid) = 0; + srslte::INTEGRITY_ALGORITHM_ID_ENUM integ_algo_) = 0; + virtual void enable_integrity(uint16_t rnti, uint32_t lcid) = 0; + virtual void enable_encryption(uint16_t rnti, uint32_t lcid) = 0; }; // PDCP interface for RLC @@ -236,9 +232,9 @@ public: class rrc_interface_rlc { public: - virtual void read_pdu_bcch_dlsch(uint32_t sib_index, uint8_t *payload) = 0; - virtual void read_pdu_pcch(uint8_t *payload, uint32_t payload_size) = 0; - virtual void max_retx_attempted(uint16_t rnti) = 0; + virtual void read_pdu_bcch_dlsch(uint32_t sib_index, uint8_t* payload) = 0; + virtual void read_pdu_pcch(uint8_t* payload, uint32_t payload_size) = 0; + virtual void max_retx_attempted(uint16_t rnti) = 0; virtual void write_pdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu) = 0; }; @@ -246,12 +242,12 @@ public: class rrc_interface_mac { public: - /* Radio Link failure */ - virtual void rl_failure(uint16_t rnti) = 0; - virtual void add_user(uint16_t rnti) = 0; - virtual void upd_user(uint16_t new_rnti, uint16_t old_rnti) = 0; - virtual void set_activity_user(uint16_t rnti) = 0; - virtual bool is_paging_opportunity(uint32_t tti, uint32_t *payload_len) = 0; + /* Radio Link failure */ + virtual void rl_failure(uint16_t rnti) = 0; + virtual void add_user(uint16_t rnti) = 0; + virtual void upd_user(uint16_t new_rnti, uint16_t old_rnti) = 0; + virtual void set_activity_user(uint16_t rnti) = 0; + virtual bool is_paging_opportunity(uint32_t tti, uint32_t* payload_len) = 0; }; // RRC interface for PDCP @@ -265,9 +261,9 @@ public: class rrc_interface_s1ap { public: - virtual void write_dl_info(uint16_t rnti, srslte::unique_byte_buffer_t sdu) = 0; - virtual void release_complete(uint16_t rnti) = 0; - virtual bool setup_ue_ctxt(uint16_t rnti, LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPREQUEST_STRUCT *msg) = 0; + virtual void write_dl_info(uint16_t rnti, srslte::unique_byte_buffer_t sdu) = 0; + virtual void release_complete(uint16_t rnti) = 0; + virtual bool setup_ue_ctxt(uint16_t rnti, LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPREQUEST_STRUCT* msg) = 0; virtual bool modify_ue_ctxt(uint16_t rnti, LIBLTE_S1AP_MESSAGE_UECONTEXTMODIFICATIONREQUEST_STRUCT* msg) = 0; virtual bool setup_ue_erabs(uint16_t rnti, LIBLTE_S1AP_MESSAGE_E_RABSETUPREQUEST_STRUCT* msg) = 0; virtual bool release_erabs(uint32_t rnti) = 0; @@ -286,9 +282,9 @@ public: class gtpu_interface_rrc { public: - virtual void add_bearer(uint16_t rnti, uint32_t lcid, uint32_t addr, uint32_t teid_out, uint32_t *teid_in) = 0; - virtual void rem_bearer(uint16_t rnti, uint32_t lcid) = 0; - virtual void rem_user(uint16_t rnti) = 0; + virtual void add_bearer(uint16_t rnti, uint32_t lcid, uint32_t addr, uint32_t teid_out, uint32_t* teid_in) = 0; + virtual void rem_bearer(uint16_t rnti, uint32_t lcid) = 0; + virtual void rem_user(uint16_t rnti) = 0; }; // S1AP interface for RRC @@ -303,7 +299,7 @@ public: uint32_t m_tmsi, uint8_t mmec) = 0; virtual void write_pdu(uint16_t rnti, srslte::unique_byte_buffer_t pdu) = 0; - virtual bool user_exists(uint16_t rnti) = 0; + virtual bool user_exists(uint16_t rnti) = 0; virtual bool user_release(uint16_t rnti, LIBLTE_S1AP_CAUSERADIONETWORK_ENUM cause_radio) = 0; virtual void ue_ctxt_setup_complete(uint16_t rnti, LIBLTE_S1AP_MESSAGE_INITIALCONTEXTSETUPRESPONSE_STRUCT* res) = 0; virtual void ue_erab_setup_complete(uint16_t rnti, LIBLTE_S1AP_MESSAGE_E_RABSETUPRESPONSE_STRUCT* res) = 0; diff --git a/lib/include/srslte/interfaces/enb_metrics_interface.h b/lib/include/srslte/interfaces/enb_metrics_interface.h index 38a878264..d004da3a0 100644 --- a/lib/include/srslte/interfaces/enb_metrics_interface.h +++ b/lib/include/srslte/interfaces/enb_metrics_interface.h @@ -44,10 +44,10 @@ struct stack_metrics_t { typedef struct { srslte::rf_metrics_t rf; - phy_metrics_t phy[ENB_METRICS_MAX_USERS]; - stack_metrics_t stack; - bool running; -}enb_metrics_t; + phy_metrics_t phy[ENB_METRICS_MAX_USERS]; + stack_metrics_t stack; + bool running; +} enb_metrics_t; // ENB interface class enb_metrics_interface : public srslte::metrics_interface diff --git a/lib/include/srslte/interfaces/rrc_interface_types.h b/lib/include/srslte/interfaces/rrc_interface_types.h index 67761d461..10f97fcb8 100644 --- a/lib/include/srslte/interfaces/rrc_interface_types.h +++ b/lib/include/srslte/interfaces/rrc_interface_types.h @@ -256,7 +256,7 @@ struct rlc_um_nr_config_t { rlc_um_nr_sn_size_t sn_field_length; // Number of bits used for sequence number uint32_t UM_Window_Size; - uint32_t mod; // Rx/Tx counter modulus + uint32_t mod; // Rx/Tx counter modulus int32_t t_reassembly_ms; // Timer used by rx to detect PDU loss (ms) }; @@ -272,10 +272,10 @@ inline std::string to_string(const srslte_rat_t& type) class rlc_config_t { public: - srslte_rat_t rat; - rlc_mode_t rlc_mode; - rlc_am_config_t am; - rlc_um_config_t um; + srslte_rat_t rat; + rlc_mode_t rlc_mode; + rlc_am_config_t am; + rlc_um_config_t um; rlc_um_nr_config_t um_nr; uint32_t tx_queue_length;