pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30973 )
Change subject: layer23: Move support.{c,h} under common/ ......................................................................
layer23: Move support.{c,h} under common/
Some of those can be reused by other apps (like modem).
Change-Id: I3c5af4db8e603aa004d0b6410b09b5143173b874 --- 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/support.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/support.c M src/host/layer23/src/mobile/Makefile.am 7 files changed, 5 insertions(+), 4 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 c756b8e..54799be 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -13,5 +13,6 @@ sap_fsm.h \ sap_interface.h \ sim.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 bbb5491..3a16293 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -6,10 +6,10 @@ #include <osmocom/core/write_queue.h>
/* FIXME no 'mobile' specific stuff should be here */ -#include <osmocom/bb/mobile/support.h> #include <osmocom/bb/mobile/settings.h> #include <osmocom/bb/mobile/subscriber.h> #include <osmocom/gsm/lapdm.h> +#include <osmocom/bb/common/support.h> #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sap_proto.h> #include <osmocom/bb/mobile/gsm48_rr.h> diff --git a/src/host/layer23/include/osmocom/bb/mobile/support.h b/src/host/layer23/include/osmocom/bb/common/support.h similarity index 99% rename from src/host/layer23/include/osmocom/bb/mobile/support.h rename to src/host/layer23/include/osmocom/bb/common/support.h index c56c78e..2fae57e 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/support.h +++ b/src/host/layer23/include/osmocom/bb/common/support.h @@ -110,7 +110,7 @@ uint16_t start; uint16_t end; uint16_t max; - uint16_t temp; + uint16_t temp; }; extern struct gsm_support_scan_max gsm_sup_smax[];
diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 978a701..e18b2bd 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 support.h \ + gsm48_rr.h mncc.h settings.h subscriber.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 7d27eb1..36342df 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 \ + support.c \ sysinfo.c \ utils.c \ vty.c \ diff --git a/src/host/layer23/src/mobile/support.c b/src/host/layer23/src/common/support.c similarity index 100% rename from src/host/layer23/src/mobile/support.c rename to src/host/layer23/src/common/support.c diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index a83e082..9ee0b72 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -29,7 +29,6 @@ primitives.c \ settings.c \ subscriber.c \ - support.c \ transaction.c \ vty_interface.c \ voice.c \
-
pespin