PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SRSUE: Removed PUSCH-DMRS/SRS pregeneration methods

This commit is contained in:
Xavier Arteaga 2021-05-28 14:37:35 +02:00 committed by Xavier Arteaga
parent aab2211058
commit 235a664120
11 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/srsran/interfaces/ue_phy_interfaces.h
View File

@ -159,8 +159,6 @@ public:
virtual bool cell_search() = 0;
virtual bool cell_select(phy_cell_t cell) = 0;
virtual bool cell_is_camping() = 0;
virtual void enable_pregen_signals(bool enable) = 0;
};
// Combined interface for stack (MAC and RRC) to access PHY

2
lib/include/srsran/test/ue_test_interfaces.h
View File

@ -76,8 +76,6 @@ class phy_dummy_interface : public phy_interface_rrc_lte
bool cell_search() override { return true; }
bool cell_select(phy_cell_t cell) override { return true; }
bool cell_is_camping() override { return false; }
void enable_pregen_signals(bool enable) override {}
};
} // namespace srsue

2
srsue/hdr/phy/lte/cc_worker.h
View File

@ -42,7 +42,6 @@ public:
void set_tdd_config_unlocked(srsran_tdd_config_t config);
void set_config_unlocked(srsran::phy_cfg_t& phy_cfg);
void upd_config_dci_unlocked(srsran_dci_cfg_t& dci_cfg);
void enable_pregen_signals_unlocked(bool enabled);
void set_uci_periodic_cqi(srsran_uci_data_t* uci_data);
@ -93,7 +92,6 @@ private:
srsran_ul_sf_cfg_t sf_cfg_ul = {};
uint32_t cc_idx = 0;
bool pregen_enabled = false;
bool cell_initiated = false;
cf_t* signal_buffer_rx[SRSRAN_MAX_PORTS] = {};
cf_t* signal_buffer_tx[SRSRAN_MAX_PORTS] = {};

2
srsue/hdr/phy/lte/sf_worker.h
View File

@ -49,8 +49,6 @@ public:
void set_tdd_config_unlocked(srsran_tdd_config_t config);
void set_config_unlocked(uint32_t cc_idx, srsran::phy_cfg_t phy_cfg);
void set_crnti_unlocked(uint16_t rnti);
void enable_pregen_signals_unlocked(bool enabled);
///< Methods for plotting called from GUI thread
int read_ce_abs(float* ce_abs, uint32_t tx_antenna, uint32_t rx_antenna);

2
srsue/hdr/phy/phy.h
View File

@ -94,8 +94,6 @@ public:
void get_metrics(const srsran::srsran_rat_t& rat, phy_metrics_t* m) final;
void srsran_phy_logger(phy_logger_level_t log_level, char* str);
void enable_pregen_signals(bool enable) final;
void radio_overflow() final;
void radio_failure() final;

12
srsue/src/phy/lte/cc_worker.cc
View File

@ -187,11 +187,6 @@ void cc_worker::set_tdd_config_unlocked(srsran_tdd_config_t config)
sf_cfg_ul.tdd_config = config;
}
void cc_worker::enable_pregen_signals_unlocked(bool enabled)
{
pregen_enabled = enabled;
}
/************
*
* Downlink Functions
@ -872,13 +867,6 @@ void cc_worker::set_config_unlocked(srsran::phy_cfg_t& phy_cfg)
ue_ul_cfg.ul_cfg = phy_cfg.ul_cfg;
phy->set_pdsch_cfg(&ue_dl_cfg.cfg.pdsch);
// Update signals
if (pregen_enabled) {
Info("Pre-generating UL signals...");
srsran_ue_ul_pregen_signals(&ue_ul, &ue_ul_cfg);
Info("Done pre-generating signals worker...");
}
}
void cc_worker::upd_config_dci_unlocked(srsran_dci_cfg_t& dci_cfg)

7
srsue/src/phy/lte/sf_worker.cc
View File

@ -138,13 +138,6 @@ void sf_worker::set_tdd_config_unlocked(srsran_tdd_config_t config)
tdd_config = config;
}
void sf_worker::enable_pregen_signals_unlocked(bool enabled)
{
for (auto& cc_worker : cc_workers) {
cc_worker->enable_pregen_signals_unlocked(enabled);
}
}
void sf_worker::set_config_unlocked(uint32_t cc_idx, srsran::phy_cfg_t phy_cfg)
{
if (cc_idx < cc_workers.size()) {

10
srsue/src/phy/phy.cc
View File

@ -146,9 +146,6 @@ void phy::run_thread()
sfsync.init(
radio, stack, &prach_buffer, &lte_workers, &nr_workers, &common, SF_RECV_THREAD_PRIO, args.sync_cpu_affinity);
// Disable UL signal pregeneration until the attachment
enable_pregen_signals(false);
is_configured = true;
config_cond.notify_all();
}
@ -420,13 +417,6 @@ void phy::start_plot()
}
}
void phy::enable_pregen_signals(bool enable)
{
for (uint32_t i = 0; i < args.nof_phy_threads; i++) {
lte_workers[i]->enable_pregen_signals_unlocked(enable);
}
}
bool phy::set_config(const srsran::phy_cfg_t& config_, uint32_t cc_idx)
{
if (!is_initiated()) {

1
srsue/test/ttcn3/hdr/lte_ttcn3_phy.h
View File

@ -55,7 +55,6 @@ public:
void set_cell_map(const cell_list_t& cells_);
// phy_interface_rrc_lte
void enable_pregen_signals(bool enable) override;
void deactivate_scells() override;
void set_activation_deactivation_scell(uint32_t cmd, uint32_t tti) override;
bool set_config(const srsran::phy_cfg_t& config, uint32_t cc_idx = 0) override;

5
srsue/test/ttcn3/src/lte_ttcn3_phy.cc
View File

@ -61,11 +61,6 @@ void lte_ttcn3_phy::set_cell_map(const cell_list_t& cells_)
void lte_ttcn3_phy::set_config_tdd(srsran_tdd_config_t& tdd_config) {}
void lte_ttcn3_phy::enable_pregen_signals(bool enable)
{
logger.debug("%s not implemented.", __FUNCTION__);
}
void lte_ttcn3_phy::deactivate_scells()
{
logger.debug("%s not implemented.", __FUNCTION__);

1
srsue/test/upper/rrc_meas_test.cc
View File

@ -48,7 +48,6 @@ public:
last_selected_cell = cell;
return true;
}
void enable_pregen_signals(bool enable) override {}
void set_cells_to_meas(uint32_t earfcn, const std::set<uint32_t>& pci) override
{