minor changes for testing

openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c

@@ -46,6 +46,7 @@
 
 //#define DEBUG_DCI
 
+
 #include "../LTE_TRANSPORT/dci_tools_common_extern.h"
 #include "../LTE_TRANSPORT/transport_proto.h"
 #include "transport_proto_ue.h"
@@ -3326,7 +3327,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
       harq_pid = subframe2harq_pid(frame_parms,
                                    pdcch_alloc2ul_frame(frame_parms,proc->frame_rx,subframe),
                                    pdcch_alloc2ul_subframe(frame_parms,subframe));
-    LOG_D(PHY,"Frame %d, Subframe %d: Programming ULSCH for (%d.%d) => harq_pid %d\n",
+    LOG_I(PHY,"Frame %d, Subframe %d: Programming ULSCH for (%d.%d) => harq_pid %d\n",
 	  proc->frame_rx,subframe,
 	  pdcch_alloc2ul_frame(frame_parms,proc->frame_rx,subframe),
 	  pdcch_alloc2ul_subframe(frame_parms,subframe), harq_pid);

openair1/SCHED_UE/phy_procedures_lte_ue.c

@@ -73,6 +73,7 @@
 
 extern double cpuf;
 
+
 void Msg1_transmitted(module_id_t module_idP,uint8_t CC_id,frame_t frameP, uint8_t eNB_id);
 void Msg3_transmitted(module_id_t module_idP,uint8_t CC_id,frame_t frameP, uint8_t eNB_id);
 
@@ -1657,7 +1658,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
   }
 
 
-  if ( LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)){
+    if ( LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)){
         LOG_D(PHY,
               "[UE  %d][PUSCH %d] AbsSubframe %d.%d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, "
               "cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d, ack_status_cw0 %d ack_status_cw1 %d bundling %d, Nbundled %d, CQI %d, RI %d\n",
@@ -1679,7 +1680,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
           ue->ulsch[eNB_id]->bundling, Nbundled,
           cqi_status,
           ri_status);
-  }
+    }
 
 
 
@@ -2900,7 +2901,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
 	// we received a CRNTI, so we're in PUSCH
 	if (ue->UE_mode[eNB_id] != PUSCH) {
           if (LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)) {
-	  LOG_D(PHY,"[UE  %d] Frame %d, subframe %d: Received DCI with CRNTI %x => Mode PUSCH\n",ue->Mod_id,frame_rx,subframe_rx,ue->pdcch_vars[subframe_rx&1][eNB_id]->crnti);
+	    LOG_D(PHY,"[UE  %d] Frame %d, subframe %d: Received DCI with CRNTI %x => Mode PUSCH\n",ue->Mod_id,frame_rx,subframe_rx,ue->pdcch_vars[subframe_rx&1][eNB_id]->crnti);
          }
 	  
 	  //dump_dci(&ue->frame_parms, &dci_alloc_rx[i]);

openair2/F1AP/f1ap_du_rrc_message_transfer.c

@@ -67,7 +67,7 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t       instance,
                                       uint32_t         assoc_id,
                                       uint32_t         stream,
                                       F1AP_F1AP_PDU_t *pdu) {
-
+#ifndef UETARGET 
   LOG_D(DU_F1AP, "DU_handle_DL_RRC_MESSAGE_TRANSFER \n");
   
   MessageDef                     *message_p;
@@ -308,6 +308,7 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t       instance,
   else if (srb_id == 2){
 
   }
+#endif
   return 0;
   
 }
@@ -390,7 +391,7 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t     module_idP,
                                             rnti_t          rntiP,
                                             uint8_t        *sduP,
                                             sdu_size_t      sdu_lenP) {
-
+#ifndef UETARGET
   F1AP_F1AP_PDU_t                       pdu;
   F1AP_InitialULRRCMessageTransfer_t    *out;
   F1AP_InitialULRRCMessageTransferIEs_t *ie;
@@ -482,6 +483,7 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t     module_idP,
   ue_context_p->ue_context.Srb0.Active        = 1;
   RB_INSERT(rrc_ue_tree_s, &RC.rrc[module_idP]->rrc_ue_head, ue_context_p);
   du_f1ap_itti_send_sctp_data_req(0, f1ap_du_data->assoc_id, buffer, len, 0);
+#endif
   return 0;
 }
 

openair2/LAYER2/MAC/eNB_scheduler_RA.c

@@ -1221,6 +1221,9 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
 		     "eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Delaying Msg4 for RRC Piggyback (RNTI %x)\n",
 		     module_idP, CC_idP, frameP, subframeP, ra->rnti);
 	    ra->Msg4_subframe ++;
+	    ra->Msg4_delay_cnt++;
+	    if (ra->Msg4_delay_cnt==10) cancel_ra_proc(module_idP, CC_idP, frameP, ra->rnti);
+
 	    if (ra->Msg4_subframe == 10) {
 	      ra->Msg4_frame++;
 	      ra->Msg4_frame&=1023;
@@ -1520,6 +1523,7 @@ initiate_ra_proc(module_id_t module_idP,
 	    LOG_D(MAC, "Frame %d, Subframe %d: Activating RA process %d\n",
 		  frameP, subframeP, i);
 	    ra[i].state = MSG2;
+	    ra[i].Msg4_delay_cnt=0;
 	    ra[i].timing_offset = timing_offset;
 	    ra[i].preamble_subframe = subframeP;
 #if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
@@ -1632,7 +1636,7 @@ cancel_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP,
 	  ra[i].RRC_timer = 20;
 	  ra[i].rnti = 0;
 	  ra[i].msg3_round = 0;
-    LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d Canceled RA procedure for UE rnti %x\n", module_idP, CC_id, frameP, rnti);
+	  LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d Canceled RA procedure for UE rnti %x\n", module_idP, CC_id, frameP, rnti);
 	}
     }
 }

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -191,7 +191,7 @@ rx_sdu(const module_id_t enb_mod_idP,
       if (UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes < 0)
         UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes = 0;
     } else {		// we've got an error
-      LOG_I(MAC,
+      LOG_D(MAC,
 	    "[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d\n",
 	    enb_mod_idP, harq_pid, CC_idP,frameP,subframeP,
 	    UE_list->UE_sched_ctrl[UE_id].round_UL[CC_idP][harq_pid],
@@ -378,7 +378,7 @@ rx_sdu(const module_id_t enb_mod_idP,
               );
               // prepare transmission of Msg4(RRCConnectionReconfiguration)
               ra->state = MSGCRNTI;
-              LOG_I(MAC,
+              LOG_D(MAC,
                     "[eNB %d] Frame %d, Subframe %d CC_id %d : (rnti %x UE_id %d) RRCConnectionReconfiguration(Msg4)\n",
                     enb_mod_idP, frameP, subframeP, CC_idP, old_rnti, old_UE_id);
 

openair2/LAYER2/MAC/mac.h

@@ -1009,6 +1009,8 @@ typedef struct {
     sub_frame_t Msg3_subframe;
     /// Frame where Msg3 is to be sent
     frame_t Msg3_frame;
+    /// Delay cnt for Msg4 transmission (waiting for RRC message piggyback)
+    int Msg4_delay_cnt;
     /// Subframe where Msg4 is to be sent
     sub_frame_t Msg4_subframe;
     /// Frame where Msg4 is to be sent