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

openair1/PHY/LTE_TRANSPORT/slss.c

@@ -77,7 +77,7 @@ void check_and_generate_slss(PHY_VARS_UE *ue,int frame_tx,int subframe_tx) {
 
   if (ue->generate_ul_signal[subframe_tx][0] == 0) 
     for (int aa=0; aa<ue->frame_parms.nb_antennas_tx; aa++) {
-      LOG_I(PHY,"%d.%d: clearing ul signal\n",frame_tx,subframe_tx);
+      LOG_D(PHY,"%d.%d: clearing ul signal\n",frame_tx,subframe_tx);
       memset(&ue->common_vars.txdataF[aa][subframe_tx*ue->frame_parms.ofdm_symbol_size*ue->frame_parms.symbols_per_tti],
 	     0,
 	     ue->frame_parms.ofdm_symbol_size*ue->frame_parms.symbols_per_tti*sizeof(int32_t));
@@ -133,7 +133,7 @@ void check_and_generate_slss(PHY_VARS_UE *ue,int frame_tx,int subframe_tx) {
                      0);
   
  
-  LOG_I(PHY,"%d.%d : SLSS nbrb %d, first rb %d\n",frame_tx,subframe_tx,6,(ue->frame_parms.N_RB_UL/2)-3);
+  LOG_D(PHY,"%d.%d : SLSS nbrb %d, first rb %d\n",frame_tx,subframe_tx,6,(ue->frame_parms.N_RB_UL/2)-3);
  
   ue->generate_ul_signal[subframe_tx][0] = 1;
   ue->slss_generated = 1;

openair1/SCHED/phy_procedures_lte_ue.c

@@ -2398,8 +2398,11 @@ void phy_procedures_UE_SL_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc) {
 
 
   }
-  if (frame_tx==0 && subframe_tx ==0)
+  
+  if (frame_tx==0 && subframe_tx ==0) 
     for (int i=0;i<MAX_SLDCH;i++) if (ue->sldch_txcnt[i]>0) LOG_I(PHY,"n_psdch %d TX count %d\n",i,ue->sldch_txcnt[i]);
+
+  
 }
 
 void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,runmode_t mode,relaying_type_t r_type) {
@@ -4797,12 +4800,15 @@ void phy_procedures_UE_SL_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc) {
 
   if (ue->is_SynchRef == 0 && frame_rx==0 && subframe_rx==0) LOG_I(PHY,"Connected with SyncRef UE (slbch errors %d/%d)\n",
                                                 ue->slbch_errors,ue->slbch_rxops);
-  if (frame_rx==0 && subframe_rx==0)
-    for (int i=0;i<MAX_SLDCH;i++) if (ue->sldch_rxcnt[i]>0) LOG_I(PHY,"n_psdch %d RX count %d\n",i,ue->sldch_rxcnt[i]);
 
   rx_slcch(ue,proc,frame_rx,subframe_rx);
 
   rx_slsch(ue,proc,frame_rx,subframe_rx);
+
+  if (frame_rx==0 && subframe_rx==0) {
+    for (int i=0;i<MAX_SLDCH;i++) if (ue->sldch_rxcnt[i]>0) LOG_I(PHY,"n_psdch %d RX count %d\n",i,ue->sldch_rxcnt[i]);
+    for (int i=0;i<4;i++) if (ue->slsch_rxcnt[i]>0) LOG_I(PHY,"n_pssch[%d] rx count %d\n",i,ue->slsch_rxcnt[i]);
+  }
 }
 
 int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,

openair2/LAYER2/MAC/ue_procedures.c

@@ -3420,15 +3420,6 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_
 }
 */
 
-const int prblist[6]={6,15,25,50,75,100};
-
-int to_prb(int sl_Bandwidth_r12) {
-
-  AssertFatal(sl_Bandwidth_r12<6, "illegal bandwidth index %d\n",sl_Bandwidth_r12);
-
-  return(prblist[sl_Bandwidth_r12]);
-
-}
 extern const int trp8[TRP8_MAX+1][8];
 
 SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_t subframeP,int slsch_test) {
@@ -3504,6 +3495,7 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_
             }
      if (ue->sltx_active == 0) return((SLSCH_t*)NULL);
 
+
      slsch->ljmod10 = 9; // note this will cause ljmod10 to be reset for first transmission of SLSCH
      slsch->rvidx   = 1;
      slsch->RB_start = RB_start;