NR UE: modify nr_gold_pdsch() to only generate gold sequence for current slot

openair1/PHY/NR_REFSIG/nr_gold_ue.c

@@ -107,9 +107,10 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
 }
 
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
+                   unsigned char ns,
                    unsigned short *n_idDMRS)
 {
-  unsigned char ns,l;
+  unsigned char l;
   unsigned int n,x1,x2,x2tmp0;
   int nscid;
   unsigned int nid;
@@ -125,10 +126,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 (l=0; l<14; l++) {
-
       x2tmp0 = ((14*ns+l+1)*((nid<<1)+1))<<17;
       x2 = (x2tmp0+(nid<<1)+nscid)%(1<<31);  //cinit
       LOG_D(PHY,"UE DMRS slot %d, symb %d, x2 %x, nscid %d\n",ns,l,x2,nscid);
@@ -155,8 +153,6 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
         // if ((ns==2)&&(l==0))
         //printf("n=%d : c %x\n",n,x1^x2);
       }
-
-      }
     }
   }
 }

openair1/PHY/NR_REFSIG/refsig_defs_ue.h

@@ -61,6 +61,7 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
                    unsigned short length_dmrs);
 
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
+                   unsigned char ns,
                    unsigned short *n_idDMRS);
 
 void nr_init_pusch_dmrs(PHY_VARS_NR_UE* ue,

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -1847,8 +1847,8 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
 
       for (int i=0;i<4;i++) if (((1<<i)&dlsch0_harq->dlDmrsSymbPos) > 0) {symb_dmrs=i;break;}
       AssertFatal(symb_dmrs>=0,"no dmrs in 0..3\n");
-      LOG_D(PHY,"Initializing dmrs for symb %d DMRS mask %x\n",symb_dmrs,dlsch0_harq->dlDmrsSymbPos);
-      nr_gold_pdsch(ue,0);
+      LOG_D(PHY,"Initializing dmrs for slot %d DMRS mask %x\n", nr_slot_rx, dlsch0_harq->dlDmrsSymbPos);
+      nr_gold_pdsch(ue, nr_slot_rx, 0);
     
       for (uint16_t m=start_symb_sch;m<(nb_symb_sch+start_symb_sch) ; m++){
         nr_slot_fep(ue,