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

openair1/PHY/LTE_TRANSPORT/sldch.c

@@ -289,6 +289,15 @@ void sldch_decoding(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,int frame_rx,int subfra
 	  rvidx,ret);
     ue->sldch_received[npsdch] = 1;
     ue->sldch_rxcnt[npsdch]++;
+    ue_send_sl_sdu(0,
+                   0,
+                   frame_rx,
+                   subframe_rx,
+                   ue->dlsch_rx_sldch[npsdch]->harq_processes[0]->b,
+                   ue->dlsch_rx_sldch[npsdch]->harq_processes[0]->TBS>>3,
+                   0,
+                   SL_DISCOVERY_FLAG_YES);
+
   }
 
   //exit(-1);

openair2/RRC/LITE/L2_interface_ue.c

@@ -135,13 +135,13 @@ mac_rrc_data_req_ue(
     UE_rrc_inst[Mod_idP].SL_Discovery[eNB_indexP].Tx_buffer.payload_size = 0;
     return(Ret_size);
   }
-  else if (Srb_idP == SL_DISCOVERY) {
+/*  else if (Srb_idP == SL_DISCOVERY) {
     LOG_D(RRC,"[UE %d] Frame %d Filling DUMMY SL DISCOVERY SRB_ID %d\n",Mod_idP,frameP,Srb_idP);
     for (int i=0;i<29;i++) buffer_pP[i] = i;
     LOG_D(RRC,"[UE %d] Sending SL_Discovery, size %d bytes\n",Mod_idP,29);
     return(29);
 
-  }
+  }*/
 #endif
 
   return(0);