mirror of https://github.com/PentHertz/srsLTE.git
merge next
This commit is contained in:
parent
86adbfceae
commit
421d5f3852
|
@ -37,7 +37,8 @@ class txrx final : public srslte::thread
|
|||
{
|
||||
public:
|
||||
txrx();
|
||||
bool init(srslte::radio_interface_phy* radio_handler,
|
||||
bool init(stack_interface_phy_lte* stack_,
|
||||
srslte::radio_interface_phy* radio_handler,
|
||||
srslte::thread_pool* _workers_pool,
|
||||
phy_common* worker_com,
|
||||
prach_worker_pool* prach_,
|
||||
|
@ -48,6 +49,7 @@ public:
|
|||
private:
|
||||
void run_thread() override;
|
||||
|
||||
stack_interface_phy_lte* stack = nullptr;
|
||||
srslte::radio_interface_phy* radio_h = nullptr;
|
||||
srslte::log* log_h = nullptr;
|
||||
srslte::thread_pool* workers_pool = nullptr;
|
||||
|
|
|
@ -130,7 +130,7 @@ int phy::init(const phy_args_t& args,
|
|||
prach.set_max_prach_offset_us(args.max_prach_offset_us);
|
||||
|
||||
// Warning this must be initialized after all workers have been added to the pool
|
||||
tx_rx.init(radio, &workers_pool, &workers_common, &prach, log_vec.at(0).get(), SF_RECV_THREAD_PRIO);
|
||||
tx_rx.init(stack_, radio, &workers_pool, &workers_common, &prach, log_vec.at(0).get(), SF_RECV_THREAD_PRIO);
|
||||
|
||||
initialized = true;
|
||||
|
||||
|
|
|
@ -139,9 +139,6 @@ void phy_common::worker_end(void* tx_sem_id,
|
|||
// Always transmit on single radio
|
||||
radio->tx(buffer, tx_time);
|
||||
|
||||
// Trigger MAC clock
|
||||
stack->tti_clock();
|
||||
|
||||
// Allow next TTI to transmit
|
||||
semaphore.release();
|
||||
}
|
||||
|
|
|
@ -50,13 +50,15 @@ txrx::txrx() : thread("TXRX")
|
|||
/* Do nothing */
|
||||
}
|
||||
|
||||
bool txrx::init(srslte::radio_interface_phy* radio_h_,
|
||||
bool txrx::init(stack_interface_phy_lte* stack_,
|
||||
srslte::radio_interface_phy* radio_h_,
|
||||
srslte::thread_pool* workers_pool_,
|
||||
phy_common* worker_com_,
|
||||
prach_worker_pool* prach_,
|
||||
srslte::log* log_h_,
|
||||
uint32_t prio_)
|
||||
{
|
||||
stack = stack_;
|
||||
radio_h = radio_h_;
|
||||
log_h = log_h_;
|
||||
workers_pool = workers_pool_;
|
||||
|
@ -161,6 +163,10 @@ void txrx::run_thread()
|
|||
for (uint32_t cc = 0; cc < worker_com->get_nof_carriers(); cc++) {
|
||||
prach->new_tti(cc, tti, buffer.get(worker_com->get_rf_port(cc), 0, worker_com->get_nof_ports(0)));
|
||||
}
|
||||
|
||||
// Advance stack in time
|
||||
stack->tti_clock();
|
||||
|
||||
} else {
|
||||
// wait_worker() only returns NULL if it's being closed. Quit now to avoid unnecessary loops here
|
||||
running = false;
|
||||
|
|
Loading…
Reference in New Issue