[MERGED] libosmocore[master]: Revert "Add function to encode classmark"

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Feb 22 15:24:28 UTC 2018

Harald Welte has submitted this change and it was merged.

Change subject: Revert "Add function to encode classmark"

Revert "Add function to encode classmark"

This breaks all existing / older osmocom-bb builds, and hence
cannot be accpeted. See also https://gerrit.osmocom.org/#/c/6679

Related: OS#2985

This reverts commit 3c38e60cd55814a7b4c34f22e0b2e6e671f883c4.

Change-Id: Icfc52ca4e5cbe3a444d98037d27fa101e3614e06
M include/osmocom/gsm/gsm48.h
M src/gsm/gsm48.c
M src/gsm/libosmogsm.map
3 files changed, 0 insertions(+), 18 deletions(-)

  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h
index 5fda4e7..9ec5463 100644
--- a/include/osmocom/gsm/gsm48.h
+++ b/include/osmocom/gsm/gsm48.h
@@ -29,7 +29,6 @@
 		     uint16_t *mnc, uint16_t *lac);
 void gsm48_generate_lai(struct gsm48_loc_area_id *lai48, uint16_t mcc,
 			uint16_t mnc, uint16_t lac);
-void gsm48_encode_classmark1(struct gsm48_classmark1 *cm, uint8_t rev_lv, bool es_ind, bool a5_1, uint8_t rf_pwr);
 int gsm48_generate_mid_from_tmsi(uint8_t *buf, uint32_t tmsi);
 int gsm48_generate_mid_from_imsi(uint8_t *buf, const char *imsi);
 uint8_t gsm48_generate_mid(uint8_t *buf, const char *id, uint8_t mi_type);
diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index d9a5527..b58e9e2 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -508,22 +508,6 @@
 	lai48->lac = osmo_htons(lac);
-/*! Encode TS 24.008 § Mobile Station Classmark 1
- *  \param[out] cm caller-provided memory for output
- *  \param[in] rev_lv Revision level
- *  \param[in] es_ind ES IND "Controlled Early Classmark Sending" option
- *  \param[in] a5_1 A5/1 algorithm supported
- *  \param[in] pwr_lv RF power capability
- */
-void gsm48_encode_classmark1(struct gsm48_classmark1 *cm, uint8_t rev_lv, bool es_ind, bool a5_1, uint8_t rf_pwr)
-	memset(cm, 0, sizeof(*cm));
-	cm->rev_lev = rev_lv;
-	cm->es_ind = es_ind;
-	cm->a5_1 = !a5_1;
-	cm->pwr_lev = rf_pwr;
 /*! Decode TS 04.08 Location Area Identifier
  *  \param[in] Location Area Identifier (encoded)
  *  \param[out] mcc Mobile Country Code
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index b6152ce..7a74718 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -245,7 +245,6 @@

To view, visit https://gerrit.osmocom.org/6680
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfc52ca4e5cbe3a444d98037d27fa101e3614e06
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder

More information about the gerrit-log mailing list