Solving a out_of_sync_ind issue

openair1/PHY/INIT/lte_init.c

@@ -1116,7 +1116,7 @@ int phy_init_lte_ue(PHY_VARS_UE *ue,
   AssertFatal( ue->n_connected_eNB <= NUMBER_OF_CONNECTED_eNB_MAX, "n_connected_eNB is too large" );
 
   // do_ofdm_mod for frequency analysis
-  int do_ofdm_mod = ue->do_ofdm_mod=1;
+  int do_ofdm_mod = ue->do_ofdm_mod=0;
 
   if (do_ofdm_mod==0)
   {

openair1/PHY/LTE_TRANSPORT/if4_tools.c

@@ -93,10 +93,10 @@ void send_IF4p5(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t packet_type
       if (eNB->CC_id==1) LOG_I(PHY,"DL_IF4p5: CC_id %d : frame %d, subframe %d, symbol %d\n",eNB->CC_id,frame,subframe,symbol_id);
       
       for (element_id=0; element_id<db_halflength; element_id++) {
-        i = (uint16_t*) &txdataF[eNB->CC_id][blockoffsetF+element_id];
+        i = (uint16_t*) &txdataF[0][blockoffsetF+element_id];
         data_block[element_id] = ((uint16_t) lin2alaw_if4p5[*i]) | (lin2alaw_if4p5[*(i+1)]<<8);
 
-        i = (uint16_t*) &txdataF[eNB->CC_id][slotoffsetF+element_id];
+        i = (uint16_t*) &txdataF[0][slotoffsetF+element_id];
         data_block[element_id+db_halflength] = ((uint16_t) lin2alaw_if4p5[*i]) | (lin2alaw_if4p5[*(i+1)]<<8);        
       }
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_COMPR_IF, 0 );

openair1/SCHED/phy_procedures_lte_ue.c

@@ -266,7 +266,7 @@ void phy_reset_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index)
 
   // This flushes ALL DLSCH and ULSCH harq buffers of ALL connected eNBs...add the eNB_index later
   // for more flexibility
-
+  //printf("phy_reset_ue: NUMBER_OF_CONNECTED_eNB_MAX %d\n",NUMBER_OF_CONNECTED_eNB_MAX);
   uint8_t i,j,k,s;
   PHY_VARS_UE *ue = PHY_vars_UE_g[Mod_id][CC_id];
 
@@ -1402,7 +1402,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc, uint8_t empt
 }
 
 void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,runmode_t mode) {
-  //printf("ue_prach_procedures: eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d\n",eNB_id,ue->common_vars.eNb_id,ue->mac_enabled==1);
+  printf("ue_prach_procedures: UE %d, eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d\n",ue->Mod_id,eNB_id,ue->common_vars.eNb_id,ue->mac_enabled==1);
   int frame_tx = proc->frame_tx;
   int subframe_tx = proc->subframe_tx;
   int prach_power;
@@ -3080,7 +3080,7 @@ void ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc, uin
     ue->pbch_vars[eNB_id]->pdu_errors_conseq++;
     ue->pbch_vars[eNB_id]->pdu_errors++;
     if (ue->mac_enabled == 1) {
-      mac_xface->out_of_sync_ind(ue->Mod_id,frame_rx,eNB_id);
+      mac_xface->out_of_sync_ind(ue->Mod_id,frame_rx,ue->common_vars.eNb_id);
     }
     else{
       if (ue->pbch_vars[eNB_id]->pdu_errors_conseq>=100) {

openair2/RRC/LITE/L2_interface.c

@@ -72,6 +72,7 @@ mac_rrc_data_req(
 )
 //--------------------------------------------------------------------------
 {
+  printf("mac_rrc_data_req:eNB_index %d\n",eNB_index);
   SRB_INFO *Srb_info;
   uint8_t Sdu_size=0;
 
@@ -651,6 +652,7 @@ rrc_data_ind(
 void rrc_in_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index)
 {
   //-------------------------------------------------------------------------------------------//
+printf("rrc_in_sync_ind:eNB_index %d\n",eNB_index);
 #if defined(ENABLE_ITTI)
   {
     MessageDef *message_p;
@@ -675,6 +677,7 @@ void rrc_in_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index)
 void rrc_out_of_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index)
 {
   //-------------------------------------------------------------------------------------------//
+  printf("rrc_out_of_sync_ind:eNB_index %d\n",eNB_index);
   if (UE_rrc_inst[Mod_idP].Info[eNB_index].N310_cnt>10)
     LOG_I(RRC,"[UE %d] Frame %d: OUT OF SYNC FROM eNB %d (T310 active %d : T310 %d, N310 %d, N311 %d)\n ",
 	  Mod_idP,frameP,eNB_index,
@@ -764,6 +767,7 @@ int
 mac_UE_get_rrc_status(
   const module_id_t Mod_idP,
   const uint8_t     indexP
+  printf("mac_UE_get_rrc_status:eNB_index %d\n",eNB_index);
 )
 //------------------------------------------------------------------------------
 {

openair2/RRC/LITE/rrc_UE.c

@@ -2126,7 +2126,7 @@ rrc_ue_decode_dcch(
 )
 //-----------------------------------------------------------------------------
 {
-
+  printf("rrc_ue_decode_dcch: eNB_indexP %d\n",eNB_indexP);
   //DL_DCCH_Message_t dldcchmsg;
   DL_DCCH_Message_t *dl_dcch_msg=NULL;//&dldcchmsg;
   //  asn_dec_rval_t dec_rval;
@@ -2643,9 +2643,10 @@ int decode_BCCH_DLSCH_Message(
   const uint8_t                rsrq,
   const uint8_t                rsrp )
 {
+  //printf("decode_BCCH_DLSCH_Message: eNB_index %d\n",eNB_index);
   BCCH_DL_SCH_Message_t *bcch_message = NULL;
   SystemInformationBlockType1_t* sib1 = UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index];
-  int i;
+  //int i;
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_BCCH, VCD_FUNCTION_IN );
 
@@ -2770,7 +2771,7 @@ int decode_PCCH_DLSCH_Message(
   const uint8_t                Sdu_len)
 {
   PCCH_Message_t *pcch_message = NULL;
-  int i;
+  //int i;
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_PCCH, VCD_FUNCTION_IN );