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

Transform precoding related changes

Browse Source
This commit is contained in:
dir
2021-02-02 13:19:42 +01:00
committed by Thomas Schlichter
parent bca9f74e66
commit 82d40a654c
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+13 -17
View File
@@ -2389,35 +2389,31 @@ uint8_t get_transformPrecoding(NR_ServingCellConfigCommon_t *scc,
int rnti_type, int rnti_type,
uint8_t configuredGrant){ uint8_t configuredGrant){
uint8_t cg_transformPrecoder = 0;
if (configuredGrant) { if (configuredGrant) {
if (ubwp->bwp_Dedicated->configuredGrantConfig){ if (ubwp->bwp_Dedicated->configuredGrantConfig) {
if (ubwp->bwp_Dedicated->configuredGrantConfig->choice.setup->transformPrecoder){ if (ubwp->bwp_Dedicated->configuredGrantConfig->choice.setup->transformPrecoder) {
return *ubwp->bwp_Dedicated->configuredGrantConfig->choice.setup->transformPrecoder; return *ubwp->bwp_Dedicated->configuredGrantConfig->choice.setup->transformPrecoder;
} else {
cg_transformPrecoder = 1;
} }
} }
} }
if (rnti_type == NR_RNTI_RA || *dci_format == NR_UL_DCI_FORMAT_0_0 || cg_transformPrecoder){ if (rnti_type != NR_RNTI_RA) {
if (*dci_format != NR_UL_DCI_FORMAT_0_0) {
if (scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->msg3_transformPrecoder == NULL) { if (pusch_config->transformPrecoder != NULL) {
return 1; return *pusch_config->transformPrecoder;
} else { }
return 0;
} }
}
} else if (*dci_format != NR_UL_DCI_FORMAT_0_0 && pusch_config->transformPrecoder != NULL) { if (scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->msg3_transformPrecoder == NULL) {
return 1; // Transformprecoding disabled
return *pusch_config->transformPrecoder; } else {
LOG_D(PHY, "MAC_COMMON: Transform Precodig enabled through msg3_transformPrecoder\n");
return 0; // Enabled
} }
LOG_E(MAC, "In %s: could not fetch transform precoder status...\n", __FUNCTION__); LOG_E(MAC, "In %s: could not fetch transform precoder status...\n", __FUNCTION__);
return -1; return -1;
} }
uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc, uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc,
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+2 -1
View File
@@ -689,7 +689,8 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
/* DMRS */ /* DMRS */
l_prime_mask = get_l_prime(pusch_config_pdu->nr_of_symbols, typeB, pusch_dmrs_pos0, pusch_len1); l_prime_mask = get_l_prime(pusch_config_pdu->nr_of_symbols, typeB, pusch_dmrs_pos0, pusch_len1);
pusch_config_pdu->num_dmrs_cdm_grps_no_data = 1; if (pusch_config_pdu->transform_precoding == transform_precoder_disabled)
pusch_config_pdu->num_dmrs_cdm_grps_no_data = 1;
// Num PRB Overhead from PUSCH-ServingCellConfig // Num PRB Overhead from PUSCH-ServingCellConfig
if (mac->scg->spCellConfig->spCellConfigDedicated->uplinkConfig->pusch_ServingCellConfig->choice.setup->xOverhead == NULL) { if (mac->scg->spCellConfig->spCellConfigDedicated->uplinkConfig->pusch_ServingCellConfig->choice.setup->xOverhead == NULL) {