diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c index 198e08610b..d7e2c78c35 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c @@ -104,167 +104,6 @@ void clear_nr_nfapi_information(gNB_MAC_INST * gNB, TX_req[CC_idP].Number_of_PDUs = 0; } -/* -void check_nr_ul_failure(module_id_t module_idP, - int CC_id, - int UE_id, - frame_t frameP, - sub_frame_t slotP) { - - NR_UE_info_t *UE_info = &RC.nrmac[module_idP]->UE_info; - nfapi_nr_dl_dci_request_t *DL_req = &RC.nrmac[module_idP]->DL_req[0]; - uint16_t rnti = UE_RNTI(module_idP, UE_id); - NR_COMMON_channels_t *cc = RC.nrmac[module_idP]->common_channels; - - // check uplink failure - if ((UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 0) && - (UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 0)) { - LOG_I(MAC, "UE %d rnti %x: UL Failure timer %d \n", UE_id, rnti, - UE_info->UE_sched_ctrl[UE_id].ul_failure_timer); - if (UE_info->UE_sched_ctrl[UE_id].ra_pdcch_order_sent == 0) { - UE_info->UE_sched_ctrl[UE_id].ra_pdcch_order_sent = 1; - - // add a format 1A dci for this UE to request an RA procedure (only one UE per subframe) - nfapi_nr_dl_dci_request_pdu_t *dl_config_pdu = &DL_req[CC_id].dl_tti_request_body.dl_config_pdu_list[DL_req[CC_id].dl_tti_request_body.number_pdu]; - memset((void *) dl_config_pdu, 0,sizeof(nfapi_dl_dci_request_pdu_t)); - dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE; - dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu)); - dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_DCI_REQUEST_DCI_DL_PDU_REL8_TAG; - dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1A; - dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = get_aggregation(get_bw_index(module_idP, CC_id), - UE_info->UE_sched_ctrl[UE_id]. - dl_cqi[CC_id], format1A); - dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti; - dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 1; // CRNTI : see Table 4-10 from SCF082 - nFAPI specifications - dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power - - AssertFatal((cc[CC_id].mib->message.dl_Bandwidth >= 0) && (cc[CC_id].mib->message.dl_Bandwidth < 6), - "illegal dl_Bandwidth %d\n", - (int) cc[CC_id].mib->message.dl_Bandwidth); - dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = nr_pdcch_order_table[cc[CC_id].mib->message.dl_Bandwidth]; - DL_req[CC_id].dl_tti_request_body.number_dci++; - DL_req[CC_id].dl_tti_request_body.number_pdu++; - DL_req[CC_id].dl_tti_request_body.tl.tag = NFAPI_DL_TTI_REQUEST_BODY_TAG; - LOG_I(MAC, - "UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d \n", - UE_id, rnti, - UE_info->UE_sched_ctrl[UE_id].ul_failure_timer, - dl_config_pdu->dci_dl_pdu. - dci_dl_pdu_rel8.resource_block_coding); - } else { // ra_pdcch_sent==1 - LOG_I(MAC, - "UE %d rnti %x: sent PDCCH order for RAPROC waiting (failure timer %d) \n", - UE_id, rnti, - UE_info->UE_sched_ctrl[UE_id].ul_failure_timer); - if ((UE_info->UE_sched_ctrl[UE_id].ul_failure_timer % 40) == 0) UE_info->UE_sched_ctrl[UE_id].ra_pdcch_order_sent = 0; // resend every 4 frames - } - - UE_info->UE_sched_ctrl[UE_id].ul_failure_timer++; - // check threshold - if (UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 20000) { - // inform RRC of failure and clear timer - LOG_I(MAC, - "UE %d rnti %x: UL Failure after repeated PDCCH orders: Triggering RRC \n", - UE_id, rnti); - mac_eNB_rrc_ul_failure(module_idP, CC_id, frameP, subframeP,rnti); - UE_info->UE_sched_ctrl[UE_id].ul_failure_timer = 0; - UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync = 1; - - //Inform the controller about the UE deactivation. Should be moved to RRC agent in the future - if (rrc_agent_registered[module_idP]) { - LOG_W(MAC, "notify flexran Agent of UE state change\n"); - agent_rrc_xface[module_idP]->flexran_agent_notify_ue_state_change(module_idP, - rnti, PROTOCOL__FLEX_UE_STATE_CHANGE_TYPE__FLUESC_DEACTIVATED); - } - } - } // ul_failure_timer>0 - -} -*/ -/* -void schedule_nr_SRS(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP) -{ - gNB_MAC_INST *gNB = RC.nrmac[module_idP]; - NR_UE_info_t *UE_info = &gNB->UE_info; - nfapi_ul_config_request_body_t *ul_req; - int CC_id, UE_id; - NR_COMMON_channels_t *cc = RC.nrmac[module_idP]->common_channels; - SoundingRS_UL_ConfigCommon_t *soundingRS_UL_ConfigCommon; - struct SoundingRS_UL_ConfigDedicated *soundingRS_UL_ConfigDedicated; - uint8_t TSFC; - uint16_t deltaTSFC; // bitmap - uint8_t srs_SubframeConfig; - - // table for TSFC (Period) and deltaSFC (offset) - const uint16_t deltaTSFCTabType1[15][2] = { {1, 1}, {1, 2}, {2, 2}, {1, 5}, {2, 5}, {4, 5}, {8, 5}, {3, 5}, {12, 5}, {1, 10}, {2, 10}, {4, 10}, {8, 10}, {351, 10}, {383, 10} }; // Table 5.5.3.3-2 3GPP 36.211 FDD - const uint16_t deltaTSFCTabType2[14][2] = { {2, 5}, {6, 5}, {10, 5}, {18, 5}, {14, 5}, {22, 5}, {26, 5}, {30, 5}, {70, 10}, {74, 10}, {194, 10}, {326, 10}, {586, 10}, {210, 10} }; // Table 5.5.3.3-2 3GPP 36.211 TDD - - uint16_t srsPeriodicity, srsOffset; - - for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) { - soundingRS_UL_ConfigCommon = &cc[CC_id].radioResourceConfigCommon->soundingRS_UL_ConfigCommon; - // check if SRS is enabled in this frame/subframe - if (soundingRS_UL_ConfigCommon) { - srs_SubframeConfig = soundingRS_UL_ConfigCommon->choice.setup.srs_SubframeConfig; - if (cc[CC_id].tdd_Config == NULL) { // FDD - deltaTSFC = deltaTSFCTabType1[srs_SubframeConfig][0]; - TSFC = deltaTSFCTabType1[srs_SubframeConfig][1]; - } else { // TDD - deltaTSFC = deltaTSFCTabType2[srs_SubframeConfig][0]; - TSFC = deltaTSFCTabType2[srs_SubframeConfig][1]; - } - // Sounding reference signal subframes are the subframes satisfying ns/2 mod TSFC (- deltaTSFC - uint16_t tmp = (subframeP % TSFC); - - if ((1 << tmp) & deltaTSFC) { - // This is an SRS subframe, loop over UEs - UEs_iterator() { - if (!RC.nrmac[module_idP]->UE_info.active[UE_id]) continue; - ul_req = &RC.nrmac[module_idP]->UL_req[CC_id].ul_config_request_body; - // drop the allocation if the UE hasn't send RRCConnectionSetupComplete yet - if (mac_eNB_get_rrc_status(module_idP,UE_RNTI(module_idP, UE_id)) < RRC_CONNECTED) continue; - - AssertFatal(UE_info->UE_template[CC_id][UE_id].physicalConfigDedicated != NULL, - "physicalConfigDedicated is null for UE %d\n", - UE_id); - - if ((soundingRS_UL_ConfigDedicated = UE_info->UE_template[CC_id][UE_id].physicalConfigDedicated->soundingRS_UL_ConfigDedicated) != NULL) { - if (soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup) { - get_srs_pos(&cc[CC_id], - soundingRS_UL_ConfigDedicated->choice. - setup.srs_ConfigIndex, - &srsPeriodicity, &srsOffset); - if (((10 * frameP + subframeP) % srsPeriodicity) == srsOffset) { - // Program SRS - ul_req->srs_present = 1; - nfapi_ul_config_request_pdu_t * ul_config_pdu = &ul_req->ul_config_pdu_list[ul_req->number_of_pdus]; - memset((void *) ul_config_pdu, 0, sizeof(nfapi_ul_config_request_pdu_t)); - ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_SRS_PDU_TYPE; - ul_config_pdu->pdu_size = 2 + (uint8_t) (2 + sizeof(nfapi_ul_config_srs_pdu)); - ul_config_pdu->srs_pdu.srs_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_SRS_PDU_REL8_TAG; - ul_config_pdu->srs_pdu.srs_pdu_rel8.size = (uint8_t)sizeof(nfapi_ul_config_srs_pdu); - ul_config_pdu->srs_pdu.srs_pdu_rel8.rnti = UE_info->UE_template[CC_id][UE_id].rnti; - ul_config_pdu->srs_pdu.srs_pdu_rel8.srs_bandwidth = soundingRS_UL_ConfigDedicated->choice.setup.srs_Bandwidth; - ul_config_pdu->srs_pdu.srs_pdu_rel8.frequency_domain_position = soundingRS_UL_ConfigDedicated->choice.setup.freqDomainPosition; - ul_config_pdu->srs_pdu.srs_pdu_rel8.srs_hopping_bandwidth = soundingRS_UL_ConfigDedicated->choice.setup.srs_HoppingBandwidth;; - ul_config_pdu->srs_pdu.srs_pdu_rel8.transmission_comb = soundingRS_UL_ConfigDedicated->choice.setup.transmissionComb; - ul_config_pdu->srs_pdu.srs_pdu_rel8.i_srs = soundingRS_UL_ConfigDedicated->choice.setup.srs_ConfigIndex; - ul_config_pdu->srs_pdu.srs_pdu_rel8.sounding_reference_cyclic_shift = soundingRS_UL_ConfigDedicated->choice.setup.cyclicShift; // ul_config_pdu->srs_pdu.srs_pdu_rel10.antenna_port = ;// - // ul_config_pdu->srs_pdu.srs_pdu_rel13.number_of_combs = ;// - RC.nrmac[module_idP]->UL_req[CC_id].sfn_sf = (frameP << 4) + subframeP; - RC.nrmac[module_idP]->UL_req[CC_id].header.message_id = NFAPI_UL_CONFIG_REQUEST; - ul_req->number_of_pdus++; - } // if (((10*frameP+subframeP) % srsPeriodicity) == srsOffset) - } // if (soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup) - } // if ((soundingRS_UL_ConfigDedicated = UE_info->UE_template[CC_id][UE_id].physicalConfigDedicated->soundingRS_UL_ConfigDedicated)!=NULL) - } // for (UE_id ... - } // if((1<=64) return false; //quickfix for FR2 where there are more than 64 slots (bitmap to be removed) diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c index 8a0e966a8a..aff03a5323 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c @@ -151,8 +151,6 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP, NrOfSymbols = NrOfSymbols_tmp; StartSymbolIndex = StartSymbolIndex_tmp; mappingtype = mappingtype_tmp; - // k0 = *scc->downlinkConfigCommon->initialDownlinkBWP->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list.array[i]->k0; - // time_domain_assignment = i; } } AssertFatal(StartSymbolIndex>=0,"StartSymbolIndex is negative\n"); @@ -164,78 +162,6 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP, StartSymbolIndex, mappingtype, 1); - /* - AssertFatal(k0==0,"k0 is not zero for Initial DL BWP TimeDomain Alloc\n"); - nr_configure_css_dci_initial(pdcch_pdu_rel15, - scs, - scs, - FR, - 0, - 0, - 0, - sfn_sf, slotP, - slots_per_frame, - dlBWP_carrier_bandwidth); - - - pdu_rel15->frequency_domain_assignment = PRBalloc_to_locationandbandwidth0(pdsch_pdu_rel15->rbSize, - pdsch_pdu_rel15->rbStart, - dlBWP_carrier_bandwidth); - pdu_rel15->time_domain_assignment = time_domain_assignment; - - pdu_rel15->vrb_to_prb_mapping = 1; - pdu_rel15->mcs = 9; - pdu_rel15->tb_scaling = 1; - - pdu_rel15->ra_preamble_index = 25; - pdu_rel15->format_indicator = 1; - pdu_rel15->ndi = 1; - pdu_rel15->rv = 0; - pdu_rel15->harq_pid = 0; - pdu_rel15->dai = 2; - pdu_rel15->tpc = 2; - pdu_rel15->pucch_resource_indicator = 7; - pdu_rel15->pdsch_to_harq_feedback_timing_indicator = 7; - - LOG_D(MAC, "[gNB scheduler phytest] DCI type 1 payload: freq_alloc %d, time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d ndi %d rv %d\n", - pdu_rel15->frequency_domain_assignment, - pdu_rel15->time_domain_assignment, - pdu_rel15->vrb_to_prb_mapping, - pdu_rel15->mcs, - pdu_rel15->tb_scaling, - pdu_rel15->ndi, - pdu_rel15->rv); - - params_rel15->rnti = rnti; - params_rel15->rnti_type = NFAPI_NR_RNTI_C; - params_rel15->dci_format = NFAPI_NR_DL_DCI_FORMAT_1_0; - //params_rel15->aggregation_level = 1; - LOG_D(MAC, "DCI type 1 params: rnti %x, rnti_type %d, dci_format %d\n \ - coreset params: mux_pattern %d, n_rb %d, n_symb %d, rb_offset %d \n \ - ss params : nb_ss_sets_per_slot %d, first symb %d, nb_slots %d, sfn_mod2 %d, first slot %d\n", - params_rel15->rnti, - params_rel15->rnti_type, - params_rel15->dci_format, - params_rel15->mux_pattern, - params_rel15->n_rb, - params_rel15->n_symb, - params_rel15->rb_offset, - params_rel15->nb_ss_sets_per_slot, - params_rel15->first_symbol, - params_rel15->nb_slots, - params_rel15->sfn_mod2, - params_rel15->first_slot); - nr_get_tbs_dl(&dl_tti_pdsch_pdu->pdsch_pdu, dl_tti_dci_pdu->dci_dl_pdu,0); - LOG_D(MAC, "DLSCH PDU: start PRB %d n_PRB %d start symbol %d nb_symbols %d nb_layers %d nb_codewords %d mcs %d\n", - pdsch_pdu_rel15->rbStart, - pdsch_pdu_rel15->rbSize, - pdsch_pdu_rel15->StartSymbolIndex, - pdsch_pdu_rel15->NrOfSymbols, - pdsch_pdu_rel15->nrOfLayers, - pdsch_pdu_rel15->NrOfCodewords, - pdsch_pdu_rel15->mcsIndex[0]); - */ - nr_mac->DL_req[CC_id].dl_tti_request_body.nPDUs+=2; TX_req = &nr_mac->TX_req[CC_id].pdu_list[nr_mac->TX_req[CC_id].Number_of_PDUs]; diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c index 574cfa2615..03dd076265 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c @@ -2995,307 +2995,3 @@ void schedule_nr_bwp_switch(module_id_t module_id, } } } - -/*void fill_nfapi_coresets_and_searchspaces(NR_CellGroupConfig_t *cg, - nfapi_nr_coreset_t *coreset, - nfapi_nr_search_space_t *search_space) { - - nfapi_nr_coreset_t *cs; - nfapi_nr_search_space_t *ss; - NR_ServingCellConfigCommon_t *scc=cg->spCellConfig->reconfigurationWithSync->spCellConfigCommon; - AssertFatal(cg->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count == 1, - "downlinkBWP_ToAddModList has %d BWP!\n", - cg->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count); - - NR_BWP_Downlink_t *bwp=cg->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[0]; - struct NR_PDCCH_Config__controlResourceSetToAddModList *coreset_list = bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList; - AssertFatal(coreset_list->list.count>0, - "cs list has 0 elements\n"); - for (int i=0;ilist.count;i++) { - NR_ControlResourceSet_t *coreset_i=coreset_list->list.array[i]; - cs = coreset + coreset_i->controlResourceSetId; - - cs->coreset_id = coreset_i->controlResourceSetId; - AssertFatal(coreset_i->frequencyDomainResources.size <=8 && coreset_i->frequencyDomainResources.size>0, - "coreset_i->frequencyDomainResources.size=%d\n", - (int)coreset_i->frequencyDomainResources.size); - - for (int f=0;ffrequencyDomainResources.size;f++) - ((uint8_t*)&cs->frequency_domain_resources)[coreset_i->frequencyDomainResources.size-1-f]=coreset_i->frequencyDomainResources.buf[f]; - - cs->frequency_domain_resources>>=coreset_i->frequencyDomainResources.bits_unused; - - cs->duration = coreset_i->duration; - // Need to add information about TCI_StateIDs - - if (coreset_i->cce_REG_MappingType.present == NR_ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved) - cs->cce_reg_mapping_type = NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED; - else { - cs->cce_reg_mapping_type = NFAPI_NR_CCE_REG_MAPPING_INTERLEAVED; - - if (coreset_i->cce_REG_MappingType.choice.interleaved->reg_BundleSize==NR_ControlResourceSet__cce_REG_MappingType__interleaved__reg_BundleSize_n6) - cs->reg_bundle_size = 6; - else cs->reg_bundle_size = 2+coreset_i->cce_REG_MappingType.choice.interleaved->reg_BundleSize; - - if (coreset_i->cce_REG_MappingType.choice.interleaved->interleaverSize==NR_ControlResourceSet__cce_REG_MappingType__interleaved__interleaverSize_n6) - cs->interleaver_size = 6; - else cs->interleaver_size = 2+coreset_i->cce_REG_MappingType.choice.interleaved->interleaverSize; - - if (coreset_i->cce_REG_MappingType.choice.interleaved->shiftIndex) - cs->shift_index = *coreset_i->cce_REG_MappingType.choice.interleaved->shiftIndex; - else cs->shift_index = 0; - } - - if (coreset_i->precoderGranularity == NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle) - cs->precoder_granularity = NFAPI_NR_CSET_SAME_AS_REG_BUNDLE; - else cs->precoder_granularity = NFAPI_NR_CSET_ALL_CONTIGUOUS_RBS; - if (coreset_i->tci_PresentInDCI == NULL) cs->tci_present_in_dci = 0; - else cs->tci_present_in_dci = 1; - - if (coreset_i->tci_PresentInDCI == NULL) cs->dmrs_scrambling_id = 0; - else cs->dmrs_scrambling_id = *coreset_i->tci_PresentInDCI; - } - - struct NR_PDCCH_ConfigCommon__commonSearchSpaceList *commonSearchSpaceList = bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList; - AssertFatal(commonSearchSpaceList->list.count>0, - "common SearchSpace list has 0 elements\n"); - // Common searchspace list - for (int i=0;ilist.count;i++) { - NR_SearchSpace_t *searchSpace_i=commonSearchSpaceList->list.array[i]; - ss=search_space + searchSpace_i->searchSpaceId; - if (searchSpace_i->controlResourceSetId) ss->coreset_id = *searchSpace_i->controlResourceSetId; - switch(searchSpace_i->monitoringSlotPeriodicityAndOffset->present) { - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL1; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL2; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl2; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl4: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL4; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl4; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl5: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL5; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl5; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl8: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL8; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl8; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl10: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL10; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl10; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl16: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL16; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl16; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl20: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL20; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl20; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl40: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL40; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl40; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl80: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL80; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl80; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl160: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL160; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl160; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl320: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL320; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl320; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl640: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL640; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl640; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1280: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL1280; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl1280; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2560: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL2560; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl2560; - break; - default: - AssertFatal(1==0,"Shouldn't get here\n"); - break; - } - if (searchSpace_i->duration) ss->duration = *searchSpace_i->duration; - else ss->duration = 1; - - - AssertFatal(searchSpace_i->monitoringSymbolsWithinSlot->size == 2, - "ss_i->monitoringSymbolsWithinSlot = %d != 2\n", - (int)searchSpace_i->monitoringSymbolsWithinSlot->size); - ((uint8_t*)&ss->monitoring_symbols_in_slot)[1] = searchSpace_i->monitoringSymbolsWithinSlot->buf[0]; - ((uint8_t*)&ss->monitoring_symbols_in_slot)[0] = searchSpace_i->monitoringSymbolsWithinSlot->buf[1]; - - AssertFatal(searchSpace_i->nrofCandidates!=NULL,"searchSpace_%d->nrofCandidates is null\n",(int)searchSpace_i->searchSpaceId); - if (searchSpace_i->nrofCandidates->aggregationLevel1 == NR_SearchSpace__nrofCandidates__aggregationLevel1_n8) - ss->number_of_candidates[0] = 8; - else ss->number_of_candidates[0] = searchSpace_i->nrofCandidates->aggregationLevel1; - if (searchSpace_i->nrofCandidates->aggregationLevel2 == NR_SearchSpace__nrofCandidates__aggregationLevel2_n8) - ss->number_of_candidates[1] = 8; - else ss->number_of_candidates[1] = searchSpace_i->nrofCandidates->aggregationLevel2; - if (searchSpace_i->nrofCandidates->aggregationLevel4 == NR_SearchSpace__nrofCandidates__aggregationLevel4_n8) - ss->number_of_candidates[2] = 8; - else ss->number_of_candidates[2] = searchSpace_i->nrofCandidates->aggregationLevel4; - if (searchSpace_i->nrofCandidates->aggregationLevel8 == NR_SearchSpace__nrofCandidates__aggregationLevel8_n8) - ss->number_of_candidates[3] = 8; - else ss->number_of_candidates[3] = searchSpace_i->nrofCandidates->aggregationLevel8; - if (searchSpace_i->nrofCandidates->aggregationLevel16 == NR_SearchSpace__nrofCandidates__aggregationLevel16_n8) - ss->number_of_candidates[4] = 8; - else ss->number_of_candidates[4] = searchSpace_i->nrofCandidates->aggregationLevel16; - - AssertFatal(searchSpace_i->searchSpaceType->present==NR_SearchSpace__searchSpaceType_PR_common, - "searchspace %d is not common\n",(int)searchSpace_i->searchSpaceId); - AssertFatal(searchSpace_i->searchSpaceType->choice.common!=NULL, - "searchspace %d common is null\n",(int)searchSpace_i->searchSpaceId); - ss->search_space_type = NFAPI_NR_SEARCH_SPACE_TYPE_COMMON; - if (searchSpace_i->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0) - ss->css_formats_0_0_and_1_0 = 1; - if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_0) { - ss->css_format_2_0 = 1; - // add aggregation info - } - if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_1) - ss->css_format_2_1 = 1; - if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_2) - ss->css_format_2_2 = 1; - if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_3) - ss->css_format_2_3 = 1; - } - - struct NR_PDCCH_Config__searchSpacesToAddModList *dedicatedSearchSpaceList = bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList; - AssertFatal(dedicatedSearchSpaceList->list.count>0, - "Dedicated Search Space list has 0 elements\n"); - // Dedicated searchspace list - for (int i=0;ilist.count;i++) { - NR_SearchSpace_t *searchSpace_i=dedicatedSearchSpaceList->list.array[i]; - ss=search_space + searchSpace_i->searchSpaceId; - ss->search_space_id = searchSpace_i->searchSpaceId; - if (searchSpace_i->controlResourceSetId) ss->coreset_id = *searchSpace_i->controlResourceSetId; - switch(searchSpace_i->monitoringSlotPeriodicityAndOffset->present) { - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL1; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL2; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl2; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl4: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL4; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl4; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl5: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL5; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl5; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl8: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL8; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl8; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl10: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL10; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl10; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl16: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL16; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl16; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl20: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL20; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl20; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl40: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL40; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl40; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl80: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL80; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl80; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl160: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL160; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl160; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl320: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL320; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl320; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl640: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL640; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl640; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1280: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL1280; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl1280; - break; - case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2560: - ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL2560; - ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl2560; - break; - default: - AssertFatal(1==0,"Shouldn't get here\n"); - break; - } - if (searchSpace_i->duration) ss->duration = *searchSpace_i->duration; - else ss->duration = 1; - - - AssertFatal(searchSpace_i->monitoringSymbolsWithinSlot->size == 2, - "ss_i->monitoringSymbolsWithinSlot = %d != 2\n", - (int)searchSpace_i->monitoringSymbolsWithinSlot->size); - ((uint8_t*)&ss->monitoring_symbols_in_slot)[1] = searchSpace_i->monitoringSymbolsWithinSlot->buf[0]; - ((uint8_t*)&ss->monitoring_symbols_in_slot)[0] = searchSpace_i->monitoringSymbolsWithinSlot->buf[1]; - - AssertFatal(searchSpace_i->nrofCandidates!=NULL,"searchSpace_%d->nrofCandidates is null\n",(int)searchSpace_i->searchSpaceId); - if (searchSpace_i->nrofCandidates->aggregationLevel1 == NR_SearchSpace__nrofCandidates__aggregationLevel1_n8) - ss->number_of_candidates[0] = 8; - else ss->number_of_candidates[0] = searchSpace_i->nrofCandidates->aggregationLevel1; - if (searchSpace_i->nrofCandidates->aggregationLevel2 == NR_SearchSpace__nrofCandidates__aggregationLevel2_n8) - ss->number_of_candidates[1] = 8; - else ss->number_of_candidates[1] = searchSpace_i->nrofCandidates->aggregationLevel2; - if (searchSpace_i->nrofCandidates->aggregationLevel4 == NR_SearchSpace__nrofCandidates__aggregationLevel4_n8) - ss->number_of_candidates[2] = 8; - else ss->number_of_candidates[2] = searchSpace_i->nrofCandidates->aggregationLevel4; - if (searchSpace_i->nrofCandidates->aggregationLevel8 == NR_SearchSpace__nrofCandidates__aggregationLevel8_n8) - ss->number_of_candidates[3] = 8; - else ss->number_of_candidates[3] = searchSpace_i->nrofCandidates->aggregationLevel8; - if (searchSpace_i->nrofCandidates->aggregationLevel16 == NR_SearchSpace__nrofCandidates__aggregationLevel16_n8) - ss->number_of_candidates[4] = 8; - else ss->number_of_candidates[4] = searchSpace_i->nrofCandidates->aggregationLevel16; - - if (searchSpace_i->searchSpaceType->present==NR_SearchSpace__searchSpaceType_PR_ue_Specific && searchSpace_i->searchSpaceType->choice.ue_Specific!=NULL) { - - ss->search_space_type = NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC; - - ss->uss_dci_formats = searchSpace_i->searchSpaceType->choice.ue_Specific-> dci_Formats; - - } else if (searchSpace_i->searchSpaceType->present==NR_SearchSpace__searchSpaceType_PR_common && searchSpace_i->searchSpaceType->choice.common!=NULL) { - ss->search_space_type = NFAPI_NR_SEARCH_SPACE_TYPE_COMMON; - - if (searchSpace_i->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0) - ss->css_formats_0_0_and_1_0 = 1; - if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_0) { - ss->css_format_2_0 = 1; - // add aggregation info - } - if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_1) - ss->css_format_2_1 = 1; - if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_2) - ss->css_format_2_2 = 1; - if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_3) - ss->css_format_2_3 = 1; - } - } -} -*/