From de21ca4aaf999b15caca686b217708111117789b Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Sun, 25 Jul 2010 00:25:50 +0200 Subject: [PATCH] layer23: Split [1/2] -> The source code We split into : - common: Everything that can be shared - mobile: The real spec compliant mobile phones - misc: Different test stuff Signed-off-by: Sylvain Munaut --- src/host/layer23/configure.ac | 3 +++ src/host/layer23/src/Makefile.am | 26 +------------------ src/host/layer23/src/common/Makefile.am | 5 ++++ src/host/layer23/src/{ => common}/l1ctl.c | 0 .../layer23/src/{ => common}/l1l2_interface.c | 0 src/host/layer23/src/{ => common}/lapdm.c | 0 src/host/layer23/src/{ => common}/logging.c | 0 src/host/layer23/src/{ => common}/main.c | 0 src/host/layer23/src/{ => common}/networks.c | 0 src/host/layer23/src/misc/Makefile.am | 10 +++++++ .../layer23/src/{ => misc}/app_bcch_scan.c | 0 .../layer23/src/{ => misc}/app_echo_test.c | 0 src/host/layer23/src/{ => misc}/app_phone.c | 0 src/host/layer23/src/{ => misc}/bcch_scan.c | 0 src/host/layer23/src/{ => misc}/layer3.c | 0 src/host/layer23/src/{ => misc}/rslms.c | 0 src/host/layer23/src/mobile/Makefile.am | 15 +++++++++++ .../layer23/src/{ => mobile}/app_mobile.c | 0 src/host/layer23/src/{ => mobile}/gsm322.c | 0 src/host/layer23/src/{ => mobile}/gsm48_cc.c | 0 src/host/layer23/src/{ => mobile}/gsm48_mm.c | 0 src/host/layer23/src/{ => mobile}/gsm48_rr.c | 0 src/host/layer23/src/{ => mobile}/mnccms.c | 0 src/host/layer23/src/{ => mobile}/settings.c | 0 .../layer23/src/{ => mobile}/subscriber.c | 0 src/host/layer23/src/{ => mobile}/support.c | 0 src/host/layer23/src/{ => mobile}/sysinfo.c | 0 .../layer23/src/{ => mobile}/transaction.c | 0 .../layer23/src/{ => mobile}/vty_interface.c | 0 29 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 src/host/layer23/src/common/Makefile.am rename src/host/layer23/src/{ => common}/l1ctl.c (100%) rename src/host/layer23/src/{ => common}/l1l2_interface.c (100%) rename src/host/layer23/src/{ => common}/lapdm.c (100%) rename src/host/layer23/src/{ => common}/logging.c (100%) rename src/host/layer23/src/{ => common}/main.c (100%) rename src/host/layer23/src/{ => common}/networks.c (100%) create mode 100644 src/host/layer23/src/misc/Makefile.am rename src/host/layer23/src/{ => misc}/app_bcch_scan.c (100%) rename src/host/layer23/src/{ => misc}/app_echo_test.c (100%) rename src/host/layer23/src/{ => misc}/app_phone.c (100%) rename src/host/layer23/src/{ => misc}/bcch_scan.c (100%) rename src/host/layer23/src/{ => misc}/layer3.c (100%) rename src/host/layer23/src/{ => misc}/rslms.c (100%) create mode 100644 src/host/layer23/src/mobile/Makefile.am rename src/host/layer23/src/{ => mobile}/app_mobile.c (100%) rename src/host/layer23/src/{ => mobile}/gsm322.c (100%) rename src/host/layer23/src/{ => mobile}/gsm48_cc.c (100%) rename src/host/layer23/src/{ => mobile}/gsm48_mm.c (100%) rename src/host/layer23/src/{ => mobile}/gsm48_rr.c (100%) rename src/host/layer23/src/{ => mobile}/mnccms.c (100%) rename src/host/layer23/src/{ => mobile}/settings.c (100%) rename src/host/layer23/src/{ => mobile}/subscriber.c (100%) rename src/host/layer23/src/{ => mobile}/support.c (100%) rename src/host/layer23/src/{ => mobile}/sysinfo.c (100%) rename src/host/layer23/src/{ => mobile}/transaction.c (100%) rename src/host/layer23/src/{ => mobile}/vty_interface.c (100%) diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index 036161c..4adf065 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -23,6 +23,9 @@ dnl Checks for typedefs, structures and compiler characteristics AC_OUTPUT( src/Makefile + src/common/Makefile + src/misc/Makefile + src/mobile/Makefile include/Makefile include/osmocom/Makefile Makefile) diff --git a/src/host/layer23/src/Makefile.am b/src/host/layer23/src/Makefile.am index c3b83cb..58a5f7f 100644 --- a/src/host/layer23/src/Makefile.am +++ b/src/host/layer23/src/Makefile.am @@ -1,25 +1 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) -#AM_LDFLAGS = $(LIBOSMOCORE_LIBS) - -noinst_LIBRARIES = liblayer23.a libmobile.a -liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c lapdm.c logging.c main.c -libmobile_a_SOURCES = gsm322.c gsm48_cc.c gsm48_mm.c gsm48_rr.c \ - mnccms.c networks.c settings.c subscriber.c support.c \ - sysinfo.c transaction.c vty_interface.c - -bin_PROGRAMS = bcch_scan layer23 echo_test mobile - -bcch_scan_SOURCES = main.c app_bcch_scan.c bcch_scan.c -bcch_scan_LDADD = liblayer23.a $(LIBOSMOCORE_LIBS) - -layer23_SOURCES = main.c app_phone.c layer3.c rslms.c -layer23_LDADD = liblayer23.a $(LIBOSMOCORE_LIBS) - -echo_test_SOURCES = main.c app_echo_test.c -echo_test_LDADD = liblayer23.a $(LIBOSMOCORE_LIBS) - -mobile_SOURCES = main.c app_mobile.c -mobile_LDADD = liblayer23.a libmobile.a $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) - - +SUBDIRS = common misc mobile diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am new file mode 100644 index 0000000..5c0d41b --- /dev/null +++ b/src/host/layer23/src/common/Makefile.am @@ -0,0 +1,5 @@ +INCLUDES = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) + +noinst_LIBRARIES = liblayer23.a +liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c lapdm.c logging.c networks.c diff --git a/src/host/layer23/src/l1ctl.c b/src/host/layer23/src/common/l1ctl.c similarity index 100% rename from src/host/layer23/src/l1ctl.c rename to src/host/layer23/src/common/l1ctl.c diff --git a/src/host/layer23/src/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c similarity index 100% rename from src/host/layer23/src/l1l2_interface.c rename to src/host/layer23/src/common/l1l2_interface.c diff --git a/src/host/layer23/src/lapdm.c b/src/host/layer23/src/common/lapdm.c similarity index 100% rename from src/host/layer23/src/lapdm.c rename to src/host/layer23/src/common/lapdm.c diff --git a/src/host/layer23/src/logging.c b/src/host/layer23/src/common/logging.c similarity index 100% rename from src/host/layer23/src/logging.c rename to src/host/layer23/src/common/logging.c diff --git a/src/host/layer23/src/main.c b/src/host/layer23/src/common/main.c similarity index 100% rename from src/host/layer23/src/main.c rename to src/host/layer23/src/common/main.c diff --git a/src/host/layer23/src/networks.c b/src/host/layer23/src/common/networks.c similarity index 100% rename from src/host/layer23/src/networks.c rename to src/host/layer23/src/common/networks.c diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am new file mode 100644 index 0000000..954c5a8 --- /dev/null +++ b/src/host/layer23/src/misc/Makefile.am @@ -0,0 +1,10 @@ +INCLUDES = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) +LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) + +bin_PROGRAMS = bcch_scan layer23 echo_test + +bcch_scan_SOURCES = ../common/main.c app_bcch_scan.c bcch_scan.c +layer23_SOURCES = ../common/main.c app_phone.c layer3.c rslms.c +echo_test_SOURCES = ../common/main.c app_echo_test.c + diff --git a/src/host/layer23/src/app_bcch_scan.c b/src/host/layer23/src/misc/app_bcch_scan.c similarity index 100% rename from src/host/layer23/src/app_bcch_scan.c rename to src/host/layer23/src/misc/app_bcch_scan.c diff --git a/src/host/layer23/src/app_echo_test.c b/src/host/layer23/src/misc/app_echo_test.c similarity index 100% rename from src/host/layer23/src/app_echo_test.c rename to src/host/layer23/src/misc/app_echo_test.c diff --git a/src/host/layer23/src/app_phone.c b/src/host/layer23/src/misc/app_phone.c similarity index 100% rename from src/host/layer23/src/app_phone.c rename to src/host/layer23/src/misc/app_phone.c diff --git a/src/host/layer23/src/bcch_scan.c b/src/host/layer23/src/misc/bcch_scan.c similarity index 100% rename from src/host/layer23/src/bcch_scan.c rename to src/host/layer23/src/misc/bcch_scan.c diff --git a/src/host/layer23/src/layer3.c b/src/host/layer23/src/misc/layer3.c similarity index 100% rename from src/host/layer23/src/layer3.c rename to src/host/layer23/src/misc/layer3.c diff --git a/src/host/layer23/src/rslms.c b/src/host/layer23/src/misc/rslms.c similarity index 100% rename from src/host/layer23/src/rslms.c rename to src/host/layer23/src/misc/rslms.c diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am new file mode 100644 index 0000000..5dbda72 --- /dev/null +++ b/src/host/layer23/src/mobile/Makefile.am @@ -0,0 +1,15 @@ +INCLUDES = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) +LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) + +noinst_LIBRARIES = libmobile.a +libmobile_a_SOURCES = gsm322.c gsm48_cc.c gsm48_mm.c gsm48_rr.c \ + mnccms.c settings.c subscriber.c support.c \ + sysinfo.c transaction.c vty_interface.c + +bin_PROGRAMS = mobile + +mobile_SOURCES = ../common/main.c app_mobile.c +mobile_LDADD = libmobile.a $(LDADD) + + diff --git a/src/host/layer23/src/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c similarity index 100% rename from src/host/layer23/src/app_mobile.c rename to src/host/layer23/src/mobile/app_mobile.c diff --git a/src/host/layer23/src/gsm322.c b/src/host/layer23/src/mobile/gsm322.c similarity index 100% rename from src/host/layer23/src/gsm322.c rename to src/host/layer23/src/mobile/gsm322.c diff --git a/src/host/layer23/src/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c similarity index 100% rename from src/host/layer23/src/gsm48_cc.c rename to src/host/layer23/src/mobile/gsm48_cc.c diff --git a/src/host/layer23/src/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c similarity index 100% rename from src/host/layer23/src/gsm48_mm.c rename to src/host/layer23/src/mobile/gsm48_mm.c diff --git a/src/host/layer23/src/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c similarity index 100% rename from src/host/layer23/src/gsm48_rr.c rename to src/host/layer23/src/mobile/gsm48_rr.c diff --git a/src/host/layer23/src/mnccms.c b/src/host/layer23/src/mobile/mnccms.c similarity index 100% rename from src/host/layer23/src/mnccms.c rename to src/host/layer23/src/mobile/mnccms.c diff --git a/src/host/layer23/src/settings.c b/src/host/layer23/src/mobile/settings.c similarity index 100% rename from src/host/layer23/src/settings.c rename to src/host/layer23/src/mobile/settings.c diff --git a/src/host/layer23/src/subscriber.c b/src/host/layer23/src/mobile/subscriber.c similarity index 100% rename from src/host/layer23/src/subscriber.c rename to src/host/layer23/src/mobile/subscriber.c diff --git a/src/host/layer23/src/support.c b/src/host/layer23/src/mobile/support.c similarity index 100% rename from src/host/layer23/src/support.c rename to src/host/layer23/src/mobile/support.c diff --git a/src/host/layer23/src/sysinfo.c b/src/host/layer23/src/mobile/sysinfo.c similarity index 100% rename from src/host/layer23/src/sysinfo.c rename to src/host/layer23/src/mobile/sysinfo.c diff --git a/src/host/layer23/src/transaction.c b/src/host/layer23/src/mobile/transaction.c similarity index 100% rename from src/host/layer23/src/transaction.c rename to src/host/layer23/src/mobile/transaction.c diff --git a/src/host/layer23/src/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c similarity index 100% rename from src/host/layer23/src/vty_interface.c rename to src/host/layer23/src/mobile/vty_interface.c -- 2.20.1