From 2cfd000da32464f62d568f96bac38dedfa4dac1d Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 12 Mar 2019 18:53:26 +0100 Subject: 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 | 14 +------------- include/osmocom/bsc/osmo_bsc_lcls.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'include/osmocom') diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 0c2094e3a..9f2d7d8a3 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 #include @@ -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 { diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h b/include/osmocom/bsc/osmo_bsc_lcls.h index d98fe98dd..8bbd55241 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 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, -- cgit v1.2.3