[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
pcuif_proto: signal BTS model via PCUIF
At the moment the PCU has no way of knowing with which BTS model it is
used with. However, some BTS models may require slightly different
behaviour by the PCU, depending on which BTS model is used. So, lets add
an additional bts_model field to struct gsm_pcu_if_info_ind in order to
convey the exact BTS model to the PCU.
Related: OS#6191
Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047
Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 51 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index 15e3e20..04936af 100644
--- a/include/osmo-bts/pcuif_proto.h
+++ b/include/osmo-bts/pcuif_proto.h
@@ -7,7 +7,7 @@
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
-#define PCU_IF_VERSION 0x0b
+#define PCU_IF_VERSION 0x0c
#define TXT_MAX_LEN128
/* msg_type */
@@ -57,6 +57,17 @@
#define PCU_IF_ADDR_TYPE_IPV4 0x04/* IPv4 address */
#define PCU_IF_ADDR_TYPE_IPV6 0x29/* IPv6 address */
+/* BTS model */
+enum gsm_pcuif_bts_model {
+ PCU_IF_BTS_MODEL_UNSPEC,
+ PCU_IF_BTS_MODEL_LC15,
+ PCU_IF_BTS_MODEL_OC2G,
+ PCU_IF_BTS_MODEL_OCTPHY,
+ PCU_IF_BTS_MODEL_SYSMO,
+ PCU_IF_BTS_MODEL_TRX,
+ PCU_IF_BTS_MODEL_RBS,
+};
+
#define PCU_IF_NUM_NSVC 2
#define PCU_IF_NUM_TRX 8
@@ -170,6 +181,7 @@
struct in_addr v4;
struct in6_addr v6;
} remote_ip[PCU_IF_NUM_NSVC];
+ uint8_t bts_model; /* enum gsm_pcuif_bts_model */
} __attribute__ ((packed));
struct gsm_pcu_if_act_req {
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 6116c9e..048e766 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -230,6 +230,25 @@
}
}
+static enum gsm_pcuif_bts_model bts_model_from_variant(enum
gsm_bts_type_variant variant)
+{
+ switch (variant) {
+ case BTS_OSMO_LITECELL15:
+ return PCU_IF_BTS_MODEL_LC15;
+ case BTS_OSMO_OC2G:
+ return PCU_IF_BTS_MODEL_OC2G;
+ case BTS_OSMO_OCTPHY:
+ return PCU_IF_BTS_MODEL_OCTPHY;
+ case BTS_OSMO_SYSMO:
+ return PCU_IF_BTS_MODEL_SYSMO;
+ case BTS_OSMO_TRX:
+ case BTS_OSMO_VIRTUAL:
+ return PCU_IF_BTS_MODEL_TRX;
+ default:
+ return PCU_IF_BTS_MODEL_UNSPEC;
+ }
+}
+
int pcu_tx_info_ind(void)
{
struct msgb *msg;
@@ -358,6 +377,8 @@
info_ind_fill_trx(_ind->trx[trx->nr], trx);
}
+ info_ind->bts_model = bts_model_from_variant(bts->variant);
+
return pcu_sock_send(msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 9
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-CC: osmith
Gerrit-MessageType: merged
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF .. Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 02 Nov 2023 09:08:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 01 Nov 2023 15:58:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, laforge, osmith, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified-1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 51 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF .. Patch Set 7: Code-Review+1 (1 comment) Patchset: PS7: aside from the linter cosmetic issue, I'm fine -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 24 Oct 2023 19:24:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, osmith, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF .. Patch Set 7: (1 comment) File src/common/pcu_sock.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12085): https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/d867ea3e_37c79262 PS7, Line 248: return PCU_IF_BTS_MODEL_TRX; code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 24 Oct 2023 15:23:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 51 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: osmith, pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 6:
(2 comments)
File src/common/pcu_sock.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12005):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/bd7c27e0_11d17df1
PS6, Line 235: static enum gsm_pcuif_bts_model bts_model_from_variant(enum
gsm_bts_type_variant variant) {
open brace '{' following function definitions go on the next line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12005):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/e0a784a2_30e4fff6
PS6, Line 247: return PCU_IF_BTS_MODEL_TRX;
code indent should use tabs where possible
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 6
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-CC: osmith
Gerrit-Attention: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Mon, 23 Oct 2023 10:16:41 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 50 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: osmith, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF .. Patch Set 6: (1 comment) File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/b5a321db_f4f35b4b PS4, Line 239: break; > break after return is not needed Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 23 Oct 2023 10:13:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 5:
(3 comments)
File src/common/pcu_sock.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11899):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/f1fd686e_a00a520b
PS5, Line 235: static enum gsm_pcuif_bts_model bts_model_from_variant(enum
gsm_bts_type_variant variant) {
open brace '{' following function definitions go on the next line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11899):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/1d157c99_3a657f80
PS5, Line 246: - case BTS_OSMO_VIRTUAL:
space prohibited after that '-' (ctx:ExW)
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11899):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/1f563543_5d2f1507
PS5, Line 247: return PCU_IF_BTS_MODEL_TRX;
code indent should use tabs where possible
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 5
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-CC: osmith
Gerrit-Attention: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Wed, 18 Oct 2023 08:13:28 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 50 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF .. Patch Set 4: (1 comment) File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/4db8767a_befda2ed PS4, Line 239: break; break after return is not needed -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 17 Oct 2023 15:23:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: pespin.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 4:
(2 comments)
File src/common/pcu_sock.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11872):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/24c958e4_5313bfda
PS4, Line 235: static enum gsm_pcuif_bts_model bts_model_from_variant(enum
gsm_bts_type_variant variant) {
open brace '{' following function definitions go on the next line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11872):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/145eedf5_25af9d30
PS4, Line 250: return PCU_IF_BTS_MODEL_TRX;
code indent should use tabs where possible
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 4
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Oct 2023 15:13:39 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 62 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: pespin.
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 4:
(2 comments)
File include/osmo-bts/pcuif_proto.h:
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/77fda5a4_78c96d58
PS3, Line 63: /* BTS model */
> same comments as osmo-pcu patch.
Done
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/c94f3204_d3ef2381
PS3, Line 363: switch (bts->variant) {
> maybe move this to a helper function?
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 4
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Tue, 17 Oct 2023 15:13:07 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 3: Code-Review-1
(2 comments)
File include/osmo-bts/pcuif_proto.h:
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/80ec5249_91385469
PS3, Line 63: /* BTS model */
same comments as osmo-pcu patch.
File src/common/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/49c7a90c_81116246
PS3, Line 363: switch (bts->variant) {
maybe move this to a helper function?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Thu, 05 Oct 2023 11:43:58 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 2:
(1 comment)
File src/common/pcu_sock.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11634):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/ef667842_64ab52ef
PS2, Line 363: switch(bts->variant) {
space required before the open parenthesis '('
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: dexter
Gerrit-Comment-Date: Thu, 05 Oct 2023 10:33:40 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF .. pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
Patch Set 1:
(3 comments)
File src/common/pcu_sock.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11632):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/76d0eef8_51be9a97
PS1, Line 363: switch(bts->variant) {
space required before the open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11632):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/7620480e_b65ceca9
PS1, Line 367: case BTS_OSMO_OC2G:
code indent should use tabs where possible
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11632):
https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/d9b11963_d3bcbc7b
PS1, Line 367: case BTS_OSMO_OC2G:
please, no spaces at the start of a line
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Thu, 05 Oct 2023 10:16:16 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email )
Change subject: pcuif_proto: signal BTS model via PCUIF
..
pcuif_proto: signal BTS model via PCUIF
At the moment the PCU has no way of knowing with which BTS model it is
used with. However, some BTS models may require slightly different
behaviour by the PCU, depending on which BTS model is used. So, lets add
an additional bts_model field to struct gsm_pcu_if_info_ind in order to
convey the exact BTS model to the PCU.
Related: OS#6191
Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047
Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 55 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/1
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index a620993..4e2e702 100644
--- a/include/osmo-bts/pcuif_proto.h
+++ b/include/osmo-bts/pcuif_proto.h
@@ -60,6 +60,17 @@
#define PCU_IF_ADDR_TYPE_IPV4 0x04/* IPv4 address */
#define PCU_IF_ADDR_TYPE_IPV6 0x29/* IPv6 address */
+/* BTS model */
+#define PCU_IF_BTS_MODEL_UNSPEC0x00
+#define PCU_IF_BTS_MODEL_LC15 0x01
+#define PCU_IF_BTS_MODEL_OC2G 0x02
+#define PCU_IF_BTS_MODEL_OCTPHY0x03
+#define PCU_IF_BTS_MODEL_SYSMO 0x04
+#define PCU_IF_BTS_MODEL_TRX 0x05
+#define PCU_IF_BTS_MODEL_VIRTUAL 0x06
+#define PCU_IF_BTS_MODEL_OMLDUMMY 0x07
+#define PCU_IF_BTS_MODEL_RBS 0x08
+
#define PCU_IF_NUM_NSVC 2
#define PCU_IF_NUM_TRX 8
@@ -173,6 +184,7 @@
struct in_addr v4;
struct in6_addr v6;
} remote_ip[PCU_IF_NUM_NSVC];
+ uint8_t bts_model;
} __attribute__ ((packed));
struct gsm_pcu_if_act_req {
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 79b39c4..07174dc 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -360,6 +360,32 @@
info_ind_fill_trx(_ind->trx[trx->nr], trx);
}
+ switch(bts->variant) {
+ case BTS_OSMO_LITECELL15:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_LC15;
+ break;
+case BTS_OSMO_OC2G:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_OC2G;
+ break;
+ case BTS_OSMO_OCTPHY:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_OCTPHY;
+ break;
+ case BTS_OSMO_SYSMO:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_SYSMO;
+ break;
+ case BTS_OSMO_TRX:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_TRX;
+ break;
+ case BTS_OSMO_VIRTUAL:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_VIRTUAL;
+ break;
+ case BTS_OSMO_OMLDUMMY:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_OMLDUMMY;
+ break;
+ default:
+ info_ind->bts_model = PCU_IF_BTS_MODEL_UNSPEC;
+ }
+
return pcu_sock_send(msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6
Gerrit-Change-Number: 34648
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
