Commit d74f2da9 authored by nepes's avatar nepes

changes to configuration file for eMTC (pucch parameters)

parent 669724c1
...@@ -978,7 +978,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, ...@@ -978,7 +978,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
m = (n1_pucch < thres) ? NRB2 : (((n1_pucch-thres)/(12*c/deltaPUCCH_Shift))+NRB2+((deltaPUCCH_Shift*Ncs1_div_deltaPUCCH_Shift)>>3)+rem); m = (n1_pucch < thres) ? NRB2 : (((n1_pucch-thres)/(12*c/deltaPUCCH_Shift))+NRB2+((deltaPUCCH_Shift*Ncs1_div_deltaPUCCH_Shift)>>3)+rem);
#ifdef DEBUG_PUCCH_RX #ifdef DEBUG_PUCCH_RX
printf("[eNB] PUCCH: m %d\n",m); printf("[eNB] PUCCH: m %d, thres %d, NRB2 %d\n",m,thres,NRB2);
#endif #endif
nsymb = N_UL_symb<<1; nsymb = N_UL_symb<<1;
......
...@@ -789,7 +789,7 @@ void uci_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) ...@@ -789,7 +789,7 @@ void uci_procedures(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc)
,uci->ue_type ,uci->ue_type
#endif #endif
); );
//dump_ulsch(eNB,frame,subframe,0,0); exit(-1);
/* cancel SR detection if reception on n1_pucch0 is better than on SR PUCCH resource index, otherwise send it up to MAC */ /* cancel SR detection if reception on n1_pucch0 is better than on SR PUCCH resource index, otherwise send it up to MAC */
......
...@@ -1351,7 +1351,7 @@ check_Msg4_retransmission(module_id_t module_idP, int CC_idP, ...@@ -1351,7 +1351,7 @@ check_Msg4_retransmission(module_id_t module_idP, int CC_idP,
} // Msg4 frame/subframe } // Msg4 frame/subframe
} // regular LTE case } // regular LTE case
} else { } else {
LOG_D(MAC, LOG_I(MAC,
"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d : Msg4 acknowledged\n", "[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d : Msg4 acknowledged\n",
module_idP, CC_idP, frameP, subframeP); module_idP, CC_idP, frameP, subframeP);
ra->state = IDLE; ra->state = IDLE;
......
...@@ -48,9 +48,9 @@ eNBs = ...@@ -48,9 +48,9 @@ eNBs =
prach_zero_correlation = 1; prach_zero_correlation = 1;
prach_freq_offset = 1; prach_freq_offset = 1;
pucch_delta_shift = 1; pucch_delta_shift = 1;
pucch_nRB_CQI = 1; pucch_nRB_CQI = 0;
pucch_nCS_AN = 0; pucch_nCS_AN = 0;
pucch_n1_AN = 32; pucch_n1_AN = 0;
pdsch_referenceSignalPower = -27; pdsch_referenceSignalPower = -27;
pdsch_p_b = 0; pdsch_p_b = 0;
pusch_n_SB = 1; pusch_n_SB = 1;
...@@ -262,7 +262,7 @@ eNBs = ...@@ -262,7 +262,7 @@ eNBs =
n1PUCCH_AN_InfoList_r13 = n1PUCCH_AN_InfoList_r13 =
( (
{ {
pucch_info_value = 0; pucch_info_value = 33;
} }
); );
......
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