From 088c7df571e3044b286200cc112e7e24b2751491 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 23 Jan 2018 20:16:23 +0100 Subject: TBF: make UL ack state internal * add functions/macros for setting TBF's UL ack state * add functions for checking TBF's UL ack state N. B: this should not be confused with TBF-UL state. Change-Id: I144483447d4b0b93e775da0e926ee45eb8ab39f3 Related: OS#1539 --- src/tbf_ul.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/tbf_ul.cpp') diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index ba048e54..c1a3388c 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -106,8 +106,8 @@ bool gprs_rlcmac_ul_tbf::ctrl_ack_to_toggle() bool gprs_rlcmac_ul_tbf::handle_ctrl_ack() { /* check if this control ack belongs to packet uplink ack */ - if (ul_ack_state == GPRS_RLCMAC_UL_ACK_WAIT_ACK) { - ul_ack_state = GPRS_RLCMAC_UL_ACK_NONE; + if (ul_ack_state_is(GPRS_RLCMAC_UL_ACK_WAIT_ACK)) { + TBF_SET_ACK_STATE(this, GPRS_RLCMAC_UL_ACK_NONE); return true; } @@ -124,7 +124,7 @@ struct msgb *gprs_rlcmac_ul_tbf::create_ul_ack(uint32_t fn, uint8_t ts) if (final) { if (poll_state == GPRS_RLCMAC_POLL_SCHED && - ul_ack_state == GPRS_RLCMAC_UL_ACK_WAIT_ACK) { + ul_ack_state_is(GPRS_RLCMAC_UL_ACK_WAIT_ACK)) { LOGPTBFUL(this, LOGL_DEBUG, "Polling is already scheduled, so we must wait for the final uplink ack...\n"); return NULL; @@ -158,7 +158,7 @@ struct msgb *gprs_rlcmac_ul_tbf::create_ul_ack(uint32_t fn, uint8_t ts) /* waiting for final acknowledge */ m_final_ack_sent = 1; } else - ul_ack_state = GPRS_RLCMAC_UL_ACK_NONE; + TBF_SET_ACK_STATE(this, GPRS_RLCMAC_UL_ACK_NONE); return msg; } @@ -362,9 +362,9 @@ void gprs_rlcmac_ul_tbf::maybe_schedule_uplink_acknack( "Scheduling Ack/Nack, because %d frames received.\n", SEND_ACK_AFTER_FRAMES); } - if (ul_ack_state == GPRS_RLCMAC_UL_ACK_NONE) { + if (ul_ack_state_is(GPRS_RLCMAC_UL_ACK_NONE)) { /* trigger sending at next RTS */ - ul_ack_state = GPRS_RLCMAC_UL_ACK_SEND_ACK; + TBF_SET_ACK_STATE(this, GPRS_RLCMAC_UL_ACK_SEND_ACK); } else { /* already triggered */ LOGPTBFUL(this, LOGL_DEBUG, -- cgit v1.2.3