5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into agpl_next

Browse Source
master
Codebot 2 years ago committed by asaezper
parent 921f17484e 737c5ae712
commit fa56836b14
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
lib/src/phy/ch_estimation/chest_dl.c
Unescape Escape View File

@ -928,7 +928,7 @@ static float get_rsrp_neighbour_port(srsran_chest_dl_t* q, uint32_t port)
static float get_rsrp(srsran_chest_dl_t* q) static float get_rsrp(srsran_chest_dl_t* q)
{ {
float max = -1e9; float max = -1e9;
for (int i = 0; i < q->nof_rx_antennas; ++i) { for (int i = 0; i < q->cell.nof_ports; ++i) {
float v = get_rsrp_port(q, i); float v = get_rsrp_port(q, i);
if (v > max) { if (v > max) {
max = v; max = v;

24
srsue/src/stack/rrc_nr/rrc_nr.cc
Unescape Escape View File

@ -1240,15 +1240,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_present) {
if (pdsch_cfg.dmrs_dl_for_pdsch_map_type_a.type() == setup_release_c<dmrs_dl_cfg_s>::types_opts::setup) { 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; // See TS 38.331, DMRS-DownlinkConfig. Also, see TS 38.214, 5.1.6.2 - DM-RS reception procedure.
if (make_phy_dmrs_dl_additional_pos(pdsch_cfg.dmrs_dl_for_pdsch_map_type_a.setup(), &srsran_dmrs_sch_add_pos) == phy_cfg.pdsch.dmrs_typeA.additional_pos = srsran_dmrs_sch_add_pos_2;
true) { phy_cfg.pdsch.dmrs_typeA.present = 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;
}
} else { } else {
logger.warning("Option dmrs_dl_for_pdsch_map_type_a not of type setup"); logger.warning("Option dmrs_dl_for_pdsch_map_type_a not of type setup");
return false; return false;
@ -1701,15 +1695,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_present) {
if (pusch_cfg.dmrs_ul_for_pusch_map_type_a.type() == setup_release_c<dmrs_ul_cfg_s>::types_opts::setup) { 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; // // See TS 38.331, DMRS-UplinkConfig. Also, see TS 38.214, 6.2.2 - UE DM-RS transmission procedure.
if (make_phy_dmrs_ul_additional_pos(pusch_cfg.dmrs_ul_for_pusch_map_type_a.setup(), &srsran_dmrs_sch_add_pos) == phy_cfg.pusch.dmrs_typeA.additional_pos = srsran_dmrs_sch_add_pos_2;
true) { phy_cfg.pusch.dmrs_typeA.present = 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;
}
} else { } else {
logger.warning("Option dmrs_ul_for_pusch_map_type_a not of type setup"); logger.warning("Option dmrs_ul_for_pusch_map_type_a not of type setup");
return false; return false;

Write Preview
Loading…
Cancel
Save