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 <tnt@246tNt.com>

29 files changed, 34 insertions, 25 deletions

diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac
index 036161c0..4adf0659 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 c3b83cb6..58a5f7fb 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 00000000..5c0d41bb
--- /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
index 993c7db8..993c7db8 100644
--- a/src/host/layer23/src/l1ctl.c
+++ b/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
index f6d66bb5..f6d66bb5 100644
--- a/src/host/layer23/src/l1l2_interface.c
+++ b/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
index e798cdc7..e798cdc7 100644
--- a/src/host/layer23/src/lapdm.c
+++ b/src/host/layer23/src/common/lapdm.c
diff --git a/src/host/layer23/src/logging.c b/src/host/layer23/src/common/logging.c
index 82195327..82195327 100644
--- a/src/host/layer23/src/logging.c
+++ b/src/host/layer23/src/common/logging.c
diff --git a/src/host/layer23/src/main.c b/src/host/layer23/src/common/main.c
index 4a32e863..4a32e863 100644
--- a/src/host/layer23/src/main.c
+++ b/src/host/layer23/src/common/main.c
diff --git a/src/host/layer23/src/networks.c b/src/host/layer23/src/common/networks.c
index ae14d80c..ae14d80c 100644
--- a/src/host/layer23/src/networks.c
+++ b/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 00000000..954c5a88
--- /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
index 325345dd..325345dd 100644
--- a/src/host/layer23/src/app_bcch_scan.c
+++ b/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
index a3cf59b5..a3cf59b5 100644
--- a/src/host/layer23/src/app_echo_test.c
+++ b/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
index b225a9ae..b225a9ae 100644
--- a/src/host/layer23/src/app_phone.c
+++ b/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
index d0383231..d0383231 100644
--- a/src/host/layer23/src/bcch_scan.c
+++ b/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
index 0680afb0..0680afb0 100644
--- a/src/host/layer23/src/layer3.c
+++ b/src/host/layer23/src/misc/layer3.c
diff --git a/src/host/layer23/src/rslms.c b/src/host/layer23/src/misc/rslms.c
index 90920787..90920787 100644
--- a/src/host/layer23/src/rslms.c
+++ b/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 00000000..5dbda72a
--- /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
index 53e26bc1..53e26bc1 100644
--- a/src/host/layer23/src/app_mobile.c
+++ b/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
index 405483c7..405483c7 100644
--- a/src/host/layer23/src/gsm322.c
+++ b/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
index 820ce665..820ce665 100644
--- a/src/host/layer23/src/gsm48_cc.c
+++ b/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
index 82d09a7e..82d09a7e 100644
--- a/src/host/layer23/src/gsm48_mm.c
+++ b/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
index 37d8a671..37d8a671 100644
--- a/src/host/layer23/src/gsm48_rr.c
+++ b/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
index 8d5a54bf..8d5a54bf 100644
--- a/src/host/layer23/src/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
diff --git a/src/host/layer23/src/settings.c b/src/host/layer23/src/mobile/settings.c
index 096b3db7..096b3db7 100644
--- a/src/host/layer23/src/settings.c
+++ b/src/host/layer23/src/mobile/settings.c
diff --git a/src/host/layer23/src/subscriber.c b/src/host/layer23/src/mobile/subscriber.c
index 8245cdcc..8245cdcc 100644
--- a/src/host/layer23/src/subscriber.c
+++ b/src/host/layer23/src/mobile/subscriber.c
diff --git a/src/host/layer23/src/support.c b/src/host/layer23/src/mobile/support.c
index 8b8b183e..8b8b183e 100644
--- a/src/host/layer23/src/support.c
+++ b/src/host/layer23/src/mobile/support.c
diff --git a/src/host/layer23/src/sysinfo.c b/src/host/layer23/src/mobile/sysinfo.c
index 0f425b48..0f425b48 100644
--- a/src/host/layer23/src/sysinfo.c
+++ b/src/host/layer23/src/mobile/sysinfo.c
diff --git a/src/host/layer23/src/transaction.c b/src/host/layer23/src/mobile/transaction.c
index 59ec17bd..59ec17bd 100644
--- a/src/host/layer23/src/transaction.c
+++ b/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
index d627d317..d627d317 100644
--- a/src/host/layer23/src/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c