fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28543 )
Change subject: trxcon: group *.c files into 'src' directory ......................................................................
trxcon: group *.c files into 'src' directory
Change-Id: I1a3703e48507cd51cd8198f13b993f54c44bc41e Related: OS#5599, OS#3761 --- M src/host/trxcon/.gitignore M src/host/trxcon/Makefile.am M src/host/trxcon/configure.ac A src/host/trxcon/src/Makefile.am R src/host/trxcon/src/l1ctl.c R src/host/trxcon/src/l1ctl_link.c R src/host/trxcon/src/logging.c R src/host/trxcon/src/sched_clck.c R src/host/trxcon/src/sched_lchan_common.c R src/host/trxcon/src/sched_lchan_desc.c R src/host/trxcon/src/sched_lchan_pdtch.c R src/host/trxcon/src/sched_lchan_rach.c R src/host/trxcon/src/sched_lchan_sch.c R src/host/trxcon/src/sched_lchan_tchf.c R src/host/trxcon/src/sched_lchan_tchh.c R src/host/trxcon/src/sched_lchan_xcch.c R src/host/trxcon/src/sched_mframe.c R src/host/trxcon/src/sched_prim.c R src/host/trxcon/src/sched_trx.c R src/host/trxcon/src/trx_if.c R src/host/trxcon/src/trxcon.c 21 files changed, 46 insertions(+), 45 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/43/28543/1
diff --git a/src/host/trxcon/.gitignore b/src/host/trxcon/.gitignore index fe90e43..1cc7ffb 100644 --- a/src/host/trxcon/.gitignore +++ b/src/host/trxcon/.gitignore @@ -20,7 +20,7 @@ *.o *.a
-trxcon +/src/trxcon
# various .version diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index aa0ae56..276eb06 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -2,50 +2,7 @@
SUBDIRS = \ include \ - $(NULL) - -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOCODING_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(NULL) - -bin_PROGRAMS = trxcon - -trxcon_SOURCES = \ - l1ctl_link.c \ - l1ctl.c \ - trx_if.c \ - logging.c \ - trxcon.c \ - $(NULL) - -# Scheduler -trxcon_SOURCES += \ - sched_lchan_common.c \ - sched_lchan_pdtch.c \ - sched_lchan_desc.c \ - sched_lchan_xcch.c \ - sched_lchan_tchf.c \ - sched_lchan_tchh.c \ - sched_lchan_rach.c \ - sched_lchan_sch.c \ - sched_mframe.c \ - sched_clck.c \ - sched_prim.c \ - sched_trx.c \ - $(NULL) - -trxcon_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOCODING_LIBS) \ - $(LIBOSMOGSM_LIBS) \ + src \ $(NULL)
BUILT_SOURCES = \ diff --git a/src/host/trxcon/configure.ac b/src/host/trxcon/configure.ac index 0e5ce6f..68bb3bd 100644 --- a/src/host/trxcon/configure.ac +++ b/src/host/trxcon/configure.ac @@ -35,5 +35,6 @@ include/osmocom/Makefile include/osmocom/bb/Makefile include/osmocom/bb/trxcon/Makefile + src/Makefile Makefile]) AC_OUTPUT diff --git a/src/host/trxcon/src/Makefile.am b/src/host/trxcon/src/Makefile.am new file mode 100644 index 0000000..bc2aa91 --- /dev/null +++ b/src/host/trxcon/src/Makefile.am @@ -0,0 +1,43 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOCODING_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(NULL) + +bin_PROGRAMS = trxcon + +trxcon_SOURCES = \ + l1ctl_link.c \ + l1ctl.c \ + trx_if.c \ + logging.c \ + trxcon.c \ + $(NULL) + +# Scheduler +trxcon_SOURCES += \ + sched_lchan_common.c \ + sched_lchan_pdtch.c \ + sched_lchan_desc.c \ + sched_lchan_xcch.c \ + sched_lchan_tchf.c \ + sched_lchan_tchh.c \ + sched_lchan_rach.c \ + sched_lchan_sch.c \ + sched_mframe.c \ + sched_clck.c \ + sched_prim.c \ + sched_trx.c \ + $(NULL) + +trxcon_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCODING_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/src/l1ctl.c similarity index 100% rename from src/host/trxcon/l1ctl.c rename to src/host/trxcon/src/l1ctl.c diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/src/l1ctl_link.c similarity index 100% rename from src/host/trxcon/l1ctl_link.c rename to src/host/trxcon/src/l1ctl_link.c diff --git a/src/host/trxcon/logging.c b/src/host/trxcon/src/logging.c similarity index 100% rename from src/host/trxcon/logging.c rename to src/host/trxcon/src/logging.c diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/src/sched_clck.c similarity index 100% rename from src/host/trxcon/sched_clck.c rename to src/host/trxcon/src/sched_clck.c diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/src/sched_lchan_common.c similarity index 100% rename from src/host/trxcon/sched_lchan_common.c rename to src/host/trxcon/src/sched_lchan_common.c diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/src/sched_lchan_desc.c similarity index 100% rename from src/host/trxcon/sched_lchan_desc.c rename to src/host/trxcon/src/sched_lchan_desc.c diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c similarity index 100% rename from src/host/trxcon/sched_lchan_pdtch.c rename to src/host/trxcon/src/sched_lchan_pdtch.c diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/src/sched_lchan_rach.c similarity index 100% rename from src/host/trxcon/sched_lchan_rach.c rename to src/host/trxcon/src/sched_lchan_rach.c diff --git a/src/host/trxcon/sched_lchan_sch.c b/src/host/trxcon/src/sched_lchan_sch.c similarity index 100% rename from src/host/trxcon/sched_lchan_sch.c rename to src/host/trxcon/src/sched_lchan_sch.c diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c similarity index 100% rename from src/host/trxcon/sched_lchan_tchf.c rename to src/host/trxcon/src/sched_lchan_tchf.c diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c similarity index 100% rename from src/host/trxcon/sched_lchan_tchh.c rename to src/host/trxcon/src/sched_lchan_tchh.c diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c similarity index 100% rename from src/host/trxcon/sched_lchan_xcch.c rename to src/host/trxcon/src/sched_lchan_xcch.c diff --git a/src/host/trxcon/sched_mframe.c b/src/host/trxcon/src/sched_mframe.c similarity index 100% rename from src/host/trxcon/sched_mframe.c rename to src/host/trxcon/src/sched_mframe.c diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/src/sched_prim.c similarity index 100% rename from src/host/trxcon/sched_prim.c rename to src/host/trxcon/src/sched_prim.c diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/src/sched_trx.c similarity index 100% rename from src/host/trxcon/sched_trx.c rename to src/host/trxcon/src/sched_trx.c diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/src/trx_if.c similarity index 100% rename from src/host/trxcon/trx_if.c rename to src/host/trxcon/src/trx_if.c diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/src/trxcon.c similarity index 100% rename from src/host/trxcon/trxcon.c rename to src/host/trxcon/src/trxcon.c