review changes

openair1/PHY/MODULATION/ofdm_mod.c

@@ -348,39 +348,33 @@ void apply_nr_rotation(NR_DL_FRAME_PARMS *fp,
 {
   int symb_offset = (slot%fp->slots_per_subframe)*fp->symbols_per_slot;
 
-  c16_t *symbol_rotation = fp->symbol_rotation[0];
+  c16_t *symbol_rotation = fp->symbol_rotation[0] + symb_offset;
 
-  for (int sidx=0;sidx<nsymb;sidx++) {
+  for (int sidx = first_symbol; sidx < first_symbol + nsymb; sidx++) {
+    c16_t *this_rotation = symbol_rotation + sidx;
+    c16_t *this_symbol = ((c16_t*) txdataF) + sidx * fp->ofdm_symbol_size;
 
     LOG_D(PHY,"Rotating symbol %d, slot %d, symbol_subframe_index %d (%d,%d)\n",
-      first_symbol + sidx,
+      sidx,
       slot,
-      sidx + first_symbol + symb_offset,
-      symbol_rotation[sidx + first_symbol + symb_offset].r,
-      symbol_rotation[sidx + first_symbol + symb_offset].i);
+      sidx + symb_offset,
+      this_rotation->r,
+      this_rotation->i);
 
     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);
+      rotate_cpx_vector(this_symbol, this_rotation, this_symbol,
+                        (fp->N_RB_DL + 1) * 6, 15);
+      rotate_cpx_vector(this_symbol + fp->first_carrier_offset - 6,
+                        this_rotation,
+                        this_symbol + 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);
+      rotate_cpx_vector(this_symbol, this_rotation, this_symbol,
+                        fp->N_RB_DL * 6, 15);
+      rotate_cpx_vector(this_symbol + fp->first_carrier_offset,
+                        this_rotation,
+                        this_symbol + fp->first_carrier_offset,
+                        fp->N_RB_DL * 6, 15);
     }
   }
 }

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c

@@ -597,34 +597,27 @@ uint8_t nr_ue_pusch_common_procedures(PHY_VARS_NR_UE *UE,
   int symb_offset = (slot%frame_parms->slots_per_subframe)*frame_parms->symbols_per_slot;
   for(ap = 0; ap < n_antenna_ports; ap++) {
     for (int s=0;s<NR_NUMBER_OF_SYMBOLS_PER_SLOT;s++){
-      c16_t rot=((c16_t*)frame_parms->symbol_rotation[1])[s + symb_offset];
+      c16_t *this_symbol = (c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s];
+      c16_t rot=frame_parms->symbol_rotation[1][s + symb_offset];
       LOG_D(PHY,"rotating txdataF symbol %d (%d) => (%d.%d)\n",
 	    s,
 	    s + symb_offset,
 	    rot.r, rot.i);
 
       if (frame_parms->N_RB_UL & 1) {
-        rotate_cpx_vector((c16_t *)&txdataF[ap][frame_parms->ofdm_symbol_size * s],
+        rotate_cpx_vector(this_symbol, &rot, this_symbol,
+                          (frame_parms->N_RB_UL + 1) * 6, 15);
+        rotate_cpx_vector(this_symbol + frame_parms->first_carrier_offset - 6,
                           &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);
+                          this_symbol + 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],
+        rotate_cpx_vector(this_symbol, &rot, this_symbol,
+                          frame_parms->N_RB_UL * 6, 15);
+        rotate_cpx_vector(this_symbol + 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);
+                          this_symbol + frame_parms->first_carrier_offset,
+                          frame_parms->N_RB_UL * 6, 15);
       }
     }
   }