Change in libosmocore[master]: rest_octets: Suffix encoder functiosn with _encode

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue May 28 17:53:23 UTC 2019


Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/14235


Change subject: rest_octets: Suffix encoder functiosn with _encode
......................................................................

rest_octets: Suffix encoder functiosn with _encode

... otherwise it's not really clear what they do.

Change-Id: I08e0ca9a8d13c7aa40b9d90f34f0e13adb87d4e0
---
M include/osmocom/gsm/gsm48_rest_octets.h
M src/gsm/gsm48_rest_octets.c
M src/gsm/libosmogsm.map
3 files changed, 32 insertions(+), 28 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/14235/1

diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h
index 6280b6a..3029ac5 100644
--- a/include/osmocom/gsm/gsm48_rest_octets.h
+++ b/include/osmocom/gsm/gsm48_rest_octets.h
@@ -12,13 +12,15 @@
 #define SI2Q_MIN_LEN 18
 
 /* generate SI1 rest octets */
-int osmo_gsm48_rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net);
-int osmo_gsm48_rest_octets_si2quater(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count, const uint16_t *uarfcn_list,
-				size_t *u_offset, size_t uarfcn_length, uint16_t *scramble_list,
-				struct osmo_earfcn_si2q *si2quater_neigh_list, size_t *e_offset);
-int osmo_gsm48_rest_octets_si2ter(uint8_t *data);
-int osmo_gsm48_rest_octets_si2bis(uint8_t *data);
-int osmo_gsm48_rest_octets_si6(uint8_t *data, bool is1800_net);
+int osmo_gsm48_rest_octets_si1_encode(uint8_t *data, uint8_t *nch_pos, int is1800_net);
+int osmo_gsm48_rest_octets_si2quater_encode(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count,
+					    const uint16_t *uarfcn_list, size_t *u_offset,
+					    size_t uarfcn_length, uint16_t *scramble_list,
+					    struct osmo_earfcn_si2q *si2quater_neigh_list,
+					    size_t *e_offset);
+int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data);
+int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data);
+int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, bool is1800_net);
 
 struct osmo_gsm48_si_selection_params {
 	uint16_t penalty_time:5,
@@ -67,10 +69,10 @@
 };
 
 /* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */
-int osmo_gsm48_rest_octets_si3(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3);
+int osmo_gsm48_rest_octets_si3_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3);
 
 /* Generate SI4 Rest Octets (Chapter 10.5.2.35) */
-int osmo_gsm48_rest_octets_si4(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len);
+int osmo_gsm48_rest_octets_si4_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len);
 
 struct osmo_gsm48_si13_info {
 	struct osmo_gprs_cell_options cell_opts;
@@ -84,4 +86,4 @@
 };
 
 /* Generate SI13 Rest Octests (Chapter 10.5.2.37b) */
-int osmo_gsm48_rest_octets_si13(uint8_t *data, const struct osmo_gsm48_si13_info *si13);
+int osmo_gsm48_rest_octets_si13_encode(uint8_t *data, const struct osmo_gsm48_si13_info *si13);
diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c
index 0171fd9..b9d5275 100644
--- a/src/gsm/gsm48_rest_octets.c
+++ b/src/gsm/gsm48_rest_octets.c
@@ -35,7 +35,7 @@
 #include <osmocom/gsm/gsm48_rest_octets.h>
 
 /* generate SI1 rest octets */
-int osmo_gsm48_rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net)
+int osmo_gsm48_rest_octets_si1_encode(uint8_t *data, uint8_t *nch_pos, int is1800_net)
 {
 	struct bitvec bv;
 
@@ -430,9 +430,11 @@
 }
 
 /* generate SI2quater rest octets: 3GPP TS 44.018 § 10.5.2.33b */
-int osmo_gsm48_rest_octets_si2quater(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count, const uint16_t *uarfcn_list,
-				     size_t *u_offset, size_t uarfcn_length, uint16_t *scramble_list,
-				     struct osmo_earfcn_si2q *si2quater_neigh_list, size_t *e_offset)
+int osmo_gsm48_rest_octets_si2quater_encode(uint8_t *data, uint8_t si2q_index, uint8_t si2q_count,
+					    const uint16_t *uarfcn_list, size_t *u_offset,
+					    size_t uarfcn_length, uint16_t *scramble_list,
+					    struct osmo_earfcn_si2q *si2quater_neigh_list,
+					    size_t *e_offset)
 {
 	int rc;
 	struct bitvec bv;
@@ -535,7 +537,7 @@
 }
 
 /* Generate SI2ter Rest Octests 3GPP TS 44.018 Table 10.5.2.33a.1 */
-int osmo_gsm48_rest_octets_si2ter(uint8_t *data)
+int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data)
 {
 	struct bitvec bv;
 
@@ -552,7 +554,7 @@
 }
 
 /* Generate SI2bis Rest Octests 3GPP TS 44.018 Table 10.5.2.33.1 */
-int osmo_gsm48_rest_octets_si2bis(uint8_t *data)
+int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data)
 {
 	struct bitvec bv;
 
@@ -566,7 +568,7 @@
 }
 
 /* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */
-int osmo_gsm48_rest_octets_si3(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3)
+int osmo_gsm48_rest_octets_si3_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si3)
 {
 	struct bitvec bv;
 
@@ -626,7 +628,7 @@
 }
 
 /* Generate SI4 Rest Octets (Chapter 10.5.2.35) */
-int osmo_gsm48_rest_octets_si4(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len)
+int osmo_gsm48_rest_octets_si4_encode(uint8_t *data, const struct osmo_gsm48_si_ro_info *si4, int len)
 {
 	struct bitvec bv;
 
@@ -685,7 +687,7 @@
 { L | H < GPRS_MS_TXPWR_MAX_CCH : bit (5) > }
 <implicit spare >;
 */
-int osmo_gsm48_rest_octets_si6(uint8_t *data, bool is1800_net)
+int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, bool is1800_net)
 {
 	struct bitvec bv;
 
@@ -908,7 +910,7 @@
 }
 
 /* Generate SI13 Rest Octests (04.08 Chapter 10.5.2.37b) */
-int osmo_gsm48_rest_octets_si13(uint8_t *data, const struct osmo_gsm48_si13_info *si13)
+int osmo_gsm48_rest_octets_si13_encode(uint8_t *data, const struct osmo_gsm48_si13_info *si13)
 {
 	struct bitvec bv;
 
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index 319969a..56fed0f 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -301,14 +301,14 @@
 gsm48_push_l3hdr;
 gsm48_att_tlvdef;
 gsm48_cc_msg_name;
-osmo_gsm48_rest_octets_si1;
-osmo_gsm48_rest_octets_si2quater;
-osmo_gsm48_rest_octets_si2ter;
-osmo_gsm48_rest_octets_si2bis;
-osmo_gsm48_rest_octets_si6;
-osmo_gsm48_rest_octets_si3;
-osmo_gsm48_rest_octets_si4;
-osmo_gsm48_rest_octets_si13;
+osmo_gsm48_rest_octets_si1_encode;
+osmo_gsm48_rest_octets_si2quater_encode;
+osmo_gsm48_rest_octets_si2ter_encode;
+osmo_gsm48_rest_octets_si2bis_encode;
+osmo_gsm48_rest_octets_si6_encode;
+osmo_gsm48_rest_octets_si3_encode;
+osmo_gsm48_rest_octets_si4_encode;
+osmo_gsm48_rest_octets_si13_encode;
 gsm48_rr_msg_name;
 gsm48_cc_state_name;
 gsm48_construct_ra;

-- 
To view, visit https://gerrit.osmocom.org/14235
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08e0ca9a8d13c7aa40b9d90f34f0e13adb87d4e0
Gerrit-Change-Number: 14235
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190528/e53e8afb/attachment-0001.html>


More information about the gerrit-log mailing list