5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply clang-format to the lib in preperation for PR.

Browse Source
master
Pedro Alvarez 5 years ago committed by Andre Puschmann
parent 940626108b
commit aecfb151ce
13 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
lib/include/srslte/common/metrics_hub.h
Unescape Escape View File

@ -47,7 +47,7 @@ class metrics_listener
{
public:
virtual void set_metrics(const metrics_t& m, const uint32_t period_usec) = 0;
virtual void stop() = 0;
virtual void stop() = 0;
};
template <typename metrics_t>

4
lib/include/srslte/phy/phch/ra_ul.h
Unescape Escape View File

@ -61,9 +61,7 @@ SRSLTE_API int srslte_ra_ul_dci_to_grant(srslte_cell_t* cell,
srslte_dci_ul_t* dci,
srslte_pusch_grant_t* grant);
SRSLTE_API void srslte_ra_ul_compute_nof_re(srslte_pusch_grant_t* grant,
srslte_cp_t cp,
uint32_t N_srs);
SRSLTE_API void srslte_ra_ul_compute_nof_re(srslte_pusch_grant_t* grant, srslte_cp_t cp, uint32_t N_srs);
/** Others */
SRSLTE_API uint32_t srslte_ra_ul_info(srslte_pusch_grant_t* grant, char* info_str, uint32_t len);

16
lib/include/srslte/phy/ue/ue_mib_sl.h
Unescape Escape View File

@ -49,15 +49,15 @@ typedef struct SRSLTE_API {
} srslte_ue_mib_sl_t;
int srslte_ue_mib_sl_set(srslte_ue_mib_sl_t* q,
uint32_t nof_prb,
uint32_t tdd_config,
uint32_t direct_frame_number,
uint32_t direct_subframe_number,
bool in_coverage);
int srslte_ue_mib_sl_set(srslte_ue_mib_sl_t* q,
uint32_t nof_prb,
uint32_t tdd_config,
uint32_t direct_frame_number,
uint32_t direct_subframe_number,
bool in_coverage);
void srslte_ue_mib_sl_pack(srslte_ue_mib_sl_t *q, uint8_t *msg);
void srlste_ue_mib_sl_unpack(srslte_ue_mib_sl_t *q, uint8_t *msg);
void srslte_ue_mib_sl_pack(srslte_ue_mib_sl_t* q, uint8_t* msg);
void srlste_ue_mib_sl_unpack(srslte_ue_mib_sl_t* q, uint8_t* msg);
void srslte_ue_mib_sl_free(srslte_ue_mib_sl_t* q);

2
lib/include/srslte/upper/rlc_common.h
Unescape Escape View File

@ -278,7 +278,7 @@ public:
virtual void discard_sdu(uint32_t discard_sn) = 0;
// MAC interface
virtual bool has_data() = 0;
virtual bool has_data() = 0;
bool is_suspended() { return suspended; };
virtual uint32_t get_buffer_state() = 0;
virtual int read_pdu(uint8_t* payload, uint32_t nof_bytes) = 0;

2
lib/src/phy/rf/rf_zmq_imp.h
Unescape Escape View File

@ -19,8 +19,8 @@
*
*/
#include <stdbool.h>
#include <inttypes.h>
#include <stdbool.h>
#include "srslte/config.h"
#include "srslte/phy/rf/rf.h"

10
lib/src/phy/rf/rf_zmq_imp_trx.h
Unescape Escape View File

@ -59,10 +59,10 @@ typedef struct {
} rf_zmq_tx_t;
typedef struct {
char id[ZMQ_ID_STRLEN];
uint32_t socket_type;
rf_zmq_format_t sample_format;
void* sock;
char id[ZMQ_ID_STRLEN];
uint32_t socket_type;
rf_zmq_format_t sample_format;
void* sock;
#if ZMQ_MONITOR
void* socket_monitor;
bool tx_connected;
@ -75,7 +75,7 @@ typedef struct {
cf_t* temp_buffer;
void* temp_buffer_convert;
uint32_t frequency_mhz;
bool fail_on_disconnect;
bool fail_on_disconnect;
} rf_zmq_rx_t;
typedef struct {

4
lib/src/radio/test/benchmark_radio.cc
Unescape Escape View File

@ -244,8 +244,8 @@ int main(int argc, char** argv)
int ret = SRSLTE_ERROR;
radio* radio_h[SRSLTE_MAX_RADIOS] = {NULL};
srslte_timestamp_t ts_prev[SRSLTE_MAX_RADIOS], ts_rx[SRSLTE_MAX_RADIOS], ts_tx;
uint32_t nof_gaps = 0;
char filename[256] = {};
uint32_t nof_gaps = 0;
char filename[256] = {};
srslte_filesink_t filesink[SRSLTE_MAX_RADIOS] = {};
srslte_dft_plan_t dft_plan = {}, idft_plan = {};
srslte_agc_t agc[SRSLTE_MAX_RADIOS] = {};

2
lib/src/upper/pdcp_entity_base.cc
Unescape Escape View File

@ -277,7 +277,7 @@ void pdcp_entity_base::write_data_header(const srslte::unique_byte_buffer_t& sdu
// Add SN
switch (cfg.sn_len) {
case PDCP_SN_LEN_5:
sdu->msg[0] = SN(count); // Data PDU and SN LEN 5 implies SRB, D flag must not be present
sdu->msg[0] = SN(count); // Data PDU and SN LEN 5 implies SRB, D flag must not be present
break;
case PDCP_SN_LEN_12:
srslte::uint16_to_uint8(SN(count), sdu->msg);

8
lib/src/upper/pdcp_entity_lte.cc
Unescape Escape View File

@ -172,19 +172,19 @@ void pdcp_entity_lte::handle_srb_pdu(srslte::unique_byte_buffer_t pdu)
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU", rrc->get_rb_name(lcid).c_str());
// Read recvd SN from header
uint32_t sn = read_data_header(pdu);
uint32_t sn = read_data_header(pdu);
log->debug("RX SRB PDU. Next_PDCP_RX_SN %d, SN %d", next_pdcp_rx_sn, sn);
// Estimate COUNT for integrity check and decryption
uint32_t count;
if (sn < next_pdcp_rx_sn){
if (sn < next_pdcp_rx_sn) {
count = COUNT(rx_hfn + 1, sn);
} else {
count = COUNT(rx_hfn, sn);
}
// Perform decription
// Perform decription
if (do_encryption) {
cipher_decrypt(&pdu->msg[cfg.hdr_len_bytes], pdu->N_bytes - cfg.hdr_len_bytes, count, &pdu->msg[cfg.hdr_len_bytes]);
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", rrc->get_rb_name(lcid).c_str());

1
lib/src/upper/pdcp_entity_nr.cc
Unescape Escape View File

@ -228,7 +228,6 @@ void pdcp_entity_nr::write_pdu(unique_byte_buffer_t pdu)
* Packing / Unpacking Helpers
*/
// Deliver all consecutivly associated COUNTs.
// Update RX_NEXT after submitting to higher layers
void pdcp_entity_nr::deliver_all_consecutive_counts()

4
lib/test/upper/pdcp_base_test.h
Unescape Escape View File

@ -109,10 +109,10 @@ public:
std::string get_rb_name(uint32_t lcid) { return "None"; }
srslte::log* log;
srslte::log* log;
// Members for testing
uint32_t rx_count = 0;
uint32_t rx_count = 0;
srslte::unique_byte_buffer_t last_pdu;
// Methods for testing

10
lib/test/upper/pdcp_lte_test.h
Unescape Escape View File

@ -89,16 +89,16 @@ public:
void set_pdcp_initial_state(pdcp_lte_initial_state init_state)
{
pdcp.set_tx_count(init_state.tx_count);
pdcp.set_tx_count(init_state.tx_count);
pdcp.set_rx_hfn(init_state.rx_hfn);
pdcp.set_next_pdcp_rx_sn(init_state.next_pdcp_rx_sn);
pdcp.set_last_submitted_pdcp_rx_sn(init_state.last_submitted_pdcp_rx_sn);
}
rlc_dummy rlc;
rrc_dummy rrc;
gw_dummy gw;
srslte::timer_handler timers;
rlc_dummy rlc;
rrc_dummy rrc;
gw_dummy gw;
srslte::timer_handler timers;
srslte::pdcp_entity_lte pdcp;
};

4
lib/test/upper/pdcp_lte_test_rx.cc
Unescape Escape View File

@ -46,7 +46,7 @@ int test_rx(std::vector<pdcp_test_event_t> events,
pdcp_lte_test_helper pdcp_hlp_rx(cfg_rx, sec_cfg, log);
srslte::pdcp_entity_lte* pdcp_rx = &pdcp_hlp_rx.pdcp;
gw_dummy* gw_rx = &pdcp_hlp_rx.gw;
rrc_dummy* rrc_rx = &pdcp_hlp_rx.rrc;
rrc_dummy* rrc_rx = &pdcp_hlp_rx.rrc;
srslte::timer_handler* timers_rx = &pdcp_hlp_rx.timers;
pdcp_hlp_rx.set_pdcp_initial_state(init_state);
@ -115,7 +115,7 @@ int test_rx_all(srslte::byte_buffer_pool* pool, srslte::log* log)
* This tests correct handling of HFN in the case of SN wraparound (SN LEN 12)
*/
{
std::vector<uint32_t> test_counts(2); // Test two packets
std::vector<uint32_t> test_counts(2); // Test two packets
std::iota(test_counts.begin(), test_counts.end(), 4095); // Starting at COUNT 4095
std::vector<pdcp_test_event_t> test_pdus = gen_expected_pdus_vector(
tst_sdu1, test_counts, srslte::PDCP_SN_LEN_12, srslte::PDCP_RB_IS_DRB, sec_cfg, pool, log);

Write Preview
Loading…
Cancel
Save