fixeria has uploaded this change for review.
virt_phy: rearrange and clean up header files
* Build up the usual include directory hierarchy.
* Move l1ctl_proto.h to 'include/osmocom/bb/'.
* System headers first, then libosmo*, the local ones.
Change-Id: I25145630ec53c2b8065a42fb12a778eec010f10c
Related: OS#5500
---
M src/host/virt_phy/configure.ac
M src/host/virt_phy/include/Makefile.am
A src/host/virt_phy/include/osmocom/Makefile.am
A src/host/virt_phy/include/osmocom/bb/Makefile.am
A src/host/virt_phy/include/osmocom/bb/l1ctl_proto.h
A src/host/virt_phy/include/osmocom/bb/virtphy/Makefile.am
R src/host/virt_phy/include/osmocom/bb/virtphy/common_util.h
R src/host/virt_phy/include/osmocom/bb/virtphy/gsmtapl1_if.h
R src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h
R src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sock.h
R src/host/virt_phy/include/osmocom/bb/virtphy/logging.h
R src/host/virt_phy/include/osmocom/bb/virtphy/osmo_mcast_sock.h
R src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h
R src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_sched.h
R src/host/virt_phy/include/osmocom/bb/virtphy/virtual_um.h
D src/host/virt_phy/include/virtphy/l1ctl_proto.h
M src/host/virt_phy/src/gsmtapl1_if.c
M src/host/virt_phy/src/l1ctl_sap.c
M src/host/virt_phy/src/l1ctl_sock.c
M src/host/virt_phy/src/logging.c
M src/host/virt_phy/src/shared/osmo_mcast_sock.c
M src/host/virt_phy/src/shared/virtual_um.c
M src/host/virt_phy/src/virt_l1_model.c
M src/host/virt_phy/src/virt_l1_sched_simple.c
M src/host/virt_phy/src/virt_prim_data.c
M src/host/virt_phy/src/virt_prim_fbsb.c
M src/host/virt_phy/src/virt_prim_pm.c
M src/host/virt_phy/src/virt_prim_rach.c
M src/host/virt_phy/src/virt_prim_traffic.c
M src/host/virt_phy/src/virtphy.c
30 files changed, 150 insertions(+), 101 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/31848/1
diff --git a/src/host/virt_phy/configure.ac b/src/host/virt_phy/configure.ac
index 2a29bc8..19e4bc7 100644
--- a/src/host/virt_phy/configure.ac
+++ b/src/host/virt_phy/configure.ac
@@ -60,6 +60,9 @@
AC_CONFIG_FILES([
Makefile
include/Makefile
+ include/osmocom/Makefile
+ include/osmocom/bb/Makefile
+ include/osmocom/bb/virtphy/Makefile
src/Makefile
])
AC_OUTPUT
diff --git a/src/host/virt_phy/include/Makefile.am b/src/host/virt_phy/include/Makefile.am
index ff3e8cb..9d963a0 100644
--- a/src/host/virt_phy/include/Makefile.am
+++ b/src/host/virt_phy/include/Makefile.am
@@ -1,11 +1,3 @@
-noinst_HEADERS = \
- virtphy/logging.h \
- virtphy/osmo_mcast_sock.h \
- virtphy/l1ctl_proto.h \
- virtphy/l1ctl_sock.h \
- virtphy/virtual_um.h \
- virtphy/gsmtapl1_if.h \
- virtphy/virt_l1_sched.h \
- virtphy/common_util.h \
- virtphy/l1ctl_sap.h \
- virtphy/virt_l1_model.h
+SUBDIRS = \
+ osmocom \
+ $(NULL)
diff --git a/src/host/virt_phy/include/osmocom/Makefile.am b/src/host/virt_phy/include/osmocom/Makefile.am
new file mode 100644
index 0000000..83c6385
--- /dev/null
+++ b/src/host/virt_phy/include/osmocom/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+ bb \
+ $(NULL)
diff --git a/src/host/virt_phy/include/osmocom/bb/Makefile.am b/src/host/virt_phy/include/osmocom/bb/Makefile.am
new file mode 100644
index 0000000..c52fb93
--- /dev/null
+++ b/src/host/virt_phy/include/osmocom/bb/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = \
+ virtphy \
+ $(NULL)
+
+noinst_HEADERS = \
+ l1ctl_proto.h \
+ $(NULL)
diff --git a/src/host/virt_phy/include/osmocom/bb/l1ctl_proto.h b/src/host/virt_phy/include/osmocom/bb/l1ctl_proto.h
new file mode 120000
index 0000000..ee19b80
--- /dev/null
+++ b/src/host/virt_phy/include/osmocom/bb/l1ctl_proto.h
@@ -0,0 +1 @@
+../../../../../../include/l1ctl_proto.h
\ No newline at end of file
diff --git a/src/host/virt_phy/include/osmocom/bb/virtphy/Makefile.am b/src/host/virt_phy/include/osmocom/bb/virtphy/Makefile.am
new file mode 100644
index 0000000..7584609
--- /dev/null
+++ b/src/host/virt_phy/include/osmocom/bb/virtphy/Makefile.am
@@ -0,0 +1,11 @@
+noinst_HEADERS = \
+ logging.h \
+ osmo_mcast_sock.h \
+ l1ctl_sock.h \
+ virtual_um.h \
+ gsmtapl1_if.h \
+ virt_l1_sched.h \
+ common_util.h \
+ l1ctl_sap.h \
+ virt_l1_model.h \
+ $(NULL)
diff --git a/src/host/virt_phy/include/virtphy/common_util.h b/src/host/virt_phy/include/osmocom/bb/virtphy/common_util.h
similarity index 100%
rename from src/host/virt_phy/include/virtphy/common_util.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/common_util.h
diff --git a/src/host/virt_phy/include/virtphy/gsmtapl1_if.h b/src/host/virt_phy/include/osmocom/bb/virtphy/gsmtapl1_if.h
similarity index 72%
rename from src/host/virt_phy/include/virtphy/gsmtapl1_if.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/gsmtapl1_if.h
index 8dab6b2..c9e9252 100644
--- a/src/host/virt_phy/include/virtphy/gsmtapl1_if.h
+++ b/src/host/virt_phy/include/osmocom/bb/virtphy/gsmtapl1_if.h
@@ -2,9 +2,10 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/gsmtap.h>
-#include <virtphy/virtual_um.h>
-#include <virtphy/l1ctl_sock.h>
-#include <virtphy/virt_l1_model.h>
+
+#include <osmocom/bb/virtphy/virtual_um.h>
+#include <osmocom/bb/virtphy/l1ctl_sock.h>
+#include <osmocom/bb/virtphy/virt_l1_model.h>
void gsmtapl1_init(struct l1_model_ms *model);
void gsmtapl1_rx_from_virt_um_inst_cb(struct virt_um_inst *vui,
diff --git a/src/host/virt_phy/include/virtphy/l1ctl_sap.h b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h
similarity index 95%
rename from src/host/virt_phy/include/virtphy/l1ctl_sap.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h
index 6306eeb..662efb6 100644
--- a/src/host/virt_phy/include/virtphy/l1ctl_sap.h
+++ b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sap.h
@@ -1,11 +1,13 @@
#pragma once
#include <stdint.h>
+
#include <osmocom/core/msgb.h>
-#include <virtphy/l1ctl_proto.h>
-#include <virtphy/virtual_um.h>
-#include <virtphy/l1ctl_sock.h>
-#include <virtphy/virt_l1_model.h>
+
+#include <osmocom/bb/virtphy/virtual_um.h>
+#include <osmocom/bb/virtphy/l1ctl_sock.h>
+#include <osmocom/bb/virtphy/virt_l1_model.h>
+#include <osmocom/bb/l1ctl_proto.h>
/* following sizes are used for message allocation */
/* size of layer 3 header */
diff --git a/src/host/virt_phy/include/virtphy/l1ctl_sock.h b/src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sock.h
similarity index 100%
rename from src/host/virt_phy/include/virtphy/l1ctl_sock.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/l1ctl_sock.h
diff --git a/src/host/virt_phy/include/virtphy/logging.h b/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h
similarity index 100%
rename from src/host/virt_phy/include/virtphy/logging.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/logging.h
diff --git a/src/host/virt_phy/include/virtphy/osmo_mcast_sock.h b/src/host/virt_phy/include/osmocom/bb/virtphy/osmo_mcast_sock.h
similarity index 100%
rename from src/host/virt_phy/include/virtphy/osmo_mcast_sock.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/osmo_mcast_sock.h
diff --git a/src/host/virt_phy/include/virtphy/virt_l1_model.h b/src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h
similarity index 97%
rename from src/host/virt_phy/include/virtphy/virt_l1_model.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h
index ffed708..b729c44 100644
--- a/src/host/virt_phy/include/virtphy/virt_l1_model.h
+++ b/src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_model.h
@@ -2,11 +2,12 @@
/* Per-MS specific state, closely attached to the L1CTL user progran */
-#include <virtphy/virtual_um.h>
-#include <virtphy/l1ctl_sock.h>
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/core/timer.h>
+#include <osmocom/bb/virtphy/virtual_um.h>
+#include <osmocom/bb/virtphy/l1ctl_sock.h>
+
#define L1S_NUM_NEIGH_CELL 6
#define A5_KEY_LEN 8
diff --git a/src/host/virt_phy/include/virtphy/virt_l1_sched.h b/src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_sched.h
similarity index 92%
rename from src/host/virt_phy/include/virtphy/virt_l1_sched.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_sched.h
index b8d401f..d5a1630 100644
--- a/src/host/virt_phy/include/virtphy/virt_l1_sched.h
+++ b/src/host/virt_phy/include/osmocom/bb/virtphy/virt_l1_sched.h
@@ -1,9 +1,11 @@
#pragma once
+
#include <osmocom/core/msgb.h>
-#include <virtphy/virt_l1_model.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/gsm/gsm_utils.h>
-#include <virtphy/virt_l1_sched.h>
+
+#include <osmocom/bb/virtphy/virt_l1_model.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
struct l1_model_ms;
diff --git a/src/host/virt_phy/include/virtphy/virtual_um.h b/src/host/virt_phy/include/osmocom/bb/virtphy/virtual_um.h
similarity index 100%
rename from src/host/virt_phy/include/virtphy/virtual_um.h
rename to src/host/virt_phy/include/osmocom/bb/virtphy/virtual_um.h
diff --git a/src/host/virt_phy/include/virtphy/l1ctl_proto.h b/src/host/virt_phy/include/virtphy/l1ctl_proto.h
deleted file mode 120000
index 95d4161..0000000
--- a/src/host/virt_phy/include/virtphy/l1ctl_proto.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../include/l1ctl_proto.h
\ No newline at end of file
diff --git a/src/host/virt_phy/src/gsmtapl1_if.c b/src/host/virt_phy/src/gsmtapl1_if.c
index 1496ee9..719d370 100644
--- a/src/host/virt_phy/src/gsmtapl1_if.c
+++ b/src/host/virt_phy/src/gsmtapl1_if.c
@@ -20,6 +20,11 @@
*
*/
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
#include <osmocom/core/gsmtap.h>
#include <osmocom/core/gsmtap_util.h>
#include <osmocom/core/utils.h>
@@ -28,18 +33,15 @@
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/core/msgb.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <virtphy/l1ctl_proto.h>
-#include <virtphy/virtual_um.h>
-#include <virtphy/l1ctl_sock.h>
-#include <virtphy/virt_l1_model.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/gsmtapl1_if.h>
-#include <virtphy/logging.h>
-#include <virtphy/virt_l1_sched.h>
+
+#include <osmocom/bb/virtphy/virtual_um.h>
+#include <osmocom/bb/virtphy/l1ctl_sock.h>
+#include <osmocom/bb/virtphy/virt_l1_model.h>
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/gsmtapl1_if.h>
+#include <osmocom/bb/virtphy/logging.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
+#include <osmocom/bb/l1ctl_proto.h>
static char *pseudo_lchan_name(uint16_t arfcn, uint8_t ts, uint8_t ss, uint8_t sub_type)
{
diff --git a/src/host/virt_phy/src/l1ctl_sap.c b/src/host/virt_phy/src/l1ctl_sap.c
index ffe94ac..ab917c6 100644
--- a/src/host/virt_phy/src/l1ctl_sap.c
+++ b/src/host/virt_phy/src/l1ctl_sap.c
@@ -19,6 +19,9 @@
*
*/
+#include <stdio.h>
+#include <string.h>
+#include <netinet/in.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/msgb.h>
@@ -28,17 +31,15 @@
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gsm/rsl.h>
#include <osmocom/gprs/gprs_rlc.h>
-#include <stdio.h>
-#include <virtphy/l1ctl_proto.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <virtphy/virtual_um.h>
-#include <virtphy/l1ctl_sock.h>
-#include <virtphy/virt_l1_model.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/gsmtapl1_if.h>
-#include <virtphy/logging.h>
-#include <virtphy/virt_l1_sched.h>
+
+#include <osmocom/bb/virtphy/virtual_um.h>
+#include <osmocom/bb/virtphy/l1ctl_sock.h>
+#include <osmocom/bb/virtphy/virt_l1_model.h>
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/gsmtapl1_if.h>
+#include <osmocom/bb/virtphy/logging.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
+#include <osmocom/bb/l1ctl_proto.h>
static void l1ctl_rx_tbf_cfg_req(struct l1_model_ms *ms, struct msgb *msg);
static void l1ctl_rx_data_tbf_req(struct l1_model_ms *ms, struct msgb *msg);
diff --git a/src/host/virt_phy/src/l1ctl_sock.c b/src/host/virt_phy/src/l1ctl_sock.c
index 7951f46..089d9ca 100644
--- a/src/host/virt_phy/src/l1ctl_sock.c
+++ b/src/host/virt_phy/src/l1ctl_sock.c
@@ -40,8 +40,8 @@
#include <osmocom/core/talloc.h>
#include <osmocom/core/socket.h>
-#include <virtphy/l1ctl_sock.h>
-#include <virtphy/logging.h>
+#include <osmocom/bb/virtphy/l1ctl_sock.h>
+#include <osmocom/bb/virtphy/logging.h>
#define L1CTL_SOCK_MSGB_SIZE 256
diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c
index 76caa27..5febff5 100644
--- a/src/host/virt_phy/src/logging.c
+++ b/src/host/virt_phy/src/logging.c
@@ -19,7 +19,7 @@
#include <osmocom/core/utils.h>
#include <osmocom/core/application.h>
-#include <virtphy/logging.h>
+#include <osmocom/bb/virtphy/logging.h>
static const char* l1ctlPrimNames[] = {
"_L1CTL_NONE",
diff --git a/src/host/virt_phy/src/shared/osmo_mcast_sock.c b/src/host/virt_phy/src/shared/osmo_mcast_sock.c
index d0c5b6d..d3ae4fe 100644
--- a/src/host/virt_phy/src/shared/osmo_mcast_sock.c
+++ b/src/host/virt_phy/src/shared/osmo_mcast_sock.c
@@ -1,14 +1,16 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
-#include <osmocom/core/socket.h>
-#include <osmocom/core/select.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <talloc.h>
#include <unistd.h>
-#include <virtphy/osmo_mcast_sock.h>
+
+#include <osmocom/core/socket.h>
+#include <osmocom/core/select.h>
+
+#include <osmocom/bb/virtphy/osmo_mcast_sock.h>
/* server socket is what we use for transmission. It is not subscribed
* to a multicast group or locally bound, but it is just a normal UDP
diff --git a/src/host/virt_phy/src/shared/virtual_um.c b/src/host/virt_phy/src/shared/virtual_um.c
index ef3ad37..e55bb03 100644
--- a/src/host/virt_phy/src/shared/virtual_um.c
+++ b/src/host/virt_phy/src/shared/virtual_um.c
@@ -19,17 +19,18 @@
*
*/
+#include <unistd.h>
+#include <errno.h>
+
#include <osmocom/core/select.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/socket.h>
#include <osmocom/core/gsmtap.h>
#include <osmocom/core/msgb.h>
#include <osmocom/core/talloc.h>
-#include <virtphy/osmo_mcast_sock.h>
-#include <virtphy/virtual_um.h>
-#include <unistd.h>
-#include <errno.h>
+#include <osmocom/bb/virtphy/osmo_mcast_sock.h>
+#include <osmocom/bb/virtphy/virtual_um.h>
/**
* Virtual UM interface file descriptor callback.
diff --git a/src/host/virt_phy/src/virt_l1_model.c b/src/host/virt_phy/src/virt_l1_model.c
index 5738bed..704a54c 100644
--- a/src/host/virt_phy/src/virt_l1_model.c
+++ b/src/host/virt_phy/src/virt_l1_model.c
@@ -19,11 +19,12 @@
*
*/
-#include <virtphy/virt_l1_model.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/logging.h>
#include <talloc.h>
+#include <osmocom/bb/virtphy/virt_l1_model.h>
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/logging.h>
+
static uint32_t next_ms_nr;
struct l1_model_ms *l1_model_ms_init(void *ctx, struct l1ctl_sock_client *lsc, struct virt_um_inst *vui)
diff --git a/src/host/virt_phy/src/virt_l1_sched_simple.c b/src/host/virt_phy/src/virt_l1_sched_simple.c
index 486d319..3cad2ce 100644
--- a/src/host/virt_phy/src/virt_l1_sched_simple.c
+++ b/src/host/virt_phy/src/virt_l1_sched_simple.c
@@ -18,13 +18,15 @@
*
*/
-#include <virtphy/virt_l1_sched.h>
-#include <osmocom/core/linuxlist.h>
-#include <virtphy/virt_l1_model.h>
-#include <virtphy/logging.h>
#include <time.h>
#include <talloc.h>
+#include <osmocom/core/linuxlist.h>
+
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
+#include <osmocom/bb/virtphy/virt_l1_model.h>
+#include <osmocom/bb/virtphy/logging.h>
+
/**
* @brief Start scheduler thread based on current gsm time from model
*/
diff --git a/src/host/virt_phy/src/virt_prim_data.c b/src/host/virt_phy/src/virt_prim_data.c
index 51f7585..74050b8 100644
--- a/src/host/virt_phy/src/virt_prim_data.c
+++ b/src/host/virt_phy/src/virt_prim_data.c
@@ -27,12 +27,12 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include <osmocom/core/msgb.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/virt_l1_sched.h>
-#include <virtphy/logging.h>
-#include <virtphy/gsmtapl1_if.h>
-#include <virtphy/l1ctl_proto.h>
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
+#include <osmocom/bb/virtphy/logging.h>
+#include <osmocom/bb/virtphy/gsmtapl1_if.h>
+#include <osmocom/bb/l1ctl_proto.h>
/**
* @brief Handler callback function for DATA request.
diff --git a/src/host/virt_phy/src/virt_prim_fbsb.c b/src/host/virt_phy/src/virt_prim_fbsb.c
index 7c634cb..d012036 100644
--- a/src/host/virt_phy/src/virt_prim_fbsb.c
+++ b/src/host/virt_phy/src/virt_prim_fbsb.c
@@ -25,11 +25,12 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include <osmocom/core/msgb.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/virt_l1_sched.h>
#include <osmocom/core/gsmtap.h>
-#include <virtphy/logging.h>
-#include <virtphy/l1ctl_proto.h>
+
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
+#include <osmocom/bb/virtphy/logging.h>
+#include <osmocom/bb/l1ctl_proto.h>
static uint16_t sync_count = 0;
diff --git a/src/host/virt_phy/src/virt_prim_pm.c b/src/host/virt_phy/src/virt_prim_pm.c
index bb7875d..5883bbb 100644
--- a/src/host/virt_phy/src/virt_prim_pm.c
+++ b/src/host/virt_phy/src/virt_prim_pm.c
@@ -22,14 +22,15 @@
#include <string.h>
#include <stdlib.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/gsmtap.h>
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
-#include <osmocom/core/msgb.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/virt_l1_sched.h>
-#include <osmocom/core/gsmtap.h>
-#include <virtphy/logging.h>
-#include <virtphy/l1ctl_proto.h>
+
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
+#include <osmocom/bb/virtphy/logging.h>
+#include <osmocom/bb/l1ctl_proto.h>
/**
* @brief Change the signal strength for a given arfcn.
diff --git a/src/host/virt_phy/src/virt_prim_rach.c b/src/host/virt_phy/src/virt_prim_rach.c
index a8a8ffa..22b8e29 100644
--- a/src/host/virt_phy/src/virt_prim_rach.c
+++ b/src/host/virt_phy/src/virt_prim_rach.c
@@ -23,16 +23,16 @@
#include <string.h>
#include <stdlib.h>
+#include <osmocom/core/msgb.h>
#include <osmocom/gsm/rsl.h>
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
-#include <osmocom/core/msgb.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/virt_l1_sched.h>
-#include <virtphy/logging.h>
-#include <virtphy/gsmtapl1_if.h>
-#include <virtphy/l1ctl_proto.h>
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
+#include <osmocom/bb/virtphy/logging.h>
+#include <osmocom/bb/virtphy/gsmtapl1_if.h>
+#include <osmocom/bb/l1ctl_proto.h>
/* use if we have a combined uplink (RACH, SDCCH, ...) (see
* http://www.rfwireless-world.com/Terminology/GSM-combined-channel-configuration.html)
diff --git a/src/host/virt_phy/src/virt_prim_traffic.c b/src/host/virt_phy/src/virt_prim_traffic.c
index ae87ad6..3468931 100644
--- a/src/host/virt_phy/src/virt_prim_traffic.c
+++ b/src/host/virt_phy/src/virt_prim_traffic.c
@@ -23,16 +23,16 @@
#include <string.h>
#include <stdlib.h>
+#include <osmocom/core/msgb.h>
#include <osmocom/gsm/rsl.h>
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
-#include <osmocom/core/msgb.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/virt_l1_sched.h>
-#include <virtphy/logging.h>
-#include <virtphy/gsmtapl1_if.h>
-#include <virtphy/l1ctl_proto.h>
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
+#include <osmocom/bb/virtphy/logging.h>
+#include <osmocom/bb/virtphy/gsmtapl1_if.h>
+#include <osmocom/bb/l1ctl_proto.h>
/**
* @brief Handler callback function for TRAFFIC request.
diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c
index f2b8e5d..ad09a53 100644
--- a/src/host/virt_phy/src/virtphy.c
+++ b/src/host/virt_phy/src/virtphy.c
@@ -20,10 +20,6 @@
*
*/
-#include <osmocom/core/msgb.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/gsmtap.h>
-#include <osmocom/core/application.h>
#include <stdint.h>
#include <string.h>
#include <stdio.h>
@@ -31,13 +27,19 @@
#include <getopt.h>
#include <errno.h>
#include <signal.h>
-#include <virtphy/virtual_um.h>
-#include <virtphy/l1ctl_sock.h>
-#include <virtphy/virt_l1_model.h>
-#include <virtphy/l1ctl_sap.h>
-#include <virtphy/gsmtapl1_if.h>
-#include <virtphy/logging.h>
-#include <virtphy/virt_l1_sched.h>
+
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/gsmtap.h>
+#include <osmocom/core/application.h>
+
+#include <osmocom/bb/virtphy/virtual_um.h>
+#include <osmocom/bb/virtphy/l1ctl_sock.h>
+#include <osmocom/bb/virtphy/virt_l1_model.h>
+#include <osmocom/bb/virtphy/l1ctl_sap.h>
+#include <osmocom/bb/virtphy/gsmtapl1_if.h>
+#include <osmocom/bb/virtphy/logging.h>
+#include <osmocom/bb/virtphy/virt_l1_sched.h>
#define DEFAULT_LOG_MASK "DL1C,2:DL1P,2:DVIRPHY,2:DMAIN,1"
To view, visit change 31848. To unsubscribe, or for help writing mail filters, visit settings.