fixing compile warnings
This commit is contained in:
@@ -1,11 +1,12 @@
|
|||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
project (OpenAirInterface)
|
||||||
set ( CMAKE_BUILD_TYPE )
|
set ( CMAKE_BUILD_TYPE )
|
||||||
set ( CFLAGS_PROCESSOR_USER "" )
|
set ( CFLAGS_PROCESSOR_USER "" )
|
||||||
set ( UE_EXPANSION False )
|
set ( UE_EXPANSION False )
|
||||||
set ( PRE_SCD_THREAD False )
|
set ( PRE_SCD_THREAD False )
|
||||||
set ( UESIM_EXPANSION False )
|
set ( UESIM_EXPANSION False )
|
||||||
set ( ENABLE_VCD_FIFO False )
|
set ( ENABLE_VCD_FIFO False )
|
||||||
set ( RF_BOARD "OAI_USRP")
|
set ( RF_BOARD "None")
|
||||||
set ( TRANSP_PRO "None")
|
set ( TRANSP_PRO "None")
|
||||||
set ( PACKAGE_NAME "")
|
set ( PACKAGE_NAME "")
|
||||||
set ( DEADLINE_SCHEDULER "False" )
|
set ( DEADLINE_SCHEDULER "False" )
|
||||||
|
|||||||
@@ -52,9 +52,6 @@
|
|||||||
#define OAI_UL_LDPC_MAX_NUM_LLR 27000//26112 // NR_LDPC_NCOL_BG1*NR_LDPC_ZMAX = 68*384
|
#define OAI_UL_LDPC_MAX_NUM_LLR 27000//26112 // NR_LDPC_NCOL_BG1*NR_LDPC_ZMAX = 68*384
|
||||||
//#define PRINT_CRC_CHECK
|
//#define PRINT_CRC_CHECK
|
||||||
|
|
||||||
static uint64_t nb_total_decod =0;
|
|
||||||
static uint64_t nb_error_decod =0;
|
|
||||||
|
|
||||||
//extern double cpuf;
|
//extern double cpuf;
|
||||||
|
|
||||||
void free_gNB_ulsch(NR_gNB_ULSCH_t **ulschptr,uint8_t N_RB_UL)
|
void free_gNB_ulsch(NR_gNB_ULSCH_t **ulschptr,uint8_t N_RB_UL)
|
||||||
@@ -286,7 +283,7 @@ void clean_gNB_ulsch(NR_gNB_ULSCH_t *ulsch)
|
|||||||
static uint32_t prnt_crc_cnt = 0;
|
static uint32_t prnt_crc_cnt = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint32_t nr_processULSegment(void* arg) {
|
void nr_processULSegment(void* arg) {
|
||||||
ldpcDecode_t *rdata = (ldpcDecode_t*) arg;
|
ldpcDecode_t *rdata = (ldpcDecode_t*) arg;
|
||||||
PHY_VARS_gNB *phy_vars_gNB = rdata->gNB;
|
PHY_VARS_gNB *phy_vars_gNB = rdata->gNB;
|
||||||
NR_UL_gNB_HARQ_t *ulsch_harq = rdata->ulsch_harq;
|
NR_UL_gNB_HARQ_t *ulsch_harq = rdata->ulsch_harq;
|
||||||
@@ -467,7 +464,6 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
|
|||||||
uint32_t G) {
|
uint32_t G) {
|
||||||
|
|
||||||
uint32_t A;
|
uint32_t A;
|
||||||
uint32_t ret;
|
|
||||||
uint32_t r;
|
uint32_t r;
|
||||||
uint32_t r_offset;
|
uint32_t r_offset;
|
||||||
uint32_t offset;
|
uint32_t offset;
|
||||||
@@ -494,7 +490,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
|
|||||||
|
|
||||||
if (!harq_process) {
|
if (!harq_process) {
|
||||||
LOG_E(PHY,"ulsch_decoding.c: NULL harq_process pointer\n");
|
LOG_E(PHY,"ulsch_decoding.c: NULL harq_process pointer\n");
|
||||||
return;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
double Coderate = 0.0;
|
double Coderate = 0.0;
|
||||||
@@ -509,7 +505,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
|
|||||||
|
|
||||||
if (!ulsch_llr) {
|
if (!ulsch_llr) {
|
||||||
LOG_E(PHY,"ulsch_decoding.c: NULL ulsch_llr pointer\n");
|
LOG_E(PHY,"ulsch_decoding.c: NULL ulsch_llr pointer\n");
|
||||||
return;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_gNB_ULSCH_DECODING,1);
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_gNB_ULSCH_DECODING,1);
|
||||||
@@ -617,7 +613,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
|
|||||||
|
|
||||||
if (harq_process->C > a_segments) {
|
if (harq_process->C > a_segments) {
|
||||||
LOG_E(PHY,"Illegal harq_process->C %d > %d\n",harq_process->C,a_segments);
|
LOG_E(PHY,"Illegal harq_process->C %d > %d\n",harq_process->C,a_segments);
|
||||||
return;
|
return 1;
|
||||||
}
|
}
|
||||||
#ifdef DEBUG_ULSCH_DECODING
|
#ifdef DEBUG_ULSCH_DECODING
|
||||||
printf("Segmentation: C %d, K %d\n",harq_process->C,harq_process->K);
|
printf("Segmentation: C %d, K %d\n",harq_process->C,harq_process->K);
|
||||||
@@ -625,13 +621,14 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
|
|||||||
Kr = harq_process->K;
|
Kr = harq_process->K;
|
||||||
Kr_bytes = Kr>>3;
|
Kr_bytes = Kr>>3;
|
||||||
offset = 0;
|
offset = 0;
|
||||||
|
void (*nr_processULSegment_ptr)(void*) = &nr_processULSegment;
|
||||||
|
|
||||||
for (r=0; r<harq_process->C; r++) {
|
for (r=0; r<harq_process->C; r++) {
|
||||||
|
|
||||||
E = nr_get_E(G, harq_process->C, Qm, n_layers, r);
|
E = nr_get_E(G, harq_process->C, Qm, n_layers, r);
|
||||||
|
|
||||||
union ldpcReqUnion id = {.s={ulsch->rnti,frame,nr_tti_rx,0,0}};
|
union ldpcReqUnion id = {.s={ulsch->rnti,frame,nr_tti_rx,0,0}};
|
||||||
notifiedFIFO_elt_t *req=newNotifiedFIFO_elt(sizeof(ldpcDecode_t), id.p, phy_vars_gNB->respDecode, nr_processULSegment);
|
notifiedFIFO_elt_t *req=newNotifiedFIFO_elt(sizeof(ldpcDecode_t), id.p, phy_vars_gNB->respDecode, nr_processULSegment_ptr);
|
||||||
ldpcDecode_t * rdata=(ldpcDecode_t *) NotifiedFifoData(req);
|
ldpcDecode_t * rdata=(ldpcDecode_t *) NotifiedFifoData(req);
|
||||||
|
|
||||||
rdata->gNB = phy_vars_gNB;
|
rdata->gNB = phy_vars_gNB;
|
||||||
@@ -659,5 +656,5 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
|
|||||||
offset += (Kr_bytes - (harq_process->F>>3) - ((harq_process->C>1)?3:0));
|
offset += (Kr_bytes - (harq_process->F>>3) - ((harq_process->C>1)?3:0));
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////////////
|
||||||
}
|
}
|
||||||
return;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -281,7 +281,6 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
|
|||||||
NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
|
NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
|
||||||
nfapi_nr_pusch_pdu_t *pusch_pdu = &gNB->ulsch[ULSCH_id][0]->harq_processes[harq_pid]->ulsch_pdu;
|
nfapi_nr_pusch_pdu_t *pusch_pdu = &gNB->ulsch[ULSCH_id][0]->harq_processes[harq_pid]->ulsch_pdu;
|
||||||
|
|
||||||
uint8_t ret;
|
|
||||||
uint8_t l, number_dmrs_symbols = 0;
|
uint8_t l, number_dmrs_symbols = 0;
|
||||||
uint32_t G;
|
uint32_t G;
|
||||||
uint16_t start_symbol, number_symbols, nb_re_dmrs;
|
uint16_t start_symbol, number_symbols, nb_re_dmrs;
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
int frame=1,slot=1;
|
int frame=1,slot=1;
|
||||||
int frame_length_complex_samples;
|
int frame_length_complex_samples;
|
||||||
int frame_length_complex_samples_no_prefix;
|
//int frame_length_complex_samples_no_prefix;
|
||||||
NR_DL_FRAME_PARMS *frame_parms;
|
NR_DL_FRAME_PARMS *frame_parms;
|
||||||
UE_nr_rxtx_proc_t UE_proc;
|
UE_nr_rxtx_proc_t UE_proc;
|
||||||
NR_Sched_Rsp_t Sched_INFO;
|
NR_Sched_Rsp_t Sched_INFO;
|
||||||
@@ -197,7 +197,7 @@ int main(int argc, char **argv)
|
|||||||
int pucch_tgt_snrx10 = 200;
|
int pucch_tgt_snrx10 = 200;
|
||||||
int loglvl=OAILOG_INFO;
|
int loglvl=OAILOG_INFO;
|
||||||
|
|
||||||
float target_error_rate = 0.01;
|
//float target_error_rate = 0.01;
|
||||||
int css_flag=0;
|
int css_flag=0;
|
||||||
|
|
||||||
cpuf = get_cpu_freq_GHz();
|
cpuf = get_cpu_freq_GHz();
|
||||||
@@ -359,7 +359,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
case 'I':
|
case 'I':
|
||||||
run_initial_sync=1;
|
run_initial_sync=1;
|
||||||
target_error_rate=0.1;
|
//target_error_rate=0.1;
|
||||||
slot = 0;
|
slot = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -585,7 +585,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
frame_length_complex_samples = frame_parms->samples_per_subframe*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
|
frame_length_complex_samples = frame_parms->samples_per_subframe*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
|
||||||
frame_length_complex_samples_no_prefix = frame_parms->samples_per_subframe_wCP*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
|
//frame_length_complex_samples_no_prefix = frame_parms->samples_per_subframe_wCP*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
|
||||||
|
|
||||||
s_re = malloc(2*sizeof(double*));
|
s_re = malloc(2*sizeof(double*));
|
||||||
s_im = malloc(2*sizeof(double*));
|
s_im = malloc(2*sizeof(double*));
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ int nr_postDecode_sim(PHY_VARS_gNB *gNB, notifiedFIFO_elt_t *req) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
ulsch->last_iteration_cnt = rdata->decodeIterations;
|
ulsch->last_iteration_cnt = rdata->decodeIterations;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
@@ -130,7 +131,7 @@ int main(int argc, char **argv)
|
|||||||
NR_DL_FRAME_PARMS *frame_parms;
|
NR_DL_FRAME_PARMS *frame_parms;
|
||||||
double sigma;
|
double sigma;
|
||||||
unsigned char qbits = 8;
|
unsigned char qbits = 8;
|
||||||
int ret;
|
int ret=0;
|
||||||
int loglvl = OAILOG_WARNING;
|
int loglvl = OAILOG_WARNING;
|
||||||
uint64_t SSB_positions=0x01;
|
uint64_t SSB_positions=0x01;
|
||||||
uint16_t nb_symb_sch = 12;
|
uint16_t nb_symb_sch = 12;
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ schedule_MBMS_NFAPI(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
|
|||||||
msi_pos++;
|
msi_pos++;
|
||||||
while((non_mbsfn_SubframeConfig & (0x100 >> msi_pos)) == (0x100>>msi_pos))
|
while((non_mbsfn_SubframeConfig & (0x100 >> msi_pos)) == (0x100>>msi_pos))
|
||||||
msi_pos++;
|
msi_pos++;
|
||||||
mbms_mch_i=0;
|
mbms_mch_i=0;
|
||||||
|
|
||||||
if((subframeP==0)){
|
if((subframeP==0)){
|
||||||
x=0;
|
x=0;
|
||||||
|
|||||||
Reference in New Issue
Block a user