Change in osmocom-bb[master]: layer23: Move subscriber.{c,h} under common/

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30974 ) Change subject: layer23: Move subscriber.{c,h} under common/ ...................................................................... layer23: Move subscriber.{c,h} under common/ Some of those can be reused by other apps (like modem). Change-Id: I3727e40bcc9a4ee93aaf2c4ced070cc789653e80 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/ms.h R src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/include/osmocom/bb/mobile/Makefile.am M src/host/layer23/src/common/Makefile.am R src/host/layer23/src/common/subscriber.c M src/host/layer23/src/mobile/Makefile.am M src/host/layer23/src/mobile/gsm48_mm.c 8 files changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve neels: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index 54799be..f09353b 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 @@ 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 3a16293..db6b276 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 similarity index 100% rename from src/host/layer23/include/osmocom/bb/mobile/subscriber.h rename to 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 e18b2bd..6d9950b 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 36342df..4dfa1f3 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -24,6 +24,7 @@ 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 similarity index 99% rename from src/host/layer23/src/mobile/subscriber.c rename to src/host/layer23/src/common/subscriber.c index 164622a..89cacb7 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 9ee0b72..dedee5f 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -28,7 +28,6 @@ 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 500eff6..60be569 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; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3727e40bcc9a4ee93aaf2c4ced070cc789653e80 Gerrit-Change-Number: 30974 Gerrit-PatchSet: 4 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev &lt;msuraev(a)sysmocom.de&gt; Gerrit-Reviewer: neels &lt;nhofmeyr(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged