Move LCLS references from gsm_data to osmo_bsc_lcls

This commit aims at better ordering of content in order to get rid of
sigtran stuff in gsm_data. This way we can avoid requiring
libosmo-sigtran when building ipaccess utils.

Change-Id: I8941f059d6e4eb21a971d48d2b66c29ec3355a6d

include/osmocom/bsc/bsc_msc_data.h

@@ -29,6 +29,7 @@
 #define _OSMO_MSC_DATA_H
 
 #include "debug.h"
+#include "osmo_bsc_lcls.h"
 
 #include <osmocom/core/timer.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
@@ -53,19 +54,6 @@ enum {
 	MSC_CON_TYPE_LOCAL,
 };
 
-enum bsc_lcls_mode {
-	BSC_LCLS_MODE_DISABLED,
-	BSC_LCLS_MODE_MGW_LOOP,
-	BSC_LCLS_MODE_BTS_LOOP,
-};
-
-extern const struct value_string bsc_lcls_mode_names[];
-
-static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m)
-{
-	return get_value_string(bsc_lcls_mode_names, m);
-}
-
 /*! /brief Information on a remote MSC for libbsc.
  */
 struct bsc_msc_data {

include/osmocom/bsc/osmo_bsc_lcls.h

@@ -1,4 +1,7 @@
 #pragma once
+
+#include "gsm_data.h"
+
 #include <osmocom/core/fsm.h>
 
 enum lcls_fsm_state {
@@ -29,6 +32,19 @@ enum lcls_event {
 	LCLS_EV_OTHER_DEAD,
 };
 
+enum bsc_lcls_mode {
+	BSC_LCLS_MODE_DISABLED,
+	BSC_LCLS_MODE_MGW_LOOP,
+	BSC_LCLS_MODE_BTS_LOOP,
+};
+
+extern const struct value_string bsc_lcls_mode_names[];
+
+static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m)
+{
+	return get_value_string(bsc_lcls_mode_names, m);
+}
+
 enum gsm0808_lcls_status lcls_get_status(const struct gsm_subscriber_connection *conn);
 
 void lcls_update_config(struct gsm_subscriber_connection *conn,

src/osmo-bsc/gsm_data.c

@@ -37,6 +37,7 @@
 #include <osmocom/gsm/gsm0808_utils.h>
 
 #include <osmocom/bsc/gsm_data.h>
+#include <osmocom/bsc/osmo_bsc_lcls.h>
 #include <osmocom/bsc/bsc_msc_data.h>
 #include <osmocom/bsc/abis_nm.h>
 #include <osmocom/bsc/handover_cfg.h>
@@ -46,13 +47,6 @@
 
 void *tall_bsc_ctx = NULL;
 
-const struct value_string bsc_lcls_mode_names[] = {
-	{ BSC_LCLS_MODE_DISABLED,	"disabled" },
-	{ BSC_LCLS_MODE_MGW_LOOP,	"mgw-loop" },
-	{ BSC_LCLS_MODE_BTS_LOOP,	"bts-loop" },
-	{ 0, NULL }
-};
-
 static LLIST_HEAD(bts_models);
 
 void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr,

src/osmo-bsc/osmo_bsc_lcls.c

@@ -42,6 +42,12 @@ struct value_string lcls_event_names[] = {
 	{ 0, NULL }
 };
 
+const struct value_string bsc_lcls_mode_names[] = {
+	{ BSC_LCLS_MODE_DISABLED,	"disabled" },
+	{ BSC_LCLS_MODE_MGW_LOOP,	"mgw-loop" },
+	{ BSC_LCLS_MODE_BTS_LOOP,	"bts-loop" },
+	{ 0, NULL }
+};
 
 /***********************************************************************
  * Utility functions