[MERGED] osmo-bts[master]: pcu_if: move definition PCU_SOCK_DEFAULT into pcuif_proto.h

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Mar 2 09:10:55 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: pcu_if: move definition PCU_SOCK_DEFAULT into pcuif_proto.h
......................................................................


pcu_if: move definition PCU_SOCK_DEFAULT into pcuif_proto.h

PCU_SOCK_DEFAULT is defined in the pcu counterpart of the file pcuif_proto.h
To be consistent with the pcu move the definition pcuif_proto.h
The pcuif_proto.h will be exact the same in the pcu repo and bts repo.

Change-Id: I67f8ec036e219994cc296d0ed5409da7f3ec681e
---
M include/osmo-bts/pcu_if.h
M include/osmo-bts/pcuif_proto.h
M src/common/bts.c
M src/common/vty.c
4 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h
index 4377833..98efb57 100644
--- a/include/osmo-bts/pcu_if.h
+++ b/include/osmo-bts/pcu_if.h
@@ -1,8 +1,6 @@
 #ifndef _PCU_IF_H
 #define _PCU_IF_H
 
-#define PCU_SOCK_DEFAULT	"/tmp/pcu_bts"
-
 extern int pcu_direct;
 
 int pcu_tx_info_ind(void);
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index 224e310..be63f1a 100644
--- a/include/osmo-bts/pcuif_proto.h
+++ b/include/osmo-bts/pcuif_proto.h
@@ -3,6 +3,8 @@
 
 #include <osmocom/gsm/l1sap.h>
 
+#define PCU_SOCK_DEFAULT	"/tmp/pcu_bts"
+
 #define PCU_IF_VERSION		0x07
 #define TXT_MAX_LEN	128
 
diff --git a/src/common/bts.c b/src/common/bts.c
index 15b92d7..32ec556 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -43,7 +43,7 @@
 #include <osmo-bts/bts.h>
 #include <osmo-bts/bts_model.h>
 #include <osmo-bts/dtx_dl_amr_fsm.h>
-#include <osmo-bts/pcu_if.h>
+#include <osmo-bts/pcuif_proto.h>
 #include <osmo-bts/rsl.h>
 #include <osmo-bts/oml.h>
 #include <osmo-bts/signal.h>
diff --git a/src/common/vty.c b/src/common/vty.c
index b57e019..5c5ac6e 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -49,7 +49,7 @@
 #include <osmo-bts/oml.h>
 #include <osmo-bts/signal.h>
 #include <osmo-bts/bts_model.h>
-#include <osmo-bts/pcu_if.h>
+#include <osmo-bts/pcuif_proto.h>
 #include <osmo-bts/measurement.h>
 #include <osmo-bts/vty.h>
 #include <osmo-bts/l1sap.h>

-- 
To view, visit https://gerrit.osmocom.org/6981
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I67f8ec036e219994cc296d0ed5409da7f3ec681e
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list