From 17aefade3fece7f4e0fdbbb84c1e8fc8c236ace0 Mon Sep 17 00:00:00 2001
From: hbilel <haithem.bilel@alcatelonetouch.com>
Date: Mon, 12 Dec 2016 12:48:48 +0100
Subject: [PATCH] remove temporary harq process for ue (ul)
---
openair1/PHY/LTE_TRANSPORT/dci_tools.c | 6 +++---
openair1/PHY/LTE_TRANSPORT/defs.h | 2 +-
openair1/PHY/LTE_TRANSPORT/phich.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index e73bb94d41..a1c118529a 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -6453,11 +6453,11 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
// subframe,
// ulsch->Mlimit);
//#endif
-
+/*
if (ulsch->harq_processes[harq_pid]->round > 0) // NACK detected on phich
{
// ulsch->harq_processes[harq_pid]->round++; already done on phich_rx
- ulsch->harq_processes[harq_pid] = ulsch->harq_processes[8];
+ // ulsch->harq_processes[harq_pid] = ulsch->harq_processes[8];
// LOG_I(PHY," Adaptative retransmission - copy temporary harq Process to current harq process. [harqId %d round %d] \n",harq_pid, ulsch->harq_processes[8]->round);
if (ulsch->harq_processes[harq_pid]->round >= ulsch->Mlimit) //UE_mac_inst[eNB_id].scheduling_info.maxHARQ_Tx)
@@ -6479,7 +6479,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
//LOG_I(PHY," [HARQ-UL harqId: %d] Adaptative retransmission NACK ==> subframe_scheduling_flag = %d round: %d\n", harq_pid, ulsch->harq_processes[harq_pid]->subframe_scheduling_flag,ulsch->harq_processes[harq_pid]->round);
}
}
-
+*/
}
}
diff --git a/openair1/PHY/LTE_TRANSPORT/defs.h b/openair1/PHY/LTE_TRANSPORT/defs.h
index c41df6c931..442fd82167 100644
--- a/openair1/PHY/LTE_TRANSPORT/defs.h
+++ b/openair1/PHY/LTE_TRANSPORT/defs.h
@@ -283,7 +283,7 @@ typedef struct {
/// SRS active flag
uint8_t srs_active;
/// Pointers to 8 HARQ processes for the ULSCH
- LTE_UL_UE_HARQ_t *harq_processes[9];
+ LTE_UL_UE_HARQ_t *harq_processes[8];
/// Pointer to CQI data
uint8_t o[MAX_CQI_BYTES];
/// Length of CQI data (bits)
diff --git a/openair1/PHY/LTE_TRANSPORT/phich.c b/openair1/PHY/LTE_TRANSPORT/phich.c
index c7cc188893..989567ca34 100644
--- a/openair1/PHY/LTE_TRANSPORT/phich.c
+++ b/openair1/PHY/LTE_TRANSPORT/phich.c
@@ -1441,7 +1441,7 @@ void rx_phich(PHY_VARS_UE *ue,
// rely only on DCI0 decoding and check if NDI has toggled
// save current harq_processes content in temporary struct
// harqId-8 corresponds to the temporary struct. In total we have 8 harq process(0 ..7) + 1 temporary harq process()
- ulsch->harq_processes[8] = ulsch->harq_processes[harq_pid];
+ //ulsch->harq_processes[8] = ulsch->harq_processes[harq_pid];
ulsch->harq_processes[harq_pid]->subframe_scheduling_flag =0;
ulsch->harq_processes[harq_pid]->status = IDLE;
--
2.26.2