Skip to content

O
OpenXG-RAN
Commit bb8c6b2c authored by hbilel's avatar hbilel
Browse files
Options

[OAI-UE] code clean up for merge

parent 3dc1963a
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 30 deletions
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @ bb8c6b2c
...@@ -4781,17 +4781,17 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format, ...@@ -4781,17 +4781,17 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format,
uint8_t NPRB = 0; uint8_t NPRB = 0;
long long int RIV_max = 0; long long int RIV_max = 0;
//#ifdef DEBUG_DCI #ifdef DEBUG_DCI
LOG_I(PHY,"[DCI-FORMAT-1-1A] AbsSubframe %d.%d dci_format %d\n", frame, subframe, dci_format); LOG_I(PHY,"[DCI-FORMAT-1-1A] AbsSubframe %d.%d dci_format %d\n", frame, subframe, dci_format);
LOG_I(PHY,"[DCI-FORMAT-1-1A] rnti %x\n", rnti); LOG_I(PHY,"[DCI-FORMAT-1-1A] rnti %x\n", rnti);
LOG_I(PHY,"[DCI-FORMAT-1-1A] harq_pid %d\n", harq_pid); LOG_I(PHY,"[DCI-FORMAT-1-1A] harq_pid %d\n", harq_pid);
// LOG_I(PHY,"[DCI-FORMAT-1-1A] rah %d\n", rah); LOG_I(PHY,"[DCI-FORMAT-1-1A] rah %d\n", rah);
// LOG_I(PHY,"[DCI-FORMAT-1-1A] rballoc %x\n", rballoc); LOG_I(PHY,"[DCI-FORMAT-1-1A] rballoc %x\n", rballoc);
// LOG_I(PHY,"[DCI-FORMAT-1-1A] mcs1 %d\n", mcs1); LOG_I(PHY,"[DCI-FORMAT-1-1A] mcs1 %d\n", mcs1);
// LOG_I(PHY,"[DCI-FORMAT-1-1A] rv1 %d\n", rv1); LOG_I(PHY,"[DCI-FORMAT-1-1A] rv1 %d\n", rv1);
// LOG_I(PHY,"[DCI-FORMAT-1-1A] ndi1 %d\n", ndi1); LOG_I(PHY,"[DCI-FORMAT-1-1A] ndi1 %d\n", ndi1);
// LOG_I(PHY,"[DCI-FORMAT-1-1A] TPC %d\n", TPC); LOG_I(PHY,"[DCI-FORMAT-1-1A] TPC %d\n", TPC);
//#endif #endif
// I- check dci content minimum coherency // I- check dci content minimum coherency
if( ((rnti==si_rnti) || (rnti==p_rnti) || (rnti==ra_rnti)) && harq_pid > 0) if( ((rnti==si_rnti) || (rnti==p_rnti) || (rnti==ra_rnti)) && harq_pid > 0)
......
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
View file @ bb8c6b2c
...@@ -612,12 +612,12 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -612,12 +612,12 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
&phy_vars_ue->dlsch_tc_intl2_stats); //(is_crnti==0)?harq_pid:harq_pid+1); &phy_vars_ue->dlsch_tc_intl2_stats); //(is_crnti==0)?harq_pid:harq_pid+1);
stop_meas(dlsch_turbo_decoding_stats); stop_meas(dlsch_turbo_decoding_stats);
printf("Segmentation: C %d r %d, dlsch_rate_unmatching_stats %5.3f dlsch_deinterleaving_stats %5.3f dlsch_turbo_decoding_stats %5.3f \n", /*printf("Segmentation: C %d r %d, dlsch_rate_unmatching_stats %5.3f dlsch_deinterleaving_stats %5.3f dlsch_turbo_decoding_stats %5.3f \n",
harq_process->C, harq_process->C,
r, r,
dlsch_rate_unmatching_stats->p_time/(cpuf*1000.0), dlsch_rate_unmatching_stats->p_time/(cpuf*1000.0),
dlsch_deinterleaving_stats->p_time/(cpuf*1000.0), dlsch_deinterleaving_stats->p_time/(cpuf*1000.0),
dlsch_turbo_decoding_stats->p_time/(cpuf*1000.0)); dlsch_turbo_decoding_stats->p_time/(cpuf*1000.0));*/
} }
} }
......
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
View file @ bb8c6b2c
...@@ -122,7 +122,6 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -122,7 +122,6 @@ int rx_pdsch(PHY_VARS_UE *ue,
switch (type) { switch (type) {
case SI_PDSCH: case SI_PDSCH:
pdsch_vars = &ue->pdsch_vars_SI[eNB_id]; pdsch_vars = &ue->pdsch_vars_SI[eNB_id];
...@@ -234,9 +233,6 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -234,9 +233,6 @@ int rx_pdsch(PHY_VARS_UE *ue,
} }
} }
//LOG_I(PHY,"[rx_pdsch %d] AbsSubframe %d.%d symbol %d rxType %d beamformingMode %d, antennaPorts %d, eNB_id_i %d, n_connected_eNB %d\n",
// harq_pid, frame,subframe, symbol,rx_type, beamforming_mode, frame_parms->nb_antenna_ports_eNB,eNB_id_i,ue->n_connected_eNB);
if (frame_parms->nb_antenna_ports_eNB>1 && beamforming_mode==0) { if (frame_parms->nb_antenna_ports_eNB>1 && beamforming_mode==0) {
#ifdef DEBUG_DLSCH_MOD #ifdef DEBUG_DLSCH_MOD
LOG_I(PHY,"dlsch: using pmi %x (%p), rb_alloc %x\n",pmi2hex_2Ar1(dlsch0_harq->pmi_alloc),dlsch[0],dlsch0_harq->rb_alloc_even[0]); LOG_I(PHY,"dlsch: using pmi %x (%p), rb_alloc %x\n",pmi2hex_2Ar1(dlsch0_harq->pmi_alloc),dlsch[0],dlsch0_harq->rb_alloc_even[0]);
...@@ -396,7 +392,6 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -396,7 +392,6 @@ int rx_pdsch(PHY_VARS_UE *ue,
((dlsch0_harq->mimo_mode >=DUALSTREAM_UNIFORM_PRECODING1) && ((dlsch0_harq->mimo_mode >=DUALSTREAM_UNIFORM_PRECODING1) &&
(dlsch0_harq->mimo_mode <=DUALSTREAM_PUSCH_PRECODING))) (dlsch0_harq->mimo_mode <=DUALSTREAM_PUSCH_PRECODING)))
{ {
//LOG_I(PHY,"Channel Level TM34 !!!!!!!! \n");
dlsch_channel_level_TM34(pdsch_vars[eNB_id]->dl_ch_estimates_ext, dlsch_channel_level_TM34(pdsch_vars[eNB_id]->dl_ch_estimates_ext,
frame_parms, frame_parms,
pdsch_vars[eNB_id]->pmi_ext, pdsch_vars[eNB_id]->pmi_ext,
...@@ -530,7 +525,6 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -530,7 +525,6 @@ int rx_pdsch(PHY_VARS_UE *ue,
} }
} else if ((dlsch0_harq->mimo_mode == LARGE_CDD) || ((dlsch0_harq->mimo_mode >=DUALSTREAM_UNIFORM_PRECODING1) && } else if ((dlsch0_harq->mimo_mode == LARGE_CDD) || ((dlsch0_harq->mimo_mode >=DUALSTREAM_UNIFORM_PRECODING1) &&
(dlsch0_harq->mimo_mode <=DUALSTREAM_PUSCH_PRECODING))){ (dlsch0_harq->mimo_mode <=DUALSTREAM_PUSCH_PRECODING))){
//LOG_I(PHY,"channel compensation TM34 !!!!!!!!!!!!!!!!!\n");
dlsch_channel_compensation_TM34(frame_parms, dlsch_channel_compensation_TM34(frame_parms,
pdsch_vars[eNB_id], pdsch_vars[eNB_id],
measurements, measurements,
...@@ -683,7 +677,6 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -683,7 +677,6 @@ int rx_pdsch(PHY_VARS_UE *ue,
((dlsch0_harq->mimo_mode >=DUALSTREAM_UNIFORM_PRECODING1) && ((dlsch0_harq->mimo_mode >=DUALSTREAM_UNIFORM_PRECODING1) &&
(dlsch0_harq->mimo_mode <=DUALSTREAM_PUSCH_PRECODING))){ // TM3 or TM4 (dlsch0_harq->mimo_mode <=DUALSTREAM_PUSCH_PRECODING))){ // TM3 or TM4
if (frame_parms->nb_antenna_ports_eNB == 2) { if (frame_parms->nb_antenna_ports_eNB == 2) {
//LOG_I(PHY,"MRC Detection TM34 !!!!!!!!!\n");
dlsch_detection_mrc_TM34(frame_parms, dlsch_detection_mrc_TM34(frame_parms,
pdsch_vars[eNB_id], pdsch_vars[eNB_id],
harq_pid, harq_pid,
...@@ -745,10 +738,6 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -745,10 +738,6 @@ int rx_pdsch(PHY_VARS_UE *ue,
//i_mod should have been passed as a parameter //i_mod should have been passed as a parameter
} }
//LOG_I(PHY,"compute LLRs rx_type dual ? %d rx_standard %d codeword_TB0 %d codeword_TB1 %d\n", rx_type==rx_IC_dual_stream, rx_standard, codeword_TB0, codeword_TB1);
//if (rx_type >= rx_IC_single_stream)
//LOG_I(PHY,"LLR0 Qm ? %d LLR1 Qm \n", dlsch0_harq->Qm, dlsch1_harq->Qm);
switch (dlsch0_harq->Qm) { switch (dlsch0_harq->Qm) {
case 2 : case 2 :
if ((rx_type==rx_standard) || (codeword_TB0 == -1) || (codeword_TB1 == -1)) { if ((rx_type==rx_standard) || (codeword_TB0 == -1) || (codeword_TB1 == -1)) {
...@@ -830,7 +819,6 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -830,7 +819,6 @@ int rx_pdsch(PHY_VARS_UE *ue,
} }
break; break;
case 4 : case 4 :
if ((rx_type==rx_standard ) || (codeword_TB0 == -1) || (codeword_TB1 == -1)) { if ((rx_type==rx_standard ) || (codeword_TB0 == -1) || (codeword_TB1 == -1)) {
dlsch_16qam_llr(frame_parms, dlsch_16qam_llr(frame_parms,
pdsch_vars[eNB_id]->rxdataF_comp0, pdsch_vars[eNB_id]->rxdataF_comp0,
...@@ -1004,7 +992,6 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -1004,7 +992,6 @@ int rx_pdsch(PHY_VARS_UE *ue,
return(-1); return(-1);
break; break;
} }
if (dlsch1_harq) { if (dlsch1_harq) {
switch (get_Qm(dlsch1_harq->mcs)) { switch (get_Qm(dlsch1_harq->mcs)) {
case 2 : case 2 :
...@@ -1050,6 +1037,7 @@ int rx_pdsch(PHY_VARS_UE *ue, ...@@ -1050,6 +1037,7 @@ int rx_pdsch(PHY_VARS_UE *ue,
} }
} }
// Please keep it: useful for debugging
#if 0 #if 0
if( (symbol == 13) && (dlsch0_harq->mimo_mode == 2) ) if( (symbol == 13) && (dlsch0_harq->mimo_mode == 2) )
{ {
......
openair1/PHY/MODULATION/slot_fep.c
View file @ bb8c6b2c
...@@ -48,7 +48,7 @@ int slot_fep(PHY_VARS_UE *ue, ...@@ -48,7 +48,7 @@ int slot_fep(PHY_VARS_UE *ue,
unsigned int rx_offset; unsigned int rx_offset;
/*LTE_UE_DLSCH_t **dlsch_ue = phy_vars_ue->dlsch_ue[eNB_id]; /*LTE_UE_DLSCH_t **dlsch_ue = phy_vars_ue->dlsch_ue[eNB_id];
unsigned char harq_pid = dlsch_ue[0]->current_harq_pid; unsigned char harq_pid = dlsch_ue[0]->current_harq_pid;
LTE_DL_UE_HARQ_t *dlsch0_harq = dlsch_ue[0]->harq_processes[harq_pid]; LTE_DL_UE_HARQ_t *dlsch0_harq = dlsch_ue[0]->harq_processes[harq_pid];
int uespec_pilot[9][1200];*/ int uespec_pilot[9][1200];*/
......
openair1/PHY/TOOLS/lte_phy_scope.c
View file @ bb8c6b2c
...@@ -768,4 +768,4 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form, ...@@ -768,4 +768,4 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
} }
free(chest_t_abs); free(chest_t_abs);
} }
\ No newline at end of file
openair1/SCHED/phy_procedures_lte_ue.c
View file @ bb8c6b2c
...@@ -368,7 +368,7 @@ void process_timing_advance(uint8_t Mod_id,uint8_t CC_id,int16_t timing_advance) ...@@ -368,7 +368,7 @@ void process_timing_advance(uint8_t Mod_id,uint8_t CC_id,int16_t timing_advance)
PHY_vars_UE_g[Mod_id][CC_id]->timing_advance = PHY_vars_UE_g[Mod_id][CC_id]->timing_advance+timing_advance*4; //this is for 25RB only!!! PHY_vars_UE_g[Mod_id][CC_id]->timing_advance = PHY_vars_UE_g[Mod_id][CC_id]->timing_advance+timing_advance*4; //this is for 25RB only!!!
LOG_I(PHY,"[UE %d] Got timing advance %d from MAC, new value %d\n",Mod_id, timing_advance, PHY_vars_UE_g[Mod_id][CC_id]->timing_advance); LOG_D(PHY,"[UE %d] Got timing advance %d from MAC, new value %d\n",Mod_id, timing_advance, PHY_vars_UE_g[Mod_id][CC_id]->timing_advance);
} }
......
openair2/RRC/LITE/L2_interface.c
View file @ bb8c6b2c
...@@ -199,7 +199,7 @@ mac_rrc_data_req( ...@@ -199,7 +199,7 @@ mac_rrc_data_req(
int sdu_size = sizeof(RRC_MAC_CCCH_DATA_REQ (message_p).sdu); int sdu_size = sizeof(RRC_MAC_CCCH_DATA_REQ (message_p).sdu);
if (ccch_size > sdu_size) { if (ccch_size > sdu_size) {
LOG_E(RRC, "SDU larger than CCCH SDU buffer size0 (%d, %d)", ccch_size, sdu_size); LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", ccch_size, sdu_size);
ccch_size = sdu_size; ccch_size = sdu_size;
} }
...@@ -297,7 +297,7 @@ mac_rrc_data_req( ...@@ -297,7 +297,7 @@ mac_rrc_data_req(
int sdu_size = sizeof(RRC_MAC_CCCH_DATA_REQ (message_p).sdu); int sdu_size = sizeof(RRC_MAC_CCCH_DATA_REQ (message_p).sdu);
if (ccch_size > sdu_size) { if (ccch_size > sdu_size) {
LOG_E(RRC, "SDU larger than CCCH SDU buffer size1 (%d, %d)", ccch_size, sdu_size); LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", ccch_size, sdu_size);
ccch_size = sdu_size; ccch_size = sdu_size;
} }
...@@ -403,7 +403,7 @@ mac_rrc_data_ind( ...@@ -403,7 +403,7 @@ mac_rrc_data_ind(
int msg_sdu_size = CCCH_SDU_SIZE; int msg_sdu_size = CCCH_SDU_SIZE;
if (sdu_lenP > msg_sdu_size) { if (sdu_lenP > msg_sdu_size) {
LOG_E(RRC, "SDU larger than CCCH SDU buffer size2 (%d, %d)", sdu_size, msg_sdu_size); LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
sdu_size = msg_sdu_size; sdu_size = msg_sdu_size;
} else { } else {
sdu_size = sdu_lenP; sdu_size = sdu_lenP;
...@@ -471,7 +471,7 @@ mac_rrc_data_ind( ...@@ -471,7 +471,7 @@ mac_rrc_data_ind(
int msg_sdu_size = sizeof(RRC_MAC_CCCH_DATA_IND (message_p).sdu); int msg_sdu_size = sizeof(RRC_MAC_CCCH_DATA_IND (message_p).sdu);
if (sdu_lenP > msg_sdu_size) { if (sdu_lenP > msg_sdu_size) {
LOG_E(RRC, "SDU larger than CCCH SDU buffer size3 (%d, %d)", sdu_lenP, msg_sdu_size); LOG_E(RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_lenP, msg_sdu_size);
sdu_size = msg_sdu_size; sdu_size = msg_sdu_size;
} else { } else {
sdu_size = sdu_lenP; sdu_size = sdu_lenP;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment