From ccda96517c7f2f5aa10166eebe105f2f45342ad4 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Thu, 12 Nov 2009 22:28:18 +0900
Subject: [PATCH] move 'struct value_string' and 'get_value_string()' to
 gsm_data

---
 openbsc/include/openbsc/gsm_data.h |  7 +++++++
 openbsc/src/gsm_04_11.c            | 18 ------------------
 openbsc/src/gsm_data.c             | 13 +++++++++++++
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index c3ea45dce..3040525c2 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -3,6 +3,13 @@
 
 #include <sys/types.h>
 
+struct value_string {
+	unsigned int value;
+	const char *str;
+};
+
+const char *get_value_string(const struct value_string *vs, u_int32_t val);
+
 enum gsm_band {
 	GSM_BAND_400,
 	GSM_BAND_850,
diff --git a/openbsc/src/gsm_04_11.c b/openbsc/src/gsm_04_11.c
index f941d90a2..75ddf9dd9 100644
--- a/openbsc/src/gsm_04_11.c
+++ b/openbsc/src/gsm_04_11.c
@@ -56,11 +56,6 @@
 void *tall_gsms_ctx;
 static u_int32_t new_callref = 0x40000001;
 
-struct value_string {
-	u_int32_t value;
-	const char *str;
-};
-
 static const struct value_string cp_cause_strs[] = {
 	{ GSM411_CP_CAUSE_NET_FAIL,	"Network Failure" },
 	{ GSM411_CP_CAUSE_CONGESTION,	"Congestion" },
@@ -104,19 +99,6 @@ static const struct value_string rp_cause_strs[] = {
 	{ 0, NULL }
 };
 
-const char *get_value_string(const struct value_string *vs, u_int32_t val)
-{
-	int i;
-
-	for (i = 0;; i++) {
-		if (vs[i].value == 0 && vs[i].str == NULL)
-			break;
-		if (vs[i].value == val)
-			return vs[i].str;
-	}
-	return "unknown";
-}
-
 struct gsm_sms *sms_alloc(void)
 {
 	return talloc_zero(tall_gsms_ctx, struct gsm_sms);
diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c
index 59947fdb7..69a9096ca 100644
--- a/openbsc/src/gsm_data.c
+++ b/openbsc/src/gsm_data.c
@@ -30,6 +30,19 @@
 
 void *tall_bsc_ctx;
 
+const char *get_value_string(const struct value_string *vs, u_int32_t val)
+{
+	int i;
+
+	for (i = 0;; i++) {
+		if (vs[i].value == 0 && vs[i].str == NULL)
+			break;
+		if (vs[i].value == val)
+			return vs[i].str;
+	}
+	return "unknown";
+}
+
 void set_ts_e1link(struct gsm_bts_trx_ts *ts, u_int8_t e1_nr,
 		   u_int8_t e1_ts, u_int8_t e1_ts_ss)
 {