From 4ba0e2338a28e3dacf482bb57552ee6707387543 Mon Sep 17 00:00:00 2001 From: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Mon, 19 May 2014 14:28:35 +0000 Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5330 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c index 63e123daef..a0586f44d3 100644 --- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c +++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c @@ -235,7 +235,7 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *phy_vars_eNB, unsigned int sumKr=0; unsigned int Qprime,L,G,Q_CQI,Q_RI,H,Hprime,Hpp,Cmux,Rmux_prime,O_RCC; unsigned int Qprime_ACK,Qprime_CQI,Qprime_RI,len_ACK=0,len_RI=0; - uint8_t q_ACK[MAX_ACK_PAYLOAD],q_RI[MAX_RI_PAYLOAD]; + // uint8_t q_ACK[MAX_ACK_PAYLOAD],q_RI[MAX_RI_PAYLOAD]; int metric,metric_new; uint8_t o_flip[8]; uint32_t x1, x2, s=0; @@ -437,6 +437,8 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *phy_vars_eNB, start_meas(&phy_vars_eNB->ulsch_demultiplexing_stats); i=0; + memset(y,LTE_NULL,Q_m*Hpp); + /* // Do RI coding if (ulsch->O_RI == 1) { switch (Q_m) { @@ -467,7 +469,7 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *phy_vars_eNB, LOG_E(PHY,"ulsch_decoding: FATAL, RI cannot be more than 1 bit yet\n"); return(-1); } - + // 1-bit ACK/NAK if (ulsch->harq_processes[harq_pid]->O_ACK == 1) { switch (Q_m) { @@ -551,11 +553,13 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *phy_vars_eNB, LOG_E(PHY,"ulsch_decoding: FATAL, ACK cannot be more than 2 bits yet\n"); return(-1); } + + // RI BITS - memset(y,LTE_NULL,Q_m*Hpp); - // memset(ytag2,0,Q_m*Hpp); + // memset(ytag2,0,Q_m*Hpp); + */ // read in buffer and unscramble llrs for everything but placeholder bits // llrs stored per symbol correspond to columns of interleaving matrix -- GitLab