<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13220">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move LCLS references from gsm_data to osmo_bsc_lcls<br><br>This commit aims at better ordering of content in order to get rid of<br>sigtran stuff in gsm_data. This way we can avoid requiring<br>libosmo-sigtran when building ipaccess utils.<br><br>Change-Id: I8941f059d6e4eb21a971d48d2b66c29ec3355a6d<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M include/osmocom/bsc/osmo_bsc_lcls.h<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>4 files changed, 24 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/13220/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index 0c2094e..9f2d7d8 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #define _OSMO_MSC_DATA_H</span><br><span> </span><br><span> #include "debug.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "osmo_bsc_lcls.h"</span><br><span> </span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span>@@ -53,19 +54,6 @@</span><br><span> MSC_CON_TYPE_LOCAL,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum bsc_lcls_mode {</span><br><span style="color: hsl(0, 100%, 40%);">- BSC_LCLS_MODE_DISABLED,</span><br><span style="color: hsl(0, 100%, 40%);">- BSC_LCLS_MODE_MGW_LOOP,</span><br><span style="color: hsl(0, 100%, 40%);">- BSC_LCLS_MODE_BTS_LOOP,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-extern const struct value_string bsc_lcls_mode_names[];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return get_value_string(bsc_lcls_mode_names, m);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! /brief Information on a remote MSC for libbsc.</span><br><span> */</span><br><span> struct bsc_msc_data {</span><br><span>diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h b/include/osmocom/bsc/osmo_bsc_lcls.h</span><br><span>index d98fe98..8bbd552 100644</span><br><span>--- a/include/osmocom/bsc/osmo_bsc_lcls.h</span><br><span>+++ b/include/osmocom/bsc/osmo_bsc_lcls.h</span><br><span>@@ -1,4 +1,7 @@</span><br><span> #pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "gsm_data.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/core/fsm.h></span><br><span> </span><br><span> enum lcls_fsm_state {</span><br><span>@@ -29,6 +32,19 @@</span><br><span> LCLS_EV_OTHER_DEAD,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum bsc_lcls_mode {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_LCLS_MODE_DISABLED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_LCLS_MODE_MGW_LOOP,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_LCLS_MODE_BTS_LOOP,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string bsc_lcls_mode_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_value_string(bsc_lcls_mode_names, m);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum gsm0808_lcls_status lcls_get_status(const struct gsm_subscriber_connection *conn);</span><br><span> </span><br><span> void lcls_update_config(struct gsm_subscriber_connection *conn,</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 0492571..0198fcf 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -37,6 +37,7 @@</span><br><span> #include <osmocom/gsm/gsm0808_utils.h></span><br><span> </span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/osmo_bsc_lcls.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span> #include <osmocom/bsc/abis_nm.h></span><br><span> #include <osmocom/bsc/handover_cfg.h></span><br><span>@@ -46,13 +47,6 @@</span><br><span> </span><br><span> void *tall_bsc_ctx = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string bsc_lcls_mode_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { BSC_LCLS_MODE_DISABLED, "disabled" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" },</span><br><span style="color: hsl(0, 100%, 40%);">- { BSC_LCLS_MODE_BTS_LOOP, "bts-loop" },</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static LLIST_HEAD(bts_models);</span><br><span> </span><br><span> void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr,</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>index f7b84e1..c1f62dc 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>@@ -42,6 +42,12 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string bsc_lcls_mode_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { BSC_LCLS_MODE_DISABLED, "disabled" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { BSC_LCLS_MODE_BTS_LOOP, "bts-loop" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span> /***********************************************************************</span><br><span> * Utility functions</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13220">change 13220</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13220"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8941f059d6e4eb21a971d48d2b66c29ec3355a6d </div>
<div style="display:none"> Gerrit-Change-Number: 13220 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>