fix issue about CI L2 FAPI SIM cplane failure

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -252,11 +252,9 @@ void fill_ulsch_cqi_indication_UE_MAC(int Mod_id,
   UL_INFO->cqi_ind.sfn_sf = frame << 4 | subframe;
   // because of nfapi_vnf.c:733, set message id to 0, not
   // NFAPI_RX_CQI_INDICATION;
-  UL_INFO->cqi_ind.header.message_id = NFAPI_RX_CQI_INDICATION;
-  UL_INFO->cqi_ind.vendor_extension = ul_config_req->vendor_extension;
+  UL_INFO->cqi_ind.header.message_id = 0;
   UL_INFO->cqi_ind.cqi_indication_body.tl.tag = NFAPI_CQI_INDICATION_BODY_TAG;
 
-  pdu->instance_length = 0;
   pdu->rx_ue_information.tl.tag = NFAPI_RX_UE_INFORMATION_TAG;
   pdu->rx_ue_information.rnti = rnti;
   // Since we assume that CRC flag is always 0 (ACK) I guess that data_offset
@@ -269,13 +267,6 @@ void fill_ulsch_cqi_indication_UE_MAC(int Mod_id,
 
   pdu->cqi_indication_rel8.timing_advance = 0;
   // pdu->cqi_indication_rel8.number_of_cc_reported = 1;
-
-  pdu->cqi_indication_rel9.tl.tag = NFAPI_CQI_INDICATION_REL9_TAG;
-  pdu->cqi_indication_rel9.length = 0;
-  pdu->cqi_indication_rel9.ri[0]  = 0;
-  pdu->cqi_indication_rel9.timing_advance = 0;
-  pdu->cqi_indication_rel9.number_of_cc_reported = 1;
-
   pdu->ul_cqi_information.tl.tag = NFAPI_UL_CQI_INFORMATION_TAG;
   pdu->ul_cqi_information.channel = 1; // PUSCH
 

openair2/RRC/LTE/MESSAGES/asn1_msg.c

@@ -2717,7 +2717,7 @@ do_RRCConnectionSetup(
   physicalConfigDedicated2->schedulingRequestConfig->present = LTE_SchedulingRequestConfig_PR_setup;
   int sr_base=carrier->sib2->radioResourceConfigCommon.pucch_ConfigCommon.n1PUCCH_AN-1;
   if (carrier->sib1->tdd_Config == NULL) {
-    physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = 71 - ue_context_pP->local_uid/10;//ue_context_pP->local_uid;
+    physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = sr_base - ue_context_pP->local_uid/10;//ue_context_pP->local_uid;
   } else {
     switch (carrier->sib1->tdd_Config->subframeAssignment) {
       case 1:

targets/RT/USER/lte-ue.c

@@ -1335,31 +1335,6 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg)
         UL_INFO->sr_ind.sr_indication_body.number_of_srs = 0;
       }
 
-
-      // Free UL_INFO messages
-      if(UL_INFO->crc_ind.crc_indication_body.crc_pdu_list != NULL){
-      free(UL_INFO->crc_ind.crc_indication_body.crc_pdu_list);
-      UL_INFO->crc_ind.crc_indication_body.crc_pdu_list = NULL;
-      }
-      if(UL_INFO->rx_ind.rx_indication_body.rx_pdu_list != NULL){
-      free(UL_INFO->rx_ind.rx_indication_body.rx_pdu_list);
-      UL_INFO->rx_ind.rx_indication_body.rx_pdu_list = NULL;
-      }
-      if(UL_INFO->harq_ind.harq_indication_body.harq_pdu_list !=NULL){
-      free(UL_INFO->harq_ind.harq_indication_body.harq_pdu_list);
-      UL_INFO->harq_ind.harq_indication_body.harq_pdu_list = NULL;
-      }
-      if(UL_INFO->sr_ind.sr_indication_body.sr_pdu_list!=NULL){
-      free(UL_INFO->sr_ind.sr_indication_body.sr_pdu_list);
-      UL_INFO->sr_ind.sr_indication_body.sr_pdu_list = NULL;
-      }
-      free(UL_INFO->cqi_ind.cqi_indication_body.cqi_pdu_list);
-      UL_INFO->cqi_ind.cqi_indication_body.cqi_pdu_list = NULL;
-      free(UL_INFO->cqi_ind.cqi_indication_body.cqi_raw_pdu_list);
-      UL_INFO->cqi_ind.cqi_indication_body.cqi_raw_pdu_list = NULL;
-      free(UL_INFO);
-      UL_INFO = NULL;
-
       // De-allocate memory of nfapi requests copies before next subframe round
       if(dl_config_req!=NULL) {
         if(dl_config_req->vendor_extension!=NULL) {