fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31333 )
Change subject: trxcon: move l1ctl_proto.h to 'include/osmocom/bb/' ......................................................................
trxcon: move l1ctl_proto.h to 'include/osmocom/bb/'
The upcoming l1gprs library will be using this header too.
Change-Id: I2101b20637f837038115497873bd905f95a3d0c2 --- M src/host/trxcon/include/osmocom/bb/Makefile.am A src/host/trxcon/include/osmocom/bb/l1ctl_proto.h M src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am D src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h M src/host/trxcon/src/l1ctl.c 5 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/31333/1
diff --git a/src/host/trxcon/include/osmocom/bb/Makefile.am b/src/host/trxcon/include/osmocom/bb/Makefile.am index c26db00..127a2c7 100644 --- a/src/host/trxcon/include/osmocom/bb/Makefile.am +++ b/src/host/trxcon/include/osmocom/bb/Makefile.am @@ -2,3 +2,7 @@ l1sched \ trxcon \ $(NULL) + +noinst_HEADERS = \ + l1ctl_proto.h \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/bb/l1ctl_proto.h b/src/host/trxcon/include/osmocom/bb/l1ctl_proto.h new file mode 120000 index 0000000..ee19b80 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/l1ctl_proto.h @@ -0,0 +1 @@ +../../../../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am index bd9324a..ad1e89a 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am +++ b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am @@ -1,5 +1,4 @@ noinst_HEADERS = \ - l1ctl_proto.h \ l1ctl_server.h \ l1ctl.h \ phyif.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 deleted file mode 120000 index 7ab0f41..0000000 --- a/src/host/trxcon/include/osmocom/bb/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/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index b0516cd..ec98f82 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -39,8 +39,8 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h>
+#include <osmocom/bb/l1ctl_proto.h> #include <osmocom/bb/trxcon/logging.h> -#include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/trxcon/trxcon.h> #include <osmocom/bb/trxcon/trxcon_fsm.h>