diff options
Diffstat (limited to 'src/host')
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/Makefile.am | 1 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/ms.h | 3 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/settings.h (renamed from src/host/layer23/include/osmocom/bb/mobile/settings.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/Makefile.am | 2 | ||||
-rw-r--r-- | src/host/layer23/src/common/Makefile.am | 1 | ||||
-rw-r--r-- | src/host/layer23/src/common/settings.c (renamed from src/host/layer23/src/mobile/settings.c) | 2 | ||||
-rw-r--r-- | src/host/layer23/src/mobile/Makefile.am | 1 | ||||
-rw-r--r-- | src/host/layer23/src/mobile/gsm322.c | 2 | ||||
-rw-r--r-- | src/host/layer23/src/mobile/gsm48_rr.c | 2 | ||||
-rw-r--r-- | src/host/layer23/src/mobile/mnccms.c | 2 |
10 files changed, 8 insertions, 8 deletions
diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index f09353bb..270f079d 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -12,6 +12,7 @@ noinst_HEADERS = \ sap_proto.h \ sap_fsm.h \ sap_interface.h \ + settings.h \ sim.h \ subscriber.h \ support.h \ diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index db6b276a..9fd4c7aa 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -5,9 +5,8 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/write_queue.h> -/* FIXME no 'mobile' specific stuff should be here */ -#include <osmocom/bb/mobile/settings.h> #include <osmocom/gsm/lapdm.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/subscriber.h> #include <osmocom/bb/common/support.h> #include <osmocom/bb/common/sap_interface.h> diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index c9a36228..c9a36228 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 6d9950be..14694bb2 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -1,4 +1,4 @@ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ - gsm48_rr.h mncc.h settings.h \ + gsm48_rr.h mncc.h \ transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \ app_mobile.h voice.h gapk_io.h diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index 4dfa1f35..9abc802c 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -23,6 +23,7 @@ liblayer23_a_SOURCES = \ sap_fsm.c \ sap_proto.c \ sap_interface.c \ + settings.c \ sim.c \ subscriber.c \ support.c \ diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/common/settings.c index 3d4d7125..d607aff5 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -21,7 +21,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/bb/mobile/app_mobile.h> -#include <osmocom/bb/mobile/settings.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/utils.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index dedee5f3..b87063b5 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -27,7 +27,6 @@ libmobile_a_SOURCES = \ mnccms.c \ mncc_sock.c \ primitives.c \ - settings.c \ transaction.c \ vty_interface.c \ voice.c \ diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 4b735947..df26e829 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -35,11 +35,11 @@ #include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/utils.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/bb/mobile/gsm322.h> #include <osmocom/bb/mobile/gsm48_mm.h> -#include <osmocom/bb/mobile/settings.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 87a0dcd6..5d5e003b 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -76,11 +76,11 @@ #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/utils.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/gsm48_rr.h> -#include <osmocom/bb/mobile/settings.h> #include <l1ctl_proto.h> diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 16cabc14..bfc95e42 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -26,10 +26,10 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/ms.h> +#include <osmocom/bb/common/settings.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/mncc_ms.h> #include <osmocom/bb/mobile/vty.h> -#include <osmocom/bb/mobile/settings.h> static uint32_t new_callref = 1; static LLIST_HEAD(call_list); |