Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32948 )

Change subject: ms : rename var ......................................................................

ms : rename var

Change-Id: Ia90a9f73fdb1f96fa5bd7f27b3c191ce0ba6c65d --- M Transceiver52M/ms/ms.cpp M Transceiver52M/ms/ms.h 2 files changed, 17 insertions(+), 8 deletions(-)

Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index ff0ce59..ca3339b 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -279,13 +279,13 @@ if (stop_lower_threads_flag) return; auto fn = get_rx_burst_handler_fn(rx_bh()); - rx_task = std::thread(fn); - set_name_aff_sched(rx_task.native_handle(), sched_params::thread_names::RXRUN); + lower_rx_task = std::thread(fn); + set_name_aff_sched(lower_rx_task.native_handle(), sched_params::thread_names::RXRUN);

usleep(1000); auto fn2 = get_tx_burst_handler_fn(tx_bh()); - tx_task = std::thread(fn2); - set_name_aff_sched(tx_task.native_handle(), sched_params::thread_names::TXRUN); + lower_tx_task = std::thread(fn2); + set_name_aff_sched(lower_tx_task.native_handle(), sched_params::thread_names::TXRUN);

actually_enable_streams(); } @@ -301,9 +301,9 @@ stop_lower_threads_flag = true; close_device(); std::cerr << "dev closed..." << std::endl; - rx_task.join(); + lower_rx_task.join(); std::cerr << "L rx dead..." << std::endl; - tx_task.join(); + lower_tx_task.join(); std::cerr << "L tx dead..." << std::endl; }

diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index d92f4b7..3b97d1b 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -245,8 +245,8 @@ int timing_advance; bool do_auto_gain;

- std::thread rx_task; - std::thread tx_task; + std::thread lower_rx_task; + std::thread lower_tx_task; std::thread *calcrval_task;

// provides bursts to upper rx thread