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

improved slot computation in decode mib function

Browse Source
This commit is contained in:
francescomani
2021-03-29 17:45:04 +02:00
parent 3de0730034
commit b711517a57
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+14 -7
View File
@@ -144,11 +144,14 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
//storing ssb index in the mac structure //storing ssb index in the mac structure
mac->mib_ssb = ssb_index; mac->mib_ssb = ssb_index;
if (get_softmodem_params()->sa == 1) { uint8_t scs_ssb;
uint32_t band;
uint16_t ssb_start_symbol;
uint8_t scs_ssb = get_softmodem_params()->numerology; if (get_softmodem_params()->sa == 1) {
uint32_t band = mac->nr_band; scs_ssb = get_softmodem_params()->numerology;
uint16_t ssb_start_symbol = get_ssb_start_symbol(band,scs_ssb,ssb_index); band = mac->nr_band;
ssb_start_symbol = get_ssb_start_symbol(band,scs_ssb,ssb_index);
uint16_t ssb_offset_point_a = (ssb_start_subcarrier - ssb_subcarrier_offset)/12; uint16_t ssb_offset_point_a = (ssb_start_subcarrier - ssb_subcarrier_offset)/12;
get_type0_PDCCH_CSS_config_parameters(&mac->type0_PDCCH_CSS_config, get_type0_PDCCH_CSS_config_parameters(&mac->type0_PDCCH_CSS_config,
@@ -167,11 +170,15 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
mac->type0_pdcch_ss_sfn_c = mac->type0_PDCCH_CSS_config.sfn_c; mac->type0_pdcch_ss_sfn_c = mac->type0_PDCCH_CSS_config.sfn_c;
mac->type0_pdcch_ss_n_c = mac->type0_PDCCH_CSS_config.n_c; mac->type0_pdcch_ss_n_c = mac->type0_PDCCH_CSS_config.n_c;
} }
else {
NR_ServingCellConfigCommon_t *scc = mac->scc;
scs_ssb = *scc->ssbSubcarrierSpacing;
band = *scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0];
ssb_start_symbol = get_ssb_start_symbol(band,scs_ssb,ssb_index);
}
//TODO is this needed?
mac->dl_config_request.sfn = frame; mac->dl_config_request.sfn = frame;
mac->dl_config_request.slot = (ssb_index>>1) + ((ssb_index>>4)<<1); // not valid for 240kHz SCS mac->dl_config_request.slot = ssb_start_symbol/14;
return 0; return 0;
} }