Change in ...osmo-pcu[master]: Move tbf_{dl, ul} child constructors to respective .cpp files

[pespin]

pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15605 )

Change subject: Move tbf_{dl,ul} child constructors to respective .cpp files
......................................................................

Move tbf_{dl,ul} child constructors to respective .cpp files

Fixes: 9d1cdb1f697057033394590a9b2815efe6c08cd9
Change-Id: Id258589d46de42ad4e27889bc396f930b7f94b79
---
M src/tbf.cpp
M src/tbf_dl.cpp
M src/tbf_ul.cpp
3 files changed, 24 insertions(+), 24 deletions(-)

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



diff --git a/src/tbf.cpp b/src/tbf.cpp
index 3ca39bf..389b186 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -955,17 +955,6 @@
 	return 0;
 }
 
-gprs_rlcmac_ul_tbf::gprs_rlcmac_ul_tbf(BTS *bts_) :
-	gprs_rlcmac_tbf(bts_, GPRS_RLCMAC_UL_TBF),
-	m_rx_counter(0),
-	m_contention_resolution_done(0),
-	m_final_ack_sent(0),
-	m_ul_gprs_ctrs(NULL),
-	m_ul_egprs_ctrs(NULL)
-{
-	memset(&m_usf, 0, sizeof(m_usf));
-}
-
 static int ul_tbf_dtor(struct gprs_rlcmac_ul_tbf *tbf)
 {
 	tbf->~gprs_rlcmac_ul_tbf();
@@ -1054,19 +1043,6 @@
 	timespecclear(&dl_loss_tv);
 }
 
-gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(BTS *bts_) :
-	gprs_rlcmac_tbf(bts_, GPRS_RLCMAC_DL_TBF),
-	m_tx_counter(0),
-	m_wait_confirm(0),
-	m_dl_ack_requested(false),
-	m_last_dl_poll_fn(0),
-	m_last_dl_drained_fn(0),
-	m_dl_gprs_ctrs(NULL),
-	m_dl_egprs_ctrs(NULL)
-{
-	memset(&m_llc_timer, 0, sizeof(m_llc_timer));
-}
-
 static int dl_tbf_dtor(struct gprs_rlcmac_dl_tbf *tbf)
 {
 	tbf->~gprs_rlcmac_dl_tbf();
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index e9190f6..fdd9ba3 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -76,6 +76,19 @@
 	tbf->request_dl_ack();
 }
 
+gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(BTS *bts_) :
+	gprs_rlcmac_tbf(bts_, GPRS_RLCMAC_DL_TBF),
+	m_tx_counter(0),
+	m_wait_confirm(0),
+	m_dl_ack_requested(false),
+	m_last_dl_poll_fn(0),
+	m_last_dl_drained_fn(0),
+	m_dl_gprs_ctrs(NULL),
+	m_dl_egprs_ctrs(NULL)
+{
+	memset(&m_llc_timer, 0, sizeof(m_llc_timer));
+}
+
 void gprs_rlcmac_dl_tbf::cleanup()
 {
 	osmo_timer_del(&m_llc_timer);
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp
index a993cce..9e3773c 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -55,6 +55,17 @@
 
 extern void *tall_pcu_ctx;
 
+gprs_rlcmac_ul_tbf::gprs_rlcmac_ul_tbf(BTS *bts_) :
+	gprs_rlcmac_tbf(bts_, GPRS_RLCMAC_UL_TBF),
+	m_rx_counter(0),
+	m_contention_resolution_done(0),
+	m_final_ack_sent(0),
+	m_ul_gprs_ctrs(NULL),
+	m_ul_egprs_ctrs(NULL)
+{
+	memset(&m_usf, 0, sizeof(m_usf));
+}
+
 /*
  * Store received block data in LLC message(s) and forward to SGSN
  * if complete.

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15605
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Id258589d46de42ad4e27889bc396f930b7f94b79
Gerrit-Change-Number: 15605
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190927/9f667274/attachment.htm>