From a66f6907dea036fffb282097c8a8cd5310246798 Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Wed, 22 Apr 2020 11:11:22 +0200
Subject: [PATCH] bufix in calling phy pucch function

---
 openair1/SCHED_NR/phy_procedures_nr_gNB.c | 47 +++++++++++++----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index 8c0fc1f5a3..147ff778f3 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -387,30 +387,35 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
   for (int i=0;i<NUMBER_OF_NR_PUCCH_MAX;i++){
     NR_gNB_PUCCH_t *pucch = gNB->pucch[i];
     if (pucch) {
-      nfapi_nr_pucch_pdu_t  *pucch_pdu = &pucch[i].pucch_pdu;
-      uint16_t num_ucis;
+      if ((pucch->active == 1) &&
+	  (pucch->frame == frame_rx) &&
+	  (pucch->slot == slot_rx) ) {
 
-      switch (pucch_pdu->format_type) {
-      case 0:
-/*
-        num_ucis = gNB->UL_INFO.uci_ind.num_ucis;
-        gNB->UL_INFO.uci_ind.uci_list = &gNB->uci_pdu_list[0];
-        gNB->UL_INFO.uci_ind.sfn = frame_rx;
-        gNB->UL_INFO.uci_ind.slot = slot_rx;
-	gNB->uci_pdu_list[num_ucis].pdu_type = NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE;
-	gNB->uci_pdu_list[num_ucis].pdu_size = sizeof(nfapi_nr_uci_pucch_pdu_format_0_1_t);
-	nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_pdu_format0 = &gNB->uci_pdu_list[num_ucis].pucch_pdu_format_0_1;
+        nfapi_nr_pucch_pdu_t  *pucch_pdu = &pucch[i].pucch_pdu;
+        uint16_t num_ucis;
 
-	nr_decode_pucch0(gNB,
-			 slot_rx,
-			 uci_pdu_format0,
-			 pucch_pdu);
+        switch (pucch_pdu->format_type) {
+        case 0:
 
-	gNB->UL_INFO.uci_ind.num_ucis += 1;*/
-        pucch->active = 0;
-	break;
-      default:
-	AssertFatal(1==0,"Only PUCCH format 0 is currently supported\n");
+          num_ucis = gNB->UL_INFO.uci_ind.num_ucis;
+          gNB->UL_INFO.uci_ind.uci_list = &gNB->uci_pdu_list[0];
+          gNB->UL_INFO.uci_ind.sfn = frame_rx;
+          gNB->UL_INFO.uci_ind.slot = slot_rx;
+          gNB->uci_pdu_list[num_ucis].pdu_type = NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE;
+          gNB->uci_pdu_list[num_ucis].pdu_size = sizeof(nfapi_nr_uci_pucch_pdu_format_0_1_t);
+          nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_pdu_format0 = &gNB->uci_pdu_list[num_ucis].pucch_pdu_format_0_1;
+
+          nr_decode_pucch0(gNB,
+	                   slot_rx,
+                           uci_pdu_format0,
+                           pucch_pdu);
+
+          gNB->UL_INFO.uci_ind.num_ucis += 1;
+          pucch->active = 0;
+	  break;
+        default:
+	  AssertFatal(1==0,"Only PUCCH format 0 is currently supported\n");
+        }
       }
     }
   }