merging

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -1253,13 +1253,35 @@ int memcpy_tx_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_tx_request_t *req) {
   return 0;
 }
 
+static bool is_my_hi_dci0_req(nfapi_hi_dci0_request_t *hi_dci0_req)
+{
+  bool is_my_rnti = false;
+  const rnti_t rnti = UE_mac_inst[0].crnti;
+  nfapi_hi_dci0_request_body_t *hi_dci0_body = &hi_dci0_req->hi_dci0_request_body;
+  for (int i = 0; i < hi_dci0_body->number_of_dci + hi_dci0_body->number_of_hi; i++)
+  {
+    nfapi_hi_dci0_request_pdu_t *hi_dci0 = &hi_dci0_body->hi_dci0_pdu_list[i];
+    if (hi_dci0->pdu_type != NFAPI_HI_DCI0_DCI_PDU_TYPE || hi_dci0->dci_pdu.dci_pdu_rel8.cqi_csi_request)
+    {
+      continue;
+    }
+    if (hi_dci0->dci_pdu.dci_pdu_rel8.rnti == rnti)
+    {
+      is_my_rnti = true;
+      break;
+    }
+  }
+
+  return is_my_rnti;
+}
+
 int memcpy_hi_dci0_req (L1_rxtx_proc_t *proc,
 			nfapi_pnf_p7_config_t* pnf_p7,
 			nfapi_hi_dci0_request_t* req) {
+  if (!is_my_hi_dci0_req(req)) return 0;
   nfapi_hi_dci0_request_t *p = (nfapi_hi_dci0_request_t *)malloc(sizeof(nfapi_hi_dci0_request_t));
 	//if(req!=0){
 
-
   p->sfn_sf = req->sfn_sf;
   p->vendor_extension = req->vendor_extension;
 

targets/RT/USER/lte-ue.c

@@ -1197,7 +1197,7 @@ static void *UE_phy_stub_standalone_pnf_task(void *arg)
         hi_dci0_req_UE_MAC(NFAPI_SFNSF2SFN(hi_dci0_req->sfn_sf),
                            NFAPI_SFNSF2SF(hi_dci0_req->sfn_sf),
                            pdu,
-                           ue_num);
+                           ue_num); // This function doesnt do anything? - Andrew
       }
     }