<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/14801">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix spelling errors detected by lintian<br><br>Change-Id: I381618eb55cc513cfa9c2e384c27cead0935c8bf<br>---<br>M src/bts.cpp<br>M src/decoding.cpp<br>M src/encoding.cpp<br>M src/gsm_rlcmac.cpp<br>M src/gsm_rlcmac.h<br>M src/pcu_l1_if.cpp<br>M src/pdch.cpp<br>M src/tbf.cpp<br>M src/tbf.h<br>9 files changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index 8799c3d..395fc73 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -611,7 +611,7 @@</span><br><span> * we roll back the rounded frame number by one RFN_MODULUS */</span><br><span> if (abs(rfn - m_cur_rfn) > RFN_THRESHOLD) {</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "Race condition between rfn (%u) and m_cur_fn (%u) detected: rfn belongs to the previos modulus %u cycle, wrappng...\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Race condition between rfn (%u) and m_cur_fn (%u) detected: rfn belongs to the previous modulus %u cycle, wrapping...\n",</span><br><span> rfn, m_cur_fn, RFN_MODULUS);</span><br><span> if (fn_rounded < RFN_MODULUS) {</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG,</span><br><span>diff --git a/src/decoding.cpp b/src/decoding.cpp</span><br><span>index d439e30..99a17dc 100644</span><br><span>--- a/src/decoding.cpp</span><br><span>+++ b/src/decoding.cpp</span><br><span>@@ -77,7 +77,7 @@</span><br><span> /* TS 44.060, table 10.4.14a.1, row 3 & 5 */</span><br><span> /* only filling bytes left */</span><br><span> LOGP(DRLCMACUL, LOGL_DEBUG, "UL DATA LI contains "</span><br><span style="color: hsl(0, 100%, 40%);">- "only filling bytes with extention octet: LI=%d, E=%d, count=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "only filling bytes with extension octet: LI=%d, E=%d, count=%d\n",</span><br><span> li->li, li->e, num_chunks);</span><br><span> break;</span><br><span> } else if (li->li > 0) {</span><br><span>@@ -92,7 +92,7 @@</span><br><span> }</span><br><span> </span><br><span> LOGP(DRLCMACUL, LOGL_DEBUG, "UL DATA LI contains "</span><br><span style="color: hsl(0, 100%, 40%);">- "extention octet: LI=%d, E=%d, count=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "extension octet: LI=%d, E=%d, count=%d\n",</span><br><span> li->li, li->e, num_chunks);</span><br><span> num_chunks += 1;</span><br><span> </span><br><span>@@ -168,7 +168,7 @@</span><br><span> chunks[num_chunks].is_complete = li->li || is_last_block;</span><br><span> </span><br><span> LOGP(DRLCMACUL, LOGL_DEBUG, "UL DATA LI contains "</span><br><span style="color: hsl(0, 100%, 40%);">- "extention octet: LI=%d, M=%d, E=%d, count=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "extension octet: LI=%d, M=%d, E=%d, count=%d\n",</span><br><span> li->li, li->m, li->e, num_chunks);</span><br><span> num_chunks += 1;</span><br><span> </span><br><span>diff --git a/src/encoding.cpp b/src/encoding.cpp</span><br><span>index ca9e906..3fac75e 100644</span><br><span>--- a/src/encoding.cpp</span><br><span>+++ b/src/encoding.cpp</span><br><span>@@ -532,7 +532,7 @@</span><br><span> </span><br><span> if (rc < 0) {</span><br><span> LOGP(DRLCMAC, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Failed to create IMMEDIATE ASSIGMENT (%s) for %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to create IMMEDIATE ASSIGNMENT (%s) for %s\n",</span><br><span> downlink ? "downlink" : "uplink",</span><br><span> tbf ? tbf->name() : "single block allocation");</span><br><span> return rc;</span><br><span>diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp</span><br><span>index 6323b09..ef7abcd 100644</span><br><span>--- a/src/gsm_rlcmac.cpp</span><br><span>+++ b/src/gsm_rlcmac.cpp</span><br><span>@@ -1363,8 +1363,8 @@</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(PCCF_AdditionsR5_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_NEXT_EXIST (PCCF_AdditionsR5_t, Exist_G_RNTI_extention, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (PCCF_AdditionsR5_t, G_RNTI_extention, 4),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_NEXT_EXIST (PCCF_AdditionsR5_t, Exist_G_RNTI_extension, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PCCF_AdditionsR5_t, G_RNTI_extension, 4),</span><br><span> M_NEXT_EXIST_OR_NULL(PCCF_AdditionsR5_t, Exist_AdditionsR8, 1),</span><br><span> M_TYPE (PCCF_AdditionsR5_t, AdditionsR8, PCCF_AdditionsR8_t),</span><br><span> CSN_DESCR_END (PCCF_AdditionsR5_t)</span><br><span>diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h</span><br><span>index 2ad1937..a4750e8 100644</span><br><span>--- a/src/gsm_rlcmac.h</span><br><span>+++ b/src/gsm_rlcmac.h</span><br><span>@@ -1602,8 +1602,8 @@</span><br><span> </span><br><span> typedef struct</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- guint8 Exist_G_RNTI_extention;</span><br><span style="color: hsl(0, 100%, 40%);">- guint8 G_RNTI_extention;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 Exist_G_RNTI_extension;</span><br><span style="color: hsl(120, 100%, 40%);">+ guint8 G_RNTI_extension;</span><br><span> guint8 Exist_AdditionsR8;</span><br><span> PCCF_AdditionsR8_t AdditionsR8;</span><br><span> } PCCF_AdditionsR5_t;</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index bc712fd..da85df4 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -650,7 +650,7 @@</span><br><span> rc = pcu_rx_susp_req(&pcu_prim->u.susp_req);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_ERROR, "Received unknwon PCU msg type %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_ERROR, "Received unknown PCU msg type %d\n",</span><br><span> msg_type);</span><br><span> rc = -EINVAL;</span><br><span> }</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 8003105..7488b96 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -632,7 +632,7 @@</span><br><span> int8_t tfi = request->ID.u.Global_TFI.u.DOWNLINK_TFI;</span><br><span> dl_tbf = bts()->dl_tbf_by_tfi(tfi, trx_no(), ts_no);</span><br><span> if (!dl_tbf) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_NOTICE, "PACKET RESSOURCE REQ unknown downlink TFI=%d\n", tfi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_NOTICE, "PACKET RESOURCE REQ unknown downlink TFI=%d\n", tfi);</span><br><span> return;</span><br><span> }</span><br><span> LOGPTBFDL(dl_tbf, LOGL_ERROR,</span><br><span>@@ -645,7 +645,7 @@</span><br><span> int8_t tfi = request->ID.u.Global_TFI.u.UPLINK_TFI;</span><br><span> ul_tbf = bts()->ul_tbf_by_tfi(tfi, trx_no(), ts_no);</span><br><span> if (!ul_tbf) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_NOTICE, "PACKET RESSOURCE REQ unknown uplink TFI=%d\n", tfi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_NOTICE, "PACKET RESOURCE REQ unknown uplink TFI=%d\n", tfi);</span><br><span> return;</span><br><span> }</span><br><span> LOGPTBFUL(ul_tbf, LOGL_ERROR,</span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index a099322..9856c7f 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -1208,7 +1208,7 @@</span><br><span> </span><br><span> if (direction == GPRS_RLCMAC_DL_TBF && !is_control_ts(ts)) {</span><br><span> LOGPTBF(this, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "Cannot poll for downlink assigment, because MS cannot reply. (TS=%d, first common TS=%d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Cannot poll for downlink assignment, because MS cannot reply. (TS=%d, first common TS=%d)\n",</span><br><span> ts, first_common_ts);</span><br><span> poll_ass_dl = 0;</span><br><span> }</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 0a58862..34e8101 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -43,7 +43,7 @@</span><br><span> */</span><br><span> </span><br><span> #define T_ASS_AGCH_USEC 200000 /* waiting after IMM.ASS confirm */</span><br><span style="color: hsl(0, 100%, 40%);">-#define T_ASS_PACCH_SEC 2 /* timeout for pacch assigment */</span><br><span style="color: hsl(120, 100%, 40%);">+#define T_ASS_PACCH_SEC 2 /* timeout for pacch assignment */</span><br><span> #define T_REJ_PACCH_USEC 2000 /* timeout for tbf reject for PRR*/</span><br><span> </span><br><span> enum gprs_rlcmac_tbf_state {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/14801">change 14801</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/+/14801"/><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: I381618eb55cc513cfa9c2e384c27cead0935c8bf </div>
<div style="display:none"> Gerrit-Change-Number: 14801 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>