From 28438ab5c49b737219b0e3477cd44323e2a6d1f1 Mon Sep 17 00:00:00 2001 From: rmagueta Date: Mon, 4 Sep 2023 18:37:01 +0100 Subject: [PATCH] Add ptrs_bit_map input in add_noise() function --- openair1/SIMULATION/NR_PHY/dlsim.c | 2 +- openair1/SIMULATION/NR_PHY/ulsim.c | 2 +- openair1/SIMULATION/TOOLS/multipath_channel.c | 3 ++- openair1/SIMULATION/TOOLS/sim.h | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c index efa7632a63..c436fc5a27 100644 --- a/openair1/SIMULATION/NR_PHY/dlsim.c +++ b/openair1/SIMULATION/NR_PHY/dlsim.c @@ -1120,7 +1120,7 @@ int main(int argc, char **argv) } else { multipath_tv_channel(gNB2UE, s_re, s_im, r_re, r_im, slot_length, 0); } - add_noise(UE->common_vars.rxdata, (const double **) r_re, (const double **) r_im, sigma2, slot_length, slot_offset, ts, delay, pdu_bit_map, frame_parms->nb_antennas_rx); + add_noise(UE->common_vars.rxdata, (const double **) r_re, (const double **) r_im, sigma2, slot_length, slot_offset, ts, delay, pdu_bit_map, 0x1, frame_parms->nb_antennas_rx); nr_ue_dcireq(&dcireq); //to be replaced with function pointer later nr_ue_scheduled_response(&scheduled_response); diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c index a14845bf4d..bd30fa1267 100644 --- a/openair1/SIMULATION/NR_PHY/ulsim.c +++ b/openair1/SIMULATION/NR_PHY/ulsim.c @@ -1227,7 +1227,7 @@ int main(int argc, char **argv) } multipath_channel(UE2gNB, s_re, s_im, r_re, r_im, slot_length, 0, (n_trials == 1) ? 1 : 0); - add_noise(rxdata, (const double **) r_re, (const double **) r_im, sigma, slot_length, slot_offset, ts, delay, pdu_bit_map, frame_parms->nb_antennas_rx); + add_noise(rxdata, (const double **) r_re, (const double **) r_im, sigma, slot_length, slot_offset, ts, delay, pdu_bit_map, PUSCH_PDU_BITMAP_PUSCH_PTRS, frame_parms->nb_antennas_rx); } /*End input_fd */ diff --git a/openair1/SIMULATION/TOOLS/multipath_channel.c b/openair1/SIMULATION/TOOLS/multipath_channel.c index 22cd5ce01c..3f92dbbf04 100644 --- a/openair1/SIMULATION/TOOLS/multipath_channel.c +++ b/openair1/SIMULATION/TOOLS/multipath_channel.c @@ -156,6 +156,7 @@ void add_noise(c16_t **rxdata, const double ts, const int delay, const uint16_t pdu_bit_map, + const uint16_t ptrs_bit_map, const uint8_t nb_antennas_rx) { for (int i = 0; i < length; i++) { @@ -164,7 +165,7 @@ void add_noise(c16_t **rxdata, rxd->r = r_re[ap][i] + sqrt(sigma / 2) * gaussZiggurat(0.0, 1.0); // convert to fixed point rxd->i = r_im[ap][i] + sqrt(sigma / 2) * gaussZiggurat(0.0, 1.0); /* Add phase noise if enabled */ - if (pdu_bit_map & PUSCH_PDU_BITMAP_PUSCH_PTRS) { + if (pdu_bit_map & ptrs_bit_map) { phase_noise(ts, &rxdata[ap][slot_offset + i + delay].r, &rxdata[ap][slot_offset + i + delay].i); } } diff --git a/openair1/SIMULATION/TOOLS/sim.h b/openair1/SIMULATION/TOOLS/sim.h index 47cb7fe066..7f6da31b7b 100644 --- a/openair1/SIMULATION/TOOLS/sim.h +++ b/openair1/SIMULATION/TOOLS/sim.h @@ -389,6 +389,7 @@ void add_noise(c16_t **rxdata, const double ts, const int delay, const uint16_t pdu_bit_map, + const uint16_t ptrs_bit_map, const uint8_t nb_antennas_rx); /**\fn void multipath_channel(channel_desc_t *desc,