<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15717">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
osmith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">encoding: fix space, tabs<br><br>Change-Id: I80ac88f50bfedfd2b86d548883313b5a187b1e8f<br>---<br>M src/encoding.cpp<br>1 file changed, 30 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/encoding.cpp b/src/encoding.cpp</span><br><span>index 8270354..b46f568 100644</span><br><span>--- a/src/encoding.cpp</span><br><span>+++ b/src/encoding.cpp</span><br><span>@@ -96,21 +96,21 @@</span><br><span> */</span><br><span> static int write_tfi_usf(bitvec *dest, const gprs_rlcmac_ul_tbf *tbf, uint8_t usf)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc = bitvec_set_u64(dest, tbf->tfi(), 5, false); /* TFI_ASSIGNMENT */</span><br><span style="color: hsl(0, 100%, 40%);">- CHECK(rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = bitvec_set_u64(dest, tbf->tfi(), 5, false); /* TFI_ASSIGNMENT */</span><br><span style="color: hsl(120, 100%, 40%);">+ CHECK(rc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- SET_0(dest); /* POLLING -- no action is required from MS */</span><br><span style="color: hsl(120, 100%, 40%);">+ SET_0(dest); /* POLLING -- no action is required from MS */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- SET_0(dest);</span><br><span style="color: hsl(120, 100%, 40%);">+ SET_0(dest);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = bitvec_set_u64(dest, usf, 3, false); /* USF */</span><br><span style="color: hsl(0, 100%, 40%);">- CHECK(rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bitvec_set_u64(dest, usf, 3, false); /* USF */</span><br><span style="color: hsl(120, 100%, 40%);">+ CHECK(rc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- SET_0(dest); /* USF_GRANULARITY -- the mobile station shall transmit one RLC/MAC block */</span><br><span style="color: hsl(120, 100%, 40%);">+ SET_0(dest); /* USF_GRANULARITY -- the mobile station shall transmit one RLC/MAC block */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- SET_0(dest); /* No P0 nor PR_MODE */</span><br><span style="color: hsl(120, 100%, 40%);">+ SET_0(dest); /* No P0 nor PR_MODE */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* { 0 | 1 < TIMING_ADVANCE_INDEX : bit (4) > } */</span><br><span>@@ -201,11 +201,11 @@</span><br><span> rc = write_alpha_gamma(dest, alpha, gamma);</span><br><span> CHECK(rc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = bitvec_set_bit(dest, (bit_value)polling); /* POLLING */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bitvec_set_bit(dest, (bit_value) polling); /* POLLING */</span><br><span> CHECK(rc);</span><br><span> </span><br><span> /* N. B: NOT related to TAI! */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = bitvec_set_bit(dest, (bit_value)ta_valid); /* TA_VALID */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bitvec_set_bit(dest, (bit_value) ta_valid); /* TA_VALID */</span><br><span> CHECK(rc);</span><br><span> </span><br><span> rc = write_ta_index(dest, ta_idx);</span><br><span>@@ -215,7 +215,7 @@</span><br><span> SET_1(dest);</span><br><span> rc = write_tbf_start_time(dest, fn);</span><br><span> CHECK(rc);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span> SET_0(dest);</span><br><span> </span><br><span> SET_0(dest); /* No P0 nor PR_MODE */</span><br><span>@@ -225,7 +225,7 @@</span><br><span> rc = bitvec_set_u64(dest, enc_ws(tbf->window_size()), 5, false); /* EGPRS Window Size */</span><br><span> CHECK(rc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* The mobile station shall not report measurements: (see 3GPP TS 44.060 Table 11.2.7.1) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The mobile station shall not report measurements: (see 3GPP TS 44.060 Table 11.2.7.1) */</span><br><span> SET_0(dest); SET_0(dest); /* LINK_QUALITY_MEASUREMENT_MODE */</span><br><span> SET_1(dest); /* No BEP_PERIOD2 */</span><br><span> } else</span><br><span>@@ -867,16 +867,16 @@</span><br><span> /* static size of 16 bits</span><br><span> ..1. .... = ACKNACK: (Union)</span><br><span> 0 0000 000 Length</span><br><span style="color: hsl(0, 100%, 40%);">- Desc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ...0 .... = FINAL_ACK_INDICATION: False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- .... 1... = BEGINNING_OF_WINDOW: 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- .... .1.. = END_OF_WINDOW: 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- .... ..10 0101 0001 1... .... = STARTING_SEQUENCE_NUMBER: 1187</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ Desc</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ ...0 .... = FINAL_ACK_INDICATION: False</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ .... 1... = BEGINNING_OF_WINDOW: 1</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ .... .1.. = END_OF_WINDOW: 1</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ .... ..10 0101 0001 1... .... = STARTING_SEQUENCE_NUMBER: 1187</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> .0.. .... = CRBB Exist: 0</span><br><span> minimal size is 24 rest_bits */</span><br><span> rest_bits -= 24;</span><br><span>@@ -1051,15 +1051,15 @@</span><br><span> {</span><br><span> unsigned wp = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp,0x1,2); // Payload Type</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp,0x0,3); // No polling</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp,0x0,3); // Uplink state flag</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp,0x22,6); // MESSAGE TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x1, 2); // Payload Type</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x0, 3); // No polling</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x0, 3); // Uplink state flag</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x22, 6); // MESSAGE TYPE</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp,0x0,2); // Page Mode</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x0, 2); // Page Mode</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp,0x0,1); // No PERSISTENCE_LEVEL</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp,0x0,1); // No NLN</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x0, 1); // No PERSISTENCE_LEVEL</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x0, 1); // No NLN</span><br><span> </span><br><span> return wp;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15717">change 15717</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/+/15717"/><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: I80ac88f50bfedfd2b86d548883313b5a187b1e8f </div>
<div style="display:none"> Gerrit-Change-Number: 15717 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </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>