fixeria has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/28502 )


Change subject: trxcon: group header files into 'include/osmocom/bb/trxcon'
......................................................................

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
---
M src/host/trxcon/Makefile.am
M src/host/trxcon/configure.ac
A src/host/trxcon/include/Makefile.am
A src/host/trxcon/include/osmocom/Makefile.am
A src/host/trxcon/include/osmocom/bb/Makefile.am
A src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h
A src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h
R src/host/trxcon/include/osmocom/bb/trxcon/logging.h
R src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h
R src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h
R src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h
R src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
M src/host/trxcon/l1ctl.c
M src/host/trxcon/l1ctl_link.c
D src/host/trxcon/l1ctl_proto.h
M src/host/trxcon/logging.c
M src/host/trxcon/sched_clck.c
M src/host/trxcon/sched_lchan_common.c
M src/host/trxcon/sched_lchan_desc.c
M src/host/trxcon/sched_lchan_pdtch.c
M src/host/trxcon/sched_lchan_rach.c
M src/host/trxcon/sched_lchan_sch.c
M src/host/trxcon/sched_lchan_tchf.c
M src/host/trxcon/sched_lchan_tchh.c
M src/host/trxcon/sched_lchan_xcch.c
M src/host/trxcon/sched_mframe.c
M src/host/trxcon/sched_prim.c
M src/host/trxcon/sched_trx.c
M src/host/trxcon/trx_if.c
M src/host/trxcon/trxcon.c
32 files changed, 116 insertions(+), 89 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/02/28502/1

diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am
index 893d9ab..aa0ae56 100644
--- a/src/host/trxcon/Makefile.am
+++ b/src/host/trxcon/Makefile.am
@@ -1,5 +1,9 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6

+SUBDIRS = \
+       include \
+       $(NULL)
+
 AM_CPPFLAGS = \
        $(all_includes) \
        -I$(top_srcdir)/include \
diff --git a/src/host/trxcon/configure.ac b/src/host/trxcon/configure.ac
index 1f24260..0e5ce6f 100644
--- a/src/host/trxcon/configure.ac
+++ b/src/host/trxcon/configure.ac
@@ -31,5 +31,9 @@

 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
diff --git a/src/host/trxcon/include/Makefile.am 
b/src/host/trxcon/include/Makefile.am
new file mode 100644
index 0000000..9d963a0
--- /dev/null
+++ b/src/host/trxcon/include/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+       osmocom \
+       $(NULL)
diff --git a/src/host/trxcon/include/osmocom/Makefile.am 
b/src/host/trxcon/include/osmocom/Makefile.am
new file mode 100644
index 0000000..83c6385
--- /dev/null
+++ b/src/host/trxcon/include/osmocom/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+       bb \
+       $(NULL)
diff --git a/src/host/trxcon/include/osmocom/bb/Makefile.am 
b/src/host/trxcon/include/osmocom/bb/Makefile.am
new file mode 100644
index 0000000..008a966
--- /dev/null
+++ b/src/host/trxcon/include/osmocom/bb/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+       trxcon \
+       $(NULL)
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am 
b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
new file mode 100644
index 0000000..e506520
--- /dev/null
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
@@ -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)
diff --git a/src/host/trxcon/l1ctl.h 
b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
similarity index 90%
rename from src/host/trxcon/l1ctl.h
rename to src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
index 48bbe09..f93908d 100644
--- a/src/host/trxcon/l1ctl.h
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
@@ -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);
diff --git a/src/host/trxcon/l1ctl_link.h 
b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h
similarity index 100%
rename from src/host/trxcon/l1ctl_link.h
rename to src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h 
b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h
new file mode 120000
index 0000000..7ab0f41
--- /dev/null
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h
@@ -0,0 +1 @@
+../../../../../../../include/l1ctl_proto.h
\ No newline at end of file
diff --git a/src/host/trxcon/logging.h 
b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h
similarity index 100%
rename from src/host/trxcon/logging.h
rename to src/host/trxcon/include/osmocom/bb/trxcon/logging.h
diff --git a/src/host/trxcon/sched_trx.h 
b/src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h
similarity index 98%
rename from src/host/trxcon/sched_trx.h
rename to src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.h
index 74b41e3..ab8ef34 100644
--- a/src/host/trxcon/sched_trx.h
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/sched_trx.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
diff --git a/src/host/trxcon/scheduler.h 
b/src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h
similarity index 100%
rename from src/host/trxcon/scheduler.h
rename to src/host/trxcon/include/osmocom/bb/trxcon/scheduler.h
diff --git a/src/host/trxcon/trx_if.h 
b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h
similarity index 95%
rename from src/host/trxcon/trx_if.h
rename to src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h
index fa66d4a..89c7dd0 100644
--- a/src/host/trxcon/trx_if.h
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h
@@ -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
diff --git a/src/host/trxcon/trxcon.h 
b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
similarity index 100%
rename from src/host/trxcon/trxcon.h
rename to src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h
diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 94a4d18..ca78e9b 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -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)
 {
diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c
index 552fc8b..b10d9da 100644
--- a/src/host/trxcon/l1ctl_link.c
+++ b/src/host/trxcon/l1ctl_link.c
@@ -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? */
diff --git a/src/host/trxcon/l1ctl_proto.h b/src/host/trxcon/l1ctl_proto.h
deleted file mode 120000
index 75862ba..0000000
--- a/src/host/trxcon/l1ctl_proto.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../include/l1ctl_proto.h
\ No newline at end of file
diff --git a/src/host/trxcon/logging.c b/src/host/trxcon/logging.c
index 8352e6a..04f3568 100644
--- a/src/host/trxcon/logging.c
+++ b/src/host/trxcon/logging.c
@@ -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] = {
diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c
index 9476ccd..1e962aa 100644
--- a/src/host/trxcon/sched_clck.c
+++ b/src/host/trxcon/sched_clck.c
@@ -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
diff --git a/src/host/trxcon/sched_lchan_common.c 
b/src/host/trxcon/sched_lchan_common.c
index ac6d262..f5ee866 100644
--- a/src/host/trxcon/sched_lchan_common.c
+++ b/src/host/trxcon/sched_lchan_common.c
@@ -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] = {
diff --git a/src/host/trxcon/sched_lchan_desc.c 
b/src/host/trxcon/sched_lchan_desc.c
index b6a72b3..ed7b141 100644
--- a/src/host/trxcon/sched_lchan_desc.c
+++ b/src/host/trxcon/sched_lchan_desc.c
@@ -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,
diff --git a/src/host/trxcon/sched_lchan_pdtch.c 
b/src/host/trxcon/sched_lchan_pdtch.c
index ad6a736..3dabc6b 100644
--- a/src/host/trxcon/sched_lchan_pdtch.c
+++ b/src/host/trxcon/sched_lchan_pdtch.c
@@ -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,
diff --git a/src/host/trxcon/sched_lchan_rach.c 
b/src/host/trxcon/sched_lchan_rach.c
index 76c0abb..33c0022 100644
--- a/src/host/trxcon/sched_lchan_rach.c
+++ b/src/host/trxcon/sched_lchan_rach.c
@@ -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
diff --git a/src/host/trxcon/sched_lchan_sch.c 
b/src/host/trxcon/sched_lchan_sch.c
index 4d7804e..ed914a0 100644
--- a/src/host/trxcon/sched_lchan_sch.c
+++ b/src/host/trxcon/sched_lchan_sch.c
@@ -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)
 {
diff --git a/src/host/trxcon/sched_lchan_tchf.c 
b/src/host/trxcon/sched_lchan_tchf.c
index caf3586..6669bb0 100644
--- a/src/host/trxcon/sched_lchan_tchf.c
+++ b/src/host/trxcon/sched_lchan_tchf.c
@@ -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,
diff --git a/src/host/trxcon/sched_lchan_tchh.c 
b/src/host/trxcon/sched_lchan_tchh.c
index ae67de4..3be3a59 100644
--- a/src/host/trxcon/sched_lchan_tchh.c
+++ b/src/host/trxcon/sched_lchan_tchh.c
@@ -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) */
diff --git a/src/host/trxcon/sched_lchan_xcch.c 
b/src/host/trxcon/sched_lchan_xcch.c
index 9fdbcc7..e3accf3 100644
--- a/src/host/trxcon/sched_lchan_xcch.c
+++ b/src/host/trxcon/sched_lchan_xcch.c
@@ -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,
diff --git a/src/host/trxcon/sched_mframe.c b/src/host/trxcon/sched_mframe.c
index 9b759af..f5fb6c9 100644
--- a/src/host/trxcon/sched_mframe.c
+++ b/src/host/trxcon/sched_mframe.c
@@ -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] = {
diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c
index e5554ea..847ebd3 100644
--- a/src/host/trxcon/sched_prim.c
+++ b/src/host/trxcon/sched_prim.c
@@ -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
diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c
index 828787e..618ce8b 100644
--- a/src/host/trxcon/sched_trx.c
+++ b/src/host/trxcon/sched_trx.c
@@ -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);
diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c
index 8dbbd12..7528609 100644
--- a/src/host/trxcon/trx_if.c
+++ b/src/host/trxcon/trx_if.c
@@ -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? */
diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c
index d6ba0c4..998fdde 100644
--- a/src/host/trxcon/trxcon.c
+++ b/src/host/trxcon/trxcon.c
@@ -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 <[email protected]>\n" \

--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28502
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4
Gerrit-Change-Number: 28502
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
Gerrit-MessageType: newchange

Reply via email to