nr PDCCH development: add nr_dci_info_extracted in file phy_procedures_nr_ue.c

openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c

@@ -6935,7 +6935,8 @@ int nr_generate_ue_ul_dlsch_params_from_dci(PHY_VARS_NR_UE *ue,
         uint8_t dci_fields_sizes[NBR_NR_DCI_FIELDS][NBR_NR_FORMATS],
         uint16_t n_RB_ULBWP,
         uint16_t n_RB_DLBWP,
-        uint16_t crc_scrambled_values[TOTAL_NBR_SCRAMBLED_VALUES])
+        uint16_t crc_scrambled_values[TOTAL_NBR_SCRAMBLED_VALUES],
+        NR_DCI_INFO_EXTRACTED_t *nr_dci_info_extracted)
 {
   /*
    * Note only format0_0 and format1_0 are implemented
@@ -6947,7 +6948,7 @@ int nr_generate_ue_ul_dlsch_params_from_dci(PHY_VARS_NR_UE *ue,
   NR_UE_DLSCH_t *dlsch0=NULL,*dlsch1=NULL;
   NR_DL_UE_HARQ_t *dlsch0_harq=NULL,*dlsch1_harq=NULL;
   NR_UE_ULSCH_t *ulsch0=NULL,*ulsch1=NULL;
-  NR_DCI_INFO_EXTRACTED_t nr_dci_info_extracted;
+  //NR_DCI_INFO_EXTRACTED_t nr_dci_info_extracted;
   uint8_t status=0,left_shift=0;
   uint64_t pdu_bitmap = 0xFFFFFFFFFFFFFFFF;
   pdu_bitmap = (pdu_bitmap << (64 - dci_length)) >> (64 - dci_length); // this variable will help to remove the bits of other fields when left-switching

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -3484,6 +3484,7 @@ int nr_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *
         }
         if ((dci_alloc_rx[i].format == format1_1)){ // This format not implemented at a first time. FIXME
         }
+        NR_DCI_INFO_EXTRACTED_t *nr_dci_info_extracted;
         nr_generate_ue_ul_dlsch_params_from_dci(ue,
                                                 eNB_id,
                                                 frame_rx,
@@ -3502,13 +3503,13 @@ int nr_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *
                                                 dci_fields_sizes_cnt[i],
                                                 n_RB_ULBWP,
                                                 n_RB_DLBWP,
-                                                crc_scrambled_values);
+                                                crc_scrambled_values,
+                                                &nr_dci_info_extracted);
 
         //ue->dci_ind.dci_list = (fapi_nr_dci_indication_pdu_t *)malloc(num_dci * sizeof(fapi_nr_dci_indication_pdu_t));
     
         ue->dci_ind.dci_list[i].rnti = 0x0000;
         ue->dci_ind.dci_list[i].dci_type = 0;
-        NR_DCI_INFO_EXTRACTED_t *nr_dci_info_extracted;
         memcpy(&ue->dci_ind.dci_list[i].dci, nr_dci_info_extracted, sizeof(fapi_nr_dci_pdu_rel15_t) );
         
         //  TODO: check where should we send up this message.