trxcon: move osmocom/bb/{trxcon->l1sched}/l1sched.h
Change-Id: I41348b738cce9954afafa0952da050306838b908 Related: OS#5599, OS#3761
This commit is contained in:
parent
504f0293df
commit
a986c466f0
|
@ -36,6 +36,7 @@ AC_CONFIG_MACRO_DIRS([m4])
|
||||||
AC_CONFIG_FILES([include/Makefile
|
AC_CONFIG_FILES([include/Makefile
|
||||||
include/osmocom/Makefile
|
include/osmocom/Makefile
|
||||||
include/osmocom/bb/Makefile
|
include/osmocom/bb/Makefile
|
||||||
|
include/osmocom/bb/l1sched/Makefile
|
||||||
include/osmocom/bb/trxcon/Makefile
|
include/osmocom/bb/trxcon/Makefile
|
||||||
src/Makefile
|
src/Makefile
|
||||||
Makefile])
|
Makefile])
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
|
l1sched \
|
||||||
trxcon \
|
trxcon \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
noinst_HEADERS = \
|
||||||
|
l1sched.h \
|
||||||
|
$(NULL)
|
|
@ -2,7 +2,6 @@ noinst_HEADERS = \
|
||||||
l1ctl_proto.h \
|
l1ctl_proto.h \
|
||||||
l1ctl_server.h \
|
l1ctl_server.h \
|
||||||
l1ctl.h \
|
l1ctl.h \
|
||||||
l1sched.h \
|
|
||||||
trx_if.h \
|
trx_if.h \
|
||||||
logging.h \
|
logging.h \
|
||||||
trxcon.h \
|
trxcon.h \
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
#include <osmocom/bb/trxcon/l1ctl_proto.h>
|
#include <osmocom/bb/trxcon/l1ctl_proto.h>
|
||||||
|
|
||||||
#include <osmocom/bb/trxcon/trx_if.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>
|
#include <osmocom/bb/trxcon/trxcon.h>
|
||||||
|
|
||||||
static const char *arfcn2band_name(uint16_t arfcn)
|
static const char *arfcn2band_name(uint16_t arfcn)
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <osmocom/core/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <osmocom/core/timer_compat.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>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
#define MAX_FN_SKEW 50
|
#define MAX_FN_SKEW 50
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
||||||
#include <osmocom/gsm/protocol/gsm_08_58.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>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
/* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */
|
/* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <osmocom/gsm/protocol/gsm_08_58.h>
|
#include <osmocom/gsm/protocol/gsm_08_58.h>
|
||||||
#include <osmocom/core/gsmtap.h>
|
#include <osmocom/core/gsmtap.h>
|
||||||
|
|
||||||
#include <osmocom/bb/trxcon/l1sched.h>
|
#include <osmocom/bb/l1sched/l1sched.h>
|
||||||
|
|
||||||
/* Forward declaration of handlers */
|
/* Forward declaration of handlers */
|
||||||
int rx_data_fn(struct l1sched_lchan_state *lchan,
|
int rx_data_fn(struct l1sched_lchan_state *lchan,
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
||||||
#include <osmocom/coding/gsm0503_coding.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>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
int rx_pdtch_fn(struct l1sched_lchan_state *lchan,
|
int rx_pdtch_fn(struct l1sched_lchan_state *lchan,
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <osmocom/gsm/gsm_utils.h>
|
#include <osmocom/gsm/gsm_utils.h>
|
||||||
#include <osmocom/coding/gsm0503_coding.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>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
/* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)" */
|
/* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)" */
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <osmocom/gsm/gsm_utils.h>
|
#include <osmocom/gsm/gsm_utils.h>
|
||||||
#include <osmocom/coding/gsm0503_coding.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>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info)
|
static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info)
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <osmocom/coding/gsm0503_coding.h>
|
#include <osmocom/coding/gsm0503_coding.h>
|
||||||
#include <osmocom/codec/codec.h>
|
#include <osmocom/codec/codec.h>
|
||||||
|
|
||||||
#include <osmocom/bb/trxcon/l1sched.h>
|
#include <osmocom/bb/l1sched/l1sched.h>
|
||||||
#include <osmocom/bb/trxcon/logging.h>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
int rx_tchf_fn(struct l1sched_lchan_state *lchan,
|
int rx_tchf_fn(struct l1sched_lchan_state *lchan,
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <osmocom/coding/gsm0503_coding.h>
|
#include <osmocom/coding/gsm0503_coding.h>
|
||||||
#include <osmocom/codec/codec.h>
|
#include <osmocom/codec/codec.h>
|
||||||
|
|
||||||
#include <osmocom/bb/trxcon/l1sched.h>
|
#include <osmocom/bb/l1sched/l1sched.h>
|
||||||
#include <osmocom/bb/trxcon/logging.h>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
static const uint8_t tch_h0_traffic_block_map[3][4] = {
|
static const uint8_t tch_h0_traffic_block_map[3][4] = {
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
||||||
#include <osmocom/coding/gsm0503_coding.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>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
int rx_data_fn(struct l1sched_lchan_state *lchan,
|
int rx_data_fn(struct l1sched_lchan_state *lchan,
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#include <osmocom/gsm/gsm_utils.h>
|
#include <osmocom/gsm/gsm_utils.h>
|
||||||
|
|
||||||
#include <osmocom/bb/trxcon/l1sched.h>
|
#include <osmocom/bb/l1sched/l1sched.h>
|
||||||
|
|
||||||
/* Non-combined CCCH */
|
/* Non-combined CCCH */
|
||||||
static const struct l1sched_tdma_frame frame_bcch[51] = {
|
static const struct l1sched_tdma_frame frame_bcch[51] = {
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
#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>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <osmocom/core/logging.h>
|
#include <osmocom/core/logging.h>
|
||||||
#include <osmocom/core/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
|
|
||||||
#include <osmocom/bb/trxcon/l1sched.h>
|
#include <osmocom/bb/l1sched/l1sched.h>
|
||||||
#include <osmocom/bb/trxcon/logging.h>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
static int l1sched_cfg_pchan_comb_req(struct l1sched_state *sched,
|
static int l1sched_cfg_pchan_comb_req(struct l1sched_state *sched,
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
#include <osmocom/gsm/gsm_utils.h>
|
#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/l1ctl.h>
|
||||||
#include <osmocom/bb/trxcon/trxcon.h>
|
#include <osmocom/bb/trxcon/trxcon.h>
|
||||||
#include <osmocom/bb/trxcon/trx_if.h>
|
#include <osmocom/bb/trxcon/trx_if.h>
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
#include <osmocom/bb/trxcon/l1ctl.h>
|
#include <osmocom/bb/trxcon/l1ctl.h>
|
||||||
#include <osmocom/bb/trxcon/l1ctl_server.h>
|
#include <osmocom/bb/trxcon/l1ctl_server.h>
|
||||||
#include <osmocom/bb/trxcon/l1ctl_proto.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))
|
#define S(x) (1 << (x))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue