Merge branch 'l1-sidelink' of https://gitlab.eurecom.fr/matzakos/LTE-D2D into l1-sidelink

openair1/PHY/LTE_TRANSPORT/drs_modulation.c

@@ -167,9 +167,11 @@ int generate_drs_pusch(PHY_VARS_UE *ue,
        l += linc,u=u1,v=v1,cyclic_shift=cyclic_shift1) {
 
     drs_offset = 0;
-//#ifdef DEBUG_DRS
-    LOG_I(PHY,"drs_modulation: l %d Msc_RS = %d, Msc_RS_idx = %d, u=%d,v=%d, cyclic shift %d\n",l,Msc_RS, Msc_RS_idx,u,v,cyclic_shift);
-//#endif
+
+    //#ifdef DEBUG_DRS
+    LOG_I(PHY,"drs_modulation: l %d Msc_RS = %d, Msc_RS_idx = %d, u=%d,v=%d, cyclic shift %d,ljmo10 %d\n",l,Msc_RS, Msc_RS_idx,u,v,cyclic_shift,ljmod10);
+    //#endif
+
 
 
     re_offset = frame_parms->first_carrier_offset;

openair1/PHY/LTE_TRANSPORT/slsch.c

@@ -1195,6 +1195,7 @@ void slsch_decoding(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,int frame_rx,int subfra
     }
     LOG_I(PHY,"SLSCH Slot FEP %d.%d\n",frame_rx,subframe_rx);
   }
+  LOG_I(PHY,"SLSCH RBstart %d, L_CRBs %d\n",slsch->RB_start+slsch->prb_Start_data,slsch->L_CRBs);
   // extract symbols from slot 
    for (int l=0; l<Nsymb; l++) {
     ulsch_extract_rbs_single((int32_t**)rxdataF,
@@ -1230,6 +1231,7 @@ void slsch_decoding(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,int frame_rx,int subfra
   uint32_t v = 0;
   uint32_t cyclic_shift=(slsch->group_destination_id>>1)&7;
 
+  LOG_I(PHY,"SLSCH, u0 %d, cyclic_shift %d\n",u,cyclic_shift);
   lte_ul_channel_estimation(&ue->frame_parms,
 			    (int32_t**)drs_ch_estimates,
 			    (int32_t**)NULL,
@@ -1244,6 +1246,8 @@ void slsch_decoding(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,int frame_rx,int subfra
 			    1, // interpolation
 			    0);
   u = ue->gh[1+slsch->group_destination_id][1+(ljmod10<<1)];
+  LOG_I(PHY,"SLSCH, u1 %d\n",u);
+
   lte_ul_channel_estimation(&ue->frame_parms,
 			    (int32_t**)drs_ch_estimates,
 			    (int32_t**)NULL,