From 50b629c6c236fb6e4084a7f404f01a0cc9d21057 Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Mon, 7 Dec 2020 10:27:12 +0100
Subject: [PATCH] fix for nb of slots in ue gold

---
 openair1/PHY/INIT/nr_init.c         |  1 +
 openair1/PHY/NR_REFSIG/nr_gold_ue.c | 56 ++++++++++++++---------------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 49ec60c94b..63c80a136b 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -134,6 +134,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
   nr_generate_modulation_table();
   nr_init_pdcch_dmrs(gNB, cfg->cell_config.phy_cell_id.value);
   nr_init_pbch_interleaver(gNB->nr_pbch_interleaver);
+
   //PDSCH DMRS init
   gNB->nr_gold_pdsch_dmrs = (uint32_t ****)malloc16(fp->slots_per_frame*sizeof(uint32_t ***));
   uint32_t ****pdsch_dmrs             = gNB->nr_gold_pdsch_dmrs;
diff --git a/openair1/PHY/NR_REFSIG/nr_gold_ue.c b/openair1/PHY/NR_REFSIG/nr_gold_ue.c
index 414582a31d..da80bd88d6 100644
--- a/openair1/PHY/NR_REFSIG/nr_gold_ue.c
+++ b/openair1/PHY/NR_REFSIG/nr_gold_ue.c
@@ -70,40 +70,39 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
   unsigned int n,x1,x2,x2tmp0;
   unsigned int nid;
 
-    if (n_idDMRS)
-      nid = n_idDMRS;
-    else
-      nid = ue->frame_parms.Nid_cell;
+  if (n_idDMRS)
+    nid = n_idDMRS;
+  else
+    nid = ue->frame_parms.Nid_cell;
 
-    for (ns=0; ns<20; ns++) {
+  for (ns=0; ns<ue->frame_parms.slots_per_frame; ns++) {
 
-      for (l=0; l<length_dmrs; l++) {
+    for (l=0; l<length_dmrs; l++) {
 
-    	x2tmp0 = ((14*ns+l+1)*((nid<<1)+1))<<17;
-        x2 = (x2tmp0+(nid<<1))%(1<<31);  //cinit
+      x2tmp0 = ((14*ns+l+1)*((nid<<1)+1))<<17;
+      x2 = (x2tmp0+(nid<<1))%(1<<31);  //cinit
 
-        x1 = 1+ (1<<31);
-        x2=x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
+      x1 = 1+ (1<<31);
+      x2=x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
 
-        // skip first 50 double words (1600 bits)
-        for (n=1; n<50; n++) {
-          x1 = (x1>>1) ^ (x1>>4);
-          x1 = x1 ^ (x1<<31) ^ (x1<<28);
-          x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
-          x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
-            //printf("x1 : %x, x2 : %x\n",x1,x2);
-        }
-
-        for (n=0; n<52; n++) {
-          x1 = (x1>>1) ^ (x1>>4);
-          x1 = x1 ^ (x1<<31) ^ (x1<<28);
-          x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
-          x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
-          ue->nr_gold_pdcch[0][ns][l][n] = x1^x2;
-	  // if (ns==1 && l==0) printf("n=%d : c %x\n",n,x1^x2);
-        }
+      // skip first 50 double words (1600 bits)
+      for (n=1; n<50; n++) {
+        x1 = (x1>>1) ^ (x1>>4);
+        x1 = x1 ^ (x1<<31) ^ (x1<<28);
+        x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
+        x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
+        //printf("x1 : %x, x2 : %x\n",x1,x2);
+      }
+      for (n=0; n<52; n++) {
+        x1 = (x1>>1) ^ (x1>>4);
+        x1 = x1 ^ (x1<<31) ^ (x1<<28);
+        x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
+        x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
+        ue->nr_gold_pdcch[0][ns][l][n] = x1^x2;
+        // if (ns==1 && l==0) printf("n=%d : c %x\n",n,x1^x2);
       }
     }
+  }
 }
 
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
@@ -125,7 +124,7 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
       
       //printf("gold pdsch nid %d lbar %d\n",nid,lbar);
 
-    for (ns=0; ns<20; ns++) {
+    for (ns=0; ns<ue->frame_parms.slots_per_frame; ns++) {
 
       for (l=0; l<14; l++) {
 
@@ -155,7 +154,6 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
           // if ((ns==2)&&(l==0))
           //printf("n=%d : c %x\n",n,x1^x2);
         }
-
       }
     }
   }