maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Force logs level to 7 in pre-ci

Browse Source 
- Output logs from ping/oaisim in two distincts files
- Fix some compiler warnings
- Put assertions in some switch default cases
- Create a wrapper for macphy_exit to display FILE and LINE of the caller
- Enabled -Werror=implicit-function-declaration

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4682 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Cedric Roux
2013-12-11 23:26:33 +00:00
parent 54ada88ddb
commit bb52f71432
15 changed files with 86 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+3 -6
View File
@@ -137,12 +137,12 @@ void ue_rrc_measurements(PHY_VARS_UE *phy_vars_ue,
u8 slot,
u8 abstraction_flag) {
int aarx,i,rb;
int aarx,rb;
s16 *rxF;
u16 Nid_cell = phy_vars_ue->lte_frame_parms.Nid_cell;
u8 eNB_offset,nu,l,nushift,k;
u16 off,off2;
u16 off;
s16 rx_power_correction;
@@ -196,13 +196,10 @@ void ue_rrc_measurements(PHY_VARS_UE *phy_vars_ue,
#ifndef NEW_FFT
rxF = (s16 *)&phy_vars_ue->lte_ue_common_vars.rxdataF[aarx][(l*phy_vars_ue->lte_frame_parms.ofdm_symbol_size)<<1];
off = (phy_vars_ue->lte_frame_parms.first_carrier_offset+k)<<2;
off2 = (phy_vars_ue->lte_frame_parms.first_carrier_offset)<<2;
#else
rxF = (s16 *)&phy_vars_ue->lte_ue_common_vars.rxdataF[aarx][(l*phy_vars_ue->lte_frame_parms.ofdm_symbol_size)];
off = (phy_vars_ue->lte_frame_parms.first_carrier_offset+k)<<1;
off2 = (phy_vars_ue->lte_frame_parms.first_carrier_offset)<<1;
#endif
#endif
if (l==(4-phy_vars_ue->lte_frame_parms.Ncp)) {
for (rb=0;rb<phy_vars_ue->lte_frame_parms.N_RB_DL;rb++) {
openair1/PHY/LTE_TRANSPORT/dci.c
+10 -1
View File
@@ -52,6 +52,7 @@
#include <tmmintrin.h>
#endif
#include "assertions.h"
//#define DEBUG_DCI_ENCODING 1
//#define DEBUG_DCI_DECODING 1
@@ -2484,7 +2485,7 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **lte_ue_pdcch_vars,int do_common,u8 s
u16 crc,CCEind,nCCE;
u32 *CCEmap=NULL,CCEmap_mask=0;
int L2=(1<<L);
unsigned int Yk,nb_candidates,i,m;
unsigned int Yk,nb_candidates = 0,i,m;
unsigned int CCEmap_cand;
nCCE = get_nCCE(lte_ue_pdcch_vars[eNB_id]->num_pdcch_symbols,frame_parms,mi);
@@ -2517,6 +2518,9 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **lte_ue_pdcch_vars,int do_common,u8 s
case 8:
nb_candidates = 2;
break;
default:
DevParam(L2, do_common, eNB_id);
break;
}
}
/* for (CCEind=0;
@@ -2768,6 +2772,11 @@ u16 dci_decoding_procedure(PHY_VARS_UE *phy_vars_ue,
format1_size_bytes = sizeof(DCI1_20MHz_FDD_t);
}
break;
default:
format1_size_bits = 0;
format1_size_bytes = 0;
DevParam(frame_parms->N_RB_DL, frame_type, 0);
break;
}
if (do_common == 1) {
openair1/PHY/LTE_TRANSPORT/rar_tools.c
+9 -1
View File
@@ -47,6 +47,8 @@
#include "SCHED/defs.h"
#endif
#include "assertions.h"
extern uint16_t RIV2nb_rb_LUT6[32];
extern uint16_t RIV2first_rb_LUT6[32];
extern uint16_t RIV2nb_rb_LUT25[512];
@@ -100,6 +102,9 @@ int generate_eNB_ulsch_params_from_rar(unsigned char *rar_pdu,
RIV2first_rb_LUT = &RIV2first_rb_LUT100[0];
RIV_max = RIV_max100;
break;
default:
DevParam(frame_parms->N_RB_DL, harq_pid, 0);
break;
}
ulsch->harq_processes[harq_pid]->TPC = (rar[3]>>2)&7;//rar->TPC;
@@ -181,7 +186,7 @@ int generate_ue_ulsch_params_from_rar(PHY_VARS_UE *phy_vars_ue,
uint8_t cqireq;
double sinr_eff;
uint16_t *RIV2nb_rb_LUT, *RIV2first_rb_LUT;
uint16_t RIV_max;
uint16_t RIV_max = 0;
LOG_D(PHY,"[eNB][RAPROC] Frame %d: generate_ue_ulsch_params_from_rar: subframe %d (harq_pid %d)\n",phy_vars_ue->frame,subframe,harq_pid);
@@ -206,6 +211,9 @@ int generate_ue_ulsch_params_from_rar(PHY_VARS_UE *phy_vars_ue,
RIV2first_rb_LUT = &RIV2first_rb_LUT100[0];
RIV_max = RIV_max100;
break;
default:
DevParam(frame_parms->N_RB_DL, eNB_id, harq_pid);
break;
}