From 4cc5bf586e3727aa99902cc3109f1aa3c40c7225 Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Thu, 27 Aug 2020 10:35:05 +0200
Subject: [PATCH] fix for pucchsim with sr

---
 openair1/SIMULATION/NR_PHY/pucchsim.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/openair1/SIMULATION/NR_PHY/pucchsim.c b/openair1/SIMULATION/NR_PHY/pucchsim.c
index a08f8ff597..c14a3d7198 100644
--- a/openair1/SIMULATION/NR_PHY/pucchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pucchsim.c
@@ -479,14 +479,17 @@ int main(int argc, char **argv)
   uint32_t dmrs_scrambling_id = 0, data_scrambling_id=0;
   //t_nrPolar_params *currentPtr;
 
+  int shift = 0;
+
   if(format==0){
-  // for now we are not considering SR just HARQ-ACK
+    if (sr_flag)
+      shift = 1<<nr_bit;
     if (nr_bit ==0) 
       mcs=table1_mcs[0];
     else if(nr_bit==1)
-      mcs=table1_mcs[actual_payload];
+      mcs=table1_mcs[actual_payload+shift];
     else if(nr_bit==2)
-      mcs=table2_mcs[actual_payload];
+      mcs=table2_mcs[actual_payload+shift];
     else AssertFatal(1==0,"Either nr_bit %d or sr_flag %d must be non-zero\n", nr_bit, sr_flag);
   }
   else if (format == 2 && nr_bit > 11) gNB->uci_polarParams = nr_polar_params(2, nr_bit, nrofPRB, 1, NULL);