phy: fix PUSCH demodulator

Author: xavierarteaga

lib/phy/upper/upper_phy_factories.cpp

@@ -422,9 +422,14 @@ static std::shared_ptr<uplink_processor_factory> create_ul_processor_factory(con
                         (config.log_level == srslog::basic_levels::debug);
 
   pusch_processor_factory_sw_configuration pusch_config;
-  pusch_config.estimator_factory   = create_dmrs_pusch_estimator_factory_sw(prg_factory, ch_estimator_factory);
-  pusch_config.demodulator_factory = create_pusch_demodulator_factory_sw(
-      equalizer_factory, precoding_factory, demodulation_factory, prg_factory, enable_evm, enable_eq_sinr);
+  pusch_config.estimator_factory          = create_dmrs_pusch_estimator_factory_sw(prg_factory, ch_estimator_factory);
+  pusch_config.demodulator_factory        = create_pusch_demodulator_factory_sw(equalizer_factory,
+                                                                         precoding_factory,
+                                                                         demodulation_factory,
+                                                                         prg_factory,
+                                                                         config.ul_bw_rb,
+                                                                         enable_evm,
+                                                                         enable_eq_sinr);
   pusch_config.demux_factory              = create_ulsch_demultiplex_factory_sw();
   pusch_config.uci_dec_factory            = uci_dec_factory;
   pusch_config.dec_nof_iterations         = config.ldpc_decoder_iterations;

tests/benchmarks/phy/upper/channel_processors/pusch/pusch_processor_benchmark.cpp

@@ -544,7 +544,7 @@ static pusch_processor_factory& get_pusch_processor_factory()
 
   // Create PUSCH demodulator factory.
   std::shared_ptr<pusch_demodulator_factory> pusch_demod_factory = create_pusch_demodulator_factory_sw(
-      eq_factory, precoding_factory, chan_modulation_factory, prg_factory, MAX_RB, enable_evm);
+      eq_factory, precoding_factory, chan_modulation_factory, prg_factory, MAX_RB, enable_evm, false);
   TESTASSERT(pusch_demod_factory);
 
   // Create PUSCH demultiplexer factory.

tests/unittests/phy/upper/channel_processors/pusch/pusch_processor_validator_test.cpp

@@ -223,7 +223,7 @@ class PuschProcessorFixture : public ::testing::TestWithParam<test_case_t>
 
     // Create PUSCH demodulator factory.
     std::shared_ptr<pusch_demodulator_factory> pusch_demod_factory = create_pusch_demodulator_factory_sw(
-        eq_factory, precoding_factory, chan_modulation_factory, prg_factory, MAX_RB);
+        eq_factory, precoding_factory, chan_modulation_factory, prg_factory, MAX_RB, false, false);
     ASSERT_NE(pusch_demod_factory, nullptr);
 
     // Create PUSCH demultiplexer factory.