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;
}
openair1/SCHED/phy_procedures_lte_eNb.c
+11 -7
View File
@@ -63,6 +63,8 @@
#include "UTIL/LOG/vcd_signal_dumper.h"
//#endif
#include "assertions.h"
//#define DIAG_PHY
#define NS_PER_SLOT 500000
@@ -283,7 +285,7 @@ void init_nCCE_table(void) {
int get_nCCE_offset(unsigned char L, int nCCE, int common_dci, unsigned short rnti, unsigned char subframe) {
int search_space_free,m,nb_candidates,l,i;
int search_space_free,m,nb_candidates = 0,l,i;
unsigned int Yk;
/*
printf("CCE Allocation: ");
@@ -331,6 +333,9 @@ int get_nCCE_offset(unsigned char L, int nCCE, int common_dci, unsigned short rn
case 8:
nb_candidates = 2;
break;
default:
DevParam(L, nCCE, rnti);
break;
}
// LOG_I(PHY,"rnti %x, Yk = %d, nCCE %d (nCCE/L %d),nb_cand %d\n",rnti,Yk,nCCE,nCCE/L,nb_candidates);
@@ -918,8 +923,6 @@ void phy_procedures_eNB_TX(unsigned char next_slot,PHY_VARS_eNB *phy_vars_eNB,u8
// s16 amp;
u8 ul_subframe;
u32 ul_frame;
int re_offset;
uint32_t *txptr;
#ifdef Rel10
MCH_PDU *mch_pduP;
MCH_PDU mch_pdu;
@@ -1488,7 +1491,7 @@ void phy_procedures_eNB_TX(unsigned char next_slot,PHY_VARS_eNB *phy_vars_eNB,u8
pdcch_alloc2ul_subframe(&phy_vars_eNB->lte_frame_parms,next_slot>>1));
if (harq_pid==255) {
LOG_E(PHY,"[eNB %d] Frame %d: Bad harq_pid for ULSCH allocation\n",phy_vars_eNB->Mod_id,phy_vars_eNB->frame);
mac_xface->macphy_exit("");
mac_exit_wrapper("Invalid harq_pid (255) detected");
}
#ifdef OPENAIR2
UE_id = find_ue((s16)DCI_pdu->dci_alloc[i].rnti,phy_vars_eNB);
@@ -1497,7 +1500,7 @@ void phy_procedures_eNB_TX(unsigned char next_slot,PHY_VARS_eNB *phy_vars_eNB,u8
#endif
if (UE_id<0) {
LOG_E(PHY,"[eNB %d] Frame %d: Unknown UE_id for rnti %x\n",phy_vars_eNB->Mod_id,phy_vars_eNB->frame,(s16)DCI_pdu->dci_alloc[i].rnti);
mac_xface->macphy_exit("");
mac_exit_wrapper("Invalid UE id (< 0) detected");
}
#ifdef DEBUG_PHY_PROC
if (phy_vars_eNB->frame%100 == 0)
@@ -2484,7 +2487,8 @@ void phy_procedures_eNB_RX(unsigned char last_slot,PHY_VARS_eNB *phy_vars_eNB,u8
u32 harq_pid, round;
u8 SR_payload,*pucch_payload=NULL,pucch_payload0[2]={0,0},pucch_payload1[2]={0,0};
s16 n1_pucch0,n1_pucch1,n1_pucch2,n1_pucch3;
u8 do_SR=0,pucch_sel;
u8 do_SR = 0;
u8 pucch_sel = 0;
s16 metric0=0,metric1=0;
ANFBmode_t bundling_flag;
PUCCH_FMT_t format;
@@ -2870,7 +2874,7 @@ void phy_procedures_eNB_RX(unsigned char last_slot,PHY_VARS_eNB *phy_vars_eNB,u8
printf("%x.",phy_vars_eNB->ulsch_eNB[i]->harq_processes[harq_pid]->c[0][j]);
printf("\n");
dump_ulsch(phy_vars_eNB,last_slot>>1,i);
mac_xface->macphy_exit("");
mac_exit_wrapper("Msg3 error");
} // This is Msg3 error
else { //normal ULSCH
LOG_D(PHY,"[eNB %d][PUSCH %d] frame %d subframe %d UE %d Error receiving ULSCH, round %d/%d (ACK %d,%d)\n",
openair1/SIMULATION/ETH_TRANSPORT/pgm_link.c
+1
View File
@@ -12,6 +12,7 @@
#include "assertions.h"
#include "pgm_link.h"
#include "multicast_link.h"
#include "UTIL/OCG/OCG.h"
openair1/SIMULATION/ETH_TRANSPORT/pgm_link.h
+1
View File
@@ -3,6 +3,7 @@
/* Define prototypes only if enabled */
#if defined(ENABLE_PGM_TRANSPORT)
void bypass_tx_nack(unsigned int frame, unsigned int next_slot);
int pgm_oai_init(char *if_name);
openair1/SIMULATION/TOOLS/abstraction.c
+12 -4
View File
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "PHY/TOOLS/defs.h"
#include "defs.h"
@@ -192,10 +192,14 @@ double a[7];
void load_pbch_desc(FILE *pbch_file_fd) {
int i;
int i, ret;
char dummy[25];
fscanf(pbch_file_fd,"%d",&pbch_polynomial_degree);
ret = fscanf(pbch_file_fd,"%d",&pbch_polynomial_degree);
if (ret < 0) {
printf("fscanf failed: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
if (pbch_polynomial_degree>6) {
printf("Illegal degree for pbch interpolation polynomial %d\n",pbch_polynomial_degree);
exit(-1);
@@ -204,7 +208,11 @@ void load_pbch_desc(FILE *pbch_file_fd) {
printf("PBCH polynomial : ");
for (i=0;i<=pbch_polynomial_degree;i++) {
fscanf(pbch_file_fd,"%s",dummy);
ret = fscanf(pbch_file_fd,"%s",dummy);
if (ret < 0) {
printf("fscanf failed: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
a[i] = strtod(dummy,NULL);
printf("%f ",a[i]);
}