diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-07-22 19:54:14 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-07-23 16:30:26 +0700 |
| commit | a986c466f0e6c0083d00f65cce8d6fcd3134b807 (patch) | |
| tree | 3091bb7a10a8b4fa051de2916d0306b617b6b461 | |
| parent | 504f0293df685407f2c90071254151972991c0f6 (diff) | |
trxcon: move osmocom/bb/{trxcon->l1sched}/l1sched.h
20 files changed, 20 insertions, 16 deletions
diff --git a/src/host/trxcon/configure.ac b/src/host/trxcon/configure.ac index 9e0a198b..f6459916 100644 --- 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]) diff --git a/src/host/trxcon/include/osmocom/bb/Makefile.am b/src/host/trxcon/include/osmocom/bb/Makefile.am index 008a9660..c26db00d 100644 --- 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) diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/Makefile.am b/src/host/trxcon/include/osmocom/bb/l1sched/Makefile.am new file mode 100644 index 00000000..295cc6b4 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/l1sched/Makefile.am @@ -0,0 +1,3 @@ +noinst_HEADERS = \ + l1sched.h \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 29694107..29694107 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am index 3b9b2169..44bcd498 100644 --- 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 \ diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index f8faa978..6b8cec2e 100644 --- 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) diff --git a/src/host/trxcon/src/sched_clck.c b/src/host/trxcon/src/sched_clck.c index 7ac83e28..27e8eb9d 100644 --- 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 diff --git a/src/host/trxcon/src/sched_lchan_common.c b/src/host/trxcon/src/sched_lchan_common.c index 8bbb9beb..5d5ef6da 100644 --- 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) */ diff --git a/src/host/trxcon/src/sched_lchan_desc.c b/src/host/trxcon/src/sched_lchan_desc.c index 60cba7af..54635ba1 100644 --- 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, diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index cb0f1ec9..9cad53a9 100644 --- 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, diff --git a/src/host/trxcon/src/sched_lchan_rach.c b/src/host/trxcon/src/sched_lchan_rach.c index 808cfe8f..e5944c61 100644 --- 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)" */ diff --git a/src/host/trxcon/src/sched_lchan_sch.c b/src/host/trxcon/src/sched_lchan_sch.c index d29083c0..235e64ce 100644 --- 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) diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index e7a04446..83491931 100644 --- 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, diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index b34bc6b2..de9c0477 100644 --- 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] = { diff --git a/src/host/trxcon/src/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c index e9ed05fc..e6777640 100644 --- 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, diff --git a/src/host/trxcon/src/sched_mframe.c b/src/host/trxcon/src/sched_mframe.c index 857755bd..e8aa4397 100644 --- 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] = { diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index bcc9bce5..0b1b0df7 100644 --- 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> /** diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 1c0910e0..443c23d4 100644 --- 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, diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index d7e28c68..7daedad6 100644 --- 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> diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 1e122936..0cc0de99 100644 --- 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)) |