From 10667b36625bf2fe0d77a8f09f43ed4437884168 Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Fri, 27 Sep 2019 18:26:13 +0200
Subject: [PATCH] modification to rate matching (to be tested)

---
 openair1/PHY/CODING/nr_rate_matching.c      | 19 +++++++++++++------
 openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c |  6 +++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/openair1/PHY/CODING/nr_rate_matching.c b/openair1/PHY/CODING/nr_rate_matching.c
index 0954939a58..f7b54f6eae 100644
--- a/openair1/PHY/CODING/nr_rate_matching.c
+++ b/openair1/PHY/CODING/nr_rate_matching.c
@@ -74,7 +74,7 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
                           uint8_t rvidx,
                           uint32_t E)
 {
-  uint32_t Ncb,ind,k,Nref,N;
+  uint32_t Ncb,k0,j,k,Nref,N,ind;
 
   if (C==0) {
     printf("nr_rate_matching: invalid parameters (C %d\n",C);
@@ -91,18 +91,25 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
       Ncb = min(N, Nref);
   }
 
-  ind = (index_k0[BG-1][rvidx]*Ncb/N)*Z;
+  k0 = (index_k0[BG-1][rvidx]*Ncb/N)*Z;
 
 #ifdef RM_DEBUG
   printf("nr_rate_matching_ldpc: E %d, k0 %d, Ncb %d, rvidx %d\n", E, ind, Ncb, rvidx);
 #endif
 
   k=0;
+  j=0;
 
-  for (; (ind<Ncb)&&(k<E); ind++) {
+  while(k<E) {
+    ind=(k0+j)%Ncb;
+    if (w[ind] != NR_NULL) e[k++]=w[ind];
+    j++;
+  }  
+
+  /*for (; (ind<Ncb)&&(k<E); ind++) {
 
 #ifdef RM_DEBUG
-    printf("RM_TX k%d Ind: %d (%d)\n",k,ind,w[ind]);
+    printf("RM_TX k%d Ind: %d (%d)\t",k,ind,w[ind]);
 #endif
 
     if (w[ind] != NR_NULL) e[k++]=w[ind];
@@ -112,12 +119,12 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
     for (ind=0; (ind<Ncb)&&(k<E); ind++) {
 
 #ifdef RM_DEBUG
-      printf("RM_TX k%d Ind: %d (%d)\n",k,ind,w[ind]);
+      printf("RM_TX k%d Ind: %d (%d)\t",k,ind,w[ind]);
 #endif
 
       if (w[ind] != NR_NULL) e[k++]=w[ind];
     }
-  }
+  }*/
 
 
   return 0;
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index 87da76b8da..f504832442 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -453,9 +453,9 @@ int nr_dlsch_encoding(unsigned char *a,int frame,
 #endif
 
 	nr_interleaving_ldpc(E,
-						mod_order,
-						dlsch->harq_processes[harq_pid]->e+r_offset,
-						dlsch->harq_processes[harq_pid]->f+r_offset);
+			     mod_order,
+			     dlsch->harq_processes[harq_pid]->e+r_offset,
+			     dlsch->harq_processes[harq_pid]->f+r_offset);
 
 
 #ifdef DEBUG_DLSCH_CODING