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

Fixed more static code analysis warnings

Browse Source
master
Xavier Arteaga 5 years ago committed by Xavier Arteaga
parent b48bb0d754
commit 6d896ee453
6 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File

4
lib/examples/pdsch_enodeb.c
Unescape Escape View File

@ -800,7 +800,7 @@ int main(int argc, char **argv) {
}
#endif
if (update_radl(sf_idx)) {
if (update_radl()) {
exit(-1);
}
@ -879,7 +879,7 @@ int main(int argc, char **argv) {
srslte_pcfich_encode(&pcfich, &dl_sf, sf_symbols);
/* Update DL resource allocation from control port */
if (update_control(sf_idx)) {
if (update_control()) {
ERROR("Error updating parameters from control port\n");
}

5
lib/examples/usrp_capture_sync.c
Unescape Escape View File

@ -98,11 +98,12 @@ void parse_args(int argc, char **argv) {
}
}
int srslte_rf_recv_wrapper(void *h, cf_t *data[SRSLTE_MAX_PORTS], uint32_t nsamples, srslte_timestamp_t *t) {
int srslte_rf_recv_wrapper(void* h, cf_t* data_[SRSLTE_MAX_PORTS], uint32_t nsamples, srslte_timestamp_t* t)
{
DEBUG(" ---- Receive %d samples ---- \n", nsamples);
void* ptr[SRSLTE_MAX_PORTS];
for (int i = 0; i < SRSLTE_MAX_PORTS; i++) {
ptr[i] = data[i];
ptr[i] = data_[i];
}
return srslte_rf_recv_with_time_multi(h, ptr, nsamples, true, NULL, NULL);
}

2
lib/src/phy/ch_estimation/chest_dl.c
Unescape Escape View File

@ -519,7 +519,7 @@ static void average_pilots(srslte_chest_dl_t* q,
float* filter,
uint32_t filter_len)
{
uint32_t nsymbols = (sf->sf_type == SRSLTE_SF_MBSFN) ? srslte_refsignal_mbsfn_nof_symbols(port_id)
uint32_t nsymbols = (sf->sf_type == SRSLTE_SF_MBSFN) ? srslte_refsignal_mbsfn_nof_symbols()
: srslte_refsignal_cs_nof_symbols(&q->csr_refs, sf, port_id);
uint32_t nref = (sf->sf_type == SRSLTE_SF_MBSFN) ? 6 * q->cell.nof_prb : 2 * q->cell.nof_prb;

33
lib/src/phy/fec/rm_turbo.c
Unescape Escape View File

@ -88,7 +88,8 @@ static uint16_t deinterleaver_sb[NOF_DEINTER_TABLE_SB_IDX][192][4][18448];
static uint16_t temp_table1[3*6176], temp_table2[3*6176];
static void srslte_rm_turbo_gentable_systematic(uint16_t *table_bits, int k0_vec[4][2], uint32_t nrows, int ndummy) {
static void srslte_rm_turbo_gentable_systematic(uint16_t* table_bits, int k0_vec_[4][2], uint32_t nrows, int ndummy)
{
bool last_is_null=true;
int k_b=0, buff_idx=0;
@ -101,10 +102,10 @@ static void srslte_rm_turbo_gentable_systematic(uint16_t *table_bits, int k0_vec
} else {
last_is_null=true;
}
for (int i=0;i<4;i++) {
if (k0_vec[i][1] == -1) {
if (k0_vec[i][0]%(3*nrows*NCOLS) <= buff_idx && !last_is_null) {
k0_vec[i][1] = k_b-1;
for (int k = 0; k < 4; k++) {
if (k0_vec_[k][1] == -1) {
if (k0_vec_[k][0] % (3 * nrows * NCOLS) <= buff_idx && !last_is_null) {
k0_vec_[k][1] = k_b - 1;
}
}
}
@ -113,8 +114,10 @@ static void srslte_rm_turbo_gentable_systematic(uint16_t *table_bits, int k0_vec
}
}
static void srslte_rm_turbo_gentable_parity(uint16_t *table_parity, int k0_vec[4][2], int offset, uint16_t nrows, int ndummy) {
static void
srslte_rm_turbo_gentable_parity(uint16_t* table_parity, int k0_vec_[4][2], int offset, uint16_t nrows, int ndummy)
{
bool last_is_null=true;
int k_b=0, buff_idx0=0;
int K_p = nrows*NCOLS;
@ -128,10 +131,10 @@ static void srslte_rm_turbo_gentable_parity(uint16_t *table_parity, int k0_vec[4
} else {
last_is_null=true;
}
for (int i=0;i<4;i++) {
if (k0_vec[i][1] == -1) {
if (k0_vec[i][0]%(3*K_p) <= 2*buff_idx0+K_p && !last_is_null) {
k0_vec[i][1] = offset+k_b-1;
for (int k = 0; k < 4; k++) {
if (k0_vec_[k][1] == -1) {
if (k0_vec_[k][0] % (3 * K_p) <= 2 * buff_idx0 + K_p && !last_is_null) {
k0_vec_[k][1] = offset + k_b - 1;
}
}
}
@ -145,10 +148,10 @@ static void srslte_rm_turbo_gentable_parity(uint16_t *table_parity, int k0_vec[4
} else {
last_is_null=true;
}
for (int i=0;i<4;i++) {
if (k0_vec[i][1] == -1) {
if (k0_vec[i][0]%(3*K_p) <= 2*buff_idx1+1+K_p && !last_is_null) {
k0_vec[i][1] = offset+k_b-1;
for (int k = 0; k < 4; k++) {
if (k0_vec_[k][1] == -1) {
if (k0_vec_[k][0] % (3 * K_p) <= 2 * buff_idx1 + 1 + K_p && !last_is_null) {
k0_vec_[k][1] = offset + k_b - 1;
}
}
}

12
srsue/hdr/stack/rrc/rrc.h
Unescape Escape View File

@ -416,8 +416,8 @@ private:
// RRC constants and timers
srslte::timer_handler* timers = nullptr;
uint32_t n310_cnt = 0, N310 = 0;
uint32_t n311_cnt = 0, N311 = 0;
uint32_t n310_cnt, N310 = 0;
uint32_t n311_cnt, N311 = 0;
srslte::timer_handler::unique_timer t300, t301, t302, t310, t311, t304;
// Radio bearers
@ -469,8 +469,12 @@ private:
void delete_last_neighbour();
std::string print_neighbour_cells();
bool initiated = false;
bool reestablishment_successful = false;
bool initiated = false;
asn1::rrc::reest_cause_e m_reest_cause = asn1::rrc::reest_cause_e::nulltype;
uint16_t m_reest_rnti = 0;
uint16_t m_reest_source_pci = 0;
bool reestablishment_started = false;
bool reestablishment_successful = false;
// Measurements sub-class
class rrc_meas

4
srsue/src/stack/rrc/rrc.cc
Unescape Escape View File

@ -3376,7 +3376,7 @@ uint8_t rrc::rrc_meas::value_to_range(quantity_t quant, float value) {
case RSRP:
if (value < -140) {
range = 0;
} else if (-140 <= value && value < -44) {
} else if (value < -44) {
range = 1u + (uint8_t)(value + 140);
} else {
range = 97;
@ -3385,7 +3385,7 @@ uint8_t rrc::rrc_meas::value_to_range(quantity_t quant, float value) {
case RSRQ:
if (value < -19.5) {
range = 0;
} else if (-19.5 <= value && value < -3) {
} else if (value < -3) {
range = 1u + (uint8_t)(2 * (value + 19.5));
} else {
range = 34;

Write Preview
Loading…
Cancel
Save