fix alignment issues in case of odd number of PRBs

openair1/PHY/MODULATION/ofdm_mod.c

@@ -359,16 +359,29 @@ void apply_nr_rotation(NR_DL_FRAME_PARMS *fp,
       symbol_rotation[sidx + first_symbol + symb_offset].r,
       symbol_rotation[sidx + first_symbol + symb_offset].i);
 
-    rotate_cpx_vector(((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size,
-                      symbol_rotation + sidx + first_symbol + symb_offset,
-                      ((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size,
-                      fp->N_RB_DL * 6,
-                      15);
-    rotate_cpx_vector(((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size + fp->first_carrier_offset,
-                      symbol_rotation + sidx + first_symbol + symb_offset,
-                      ((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size + fp->first_carrier_offset,
-                      fp->N_RB_DL * 6,
-                      15);
+    if (fp->N_RB_DL & 1) {
+      rotate_cpx_vector(((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size,
+                        symbol_rotation + sidx + first_symbol + symb_offset,
+                        ((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size,
+                        (fp->N_RB_DL + 1) * 6,
+                        15);
+      rotate_cpx_vector(((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size + fp->first_carrier_offset - 6,
+                        symbol_rotation + sidx + first_symbol + symb_offset,
+                        ((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size + fp->first_carrier_offset - 6,
+                        (fp->N_RB_DL + 1) * 6,
+                        15);
+    } else {
+      rotate_cpx_vector(((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size,
+                        symbol_rotation + sidx + first_symbol + symb_offset,
+                        ((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size,
+                        fp->N_RB_DL * 6,
+                        15);
+      rotate_cpx_vector(((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size + fp->first_carrier_offset,
+                        symbol_rotation + sidx + first_symbol + symb_offset,
+                        ((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size + fp->first_carrier_offset,
+                        fp->N_RB_DL * 6,
+                        15);
+    }
   }
 }
                        

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c

@@ -603,16 +603,29 @@ uint8_t nr_ue_pusch_common_procedures(PHY_VARS_NR_UE *UE,
 	    s + symb_offset,
 	    rot.r, rot.i);
 
-      rotate_cpx_vector((c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s],
-                        &rot,
-                        (c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s],
-                        frame_parms->N_RB_UL * 6,
-                        15);
-      rotate_cpx_vector((c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s + frame_parms->first_carrier_offset],
-                        &rot,
-                        (c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s + frame_parms->first_carrier_offset],
-                        frame_parms->N_RB_UL * 6,
-                        15);
+      if (frame_parms->N_RB_UL & 1) {
+        rotate_cpx_vector((c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s],
+                          &rot,
+                          (c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s],
+                          (frame_parms->N_RB_UL + 1) * 6,
+                          15);
+        rotate_cpx_vector((c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s + frame_parms->first_carrier_offset - 6],
+                          &rot,
+                          (c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s + frame_parms->first_carrier_offset - 6],
+                          (frame_parms->N_RB_UL + 1) * 6,
+                          15);
+      } else {
+        rotate_cpx_vector((c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s],
+                          &rot,
+                          (c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s],
+                          frame_parms->N_RB_UL * 6,
+                          15);
+        rotate_cpx_vector((c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s + frame_parms->first_carrier_offset],
+                          &rot,
+                          (c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s + frame_parms->first_carrier_offset],
+                          frame_parms->N_RB_UL * 6,
+                          15);
+      }
     }
   }