maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove temporary harq process for ue (ul)

Browse Source
This commit is contained in:
hbilel
2016-12-12 12:48:48 +01:00
parent e0bf855fbf
commit 17aefade3f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+3 -3
View File
@@ -6453,11 +6453,11 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
// subframe, // subframe,
// ulsch->Mlimit); // ulsch->Mlimit);
//#endif //#endif
/*
if (ulsch->harq_processes[harq_pid]->round > 0) // NACK detected on phich 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]->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); // 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) 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); //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);
} }
} }
*/
} }
} }
openair1/PHY/LTE_TRANSPORT/defs.h
+1 -1
View File
@@ -283,7 +283,7 @@ typedef struct {
/// SRS active flag /// SRS active flag
uint8_t srs_active; uint8_t srs_active;
/// Pointers to 8 HARQ processes for the ULSCH /// 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 /// Pointer to CQI data
uint8_t o[MAX_CQI_BYTES]; uint8_t o[MAX_CQI_BYTES];
/// Length of CQI data (bits) /// Length of CQI data (bits)
openair1/PHY/LTE_TRANSPORT/phich.c
+1 -1
View File
@@ -1441,7 +1441,7 @@ void rx_phich(PHY_VARS_UE *ue,
// rely only on DCI0 decoding and check if NDI has toggled // rely only on DCI0 decoding and check if NDI has toggled
// save current harq_processes content in temporary struct // 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() // 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]->subframe_scheduling_flag =0;
ulsch->harq_processes[harq_pid]->status = IDLE; ulsch->harq_processes[harq_pid]->status = IDLE;