phy: moved PUSCH factories to pusch subdir

phy: review PUSCH processor related

Author: xavierarteaga

include/srsran/phy/upper/channel_processors/channel_processor_factories.h

@@ -27,21 +27,15 @@
 #include "srsran/phy/upper/channel_processors/pucch_demodulator.h"
 #include "srsran/phy/upper/channel_processors/pucch_detector.h"
 #include "srsran/phy/upper/channel_processors/pucch_processor.h"
-#include "srsran/phy/upper/channel_processors/pusch/pusch_decoder.h"
-#include "srsran/phy/upper/channel_processors/pusch/pusch_demodulator.h"
-#include "srsran/phy/upper/channel_processors/pusch/pusch_processor.h"
-#include "srsran/phy/upper/channel_processors/pusch/ulsch_demultiplex.h"
 #include "srsran/phy/upper/channel_processors/ssb_processor.h"
-#include "srsran/phy/upper/channel_processors/uci_decoder.h"
+#include "srsran/phy/upper/channel_processors/uci/factories.h"
 #include "srsran/phy/upper/equalization/equalization_factories.h"
 #include "srsran/phy/upper/signal_processors/signal_processor_factories.h"
 #include <memory>
 
 namespace srsran {
 
 class prach_generator_factory;
-class ulsch_demultiplex_factory;
-class uci_decoder_factory;
 class task_executor;
 
 class pbch_encoder_factory
@@ -233,65 +227,6 @@ create_pucch_processor_factory_sw(std::shared_ptr<dmrs_pucch_estimator_factory>
                                   std::shared_ptr<uci_decoder_factory>                 decoder_factory,
                                   const channel_estimate::channel_estimate_dimensions& channel_estimate_dimensions);
 
-class pusch_decoder_factory
-{
-public:
-  virtual ~pusch_decoder_factory()                = default;
-  virtual std::unique_ptr<pusch_decoder> create() = 0;
-};
-
-struct pusch_decoder_factory_sw_configuration {
-  std::shared_ptr<crc_calculator_factory>      crc_factory;
-  std::shared_ptr<ldpc_decoder_factory>        decoder_factory;
-  std::shared_ptr<ldpc_rate_dematcher_factory> dematcher_factory;
-  std::shared_ptr<ldpc_segmenter_rx_factory>   segmenter_factory;
-  unsigned                                     nof_pusch_decoder_threads = 1;
-  task_executor*                               executor                  = nullptr;
-};
-
-std::shared_ptr<pusch_decoder_factory> create_pusch_decoder_factory_sw(pusch_decoder_factory_sw_configuration config);
-
-class pusch_demodulator_factory
-{
-public:
-  virtual ~pusch_demodulator_factory()                = default;
-  virtual std::unique_ptr<pusch_demodulator> create() = 0;
-};
-
-std::shared_ptr<pusch_demodulator_factory>
-create_pusch_demodulator_factory_sw(std::shared_ptr<channel_equalizer_factory>       equalizer_factory,
-                                    std::shared_ptr<channel_modulation_factory>      demodulation_factory,
-                                    std::shared_ptr<pseudo_random_generator_factory> prg_factory,
-                                    bool                                             enable_evm          = false,
-                                    bool                                             enable_post_eq_sinr = false);
-
-class pusch_processor_factory
-{
-public:
-  virtual ~pusch_processor_factory()                              = default;
-  virtual std::unique_ptr<pusch_processor>     create()           = 0;
-  virtual std::unique_ptr<pusch_pdu_validator> create_validator() = 0;
-  virtual std::unique_ptr<pusch_processor>     create(srslog::basic_logger& logger);
-};
-
-struct pusch_processor_factory_sw_configuration {
-  std::shared_ptr<dmrs_pusch_estimator_factory> estimator_factory;
-  std::shared_ptr<pusch_demodulator_factory>    demodulator_factory;
-  std::shared_ptr<ulsch_demultiplex_factory>    demux_factory;
-  std::shared_ptr<pusch_decoder_factory>        decoder_factory;
-  std::shared_ptr<uci_decoder_factory>          uci_dec_factory;
-  channel_estimate::channel_estimate_dimensions ch_estimate_dimensions;
-  unsigned                                      dec_nof_iterations    = 10;
-  bool                                          dec_enable_early_stop = true;
-  channel_state_information::sinr_type csi_sinr_calc_method = channel_state_information::sinr_type::channel_estimator;
-};
-
-std::shared_ptr<pusch_processor_factory>
-create_pusch_processor_factory_sw(pusch_processor_factory_sw_configuration& config);
-
-std::shared_ptr<pusch_processor_factory> create_pusch_processor_pool(std::shared_ptr<pusch_processor_factory> factory,
-                                                                     unsigned max_nof_processors);
-
 class ssb_processor_factory
 {
 public:
@@ -311,25 +246,4 @@ struct ssb_processor_factory_sw_configuration {
 
 std::shared_ptr<ssb_processor_factory> create_ssb_processor_factory_sw(ssb_processor_factory_sw_configuration& config);
 
-class uci_decoder_factory
-{
-public:
-  virtual ~uci_decoder_factory()                = default;
-  virtual std::unique_ptr<uci_decoder> create() = 0;
-};
-
-std::shared_ptr<uci_decoder_factory>
-create_uci_decoder_factory_sw(std::shared_ptr<short_block_detector_factory> decoder_factory,
-                              std::shared_ptr<polar_factory>                polar_factory,
-                              std::shared_ptr<crc_calculator_factory>       crc_calc_factory);
-
-class ulsch_demultiplex_factory
-{
-public:
-  virtual ~ulsch_demultiplex_factory()                = default;
-  virtual std::unique_ptr<ulsch_demultiplex> create() = 0;
-};
-
-std::shared_ptr<ulsch_demultiplex_factory> create_ulsch_demultiplex_factory_sw();
-
 } // namespace srsran