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

Isolate DMRS config type in ULSCH

Browse Source
This commit is contained in:
Robert Schmidt
2020-12-02 18:08:51 +01:00
parent c821dd0c94
commit 0d2435460c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+10 -10
View File
@@ -588,6 +588,15 @@ void nr_schedule_ulsch(module_id_t module_id,
else else
transform_precoding = *pusch_Config->transformPrecoder; transform_precoding = *pusch_Config->transformPrecoder;
const int target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific; const int target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
/* DMRS calculations */
const int mapping_type = tdaList->list.array[tda]->mappingType;
const NR_DMRS_UplinkConfig_t *NR_DMRS_UplinkConfig =
mapping_type == NR_PUSCH_TimeDomainResourceAllocation__mappingType_typeA
? pusch_Config->dmrs_UplinkForPUSCH_MappingTypeA->choice.setup
: pusch_Config->dmrs_UplinkForPUSCH_MappingTypeB->choice.setup;
const uint8_t dmrs_config_type = NR_DMRS_UplinkConfig->dmrs_Type == NULL ? 0 : 1;
uint8_t mcs_table = 0; uint8_t mcs_table = 0;
if (transform_precoding) if (transform_precoding)
mcs_table = get_pusch_mcs_table(pusch_Config->mcs_Table, mcs_table = get_pusch_mcs_table(pusch_Config->mcs_Table,
@@ -671,16 +680,7 @@ void nr_schedule_ulsch(module_id_t module_id,
// -------------------- // --------------------
// ------- DMRS ------- // ------- DMRS -------
// -------------------- // --------------------
const int mapping_type = tdaList->list.array[tda]->mappingType; pusch_pdu->dmrs_config_type = dmrs_config_type;
NR_DMRS_UplinkConfig_t *NR_DMRS_UplinkConfig;
if (mapping_type == NR_PUSCH_TimeDomainResourceAllocation__mappingType_typeA)
NR_DMRS_UplinkConfig = pusch_Config->dmrs_UplinkForPUSCH_MappingTypeA->choice.setup;
else
NR_DMRS_UplinkConfig = pusch_Config->dmrs_UplinkForPUSCH_MappingTypeB->choice.setup;
if (NR_DMRS_UplinkConfig->dmrs_Type == NULL)
pusch_pdu->dmrs_config_type = 0;
else
pusch_pdu->dmrs_config_type = 1;
pusch_pdu->scid = 0; // DMRS sequence initialization [TS38.211, sec 6.4.1.1.1] pusch_pdu->scid = 0; // DMRS sequence initialization [TS38.211, sec 6.4.1.1.1]
if (pusch_pdu->transform_precoding) { // transform precoding disabled if (pusch_pdu->transform_precoding) { // transform precoding disabled
long *scramblingid; long *scramblingid;