Hoernchen submitted this change.

View Change


Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved
ms: make init call less confusing

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

diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp
index e587c05..896928e 100644
--- a/Transceiver52M/ms/ms.cpp
+++ b/Transceiver52M/ms/ms.cpp
@@ -49,7 +49,7 @@
int ms_trx::init_dev_and_streams()
{
int status = 0;
- status = base::init_device(rx_bh(), tx_bh());
+ status = init_device(rx_bh(), tx_bh());
if (status < 0) {
std::cerr << "failed to init dev!" << std::endl;
return -1;
diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h
index 926031e..1c210b0 100644
--- a/Transceiver52M/ms/ms.h
+++ b/Transceiver52M/ms/ms.h
@@ -293,7 +293,6 @@
SCH_STATE search_for_sch(dev_buf_t *rcd);
void grab_bursts(dev_buf_t *rcd);

- int init_device();
int init_dev_and_streams();
void stop_threads();
void *rx_cb(ms_trx *t);

To view, visit change 32957. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I122b0c8cf97e5efcbc60cd95e8bd06a50d57eb57
Gerrit-Change-Number: 32957
Gerrit-PatchSet: 5
Gerrit-Owner: Hoernchen <ewild@sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged