trxcon: move osmocom/bb/{trxcon->l1sched}/l1sched.h

Change-Id: I41348b738cce9954afafa0952da050306838b908 Related: OS#5599, OS#3761
7 months ago · a986c466f0
parent 504f0293df
commit a986c466f0
20 changed files with 20 additions and 16 deletions
--- a/src/host/trxcon/configure.ac
+++ b/src/host/trxcon/configure.ac
@ -36,6 +36,7 @@ AC_CONFIG_MACRO_DIRS([m4])
 AC_CONFIG_FILES([include/Makefile
 		 include/osmocom/Makefile
 		 include/osmocom/bb/Makefile
+		 include/osmocom/bb/l1sched/Makefile
 		 include/osmocom/bb/trxcon/Makefile
 		 src/Makefile
 		 Makefile])
--- a/src/host/trxcon/include/osmocom/bb/Makefile.am
+++ b/src/host/trxcon/include/osmocom/bb/Makefile.am
@ -1,3 +1,4 @@
 SUBDIRS = \
+	l1sched \
 	trxcon \
 	$(NULL)
--- a/src/host/trxcon/include/osmocom/bb/l1sched/Makefile.am
+++ b/src/host/trxcon/include/osmocom/bb/l1sched/Makefile.am
@ -0,0 +1,3 @@
+noinst_HEADERS = \
+	l1sched.h \
+	$(NULL)
--- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h
+++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h
--- a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
@ -2,7 +2,6 @@ noinst_HEADERS = \
 	l1ctl_proto.h \
 	l1ctl_server.h \
 	l1ctl.h \
-	l1sched.h \
 	trx_if.h \
 	logging.h \
 	trxcon.h \
--- a/src/host/trxcon/src/l1ctl.c
+++ b/src/host/trxcon/src/l1ctl.c
@ -41,7 +41,7 @@
 #include <osmocom/bb/trxcon/l1ctl_proto.h>

 #include <osmocom/bb/trxcon/trx_if.h>
-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/trxcon.h>

 static const char *arfcn2band_name(uint16_t arfcn)
--- a/src/host/trxcon/src/sched_clck.c
+++ b/src/host/trxcon/src/sched_clck.c
@ -35,7 +35,7 @@
 #include <osmocom/core/timer.h>
 #include <osmocom/core/timer_compat.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 #define MAX_FN_SKEW		50
--- a/src/host/trxcon/src/sched_lchan_common.c
+++ b/src/host/trxcon/src/sched_lchan_common.c
@ -35,7 +35,7 @@
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/gsm/protocol/gsm_08_58.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 /* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */
--- a/src/host/trxcon/src/sched_lchan_desc.c
+++ b/src/host/trxcon/src/sched_lchan_desc.c
@ -27,7 +27,7 @@
 #include <osmocom/gsm/protocol/gsm_08_58.h>
 #include <osmocom/core/gsmtap.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>

 /* Forward declaration of handlers */
 int rx_data_fn(struct l1sched_lchan_state *lchan,
--- a/src/host/trxcon/src/sched_lchan_pdtch.c
+++ b/src/host/trxcon/src/sched_lchan_pdtch.c
@ -30,7 +30,7 @@
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/coding/gsm0503_coding.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 int rx_pdtch_fn(struct l1sched_lchan_state *lchan,
--- a/src/host/trxcon/src/sched_lchan_rach.c
+++ b/src/host/trxcon/src/sched_lchan_rach.c
@ -30,7 +30,7 @@
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/coding/gsm0503_coding.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 /* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)" */
--- a/src/host/trxcon/src/sched_lchan_sch.c
+++ b/src/host/trxcon/src/sched_lchan_sch.c
@ -32,7 +32,7 @@
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/coding/gsm0503_coding.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info)
--- a/src/host/trxcon/src/sched_lchan_tchf.c
+++ b/src/host/trxcon/src/sched_lchan_tchf.c
@ -32,7 +32,7 @@
 #include <osmocom/coding/gsm0503_coding.h>
 #include <osmocom/codec/codec.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 int rx_tchf_fn(struct l1sched_lchan_state *lchan,
--- a/src/host/trxcon/src/sched_lchan_tchh.c
+++ b/src/host/trxcon/src/sched_lchan_tchh.c
@ -35,7 +35,7 @@
 #include <osmocom/coding/gsm0503_coding.h>
 #include <osmocom/codec/codec.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 static const uint8_t tch_h0_traffic_block_map[3][4] = {
--- a/src/host/trxcon/src/sched_lchan_xcch.c
+++ b/src/host/trxcon/src/sched_lchan_xcch.c
@ -30,7 +30,7 @@
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/coding/gsm0503_coding.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 int rx_data_fn(struct l1sched_lchan_state *lchan,
--- a/src/host/trxcon/src/sched_mframe.c
+++ b/src/host/trxcon/src/sched_mframe.c
@ -25,7 +25,7 @@

 #include <osmocom/gsm/gsm_utils.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>

 /* Non-combined CCCH */
 static const struct l1sched_tdma_frame frame_bcch[51] = {
--- a/src/host/trxcon/src/sched_prim.c
+++ b/src/host/trxcon/src/sched_prim.c
@ -30,7 +30,7 @@

 #include <osmocom/gsm/protocol/gsm_04_08.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 /**
--- a/src/host/trxcon/src/sched_trx.c
+++ b/src/host/trxcon/src/sched_trx.c
@ -32,7 +32,7 @@
 #include <osmocom/core/logging.h>
 #include <osmocom/core/linuxlist.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/logging.h>

 static int l1sched_cfg_pchan_comb_req(struct l1sched_state *sched,
--- a/src/host/trxcon/src/trx_if.c
+++ b/src/host/trxcon/src/trx_if.c
@ -39,7 +39,7 @@

 #include <osmocom/gsm/gsm_utils.h>

-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>
 #include <osmocom/bb/trxcon/l1ctl.h>
 #include <osmocom/bb/trxcon/trxcon.h>
 #include <osmocom/bb/trxcon/trx_if.h>
--- a/src/host/trxcon/src/trxcon.c
+++ b/src/host/trxcon/src/trxcon.c
@ -47,7 +47,7 @@
 #include <osmocom/bb/trxcon/l1ctl.h>
 #include <osmocom/bb/trxcon/l1ctl_server.h>
 #include <osmocom/bb/trxcon/l1ctl_proto.h>
-#include <osmocom/bb/trxcon/l1sched.h>
+#include <osmocom/bb/l1sched/l1sched.h>

 #define S(x)	(1 << (x))