Skip to content

O
OpenXG-RAN
Commit 217eba6b authored by Cedric Roux's avatar Cedric Roux
Browse files
Options

Merge branch 'bugfix-176' into develop_integration_wk01 

There were some conflicts, manually resolved.

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/SCHED/phy_procedures_lte_ue.c
parents de665ee4 2e7c28a5
Show whitespace changes
Inline Side-by-side
Showing with 516 additions and 196 deletions
openair1/PHY/CODING/TESTBENCH/ltetest.c
View file @ 217eba6b
...@@ -256,6 +256,7 @@ int test_logmap8(LTE_eNB_DLSCH_t *dlsch_eNB, ...@@ -256,6 +256,7 @@ int test_logmap8(LTE_eNB_DLSCH_t *dlsch_eNB,
&PHY_vars_UE->lte_frame_parms, &PHY_vars_UE->lte_frame_parms,
PHY_vars_UE->dlsch_ue[0][0], PHY_vars_UE->dlsch_ue[0][0],
PHY_vars_UE->dlsch_ue[0][0]->harq_processes[PHY_vars_UE->dlsch_ue[0][0]->current_harq_pid], PHY_vars_UE->dlsch_ue[0][0]->harq_processes[PHY_vars_UE->dlsch_ue[0][0]->current_harq_pid],
frame,
subframe, subframe,
PHY_vars_UE->dlsch_ue[0][0]->current_harq_pid, PHY_vars_UE->dlsch_ue[0][0]->current_harq_pid,
num_pdcch_symbols,1); num_pdcch_symbols,1);
......
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @ 217eba6b
...@@ -1061,8 +1061,8 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -1061,8 +1061,8 @@ int generate_eNB_dlsch_params_from_dci(int frame,
// 36-213 sec.7.1.7.2 p.26 // 36-213 sec.7.1.7.2 p.26
I_mcs = mcs; I_mcs = mcs;
} else { } else {
if (harq_pid>1) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 1A: harq_pid > 1\n"); LOG_E(PHY,"ERROR: Format 1A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -1206,7 +1206,7 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -1206,7 +1206,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
} }
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 1: harq_pid >= 8\n"); LOG_E(PHY,"ERROR: Format 1: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -1496,7 +1496,7 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -1496,7 +1496,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 2_2A: harq_pid >= 8\n"); LOG_E(PHY,"ERROR: Format 2_2A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -1848,7 +1848,7 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -1848,7 +1848,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 2_2A: harq_pid >= 8\n"); LOG_E(PHY,"ERROR: Format 2_2A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -2117,7 +2117,7 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -2117,7 +2117,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 2_2A: harq_pid >= 8\n"); LOG_E(PHY,"ERROR: Format 2_2A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -2279,7 +2279,7 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -2279,7 +2279,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 2_2A: harq_pid >= 8\n"); LOG_E(PHY,"ERROR: Format 2_2A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -2450,7 +2450,7 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -2450,7 +2450,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 2_2A: harq_pid >= 8\n"); LOG_E(PHY,"ERROR: Format 2_2A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -2528,7 +2528,7 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -2528,7 +2528,7 @@ int generate_eNB_dlsch_params_from_dci(int frame,
harq_pid = ((DCI1E_5MHz_2A_M10PRB_TDD_t *)dci_pdu)->harq_pid; harq_pid = ((DCI1E_5MHz_2A_M10PRB_TDD_t *)dci_pdu)->harq_pid;
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 1E_2A_M10PRB: harq_pid >= 8\n"); LOG_E(PHY,"ERROR: Format 1E_2A_M10PRB: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -3818,7 +3818,8 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3818,7 +3818,8 @@ int generate_ue_dlsch_params_from_dci(int frame,
uint16_t si_rnti, uint16_t si_rnti,
uint16_t ra_rnti, uint16_t ra_rnti,
uint16_t p_rnti, uint16_t p_rnti,
uint8_t beamforming_mode) uint8_t beamforming_mode,
uint16_t tc_rnti)
{ {
uint8_t harq_pid=0; uint8_t harq_pid=0;
...@@ -3832,11 +3833,29 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3832,11 +3833,29 @@ int generate_ue_dlsch_params_from_dci(int frame,
uint8_t TPC=0; uint8_t TPC=0;
uint8_t NPRB=0,tbswap=0,tpmi=0; uint8_t NPRB=0,tbswap=0,tpmi=0;
uint8_t Ngap; uint8_t Ngap;
uint8_t dai=0;
LTE_UE_DLSCH_t *dlsch0=NULL,*dlsch1=NULL; LTE_UE_DLSCH_t *dlsch0=NULL,*dlsch1=NULL;
LTE_DL_UE_HARQ_t *dlsch0_harq,*dlsch1_harq; LTE_DL_UE_HARQ_t *dlsch0_harq,*dlsch1_harq;
#ifdef DEBUG_DCI #ifdef DEBUG_DCI
LOG_D(PHY,"dci_tools.c: Filling ue dlsch params -> rnti %x, dci_format %d\n",rnti,dci_format); LOG_D(PHY,"dci_tools.c: Filling ue dlsch params -> rnti %x, SFN/SF %d/%d, dci_format %s\n",
rnti,
frame%1024,
subframe,
(dci_format==format0? "Format 0":(
dci_format==format1? "format 1":(
dci_format==format1A? "format 1A":(
dci_format==format1B? "format 1B":(
dci_format==format1C? "format 1C":(
dci_format==format1D? "format 1D":(
dci_format==format1E_2A_M10PRB? "format 1E_2A_M10PRB":(
dci_format==format2? "format 2":(
dci_format==format2A? "format 2A":(
dci_format==format2B? "format 2B":(
dci_format==format2C? "format 2C":(
dci_format==format2D? "format 2D":(
dci_format==format3? "format 3": "UNKNOWN"
))))))))))))));
#endif #endif
switch (dci_format) { switch (dci_format) {
...@@ -3858,6 +3877,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3858,6 +3877,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
ndi = ((DCI1A_1_5MHz_TDD_1_6_t *)dci_pdu)->ndi; ndi = ((DCI1A_1_5MHz_TDD_1_6_t *)dci_pdu)->ndi;
TPC = ((DCI1A_1_5MHz_TDD_1_6_t *)dci_pdu)->TPC; TPC = ((DCI1A_1_5MHz_TDD_1_6_t *)dci_pdu)->TPC;
harq_pid = ((DCI1A_1_5MHz_TDD_1_6_t *)dci_pdu)->harq_pid; harq_pid = ((DCI1A_1_5MHz_TDD_1_6_t *)dci_pdu)->harq_pid;
dai = ((DCI1A_1_5MHz_TDD_1_6_t *)dci_pdu)->dai;
// printf("TDD 1A: mcs %d, rballoc %x,rv %d, TPC %d\n",mcs,rballoc,rv,TPC); // printf("TDD 1A: mcs %d, rballoc %x,rv %d, TPC %d\n",mcs,rballoc,rv,TPC);
} else { } else {
vrb_type = ((DCI1A_1_5MHz_FDD_t *)dci_pdu)->vrb_type; vrb_type = ((DCI1A_1_5MHz_FDD_t *)dci_pdu)->vrb_type;
...@@ -3877,8 +3897,8 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3877,8 +3897,8 @@ int generate_ue_dlsch_params_from_dci(int frame,
NPRB = (TPC&1) + 2; NPRB = (TPC&1) + 2;
} else { } else {
if (harq_pid>1) { if (harq_pid>=8) {
LOG_E(PHY,"Format 1A: harq_pid > 1\n"); LOG_E(PHY,"Format 1A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -3913,6 +3933,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3913,6 +3933,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
ndi = ((DCI1A_5MHz_TDD_1_6_t *)dci_pdu)->ndi; ndi = ((DCI1A_5MHz_TDD_1_6_t *)dci_pdu)->ndi;
TPC = ((DCI1A_5MHz_TDD_1_6_t *)dci_pdu)->TPC; TPC = ((DCI1A_5MHz_TDD_1_6_t *)dci_pdu)->TPC;
harq_pid = ((DCI1A_5MHz_TDD_1_6_t *)dci_pdu)->harq_pid; harq_pid = ((DCI1A_5MHz_TDD_1_6_t *)dci_pdu)->harq_pid;
dai = ((DCI1A_5MHz_TDD_1_6_t *)dci_pdu)->dai;
//printf("TDD 1A: mcs %d, rballoc %x,rv %d, TPC %d\n",mcs,rballoc,rv,TPC); //printf("TDD 1A: mcs %d, rballoc %x,rv %d, TPC %d\n",mcs,rballoc,rv,TPC);
} else { } else {
vrb_type = ((DCI1A_5MHz_FDD_t *)dci_pdu)->vrb_type; vrb_type = ((DCI1A_5MHz_FDD_t *)dci_pdu)->vrb_type;
...@@ -3932,10 +3953,10 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3932,10 +3953,10 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch0_harq = dlsch[0]->harq_processes[harq_pid]; dlsch0_harq = dlsch[0]->harq_processes[harq_pid];
} else { } else {
//if (harq_pid>1) { if (harq_pid>=8) {
// LOG_E(PHY,"Format 1A: harq_pid > 1\n"); LOG_E(PHY,"Format 1A: harq_pid=%d >= 8\n", harq_pid);
// return(-1); return(-1);
//} }
dlsch0_harq = dlsch[0]->harq_processes[harq_pid]; dlsch0_harq = dlsch[0]->harq_processes[harq_pid];
NPRB = RIV2nb_rb_LUT25[rballoc]; NPRB = RIV2nb_rb_LUT25[rballoc];
...@@ -3965,6 +3986,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3965,6 +3986,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
ndi = ((DCI1A_10MHz_TDD_1_6_t *)dci_pdu)->ndi; ndi = ((DCI1A_10MHz_TDD_1_6_t *)dci_pdu)->ndi;
TPC = ((DCI1A_10MHz_TDD_1_6_t *)dci_pdu)->TPC; TPC = ((DCI1A_10MHz_TDD_1_6_t *)dci_pdu)->TPC;
harq_pid = ((DCI1A_10MHz_TDD_1_6_t *)dci_pdu)->harq_pid; harq_pid = ((DCI1A_10MHz_TDD_1_6_t *)dci_pdu)->harq_pid;
dai = ((DCI1A_10MHz_TDD_1_6_t *)dci_pdu)->dai;
// printf("TDD 1A: mcs %d, rballoc %x,rv %d, TPC %d\n",mcs,rballoc,rv,TPC); // printf("TDD 1A: mcs %d, rballoc %x,rv %d, TPC %d\n",mcs,rballoc,rv,TPC);
} else { } else {
vrb_type = ((DCI1A_10MHz_FDD_t *)dci_pdu)->vrb_type; vrb_type = ((DCI1A_10MHz_FDD_t *)dci_pdu)->vrb_type;
...@@ -3984,8 +4006,8 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -3984,8 +4006,8 @@ int generate_ue_dlsch_params_from_dci(int frame,
NPRB = (TPC&1) + 2; NPRB = (TPC&1) + 2;
} else { } else {
if (harq_pid>1) { if (harq_pid>=8) {
LOG_E(PHY,"Format 1A: harq_pid > 1\n"); LOG_E(PHY,"Format 1A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -4031,6 +4053,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4031,6 +4053,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
ndi = ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->ndi; ndi = ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->ndi;
TPC = ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->TPC; TPC = ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->TPC;
harq_pid = ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->harq_pid; harq_pid = ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->harq_pid;
dai = ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->dai;
// printf("TDD 1A: mcs %d, rballoc %x,rv %d, TPC %d\n",mcs,rballoc,rv,TPC); // printf("TDD 1A: mcs %d, rballoc %x,rv %d, TPC %d\n",mcs,rballoc,rv,TPC);
} else { } else {
vrb_type = ((DCI1A_20MHz_FDD_t *)dci_pdu)->vrb_type; vrb_type = ((DCI1A_20MHz_FDD_t *)dci_pdu)->vrb_type;
...@@ -4050,8 +4073,8 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4050,8 +4073,8 @@ int generate_ue_dlsch_params_from_dci(int frame,
NPRB = (TPC&1) + 2; NPRB = (TPC&1) + 2;
} else { } else {
if (harq_pid>1) { if (harq_pid>=8) {
LOG_E(PHY,"Format 1A: harq_pid > 1\n"); LOG_E(PHY,"Format 1A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -4146,16 +4169,9 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4146,16 +4169,9 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch0_harq->mimo_mode = frame_parms->mode1_flag == 1 ?SISO : ALAMOUTI; dlsch0_harq->mimo_mode = frame_parms->mode1_flag == 1 ?SISO : ALAMOUTI;
dlsch0_harq->dl_power_off = 1; //no power offset dlsch0_harq->dl_power_off = 1; //no power offset
LOG_D(PHY,"UE (%x/%d): Subframe %d Format1A DCI: ndi %d, old_ndi %d (first tx %d) harq_status %d, round %d\n", dlsch[0]->active = 1; // fix no DLSCH decoding for downlink retransmission
dlsch[0]->rnti,
harq_pid, if ((ndi!=dlsch0_harq->DCINdi) || // DCI has been toggled or this is the first transmission
subframe,
ndi,
dlsch0_harq->DCINdi,
dlsch0_harq->first_tx,
dlsch0_harq->status,
dlsch0_harq->round);
if ((ndi!=dlsch0_harq->DCINdi)|| // DCI has been toggled or this is the first transmission
(dlsch0_harq->first_tx==1)) { (dlsch0_harq->first_tx==1)) {
dlsch0_harq->round = 0; dlsch0_harq->round = 0;
...@@ -4163,10 +4179,41 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4163,10 +4179,41 @@ int generate_ue_dlsch_params_from_dci(int frame,
//LOG_I(PHY,"[PDSCH %x/%d] Format 1A DCI First TX: Clearing flag\n"); //LOG_I(PHY,"[PDSCH %x/%d] Format 1A DCI First TX: Clearing flag\n");
dlsch0_harq->first_tx = 0; dlsch0_harq->first_tx = 0;
} }
} else if (dlsch0_harq->round == 0) { // duplicated PDSCH received. possibly eNB missed the previous DL ACK/NACK feedback
// skip PDSCH decoding
dlsch[0]->active = 0;
// report ACK back to eNB for this duplicated PDSCH
dlsch0_harq->status = SCH_IDLE;
dlsch0_harq->round = 0;
dlsch[0]->harq_ack[subframe].ack = 1;
dlsch[0]->harq_ack[subframe].harq_id = harq_pid;
dlsch[0]->harq_ack[subframe].send_harq_status = 1;
LOG_D(PHY,"UE (%x/%d): Format1A DCI: Duplicated PDSCH. Setting ACK for subframe %d (pid %d, round 0)\n",
dlsch[0]->rnti,harq_pid, subframe,harq_pid);
} }
LOG_D(PHY,"UE (%x/%d): SFN/SF %4d/%1d Format1A DCI: dai %d, ndi %d, old_ndi %d (first tx %d), harq_status %d, round %d\n",
rnti,
harq_pid,
frame % 1024,
subframe,
dai,
ndi,
dlsch0_harq->DCINdi,
dlsch0_harq->first_tx,
dlsch0_harq->status,
dlsch0_harq->round);
if (rnti == tc_rnti) {
dlsch0_harq->DCINdi = (uint8_t)-1;
LOG_D(PHY,"UE (%x/%d): Format1A DCI: C-RNTI is temporary. Set NDI = %d and to be ignored\n",
rnti,harq_pid,dlsch0_harq->DCINdi);
} else {
dlsch0_harq->DCINdi = ndi; dlsch0_harq->DCINdi = ndi;
}
dlsch[0]->harq_ack[subframe].vDAI_DL = dai+1;
// this a retransmission // this a retransmission
if(dlsch0_harq->round) if(dlsch0_harq->round)
{ {
...@@ -4196,7 +4243,6 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4196,7 +4243,6 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch0_harq->Qm = get_Qm(mcs); dlsch0_harq->Qm = get_Qm(mcs);
} }
dlsch[0]->rnti = rnti; dlsch[0]->rnti = rnti;
dlsch[0]->active = 1;
dlsch0 = dlsch[0]; dlsch0 = dlsch[0];
//printf("Format 1A: harq_pid %d, nb_rb %d, round %d\n",harq_pid,dlsch0_harq->nb_rb,dlsch0_harq->round); //printf("Format 1A: harq_pid %d, nb_rb %d, round %d\n",harq_pid,dlsch0_harq->nb_rb,dlsch0_harq->round);
break; break;
...@@ -4425,7 +4471,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4425,7 +4471,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch0_harq = dlsch[0]->harq_processes[harq_pid]; dlsch0_harq = dlsch[0]->harq_processes[harq_pid];
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"Format 1: harq_pid >= 8\n"); LOG_E(PHY,"Format 1: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -4741,7 +4787,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4741,7 +4787,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
} }
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"Format 2_2A: harq_pid >= 8\n"); LOG_E(PHY,"Format 2_2A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -5154,7 +5200,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -5154,7 +5200,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"ERROR: Format 2_2A: harq_pid >= 8\n"); LOG_E(PHY,"ERROR: Format 2_2A: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -5416,7 +5462,7 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -5416,7 +5462,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
harq_pid = ((DCI1E_5MHz_2A_M10PRB_TDD_t *)dci_pdu)->harq_pid; harq_pid = ((DCI1E_5MHz_2A_M10PRB_TDD_t *)dci_pdu)->harq_pid;
if (harq_pid>=8) { if (harq_pid>=8) {
LOG_E(PHY,"Format 1E_2A_M10PRB: harq_pid >= 8\n"); LOG_E(PHY,"Format 1E_2A_M10PRB: harq_pid=%d >= 8\n", harq_pid);
return(-1); return(-1);
} }
...@@ -5606,7 +5652,6 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -5606,7 +5652,6 @@ int generate_ue_dlsch_params_from_dci(int frame,
T_INT(dlsch0_harq->TBS)); T_INT(dlsch0_harq->TBS));
} }
#endif #endif
dlsch[0]->active=1;
// compute DL power control parameters // compute DL power control parameters
computeRhoA_UE(pdsch_config_dedicated, dlsch[0],dlsch0_harq->dl_power_off); computeRhoA_UE(pdsch_config_dedicated, dlsch[0],dlsch0_harq->dl_power_off);
...@@ -6283,7 +6328,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -6283,7 +6328,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
uint8_t transmission_mode = ue->transmission_mode[eNB_id]; uint8_t transmission_mode = ue->transmission_mode[eNB_id];
ANFBmode_t AckNackFBMode; ANFBmode_t AckNackFBMode;
LTE_UE_ULSCH_t *ulsch = ue->ulsch[eNB_id]; LTE_UE_ULSCH_t *ulsch = ue->ulsch[eNB_id];
// LTE_UE_DLSCH_t **dlsch = ue->dlsch[0]; LTE_UE_DLSCH_t **dlsch = ue->dlsch[0];
PHY_MEASUREMENTS *meas = &ue->measurements; PHY_MEASUREMENTS *meas = &ue->measurements;
LTE_DL_FRAME_PARMS *frame_parms = &ue->frame_parms; LTE_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
// uint32_t current_dlsch_cqi = ue->current_dlsch_cqi[eNB_id]; // uint32_t current_dlsch_cqi = ue->current_dlsch_cqi[eNB_id];
...@@ -6298,12 +6343,15 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -6298,12 +6343,15 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
} }
uint32_t cqi_req; uint32_t cqi_req;
uint32_t dai=0; uint32_t dai=3;
uint32_t cshift; uint32_t cshift;
uint32_t TPC; uint32_t TPC;
uint32_t ndi; uint32_t ndi;
uint32_t mcs; uint32_t mcs;
uint32_t rballoc,RIV_max; uint32_t rballoc,RIV_max;
uint16_t* RIV2first_rb_LUT;
uint16_t* RIV2nb_rb_LUT;
// uint32_t hopping; // uint32_t hopping;
// uint32_t type; // uint32_t type;
...@@ -6349,8 +6397,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -6349,8 +6397,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
} }
RIV_max = RIV_max6; RIV_max = RIV_max6;
ulsch->harq_processes[harq_pid]->first_rb = RIV2first_rb_LUT6[rballoc]; RIV2first_rb_LUT = RIV2first_rb_LUT6;
ulsch->harq_processes[harq_pid]->nb_rb = RIV2nb_rb_LUT6[rballoc]; RIV2nb_rb_LUT = RIV2nb_rb_LUT6;
break; break;
...@@ -6377,8 +6425,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -6377,8 +6425,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
} }
RIV_max = RIV_max25; RIV_max = RIV_max25;
ulsch->harq_processes[harq_pid]->first_rb = RIV2first_rb_LUT25[rballoc]; RIV2first_rb_LUT = RIV2first_rb_LUT25;
ulsch->harq_processes[harq_pid]->nb_rb = RIV2nb_rb_LUT25[rballoc]; RIV2nb_rb_LUT = RIV2nb_rb_LUT25;
// printf("***********rballoc %d, first_rb %d, nb_rb %d (dci %p)\n",rballoc,ulsch->harq_processes[harq_pid]->first_rb,ulsch->harq_processes[harq_pid]->nb_rb,dci_pdu); // printf("***********rballoc %d, first_rb %d, nb_rb %d (dci %p)\n",rballoc,ulsch->harq_processes[harq_pid]->first_rb,ulsch->harq_processes[harq_pid]->nb_rb,dci_pdu);
break; break;
...@@ -6405,8 +6453,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -6405,8 +6453,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
} }
RIV_max = RIV_max50; RIV_max = RIV_max50;
ulsch->harq_processes[harq_pid]->first_rb = RIV2first_rb_LUT50[rballoc]; RIV2first_rb_LUT = RIV2first_rb_LUT50;
ulsch->harq_processes[harq_pid]->nb_rb = RIV2nb_rb_LUT50[rballoc]; RIV2nb_rb_LUT = RIV2nb_rb_LUT50;
break; break;
...@@ -6433,8 +6481,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -6433,8 +6481,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
} }
RIV_max = RIV_max100; RIV_max = RIV_max100;
ulsch->harq_processes[harq_pid]->first_rb = RIV2first_rb_LUT100[rballoc]; RIV2first_rb_LUT = RIV2first_rb_LUT100;
ulsch->harq_processes[harq_pid]->nb_rb = RIV2nb_rb_LUT100[rballoc]; RIV2nb_rb_LUT = RIV2nb_rb_LUT100;
// printf("rb_alloc (20 MHz dci) %d\n",rballoc); // printf("rb_alloc (20 MHz dci) %d\n",rballoc);
break; break;
...@@ -6466,6 +6514,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -6466,6 +6514,8 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
} }
ulsch->harq_processes[harq_pid]->TPC = TPC; ulsch->harq_processes[harq_pid]->TPC = TPC;
ulsch->harq_processes[harq_pid]->first_rb = RIV2first_rb_LUT[rballoc];
ulsch->harq_processes[harq_pid]->nb_rb = RIV2nb_rb_LUT[rballoc];
if (ue->ul_power_control_dedicated[eNB_id].accumulationEnabled == 1) { if (ue->ul_power_control_dedicated[eNB_id].accumulationEnabled == 1) {
LOG_D(PHY,"[UE %d][PUSCH %d] Frame %d subframe %d: f_pusch (ACC) %d, adjusting by %d (TPC %d)\n", LOG_D(PHY,"[UE %d][PUSCH %d] Frame %d subframe %d: f_pusch (ACC) %d, adjusting by %d (TPC %d)\n",
...@@ -7097,6 +7147,13 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -7097,6 +7147,13 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
// ulsch->harq_processes[harq_pid]->V_UL_DAI = dai+1; // ulsch->harq_processes[harq_pid]->V_UL_DAI = dai+1;
} }
dlsch[0]->harq_ack[subframe].vDAI_UL = dai+1;
LOG_D(PHY, "[PUSCH %d] Format0 DCI %s, CQI_req=%d, cshift=%d, TPC=%d, DAI=%d, vDAI_UL[sf#%d]=%d, NDI=%d, MCS=%d, RBalloc=%d, first_rb=%d, harq_pid=%d, nb_rb=%d, subframe_scheduling_flag=%d\n",
harq_pid,
(frame_parms->frame_type == TDD? "TDD" : "FDD"),
cqi_req, cshift, TPC, dai, subframe, dlsch[0]->harq_ack[subframe].vDAI_UL, ndi, mcs, rballoc, ulsch->harq_processes[harq_pid]->first_rb, harq_pid, ulsch->harq_processes[harq_pid]->nb_rb, ulsch->harq_processes[harq_pid]->subframe_scheduling_flag);
ulsch->beta_offset_cqi_times8 = beta_cqi[ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index];//18; ulsch->beta_offset_cqi_times8 = beta_cqi[ue->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index];//18;
ulsch->beta_offset_ri_times8 = beta_ri[ue->pusch_config_dedicated[eNB_id].betaOffset_RI_Index];//10; ulsch->beta_offset_ri_times8 = beta_ri[ue->pusch_config_dedicated[eNB_id].betaOffset_RI_Index];//10;
ulsch->beta_offset_harqack_times8 = beta_ack[ue->pusch_config_dedicated[eNB_id].betaOffset_ACK_Index];//16; ulsch->beta_offset_harqack_times8 = beta_ack[ue->pusch_config_dedicated[eNB_id].betaOffset_ACK_Index];//16;
...@@ -7105,20 +7162,27 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -7105,20 +7162,27 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
ulsch->srs_active = use_srs; ulsch->srs_active = use_srs;
ulsch->bundling = 1-AckNackFBMode; ulsch->bundling = 1-AckNackFBMode;
if (ulsch->harq_processes[harq_pid]->round == 0) {
if ((rnti >= cba_rnti) && (rnti < p_rnti)) if ((rnti >= cba_rnti) && (rnti < p_rnti))
ulsch->harq_processes[harq_pid]->status = CBA_ACTIVE; ulsch->harq_processes[harq_pid]->status = CBA_ACTIVE;
else else
ulsch->harq_processes[harq_pid]->status = ACTIVE; ulsch->harq_processes[harq_pid]->status = ACTIVE;
ulsch->harq_processes[harq_pid]->rvidx = 0; ulsch->harq_processes[harq_pid]->rvidx = 0;
ulsch->harq_processes[harq_pid]->mcs = mcs;
// ulsch->harq_processes[harq_pid]->calibration_flag =0; // ulsch->harq_processes[harq_pid]->calibration_flag =0;
if (ulsch->harq_processes[harq_pid]->mcs < 29) if (mcs < 29) {
ulsch->harq_processes[harq_pid]->mcs = mcs;
// ulsch->harq_processes[harq_pid]->round = 0;
} else {
ulsch->harq_processes[harq_pid]->rvidx = mcs - 28;
if (ulsch->harq_processes[harq_pid]->round == 0) {
LOG_W(PHY,"PUSCH::mcs = %d and DCI0::mcs(%d) > 28 and round == %d\n", ulsch->harq_processes[harq_pid]->mcs, mcs, ulsch->harq_processes[harq_pid]->round);
} else {
LOG_D(PHY,"PUSCH::mcs = %d and DCI0::mcs(%d) > 28 and round == %d\n", ulsch->harq_processes[harq_pid]->mcs, mcs, ulsch->harq_processes[harq_pid]->round);
}
//LOG_E(PHY,"Fatal: mcs(%d) > 28!!! and round == 0\n", mcs);
}
ulsch->harq_processes[harq_pid]->TBS = TBStable[get_I_TBS_UL(ulsch->harq_processes[harq_pid]->mcs)][ulsch->harq_processes[harq_pid]->nb_rb-1]; ulsch->harq_processes[harq_pid]->TBS = TBStable[get_I_TBS_UL(ulsch->harq_processes[harq_pid]->mcs)][ulsch->harq_processes[harq_pid]->nb_rb-1];
else
LOG_E(PHY,"Fatal: mcs > 28!!! and round == 0\n");
/* /*
else if (ulsch->harq_processes[harq_pid]->mcs == 29) { else if (ulsch->harq_processes[harq_pid]->mcs == 29) {
...@@ -7129,21 +7193,15 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu, ...@@ -7129,21 +7193,15 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
}*/ }*/
ulsch->harq_processes[harq_pid]->Msc_initial = 12*ulsch->harq_processes[harq_pid]->nb_rb; ulsch->harq_processes[harq_pid]->Msc_initial = 12*ulsch->harq_processes[harq_pid]->nb_rb;
ulsch->harq_processes[harq_pid]->Nsymb_initial = ulsch->Nsymb_pusch; ulsch->harq_processes[harq_pid]->Nsymb_initial = ulsch->Nsymb_pusch;
ulsch->harq_processes[harq_pid]->round = 0;
// a Ndi=1 automatically acknowledges previous PUSCH transmission // a Ndi=1 automatically acknowledges previous PUSCH transmission
if (ue->ulsch_Msg3_active[eNB_id] == 1) if (ue->ulsch_Msg3_active[eNB_id] == 1)
ue->ulsch_Msg3_active[eNB_id] = 0; ue->ulsch_Msg3_active[eNB_id] = 0;
} else {
// printf("Ndi = 0 : Setting RVidx from mcs %d\n",((DCI0_5MHz_TDD_1_6_t *)dci_pdu)->mcs);
if (mcs>28) ulsch->harq_processes[harq_pid]->rvidx = mcs - 28;
// ulsch->harq_processes[harq_pid]->round++;
}
LOG_D(PHY,"[UE %d][PUSCH %d] Frame %d, subframe %d : Programming PUSCH with n_DMRS2 %d (cshift %d), nb_rb %d, first_rb %d, mcs %d, round %d, rv %d\n", LOG_D(PHY,"[UE %d][PUSCH %d] Frame %d, subframe %d : Programming PUSCH with n_DMRS2 %d (cshift %d), nb_rb %d, first_rb %d, mcs %d, round %d, rv %d, ulsch_ue_Msg3_active %d\n",
ue->Mod_id,harq_pid,proc->frame_rx,subframe,ulsch->harq_processes[harq_pid]->n_DMRS2,cshift,ulsch->harq_processes[harq_pid]->nb_rb,ulsch->harq_processes[harq_pid]->first_rb, ue->Mod_id,harq_pid,
ulsch->harq_processes[harq_pid]->mcs,ulsch->harq_processes[harq_pid]->round,ulsch->harq_processes[harq_pid]->rvidx); proc->frame_rx,subframe,ulsch->harq_processes[harq_pid]->n_DMRS2,cshift,ulsch->harq_processes[harq_pid]->nb_rb,ulsch->harq_processes[harq_pid]->first_rb,
ulsch->harq_processes[harq_pid]->mcs,ulsch->harq_processes[harq_pid]->round,ulsch->harq_processes[harq_pid]->rvidx, ue->ulsch_Msg3_active[eNB_id]);
// ulsch->n_DMRS2 = ((DCI0_5MHz_TDD_1_6_t *)dci_pdu)->cshift; // ulsch->n_DMRS2 = ((DCI0_5MHz_TDD_1_6_t *)dci_pdu)->cshift;
......
openair1/PHY/LTE_TRANSPORT/defs.h
View file @ 217eba6b
...@@ -675,12 +675,16 @@ typedef struct { ...@@ -675,12 +675,16 @@ typedef struct {
typedef struct { typedef struct {
/// HARQ process id /// HARQ process id
uint8_t harq_id; uint8_t harq_id;
/// ACK bits (after decoding) /// ACK bits (after decoding) 0:NACK / 1:ACK / 2:DTX
uint8_t ack; uint8_t ack;
/// send status (for PUCCH) /// send status (for PUCCH)
uint8_t send_harq_status; uint8_t send_harq_status;
/// nCCE (for PUCCH) /// nCCE (for PUCCH)
uint8_t nCCE; uint8_t nCCE;
/// DAI value detected from DCI1/1a/1b/1d/2/2a/2b/2c. 0xff indicates not touched
uint8_t vDAI_DL;
/// DAI value detected from DCI0/4. 0xff indicates not touched
uint8_t vDAI_UL;
} harq_status_t; } harq_status_t;
typedef struct { typedef struct {
......
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
View file @ 217eba6b
...@@ -159,6 +159,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -159,6 +159,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
LTE_DL_FRAME_PARMS *frame_parms, LTE_DL_FRAME_PARMS *frame_parms,
LTE_UE_DLSCH_t *dlsch, LTE_UE_DLSCH_t *dlsch,
LTE_DL_UE_HARQ_t *harq_process, LTE_DL_UE_HARQ_t *harq_process,
uint8_t frame,
uint8_t subframe, uint8_t subframe,
uint8_t harq_pid, uint8_t harq_pid,
uint8_t is_crnti, uint8_t is_crnti,
...@@ -241,6 +242,11 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -241,6 +242,11 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
return(dlsch->max_turbo_iterations); return(dlsch->max_turbo_iterations);
} }
if (dlsch->harq_ack[subframe].ack != 2) {
LOG_W(PHY, "[UE %d] DLSCH @ SF%d : ACK bit is %d instead of DTX even before PDSCH is decoded!\n",
phy_vars_ue->Mod_id, subframe, dlsch->harq_ack[subframe].ack);
}
if (llr8_flag == 0) { if (llr8_flag == 0) {
//#ifdef __AVX2__ //#ifdef __AVX2__
#if 0 #if 0
...@@ -609,10 +615,20 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -609,10 +615,20 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
//printf("CRC failed, segment %d\n",r); //printf("CRC failed, segment %d\n",r);
err_flag = 1; err_flag = 1;
} }
}
int32_t frame_rx_prev = frame;
int32_t subframe_rx_prev = subframe - 1;
if (subframe_rx_prev < 0) {
frame_rx_prev--;
subframe_rx_prev += 10;
} }
frame_rx_prev = frame_rx_prev%1024;
if (err_flag == 1) { if (err_flag == 1) {
LOG_D(PHY,"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, round %d, subframe %d)\n",
phy_vars_ue->Mod_id, frame_rx_prev, subframe_rx_prev, harq_pid, harq_process->round, subframe);
dlsch->harq_ack[subframe].ack = 0; dlsch->harq_ack[subframe].ack = 0;
dlsch->harq_ack[subframe].harq_id = harq_pid; dlsch->harq_ack[subframe].harq_id = harq_pid;
dlsch->harq_ack[subframe].send_harq_status = 1; dlsch->harq_ack[subframe].send_harq_status = 1;
...@@ -631,6 +647,9 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -631,6 +647,9 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
return((1+dlsch->max_turbo_iterations)); return((1+dlsch->max_turbo_iterations));
} else { } else {
LOG_D(PHY,"[UE %d] DLSCH: Setting ACK for SFN/SF %d/%d (pid %d, round %d, subframe %d)\n",
phy_vars_ue->Mod_id, frame_rx_prev, subframe_rx_prev, harq_pid, harq_process->round, subframe);
harq_process->status = SCH_IDLE; harq_process->status = SCH_IDLE;
harq_process->round = 0; harq_process->round = 0;
dlsch->harq_ack[subframe].ack = 1; dlsch->harq_ack[subframe].ack = 1;
......
openair1/PHY/LTE_TRANSPORT/group_hopping.c
View file @ 217eba6b
...@@ -118,7 +118,8 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms) ...@@ -118,7 +118,8 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms)
uint16_t next = 0; uint16_t next = 0;
uint8_t ns=0; uint8_t ns=0;
uint32_t fss_pusch = frame_parms->Nid_cell + frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH; uint32_t fss_pucch = (frame_parms->Nid_cell) % 30;
uint32_t fss_pusch = (fss_pucch + frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH) % 30;
x2 = (32*(uint32_t)(frame_parms->Nid_cell/30)) + fss_pusch; x2 = (32*(uint32_t)(frame_parms->Nid_cell/30)) + fss_pusch;
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
......
openair1/PHY/LTE_TRANSPORT/phich.c
View file @ 217eba6b
...@@ -1119,6 +1119,16 @@ void rx_phich(PHY_VARS_UE *ue, ...@@ -1119,6 +1119,16 @@ void rx_phich(PHY_VARS_UE *ue,
nseq_PHICH = ((ulsch->harq_processes[harq_pid]->first_rb/Ngroup_PHICH) + nseq_PHICH = ((ulsch->harq_processes[harq_pid]->first_rb/Ngroup_PHICH) +
ulsch->harq_processes[harq_pid]->n_DMRS)%(2*NSF_PHICH); ulsch->harq_processes[harq_pid]->n_DMRS)%(2*NSF_PHICH);
} else { } else {
LOG_D(PHY,"[UE %d][PUSCH %d] Frame %d subframe %d PHICH RX %s\n",
ue->Mod_id,
harq_pid,
proc->frame_rx,
subframe,
(ulsch->harq_processes[harq_pid]->status==SCH_IDLE? "SCH_IDLE" :
(ulsch->harq_processes[harq_pid]->status==ACTIVE? "ACTIVE" :
(ulsch->harq_processes[harq_pid]->status==CBA_ACTIVE? "CBA_ACTIVE":
(ulsch->harq_processes[harq_pid]->status==DISABLED? "DISABLED" : "UNKNOWN")))));
return; return;
} }
......
openair1/PHY/LTE_TRANSPORT/proto.h
View file @ 217eba6b
...@@ -1138,6 +1138,7 @@ void dlsch_scale_channel(int32_t **dl_ch_estimates_ext, ...@@ -1138,6 +1138,7 @@ void dlsch_scale_channel(int32_t **dl_ch_estimates_ext,
@param dlsch_llr Pointer to LLR values computed by dlsch_demodulation @param dlsch_llr Pointer to LLR values computed by dlsch_demodulation
@param lte_frame_parms Pointer to frame descriptor @param lte_frame_parms Pointer to frame descriptor
@param dlsch Pointer to DLSCH descriptor @param dlsch Pointer to DLSCH descriptor
@param frame Frame number
@param subframe Subframe number @param subframe Subframe number
@param num_pdcch_symbols Number of PDCCH symbols @param num_pdcch_symbols Number of PDCCH symbols
@param is_crnti indicates if PDSCH belongs to a CRNTI (necessary for parallelizing decoding threads) @param is_crnti indicates if PDSCH belongs to a CRNTI (necessary for parallelizing decoding threads)
...@@ -1149,6 +1150,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -1149,6 +1150,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
LTE_DL_FRAME_PARMS *lte_frame_parms, LTE_DL_FRAME_PARMS *lte_frame_parms,
LTE_UE_DLSCH_t *dlsch, LTE_UE_DLSCH_t *dlsch,
LTE_DL_UE_HARQ_t *harq_process, LTE_DL_UE_HARQ_t *harq_process,
uint8_t frame,
uint8_t subframe, uint8_t subframe,
uint8_t harq_pid, uint8_t harq_pid,
uint8_t is_crnti, uint8_t is_crnti,
...@@ -1501,7 +1503,8 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -1501,7 +1503,8 @@ int generate_ue_dlsch_params_from_dci(int frame,
uint16_t si_rnti, uint16_t si_rnti,
uint16_t ra_rnti, uint16_t ra_rnti,
uint16_t p_rnti, uint16_t p_rnti,
uint8_t beamforming_mode); uint8_t beamforming_mode,
uint16_t tc_rnti);
int32_t generate_eNB_dlsch_params_from_dci(int frame, int32_t generate_eNB_dlsch_params_from_dci(int frame,
uint8_t subframe, uint8_t subframe,
......
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
View file @ 217eba6b
...@@ -469,6 +469,16 @@ uint32_t ulsch_encoding(uint8_t *a, ...@@ -469,6 +469,16 @@ uint32_t ulsch_encoding(uint8_t *a,
Q_ACK = Qprime * Q_m; Q_ACK = Qprime * Q_m;
Qprime_ACK = Qprime; Qprime_ACK = Qprime;
LOG_D(PHY,"UE (%x/%d) O_ACK %d, Mcs_initial %d, Nsymb_initial %d, beta_offset_harqack*8 %d, sum Kr %d, Qprime_ACK %d, Q_ACK %d\n",
rnti, harq_pid,
ulsch->harq_processes[harq_pid]->O_ACK,
ulsch->harq_processes[harq_pid]->Msc_initial,
ulsch->harq_processes[harq_pid]->Nsymb_initial,
ulsch->beta_offset_harqack_times8,
sumKr,
Qprime_ACK,
Q_ACK);
// Compute Q_cqi, assume O>11, p. 26 36-212 // Compute Q_cqi, assume O>11, p. 26 36-212
if (control_only_flag == 0) { if (control_only_flag == 0) {
......
openair1/PHY/impl_defs_lte.h
View file @ 217eba6b
...@@ -994,6 +994,8 @@ typedef struct { ...@@ -994,6 +994,8 @@ typedef struct {
uint8_t num_pdcch_symbols; uint8_t num_pdcch_symbols;
/// Allocated CRNTI for UE /// Allocated CRNTI for UE
uint16_t crnti; uint16_t crnti;
/// 1: the allocated crnti is Temporary C-RNTI / 0: otherwise
uint8_t crnti_is_temporary;
/// Total number of PDU errors (diagnostic mode) /// Total number of PDU errors (diagnostic mode)
uint32_t dci_errors; uint32_t dci_errors;
/// Total number of PDU received /// Total number of PDU received
......
openair1/SCHED/defs.h
View file @ 217eba6b
...@@ -307,6 +307,18 @@ uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n); ...@@ -307,6 +307,18 @@ uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n);
*/ */
uint8_t get_ack(LTE_DL_FRAME_PARMS *frame_parms,harq_status_t *harq_ack,uint8_t subframe,uint8_t *o_ACK); uint8_t get_ack(LTE_DL_FRAME_PARMS *frame_parms,harq_status_t *harq_ack,uint8_t subframe,uint8_t *o_ACK);
/*! \brief Reset ACK/NACK information
@param frame_parms Pointer to DL frame parameter descriptor
@param harq_ack Pointer to dlsch_ue harq_ack status descriptor
@param subframe Subframe for UE transmission (n in 36.213)
@param o_ACK Pointer to ACK/NAK payload for PUCCH/PUSCH
@returns status indicator for PUCCH/PUSCH transmission
*/
uint8_t reset_ack(LTE_DL_FRAME_PARMS *frame_parms,
harq_status_t *harq_ack,
unsigned char subframe,
unsigned char *o_ACK);
/*! \brief Compute UL ACK subframe from DL subframe. This is used to retrieve corresponding DLSCH HARQ pid at eNB upon reception of ACK/NAK information on PUCCH/PUSCH. Derived from Table 10.1-1 in 36.213 (p. 69 in version 8.6) /*! \brief Compute UL ACK subframe from DL subframe. This is used to retrieve corresponding DLSCH HARQ pid at eNB upon reception of ACK/NAK information on PUCCH/PUSCH. Derived from Table 10.1-1 in 36.213 (p. 69 in version 8.6)
@param frame_parms Pointer to DL frame parameter descriptor @param frame_parms Pointer to DL frame parameter descriptor
@param subframe Subframe for UE transmission (n in 36.213) @param subframe Subframe for UE transmission (n in 36.213)
...@@ -373,6 +385,7 @@ subframe n-4 which is acknowledged in subframe n (for FDD) according to n1_pucch ...@@ -373,6 +385,7 @@ subframe n-4 which is acknowledged in subframe n (for FDD) according to n1_pucch
TDD, this routine computes the complex procedure described in Section 10.1 of 36.213 (through tables 10.1-1,10.1-2) TDD, this routine computes the complex procedure described in Section 10.1 of 36.213 (through tables 10.1-1,10.1-2)
@param phy_vars_ue Pointer to UE variables @param phy_vars_ue Pointer to UE variables
@param proc Pointer to RXn-TXnp4 proc information @param proc Pointer to RXn-TXnp4 proc information
@param harq_ack Pointer to dlsch_ue harq_ack status descriptor
@param eNB_id Index of eNB @param eNB_id Index of eNB
@param b Pointer to PUCCH payload (b[0],b[1]) @param b Pointer to PUCCH payload (b[0],b[1])
@param SR 1 means there's a positive SR in parallel to ACK/NAK @param SR 1 means there's a positive SR in parallel to ACK/NAK
...@@ -380,6 +393,7 @@ TDD, this routine computes the complex procedure described in Section 10.1 of 36 ...@@ -380,6 +393,7 @@ TDD, this routine computes the complex procedure described in Section 10.1 of 36
*/ */
uint16_t get_n1_pucch(PHY_VARS_UE *phy_vars_ue, uint16_t get_n1_pucch(PHY_VARS_UE *phy_vars_ue,
UE_rxtx_proc_t *proc, UE_rxtx_proc_t *proc,
harq_status_t *harq_ack,
uint8_t eNB_id, uint8_t eNB_id,
uint8_t *b, uint8_t *b,
uint8_t SR); uint8_t SR);
......
openair1/SCHED/phy_procedures_lte_common.c
View file @ 217eba6b
...@@ -320,85 +320,128 @@ unsigned char ul_ACK_subframe2_M(LTE_DL_FRAME_PARMS *frame_parms,unsigned char s ...@@ -320,85 +320,128 @@ unsigned char ul_ACK_subframe2_M(LTE_DL_FRAME_PARMS *frame_parms,unsigned char s
} }
// This function implements table 10.1-1 of 36-213, p. 69 // This function implements table 10.1-1 of 36-213, p. 69
uint8_t get_ack(LTE_DL_FRAME_PARMS *frame_parms, // return the number 'Nbundled'
uint8_t get_reset_ack(LTE_DL_FRAME_PARMS *frame_parms,
harq_status_t *harq_ack, harq_status_t *harq_ack,
unsigned char subframe, unsigned char subframe,
unsigned char *o_ACK) unsigned char *o_ACK,
uint8_t do_reset) // 1 to reset ACK/NACK status : 0 otherwise
{ {
uint8_t status=0; uint8_t status=0;
uint8_t subframe_dl; uint8_t subframe_ul=0xff, subframe_dl0=0xff, subframe_dl1=0xff;
// printf("get_ack: SF %d\n",subframe); // printf("get_ack: SF %d\n",subframe);
if (frame_parms->frame_type == FDD) { if (frame_parms->frame_type == FDD) {
if (subframe < 4) if (subframe < 4)
subframe_dl = subframe + 6; subframe_dl0 = subframe + 6;
else else
subframe_dl = subframe - 4; subframe_dl0 = subframe - 4;
o_ACK[0] = harq_ack[subframe_dl].ack; o_ACK[0] = harq_ack[subframe_dl0].ack;
status = harq_ack[subframe_dl].send_harq_status; status = harq_ack[subframe_dl0].send_harq_status;
//printf("get_ack: Getting ACK/NAK for PDSCH (subframe %d) => %d\n",subframe_dl,o_ACK[0]); //printf("get_ack: Getting ACK/NAK for PDSCH (subframe %d) => %d\n",subframe_dl,o_ACK[0]);
} else { } else {
switch (frame_parms->tdd_config) { switch (frame_parms->tdd_config) {
case 1: case 1:
if (subframe == 2) { // ACK subframes 5 (forget 6) if (subframe == 2) { // ACK subframes 5,6
o_ACK[0] = harq_ack[5].ack; subframe_ul = 6;
status = harq_ack[5].send_harq_status; subframe_dl0 = 5;
subframe_dl1 = 6;
} else if (subframe == 3) { // ACK subframe 9 } else if (subframe == 3) { // ACK subframe 9
o_ACK[0] = harq_ack[9].ack; subframe_ul = 9;
status = harq_ack[9].send_harq_status; subframe_dl0 = 9;
subframe_dl1 = 0xff;
} else if (subframe == 4) { // nothing } else if (subframe == 4) { // nothing
status = 0; subframe_ul = 0xff;
} else if (subframe == 7) { // ACK subframes 0 (forget 1) subframe_dl0 = 0xff; // invalid subframe number indicates ACK/NACK is not needed
o_ACK[0] = harq_ack[0].ack; subframe_dl1 = 0xff;
status = harq_ack[0].send_harq_status; } else if (subframe == 7) { // ACK subframes 0,1
subframe_ul = 1;
subframe_dl0 = 0;
subframe_dl1 = 1;
} else if (subframe == 8) { // ACK subframes 4 } else if (subframe == 8) { // ACK subframes 4
o_ACK[0] = harq_ack[4].ack; subframe_ul = 4;
status = harq_ack[4].send_harq_status; subframe_dl0 = 4;
subframe_dl1 = 0xff;
} else { } else {
LOG_E(PHY,"phy_procedures_lte.c: get_ack, illegal subframe %d for tdd_config %d\n", LOG_E(PHY,"phy_procedures_lte.c: get_ack, illegal subframe %d for tdd_config %d\n",
subframe,frame_parms->tdd_config); subframe,frame_parms->tdd_config);
return(0); return(0);
} }
// report ACK/NACK status
o_ACK[0] = 1;
status = 0;
if ((subframe_dl0 < 10) && (harq_ack[subframe_dl0].send_harq_status)) {
o_ACK[0] &= harq_ack[subframe_dl0].ack;
status = harq_ack[subframe_dl0].send_harq_status;
}
if ((subframe_dl1 < 10) && (harq_ack[subframe_dl1].send_harq_status)) {
o_ACK[0] &= harq_ack[subframe_dl1].ack;
status = harq_ack[subframe_dl1].send_harq_status;
}
// report status = Nbundled
if (!status) {
o_ACK[0] = 0;
} else {
if (harq_ack[subframe_ul].vDAI_UL < 0xff) {
status = harq_ack[subframe_ul].vDAI_UL;
}
}
if (!do_reset && (subframe_ul < 10)) {
if ((subframe_dl0 < 10) && (subframe_dl1 < 10)) {
LOG_D(PHY,"ul-sf#%d vDAI_UL[sf#%d]=%d Nbundled=%d: dlsf#%d ACK=%d harq_status=%d vDAI_DL=%d, dlsf#%d ACK=%d harq_status=%d vDAI_DL=%d, o_ACK[0]=%d status=%d\n",
subframe, subframe_ul, harq_ack[subframe_ul].vDAI_UL, status,
subframe_dl0, harq_ack[subframe_dl0].ack, harq_ack[subframe_dl0].send_harq_status, harq_ack[subframe_dl0].vDAI_DL,
subframe_dl1, harq_ack[subframe_dl1].ack, harq_ack[subframe_dl1].send_harq_status, harq_ack[subframe_dl1].vDAI_DL,
o_ACK[0], status);
} else if (subframe_dl0 < 10) {
LOG_D(PHY,"ul-sf#%d vDAI_UL[sf#%d]=%d Nbundled=%d: dlsf#%d ACK=%d status=%d vDAI_DL=%d, o_ACK[0]=%d status=%d\n",
subframe, subframe_ul, harq_ack[subframe_ul].vDAI_UL, status,
subframe_dl0, harq_ack[subframe_dl0].ack, harq_ack[subframe_dl0].send_harq_status, harq_ack[subframe_dl0].vDAI_DL,
o_ACK[0], status);
}else if (subframe_dl1 < 10) {
LOG_D(PHY,"ul-sf#%d vDAI_UL[sf#%d]=%d Nbundled=%d: dlsf#%d ACK=%d status=%d vDAI_DL=%d, o_ACK[0]=%d status=%d\n",
subframe, subframe_ul, harq_ack[subframe_ul].vDAI_UL, status,
subframe_dl1, harq_ack[subframe_dl1].ack, harq_ack[subframe_dl1].send_harq_status, harq_ack[subframe_dl1].vDAI_DL,
o_ACK[0], status);
}
}
// reset ACK/NACK status
if (do_reset) {
LOG_D(PHY,"ul-sf#%d ACK/NACK status resetting @ dci0-sf#%d, dci1x/2x-sf#%d, dci1x/2x-sf#%d\n", subframe, subframe_ul, subframe_dl0, subframe_dl1);
if (subframe_ul < 10) {
harq_ack[subframe_ul].vDAI_UL = 0xff;
}
if (subframe_dl0 < 10) {
harq_ack[subframe_dl0].vDAI_DL = 0xff;
harq_ack[subframe_dl0].ack = 2;
harq_ack[subframe_dl0].send_harq_status = 0;
}
if (subframe_dl1 < 10) {
harq_ack[subframe_dl1].vDAI_DL = 0xff;
harq_ack[subframe_dl1].ack = 2;
harq_ack[subframe_dl1].send_harq_status = 0;
}
}
break; break;
case 3: case 3:
if (subframe == 2) { // ACK subframes 5 and 6 if (subframe == 2) { // ACK subframes 5 and 6
if (harq_ack[5].send_harq_status == 1) { subframe_dl0 = 5;
o_ACK[0] = harq_ack[5].ack; subframe_dl1 = 6;
if (harq_ack[6].send_harq_status == 1)
o_ACK[1] = harq_ack[6].ack;
} else if (harq_ack[6].send_harq_status == 1)
o_ACK[0] = harq_ack[6].ack;
status = harq_ack[5].send_harq_status + (harq_ack[6].send_harq_status<<1);
//printf("Subframe 2, TDD config 3: harq_ack[5] = %d (%d),harq_ack[6] = %d (%d)\n",harq_ack[5].ack,harq_ack[5].send_harq_status,harq_ack[6].ack,harq_ack[6].send_harq_status); //printf("Subframe 2, TDD config 3: harq_ack[5] = %d (%d),harq_ack[6] = %d (%d)\n",harq_ack[5].ack,harq_ack[5].send_harq_status,harq_ack[6].ack,harq_ack[6].send_harq_status);
} else if (subframe == 3) { // ACK subframes 7 and 8 } else if (subframe == 3) { // ACK subframes 7 and 8
if (harq_ack[7].send_harq_status == 1) { subframe_dl0 = 7;
o_ACK[0] = harq_ack[7].ack; subframe_dl1 = 8;
if (harq_ack[8].send_harq_status == 1)
o_ACK[1] = harq_ack[8].ack;
} else if (harq_ack[8].send_harq_status == 1)
o_ACK[0] = harq_ack[8].ack;
status = harq_ack[7].send_harq_status + (harq_ack[8].send_harq_status<<1);
//printf("Subframe 3, TDD config 3: harq_ack[7] = %d,harq_ack[8] = %d\n",harq_ack[7].ack,harq_ack[8].ack); //printf("Subframe 3, TDD config 3: harq_ack[7] = %d,harq_ack[8] = %d\n",harq_ack[7].ack,harq_ack[8].ack);
//printf("status %d : o_ACK (%d,%d)\n", status,o_ACK[0],o_ACK[1]); //printf("status %d : o_ACK (%d,%d)\n", status,o_ACK[0],o_ACK[1]);
} else if (subframe == 4) { // ACK subframes 9 and 0 } else if (subframe == 4) { // ACK subframes 9 and 0
if (harq_ack[9].send_harq_status == 1) { subframe_dl0 = 9;
o_ACK[0] = harq_ack[9].ack; subframe_dl1 = 0;
if (harq_ack[0].send_harq_status == 1)
o_ACK[1] = harq_ack[0].ack;
} else if (harq_ack[0].send_harq_status == 1)
o_ACK[0] = harq_ack[0].ack;
status = harq_ack[9].send_harq_status + (harq_ack[0].send_harq_status<<1);
//printf("Subframe 4, TDD config 3: harq_ack[9] = %d,harq_ack[0] = %d\n",harq_ack[9].ack,harq_ack[0].ack); //printf("Subframe 4, TDD config 3: harq_ack[9] = %d,harq_ack[0] = %d\n",harq_ack[9].ack,harq_ack[0].ack);
} else { } else {
LOG_E(PHY,"phy_procedures_lte.c: get_ack, illegal subframe %d for tdd_config %d\n", LOG_E(PHY,"phy_procedures_lte.c: get_ack, illegal subframe %d for tdd_config %d\n",
...@@ -406,6 +449,25 @@ uint8_t get_ack(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -406,6 +449,25 @@ uint8_t get_ack(LTE_DL_FRAME_PARMS *frame_parms,
return(0); return(0);
} }
// report ACK/NACK status
if (harq_ack[subframe_dl0].send_harq_status == 1) {
o_ACK[0] = harq_ack[subframe_dl0].ack;
if (harq_ack[subframe_dl1].send_harq_status == 1)
o_ACK[1] = harq_ack[subframe_dl1].ack;
} else if (harq_ack[subframe_dl1].send_harq_status == 1)
o_ACK[0] = harq_ack[subframe_dl1].ack;
status = harq_ack[subframe_dl0].send_harq_status + (harq_ack[subframe_dl1].send_harq_status<<1);
if (do_reset) {
// reset ACK/NACK status
harq_ack[subframe_dl0].ack = 2;
harq_ack[subframe_dl1].ack = 2;
harq_ack[subframe_dl0].send_harq_status = 0;
harq_ack[subframe_dl1].send_harq_status = 0;
}
break; break;
} }
...@@ -416,6 +478,24 @@ uint8_t get_ack(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -416,6 +478,24 @@ uint8_t get_ack(LTE_DL_FRAME_PARMS *frame_parms,
return(status); return(status);
} }
uint8_t get_ack(LTE_DL_FRAME_PARMS *frame_parms,
harq_status_t *harq_ack,
unsigned char subframe,
unsigned char *o_ACK)
{
return get_reset_ack(frame_parms, harq_ack, subframe, o_ACK, 0);
}
uint8_t reset_ack(LTE_DL_FRAME_PARMS *frame_parms,
harq_status_t *harq_ack,
unsigned char subframe,
unsigned char *o_ACK)
{
return get_reset_ack(frame_parms, harq_ack, subframe, o_ACK, 1);
}
uint8_t Np6[4]= {0,1,3,5}; uint8_t Np6[4]= {0,1,3,5};
uint8_t Np15[4]= {0,3,8,13}; uint8_t Np15[4]= {0,3,8,13};
uint8_t Np25[4]= {0,5,13,22}; uint8_t Np25[4]= {0,5,13,22};
......
openair1/SCHED/phy_procedures_lte_ue.c
View file @ 217eba6b
...@@ -265,7 +265,7 @@ void phy_reset_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index) ...@@ -265,7 +265,7 @@ void phy_reset_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index)
// This flushes ALL DLSCH and ULSCH harq buffers of ALL connected eNBs...add the eNB_index later // This flushes ALL DLSCH and ULSCH harq buffers of ALL connected eNBs...add the eNB_index later
// for more flexibility // for more flexibility
uint8_t i,j,k; uint8_t i,j,k,s;
PHY_VARS_UE *ue = PHY_vars_UE_g[Mod_id][CC_id]; PHY_VARS_UE *ue = PHY_vars_UE_g[Mod_id][CC_id];
//[NUMBER_OF_CONNECTED_eNB_MAX][2]; //[NUMBER_OF_CONNECTED_eNB_MAX][2];
...@@ -275,6 +275,13 @@ void phy_reset_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index) ...@@ -275,6 +275,13 @@ void phy_reset_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index)
if(ue->dlsch[i][j]) { if(ue->dlsch[i][j]) {
for(k=0; k<NUMBER_OF_HARQ_PID_MAX && ue->dlsch[i][j]->harq_processes[k]; k++) { for(k=0; k<NUMBER_OF_HARQ_PID_MAX && ue->dlsch[i][j]->harq_processes[k]; k++) {
ue->dlsch[i][j]->harq_processes[k]->status = SCH_IDLE; ue->dlsch[i][j]->harq_processes[k]->status = SCH_IDLE;
for (s=0; s<10; s++) {
// reset ACK/NACK bit to DTX for all subframes s = 0..9
ue->dlsch[i][j]->harq_ack[s].ack = 2;
ue->dlsch[i][j]->harq_ack[s].send_harq_status = 0;
ue->dlsch[i][j]->harq_ack[s].vDAI_UL = 0xff;
ue->dlsch[i][j]->harq_ack[s].vDAI_DL = 0xff;
}
} }
} }
} }
...@@ -300,7 +307,9 @@ void ra_failed(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index) ...@@ -300,7 +307,9 @@ void ra_failed(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index)
// if contention resolution fails, go back to PRACH // if contention resolution fails, go back to PRACH
PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_index] = PRACH; PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_index] = PRACH;
LOG_E(PHY,"[UE %d] Random-access procedure fails, going back to PRACH, setting SIStatus = 0 and State RRC_IDLE\n",Mod_id); PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[eNB_index]->crnti_is_temporary = 0;
PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[eNB_index]->crnti = 0;
LOG_E(PHY,"[UE %d] Random-access procedure fails, going back to PRACH, setting SIStatus = 0, discard temporary C-RNTI and State RRC_IDLE\n",Mod_id);
//mac_xface->macphy_exit(""); //mac_xface->macphy_exit("");
} }
...@@ -309,8 +318,9 @@ void ra_succeeded(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index) ...@@ -309,8 +318,9 @@ void ra_succeeded(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index)
int i; int i;
LOG_I(PHY,"[UE %d][RAPROC] Random-access procedure succeeded\n",Mod_id); LOG_I(PHY,"[UE %d][RAPROC] Random-access procedure succeeded. Set C-RNTI = Temporary C-RNTI\n",Mod_id);
PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[eNB_index]->crnti_is_temporary = 0;
PHY_vars_UE_g[Mod_id][CC_id]->ulsch_Msg3_active[eNB_index] = 0; PHY_vars_UE_g[Mod_id][CC_id]->ulsch_Msg3_active[eNB_index] = 0;
PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_index] = PUSCH; PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_index] = PUSCH;
...@@ -727,6 +737,7 @@ void get_cqipmiri_params(PHY_VARS_UE *ue,uint8_t eNB_id) ...@@ -727,6 +737,7 @@ void get_cqipmiri_params(PHY_VARS_UE *ue,uint8_t eNB_id)
uint16_t get_n1_pucch(PHY_VARS_UE *ue, uint16_t get_n1_pucch(PHY_VARS_UE *ue,
UE_rxtx_proc_t *proc, UE_rxtx_proc_t *proc,
harq_status_t *harq_ack,
uint8_t eNB_id, uint8_t eNB_id,
uint8_t *b, uint8_t *b,
uint8_t SR) uint8_t SR)
...@@ -736,7 +747,8 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue, ...@@ -736,7 +747,8 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
uint8_t nCCE0,nCCE1,harq_ack1,harq_ack0; uint8_t nCCE0,nCCE1,harq_ack1,harq_ack0;
ANFBmode_t bundling_flag; ANFBmode_t bundling_flag;
uint16_t n1_pucch0=0,n1_pucch1=0; uint16_t n1_pucch0=0,n1_pucch1=0;
int subframe_offset; static uint8_t candidate_dl[9]; // which downlink(s) the current ACK/NACK is associating to
uint8_t last_dl=0xff; // the last downlink with valid DL-DCI. for calculating the PUCCH resource index
int sf; int sf;
int M; int M;
// clear this, important for case where n1_pucch selection is not used // clear this, important for case where n1_pucch selection is not used
...@@ -774,33 +786,51 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue, ...@@ -774,33 +786,51 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
M=1; M=1;
// This is the offset for a particular subframe (2,3,4) => (0,2,4) // This is the offset for a particular subframe (2,3,4) => (0,2,4)
if (subframe == 2) { // ACK subframes 5 (forget 6) if (subframe == 2) { // ACK subframes 5,6
subframe_offset = 5; candidate_dl[0] = 6;
candidate_dl[1] = 5;
M=2; M=2;
} else if (subframe == 3) { // ACK subframe 9 } else if (subframe == 3) { // ACK subframe 9
subframe_offset = 9; candidate_dl[0] = 9;
} else if (subframe == 7) { // ACK subframes 0 (forget 1) } else if (subframe == 7) { // ACK subframes 0,1
subframe_offset = 0; candidate_dl[0] = 1;
candidate_dl[1] = 0;
M=2; M=2;
} else if (subframe == 8) { // ACK subframes 4 } else if (subframe == 8) { // ACK subframes 4
subframe_offset = 4; candidate_dl[0] = 4;
} else { } else {
LOG_E(PHY,"[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal subframe %d for tdd_config %d\n", LOG_E(PHY,"[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal subframe %d for tdd_config %d\n",
ue->Mod_id,proc->frame_tx,subframe,frame_parms->tdd_config); ue->Mod_id,proc->frame_tx,subframe,frame_parms->tdd_config);
return(0); return(0);
} }
// checking which downlink candidate is the last downlink with valid DL-DCI
int k;
for (k=0;k<M;k++) {
if (harq_ack[candidate_dl[k]].send_harq_status>0) {
last_dl = candidate_dl[k];
break;
}
}
if (last_dl >= 10) {
LOG_E(PHY,"[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal subframe %d for tdd_config %d\n",
ue->Mod_id,proc->frame_tx,last_dl,frame_parms->tdd_config);
return (0);
}
LOG_D(PHY,"SFN/SF %d/%d calculating n1_pucch0 from last_dl=%d\n",
proc->frame_tx%1024,
proc->subframe_tx,
last_dl);
// i=0 // i=0
nCCE0 = ue->pdcch_vars[eNB_id]->nCCE[subframe_offset]; nCCE0 = ue->pdcch_vars[eNB_id]->nCCE[last_dl];
n1_pucch0 = get_Np(frame_parms->N_RB_DL,nCCE0,0) + nCCE0+ frame_parms->pucch_config_common.n1PUCCH_AN; n1_pucch0 = get_Np(frame_parms->N_RB_DL,nCCE0,0) + nCCE0+ frame_parms->pucch_config_common.n1PUCCH_AN;
// set ACK/NAK to values if not DTX harq_ack0 = b[0];
if (ue->dlsch[eNB_id][0]->harq_ack[subframe_offset].send_harq_status>0) // n-6 // subframe 5 is to be ACK/NAKed
harq_ack0 = ue->dlsch[eNB_id][0]->harq_ack[subframe_offset].ack;
if (harq_ack0!=2) { // DTX if (harq_ack0!=2) { // DTX
if (frame_parms->frame_type == FDD ) {
if (SR == 0) { // last paragraph pg 68 from 36.213 (v8.6), m=0 if (SR == 0) { // last paragraph pg 68 from 36.213 (v8.6), m=0
b[0]=(M==2) ? 1-harq_ack0 : harq_ack0; b[0]=(M==2) ? 1-harq_ack0 : harq_ack0;
b[1]=harq_ack0; // in case we use pucch format 1b (subframes 2,7) b[1]=harq_ack0; // in case we use pucch format 1b (subframes 2,7)
...@@ -810,6 +840,18 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue, ...@@ -810,6 +840,18 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
b[0]=harq_ack0; b[0]=harq_ack0;
return(ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex); return(ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex);
} }
} else {
if (SR == 0) {
b[0] = harq_ack0;
b[1] = harq_ack0;
ue->pucch_sel[subframe] = 0;
return(n1_pucch0);
} else {
b[0] = harq_ack0;
b[1] = harq_ack0;
return(ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex);
}
}
} }
...@@ -822,20 +864,20 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue, ...@@ -822,20 +864,20 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
harq_ack1 = 2; // DTX harq_ack1 = 2; // DTX
harq_ack0 = 2; // DTX harq_ack0 = 2; // DTX
// This is the offset for a particular subframe (2,3,4) => (0,2,4) // This is the offset for a particular subframe (2,3,4) => (0,2,4)
subframe_offset = (subframe-2)<<1; last_dl = (subframe-2)<<1;
// i=0 // i=0
nCCE0 = ue->pdcch_vars[eNB_id]->nCCE[5+subframe_offset]; nCCE0 = ue->pdcch_vars[eNB_id]->nCCE[5+last_dl];
n1_pucch0 = get_Np(frame_parms->N_RB_DL,nCCE0,0) + nCCE0+ frame_parms->pucch_config_common.n1PUCCH_AN; n1_pucch0 = get_Np(frame_parms->N_RB_DL,nCCE0,0) + nCCE0+ frame_parms->pucch_config_common.n1PUCCH_AN;
// i=1 // i=1
nCCE1 = ue->pdcch_vars[eNB_id]->nCCE[(6+subframe_offset)%10]; nCCE1 = ue->pdcch_vars[eNB_id]->nCCE[(6+last_dl)%10];
n1_pucch1 = get_Np(frame_parms->N_RB_DL,nCCE1,1) + nCCE1 + frame_parms->pucch_config_common.n1PUCCH_AN; n1_pucch1 = get_Np(frame_parms->N_RB_DL,nCCE1,1) + nCCE1 + frame_parms->pucch_config_common.n1PUCCH_AN;
// set ACK/NAK to values if not DTX // set ACK/NAK to values if not DTX
if (ue->dlsch[eNB_id][0]->harq_ack[(6+subframe_offset)%10].send_harq_status>0) // n-6 // subframe 6 is to be ACK/NAKed if (ue->dlsch[eNB_id][0]->harq_ack[(6+last_dl)%10].send_harq_status>0) // n-6 // subframe 6 is to be ACK/NAKed
harq_ack1 = ue->dlsch[eNB_id][0]->harq_ack[(6+subframe_offset)%10].ack; harq_ack1 = ue->dlsch[eNB_id][0]->harq_ack[(6+last_dl)%10].ack;
if (ue->dlsch[eNB_id][0]->harq_ack[5+subframe_offset].send_harq_status>0) // n-6 // subframe 5 is to be ACK/NAKed if (ue->dlsch[eNB_id][0]->harq_ack[5+last_dl].send_harq_status>0) // n-6 // subframe 5 is to be ACK/NAKed
harq_ack0 = ue->dlsch[eNB_id][0]->harq_ack[5+subframe_offset].ack; harq_ack0 = ue->dlsch[eNB_id][0]->harq_ack[5+last_dl].ack;
if (harq_ack1!=2) { // n-6 // subframe 6,8,0 and maybe 5,7,9 is to be ACK/NAKed if (harq_ack1!=2) { // n-6 // subframe 6,8,0 and maybe 5,7,9 is to be ACK/NAKed
...@@ -1224,7 +1266,6 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB ...@@ -1224,7 +1266,6 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
int Mod_id = ue->Mod_id; int Mod_id = ue->Mod_id;
int CC_id = ue->CC_id; int CC_id = ue->CC_id;
uint8_t Msg3_flag=0; uint8_t Msg3_flag=0;
uint8_t ack_status=0;
uint16_t first_rb, nb_rb; uint16_t first_rb, nb_rb;
unsigned int input_buffer_length; unsigned int input_buffer_length;
int i; int i;
...@@ -1232,6 +1273,8 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB ...@@ -1232,6 +1273,8 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
int tx_amp; int tx_amp;
uint8_t ulsch_input_buffer[5477] __attribute__ ((aligned(32))); uint8_t ulsch_input_buffer[5477] __attribute__ ((aligned(32)));
uint8_t access_mode; uint8_t access_mode;
uint8_t Nbundled=0;
uint8_t ack_status=0;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC,VCD_FUNCTION_IN); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC,VCD_FUNCTION_IN);
...@@ -1275,6 +1318,49 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB ...@@ -1275,6 +1318,49 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
} }
} }
if (ue->ulsch[eNB_id]->harq_processes[harq_pid]->subframe_scheduling_flag == 1) {
uint8_t isBad = 0;
if (ue->frame_parms.N_RB_UL <= ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb) {
LOG_D(PHY,"Invalid PUSCH first_RB=%d for N_RB_UL=%d\n",
ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb,
ue->frame_parms.N_RB_UL);
isBad = 1;
}
if (ue->frame_parms.N_RB_UL < ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb) {
LOG_D(PHY,"Invalid PUSCH num_RB=%d for N_RB_UL=%d\n",
ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb,
ue->frame_parms.N_RB_UL);
isBad = 1;
}
if (0 > ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb) {
LOG_D(PHY,"Invalid PUSCH first_RB=%d\n",
ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb);
isBad = 1;
}
if (0 >= ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb) {
LOG_D(PHY,"Invalid PUSCH num_RB=%d\n",
ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb);
isBad = 1;
}
if (ue->frame_parms.N_RB_UL < (ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb + ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb)) {
LOG_D(PHY,"Invalid PUSCH num_RB=%d + first_RB=%d for N_RB_UL=%d\n",
ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb,
ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb,
ue->frame_parms.N_RB_UL);
isBad = 1;
}
if ((0 > ue->ulsch[eNB_id]->harq_processes[harq_pid]->rvidx) ||
(3 < ue->ulsch[eNB_id]->harq_processes[harq_pid]->rvidx)) {
LOG_D(PHY,"Invalid PUSCH RV index=%d\n", ue->ulsch[eNB_id]->harq_processes[harq_pid]->rvidx);
isBad = 1;
}
if (isBad) {
LOG_D(PHY,"Skip PUSCH generation!\n");
ue->ulsch[eNB_id]->harq_processes[harq_pid]->subframe_scheduling_flag = 0;
}
}
if (ue->ulsch[eNB_id]->harq_processes[harq_pid]->subframe_scheduling_flag == 1) { if (ue->ulsch[eNB_id]->harq_processes[harq_pid]->subframe_scheduling_flag == 1) {
ue->generate_ul_signal[eNB_id] = 1; ue->generate_ul_signal[eNB_id] = 1;
...@@ -1293,7 +1379,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB ...@@ -1293,7 +1379,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
ue->dlsch[eNB_id][0]->harq_ack, ue->dlsch[eNB_id][0]->harq_ack,
subframe_tx, subframe_tx,
ue->ulsch[eNB_id]->o_ACK); ue->ulsch[eNB_id]->o_ACK);
Nbundled = ack_status;
first_rb = ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb; first_rb = ue->ulsch[eNB_id]->harq_processes[harq_pid]->first_rb;
nb_rb = ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb; nb_rb = ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb;
...@@ -1339,7 +1425,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB ...@@ -1339,7 +1425,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#ifdef DEBUG_PHY_PROC #ifdef DEBUG_PHY_PROC
LOG_D(PHY, LOG_D(PHY,
"[UE %d][PUSCH %d] Frame %d subframe %d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d\n", "[UE %d][PUSCH %d] Frame %d subframe %d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d, bundling %d\n",
Mod_id,harq_pid,frame_tx,subframe_tx, Mod_id,harq_pid,frame_tx,subframe_tx,
first_rb,nb_rb, first_rb,nb_rb,
ue->ulsch[eNB_id]->harq_processes[harq_pid]->round, ue->ulsch[eNB_id]->harq_processes[harq_pid]->round,
...@@ -1352,7 +1438,8 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB ...@@ -1352,7 +1438,8 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
ue->ulsch[eNB_id]->harq_processes[harq_pid]->n_DMRS2, ue->ulsch[eNB_id]->harq_processes[harq_pid]->n_DMRS2,
ue->frame_parms.pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[subframe_tx<<1], ue->frame_parms.pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[subframe_tx<<1],
ue->ulsch[eNB_id]->o_ACK[0],ue->ulsch[eNB_id]->o_ACK[1], ue->ulsch[eNB_id]->o_ACK[0],ue->ulsch[eNB_id]->o_ACK[1],
ue->ulsch[eNB_id]->harq_processes[harq_pid]->O_ACK); ue->ulsch[eNB_id]->harq_processes[harq_pid]->O_ACK,
ue->ulsch[eNB_id]->bundling);
#endif #endif
...@@ -1455,7 +1542,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB ...@@ -1455,7 +1542,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
harq_pid, harq_pid,
eNB_id, eNB_id,
ue->transmission_mode[eNB_id],0, ue->transmission_mode[eNB_id],0,
0)!=0) { // Nbundled, to be updated!!!! Nbundled)!=0) {
LOG_E(PHY,"ulsch_coding.c: FATAL ERROR: returning\n"); LOG_E(PHY,"ulsch_coding.c: FATAL ERROR: returning\n");
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX, VCD_FUNCTION_OUT);
stop_meas(&ue->phy_proc_tx); stop_meas(&ue->phy_proc_tx);
...@@ -1620,6 +1707,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin ...@@ -1620,6 +1707,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
int CC_id = ue->CC_id; int CC_id = ue->CC_id;
int tx_amp; int tx_amp;
int16_t Po_PUCCH; int16_t Po_PUCCH;
uint8_t ack_status=0;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PUCCH,VCD_FUNCTION_IN); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PUCCH,VCD_FUNCTION_IN);
...@@ -1684,15 +1772,21 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin ...@@ -1684,15 +1772,21 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
SR_payload=0; SR_payload=0;
} }
if (get_ack(&ue->frame_parms, ack_status = get_ack(&ue->frame_parms,
ue->dlsch[eNB_id][0]->harq_ack, ue->dlsch[eNB_id][0]->harq_ack,
subframe_tx,pucch_ack_payload) > 0) { subframe_tx,pucch_ack_payload);
if (ack_status > 0) {
// we need to transmit ACK/NAK in this subframe // we need to transmit ACK/NAK in this subframe
ue->generate_ul_signal[eNB_id] = 1; ue->generate_ul_signal[eNB_id] = 1;
if ((frame_parms->frame_type == TDD) && (SR_payload>0)) {
format = pucch_format1b;
}
n1_pucch = get_n1_pucch(ue, n1_pucch = get_n1_pucch(ue,
proc, proc,
ue->dlsch[eNB_id][0]->harq_ack,
eNB_id, eNB_id,
pucch_ack_payload, pucch_ack_payload,
SR_payload); SR_payload);
...@@ -1719,21 +1813,25 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin ...@@ -1719,21 +1813,25 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
T_INT(tx_amp),T_INT(ue->dlsch[eNB_id][0]->g_pucch),T_INT(get_PL(ue->Mod_id,ue->CC_id,eNB_id))); T_INT(tx_amp),T_INT(ue->dlsch[eNB_id][0]->g_pucch),T_INT(get_PL(ue->Mod_id,ue->CC_id,eNB_id)));
#endif #endif
if (SR_payload>0) { if (SR_payload>0) {
LOG_D(PHY,"[UE %d][SR %x] Frame %d subframe %d Generating PUCCH 1a/1b payload %d,%d (with SR for PUSCH), an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, Po_PUCCH, amp %d\n", LOG_D(PHY,"[UE %d][SR %x] Frame %d subframe %d Generating PUCCH %s payload %d,%d (with SR for PUSCH), an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, Po_PUCCH, amp %d\n",
Mod_id, Mod_id,
ue->dlsch[eNB_id][0]->rnti, ue->dlsch[eNB_id][0]->rnti,
frame_tx % 1024, subframe_tx,
(format == pucch_format1a? "1a": (
format == pucch_format1b? "1b" : "??")),
pucch_ack_payload[0],pucch_ack_payload[1],
frame_parms->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission, frame_parms->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission,
isShortenPucch, isShortenPucch,
frame_tx, subframe_tx,
pucch_ack_payload[0],pucch_ack_payload[1],
ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex, ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex,
Po_PUCCH, Po_PUCCH,
tx_amp); tx_amp);
} else { } else {
LOG_D(PHY,"[UE %d][PDSCH %x] Frame %d subframe %d Generating PUCCH 1a/1b, an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, b[0]=%d,b[1]=%d (SR_Payload %d), Po_PUCCH %d, amp %d\n", LOG_D(PHY,"[UE %d][PDSCH %x] Frame %d subframe %d Generating PUCCH %s, an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, b[0]=%d,b[1]=%d (SR_Payload %d), Po_PUCCH %d, amp %d\n",
Mod_id, Mod_id,
ue->dlsch[eNB_id][0]->rnti, ue->dlsch[eNB_id][0]->rnti,
frame_tx, subframe_tx, frame_tx, subframe_tx,
(format == pucch_format1a? "1a": (
format == pucch_format1b? "1b" : "??")),
frame_parms->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission, frame_parms->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission,
isShortenPucch, isShortenPucch,
n1_pucch,pucch_ack_payload[0],pucch_ack_payload[1],SR_payload, n1_pucch,pucch_ack_payload[0],pucch_ack_payload[1],SR_payload,
...@@ -2083,6 +2181,17 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui ...@@ -2083,6 +2181,17 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
ue->generate_prach=0; ue->generate_prach=0;
} }
// reset DL ACK/NACK status
reset_ack(&ue->frame_parms,
ue->dlsch[eNB_id][0]->harq_ack,
subframe_tx,
ue->ulsch[eNB_id]->o_ACK);
reset_ack(&ue->frame_parms,
ue->dlsch_SI[eNB_id]->harq_ack,
subframe_tx,
ue->ulsch[eNB_id]->o_ACK);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX, VCD_FUNCTION_OUT);
stop_meas(&ue->phy_proc_tx); stop_meas(&ue->phy_proc_tx);
...@@ -2681,7 +2790,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint ...@@ -2681,7 +2790,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
SI_RNTI, SI_RNTI,
0, 0,
P_RNTI, P_RNTI,
ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id])==0)) { ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id],
ue->pdcch_vars[eNB_id]->crnti_is_temporary? ue->pdcch_vars[eNB_id]->crnti: 0)==0)) {
// update TPC for PUCCH // update TPC for PUCCH
if((dci_alloc_rx[i].format == format1) || if((dci_alloc_rx[i].format == format1) ||
...@@ -2740,7 +2850,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint ...@@ -2740,7 +2850,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
SI_RNTI, SI_RNTI,
0, 0,
P_RNTI, P_RNTI,
ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id])==0) { ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id],
0)==0) {
ue->dlsch_SI_received[eNB_id]++; ue->dlsch_SI_received[eNB_id]++;
...@@ -2770,7 +2881,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint ...@@ -2770,7 +2881,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
SI_RNTI, SI_RNTI,
0, 0,
P_RNTI, P_RNTI,
ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id])==0) { ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id],
0)==0) {
ue->dlsch_p_received[eNB_id]++; ue->dlsch_p_received[eNB_id]++;
...@@ -2805,7 +2917,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint ...@@ -2805,7 +2917,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
SI_RNTI, SI_RNTI,
ue->prach_resources[eNB_id]->ra_RNTI, ue->prach_resources[eNB_id]->ra_RNTI,
P_RNTI, P_RNTI,
ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id])==0) { ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id],
0)==0) {
ue->dlsch_ra_received[eNB_id]++; ue->dlsch_ra_received[eNB_id]++;
...@@ -2981,6 +3094,7 @@ void ue_pmch_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc,int eNB_id,int abs ...@@ -2981,6 +3094,7 @@ void ue_pmch_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc,int eNB_id,int abs
&ue->frame_parms, &ue->frame_parms,
ue->dlsch_MCH[0], ue->dlsch_MCH[0],
ue->dlsch_MCH[0]->harq_processes[0], ue->dlsch_MCH[0]->harq_processes[0],
frame_rx,
subframe_rx, subframe_rx,
0, 0,
0,1); 0,1);
...@@ -3157,6 +3271,9 @@ void process_rar(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc, int eNB_id, runmode_t mo ...@@ -3157,6 +3271,9 @@ void process_rar(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc, int eNB_id, runmode_t mo
ue->pdcch_vars[eNB_id]->crnti, ue->pdcch_vars[eNB_id]->crnti,
timing_advance); timing_advance);
// remember this c-rnti is still a tc-rnti
ue->pdcch_vars[eNB_id]->crnti_is_temporary = 1;
//timing_advance = 0; //timing_advance = 0;
process_timing_advance_rar(ue,proc,timing_advance); process_timing_advance_rar(ue,proc,timing_advance);
...@@ -3285,6 +3402,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue, ...@@ -3285,6 +3402,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
&ue->frame_parms, &ue->frame_parms,
dlsch0, dlsch0,
dlsch0->harq_processes[harq_pid], dlsch0->harq_processes[harq_pid],
frame_rx,
subframe_rx, subframe_rx,
harq_pid, harq_pid,
pdsch==PDSCH?1:0, pdsch==PDSCH?1:0,
...@@ -3344,6 +3462,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue, ...@@ -3344,6 +3462,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
mac_xface->ue_send_sdu(ue->Mod_id, mac_xface->ue_send_sdu(ue->Mod_id,
CC_id, CC_id,
frame_rx, frame_rx,
subframe_rx,
dlsch0->harq_processes[dlsch0->current_harq_pid]->b, dlsch0->harq_processes[dlsch0->current_harq_pid]->b,
dlsch0->harq_processes[dlsch0->current_harq_pid]->TBS>>3, dlsch0->harq_processes[dlsch0->current_harq_pid]->TBS>>3,
eNB_id); eNB_id);
...@@ -3646,10 +3765,6 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin ...@@ -3646,10 +3765,6 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC, VCD_FUNCTION_OUT);
} }
else {
// printf("PDSCH inactive in subframe %d\n",subframe_rx-1);
ue->dlsch[eNB_id][0]->harq_ack[subframe_rx].send_harq_status = 0;
}
// do procedures for SI-RNTI // do procedures for SI-RNTI
if ((ue->dlsch_SI[eNB_id]) && (ue->dlsch_SI[eNB_id]->active == 1)) { if ((ue->dlsch_SI[eNB_id]) && (ue->dlsch_SI[eNB_id]->active == 1)) {
......
openair1/SIMULATION/LTE_PHY/mbmssim.c
View file @ 217eba6b
...@@ -492,6 +492,7 @@ int main(int argc, char **argv) ...@@ -492,6 +492,7 @@ int main(int argc, char **argv)
&UE->frame_parms, &UE->frame_parms,
UE->dlsch_MCH[0], UE->dlsch_MCH[0],
UE->dlsch_MCH[0]->harq_processes[0], UE->dlsch_MCH[0]->harq_processes[0],
frame,
subframe, subframe,
0,0,0); 0,0,0);
......
openair1/SIMULATION/LTE_PHY/syncsim.c
View file @ 217eba6b
...@@ -1656,6 +1656,7 @@ int main(int argc, char **argv) ...@@ -1656,6 +1656,7 @@ int main(int argc, char **argv)
PHY_vars_UE[UE_idx]->lte_ue_pdsch_vars[0]->llr[0], PHY_vars_UE[UE_idx]->lte_ue_pdsch_vars[0]->llr[0],
&PHY_vars_UE[UE_idx]->lte_frame_parms, &PHY_vars_UE[UE_idx]->lte_frame_parms,
PHY_vars_UE[UE_idx]->dlsch_ue[0][0], PHY_vars_UE[UE_idx]->dlsch_ue[0][0],
frame,
subframe, subframe,
0, 0,
PHY_vars_UE[UE_idx]->lte_ue_pdcch_vars[0]->num_pdcch_symbols); PHY_vars_UE[UE_idx]->lte_ue_pdcch_vars[0]->num_pdcch_symbols);
......
openair2/LAYER2/MAC/proto.h
View file @ 217eba6b
...@@ -402,7 +402,7 @@ void ue_decode_si(module_id_t module_idP, int CC_id,frame_t frame, uint8_t CH_in ...@@ -402,7 +402,7 @@ void ue_decode_si(module_id_t module_idP, int CC_id,frame_t frame, uint8_t CH_in
void ue_decode_p(module_id_t module_idP, int CC_id,frame_t frame, uint8_t CH_index, void *pdu, uint16_t len); void ue_decode_p(module_id_t module_idP, int CC_id,frame_t frame, uint8_t CH_index, void *pdu, uint16_t len);
void ue_send_sdu(module_id_t module_idP, uint8_t CC_id,frame_t frame, uint8_t *sdu,uint16_t sdu_len,uint8_t CH_index); void ue_send_sdu(module_id_t module_idP, uint8_t CC_id,frame_t frame, sub_frame_t subframe, uint8_t *sdu,uint16_t sdu_len,uint8_t CH_index);
#ifdef Rel10 #ifdef Rel10
......
openair2/LAYER2/MAC/ue_procedures.c
View file @ 217eba6b
...@@ -333,6 +333,7 @@ ue_send_sdu( ...@@ -333,6 +333,7 @@ ue_send_sdu(
module_id_t module_idP, module_id_t module_idP,
uint8_t CC_id, uint8_t CC_id,
frame_t frameP, frame_t frameP,
sub_frame_t subframeP,
uint8_t* sdu, uint8_t* sdu,
uint16_t sdu_len, uint16_t sdu_len,
uint8_t eNB_index uint8_t eNB_index
...@@ -451,7 +452,7 @@ ue_send_sdu( ...@@ -451,7 +452,7 @@ ue_send_sdu(
#endif #endif
mac_rrc_data_ind(module_idP, mac_rrc_data_ind(module_idP,
CC_id, CC_id,
frameP,0, // unknown subframe frameP,subframeP,
UE_mac_inst[module_idP].crnti, UE_mac_inst[module_idP].crnti,
CCCH, CCCH,
(uint8_t*)payload_ptr, (uint8_t*)payload_ptr,
......
openair2/PHY_INTERFACE/defs.h
View file @ 217eba6b
...@@ -152,7 +152,7 @@ typedef struct { ...@@ -152,7 +152,7 @@ typedef struct {
void (*ue_decode_p)(module_id_t Mod_id,int CC_id,frame_t frameP, uint8_t CH_index, void *pdu, uint16_t len); void (*ue_decode_p)(module_id_t Mod_id,int CC_id,frame_t frameP, uint8_t CH_index, void *pdu, uint16_t len);
/// Send a received DLSCH sdu to MAC /// Send a received DLSCH sdu to MAC
void (*ue_send_sdu)(module_id_t Mod_id,uint8_t CC_id,frame_t frameP,uint8_t *sdu,uint16_t sdu_len,uint8_t CH_index); void (*ue_send_sdu)(module_id_t Mod_id,uint8_t CC_id,frame_t frameP,sub_frame_t subframe,uint8_t *sdu,uint16_t sdu_len,uint8_t CH_index);
#ifdef Rel10 #ifdef Rel10
/// Send a received MCH sdu to MAC /// Send a received MCH sdu to MAC
......
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