<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14238">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rest_octets: Remove SI2ter + SI2bis encoders that don't do anything<br><br>The library should either provide functions that implement encoding<br>of those rest octets, or it shouldn't.  Providing a function that<br>doesn't do anything but pad the buffer is useless.<br><br>Change-Id: Ie10684de6a6b2663e2a871fcdb2b275b6ad7a1e7<br>---<br>M include/osmocom/gsm/gsm48_rest_octets.h<br>M src/gsm/gsm48_rest_octets.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 0 insertions(+), 35 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/14238/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>index 7163672..d3bb878 100644</span><br><span>--- a/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>+++ b/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>@@ -18,8 +18,6 @@</span><br><span>                                             size_t uarfcn_length, uint16_t *scramble_list,</span><br><span>                                       struct osmo_earfcn_si2q *si2quater_neigh_list,</span><br><span>                                       size_t *e_offset);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data);</span><br><span> </span><br><span> struct osmo_gsm48_si_pch_nch_info {</span><br><span>    bool present;</span><br><span>diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c</span><br><span>index c1e4b30..84136c6 100644</span><br><span>--- a/src/gsm/gsm48_rest_octets.c</span><br><span>+++ b/src/gsm/gsm48_rest_octets.c</span><br><span>@@ -536,37 +536,6 @@</span><br><span>                bitvec_set_bit(bv, L);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Generate SI2ter Rest Octests 3GPP TS 44.018 Table 10.5.2.33a.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-     struct bitvec bv;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       memset(&bv, 0, sizeof(bv));</span><br><span style="color: hsl(0, 100%, 40%);">- bv.data = data;</span><br><span style="color: hsl(0, 100%, 40%);">- bv.data_len = 4;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        /* No SI2ter_MP_CHANGE_MARK */</span><br><span style="color: hsl(0, 100%, 40%);">-  bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   return bv.data_len;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Generate SI2bis Rest Octests 3GPP TS 44.018 Table 10.5.2.33.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct bitvec bv;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       memset(&bv, 0, sizeof(bv));</span><br><span style="color: hsl(0, 100%, 40%);">- bv.data = data;</span><br><span style="color: hsl(0, 100%, 40%);">- bv.data_len = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   return bv.data_len;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */</span><br><span> int osmo_gsm48_rest_octets_si3_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3)</span><br><span> {</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 84d71e6..d49401d 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -303,8 +303,6 @@</span><br><span> gsm48_cc_msg_name;</span><br><span> osmo_gsm48_rest_octets_si1_encode;</span><br><span> osmo_gsm48_rest_octets_si2quater_encode;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si2ter_encode;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si2bis_encode;</span><br><span> osmo_gsm48_rest_octets_si6_encode;</span><br><span> osmo_gsm48_rest_octets_si3_encode;</span><br><span> osmo_gsm48_rest_octets_si4_encode;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14238">change 14238</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/14238"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie10684de6a6b2663e2a871fcdb2b275b6ad7a1e7 </div>
<div style="display:none"> Gerrit-Change-Number: 14238 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>