diff options
Diffstat (limited to 'src/host/layer23')
-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 | 2 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/subscriber.h (renamed from src/host/layer23/include/osmocom/bb/mobile/subscriber.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/subscriber.c (renamed from src/host/layer23/src/mobile/subscriber.c) | 2 | ||||
-rw-r--r-- | src/host/layer23/src/mobile/Makefile.am | 1 | ||||
-rw-r--r-- | src/host/layer23/src/mobile/gsm48_mm.c | 2 |
8 files changed, 6 insertions, 5 deletions
diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index 54799bea..f09353bb 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -13,6 +13,7 @@ noinst_HEADERS = \ sap_fsm.h \ sap_interface.h \ sim.h \ + subscriber.h \ support.h \ vty.h \ $(NULL) diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index 3a162937..db6b276a 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -7,8 +7,8 @@ /* FIXME no 'mobile' specific stuff should be here */ #include <osmocom/bb/mobile/settings.h> -#include <osmocom/bb/mobile/subscriber.h> #include <osmocom/gsm/lapdm.h> +#include <osmocom/bb/common/subscriber.h> #include <osmocom/bb/common/support.h> #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sap_proto.h> diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index 698b0fdc..698b0fdc 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index e18b2bd0..6d9950be 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 subscriber.h \ + gsm48_rr.h mncc.h settings.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 36342df5..4dfa1f35 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -24,6 +24,7 @@ liblayer23_a_SOURCES = \ sap_proto.c \ sap_interface.c \ sim.c \ + subscriber.c \ support.c \ sysinfo.c \ utils.c \ diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/common/subscriber.c index 164622a2..89cacb76 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -28,8 +28,8 @@ #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sap_proto.h> #include <osmocom/bb/common/networks.h> +#include <osmocom/bb/common/subscriber.h> #include <osmocom/bb/mobile/vty.h> -#include <osmocom/bb/mobile/subscriber.h> /* enable to get an empty list of forbidden PLMNs, even if stored on SIM. * if list is changed, the result is not written back to SIM */ diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index 9ee0b72f..dedee5f3 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -28,7 +28,6 @@ libmobile_a_SOURCES = \ mncc_sock.c \ primitives.c \ settings.c \ - subscriber.c \ transaction.c \ vty_interface.c \ voice.c \ diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 500eff6d..60be5691 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -34,6 +34,7 @@ #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/utils.h> +#include <osmocom/bb/common/subscriber.h> #include <osmocom/bb/mobile/gsm48_cc.h> #include <osmocom/bb/mobile/gsm480_ss.h> #include <osmocom/bb/mobile/gsm411_sms.h> @@ -42,7 +43,6 @@ #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/gsm48_rr.h> #include <osmocom/bb/mobile/gsm322.h> -#include <osmocom/bb/mobile/subscriber.h> extern void *l23_ctx; |