fix for scrambling rnti and dci format

nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h

@@ -60,7 +60,7 @@ typedef struct {
   uint8_t CoreSetType;
   uint8_t precoder_granularity;
   uint16_t pdcch_dmrs_scrambling_id;
-
+  uint16_t scrambling_rnti;
   uint8_t tci_state_pdcch;
   uint8_t tci_present_in_dci;
 } fapi_nr_coreset_t;

openair1/PHY/NR_UE_TRANSPORT/dci_nr.c

@@ -851,7 +851,7 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
       uint64_t dci_estimation[2]= {0};
       const t_nrPolar_params *currentPtrDCI=nr_polar_params(1, dci_length, L,1,&ue->polarList);
 
-      nr_pdcch_unscrambling(rel15->rnti,
+      nr_pdcch_unscrambling(rel15->coreset.scrambling_rnti,
 			    &ue->frame_parms,
 			    slot,
 			    &pdcch_vars->e_rx[CCEind*108],

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -170,10 +170,14 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac,fapi_nr_dl_config_request_t *dl_
       }
       rel15->coreset.CoreSetType = 1;
       rel15->coreset.precoder_granularity = mac->coreset[0][0]->precoderGranularity;
-      if (mac->coreset[0][0]->pdcch_DMRS_ScramblingID)
+      if (mac->coreset[0][0]->pdcch_DMRS_ScramblingID) {
 	rel15->coreset.pdcch_dmrs_scrambling_id = *mac->coreset[0][0]->pdcch_DMRS_ScramblingID;
-      else
+        rel15->coreset.scrambling_rnti = mac->t_crnti;
+      }
+      else {
 	rel15->coreset.pdcch_dmrs_scrambling_id = *mac->scc->physCellId;
+        rel15->coreset.scrambling_rnti = 0;
+      }
       fill_dci_search_candidates(mac->SSpace[0][0][ss_id],rel15);
       rel15->dci_format = NR_DL_DCI_FORMAT_1_1;
       rel15->dci_length = nr_dci_size(mac->scg,def_dci_pdu_rel15,rel15->dci_format,NR_RNTI_C,rel15->BWPSize,bwp_id);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -426,9 +426,9 @@ int configure_fapi_dl_pdu(int Mod_idP,
   int rnti_types[2];
   
   if (ss->searchSpaceType->choice.ue_Specific->dci_Formats)
-    dci_formats[0]  = NR_DL_DCI_FORMAT_1_0;
-  else
     dci_formats[0]  = NR_DL_DCI_FORMAT_1_1;
+  else
+    dci_formats[0]  = NR_DL_DCI_FORMAT_1_0;
 
   rnti_types[0]   = NR_RNTI_C;