tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA
Same information is available under ul_tbf->m_rx_counter. Change-Id: I1d993117c7daa2609b132c2d0fd748e0338ef559
This commit is contained in:
parent
5bc6560efc
commit
c65c9e56e1
20
src/tbf.cpp
20
src/tbf.cpp
|
@ -997,14 +997,18 @@ const char* tbf_rlcmac_diag(const struct gprs_rlcmac_tbf *tbf)
|
||||||
OSMO_STRBUF_PRINTF(sb, "Assignment was on CCCH|");
|
OSMO_STRBUF_PRINTF(sb, "Assignment was on CCCH|");
|
||||||
if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))
|
if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))
|
||||||
OSMO_STRBUF_PRINTF(sb, "Assignment was on PACCH|");
|
OSMO_STRBUF_PRINTF(sb, "Assignment was on PACCH|");
|
||||||
if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_UL_DATA))
|
if (tbf->direction == GPRS_RLCMAC_UL_TBF) {
|
||||||
OSMO_STRBUF_PRINTF(sb, "Uplink data was received|");
|
const struct gprs_rlcmac_ul_tbf *ul_tbf = static_cast<const gprs_rlcmac_ul_tbf *>(tbf);
|
||||||
else if (tbf->direction == GPRS_RLCMAC_UL_TBF)
|
if (ul_tbf->m_rx_counter)
|
||||||
OSMO_STRBUF_PRINTF(sb, "No uplink data received yet|");
|
OSMO_STRBUF_PRINTF(sb, "Uplink data was received|");
|
||||||
if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))
|
else
|
||||||
OSMO_STRBUF_PRINTF(sb, "Downlink ACK was received|");
|
OSMO_STRBUF_PRINTF(sb, "No uplink data received yet|");
|
||||||
else if (tbf->direction == GPRS_RLCMAC_DL_TBF)
|
} else {
|
||||||
OSMO_STRBUF_PRINTF(sb, "No downlink ACK received yet|");
|
if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))
|
||||||
|
OSMO_STRBUF_PRINTF(sb, "Downlink ACK was received|");
|
||||||
|
else
|
||||||
|
OSMO_STRBUF_PRINTF(sb, "No downlink ACK received yet|");
|
||||||
|
}
|
||||||
|
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,10 +127,9 @@ enum tbf_counters { /* TBF counters from 3GPP TS 44.060 §13.4 */
|
||||||
|
|
||||||
#define GPRS_RLCMAC_FLAG_CCCH 0 /* assignment on CCCH */
|
#define GPRS_RLCMAC_FLAG_CCCH 0 /* assignment on CCCH */
|
||||||
#define GPRS_RLCMAC_FLAG_PACCH 1 /* assignment on PACCH */
|
#define GPRS_RLCMAC_FLAG_PACCH 1 /* assignment on PACCH */
|
||||||
#define GPRS_RLCMAC_FLAG_UL_DATA 2 /* uplink data received */
|
#define GPRS_RLCMAC_FLAG_DL_ACK 2 /* downlink acknowledge received */
|
||||||
#define GPRS_RLCMAC_FLAG_DL_ACK 3 /* downlink acknowledge received */
|
#define GPRS_RLCMAC_FLAG_TO_UL_ACK 3
|
||||||
#define GPRS_RLCMAC_FLAG_TO_UL_ACK 4
|
#define GPRS_RLCMAC_FLAG_TO_DL_ACK 4
|
||||||
#define GPRS_RLCMAC_FLAG_TO_DL_ACK 5
|
|
||||||
#define GPRS_RLCMAC_FLAG_TO_MASK 0xf0 /* timeout bits */
|
#define GPRS_RLCMAC_FLAG_TO_MASK 0xf0 /* timeout bits */
|
||||||
|
|
||||||
#define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__)
|
#define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__)
|
||||||
|
|
|
@ -404,8 +404,6 @@ int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged(
|
||||||
|
|
||||||
const uint16_t ws = m_window.ws();
|
const uint16_t ws = m_window.ws();
|
||||||
|
|
||||||
this->state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_UL_DATA);
|
|
||||||
|
|
||||||
LOGPTBFUL(this, LOGL_DEBUG, "UL DATA TFI=%d received (V(Q)=%d .. "
|
LOGPTBFUL(this, LOGL_DEBUG, "UL DATA TFI=%d received (V(Q)=%d .. "
|
||||||
"V(R)=%d)\n", rlc->tfi, this->m_window.v_q(),
|
"V(R)=%d)\n", rlc->tfi, this->m_window.v_q(),
|
||||||
this->m_window.v_r());
|
this->m_window.v_r());
|
||||||
|
|
Loading…
Reference in New Issue