more updates to last commit

openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c

@@ -481,6 +481,7 @@ int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
   unsigned int pilot_cnt;
   int16_t ch[2],*pil,*rxF,*dl_ch,*fl,*fm,*fr;
   int ch_offset,symbol_offset;
+  int coreset_config_pbch = 1; // TODO: To be updated from PBCH decoder
 
   //uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
 
@@ -513,7 +514,7 @@ int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
   // generate pilot 
   uint16_t rb_offset = (coreset_start_subcarrier - ue->frame_parms.first_carrier_offset) / 12;
   
-  nr_pdcch_dmrs_rx(ue,eNB_offset,Ns,ue->nr_gold_pdcch[eNB_offset][Ns][symbol], &pilot[0],2000,nb_rb_coreset,rb_offset);
+  nr_pdcch_dmrs_rx(ue,eNB_offset,Ns,ue->nr_gold_pdcch[eNB_offset][Ns][symbol], &pilot[0],2000,nb_rb_coreset,coreset_config_pbch?0:rb_offset);
 
   for (aarx=0; aarx<ue->frame_parms.nb_antennas_rx; aarx++) {
 

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -51,7 +51,7 @@ void set_cset_offset(uint16_t offset_bits) {
 void nr_init_coreset(nfapi_nr_coreset_t *coreset) {
 
   coreset->coreset_id = 1;
-  coreset->frequency_domain_resources = 0x1E0000000000;//0x1FFFE0000000; // 96 RB starting from CRB0
+  coreset->frequency_domain_resources = 0x1E00000000;//0x1FFFE0000000; // 96 RB starting from CRB0
   coreset->duration = 2;
   coreset->cce_reg_mapping_type = NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED;
   coreset->reg_bundle_size = 6;