Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/14238 )
Change subject: rest_octets: Remove SI2ter + SI2bis encoders that don't do
anything
......................................................................
rest_octets: Remove SI2ter + SI2bis encoders that don't do anything
The library should either provide functions that implement encoding
of those rest octets, or it shouldn't. Providing a function that
doesn't do anything but pad the buffer is useless.
Change-Id: Ie10684de6a6b2663e2a871fcdb2b275b6ad7a1e7
---
M include/osmocom/gsm/gsm48_rest_octets.h
M src/gsm/gsm48_rest_octets.c
M src/gsm/libosmogsm.map
3 files changed, 0 insertions(+), 35 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/include/osmocom/gsm/gsm48_rest_octets.h
b/include/osmocom/gsm/gsm48_rest_octets.h
index 7163672..d3bb878 100644
--- a/include/osmocom/gsm/gsm48_rest_octets.h
+++ b/include/osmocom/gsm/gsm48_rest_octets.h
@@ -18,8 +18,6 @@
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);
struct osmo_gsm48_si_pch_nch_info {
bool present;
diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c
index c1e4b30..84136c6 100644
--- a/src/gsm/gsm48_rest_octets.c
+++ b/src/gsm/gsm48_rest_octets.c
@@ -536,37 +536,6 @@
bitvec_set_bit(bv, L);
}
-/* Generate SI2ter Rest Octests 3GPP TS 44.018 Table 10.5.2.33a.1 */
-int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data)
-{
- struct bitvec bv;
-
- memset(&bv, 0, sizeof(bv));
- bv.data = data;
- bv.data_len = 4;
-
- /* No SI2ter_MP_CHANGE_MARK */
- bitvec_set_bit(&bv, L);
-
- bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);
-
- return bv.data_len;
-}
-
-/* Generate SI2bis Rest Octests 3GPP TS 44.018 Table 10.5.2.33.1 */
-int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data)
-{
- struct bitvec bv;
-
- memset(&bv, 0, sizeof(bv));
- bv.data = data;
- bv.data_len = 1;
-
- bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);
-
- return bv.data_len;
-}
-
/* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */
int osmo_gsm48_rest_octets_si3_encode(uint8_t *data, const struct
osmo_gsm48_si_ro_info *si3)
{
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index 84d71e6..d49401d 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -303,8 +303,6 @@
gsm48_cc_msg_name;
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;
--
To view, visit https://gerrit.osmocom.org/14238
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie10684de6a6b2663e2a871fcdb2b275b6ad7a1e7
Gerrit-Change-Number: 14238
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
