maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates on coreset harmonization

Browse Source
This commit is contained in:
francescomani
2022-04-27 16:24:05 +02:00
parent a71552d55d
commit f902e27c43
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+1 -1
View File
@@ -682,7 +682,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
int ch_offset,symbol_offset; int ch_offset,symbol_offset;
uint8_t nushift; uint8_t nushift;
int **dl_ch_estimates =ue->pdsch_vars[proc->thread_id][gNB_id]->dl_ch_estimates; int **dl_ch_estimates = ue->pdsch_vars[proc->thread_id][gNB_id]->dl_ch_estimates;
int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[proc->thread_id].rxdataF; int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[proc->thread_id].rxdataF;
ch_offset = ue->frame_parms.ofdm_symbol_size*symbol; ch_offset = ue->frame_parms.ofdm_symbol_size*symbol;
openair2/RRC/NR/nr_rrc_config.c
+7 -4
View File
@@ -38,14 +38,15 @@ void rrc_coreset_config(NR_ControlResourceSet_t *coreset,
int curr_bwp, int curr_bwp,
uint64_t ssb_bitmap) { uint64_t ssb_bitmap) {
// frequency domain resources depends on BWP size
// frequency domain resources depending on BWP size
coreset->frequencyDomainResources.buf = calloc(1,6); coreset->frequencyDomainResources.buf = calloc(1,6);
coreset->frequencyDomainResources.buf[0] = (curr_bwp < 48) ? 0xf0 : 0xff; coreset->frequencyDomainResources.buf[0] = (curr_bwp < 48) ? 0xf0 : 0xff;
coreset->frequencyDomainResources.buf[1] = (curr_bwp < 96) ? 0x00 : 0xff; coreset->frequencyDomainResources.buf[1] = (curr_bwp < 96) ? 0x00 : 0xff;
coreset->frequencyDomainResources.buf[2] = (curr_bwp < 144) ? 0x00 : 0xff; coreset->frequencyDomainResources.buf[2] = (curr_bwp < 144) ? 0x00 : 0xff;
coreset->frequencyDomainResources.buf[3] = (curr_bwp < 192) ? 0x00 : 0xff; coreset->frequencyDomainResources.buf[3] = (curr_bwp < 192) ? 0x00 : 0xff;
coreset->frequencyDomainResources.buf[4] = 0; coreset->frequencyDomainResources.buf[4] = (curr_bwp < 240) ? 0x00 : 0xff;
coreset->frequencyDomainResources.buf[5] = 0; coreset->frequencyDomainResources.buf[5] = 0x00;
coreset->frequencyDomainResources.size = 6; coreset->frequencyDomainResources.size = 6;
coreset->frequencyDomainResources.bits_unused = 3; coreset->frequencyDomainResources.bits_unused = 3;
coreset->duration = (curr_bwp < 48) ? 2 : 1; coreset->duration = (curr_bwp < 48) ? 2 : 1;
@@ -53,10 +54,12 @@ void rrc_coreset_config(NR_ControlResourceSet_t *coreset,
coreset->precoderGranularity = NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle; coreset->precoderGranularity = NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle;
// The ID space is used across the BWPs of a Serving Cell as per 38.331 // The ID space is used across the BWPs of a Serving Cell as per 38.331
// Unique ID depending on BWP size
coreset->controlResourceSetId = (coreset->frequencyDomainResources.buf[0] > 0) + coreset->controlResourceSetId = (coreset->frequencyDomainResources.buf[0] > 0) +
(coreset->frequencyDomainResources.buf[1] > 0) + (coreset->frequencyDomainResources.buf[1] > 0) +
(coreset->frequencyDomainResources.buf[2] > 0) + (coreset->frequencyDomainResources.buf[2] > 0) +
(coreset->frequencyDomainResources.buf[3] > 0); (coreset->frequencyDomainResources.buf[3] > 0) +
(coreset->frequencyDomainResources.buf[4] > 0);
coreset->tci_StatesPDCCH_ToAddList=calloc(1,sizeof(*coreset->tci_StatesPDCCH_ToAddList)); coreset->tci_StatesPDCCH_ToAddList=calloc(1,sizeof(*coreset->tci_StatesPDCCH_ToAddList));
NR_TCI_StateId_t *tci[64]; NR_TCI_StateId_t *tci[64];