<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25090">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA<br><br>Same information is available under ul_tbf->m_rx_counter.<br><br>Change-Id: I1d993117c7daa2609b132c2d0fd748e0338ef559<br>---<br>M src/tbf.cpp<br>M src/tbf.h<br>M src/tbf_ul.cpp<br>3 files changed, 15 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 0154bab..67e05bb 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -997,14 +997,18 @@</span><br><span>            OSMO_STRBUF_PRINTF(sb, "Assignment was on CCCH|");</span><br><span>         if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))</span><br><span>                 OSMO_STRBUF_PRINTF(sb, "Assignment was on PACCH|");</span><br><span style="color: hsl(0, 100%, 40%);">-   if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_UL_DATA))</span><br><span style="color: hsl(0, 100%, 40%);">-          OSMO_STRBUF_PRINTF(sb, "Uplink data was received|");</span><br><span style="color: hsl(0, 100%, 40%);">-  else if (tbf->direction == GPRS_RLCMAC_UL_TBF)</span><br><span style="color: hsl(0, 100%, 40%);">-               OSMO_STRBUF_PRINTF(sb, "No uplink data received yet|");</span><br><span style="color: hsl(0, 100%, 40%);">-       if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))</span><br><span style="color: hsl(0, 100%, 40%);">-           OSMO_STRBUF_PRINTF(sb, "Downlink ACK was received|");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (tbf->direction == GPRS_RLCMAC_DL_TBF)</span><br><span style="color: hsl(0, 100%, 40%);">-               OSMO_STRBUF_PRINTF(sb, "No downlink ACK received yet|");</span><br><span style="color: hsl(120, 100%, 40%);">+    if (tbf->direction == GPRS_RLCMAC_UL_TBF) {</span><br><span style="color: hsl(120, 100%, 40%);">+                const struct gprs_rlcmac_ul_tbf *ul_tbf = static_cast<const gprs_rlcmac_ul_tbf *>(tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+         if (ul_tbf->m_rx_counter)</span><br><span style="color: hsl(120, 100%, 40%);">+                  OSMO_STRBUF_PRINTF(sb, "Uplink data was received|");</span><br><span style="color: hsl(120, 100%, 40%);">+                else</span><br><span style="color: hsl(120, 100%, 40%);">+                  OSMO_STRBUF_PRINTF(sb, "No uplink data received yet|");</span><br><span style="color: hsl(120, 100%, 40%);">+     } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))</span><br><span style="color: hsl(120, 100%, 40%);">+                 OSMO_STRBUF_PRINTF(sb, "Downlink ACK was received|");</span><br><span style="color: hsl(120, 100%, 40%);">+               else</span><br><span style="color: hsl(120, 100%, 40%);">+                  OSMO_STRBUF_PRINTF(sb, "No downlink ACK received yet|");</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> </span><br><span>        return buf;</span><br><span> }</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index b8f1e18..96a5788 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -127,10 +127,9 @@</span><br><span> </span><br><span> #define GPRS_RLCMAC_FLAG_CCCH           0 /* assignment on CCCH */</span><br><span> #define GPRS_RLCMAC_FLAG_PACCH            1 /* assignment on PACCH */</span><br><span style="color: hsl(0, 100%, 40%);">-#define GPRS_RLCMAC_FLAG_UL_DATA     2 /* uplink data received */</span><br><span style="color: hsl(0, 100%, 40%);">-#define GPRS_RLCMAC_FLAG_DL_ACK             3 /* downlink acknowledge received  */</span><br><span style="color: hsl(0, 100%, 40%);">-#define GPRS_RLCMAC_FLAG_TO_UL_ACK        4</span><br><span style="color: hsl(0, 100%, 40%);">-#define GPRS_RLCMAC_FLAG_TO_DL_ACK     5</span><br><span style="color: hsl(120, 100%, 40%);">+#define GPRS_RLCMAC_FLAG_DL_ACK              2 /* downlink acknowledge received  */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GPRS_RLCMAC_FLAG_TO_UL_ACK      3</span><br><span style="color: hsl(120, 100%, 40%);">+#define GPRS_RLCMAC_FLAG_TO_DL_ACK   4</span><br><span> #define GPRS_RLCMAC_FLAG_TO_MASK   0xf0 /* timeout bits */</span><br><span> </span><br><span> #define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__)</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index 31bb273..c84f373 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -404,8 +404,6 @@</span><br><span> </span><br><span>       const uint16_t ws = m_window.ws();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  this->state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_UL_DATA);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     LOGPTBFUL(this, LOGL_DEBUG, "UL DATA TFI=%d received (V(Q)=%d .. "</span><br><span>                 "V(R)=%d)\n", rlc->tfi, this->m_window.v_q(),</span><br><span>                this->m_window.v_r());</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25090">change 25090</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/25090"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1d993117c7daa2609b132c2d0fd748e0338ef559 </div>
<div style="display:none"> Gerrit-Change-Number: 25090 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>