trxcon: group header files into 'include/osmocom/bb/trxcon'

This is the first step towards the goal of moving the scheduler
into a separate library.

Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4
Related: OS#5599, OS#3761
changes/02/28502/1
Vadim Yanitskiy 7 months ago
parent 57ce62f4bc
commit b7335dfe79
  1. 4
      src/host/trxcon/Makefile.am
  2. 8
      src/host/trxcon/configure.ac
  3. 3
      src/host/trxcon/include/Makefile.am
  4. 3
      src/host/trxcon/include/osmocom/Makefile.am
  5. 3
      src/host/trxcon/include/osmocom/bb/Makefile.am
  6. 10
      src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
  7. 4
      src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
  8. 0
      src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h
  9. 1
      src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h
  10. 0
      src/host/trxcon/include/osmocom/bb/trxcon/logging.h
  11. 4
      src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h
  12. 0
      src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h
  13. 4
      src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h
  14. 0
      src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
  15. 10
      src/host/trxcon/l1ctl.c
  16. 8
      src/host/trxcon/l1ctl_link.c
  17. 1
      src/host/trxcon/l1ctl_proto.h
  18. 2
      src/host/trxcon/logging.c
  19. 6
      src/host/trxcon/sched_clck.c
  20. 14
      src/host/trxcon/sched_lchan_common.c
  21. 2
      src/host/trxcon/sched_lchan_desc.c
  22. 12
      src/host/trxcon/sched_lchan_pdtch.c
  23. 12
      src/host/trxcon/sched_lchan_rach.c
  24. 12
      src/host/trxcon/sched_lchan_sch.c
  25. 12
      src/host/trxcon/sched_lchan_tchf.c
  26. 12
      src/host/trxcon/sched_lchan_tchh.c
  27. 12
      src/host/trxcon/sched_lchan_xcch.c
  28. 2
      src/host/trxcon/sched_mframe.c
  29. 8
      src/host/trxcon/sched_prim.c
  30. 10
      src/host/trxcon/sched_trx.c
  31. 10
      src/host/trxcon/trx_if.c
  32. 16
      src/host/trxcon/trxcon.c

@ -1,5 +1,9 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
SUBDIRS = \
include \
$(NULL)
AM_CPPFLAGS = \
$(all_includes) \
-I$(top_srcdir)/include \

@ -31,5 +31,9 @@ fi
dnl Checks for typedefs, structures and compiler characteristics
AC_OUTPUT(
Makefile)
AC_CONFIG_FILES([include/Makefile
include/osmocom/Makefile
include/osmocom/bb/Makefile
include/osmocom/bb/trxcon/Makefile
Makefile])
AC_OUTPUT

@ -0,0 +1,3 @@
SUBDIRS = \
osmocom \
$(NULL)

@ -0,0 +1,3 @@
SUBDIRS = \
bb \
$(NULL)

@ -0,0 +1,3 @@
SUBDIRS = \
trxcon \
$(NULL)

@ -0,0 +1,10 @@
noinst_HEADERS = \
l1ctl_proto.h \
l1ctl_link.h \
l1ctl.h \
scheduler.h \
sched_trx.h \
trx_if.h \
logging.h \
trxcon.h \
$(NULL)

@ -3,8 +3,8 @@
#include <stdint.h>
#include <osmocom/core/msgb.h>
#include "l1ctl_link.h"
#include "l1ctl_proto.h"
#include <osmocom/bb/trxcon/l1ctl_link.h>
#include <osmocom/bb/trxcon/l1ctl_proto.h>
/* Event handlers */
int l1ctl_rx_cb(struct l1ctl_link *l1l, struct msgb *msg);

@ -0,0 +1 @@
../../../../../../../include/l1ctl_proto.h

@ -9,8 +9,8 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/core/linuxlist.h>
#include "logging.h"
#include "scheduler.h"
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/scheduler.h>
#define GSM_BURST_LEN 148
#define GSM_BURST_PL_LEN 116

@ -5,8 +5,8 @@
#include <osmocom/core/timer.h>
#include <osmocom/core/fsm.h>
#include "scheduler.h"
#include "sched_trx.h"
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#define TRXC_BUF_SIZE 1024
#define TRXD_BUF_SIZE 512

@ -35,12 +35,12 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include "logging.h"
#include "l1ctl_link.h"
#include "l1ctl_proto.h"
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/l1ctl_link.h>
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include "trx_if.h"
#include "sched_trx.h"
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/sched_trx.h>
static const char *arfcn2band_name(uint16_t arfcn)
{

@ -36,10 +36,10 @@
#include <osmocom/core/socket.h>
#include <osmocom/core/write_queue.h>
#include "trxcon.h"
#include "logging.h"
#include "l1ctl_link.h"
#include "l1ctl.h"
#include <osmocom/bb/trxcon/trxcon.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/l1ctl_link.h>
#include <osmocom/bb/trxcon/l1ctl.h>
static struct value_string l1ctl_evt_names[] = {
{ 0, NULL } /* no events? */

@ -1 +0,0 @@
../../../include/l1ctl_proto.h

@ -21,7 +21,7 @@
#include <osmocom/core/logging.h>
#include <osmocom/core/utils.h>
#include "logging.h"
#include <osmocom/bb/trxcon/logging.h>
static struct log_info_cat trx_log_info_cat[] = {
[DAPP] = {

@ -38,9 +38,9 @@
#include <osmocom/core/timer_compat.h>
#include <osmocom/gsm/a5.h>
#include "scheduler.h"
#include "logging.h"
#include "trx_if.h"
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trx_if.h>
#define MAX_FN_SKEW 50
#define TRX_LOSS_FRAMES 400

@ -36,13 +36,13 @@
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "logging.h"
#include "trxcon.h"
#include "trx_if.h"
#include "l1ctl.h"
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trxcon.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/l1ctl.h>
/* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */
const uint8_t sched_nb_training_bits[8][26] = {

@ -26,7 +26,7 @@
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include <osmocom/core/gsmtap.h>
#include "sched_trx.h"
#include <osmocom/bb/trxcon/sched_trx.h>
/* Forward declaration of handlers */
int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts,

@ -30,12 +30,12 @@
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/coding/gsm0503_coding.h>
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "logging.h"
#include "trx_if.h"
#include "l1ctl.h"
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/l1ctl.h>
int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts,
struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,

@ -30,12 +30,12 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/coding/gsm0503_coding.h>
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "logging.h"
#include "trx_if.h"
#include "l1ctl.h"
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/l1ctl.h>
/* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)" */
#define RACH_EXT_TAIL_BITS_LEN 8

@ -31,12 +31,12 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/coding/gsm0503_coding.h>
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "logging.h"
#include "trx_if.h"
#include "l1ctl.h"
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/l1ctl.h>
static void decode_sb(struct gsm_time *time, uint8_t *bsic, uint8_t *sb_info)
{

@ -32,12 +32,12 @@
#include <osmocom/coding/gsm0503_coding.h>
#include <osmocom/codec/codec.h>
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "logging.h"
#include "trx_if.h"
#include "l1ctl.h"
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/l1ctl.h>
int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts,
struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,

@ -35,12 +35,12 @@
#include <osmocom/coding/gsm0503_coding.h>
#include <osmocom/codec/codec.h>
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "logging.h"
#include "trx_if.h"
#include "l1ctl.h"
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/l1ctl.h>
static const uint8_t tch_h0_traffic_block_map[3][4] = {
/* B0(0,2,4,6), B1(4,6,8,10), B2(8,10,0,2) */

@ -30,12 +30,12 @@
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/coding/gsm0503_coding.h>
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "logging.h"
#include "trx_if.h"
#include "l1ctl.h"
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/l1ctl.h>
int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts,
struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,

@ -25,7 +25,7 @@
#include <osmocom/gsm/gsm_utils.h>
#include "sched_trx.h"
#include <osmocom/bb/trxcon/sched_trx.h>
/* Non-combined CCCH */
static const struct trx_frame frame_bcch[51] = {

@ -29,10 +29,10 @@
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include "scheduler.h"
#include "sched_trx.h"
#include "trx_if.h"
#include "logging.h"
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/logging.h>
/**
* Initializes a new primitive by allocating memory

@ -31,11 +31,11 @@
#include <osmocom/core/logging.h>
#include <osmocom/core/linuxlist.h>
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "trx_if.h"
#include "logging.h"
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/logging.h>
static void sched_trx_a5_burst_enc(struct trx_lchan_state *lchan,
struct sched_burst_req *br);

@ -39,11 +39,11 @@
#include <osmocom/gsm/gsm_utils.h>
#include "l1ctl.h"
#include "trxcon.h"
#include "trx_if.h"
#include "logging.h"
#include "scheduler.h"
#include <osmocom/bb/trxcon/l1ctl.h>
#include <osmocom/bb/trxcon/trxcon.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/scheduler.h>
static struct value_string trx_evt_names[] = {
{ 0, NULL } /* no events? */

@ -39,14 +39,14 @@
#include <osmocom/gsm/gsm_utils.h>
#include "trxcon.h"
#include "trx_if.h"
#include "logging.h"
#include "l1ctl.h"
#include "l1ctl_link.h"
#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include <osmocom/bb/trxcon/trxcon.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/l1ctl.h>
#include <osmocom/bb/trxcon/l1ctl_link.h>
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/scheduler.h>
#include <osmocom/bb/trxcon/sched_trx.h>
#define COPYRIGHT \
"Copyright (C) 2016-2020 by Vadim Yanitskiy <axilirator@gmail.com>\n" \

Loading…
Cancel
Save