aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-09-26 14:41:18 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-09-26 14:43:22 +0200
commitbddf1ad7f6229ae5a8091274fc50036e9236418c (patch)
treef89048a844315374f8e5e9dfce0bd3aaf108ab84
parent9d1cdb1f697057033394590a9b2815efe6c08cd9 (diff)
Move tbf_{dl,ul} child constructors to respective .cpp files
Fixes: 9d1cdb1f697057033394590a9b2815efe6c08cd9 Change-Id: Id258589d46de42ad4e27889bc396f930b7f94b79
-rw-r--r--src/tbf.cpp24
-rw-r--r--src/tbf_dl.cpp13
-rw-r--r--src/tbf_ul.cpp11
3 files changed, 24 insertions, 24 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 3ca39bff..389b1864 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -955,17 +955,6 @@ static int setup_tbf(struct gprs_rlcmac_tbf *tbf, GprsMs *ms, int8_t use_trx, ui
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 @@ gprs_rlcmac_dl_tbf::BandWidth::BandWidth() :
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 e9190f6e..fdd9ba30 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -76,6 +76,19 @@ static void llc_timer_cb(void *_tbf)
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 a993cce5..9e3773c3 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -55,6 +55,17 @@ extern "C" {
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.