Skip to content

O
OpenXG-RAN
Commit 21481c4a authored by Elena_Lukashova's avatar Elena_Lukashova
Browse files
Options

Adding check for the first transmission in prepare_dl_decoding_format1_1A.

parent e5908bfd
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @ 21481c4a
...@@ -1270,7 +1270,6 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -1270,7 +1270,6 @@ int generate_eNB_dlsch_params_from_dci(int frame,
if (dlsch0_harq->round == 0) { if (dlsch0_harq->round == 0) {
dlsch0_harq->status = ACTIVE; dlsch0_harq->status = ACTIVE;
// printf("Setting DLSCH process %d to ACTIVE\n",harq_pid);
// MCS and TBS don't change across HARQ rounds // MCS and TBS don't change across HARQ rounds
dlsch0_harq->mcs = mcs; dlsch0_harq->mcs = mcs;
dlsch0_harq->TBS = TBStable[get_I_TBS(dlsch0_harq->mcs)][NPRB-1]; dlsch0_harq->TBS = TBStable[get_I_TBS(dlsch0_harq->mcs)][NPRB-1];
...@@ -2829,8 +2828,6 @@ int generate_eNB_dlsch_params_from_dci(int frame, ...@@ -2829,8 +2828,6 @@ int generate_eNB_dlsch_params_from_dci(int frame,
int dump_dci(LTE_DL_FRAME_PARMS *frame_parms, DCI_ALLOC_t *dci) int dump_dci(LTE_DL_FRAME_PARMS *frame_parms, DCI_ALLOC_t *dci)
{ {
switch (dci->format) { switch (dci->format) {
case format0: // This is an UL SCH allocation so nothing here, inform MAC case format0: // This is an UL SCH allocation so nothing here, inform MAC
...@@ -5182,14 +5179,14 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format, ...@@ -5182,14 +5179,14 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format,
else //CRNTI else //CRNTI
{ {
// DCI has been toggled or this is the first transmission // DCI has been toggled or this is the first transmission
if (ndi1!=pdlsch0_harq->DCINdi) if ((ndi1!=pdlsch0_harq->DCINdi) || (pdlsch0_harq->first_tx==1))
{ {
pdlsch0_harq->round = 0; pdlsch0_harq->round = 0;
pdlsch0_harq->first_tx = 1; pdlsch0_harq->first_tx = 1;
pdlsch0_harq->status = ACTIVE; pdlsch0_harq->status = ACTIVE;
} }
if( ((ndi1 == pdlsch0_harq->DCINdi) && (pdlsch0_harq->round == 0)) || if( ((ndi1 == pdlsch0_harq->DCINdi) && (pdlsch0_harq->round == 0) && (pdlsch0_harq->first_tx!=1)) ||
((rv1 != 0) && (pdlsch0_harq->round == 0)) ((rv1 != 0) && (pdlsch0_harq->round == 0))
) )
{ {
......
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