diff options
| author | herlesupreeth <herlesupreeth@gmail.com> | 2023-06-12 18:01:06 +0200 |
|---|---|---|
| committer | Supreeth Herle <herlesupreeth@gmail.com> | 2023-06-13 11:28:50 +0200 |
| commit | 79e1230a651841b95bc1b62889a69a382d0daa2d (patch) | |
| tree | a3ebd032d505ff2a143f1e201aaee51786273395 | |
| parent | 179f7d8d6933e9d1f92f92d49302bcce8242bb91 (diff) | |
rrc_nr: fix applying of dedicated PUSCH and PDSCH DMRS configuration
| -rw-r--r-- | srsue/src/stack/rrc_nr/rrc_nr.cc | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/srsue/src/stack/rrc_nr/rrc_nr.cc b/srsue/src/stack/rrc_nr/rrc_nr.cc index 8f7ab358b..e977b5377 100644 --- a/srsue/src/stack/rrc_nr/rrc_nr.cc +++ b/srsue/src/stack/rrc_nr/rrc_nr.cc @@ -1231,15 +1231,9 @@ bool rrc_nr::apply_sp_cell_init_dl_pdsch(const asn1::rrc_nr::pdsch_cfg_s& pdsch_ if (pdsch_cfg.dmrs_dl_for_pdsch_map_type_a_present) { if (pdsch_cfg.dmrs_dl_for_pdsch_map_type_a.type() == setup_release_c<dmrs_dl_cfg_s>::types_opts::setup) { - srsran_dmrs_sch_add_pos_t srsran_dmrs_sch_add_pos; - if (make_phy_dmrs_dl_additional_pos(pdsch_cfg.dmrs_dl_for_pdsch_map_type_a.setup(), &srsran_dmrs_sch_add_pos) == - true) { - phy_cfg.pdsch.dmrs_typeA.additional_pos = srsran_dmrs_sch_add_pos; - phy_cfg.pdsch.dmrs_typeA.present = true; - } else { - logger.warning("Warning while build srsran_dmrs_sch_add_pos structure"); - return false; - } + // See TS 38.331, DMRS-DownlinkConfig. Also, see TS 38.214, 5.1.6.2 - DM-RS reception procedure. + phy_cfg.pdsch.dmrs_typeA.additional_pos = srsran_dmrs_sch_add_pos_2; + phy_cfg.pdsch.dmrs_typeA.present = true; } else { logger.warning("Option dmrs_dl_for_pdsch_map_type_a not of type setup"); return false; @@ -1692,15 +1686,9 @@ bool rrc_nr::apply_sp_cell_ded_ul_pusch(const asn1::rrc_nr::pusch_cfg_s& pusch_c if (pusch_cfg.dmrs_ul_for_pusch_map_type_a_present) { if (pusch_cfg.dmrs_ul_for_pusch_map_type_a.type() == setup_release_c<dmrs_ul_cfg_s>::types_opts::setup) { - srsran_dmrs_sch_add_pos_t srsran_dmrs_sch_add_pos; - if (make_phy_dmrs_ul_additional_pos(pusch_cfg.dmrs_ul_for_pusch_map_type_a.setup(), &srsran_dmrs_sch_add_pos) == - true) { - phy_cfg.pusch.dmrs_typeA.additional_pos = srsran_dmrs_sch_add_pos; - phy_cfg.pusch.dmrs_typeA.present = true; - } else { - logger.warning("Warning while build srsran_dmrs_sch_add_pos structure"); - return false; - } + // // See TS 38.331, DMRS-UplinkConfig. Also, see TS 38.214, 6.2.2 - UE DM-RS transmission procedure. + phy_cfg.pusch.dmrs_typeA.additional_pos = srsran_dmrs_sch_add_pos_2; + phy_cfg.pusch.dmrs_typeA.present = true; } else { logger.warning("Option dmrs_ul_for_pusch_map_type_a not of type setup"); return false; |