Removed unused attribute and fix end-of-burst in NR UE SA PHY

master
Xavier Arteaga 3 years ago committed by Xavier Arteaga
parent 66f6c11561
commit 0812a90d21

@ -66,7 +66,6 @@ private:
state& phy_state; state& phy_state;
srslog::basic_logger& logger; srslog::basic_logger& logger;
srsran::rf_timestamp_t tx_time = {}; srsran::rf_timestamp_t tx_time = {};
uint32_t tti_rx = 0;
cf_t* prach_ptr = nullptr; cf_t* prach_ptr = nullptr;
float prach_power = 0; float prach_power = 0;
srsran::phy_common_interface::worker_context_t context = {}; srsran::phy_common_interface::worker_context_t context = {};

@ -97,7 +97,7 @@ private:
uint32_t tti = 0; uint32_t tti = 0;
srsran::tti_semaphore<void*> tti_semaphore; srsran::tti_semaphore<void*> tti_semaphore;
srsran::rf_timestamp_t last_rx_time; srsran::rf_timestamp_t last_rx_time;
bool is_pending_tx_end = false; std::atomic<bool> is_pending_tx_end = {false};
uint32_t cell_search_nof_trials = 0; uint32_t cell_search_nof_trials = 0;
const static uint32_t cell_search_max_trials = 100; const static uint32_t cell_search_max_trials = 100;
uint32_t sfn_sync_nof_trials = 0; uint32_t sfn_sync_nof_trials = 0;

@ -65,7 +65,6 @@ uint32_t sf_worker::get_buffer_len()
void sf_worker::set_context(const srsran::phy_common_interface::worker_context_t& w_ctx) void sf_worker::set_context(const srsran::phy_common_interface::worker_context_t& w_ctx)
{ {
tti_rx = w_ctx.sf_idx;
logger.set_context(w_ctx.sf_idx); logger.set_context(w_ctx.sf_idx);
for (auto& w : cc_workers) { for (auto& w : cc_workers) {
w->set_tti(w_ctx.sf_idx); w->set_tti(w_ctx.sf_idx);

@ -131,9 +131,6 @@ cell_search::ret_t sync_sa::cell_search_run(const cell_search::cfg_t& cfg)
return cs_ret; return cs_ret;
} }
// Zero receive buffer
srsran_vec_zero(rx_buffer, slot_sz);
logger.info("Cell Search: Running Cell search state"); logger.info("Cell Search: Running Cell search state");
cell_search_nof_trials = 0; cell_search_nof_trials = 0;
phy_state.run_cell_search(); phy_state.run_cell_search();
@ -280,6 +277,7 @@ void sync_sa::run_state_cell_camping()
rf_buffer.set(0, nr_worker->get_buffer(0, 0)); rf_buffer.set(0, nr_worker->get_buffer(0, 0));
if (not slot_synchronizer.run_camping(rf_buffer, last_rx_time)) { if (not slot_synchronizer.run_camping(rf_buffer, last_rx_time)) {
logger.error("SYNC: detected out-of-sync... skipping slot ..."); logger.error("SYNC: detected out-of-sync... skipping slot ...");
is_pending_tx_end = true;
nr_worker->release(); nr_worker->release();
return; return;
} }
@ -345,11 +343,9 @@ void sync_sa::worker_end(const srsran::phy_common_interface::worker_context_t& w
is_pending_tx_end = false; is_pending_tx_end = false;
} else { } else {
if (!radio->get_is_start_of_burst()) { if (!radio->get_is_start_of_burst()) {
// TODO srsran::rf_buffer_t zeros_multi;
/* zeros_multi.set_nof_samples(tx_buffer.get_nof_samples());
zeros_multi.set_nof_samples(buffer.get_nof_samples());
radio->tx(zeros_multi, tx_time); radio->tx(zeros_multi, tx_time);
*/
} }
} }
} else { } else {

Loading…
Cancel
Save