<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14235">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rest_octets: Suffix encoder functiosn with _encode<br><br>... otherwise it's not really clear what they do.<br><br>Change-Id: I08e0ca9a8d13c7aa40b9d90f34f0e13adb87d4e0<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, 32 insertions(+), 28 deletions(-)<br><br></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 6280b6a..3029ac5 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>@@ -12,13 +12,15 @@</span><br><span> #define SI2Q_MIN_LEN 18</span><br><span> </span><br><span> /* generate SI1 rest octets */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si2quater(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count, const uint16_t *uarfcn_list,</span><br><span style="color: hsl(0, 100%, 40%);">- size_t *u_offset, size_t uarfcn_length, uint16_t *scramble_list,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_earfcn_si2q *si2quater_neigh_list, size_t *e_offset);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si2ter(uint8_t *data);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si2bis(uint8_t *data);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si6(uint8_t *data, bool is1800_net);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si1_encode(uint8_t *data, uint8_t *nch_pos, int is1800_net);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si2quater_encode(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint16_t *uarfcn_list, size_t *u_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t uarfcn_length, uint16_t *scramble_list,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_earfcn_si2q *si2quater_neigh_list,</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t *e_offset);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, bool is1800_net);</span><br><span> </span><br><span> struct osmo_gsm48_si_selection_params {</span><br><span> uint16_t penalty_time:5,</span><br><span>@@ -67,10 +69,10 @@</span><br><span> };</span><br><span> </span><br><span> /* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si3(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si3_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3);</span><br><span> </span><br><span> /* Generate SI4 Rest Octets (Chapter 10.5.2.35) */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si4(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si4_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len);</span><br><span> </span><br><span> struct osmo_gsm48_si13_info {</span><br><span> struct osmo_gprs_cell_options cell_opts;</span><br><span>@@ -84,4 +86,4 @@</span><br><span> };</span><br><span> </span><br><span> /* Generate SI13 Rest Octests (Chapter 10.5.2.37b) */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si13(uint8_t *data, const struct osmo_gsm48_si13_info *si13);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si13_encode(uint8_t *data, const struct osmo_gsm48_si13_info *si13);</span><br><span>diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c</span><br><span>index 0171fd9..b9d5275 100644</span><br><span>--- a/src/gsm/gsm48_rest_octets.c</span><br><span>+++ b/src/gsm/gsm48_rest_octets.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span> #include <osmocom/gsm/gsm48_rest_octets.h></span><br><span> </span><br><span> /* generate SI1 rest octets */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si1_encode(uint8_t *data, uint8_t *nch_pos, int is1800_net)</span><br><span> {</span><br><span> struct bitvec bv;</span><br><span> </span><br><span>@@ -430,9 +430,11 @@</span><br><span> }</span><br><span> </span><br><span> /* generate SI2quater rest octets: 3GPP TS 44.018 ยง 10.5.2.33b */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si2quater(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count, const uint16_t *uarfcn_list,</span><br><span style="color: hsl(0, 100%, 40%);">- size_t *u_offset, size_t uarfcn_length, uint16_t *scramble_list,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_earfcn_si2q *si2quater_neigh_list, size_t *e_offset)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si2quater_encode(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint16_t *uarfcn_list, size_t *u_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t uarfcn_length, uint16_t *scramble_list,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_earfcn_si2q *si2quater_neigh_list,</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t *e_offset)</span><br><span> {</span><br><span> int rc;</span><br><span> struct bitvec bv;</span><br><span>@@ -535,7 +537,7 @@</span><br><span> }</span><br><span> </span><br><span> /* 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(uint8_t *data)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data)</span><br><span> {</span><br><span> struct bitvec bv;</span><br><span> </span><br><span>@@ -552,7 +554,7 @@</span><br><span> }</span><br><span> </span><br><span> /* 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(uint8_t *data)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data)</span><br><span> {</span><br><span> struct bitvec bv;</span><br><span> </span><br><span>@@ -566,7 +568,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si3(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si3_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3)</span><br><span> {</span><br><span> struct bitvec bv;</span><br><span> </span><br><span>@@ -626,7 +628,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Generate SI4 Rest Octets (Chapter 10.5.2.35) */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si4(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si4_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len)</span><br><span> {</span><br><span> struct bitvec bv;</span><br><span> </span><br><span>@@ -685,7 +687,7 @@</span><br><span> { L | H < GPRS_MS_TXPWR_MAX_CCH : bit (5) > }</span><br><span> <implicit spare >;</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si6(uint8_t *data, bool is1800_net)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, bool is1800_net)</span><br><span> {</span><br><span> struct bitvec bv;</span><br><span> </span><br><span>@@ -908,7 +910,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Generate SI13 Rest Octests (04.08 Chapter 10.5.2.37b) */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si13(uint8_t *data, const struct osmo_gsm48_si13_info *si13)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si13_encode(uint8_t *data, const struct osmo_gsm48_si13_info *si13)</span><br><span> {</span><br><span> struct bitvec bv;</span><br><span> </span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 319969a..56fed0f 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -301,14 +301,14 @@</span><br><span> gsm48_push_l3hdr;</span><br><span> gsm48_att_tlvdef;</span><br><span> gsm48_cc_msg_name;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si1;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si2quater;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si2ter;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si2bis;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si6;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si3;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si4;</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gsm48_rest_octets_si13;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si1_encode;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si2quater_encode;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si2ter_encode;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si2bis_encode;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si6_encode;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si3_encode;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si4_encode;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si13_encode;</span><br><span> gsm48_rr_msg_name;</span><br><span> gsm48_cc_state_name;</span><br><span> gsm48_construct_ra;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14235">change 14235</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/14235"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I08e0ca9a8d13c7aa40b9d90f34f0e13adb87d4e0 </div>
<div style="display:none"> Gerrit-Change-Number: 14235 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>