fix issue about 4UE segment(cqi channel=0)

nfapi/oai_integration/nfapi_vnf.c

@@ -645,7 +645,22 @@ int phy_cqi_indication(struct nfapi_vnf_p7_config* config, nfapi_cqi_indication_
 
   pthread_mutex_lock(&eNB->UL_INFO_mutex);
 
-  eNB->UL_INFO.cqi_ind.cqi_indication_body = ind->cqi_indication_body;
+  nfapi_cqi_indication_t *dest_ind = &eNB->UL_INFO.cqi_ind;
+  *dest_ind = *ind;
+
+  dest_ind->cqi_indication_body.cqi_pdu_list = eNB->cqi_pdu_list;
+  dest_ind->cqi_indication_body.cqi_raw_pdu_list = eNB->cqi_raw_pdu_list;
+
+  for(int i=0; i<ind->cqi_indication_body.number_of_cqis; i++) {
+    nfapi_cqi_indication_pdu_t *src_pdu = &ind->cqi_indication_body.cqi_pdu_list[i];
+    LOG_D(MAC, "SR_IND[PDU:%d][rnti:%x cqi:%d channel:%d]\n", i, src_pdu->rx_ue_information.rnti,
+                src_pdu->ul_cqi_information.ul_cqi, src_pdu->ul_cqi_information.channel);
+    memcpy(&dest_ind->cqi_indication_body.cqi_pdu_list[i],
+           src_pdu, sizeof(nfapi_cqi_indication_pdu_t));
+
+    memcpy(&dest_ind->cqi_indication_body.cqi_raw_pdu_list[i],
+           &ind->cqi_indication_body.cqi_raw_pdu_list[i], sizeof(nfapi_cqi_indication_raw_pdu_t));
+  }
 
   pthread_mutex_unlock(&eNB->UL_INFO_mutex);
 

openair2/PHY_INTERFACE/IF_Module.c

@@ -111,8 +111,8 @@ void handle_cqi(UL_IND_t *UL_info) {
     for (i=0;i<UL_info->cqi_ind.cqi_indication_body.number_of_cqis;i++)
       cqi_indication(UL_info->module_id,
           UL_info->CC_id,
-          UL_info->frame,
-          UL_info->subframe,
+          NFAPI_SFNSF2SFN(UL_info->cqi_ind.sfn_sf),
+          NFAPI_SFNSF2SF(UL_info->cqi_ind.sfn_sf),
           UL_info->cqi_ind.cqi_indication_body.cqi_pdu_list[i].rx_ue_information.rnti,
           &UL_info->cqi_ind.cqi_indication_body.cqi_pdu_list[i].cqi_indication_rel9,
           UL_info->cqi_ind.cqi_indication_body.cqi_raw_pdu_list[i].pdu,