Max has submitted this change and it was merged. Change subject: Set BTS variant while initializing BTS model ......................................................................
Set BTS variant while initializing BTS model This will allow proper BTS attribute reporting via OML in follow-up patches. Change-Id: I1c49d6c39fb4dac7a46ee25ceacf4c6ef0f0b736 Related: OS#1614 --- M src/osmo-bts-litecell15/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c 4 files changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c index 352949b..ab13981 100644 --- a/src/osmo-bts-litecell15/main.c +++ b/src/osmo-bts-litecell15/main.c @@ -70,6 +70,7 @@ static struct osmo_fd accept_fd, read_fd; int rc; + bts->variant = BTS_OSMO_LITECELL15; btsb = bts_role_bts(bts); btsb->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index b42fb3a..a4d0e3a 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -769,6 +769,7 @@ LOGP(DL1C, LOGL_NOTICE, "model_init()\n"); + bts->variant = BTS_OSMO_OCTPHY; btsb = bts_role_bts(bts); btsb->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index b1263b9..547d084 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -62,6 +62,7 @@ static struct osmo_fd accept_fd, read_fd; int rc; + bts->variant = BTS_OSMO_SYSMO; btsb = bts_role_bts(bts); btsb->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 98066ca..0148e5b 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -99,6 +99,7 @@ { struct gsm_bts_role_bts *btsb = bts_role_bts(bts); + bts->variant = BTS_OSMO_TRX; btsb->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2); /* FIXME: this needs to be overridden with the real hardrware -- To view, visit https://gerrit.osmocom.org/2520 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c49d6c39fb4dac7a46ee25ceacf4c6ef0f0b736 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max <msur...@sysmocom.de> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msur...@sysmocom.de>