diff options
author | Max <msuraev@sysmocom.de> | 2017-12-15 11:14:30 +0100 |
---|---|---|
committer | Max <msuraev@sysmocom.de> | 2018-01-04 10:15:59 +0000 |
commit | 7df82d412eca327b94f6040a140d1f8d5d9c7c53 (patch) | |
tree | 9b229d8024356117c3af254fcd9b7aff96bf135d | |
parent | 869c0c2e552cc5019531229e366a022f6ede0557 (diff) |
TBF-DL: mark rcvd_dl_ack() parameters as boolean
The final(_ack) parameter of rcvd_dl_ack() only used as boolean - mark
it as such.
Change-Id: Icc4d68f049a45d4b42c5594f50594ff0d44c1bac
-rw-r--r-- | src/tbf.h | 4 | ||||
-rw-r--r-- | src/tbf_dl.cpp | 4 | ||||
-rw-r--r-- | tests/tbf/TbfTest.cpp | 12 |
3 files changed, 10 insertions, 10 deletions
@@ -450,8 +450,8 @@ struct gprs_rlcmac_dl_tbf : public gprs_rlcmac_tbf { const uint16_t pdu_delay_csec, const uint8_t *data, const uint16_t len); - int rcvd_dl_ack(uint8_t final, uint8_t ssn, uint8_t *rbb); - int rcvd_dl_ack(uint8_t final_ack, unsigned first_bsn, struct bitvec *rbb); + int rcvd_dl_ack(bool final, uint8_t ssn, uint8_t *rbb); + int rcvd_dl_ack(bool final_ack, unsigned first_bsn, struct bitvec *rbb); struct msgb *create_dl_acked_block(uint32_t fn, uint8_t ts); void trigger_ass(struct gprs_rlcmac_tbf *old_tbf); void clear_poll_timeout_flag(); diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 84f61667..58b55dcd 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -1159,7 +1159,7 @@ int gprs_rlcmac_dl_tbf::abort() return 0; } -int gprs_rlcmac_dl_tbf::rcvd_dl_ack(uint8_t final_ack, unsigned first_bsn, +int gprs_rlcmac_dl_tbf::rcvd_dl_ack(bool final_ack, unsigned first_bsn, struct bitvec *rbb) { int rc; @@ -1179,7 +1179,7 @@ int gprs_rlcmac_dl_tbf::rcvd_dl_ack(uint8_t final_ack, unsigned first_bsn, return rc; } -int gprs_rlcmac_dl_tbf::rcvd_dl_ack(uint8_t final_ack, uint8_t ssn, uint8_t *rbb) +int gprs_rlcmac_dl_tbf::rcvd_dl_ack(bool final_ack, uint8_t ssn, uint8_t *rbb) { LOGPTBFDL(this, LOGL_DEBUG, "downlink acknowledge\n"); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 18bbc76e..28631516 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -267,7 +267,7 @@ static void test_tbf_final_ack(enum test_tbf_final_ack_mode test_mode) /* Queue a final ACK */ memset(rbb, 0, sizeof(rbb)); /* Receive a final ACK */ - dl_tbf->rcvd_dl_ack(1, 1, rbb); + dl_tbf->rcvd_dl_ack(true, 1, rbb); /* Clean up and ensure tbfs are in the correct state */ OSMO_ASSERT(dl_tbf->state_is(GPRS_RLCMAC_WAIT_RELEASE)); @@ -341,14 +341,14 @@ static void test_tbf_delayed_release() /* ACK all blocks */ memset(rbb, 0xff, sizeof(rbb)); /* Receive an ACK */ - dl_tbf->rcvd_dl_ack(0, dl_tbf->m_window.v_s(), rbb); + dl_tbf->rcvd_dl_ack(false, dl_tbf->m_window.v_s(), rbb); OSMO_ASSERT(dl_tbf->m_window.window_empty()); /* Force sending of a single block containing an LLC dummy command */ request_dl_rlc_block(dl_tbf, &fn); /* Receive an ACK */ - dl_tbf->rcvd_dl_ack(0, dl_tbf->m_window.v_s(), rbb); + dl_tbf->rcvd_dl_ack(false, dl_tbf->m_window.v_s(), rbb); OSMO_ASSERT(dl_tbf->m_window.window_empty()); /* Timeout (make sure fn % 52 remains valid) */ @@ -358,7 +358,7 @@ static void test_tbf_delayed_release() OSMO_ASSERT(dl_tbf->state_is(GPRS_RLCMAC_FINISHED)); /* Receive a final ACK */ - dl_tbf->rcvd_dl_ack(1, dl_tbf->m_window.v_s(), rbb); + dl_tbf->rcvd_dl_ack(true, dl_tbf->m_window.v_s(), rbb); /* Clean up and ensure tbfs are in the correct state */ OSMO_ASSERT(dl_tbf->state_is(GPRS_RLCMAC_WAIT_RELEASE)); @@ -2695,7 +2695,7 @@ static void establish_and_use_egprs_dl_tbf(BTS *the_bts, int mcs) OSMO_ASSERT(dl_tbf->state_is(GPRS_RLCMAC_FLOW)); /* Receive a final ACK */ - dl_tbf->rcvd_dl_ack(1, dl_tbf->m_window.v_s(), rbb); + dl_tbf->rcvd_dl_ack(true, dl_tbf->m_window.v_s(), rbb); /* Clean up and ensure tbfs are in the correct state */ OSMO_ASSERT(dl_tbf->state_is(GPRS_RLCMAC_WAIT_RELEASE)); @@ -2745,7 +2745,7 @@ static void tbf_cleanup(gprs_rlcmac_dl_tbf *dl_tbf) uint8_t rbb[64/8]; /* Receive a final ACK */ - dl_tbf->rcvd_dl_ack(1, dl_tbf->m_window.v_s(), rbb); + dl_tbf->rcvd_dl_ack(true, dl_tbf->m_window.v_s(), rbb); /* Clean up and ensure tbfs are in the correct state */ OSMO_ASSERT(dl_tbf->state_is(GPRS_RLCMAC_WAIT_RELEASE)); |