diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2014-08-08 11:43:53 +0200 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2014-08-08 14:15:24 +0200 |
| commit | eb100244b05ea2b732cefb50fd392f1eb7edfcd4 (patch) | |
| tree | d28720cf677ad229734c02cc39f00ed0a0fea4dc /src/bts.cpp | |
| parent | 418a4230e0539583803deb189c30cc68c341da4e (diff) | |
tbf, bts: Use tbf set_state method instead of tbf_new_state function
All the function did was add debug output and call the set_state method.
Move the debugging into the method and remove the function.
Ticket: SYS#389
Sponsored by: On-Waves ehf
Diffstat (limited to 'src/bts.cpp')
| -rw-r--r-- | src/bts.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bts.cpp b/src/bts.cpp index 73344a38..86659621 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -467,7 +467,7 @@ int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) return -EBUSY; } tbf->ta = qta >> 2; - tbf_new_state(tbf, GPRS_RLCMAC_FLOW); + tbf->set_state(GPRS_RLCMAC_FLOW); tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_CCCH); tbf_timer_start(tbf, 3169, m_bts.t3169, 0); LOGP(DRLCMAC, LOGL_DEBUG, "%s [UPLINK] START\n", @@ -515,7 +515,7 @@ void BTS::trigger_dl_ass( dl_tbf->ta = old_tbf->ta; dl_tbf->was_releasing = dl_tbf->state_is(GPRS_RLCMAC_WAIT_RELEASE); /* change state */ - tbf_new_state(dl_tbf, GPRS_RLCMAC_ASSIGN); + dl_tbf->set_state(GPRS_RLCMAC_ASSIGN); dl_tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_PACCH); /* start timer */ tbf_timer_start(dl_tbf, 0, Tassign_pacch); @@ -527,7 +527,7 @@ void BTS::trigger_dl_ass( } dl_tbf->was_releasing = dl_tbf->state_is(GPRS_RLCMAC_WAIT_RELEASE); /* change state */ - tbf_new_state(dl_tbf, GPRS_RLCMAC_ASSIGN); + dl_tbf->set_state(GPRS_RLCMAC_ASSIGN); dl_tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_CCCH); dl_tbf->assign_imsi(imsi); /* send immediate assignment */ @@ -774,7 +774,7 @@ void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, "TBF is gone TLLI=0x%08x\n", tlli); return; } - tbf_new_state(tbf, GPRS_RLCMAC_FLOW); + tbf->set_state(GPRS_RLCMAC_FLOW); /* stop pending assignment timer */ tbf->stop_timer(); if ((tbf->state_flags & @@ -800,7 +800,7 @@ void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, "TBF is gone TLLI=0x%08x\n", tlli); return; } - tbf_new_state(tbf, GPRS_RLCMAC_FLOW); + tbf->set_state(GPRS_RLCMAC_FLOW); if ((tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS))) { tbf->state_flags &= |