Change in osmo-bsc[master]: Move LCLS references from gsm_data to osmo_bsc_lcls

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Thu Mar 14 13:21:19 UTC 2019


Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13220 )

Change subject: Move LCLS references from gsm_data to osmo_bsc_lcls
......................................................................

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
---
M include/osmocom/bsc/bsc_msc_data.h
M include/osmocom/bsc/osmo_bsc_lcls.h
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/osmo_bsc_lcls.c
4 files changed, 24 insertions(+), 20 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Max: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h
index 0c2094e..9f2d7d8 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/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 @@
 	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 {
diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h b/include/osmocom/bsc/osmo_bsc_lcls.h
index d98fe98..8bbd552 100644
--- a/include/osmocom/bsc/osmo_bsc_lcls.h
+++ b/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 @@
 	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,
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 0492571..0198fcf 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/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,
diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c
index f7b84e1..c1f62dc 100644
--- a/src/osmo-bsc/osmo_bsc_lcls.c
+++ b/src/osmo-bsc/osmo_bsc_lcls.c
@@ -42,6 +42,12 @@
 	{ 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

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8941f059d6e4eb21a971d48d2b66c29ec3355a6d
Gerrit-Change-Number: 13220
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190314/74f8e416/attachment.html>


More information about the gerrit-log mailing list