commit to allow merge (nothing special here)

openair1/PHY/LTE_TRANSPORT/slss.c

@@ -56,7 +56,7 @@ void check_and_generate_slss(PHY_VARS_UE *ue,int frame_tx,int subframe_tx) {
   ue->frame_parms.Nid_SL = slss->slss_id;
 
   // 6 PRBs => ceil(10*log10(6)) = 8 
-  ue->tx_power_dBm[subframe_tx] = 8;
+  ue->tx_power_dBm[subframe_tx] = -6;
   ue->tx_total_RE[subframe_tx] = 72;
 
 #if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)

openair1/SIMULATION/LTE_PHY/dummy_functions.c

@@ -39,7 +39,8 @@ void ue_decode_p(module_id_t module_idP, int CC_id, frame_t frame,
 		 uint8_t CH_index, void *pdu, uint16_t len){}
 
 void ue_decode_si(module_id_t module_idP, int CC_id, frame_t frame,
-		  uint8_t CH_index, void *pdu, uint16_t len){}
+		  uint8_t CH_index, void *pdu, uint16_t len,
+                  SLSS_t *slss, int *rxframe, int *rxsubframe){}
 
 void ue_send_sdu(module_id_t module_idP, uint8_t CC_id, frame_t frame,
 		 sub_frame_t subframe, uint8_t * sdu, uint16_t sdu_len,

openair2/LAYER2/MAC/config_ue.c

@@ -646,7 +646,7 @@ rrc_mac_config_req_ue(module_id_t Mod_idP,
 
     UE_mac_inst[Mod_idP].slss.SL_OffsetIndicator   = SL_Preconfiguration_r12->preconfigSync_r12.syncOffsetIndicator1_r12;
     // Note: Other synch parameters are ignored for now
-    UE_mac_inst[Mod_idP].slss.slss_id              = 168+(taus()%168);
+    UE_mac_inst[Mod_idP].slss.slss_id              = 170;//+(taus()%168);
     // PSCCH
     struct SL_PreconfigCommPool_r12 *preconfigpool = SL_Preconfiguration_r12->preconfigComm_r12.list.array[0];
     UE_mac_inst[Mod_idP].slsch.N_SL_RB_SC                = preconfigpool->sc_TF_ResourceConfig_r12.prb_Num_r12;