Attention is currently required from: falconia.
laforge has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42718?usp=email )
Change subject: nokia skip-reset: make consistent with other vty settings
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42718?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie8cdac51f82185e2d4f37a8da00acba633670052
Gerrit-Change-Number: 42718
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Comment-Date: Wed, 29 Apr 2026 14:55:54 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42720?usp=email )
Change subject: Cosmetic: bts_nokia_site: fix comment formatting
......................................................................
Cosmetic: bts_nokia_site: fix comment formatting
Ensure each line of a multiline comment starts with " * ".
Related: https://gerrit.osmocom.org/c/osmo-bsc/+/42712/comment/6aa80188_f56f2265/
Change-Id: I83ed16ec09fb66076dc2ba6a49ef272657b09407
---
M src/osmo-bsc/bts_nokia_site.c
1 file changed, 47 insertions(+), 61 deletions(-)
Approvals:
laforge: Looks good to me, approved
falconia: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c
index c5e31b7..10a4c5d 100644
--- a/src/osmo-bsc/bts_nokia_site.c
+++ b/src/osmo-bsc/bts_nokia_site.c
@@ -19,12 +19,11 @@
*
*/
-/*
- TODO: Attention: There are some static variables used for states during
- configuration. Those variables have to be moved to a BTS specific context,
- otherwise there will most certainly be problems if more than one Nokia BTS
- is used.
-*/
+/* TODO: Attention: There are some static variables used for states during
+ * configuration. Those variables have to be moved to a BTS specific context,
+ * otherwise there will most certainly be problems if more than one Nokia BTS
+ * is used.
+ */
#include <time.h>
@@ -88,14 +87,11 @@
#define SAPI_OML 62
#define SAPI_RSL 0
-/*
-
- Tell LAPD to start start the SAP (send SABM requests) for all signalling
- timeslots in this line
-
- Attention: this has to be adapted for mISDN
-*/
-
+/* Tell LAPD to start start the SAP (send SABM requests) for all signalling
+ * timeslots in this line
+ *
+ * Attention: this has to be adapted for mISDN
+ */
static void start_sabm_in_line(struct e1inp_line *line, int start, int sapi)
{
struct e1inp_sign_link *link;
@@ -866,10 +862,7 @@
/* TODO: put in a separate file ? */
-/*
- build the configuration for each TRX
-*/
-
+/* build the configuration for each TRX */
static int make_fu_config(struct gsm_bts_trx *trx, uint8_t id,
uint8_t * fu_config, int *hopping)
{
@@ -915,11 +908,10 @@
/* set BSIC */
- /*
- Attention: all TRX except the first one seem to get the TSC
- from the CHANNEL ACTIVATION command (in CHANNEL IDENTIFICATION,
- GSM 04.08 CHANNEL DESCRIPTION).
- There was a bug in rsl_chan_activate_lchan() setting this parameter.
+ /* Attention: all TRX except the first one seem to get the TSC
+ * from the CHANNEL ACTIVATION command (in CHANNEL IDENTIFICATION,
+ * GSM 04.08 CHANNEL DESCRIPTION).
+ * There was a bug in rsl_chan_activate_lchan() setting this parameter.
*/
uint8_t bsic = trx->bts->bsic;
@@ -939,19 +931,18 @@
struct gsm_bts_trx_ts *ts = &trx->ts[i];
uint8_t chan_config;
- /*
- 0 = FCCH + SCH + BCCH + CCCH
- 1 = FCCH + SCH + BCCH + CCCH + SDCCH/4 + SACCH/4
- 2 = BCCH + CCCH (This combination is not used in any BTS)
- 3 = FCCH + SCH + BCCH + CCCH + SDCCH/4 with SDCCH2 used as CBCH
- 4 = SDCCH/8 + SACCH/8
- 5 = SDCCH/8 with SDCCH2 used as CBCH
- 6 = TCH/F + FACCH/F + SACCH/F
- 7 = E-RACH (Talk family)
- 9 = Dual rate (capability for TCH/F and TCH/H)
- 10 = reserved for BTS internal use
- 11 = PBCCH + PCCCH + PDTCH + PACCH + PTCCH (can be used in GPRS release 2).
- 0xFF = spare TS
+ /* 0 = FCCH + SCH + BCCH + CCCH
+ * 1 = FCCH + SCH + BCCH + CCCH + SDCCH/4 + SACCH/4
+ * 2 = BCCH + CCCH (This combination is not used in any BTS)
+ * 3 = FCCH + SCH + BCCH + CCCH + SDCCH/4 with SDCCH2 used as CBCH
+ * 4 = SDCCH/8 + SACCH/8
+ * 5 = SDCCH/8 with SDCCH2 used as CBCH
+ * 6 = TCH/F + FACCH/F + SACCH/F
+ * 7 = E-RACH (Talk family)
+ * 9 = Dual rate (capability for TCH/F and TCH/H)
+ * 10 = reserved for BTS internal use
+ * 11 = PBCCH + PCCCH + PDTCH + PACCH + PTCCH (can be used in GPRS release 2).
+ * 0xFF = spare TS
*/
switch (ts->pchan_from_config) {
@@ -1168,10 +1159,7 @@
/* TODO: put in a separate file ? */
-/*
- build the configuration data
-*/
-
+/* build the configuration data */
static int make_bts_config(struct gsm_bts *bts, uint8_t bts_type, int n_trx, uint8_t * fu_config,
int need_hopping, int hopping_type)
{
@@ -1764,19 +1752,18 @@
/* TODO: put in a separate file ? */
-/*
- This is how the configuration is done:
- - start OML link
- - reset BTS
- - receive ACK, wait some time and restart OML link
- - receive OMU STARTED message, send START DOWNLOAD REQ
- - receive CNF REQ message, send CONF DATA
- - receive ACK, start RSL link(s)
- ACK some other messages received from the BTS.
-
- Probably its also possible to configure the BTS without a reset, this
- has not been tested yet.
-*/
+/* This is how the configuration is done:
+ * - start OML link
+ * - reset BTS
+ * - receive ACK, wait some time and restart OML link
+ * - receive OMU STARTED message, send START DOWNLOAD REQ
+ * - receive CNF REQ message, send CONF DATA
+ * - receive ACK, start RSL link(s)
+ * ACK some other messages received from the BTS.
+ *
+ * Probably its also possible to configure the BTS without a reset, this
+ * has not been tested yet.
+ */
#define FIND_ELEM(data, data_len, ei, var, len) (find_element(data, data_len, ei, var, len) == len)
static int abis_nm_rcvmsg_fom(struct msgb *mb)
@@ -1861,14 +1848,13 @@
if (!bts->nokia.did_reset) {
bts->nokia.did_reset = 1;
- /*
- TODO: For the InSite processing the received data is
- blocked in the driver during reset.
- Otherwise the LAPD module might assert because the InSite
- sends garbage on the E1 line during reset.
- This is done by looking at "wait_reset" in the driver
- (function handle_ts1_read()) and ignoring the received data.
- It seems to be necessary for the MetroSite too.
+ /* TODO: For the InSite processing the received data is
+ * blocked in the driver during reset.
+ * Otherwise the LAPD module might assert because the InSite
+ * sends garbage on the E1 line during reset.
+ * This is done by looking at "wait_reset" in the driver
+ * (function handle_ts1_read()) and ignoring the received data.
+ * It seems to be necessary for the MetroSite too.
*/
/* we cannot delete / stop the OML LAPD SAP right here, as we are in
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42720?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I83ed16ec09fb66076dc2ba6a49ef272657b09407
Gerrit-Change-Number: 42720
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Attention is currently required from: fixeria, osmith.
falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42712?usp=email )
Change subject: nokia: add support for Flexi Multiradio
......................................................................
Patch Set 2:
(2 comments)
File include/osmocom/bsc/bts.h:
https://gerrit.osmocom.org/c/osmo-bsc/+/42712/comment/7adc44bb_5ae679a7?usp… :
PS1, Line 512: 256
> Will do as asked, new patch coming shortly.
Done
File src/osmo-bsc/bts_nokia_site.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/42712/comment/df5045c1_bfaf65bc?usp… :
PS1, Line 1778: It is also possible to configure the BTS without a reset, but in this case
> we could either ignore the linter's review, or make a separate patch that fixes the formatting of th […]
Thank you for making the linked cosmetic patch to osmo-bsc! I just CR+1'ed it; once it gets merged, I will rebase the present series on top of it.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42712?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Icd429552c3b5e90d6c5d3ae5f52afd6550e3cebc
Gerrit-Change-Number: 42712
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Apr 2026 14:22:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: falconia, fixeria.
osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42712?usp=email )
Change subject: nokia: add support for Flexi Multiradio
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-bsc/bts_nokia_site.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/42712/comment/35c1a5be_f85cfb6b?usp… :
PS1, Line 1778: It is also possible to configure the BTS without a reset, but in this case
> > please, no spaces at the start of a line […]
we could either ignore the linter's review, or make a separate patch that fixes the formatting of the existing comment: https://gerrit.osmocom.org/c/osmo-bsc/+/42720
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42712?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Icd429552c3b5e90d6c5d3ae5f52afd6550e3cebc
Gerrit-Change-Number: 42712
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Apr 2026 07:14:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42720?usp=email )
Change subject: Cosmetic: bts_nokia_site: fix comment formatting
......................................................................
Cosmetic: bts_nokia_site: fix comment formatting
Ensure each line of a multiline comment starts with " * ".
Related: https://gerrit.osmocom.org/c/osmo-bsc/+/42712/comment/6aa80188_f56f2265/
Change-Id: I83ed16ec09fb66076dc2ba6a49ef272657b09407
---
M src/osmo-bsc/bts_nokia_site.c
1 file changed, 47 insertions(+), 61 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/42720/1
diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c
index e5f2c9d..f365278 100644
--- a/src/osmo-bsc/bts_nokia_site.c
+++ b/src/osmo-bsc/bts_nokia_site.c
@@ -19,12 +19,11 @@
*
*/
-/*
- TODO: Attention: There are some static variables used for states during
- configuration. Those variables have to be moved to a BTS specific context,
- otherwise there will most certainly be problems if more than one Nokia BTS
- is used.
-*/
+/* TODO: Attention: There are some static variables used for states during
+ * configuration. Those variables have to be moved to a BTS specific context,
+ * otherwise there will most certainly be problems if more than one Nokia BTS
+ * is used.
+ */
#include <time.h>
@@ -88,14 +87,11 @@
#define SAPI_OML 62
#define SAPI_RSL 0
-/*
-
- Tell LAPD to start start the SAP (send SABM requests) for all signalling
- timeslots in this line
-
- Attention: this has to be adapted for mISDN
-*/
-
+/* Tell LAPD to start start the SAP (send SABM requests) for all signalling
+ * timeslots in this line
+ *
+ * Attention: this has to be adapted for mISDN
+ */
static void start_sabm_in_line(struct e1inp_line *line, int start, int sapi)
{
struct e1inp_sign_link *link;
@@ -851,10 +847,7 @@
/* TODO: put in a separate file ? */
-/*
- build the configuration for each TRX
-*/
-
+/* build the configuration for each TRX */
static int make_fu_config(struct gsm_bts_trx *trx, uint8_t id,
uint8_t * fu_config, int *hopping)
{
@@ -900,11 +893,10 @@
/* set BSIC */
- /*
- Attention: all TRX except the first one seem to get the TSC
- from the CHANNEL ACTIVATION command (in CHANNEL IDENTIFICATION,
- GSM 04.08 CHANNEL DESCRIPTION).
- There was a bug in rsl_chan_activate_lchan() setting this parameter.
+ /* Attention: all TRX except the first one seem to get the TSC
+ * from the CHANNEL ACTIVATION command (in CHANNEL IDENTIFICATION,
+ * GSM 04.08 CHANNEL DESCRIPTION).
+ * There was a bug in rsl_chan_activate_lchan() setting this parameter.
*/
uint8_t bsic = trx->bts->bsic;
@@ -924,19 +916,18 @@
struct gsm_bts_trx_ts *ts = &trx->ts[i];
uint8_t chan_config;
- /*
- 0 = FCCH + SCH + BCCH + CCCH
- 1 = FCCH + SCH + BCCH + CCCH + SDCCH/4 + SACCH/4
- 2 = BCCH + CCCH (This combination is not used in any BTS)
- 3 = FCCH + SCH + BCCH + CCCH + SDCCH/4 with SDCCH2 used as CBCH
- 4 = SDCCH/8 + SACCH/8
- 5 = SDCCH/8 with SDCCH2 used as CBCH
- 6 = TCH/F + FACCH/F + SACCH/F
- 7 = E-RACH (Talk family)
- 9 = Dual rate (capability for TCH/F and TCH/H)
- 10 = reserved for BTS internal use
- 11 = PBCCH + PCCCH + PDTCH + PACCH + PTCCH (can be used in GPRS release 2).
- 0xFF = spare TS
+ /* 0 = FCCH + SCH + BCCH + CCCH
+ * 1 = FCCH + SCH + BCCH + CCCH + SDCCH/4 + SACCH/4
+ * 2 = BCCH + CCCH (This combination is not used in any BTS)
+ * 3 = FCCH + SCH + BCCH + CCCH + SDCCH/4 with SDCCH2 used as CBCH
+ * 4 = SDCCH/8 + SACCH/8
+ * 5 = SDCCH/8 with SDCCH2 used as CBCH
+ * 6 = TCH/F + FACCH/F + SACCH/F
+ * 7 = E-RACH (Talk family)
+ * 9 = Dual rate (capability for TCH/F and TCH/H)
+ * 10 = reserved for BTS internal use
+ * 11 = PBCCH + PCCCH + PDTCH + PACCH + PTCCH (can be used in GPRS release 2).
+ * 0xFF = spare TS
*/
switch (ts->pchan_from_config) {
@@ -1153,10 +1144,7 @@
/* TODO: put in a separate file ? */
-/*
- build the configuration data
-*/
-
+/* build the configuration data */
static int make_bts_config(struct gsm_bts *bts, uint8_t bts_type, int n_trx, uint8_t * fu_config,
int need_hopping, int hopping_type)
{
@@ -1749,19 +1737,18 @@
/* TODO: put in a separate file ? */
-/*
- This is how the configuration is done:
- - start OML link
- - reset BTS
- - receive ACK, wait some time and restart OML link
- - receive OMU STARTED message, send START DOWNLOAD REQ
- - receive CNF REQ message, send CONF DATA
- - receive ACK, start RSL link(s)
- ACK some other messages received from the BTS.
-
- Probably its also possible to configure the BTS without a reset, this
- has not been tested yet.
-*/
+/* This is how the configuration is done:
+ * - start OML link
+ * - reset BTS
+ * - receive ACK, wait some time and restart OML link
+ * - receive OMU STARTED message, send START DOWNLOAD REQ
+ * - receive CNF REQ message, send CONF DATA
+ * - receive ACK, start RSL link(s)
+ * ACK some other messages received from the BTS.
+ *
+ * Probably its also possible to configure the BTS without a reset, this
+ * has not been tested yet.
+ */
#define FIND_ELEM(data, data_len, ei, var, len) (find_element(data, data_len, ei, var, len) == len)
static int abis_nm_rcvmsg_fom(struct msgb *mb)
@@ -1846,14 +1833,13 @@
if (!bts->nokia.did_reset) {
bts->nokia.did_reset = 1;
- /*
- TODO: For the InSite processing the received data is
- blocked in the driver during reset.
- Otherwise the LAPD module might assert because the InSite
- sends garbage on the E1 line during reset.
- This is done by looking at "wait_reset" in the driver
- (function handle_ts1_read()) and ignoring the received data.
- It seems to be necessary for the MetroSite too.
+ /* TODO: For the InSite processing the received data is
+ * blocked in the driver during reset.
+ * Otherwise the LAPD module might assert because the InSite
+ * sends garbage on the E1 line during reset.
+ * This is done by looking at "wait_reset" in the driver
+ * (function handle_ts1_read()) and ignoring the received data.
+ * It seems to be necessary for the MetroSite too.
*/
/* we cannot delete / stop the OML LAPD SAP right here, as we are in
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42720?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I83ed16ec09fb66076dc2ba6a49ef272657b09407
Gerrit-Change-Number: 42720
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: falconia, fixeria.
osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42712?usp=email )
Change subject: nokia: add support for Flexi Multiradio
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-bsc/bts_nokia_site.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/42712/comment/4fb4cedb_20fb753b?usp… :
PS1, Line 1785: static int abis_nm_rcvmsg_fom(struct e1inp_sign_link *sign_link,
> The liner is indeed hallucinating here. Might be something for @osmith@sysmocom.de to check. […]
patch to disable this rule as it is clearly not working as intended: https://gerrit.osmocom.org/c/osmo-ci/+/42719
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42712?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Icd429552c3b5e90d6c5d3ae5f52afd6550e3cebc
Gerrit-Change-Number: 42712
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 29 Apr 2026 06:58:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>