[MERGED] osmo-pcu[master]: TBF-DL: mark rcvd_dl_ack() parameters as boolean

[Max]

Max has submitted this change and it was merged.

Change subject: TBF-DL: mark rcvd_dl_ack() parameters as boolean
......................................................................


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
---
M src/tbf.h
M src/tbf_dl.cpp
M tests/tbf/TbfTest.cpp
3 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/tbf.h b/src/tbf.h
index 4a304af..f57dbe3 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -450,8 +450,8 @@
 			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 84f6166..58b55dc 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -1159,7 +1159,7 @@
 	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 @@
 	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 18bbc76..2863151 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -267,7 +267,7 @@
 	/* 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 @@
 	/* 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 @@
 	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 @@
 	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 @@
 	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));

-- 
To view, visit https://gerrit.osmocom.org/5339
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc4d68f049a45d4b42c5594f50594ff0d44c1bac
Gerrit-PatchSet: 4
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>