Merge remote-tracking branch 'origin/fix_rb_corruption' into integration_2021_wk13_a

openair1/PHY/NR_TRANSPORT/nr_dlsch.c

@@ -418,19 +418,6 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
     // The Precoding matrix:
     // The Codebook Type I and Type II are not supported yet.
     // We adopt the precoding matrices of PUSCH for 4 layers.
-    if ((frame_parms->nb_antennas_tx == 1 && rel15->nrOfLayers == 1) || rel15->precodingAndBeamforming.prgSize == 0) {//No precoding if precoding info is not available
-      for (int ap=0; ap<frame_parms->nb_antennas_tx; ap++) {//frame_parms->nb_antennas_tx rel15->nrOfLayers
-        if(ap<rel15->nrOfLayers)
-          memcpy((void*)&txdataF[ap][rel15->StartSymbolIndex*frame_parms->ofdm_symbol_size + txdataF_offset],
-                 (void*)&txdataF_precoding[ap][2*(rel15->StartSymbolIndex*frame_parms->ofdm_symbol_size + txdataF_offset)],
-                 rel15->NrOfSymbols*frame_parms->ofdm_symbol_size*sizeof(int32_t));
-        else
-          memset((void*)&txdataF[ap][rel15->StartSymbolIndex*frame_parms->ofdm_symbol_size + txdataF_offset],
-                 0,
-                 rel15->NrOfSymbols*frame_parms->ofdm_symbol_size*sizeof(int32_t));
-      }
-    } else {//apply precoding
-      uint8_t pmi;
     for (int ap=0; ap<frame_parms->nb_antennas_tx; ap++) {
 
       for (int l=rel15->StartSymbolIndex; l<rel15->StartSymbolIndex+rel15->NrOfSymbols; l++) {
@@ -438,11 +425,27 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
 
         for (int rb=0; rb<rel15->rbSize; rb++) {
           //get pmi info
+          uint8_t pmi;
           if (rel15->precodingAndBeamforming.prgSize > 0)
             pmi = rel15->precodingAndBeamforming.PMIdx[(int)rb/rel15->precodingAndBeamforming.prgSize];
           else
             pmi = 0;//no precoding
 
+          if (pmi == 0) {//unitary Precoding
+            if(ap<rel15->nrOfLayers)
+              memcpy((void*)&txdataF[ap][l*frame_parms->ofdm_symbol_size + txdataF_offset + k],
+                     (void*)&txdataF_precoding[ap][2*(l*frame_parms->ofdm_symbol_size + txdataF_offset+ k)],
+                     NR_NB_SC_PER_RB*sizeof(int32_t));
+            else
+              memset((void*)&txdataF[ap][rel15->StartSymbolIndex*frame_parms->ofdm_symbol_size + txdataF_offset +k],
+                     0,
+                     NR_NB_SC_PER_RB*sizeof(int32_t));
+            k += NR_NB_SC_PER_RB;
+            if (k >= frame_parms->ofdm_symbol_size) {
+              k -= frame_parms->ofdm_symbol_size;
+            }
+          }
+          else {
             //get the precoding matrix weights:
             char *W_prec;
             switch (frame_parms->nb_antennas_tx) {
@@ -470,21 +473,6 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
                 W_prec = nr_W_1l_2p[pmi][ap];
                 break;
             }
-            if (pmi == 0) {//unitary Precoding
-              if(ap<rel15->nrOfLayers)
-                memcpy((void*)&txdataF[ap][l*frame_parms->ofdm_symbol_size + txdataF_offset + k],
-                       (void*)&txdataF_precoding[ap][2*(l*frame_parms->ofdm_symbol_size + txdataF_offset+ k)],
-                       NR_NB_SC_PER_RB*sizeof(int32_t));
-              else
-                memset((void*)&txdataF[ap][rel15->StartSymbolIndex*frame_parms->ofdm_symbol_size + txdataF_offset +k],
-                       0,
-                       NR_NB_SC_PER_RB*sizeof(int32_t));
-              k += NR_NB_SC_PER_RB;
-              if (k >= frame_parms->ofdm_symbol_size) {
-                k -= frame_parms->ofdm_symbol_size;
-              }
-            }
-            else {
             for (int i=0; i<NR_NB_SC_PER_RB; i++) {
               int32_t re_offset = l*frame_parms->ofdm_symbol_size + k;
               int32_t precodatatx_F = nr_layer_precoder(txdataF_precoding, W_prec, rel15->nrOfLayers, re_offset+txdataF_offset);
@@ -503,7 +491,6 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
         } //RB loop
       } // symbol loop
     }// port loop
-    }
 
     dlsch->slot_tx[slot]=0;