Change in osmo-bts[master]: sysmobts-mgr: Fix path to hwmon in /sys
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24433 ) Change subject: sysmobts-mgr: Fix path to hwmon in /sys .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/24433/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/24433/1//COMMIT_MSG@9 PS1, Line 9: The path to the temperature sensor > Which one? Please add a reference (e.g. Change-Id). The usual way is: […] Nevermind, I somehow read it as 'patch'. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iac8e9a866ad6326874af91bd12a981f39a9a24c7 Gerrit-Change-Number: 24433 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 22:32:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-trx[master]: ctrl_sock_handle_rx(): fix missing space in LOGCHAN() statement
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/24441 )
Change subject: ctrl_sock_handle_rx(): fix missing space in LOGCHAN() statement
..
ctrl_sock_handle_rx(): fix missing space in LOGCHAN() statement
Change-Id: I3c69d64dfe79dcc815e1d412569ed4e9ed428c52
---
M Transceiver52M/Transceiver.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 9e7bd5a..42aa93e 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -1003,7 +1003,7 @@
LOGCHAN(chan, DTRXCTRL, INFO) << "BTS requests TRXD version switch: " <<
version_recv;
if (version_recv > TRX_DATA_FORMAT_VER) {
LOGCHAN(chan, DTRXCTRL, INFO) << "rejecting TRXD version " <<
version_recv
-<< "in favor of " << TRX_DATA_FORMAT_VER;
+<< " in favor of " << TRX_DATA_FORMAT_VER;
sprintf(response, "RSP SETFORMAT %u %u", TRX_DATA_FORMAT_VER,
version_recv);
} else {
LOGCHAN(chan, DTRXCTRL, NOTICE) << "switching to TRXD version " <<
version_recv;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/24441
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I3c69d64dfe79dcc815e1d412569ed4e9ed428c52
Gerrit-Change-Number: 24441
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: [VAMOS] gsm_data: rework and rename gsm_lchan_name_compute()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24439 ) Change subject: [VAMOS] gsm_data: rework and rename gsm_lchan_name_compute() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id5cc40db04a654d94f5f75d4aad45439d66528cc Gerrit-Change-Number: 24439 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 22:07:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: [VAMOS] rsl_lchan_lookup(): use ABIS_RSL_CHAN_NR_CBITS_* macros
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24437 ) Change subject: [VAMOS] rsl_lchan_lookup(): use ABIS_RSL_CHAN_NR_CBITS_* macros .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iec3250e3a59f8d428d7e7be2ceb71f7086a68e7b Gerrit-Change-Number: 24437 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 22:06:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: [VAMOS] rsl_lchan_lookup(): make it more readable
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24438 ) Change subject: [VAMOS] rsl_lchan_lookup(): make it more readable .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3160929c739a521fe494716c3da3d3b72370a98a Gerrit-Change-Number: 24438 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 22:06:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: [VAMOS] gsm_pchan2chan_nr(): use ABIS_RSL_CHAN_NR_CBITS_* macros
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24436 ) Change subject: [VAMOS] gsm_pchan2chan_nr(): use ABIS_RSL_CHAN_NR_CBITS_* macros .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2b1480d3c33095115333450cf7243b9505fc Gerrit-Change-Number: 24436 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 22:05:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: [VAMOS] Implement the concept of 'shadow' timeslots
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24153 ) Change subject: [VAMOS] Implement the concept of 'shadow' timeslots .. Patch Set 10: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/24153/10/include/osmo-bts/gsm_data.h File include/osmo-bts/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bts/+/24153/10/include/osmo-bts/gsm_data.h@469 PS10, Line 469: struct gsm_bts_trx_ts *peer; ts_peer/peer_ts would be far more explanatory when looking at code. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I48b44b4df9ffb1cca105aebbd868c29b21f3b1d6 Gerrit-Change-Number: 24153 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 22:04:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: socket: add function to wait until a socket becomes writeable
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24435 ) Change subject: socket: add function to wait until a socket becomes writeable .. Patch Set 1: Code-Review-2 This still makes no sense in the context of osmocom apps with a mainloop. While waiting in that select loop you are basically blocking any other events to be parsed by the main loop. You need to integrate this in the osmocom mainloop. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1c68185120fa2a6c9b6cb8aa2a25232a44ff5508 Gerrit-Change-Number: 24435 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 21:57:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: ctrl_sock_handle_rx(): fix missing space in LOGCHAN() statement
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/24441 ) Change subject: ctrl_sock_handle_rx(): fix missing space in LOGCHAN() statement .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/24441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3c69d64dfe79dcc815e1d412569ed4e9ed428c52 Gerrit-Change-Number: 24441 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 27 May 2021 21:56:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: socket: add function to wait until a socket becomes writeable
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24435 ) Change subject: socket: add function to wait until a socket becomes writeable .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/24435/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/c/libosmocore/+/24435/1/include/osmocom/core/socket.h@a116 PS1, Line 116: ws -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1c68185120fa2a6c9b6cb8aa2a25232a44ff5508 Gerrit-Change-Number: 24435 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 27 May 2021 21:49:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: ctrl_sock_handle_rx(): fix missing space in LOGCHAN() statement
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/24441 )
Change subject: ctrl_sock_handle_rx(): fix missing space in LOGCHAN() statement
..
ctrl_sock_handle_rx(): fix missing space in LOGCHAN() statement
Change-Id: I3c69d64dfe79dcc815e1d412569ed4e9ed428c52
---
M Transceiver52M/Transceiver.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/41/24441/1
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index c0db343..20eaeb6 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -1009,7 +1009,7 @@
LOGCHAN(chan, DTRXCTRL, INFO) << "BTS requests TRXD version switch: " <<
version_recv;
if (version_recv > TRX_DATA_FORMAT_VER) {
LOGCHAN(chan, DTRXCTRL, INFO) << "rejecting TRXD version " <<
version_recv
-<< "in favor of " << TRX_DATA_FORMAT_VER;
+<< " in favor of " << TRX_DATA_FORMAT_VER;
sprintf(response, "RSP SETFORMAT %u %u", TRX_DATA_FORMAT_VER,
version_recv);
} else {
LOGCHAN(chan, DTRXCTRL, NOTICE) << "switching to TRXD version " <<
version_recv;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/24441
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I3c69d64dfe79dcc815e1d412569ed4e9ed428c52
Gerrit-Change-Number: 24441
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: sysmobts-mgr: Fix path to hwmon in /sys
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24433 ) Change subject: sysmobts-mgr: Fix path to hwmon in /sys .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/24433/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/24433/1//COMMIT_MSG@9 PS1, Line 9: The path to the temperature sensor Which one? Please add a reference (e.g. Change-Id). The usual way is: Change-Id: Fixes: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iac8e9a866ad6326874af91bd12a981f39a9a24c7 Gerrit-Change-Number: 24433 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 21:37:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: sysmobts-mgr: Fix path to hwmon in /sys
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24433 ) Change subject: sysmobts-mgr: Fix path to hwmon in /sys .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iac8e9a866ad6326874af91bd12a981f39a9a24c7 Gerrit-Change-Number: 24433 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 21:36:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: sysmobts-mgr: Fix path to hwmon in /sys
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24433 ) Change subject: sysmobts-mgr: Fix path to hwmon in /sys .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iac8e9a866ad6326874af91bd12a981f39a9a24c7 Gerrit-Change-Number: 24433 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 27 May 2021 21:35:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: [VAMOS] osmo-bts-trx: properly handle per-timeslot TSC values
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24388 ) Change subject: [VAMOS] osmo-bts-trx: properly handle per-timeslot TSC values .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idc5796151e3e83f42d60c2d4cb7c35890d76a7f5 Gerrit-Change-Number: 24388 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 21:34:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: [VAMOS] Implement the concept of 'shadow' timeslots
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24153 ) Change subject: [VAMOS] Implement the concept of 'shadow' timeslots .. Patch Set 10: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I48b44b4df9ffb1cca105aebbd868c29b21f3b1d6 Gerrit-Change-Number: 24153 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 27 May 2021 21:24:14 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: [VAMOS] osmo-bts-trx: schedule bursts on 'shadow' timeslots
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24440 )
Change subject: [VAMOS] osmo-bts-trx: schedule bursts on 'shadow' timeslots
..
[VAMOS] osmo-bts-trx: schedule bursts on 'shadow' timeslots
Change-Id: I3e0bdf8c03273f66991aa1764029ab1dd3528d7e
Related: SYS#4895, OS#4941
---
M include/osmo-bts/scheduler.h
M src/common/scheduler.c
M src/osmo-bts-trx/main.c
M src/osmo-bts-trx/scheduler_trx.c
M src/osmo-bts-trx/trx_if.c
5 files changed, 67 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/24440/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index 9093229..e7d27ac 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -71,6 +71,7 @@
enum trx_mod_type {
TRX_MOD_T_GMSK,
TRX_MOD_T_8PSK,
+ TRX_MOD_T_AQPSK,
};
/* A set of measurements belonging to one Uplink burst */
diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 75cf6bd..91e5067 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -606,32 +606,49 @@
* init / exit
*/
+static void trx_sched_init_ts(struct gsm_bts_trx_ts *ts,
+ const unsigned int rate_ctr_idx)
+{
+ struct l1sched_ts *l1ts;
+ unsigned int i;
+
+ l1ts = talloc_zero(ts->trx, struct l1sched_ts);
+ OSMO_ASSERT(l1ts != NULL);
+
+ /* Link both structures */
+ ts->priv = l1ts;
+ l1ts->ts = ts;
+
+ l1ts->ctrs = rate_ctr_group_alloc(ts->trx,
+ &l1sched_ts_ctrg_desc,
+ rate_ctr_idx);
+ INIT_LLIST_HEAD(&l1ts->dl_prims);
+
+ for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) {
+ struct l1sched_chan_state *chan_state;
+ chan_state = &l1ts->chan_state[i];
+ chan_state->active = false;
+ }
+}
+
void trx_sched_init(struct gsm_bts_trx *trx)
{
- unsigned int tn, i;
+ unsigned int tn;
OSMO_ASSERT(trx != NULL);
LOGPTRX(trx, DL1C, LOGL_DEBUG, "Init scheduler structures\n");
+ /* Allocate shadow timeslots */
+ gsm_bts_trx_init_shadow_ts(trx);
+
for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) {
- struct l1sched_ts *l1ts;
+ unsigned int rate_ctr_idx = trx->nr * 100 + tn;
+ struct gsm_bts_trx_ts *ts = &trx->ts[tn];
- l1ts = talloc_zero(trx, struct l1sched_ts);
- OSMO_ASSERT(l1ts != NULL);
-
- trx->ts[tn].priv = l1ts;
- l1ts->ts = &trx->ts[tn];
-
- l1ts->mf_index = 0;
- l1ts->ctrs = rate_ctr_group_alloc(trx, &l1sched_ts_ctrg_desc,
(trx->nr + 1) * 10 + tn);
- INIT_LLIST_HEAD(&l1ts->dl_prims);
-
- for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) {
- struct l1sched_chan_state *chan_state;
- chan_state = &l1ts->chan_state[i];
- chan_state->active = false;
- }
+ /* Init primary and shadow timeslots */
+ trx_sched_init_ts(ts, rate_ctr_idx);
+ trx_sched_init_ts(ts->vamos.peer, rate_ctr_idx + 10);
}
}
diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c
index 6ec8dfc..7134939 100644
--- a/src/osmo-bts-trx/main.c
+++ b/src/osmo-bts-trx/main.c
@@ -146,6 +146,7 @@
osmo_bts_set_feature(bts->features, BTS_FEAT_HOPPING);
osmo_bts_set_feature(bts->features, BTS_FEAT_ACCH_REP);
osmo_bts_set_feature(bts->features, BTS_FEAT_MULTI_TSC);
+ osmo_bts_set_feature(bts->features, BTS_FEAT_VAMOS);
bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB);
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index fa5c719..1e099c0 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -149,6 +149,33 @@
}
}
+/* schedule one frame for a shadow TRX/TS */
+static void trx_sched_shadow_ts(const struct gsm_bts_trx_ts *ts,
+ struct trx_dl_burst_req *br)
+{
+ struct l1sched_ts *l1ts = ts->priv;
+ struct trx_dl_burst_req sbr = {
+ .trx_num = br->trx_num,
+ .fn = br->fn,
+ .tn = br->tn,
+ };
+
+ _sched_dl_burst(l1ts, &sbr);
+
+ if (br->burst_len != 0 && sbr.burst_len != 0) /* both present */
+ memcpy(br->burst + GSM_BURST_LEN, sbr.burst, GSM_BURST_LEN);
+ else if (br->burst_len == 0) /* V0 burst is missing, use dummy bits */
+ memcpy(br->burst, _sched_dummy_burst, GSM_BURST_LEN);
+ else if (sbr.burst_len == 0) /* V1 burst is missing, use dummy bits */
+ memcpy(br->burst + GSM_BURST_LEN, _sched_dummy_burst,
GSM_BURST_LEN);
+ else /* nothing to send at al
Change in osmo-bts[master]: [VAMOS] rsl_lchan_lookup(): make it more readable
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24438 )
Change subject: [VAMOS] rsl_lchan_lookup(): make it more readable
..
[VAMOS] rsl_lchan_lookup(): make it more readable
Change-Id: I3160929c739a521fe494716c3da3d3b72370a98a
Related: SYS#4895, OS#4941
---
M src/common/gsm_data.c
1 file changed, 28 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/38/24438/1
diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c
index 8425d1a..6b57851 100644
--- a/src/common/gsm_data.c
+++ b/src/common/gsm_data.c
@@ -282,41 +282,62 @@
if (rc)
*rc = -EINVAL;
- if (cbits == ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs) {
+ switch (cbits) {
+ case ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs:
lch_idx = 0;/* TCH/F */
if (ts->pchan != GSM_PCHAN_TCH_F &&
ts->pchan != GSM_PCHAN_PDCH &&
ts->pchan != GSM_PCHAN_TCH_F_PDCH &&
ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)
ok = false;
- } else if ((cbits & 0x1e) == ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(0)) {
+ break;
+ case ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(0):
+ case ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(1):
lch_idx = cbits & 0x1; /* TCH/H */
if (ts->pchan != GSM_PCHAN_TCH_H &&
ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)
ok = false;
- } else if ((cbits & 0x1c) == ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(0)) {
+ break;
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(0):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(1):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(2):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(3):
lch_idx = cbits & 0x3; /* SDCCH/4 */
if (ts->pchan != GSM_PCHAN_CCCH_SDCCH4 &&
ts->pchan != GSM_PCHAN_CCCH_SDCCH4_CBCH)
ok = false;
- } else if ((cbits & 0x18) == ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(0)) {
+ break;
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(0):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(1):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(2):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(3):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(4):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(5):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(6):
+ case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(7):
lch_idx = cbits & 0x7; /* SDCCH/8 */
if (ts->pchan != GSM_PCHAN_SDCCH8_SACCH8C &&
ts->pchan != GSM_PCHAN_SDCCH8_SACCH8C_CBCH)
ok = false;
- } else if (cbits == 0x10 || cbits == 0x11 || cbits == 0x12) {
+ break;
+ case ABIS_RSL_CHAN_NR_CBITS_BCCH:
+ case ABIS_RSL_CHAN_NR_CBITS_RACH:
+ case ABIS_RSL_CHAN_NR_CBITS_PCH_AGCH:
lch_idx = 0;
if (ts->pchan != GSM_PCHAN_CCCH &&
ts->pchan != GSM_PCHAN_CCCH_SDCCH4 &&
ts->pchan != GSM_PCHAN_CCCH_SDCCH4_CBCH)
ok = false;
/* FIXME: we should not return first sdcch4 !!! */
- } else if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) {
+ break;
+ case ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH:
lch_idx = 0;
if (ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)
ok = false;
- } else
+ break;
+ default:
return NULL;
+ }
if (rc && ok)
*rc = 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24438
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I3160929c739a521fe494716c3da3d3b72370a98a
Gerrit-Change-Number: 24438
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: [VAMOS] gsm_data: rework and rename gsm_lchan_name_compute()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24439 )
Change subject: [VAMOS] gsm_data: rework and rename gsm_lchan_name_compute()
..
[VAMOS] gsm_data: rework and rename gsm_lchan_name_compute()
Change-Id: Id5cc40db04a654d94f5f75d4aad45439d66528cc
Related: SYS#4895, OS#4941
---
M include/osmo-bts/gsm_data.h
M src/common/bts_trx.c
M src/common/gsm_data.c
3 files changed, 11 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/24439/1
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h
index cd63f6f..93eb2f0 100644
--- a/include/osmo-bts/gsm_data.h
+++ b/include/osmo-bts/gsm_data.h
@@ -512,7 +512,7 @@
const char *gsm_lchant_name(enum gsm_chan_t c);
char *gsm_ts_name(const struct gsm_bts_trx_ts *ts);
char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts);
-char *gsm_lchan_name_compute(const struct gsm_lchan *lchan);
+void gsm_lchan_name_update(struct gsm_lchan *lchan);
const char *gsm_lchans_name(enum gsm_lchan_state s);
static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)
diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c
index ee03b9a..3d295e5 100644
--- a/src/common/bts_trx.c
+++ b/src/common/bts_trx.c
@@ -96,15 +96,13 @@
for (l = 0; l < TS_MAX_LCHAN; l++) {
struct gsm_lchan *lchan;
- char *name;
lchan = &ts->lchan[l];
lchan->ts = ts;
lchan->nr = l;
lchan->type = GSM_LCHAN_NONE;
+ gsm_lchan_name_update(lchan);
- name = gsm_lchan_name_compute(lchan);
- lchan->name = talloc_strdup(trx, name);
INIT_LLIST_HEAD(&lchan->sapi_cmds);
INIT_LLIST_HEAD(&lchan->dl_tch_queue);
}
diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c
index 6b57851..6328783 100644
--- a/src/common/gsm_data.c
+++ b/src/common/gsm_data.c
@@ -165,14 +165,17 @@
return ts2str;
}
-char *gsm_lchan_name_compute(const struct gsm_lchan *lchan)
+void gsm_lchan_name_update(struct gsm_lchan *lchan)
{
- struct gsm_bts_trx_ts *ts = lchan->ts;
+ const struct gsm_bts_trx_ts *ts = lchan->ts;
+ const struct gsm_bts_trx *trx = ts->trx;
+ char *name;
- snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d,ss=%d)",
-ts->trx->bts->nr, ts->trx->nr, ts->nr, lchan->nr);
-
- return ts2str;
+ name = talloc_asprintf(trx, "(bts=%u,trx=%u,ts=%u,ss=%u)",
+ trx->bts->nr, trx->nr, ts->nr, lchan->nr);
+ if (lchan->name != NULL)
+ talloc_free(lchan->name);
+ lchan->name = name;
}
/* See Table 10.5.25 of GSM04.08 */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24439
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id5cc40db04a654d94f5f75d4aad45439d66528cc
Gerrit-Change-Number: 24439
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: [VAMOS] osmo-bts-trx: properly handle per-timeslot TSC values
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/24388 to look at the new patch set (#4). Change subject: [VAMOS] osmo-bts-trx: properly handle per-timeslot TSC values .. [VAMOS] osmo-bts-trx: properly handle per-timeslot TSC values Each timeslot can have its own Training Sequence Code value, which may optionally be included in the NM_MT_SET_CHAN_ATTR message sent over the A-bis/OML. If it's not present, then the TSC value for a timeslot is derived from the BCC part of BSIC, which is always included in the NM_MT_SET_BTS_ATTR message. On the TRXC interface, the BTS global TSC value is indicated to the transceiver using either of the 'SETTSC' or 'SETBSIC' commands. The transceiver then applies this value for all timeslots by default, however it can be redefined for each timeslot individually using additional arguments of the 'SETSLOT' command (see section 25.2.4.1 in the user manual [1] for more details). Currently, trx_set_ts_as_pchan() sends TRX_PROV_EV_CFG_TSC to the transceiver provisioning FSM, together with the per-timeslot TSC value. This event causes the FSM to modify the global TSC value, that is going to be or has already been sent to the transceiver. This is wrong, the global TSC value shall not be overwritten. Remove the TRX_PROV_EV_CFG_TSC, and include per-timeslot Training Sequence Code and Set in the data structure that gets passed together with the TRX_PROV_EV_CFG_TS instead. Implement handling of the optional per-timeslot TSC in trx_if_cmd_setslot(). [1] https://downloads.osmocom.org/docs/latest/osmobts-usermanual.pdf Change-Id: Idc5796151e3e83f42d60c2d4cb7c35890d76a7f5 Related: SYS#4895, OS#4941 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_provision_fsm.h M src/osmo-bts-trx/trx_vty.c 8 files changed, 84 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/24388/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idc5796151e3e83f42d60c2d4cb7c35890d76a7f5 Gerrit-Change-Number: 24388 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: [VAMOS] gsm_pchan2chan_nr(): use ABIS_RSL_CHAN_NR_CBITS_* macros
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24436 )
Change subject: [VAMOS] gsm_pchan2chan_nr(): use ABIS_RSL_CHAN_NR_CBITS_* macros
..
[VAMOS] gsm_pchan2chan_nr(): use ABIS_RSL_CHAN_NR_CBITS_* macros
Change-Id: I2b1480d3c33095115333450cf7243b9505fc
Related: SYS#4895, OS#4941
---
M src/common/gsm_data.c
1 file changed, 7 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/36/24436/1
diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c
index d0fe479..9a54912 100644
--- a/src/common/gsm_data.c
+++ b/src/common/gsm_data.c
@@ -187,16 +187,15 @@
switch (pchan) {
case GSM_PCHAN_TCH_F:
OSMO_ASSERT(lchan_nr == 0);
- cbits = 0x01;
+ cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs;
break;
case GSM_PCHAN_PDCH:
OSMO_ASSERT(lchan_nr == 0);
- cbits = RSL_CHAN_OSMO_PDCH >> 3;
+ cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH;
break;
case GSM_PCHAN_TCH_H:
OSMO_ASSERT(lchan_nr < 2);
- cbits = 0x02;
- cbits += lchan_nr;
+ cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr);
break;
case GSM_PCHAN_CCCH_SDCCH4:
case GSM_PCHAN_CCCH_SDCCH4_CBCH:
@@ -206,21 +205,19 @@
* See osmo-bts-xxx/oml.c:opstart_compl().
*/
if (lchan_nr == CCCH_LCHAN)
- cbits = 0x10; /* BCCH */
+ cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH;
else {
OSMO_ASSERT(lchan_nr < 4);
- cbits = 0x04;
- cbits += lchan_nr;
+ cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr);
}
break;
case GSM_PCHAN_SDCCH8_SACCH8C:
case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:
OSMO_ASSERT(lchan_nr < 8);
- cbits = 0x08;
- cbits += lchan_nr;
+ cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr);
break;
case GSM_PCHAN_CCCH:
- cbits = 0x10;
+ cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH;
break;
case GSM_PCHAN_NONE:
LOGP(DRSL, LOGL_ERROR, "Physical channel %s not expected!\n",
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24436
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I2b1480d3c33095115333450cf7243b9505fc
Gerrit-Change-Number: 24436
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: [VAMOS] rsl_lchan_lookup(): use ABIS_RSL_CHAN_NR_CBITS_* macros
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24437 )
Change subject: [VAMOS] rsl_lchan_lookup(): use ABIS_RSL_CHAN_NR_CBITS_* macros
..
[VAMOS] rsl_lchan_lookup(): use ABIS_RSL_CHAN_NR_CBITS_* macros
Change-Id: Iec3250e3a59f8d428d7e7be2ceb71f7086a68e7b
Related: SYS#4895, OS#4941
---
M src/common/gsm_data.c
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/37/24437/1
diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c
index 9a54912..8425d1a 100644
--- a/src/common/gsm_data.c
+++ b/src/common/gsm_data.c
@@ -282,24 +282,24 @@
if (rc)
*rc = -EINVAL;
- if (cbits == 0x01) {
+ if (cbits == ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs) {
lch_idx = 0;/* TCH/F */
if (ts->pchan != GSM_PCHAN_TCH_F &&
ts->pchan != GSM_PCHAN_PDCH &&
ts->pchan != GSM_PCHAN_TCH_F_PDCH &&
ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)
ok = false;
- } else if ((cbits & 0x1e) == 0x02) {
+ } else if ((cbits & 0x1e) == ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(0)) {
lch_idx = cbits & 0x1; /* TCH/H */
if (ts->pchan != GSM_PCHAN_TCH_H &&
ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)
ok = false;
- } else if ((cbits & 0x1c) == 0x04) {
+ } else if ((cbits & 0x1c) == ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(0)) {
lch_idx = cbits & 0x3; /* SDCCH/4 */
if (ts->pchan != GSM_PCHAN_CCCH_SDCCH4 &&
ts->pchan != GSM_PCHAN_CCCH_SDCCH4_CBCH)
ok = false;
- } else if ((cbits & 0x18) == 0x08) {
+ } else if ((cbits & 0x18) == ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(0)) {
lch_idx = cbits & 0x7; /* SDCCH/8 */
if (ts->pchan != GSM_PCHAN_SDCCH8_SACCH8C &&
ts->pchan != GSM_PCHAN_SDCCH8_SACCH8C_CBCH)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24437
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iec3250e3a59f8d428d7e7be2ceb71f7086a68e7b
Gerrit-Change-Number: 24437
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/24434 )
Change subject: Fix regression in 'osmo-bts-trx: rework and split up
bts_sched_fn()'
..
Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
In [1] I forgot to update tx_fcch_fn(), where we assume that the
burst buffer is already zero-initialized and do not call memset().
This results in sending dummy bursts on FCCH (instead of zeros).
Change-Id: I491b3b5702b3cfca45c12c002b41e60c629b05b9
Fixes: [1] Iec78989517865b3275a9784d1042a5ebd1d2815f
---
M src/osmo-bts-trx/sched_lchan_fcch_sch.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
tnt: Looks good to me, but someone else must approve
Hoernchen: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved; Verified
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/sched_lchan_fcch_sch.c
b/src/osmo-bts-trx/sched_lchan_fcch_sch.c
index eaf140f..44da04c 100644
--- a/src/osmo-bts-trx/sched_lchan_fcch_sch.c
+++ b/src/osmo-bts-trx/sched_lchan_fcch_sch.c
@@ -40,8 +40,8 @@
{
LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "Transmitting FCCH\n");
- /* A frequency correction burst is basically a sequence of zeros.
-* Since br->burst is already zero-initialized, just set the length. */
+ /* A frequency correction burst is basically a sequence of zeros */
+ memset(br->burst, 0x00, GSM_BURST_LEN);
br->burst_len = GSM_BURST_LEN;
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24434
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I491b3b5702b3cfca45c12c002b41e60c629b05b9
Gerrit-Change-Number: 24434
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Reviewer: tnt
Gerrit-MessageType: merged
Change in osmo-bts[master]: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24434 ) Change subject: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()' .. Patch Set 1: Verified+1 Code-Review+2 Confirmed to work. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I491b3b5702b3cfca45c12c002b41e60c629b05b9 Gerrit-Change-Number: 24434 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Thu, 27 May 2021 20:53:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: [VAMOS] osmo-bts-trx: indicate BTS_FEAT_{MULTI_TSC, VAMOS} as supported
fixeria has abandoned this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/24390 )
Change subject: [VAMOS] osmo-bts-trx: indicate BTS_FEAT_{MULTI_TSC,VAMOS} as
supported
..
Abandoned
Squashed into Idc5796151e3e83f42d60c2d4cb7c35890d76a7f5 and
I3e0bdf8c03273f66991aa1764029ab1dd3528d7e.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24390
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iba3f9787c32c802cfab716176e6ada799f5f21df
Gerrit-Change-Number: 24390
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: abandon
Change in osmo-bts[master]: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24434 ) Change subject: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()' .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I491b3b5702b3cfca45c12c002b41e60c629b05b9 Gerrit-Change-Number: 24434 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Thu, 27 May 2021 19:58:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24434 ) Change subject: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()' .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I491b3b5702b3cfca45c12c002b41e60c629b05b9 Gerrit-Change-Number: 24434 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Thu, 27 May 2021 19:47:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: socket: add function to wait until a socket becomes writeable
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/24435 )
Change subject: socket: add function to wait until a socket becomes writeable
..
socket: add function to wait until a socket becomes writeable
In cases where a socket is created using the option OSMO_SOCK_F_NONBLOCK
it is not possible to detect a connection error because
osmo_sock_init() will return early while the connection is still in
progress.
One way to make sure that the socket is connected is to use select to
wait until the socket becomes writeable and to use getsockopt to check
SO_ERROR.
The function osmo_sock_wait() waits until the socket becomes writeable.
From the error code the API user can determine whether the connection
was successful or not.
Change-Id: I1c68185120fa2a6c9b6cb8aa2a25232a44ff5508
Related: SYS#4971
---
M include/osmocom/core/socket.h
M src/socket.c
2 files changed, 53 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/24435/1
diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h
index a053391..ce6ee3c 100644
--- a/include/osmocom/core/socket.h
+++ b/include/osmocom/core/socket.h
@@ -113,7 +113,6 @@
int osmo_sock_get_remote_ip(int fd, char *host, size_t len);
int osmo_sock_get_remote_ip_port(int fd, char *port, size_t len);
-
int osmo_sock_mcast_loop_set(int fd, bool enable);
int osmo_sock_mcast_ttl_set(int fd, uint8_t ttl);
int osmo_sock_mcast_all_set(int fd, bool enable);
@@ -134,5 +133,7 @@
int osmo_sock_set_dscp(int fd, uint8_t dscp);
int osmo_sock_set_priority(int fd, int prio);
+int osmo_sock_wait(int fd, time_t timeout_sec, suseconds_t timeout_usec);
+
#endif /* (!EMBEDDED) */
/*! @} */
diff --git a/src/socket.c b/src/socket.c
index 34972b8..810e39c 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1868,6 +1868,57 @@
return setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &prio, sizeof(prio));
}
+/*! Wait until a socket becomes writeable.
+ * \param[in] fd file descriptor of related scoket.
+ * \param[in] timeout_sec timeout seconds.
+ * \param[in] timeout_usec timeout microseconds.
+ * \returns 0 on success; negative otherwise
+ *
+ * The function returns 0 when the socket becomes writeable and no errors are
+ * detected. The return code is -EIO if one of the syscalls (select,
+ * getsockopt) fails, -EINPROGRESS if the (select) timout expires while
waiting
+ * for the socket to become writeable. If the error is socket specific then
the
+ * SO_ERROR related return values from errno.h will be used. */
+int osmo_sock_wait(int fd, time_t timeout_sec, suseconds_t timeout_usec)
+{
+ int so_error;
+ socklen_t so_error_len = sizeof(so_error);
+ fd_set write_fds;
+ fd_set except_fds;
+ struct timeval timeout;
+ int rc;
+
+ timeout.tv_sec = timeout_sec;
+ timeout.tv_usec = timeout_usec;
+
+ /* We monitor the given file descriptor for writeability and
+* exceptional conditions. */
+ FD_ZERO(&write_fds);
+ FD_ZERO(&except_fds);
+ FD_SET(fd, &write_fds);
+ FD_SET(fd, &except_fds);
+ rc = select(fd + 1, NULL, &write_fds, &except_fds, &timeout);
+ if (rc < 0)
+ return -EIO;
+
+ /* The socket did not become writeable, nor did it exhibit any
+* exeptional behaviour (select timeout). */
+ if (rc == 0)
+ return -EINPROGRESS;
+
+ if (FD_ISSET(fd, &write_fds) || FD_ISSET(fd, &except_fds)) {
+ rc = getsockopt(fd, SOL_SOCKET, SO_ERROR, &so_error,
+ &so_error_len);
+ if (rc < 0)
+ return -EIO;
+ return so_error;/* 0 if no error occured */
+ }
+
+ /* Should not be reached as either select will return 0 on timeout
+* or at least one of the fd sets will contain fd. */
+ return -EINVAL;
+}
+
#endif /* HAVE_SYS_SOCKET_H */
/*! @} */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24435
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I1c68185120fa2a6c9b6cb8aa2a25232a44ff5508
Gerrit-Change-Number: 24435
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in osmo-bts[master]: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24434 ) Change subject: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()' .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I491b3b5702b3cfca45c12c002b41e60c629b05b9 Gerrit-Change-Number: 24434 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 27 May 2021 19:39:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24434 )
Change subject: Fix regression in 'osmo-bts-trx: rework and split up
bts_sched_fn()'
..
Fix regression in 'osmo-bts-trx: rework and split up bts_sched_fn()'
In [1] I forgot to update tx_fcch_fn(), where we assume that the
burst buffer is already zero-initialized and do not call memset().
This results in sending dummy bursts on FCCH (instead of zeros).
Change-Id: I491b3b5702b3cfca45c12c002b41e60c629b05b9
Fixes: [1] Iec78989517865b3275a9784d1042a5ebd1d2815f
---
M src/osmo-bts-trx/sched_lchan_fcch_sch.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/34/24434/1
diff --git a/src/osmo-bts-trx/sched_lchan_fcch_sch.c
b/src/osmo-bts-trx/sched_lchan_fcch_sch.c
index eaf140f..44da04c 100644
--- a/src/osmo-bts-trx/sched_lchan_fcch_sch.c
+++ b/src/osmo-bts-trx/sched_lchan_fcch_sch.c
@@ -40,8 +40,8 @@
{
LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "Transmitting FCCH\n");
- /* A frequency correction burst is basically a sequence of zeros.
-* Since br->burst is already zero-initialized, just set the length. */
+ /* A frequency correction burst is basically a sequence of zeros */
+ memset(br->burst, 0x00, GSM_BURST_LEN);
br->burst_len = GSM_BURST_LEN;
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24434
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I491b3b5702b3cfca45c12c002b41e60c629b05b9
Gerrit-Change-Number: 24434
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: sysmobts-mgr: Fix path to hwmon in /sys
keith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24433 )
Change subject: sysmobts-mgr: Fix path to hwmon in /sys
..
sysmobts-mgr: Fix path to hwmon in /sys
The path to the temperature sensor was wrong which
results in the SysmoBTS manager always considering
that the state is critical and hence powering OFF
the PA on startup. (with the default config)
As a further side-effect, the temperatures were not
available in the vty 'show manager' command.
Redacted log previous to this patch:
sysmobts_misc.c:128 Error reading temperature
sysmobts_mgr_2050.c:323 Going to enable the PA.
sysmobts_mgr_temp.c:252 Failed to read the digital temperature. rc=-1
sysmobts_mgr_temp.c:267 Failed to read the RF temperature. rc=-1
sysmobts_mgr_temp.c:203 Moving from state NORMAL to CRITICAL.
sysmobts_mgr_temp.c:185 System has reached critical warning.
sysmobts_mgr_temp.c:236 OML alert sent: 0
and in the vty:
Temperature control state: CRITICAL
Current Temperatures
Digital: -0.001000 Celsius
RF: -0.001000 Celsius
With this patch we correctly enable the PA and now can show in the vty:
Temperature control state: NORMAL
Current Temperatures
Digital: 39.00 Celsius
RF: 35.125000 Celsius
Change-Id: Iac8e9a866ad6326874af91bd12a981f39a9a24c7
---
M src/osmo-bts-sysmo/misc/sysmobts_misc.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/24433/1
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.c
b/src/osmo-bts-sysmo/misc/sysmobts_misc.c
index 8c93979..ae59d78 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_misc.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.c
@@ -46,7 +46,7 @@
* Temperature handling
*/
-#define TEMP_PATH "/sys/class/hwmon/hwmon0/device/temp%u_%s"
+#define TEMP_PATH "/sys/class/hwmon/hwmon0/device/hwmon/hwmon0/temp%u_%s"
static const char *temp_type_str[_NUM_TEMP_TYPES] = {
[SYSMOBTS_TEMP_INPUT] = "input",
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24433
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iac8e9a866ad6326874af91bd12a981f39a9a24c7
Gerrit-Change-Number: 24433
Gerrit-PatchSet: 1
Gerrit-Owner: keith
Gerrit-MessageType: newchange
Change in osmo-bts[master]: Add missing value_string for NM_EV_* introduced recently
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/24432 )
Change subject: Add missing value_string for NM_EV_* introduced recently
..
Add missing value_string for NM_EV_* introduced recently
Fixes: 0277cddab2bb6b09f02e998c0aa9ff78d41c327c
Change-Id: I70266767d4f85e8c14ecf477af7fab0706698067
---
M src/common/nm_common_fsm.c
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c
index b2fd451..7273e22 100644
--- a/src/common/nm_common_fsm.c
+++ b/src/common/nm_common_fsm.c
@@ -35,5 +35,7 @@
{ NM_EV_BBTRANSC_INSTALLED, "BBTRANSC_INSTALLED" },
{ NM_EV_BBTRANSC_ENABLED, "BBTRANSC_ENABLED" },
{ NM_EV_BBTRANSC_DISABLED, "BBTRANSC_DISABLED" },
+ { NM_EV_RCARRIER_ENABLED, "RCARRIER_ENABLED" },
+ { NM_EV_RCARRIER_DISABLED, "RCARRIER_DISABLED" },
{ 0, NULL }
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24432
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I70266767d4f85e8c14ecf477af7fab0706698067
Gerrit-Change-Number: 24432
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: Add missing value_string for NM_EV_* introduced recently
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24432 ) Change subject: Add missing value_string for NM_EV_* introduced recently .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I70266767d4f85e8c14ecf477af7fab0706698067 Gerrit-Change-Number: 24432 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 27 May 2021 17:04:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Add missing value_string for NM_EV_* introduced recently
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24432 ) Change subject: Add missing value_string for NM_EV_* introduced recently .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I70266767d4f85e8c14ecf477af7fab0706698067 Gerrit-Change-Number: 24432 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 27 May 2021 17:01:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Add missing value_string for NM_EV_* introduced recently
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24432 )
Change subject: Add missing value_string for NM_EV_* introduced recently
..
Add missing value_string for NM_EV_* introduced recently
Fixes: 0277cddab2bb6b09f02e998c0aa9ff78d41c327c
Change-Id: I70266767d4f85e8c14ecf477af7fab0706698067
---
M src/common/nm_common_fsm.c
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/24432/1
diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c
index b2fd451..7273e22 100644
--- a/src/common/nm_common_fsm.c
+++ b/src/common/nm_common_fsm.c
@@ -35,5 +35,7 @@
{ NM_EV_BBTRANSC_INSTALLED, "BBTRANSC_INSTALLED" },
{ NM_EV_BBTRANSC_ENABLED, "BBTRANSC_ENABLED" },
{ NM_EV_BBTRANSC_DISABLED, "BBTRANSC_DISABLED" },
+ { NM_EV_RCARRIER_ENABLED, "RCARRIER_ENABLED" },
+ { NM_EV_RCARRIER_DISABLED, "RCARRIER_DISABLED" },
{ 0, NULL }
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24432
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I70266767d4f85e8c14ecf477af7fab0706698067
Gerrit-Change-Number: 24432
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: GSM_Types, bsc: add VAMOS cbits
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431 ) Change subject: GSM_Types, bsc: add VAMOS cbits .. Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2d98495b8c4c9a8466f2154af9bb29124c2cb0b5 Gerrit-Change-Number: 24431 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 16:14:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: add bsc/BSC_Tests_VAMOS.ttcn
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411 )
Change subject: add bsc/BSC_Tests_VAMOS.ttcn
..
Patch Set 5: Code-Review+1
(2 comments)
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411/4/bsc/BSC_Tests_VAMOS.ttcn
File bsc/BSC_Tests_VAMOS.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411/4/bsc/BSC_Tests_VAMOS.ttcn@116
PS4, Line 116: var RslChannelNr chan_nr := rsl.ies[0].body.chan_nr;
With the recent RSL chan_nr changes, we should probably also do:
if (not match(chan_nr, t_RslChanNr_Osmo_VAMOS_Bm(1)) { ... }
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411/4/bsc/BSC_Tests_VAMOS.ttcn@174
PS4, Line 174: RSL.receive(tr_RSL_MODE_MODIFY_REQ(g_chan_nr, ?)) -> value rsl;
Would also be good to match chan_nr against t_RslChanNr_Osmo_VAMOS_Bm.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I2c504099163a30ea102cbd26d3615ca2e5ce1e64
Gerrit-Change-Number: 24411
Gerrit-PatchSet: 5
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Thu, 27 May 2021 16:13:55 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: add bsc/BSC_Tests_VAMOS.ttcn
Hello Jenkins Builder, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411 to look at the new patch set (#5). Change subject: add bsc/BSC_Tests_VAMOS.ttcn .. add bsc/BSC_Tests_VAMOS.ttcn BSC_Tests_VAMOS.ttcn is separate from BSC_Tests.ttcn in order to instruct osmo-bts-omldummy to pass BTS_FEAT_VAMOS == true in the OML BTS attributes. Add tests: TC_mode_modify_to_vamos() TC_chan_act_to_vamos() TC_assign_to_secondary_lchan() TC_vamos_multiplex_tch_f_tch_f() Change-Id: I2c504099163a30ea102cbd26d3615ca2e5ce1e64 --- M bsc/BSC_Tests.ttcn A bsc/BSC_Tests_VAMOS.ttcn 2 files changed, 384 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/24411/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c504099163a30ea102cbd26d3615ca2e5ce1e64 Gerrit-Change-Number: 24411 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: meas rep logging: use log_check_level() to skip a logging loop
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24427 ) Change subject: meas rep logging: use log_check_level() to skip a logging loop .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71a402a0940857bbedbaf25d293429934706a83c Gerrit-Change-Number: 24427 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 15:52:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: meas rep logging: replace a dozen DEBUGPC() with one DEBUGP()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24426 ) Change subject: meas rep logging: replace a dozen DEBUGPC() with one DEBUGP() .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cb607ff43a1cb30408427d99d97c103776b6e69 Gerrit-Change-Number: 24426 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 15:51:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_network: refactor MGCP_DUMMY_LOAD
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24315 ) Change subject: mgcp_network: refactor MGCP_DUMMY_LOAD .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/24315/2/include/osmocom/mgcp/mgcp_network.h File include/osmocom/mgcp/mgcp_network.h: https://gerrit.osmocom.org/c/osmo-mgw/+/24315/2/include/osmocom/mgcp/mgcp_network.h@19 PS2, Line 19:memcmp(msgb_data(msg), rtp_dummy_payload, sizeof(rtp_dummy_payload)) == 0)) this here is sufficient, no need to add a char array and redundant checks: #define mgcp_is_rtp_dummy_payload(msg) \ (msgb_length(msg) == 1 && msgb_data(msg)[0] == 0x23) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I21d96cefeeb647958bfa1e22a0ea030884746fad Gerrit-Change-Number: 24315 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: neels Gerrit-Comment-Date: Thu, 27 May 2021 15:51:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_network: refactor MGCP_DUMMY_LOAD
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24315 ) Change subject: mgcp_network: refactor MGCP_DUMMY_LOAD .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/24315/1/include/osmocom/mgcp/mgcp_network.h File include/osmocom/mgcp/mgcp_network.h: https://gerrit.osmocom.org/c/osmo-mgw/+/24315/1/include/osmocom/mgcp/mgcp_network.h@18 PS1, Line 18: memcmp > The dummy payload may be one byte but technically it is an array with only > one element. […] Yes, but now it's even more complicated... If anybody ever wants to have a payload of more than one octet, then we can start using memcmp(). But at the moment it should be optimal to compare a single byte and the length == 1. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I21d96cefeeb647958bfa1e22a0ea030884746fad Gerrit-Change-Number: 24315 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 27 May 2021 15:49:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: dexter Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: GSM_Types, bsc: add VAMOS cbits
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431 ) Change subject: GSM_Types, bsc: add VAMOS cbits .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431/1/library/GSM_Types.ttcn File library/GSM_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431/1/library/GSM_Types.ttcn@136 PS1, Line 136: RslChanNr2VAMOS We can re-use RslChanNr2 here, please see: http://people.osmocom.org/fixeria/GSM_Types.patch NOTE: I did not test this patch, just checked if it compiles. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2d98495b8c4c9a8466f2154af9bb29124c2cb0b5 Gerrit-Change-Number: 24431 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 27 May 2021 15:42:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: change bs_power to bs_power_db
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24421 ) Change subject: change bs_power to bs_power_db .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616 Gerrit-Change-Number: 24421 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 15:29:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ttcn3: add ttcn3-bsc-test-vamos
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/24414 ) Change subject: ttcn3: add ttcn3-bsc-test-vamos .. ttcn3: add ttcn3-bsc-test-vamos Change-Id: I9c4918c4f1da28b97db6386485e115f7e091a842 --- M jobs/ttcn3-testsuites.yml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved neels: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 3b35ab9..1704327 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -129,6 +129,9 @@ - ttcn3-pcap-client-test: blocking: "^(ttcn3|TTCN3-.*)-pcap-client-test.*" timer: 40 11 * * * + - ttcn3-bsc-test-vamos: + blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" + timer: 00 12 * * * # debian-stretch latest stable - nplab-m3ua-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/24414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9c4918c4f1da28b97db6386485e115f7e091a842 Gerrit-Change-Number: 24414 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: ttcn3: add ttcn3-bsc-test-vamos
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/24414 ) Change subject: ttcn3: add ttcn3-bsc-test-vamos .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/24414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9c4918c4f1da28b97db6386485e115f7e091a842 Gerrit-Change-Number: 24414 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 15:15:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: assignment_fsm: send BSSMAP response only after Assignment Request
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/24350 )
Change subject: assignment_fsm: send BSSMAP response only after Assignment
Request
..
assignment_fsm: send BSSMAP response only after Assignment Request
So far, only the MSC asked for Assignment via Assignment Request, which
we answer with a BSSMAP Assignment Complete or Assignment Failure when
done.
When Assignment is triggered for any other reason (congestion
resolution, VAMOS, VTY), we will not send any such messages to the MSC.
Additional enum values will be added in subsequent commits:
Id56a890106b93fcee67ac9401b890e7b63bba421 ASSIGN_FOR_CONGESTION_RESOLUTION
If006f5caaf83b07675f57e5665cfa79328da55e6 ASSIGN_FOR_VTY
Related: SYS#5315 OS#4940
Change-Id: Ie0cddbdb00abcec78e153f4ae6d04ce75080a111
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/assignment_fsm.c
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/osmo_bsc_bssap.c
4 files changed, 42 insertions(+), 16 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 5a202bf..4b175a4 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -111,10 +111,21 @@
uint16_t s15_s0;
};
+enum assign_for {
+ ASSIGN_FOR_NONE,
+ ASSIGN_FOR_BSSMAP_REQ,
+};
+
+extern const struct value_string assign_for_names[];
+static inline const char *assign_for_name(enum assign_for assign_for)
+{ return get_value_string(assign_for_names, assign_for); }
+
/* Information retrieved during an Assignment Request from the MSC. This is
storage of the Assignment instructions
* parsed from the Assignment Request message, to pass on until the gscon and
assignment FSMs have decided whether an
* Assignment is actually going to be carried out. Should remain unchanged
after initial decoding. */
struct assignment_request {
+ enum assign_for assign_for;
+
bool aoip;
uint16_t msc_assigned_cic;
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index cf3c50e..bfb4043 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -134,13 +134,17 @@
static void on_assignment_failure(struct gsm_subscriber_connection *conn)
{
- struct msgb *resp =
gsm0808_create_assignment_failure(conn->assignment.failure_cause, NULL);
+ /* Send Assignment Failure to MSC only when the assignment was
requested via BSSAP. Do not send anything to the
+* MSC if re-assignment was requested for congestion resolution, for
VAMOS multiplexing, or by VTY. */
+ if (conn->assignment.req.assign_for == ASSIGN_FOR_BSSMAP_REQ) {
+ struct msgb *resp =
gsm0808_create_assignment_failure(conn->assignment.failure_cause, NULL);
- if (!resp) {
- LOG_ASSIGNMENT(conn, LOGL_ERROR, "Unable to compose BSSMAP
Assignment Failure message\n");
- } else {
-
rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE]);
- gscon_sigtran_send(conn, resp);
+ if (!resp) {
+ LOG_ASSIGNMENT(conn, LOGL_ERROR, "Unable to compose
BSSMAP Assignment Failure message\n");
+ } else {
+
rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE]);
+ gscon_sigtran_send(conn, resp);
+ }
}
/* If assignment failed as early as in assignment_fsm_start(), there
may not be an fi yet. */
@@ -259,15 +263,17 @@
}
conn->assignment.new_lchan = NULL;
- send_assignment_complete(conn);
- /* If something went wrong during send_assignment_complete(), the fi
will be gone from
-* error handling in there. Almost a success, but then again the whole
thing failed. */
- if (!conn->assignment.fi) {
- /* The lchan was ready, and we failed to tell the MSC about it.
By releasing this lchan,
-* the conn will notice that its primary lchan is gone and
should clean itself up. */
- lchan_release(conn->lchan, true, true, RSL_ERR_EQUIPMENT_FAIL,
- gscon_last_eutran_plmn(conn));
- return;
+ if (conn->assignment.req.assign_for == ASSIGN_FOR_BSSMAP_REQ) {
+ send_assignment_complete(conn);
+ /* If something went wrong during send_assignment_complete(),
the fi will be gone from
+* error handling in there. Almost a success, but then again
the whole thing failed. */
+ if (!conn->assignment.fi) {
+ /* The lchan was ready, and we failed to tell the MSC
about it. By releasing this lchan,
+
Change in osmo-bsc[master]: cosmetic scoping in reuse_existing_lchan()
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/24351 )
Change subject: cosmetic scoping in reuse_existing_lchan()
..
cosmetic scoping in reuse_existing_lchan()
cosmetic prep for Ie0da36124d73efc28a8809b63d7c96e2167fc412
Related: SYS#5315 OS#4940
Change-Id: I0d1000cf108b0dfdc690f7a59d9bdf40de9043d2
---
M src/osmo-bsc/assignment_fsm.c
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index bfb4043..60e3342 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -430,11 +430,12 @@
/* Check if the currently existing lchan is compatible with the
* preferred rate/codec. */
- for (i = 0; i < req->n_ch_mode_rate; i++)
- if (lchan_type_compat_with_mode(conn->lchan->type,
&req->ch_mode_rate[i])) {
- conn->lchan->ch_mode_rate = req->ch_mode_rate[i];
- return true;
- }
+ for (i = 0; i < req->n_ch_mode_rate; i++) {
+ if (!lchan_type_compat_with_mode(conn->lchan->type,
&req->ch_mode_rate[i]))
+ continue;
+ conn->lchan->ch_mode_rate = req->ch_mode_rate[i];
+ return true;
+ }
return false;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24351
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I0d1000cf108b0dfdc690f7a59d9bdf40de9043d2
Gerrit-Change-Number: 24351
Gerrit-PatchSet: 4
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-MessageType: merged
Change in osmo-bsc[master]: meas rep logging: use log_check_level() to skip a logging loop
Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/24427 to look at the new patch set (#4). Change subject: meas rep logging: use log_check_level() to skip a logging loop .. meas rep logging: use log_check_level() to skip a logging loop A side effect is that the final cleanup part of that function is now always called, also when num_cell == 7. (Whether we should really clear that logging context at that place is a different question, out of scope here.) Change-Id: I71a402a0940857bbedbaf25d293429934706a83c --- M src/osmo-bsc/abis_rsl.c 1 file changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/24427/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71a402a0940857bbedbaf25d293429934706a83c Gerrit-Change-Number: 24427 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: change bs_power to bs_power_db
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/24421 to look at the new patch set (#7). Change subject: change bs_power to bs_power_db .. change bs_power to bs_power_db The RSL BS Power IE in measurement reports is encoded as dB / 2. Instead of using this coding all over the code, converting to dB and often printing confusing values in logging etc, store as plain dB. The conversions should be at the points where a "weird" format is defined: the RSL encoding needs divided-by-two, so apply it there. The meas_vis is (now unfortunately) defined as div-two, and so on. But internally we now just store the plain dB value and calculate with it without duplicating the wire decoding step everywhere. Rename to bs_power_db to clarify the unit of the stored value. Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616 --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/meas_rep.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/meas_rep.c M src/utils/meas_db.c M src/utils/meas_json.c 8 files changed, 21 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/24421/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616 Gerrit-Change-Number: 24421 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: meas rep logging: replace a dozen DEBUGPC() with one DEBUGP()
Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/24426 to look at the new patch set (#4). Change subject: meas rep logging: replace a dozen DEBUGPC() with one DEBUGP() .. meas rep logging: replace a dozen DEBUGPC() with one DEBUGP() Instead of calling DEBUGPC() over and over, compose a string using osmo_strbuf and then log it once. Rationale: a) DEBUGPC() is a bad idea for gsmtap_log, because each DEBUGPC() dispatches a separate gsmtap_log packet, fragmenting the actual log line in wireshark. b) DEBUGPC() is a bad idea because it checks the logging categories for every DEBUGPC() invocation. c) using a separate function with osmo_strbuf and OTC_SELECT, we can actually skip the entire string composition in case the DMEAS logging category is disabled, with a single logging category check. Change-Id: I4cb607ff43a1cb30408427d99d97c103776b6e69 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 45 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/24426/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cb607ff43a1cb30408427d99d97c103776b6e69 Gerrit-Change-Number: 24426 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: meas rep logging: use log_check_level() to skip a logging loop
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24427 ) Change subject: meas rep logging: use log_check_level() to skip a logging loop .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71a402a0940857bbedbaf25d293429934706a83c Gerrit-Change-Number: 24427 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:58:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: meas rep logging: replace a dozen DEBUGPC() with one DEBUGP()
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24426 ) Change subject: meas rep logging: replace a dozen DEBUGPC() with one DEBUGP() .. Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/24426/3/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/24426/3/src/osmo-bsc/abis_rsl.c@1088 PS3, Line 1088:mrc->neigh_idx, mrc->arfcn, mrc->bsic, rxlev2dbm(mrc->rxlev)); Unrelated. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cb607ff43a1cb30408427d99d97c103776b6e69 Gerrit-Change-Number: 24426 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:57:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: change bs_power to bs_power_db
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24421 ) Change subject: change bs_power to bs_power_db .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c@594 PS6, Line 594: msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power_db / 2); This flag relates to the Fast Power Control, a CSD specific feature that we unlikely support in osmo-bsc. > This patch here should not do any functional change. ACK, FPC is not related to this change, let's leave it as it is. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616 Gerrit-Change-Number: 24421 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:46:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-bsc[master]: change bs_power to bs_power_db
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24421 ) Change subject: change bs_power to bs_power_db .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c@594 PS6, Line 594: msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power_db / 2); > aren't you missing here the 0x10 flag? I have no idea, would have to ask Vadim... This patch here should not do any functional change. Oh I see, because of that other function that accidentally put the FPC flag in lchan->bs_power. That other function is actually never called, so there would so far never be an FPC fag in lchan->bs_power. Whether the flag should be added here is a question of whether the code prior to this patch needs a fix. @fixeria? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616 Gerrit-Change-Number: 24421 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:43:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-bsc[master]: change bs_power to bs_power_db
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24421 ) Change subject: change bs_power to bs_power_db .. Patch Set 6: > I'm not really sure we really gain something with this patch, specially since > ms_power is probably also stored the same way and you are then leaving each > one with different metrics. In my opinion we should not store weird wire encoded formats, requiring code duplication of numeric conversion calculations all over the place. The conversions should be at those places that define that they require a weird format, as it is now: the RSL encoding needs divided-by-two, so apply it there. The meas_vis is (unfortunately) defined as div-two, so apply it there, and so on. But internally we now just store the plain dB value and calculate with it without duplicating the wire decoding step everywhere. Vadim tells me that ms_power is some magic weird value and I'm not going to take that one on now, because I am working on BS Power. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616 Gerrit-Change-Number: 24421 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:40:33 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: change bs_power to bs_power_db
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24421 ) Change subject: change bs_power to bs_power_db .. Patch Set 6: (5 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6//COMMIT_MSG@9 PS6, Line 9: dBm Should be dB, because it's relative to the full power, not Milliwatt. https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6//COMMIT_MSG@10 PS6, Line 10: dBm Same here and below. https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c@1040 PS6, Line 1040: ddBm dB https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c@1129 PS6, Line 1129: bs_power_enc I would use: const uint8_t bs_power_enc = *TLVP_VAL(&tp, RSL_IE_BS_POWER); but this is not critical. https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c@1130 PS6, Line 1130: bs_power_enc Ideally, we should apply a mask here: (bs_power_enc & 0x0f) * 2; because the 4 MSB bits may contain flags (FPC, EPC). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616 Gerrit-Change-Number: 24421 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:38:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: handover: apply meas report BS Power to RXLEV, fix ho oscillation
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24425 ) Change subject: handover: apply meas report BS Power to RXLEV, fix ho oscillation .. Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/24425/5/src/osmo-bsc/meas_rep.c File src/osmo-bsc/meas_rep.c: https://gerrit.osmocom.org/c/osmo-bsc/+/24425/5/src/osmo-bsc/meas_rep.c@37 PS5, Line 37: return rep->dl.full.rx_lev + (rep->bs_power * 2); > Shouldn't this be doe by the caller of get_field and not this getter itself? > looks weird asking for […] i specifically picked this place to apply the BS Power effect, because all of our code expects RXLEV to be the actual practical DL power; fixing the RXLEV value here makes sure that all of the handover and congestion resolution code everywhere uses the value adjusted for practical relevance. We could apply the BS Power to all of the callers separately, but IMHO that would be a bad choice. We could rename the enum values to MEAS_REP_DL_RXLEV_AND_BS_POWER_FULL and *_SUB? or introduce a separate MEAS_REP_DL_RXLEV_RAW (which then no code would use, ever). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifcf59964b5e2d550d79e4ba14d90962808f79dae Gerrit-Change-Number: 24425 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:35:32 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-bsc[master]: add test_bs_power.ho_vty to show BS Power HO oscillation
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24424 ) Change subject: add test_bs_power.ho_vty to show BS Power HO oscillation .. add test_bs_power.ho_vty to show BS Power HO oscillation Shows a bug / missing feature, to be fixed in Ifcf59964b5e2d550d79e4ba14d90962808f79dae Related: SYS#5339 Change-Id: I1cc9bc39e8695faa983819b909e0ec76f0dbc296 --- M tests/handover/handover_tests.ok A tests/handover/test_bs_power.ho_vty 2 files changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/handover/handover_tests.ok b/tests/handover/handover_tests.ok index bd21d0e..4a4a924 100644 --- a/tests/handover/handover_tests.ok +++ b/tests/handover/handover_tests.ok @@ -10,6 +10,7 @@ pass test_balance_congestion_2.ho_vty pass test_balance_congestion_by_percentage.ho_vty pass test_balance_congestion_tchf_tchh.ho_vty +pass test_bs_power.ho_vty pass test_congestion.ho_vty pass test_congestion_favor_best_target_rxlev.ho_vty pass test_congestion_intra_vs_inter_cell.ho_vty diff --git a/tests/handover/test_bs_power.ho_vty b/tests/handover/test_bs_power.ho_vty new file mode 100644 index 000..2c68d57 --- /dev/null +++ b/tests/handover/test_bs_power.ho_vty @@ -0,0 +1,16 @@ +# Do not oscillate handover when the BTS applies BS power reduction + +create-bts trx-count 1 timeslots c+s4 TCH/F TCH/F TCH/F TCH/F TCH/F TCH/F PDCH +create-bts trx-count 1 timeslots c+s4 TCH/F TCH/F TCH/F TCH/F TCH/F TCH/F PDCH + +set-ts-use trx 0 0 states*TCH/F - - - - - * + +meas-rep repeat 10 bspower 20 lchan 0 0 1 0 rxlev 20 rxqual 0 ta 0 neighbors 30 +# FAIL: there should be no handover, because the bspower reduction of 20 with an rxlev of 20 (= 40) is stronger than the +# neighbor at 30. But since osmo-bsc fails to take the BS Power into account, it hands over to the neighbor. +#expect-no-chan +expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 + +# When the neighbor then reports the stronger original cell, we get handover oscillation +meas-rep repeat 10 bspower 0 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1cc9bc39e8695faa983819b909e0ec76f0dbc296 Gerrit-Change-Number: 24424 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bsc[master]: handover_test: add bspower to meas-rep cmd
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/24423 )
Change subject: handover_test: add bspower to meas-rep cmd
..
handover_test: add bspower to meas-rep cmd
Subsequent patch will add a test that uses this to show a handover
oscillation problem in the presence of nonzero BS Power.
Related: SYS#5339
Change-Id: I158d4b27370ab19318f83018803853f423c89b79
---
M tests/handover/handover_test.c
1 file changed, 28 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c
index 8e23a4f..2b8e877 100644
--- a/tests/handover/handover_test.c
+++ b/tests/handover/handover_test.c
@@ -82,7 +82,7 @@
uint8_t meas_rep_ba = 0, meas_rep_valid = 1, meas_valid = 1, meas_multi_rep =
0;
uint8_t meas_ul_rxlev = 0, meas_ul_rxqual = 0;
-uint8_t meas_tx_power_ms = 0, meas_tx_power_bs = 0;
+uint8_t meas_tx_power_ms = 0;
uint8_t meas_dtx_ms = 0, meas_dtx_bs = 0, meas_nr = 0;
char *codec_tch_f = NULL;
char *codec_tch_h = NULL;
@@ -94,7 +94,7 @@
};
static void gen_meas_rep(struct gsm_lchan *lchan,
-uint8_t rxlev, uint8_t rxqual, uint8_t ta,
+uint8_t bs_power_db, uint8_t rxlev, uint8_t rxqual,
uint8_t ta,
int neighbors_count, struct neighbor_meas *neighbors)
{
struct msgb *msg = msgb_alloc_headroom(256, 64, "RSL");
@@ -117,7 +117,7 @@
ulm[2] = (meas_ul_rxqual << 3) | meas_ul_rxqual;
msgb_tlv_put(msg, RSL_IE_UPLINK_MEAS, sizeof(ulm), ulm);
- msgb_tv_put(msg, RSL_IE_BS_POWER, meas_tx_power_bs);
+ msgb_tv_put(msg, RSL_IE_BS_POWER, (bs_power_db / 2) & 0xf);
l1i[0] = 0;
l1i[1] = ta;
@@ -865,6 +865,7 @@
struct meas_rep_data {
int argc;
const char **argv;
+ uint8_t bs_power_db;
};
static void _meas_rep_cb(struct gsm_lchan *lc, void *data)
@@ -916,14 +917,15 @@
fprintf(stderr, " * Neighbor cell #%d, actual BTS %d:
rxlev=%d\n", i, neighbor_bts_nr,
nm[i].rxlev);
}
- gen_meas_rep(lc, rxlev, rxqual, ta, argc, nm);
+ gen_meas_rep(lc, d->bs_power_db, rxlev, rxqual, ta, argc, nm);
}
-static int _meas_rep(struct vty *vty, int argc, const char **argv)
+static int _meas_rep(struct vty *vty, uint8_t bs_power_db, int argc, const
char **argv)
{
struct meas_rep_data d = {
.argc = argc - 4,
.argv = argv + 4,
+ .bs_power_db = bs_power_db,
};
parse_lchan_wildcard_args(argv, _meas_rep_cb, &d);
return CMD_SUCCESS;
@@ -951,7 +953,7 @@
MEAS_REP_DOC MEAS_REP_ARGS_DOC)
{
VTY_ECHO();
- return _meas_rep(vty, argc, argv);
+ return _meas_rep(vty, 0, argc, argv);
}
DEFUN(meas_rep_repeat, meas_rep_repeat_cmd,
@@ -966,7 +968,25 @@
argc -= 1;
while (count--)
- _meas_rep(vty, argc, argv);
+ _meas_rep(vty, 0, argc, argv);
+ return CMD_SUCCESS;
+}
+
+DEFUN(meas_rep_repeat_bspower, meas_rep_repeat_bspower_cmd,
+ "meas-rep repeat <0-999> bspower <0-31> " MEAS_REP_ARGS,
+ MEAS_REP_DOC
+ "Resend the same measurement report N times\nN\n"
+ "Send a nonzero BS Power value in the measurement report (downlink power
reduction)\nBS Power reduction in dB\n"
+ MEAS_REP_ARGS_DOC)
+{
+ int count = atoi(argv[0]);
+ uint8_t bs_power_db = atoi(argv[1]);
+ VTY_ECHO();
+ argv += 2;
+ argc -= 2;
+
+ while (count--)
+ _meas_rep(vty, bs_power_db, argc, argv);
return CMD_SUCCESS;
}
@@ -1184,6 +1204,7 @@
install_element(CONFIG_NODE, &create_ms_cmd);
install_element(CONFIG_NODE, &meas_rep_cmd);
install_element(CONFIG_NODE, &meas_rep_repeat_cmd);
+ install_element(CONFIG_NODE, &meas_rep_repeat_bspower_cmd);
install_element(CONFIG_NODE, &congestion_check_cmd);
install_element(CONFIG_NODE, &expect_no_chan_cmd);
install_element(CONFIG_NODE, &expect_chan_cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24423
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I158d4b27370ab19318f83018803853f423c89b79
Gerrit-Change-Number: 24423
Gerrit-PatchSet: 4
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: neels
Gerrit-MessageType: merged
Change in osmo-bsc[master]: hodec2: remove code dup of rxlev averaging
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24422 ) Change subject: hodec2: remove code dup of rxlev averaging .. hodec2: remove code dup of rxlev averaging Change-Id: Ic49b94ea243898535c82018c14df8a3ba216ea83 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index b397a9a..3326c0b 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -1439,10 +1439,7 @@ } /* get average levels. if not enough measurements yet, value is < 0 */ - av_rxlev = get_meas_rep_avg(lchan, - ho_get_hodec2_full_tdma(bts->ho) ? - MEAS_REP_DL_RXLEV_FULL : MEAS_REP_DL_RXLEV_SUB, - ho_get_hodec2_rxlev_avg_win(bts->ho)); + av_rxlev = current_rxlev(lchan); av_rxqual = get_meas_rep_avg(lchan, ho_get_hodec2_full_tdma(bts->ho) ? MEAS_REP_DL_RXQUAL_FULL : MEAS_REP_DL_RXQUAL_SUB, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic49b94ea243898535c82018c14df8a3ba216ea83 Gerrit-Change-Number: 24422 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bsc[master]: handover: apply meas report BS Power to RXLEV, fix ho oscillation
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24425 ) Change subject: handover: apply meas report BS Power to RXLEV, fix ho oscillation .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifcf59964b5e2d550d79e4ba14d90962808f79dae Gerrit-Change-Number: 24425 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:27:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm_08_58.h: add Osmocom specific Bm/Lm CBITs for VAMOS
neels has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/24420 )
Change subject: gsm_08_58.h: add Osmocom specific Bm/Lm CBITs for VAMOS
..
gsm_08_58.h: add Osmocom specific Bm/Lm CBITs for VAMOS
Change-Id: If33c1695922d110c0d2c60d5c0136caf2587194e
Related: SYS#4895, OS#4941, SYS#5315, OS#4940
---
M include/osmocom/gsm/protocol/gsm_08_58.h
M src/gsm/rsl.c
M src/gsmtap_util.c
3 files changed, 19 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h
b/include/osmocom/gsm/protocol/gsm_08_58.h
index 97c02e8..9a6e761 100644
--- a/include/osmocom/gsm/protocol/gsm_08_58.h
+++ b/include/osmocom/gsm/protocol/gsm_08_58.h
@@ -53,6 +53,10 @@
#define ABIS_RSL_CHAN_NR_CBITS_OSMO_CBCH4 0x19 /*< non-standard, for
CBCH/SDCCH4 */
#define ABIS_RSL_CHAN_NR_CBITS_OSMO_CBCH8 0x1a /*< non-standard, for
CBCH/SDCCH8 */
+/* non-standard, Osmocom specific Bm/Lm equivalents for VAMOS */
+#define ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs 0x1d/*<
VAMOS TCH/F */
+#define ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(ss) (0x1e + (ss)) /*<
VAMOS TCH/H */
+
/* Link Identifier 9.3.2 */
union abis_rsl_link_id {
#if OSMO_IS_BIG_ENDIAN
@@ -455,6 +459,10 @@
#define RSL_CHAN_OSMO_CBCH40xc8/*< non-standard, for CBCH/SDCCH4 */
#define RSL_CHAN_OSMO_CBCH80xd0/*< non-standard, for CBCH/SDCCH8 */
+/* non-standard, Osmocom specific Bm/Lm equivalents for VAMOS */
+#define RSL_CHAN_OSMO_VAMOS_Bm_ACCHs 0xe8/* VAMOS TCH/F */
+#define RSL_CHAN_OSMO_VAMOS_Lm_ACCHs 0xf0/* VAMOS TCH/H */
+
/* Chapter 9.3.3 */
#define RSL_ACT_TYPE_INITIAL 0x00
#define RSL_ACT_TYPE_REACT 0x80
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index 706fb54..a7fa81d 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -159,6 +159,7 @@
switch (type) {
case RSL_CHAN_Lm_ACCHs:
+ case RSL_CHAN_OSMO_VAMOS_Lm_ACCHs:
subch &= 0x01;
break;
case RSL_CHAN_SDCCH4_ACCH:
@@ -195,6 +196,7 @@
case RSL_CHAN_OSMO_PDCH:
case RSL_CHAN_OSMO_CBCH4:
case RSL_CHAN_OSMO_CBCH8:
+ case RSL_CHAN_OSMO_VAMOS_Bm_ACCHs:
*type = chan_nr & RSL_CHAN_NR_MASK;
*subch = 0;
break;
@@ -208,6 +210,9 @@
} else if ((chan_nr & 0xc0) == RSL_CHAN_SDCCH8_ACCH) {
*type = RSL_CHAN_SDCCH8_ACCH;
*subch = (chan_nr >> 3) & 0x7;
+ } else if ((chan_nr & 0xf0) == RSL_CHAN_OSMO_VAMOS_Lm_ACCHs) {
+ *type = RSL_CHAN_OSMO_VAMOS_Lm_ACCHs;
+ *subch = (chan_nr >> 3) & 0x1;
} else
return -EINVAL;
}
@@ -246,6 +251,10 @@
snprintf(buf, buf_len, "CBCH(SDCCH/4) on TS%d", ts);
else if (cbits == ABIS_RSL_CHAN_NR_CBITS_OSMO_CBCH8)
snprintf(buf, buf_len, "CBCH(SDCCH/8) on TS%d", ts);
+ else if (cbits == ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs)
+ snprintf(buf, buf_len, "VAMOS TCH/F on TS%d", ts);
+ else if ((cbits & 0x1e) ==
ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(0))
+ snprintf(buf, buf_len, "VAMOS TCH/H(%u) on TS%d", cbits & 0x01,
ts);
else
snprintf(buf, buf_len, "UNKNOWN on TS%d", ts);
diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c
index 336e1d0..9ae06d6 100644
--- a/src/gsmtap_util.c
+++ b/src/gsmtap_util.c
@@ -63,12 +63,14 @@
switch (rsl_chantype) {
case RSL_CHAN_Bm_ACCHs:
+ case RSL_CHAN_OSMO_VAMOS_Bm_ACCHs:
if (user_plane)
ret = GSMTAP_CHANNEL_VOICE_F;
else
ret = GSMTAP_CHANNEL_FACCH_F;
break;
case RSL_CHAN_Lm_ACCHs:
+ case RSL_CHAN_OSMO_VAMOS_Lm_ACCHs:
if (user_plane)
ret = GSMTAP_CHANNEL_VOICE_H;
else
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24420
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: If33c1695922d110c0d2c60d5c0136caf2587194e
Gerrit-Change-Number: 24420
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: rsl: make rsl_dec_chan_nr() more readable, use RSL_CHAN_NR_MASK
neels has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/24419 )
Change subject: rsl: make rsl_dec_chan_nr() more readable, use RSL_CHAN_NR_MASK
..
rsl: make rsl_dec_chan_nr() more readable, use RSL_CHAN_NR_MASK
Change-Id: I1650e3b02e79461e42499268fa8ed30bff667489
---
M src/gsm/rsl.c
1 file changed, 23 insertions(+), 31 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index 8d34543..706fb54 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -187,38 +187,30 @@
{
*timeslot = chan_nr & 0x7;
- if ((chan_nr & 0xf8) == RSL_CHAN_Bm_ACCHs) {
- *type = RSL_CHAN_Bm_ACCHs;
+ switch (chan_nr & RSL_CHAN_NR_MASK) {
+ case RSL_CHAN_Bm_ACCHs:
+ case RSL_CHAN_BCCH:
+ case RSL_CHAN_RACH:
+ case RSL_CHAN_PCH_AGCH:
+ case RSL_CHAN_OSMO_PDCH:
+ case RSL_CHAN_OSMO_CBCH4:
+ case RSL_CHAN_OSMO_CBCH8:
+ *type = chan_nr & RSL_CHAN_NR_MASK;
*subch = 0;
- } else if ((chan_nr & 0xf0) == RSL_CHAN_Lm_ACCHs) {
- *type = RSL_CHAN_Lm_ACCHs;
- *subch = (chan_nr >> 3) & 0x1;
- } else if ((chan_nr & 0xe0) == RSL_CHAN_SDCCH4_ACCH) {
- *type = RSL_CHAN_SDCCH4_ACCH;
- *subch = (chan_nr >> 3) & 0x3;
- } else if ((chan_nr & 0xc0) == RSL_CHAN_SDCCH8_ACCH) {
- *type = RSL_CHAN_SDCCH8_ACCH;
- *subch = (chan_nr >> 3) & 0x7;
- } else if ((chan_nr & 0xf8) == RSL_CHAN_BCCH) {
- *type = RSL_CHAN_BCCH;
- *subch = 0;
- } else if ((chan_nr & 0xf8) == RSL_CHAN_RACH) {
- *type = RSL_CHAN_RACH;
- *subch = 0;
- } else if ((chan_nr & 0xf8) == RSL_CHAN_PCH_AGCH) {
- *type = RSL_CHAN_PCH_AGCH;
- *subch = 0;
- } else if ((chan_nr & 0xf8) == RSL_CHAN_OSMO_PDCH) {
- *type = RSL_CHAN_OSMO_PDCH;
- *subch = 0;
- } else if ((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH4) {
- *type = RSL_CHAN_OSMO_CBCH4;
- *subch = 0;
- } else if ((chan_nr & 0xf8) == RSL_CHAN_OSMO_CBCH8) {
- *type = RSL_CHAN_OSMO_CBCH8;
- *subch = 0;
- } else
- return -EINVAL;
+ break;
+ default:
+ if ((chan_nr & 0xf0) == RSL_CHAN_Lm_ACCHs) {
+ *type = RSL_CHAN_Lm_ACCHs;
+ *subch = (chan_nr >> 3) & 0x1;
+ } else if ((chan_nr & 0xe0) == RSL_CHAN_SDCCH4_ACCH) {
+ *type = RSL_CHAN_SDCCH4_ACCH;
+ *subch = (chan_nr >> 3) & 0x3;
+ } else if ((chan_nr & 0xc0) == RSL_CHAN_SDCCH8_ACCH) {
+ *type = RSL_CHAN_SDCCH8_ACCH;
+ *subch = (chan_nr >> 3) & 0x7;
+ } else
+ return -EINVAL;
+ }
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24419
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I1650e3b02e79461e42499268fa8ed30bff667489
Gerrit-Change-Number: 24419
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bsc[master]: add test_bs_power.ho_vty to show BS Power HO oscillation
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24424 ) Change subject: add test_bs_power.ho_vty to show BS Power HO oscillation .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1cc9bc39e8695faa983819b909e0ec76f0dbc296 Gerrit-Change-Number: 24424 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 14:16:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: handover_test: add bspower to meas-rep cmd
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24423 ) Change subject: handover_test: add bspower to meas-rep cmd .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I158d4b27370ab19318f83018803853f423c89b79 Gerrit-Change-Number: 24423 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 27 May 2021 14:15:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_network: refactor MGCP_DUMMY_LOAD
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24315 ) Change subject: mgcp_network: refactor MGCP_DUMMY_LOAD .. Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/24315/1/include/osmocom/mgcp/mgcp_network.h File include/osmocom/mgcp/mgcp_network.h: https://gerrit.osmocom.org/c/osmo-mgw/+/24315/1/include/osmocom/mgcp/mgcp_network.h@10 PS1, Line 10: a an > an Done https://gerrit.osmocom.org/c/osmo-mgw/+/24315/1/include/osmocom/mgcp/mgcp_network.h@18 PS1, Line 18: memcmp > Ack The dummy payload may be one byte but technically it is an array with only one element. That is why memcmp() is used. I have now changed the macro a bit. If we only have one byte rtp_dummy_payload it will directly compare the first byte. (I also added a unit-test so that we can be sure the macro still works now) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I21d96cefeeb647958bfa1e22a0ea030884746fad Gerrit-Change-Number: 24315 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 27 May 2021 13:12:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_network: refactor MGCP_DUMMY_LOAD
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/24315 to look at the new patch set (#2). Change subject: mgcp_network: refactor MGCP_DUMMY_LOAD .. mgcp_network: refactor MGCP_DUMMY_LOAD The constant MGCP_DUMMY_LOAD is used ambigously. Sometimes it is used as initalizer for an array, sometimes it is used as a single byte. Also the name is not very expressive. Lets refactor this. Change-Id: I21d96cefeeb647958bfa1e22a0ea030884746fad --- M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M tests/mgcp/mgcp_test.c 4 files changed, 60 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/15/24315/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I21d96cefeeb647958bfa1e22a0ea030884746fad Gerrit-Change-Number: 24315 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2: implement local update weight procedure
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23187 ) Change subject: gprs_ns2: implement local update weight procedure .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icec4dabb46bc198f68f91bfe09ba279fbe68d454 Gerrit-Change-Number: 23187 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 27 May 2021 12:16:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: handover: apply meas report BS Power to RXLEV, fix ho oscillation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24425 ) Change subject: handover: apply meas report BS Power to RXLEV, fix ho oscillation .. Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/24425/5/src/osmo-bsc/meas_rep.c File src/osmo-bsc/meas_rep.c: https://gerrit.osmocom.org/c/osmo-bsc/+/24425/5/src/osmo-bsc/meas_rep.c@37 PS5, Line 37: return rep->dl.full.rx_lev + (rep->bs_power * 2); Shouldn't this be doe by the caller of get_field and not this getter itself? looks weird asking for MEAS_REP_DL_RXLEV_FULL and getting rx_lev + bs_power... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifcf59964b5e2d550d79e4ba14d90962808f79dae Gerrit-Change-Number: 24425 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:57:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: add test_bs_power.ho_vty to show BS Power HO oscillation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24424 ) Change subject: add test_bs_power.ho_vty to show BS Power HO oscillation .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1cc9bc39e8695faa983819b909e0ec76f0dbc296 Gerrit-Change-Number: 24424 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:54:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm_08_58.h: add Osmocom specific Bm/Lm CBITs for VAMOS
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24420 ) Change subject: gsm_08_58.h: add Osmocom specific Bm/Lm CBITs for VAMOS .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If33c1695922d110c0d2c60d5c0136caf2587194e Gerrit-Change-Number: 24420 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:53:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: rsl: make rsl_dec_chan_nr() more readable, use RSL_CHAN_NR_MASK
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24419 ) Change subject: rsl: make rsl_dec_chan_nr() more readable, use RSL_CHAN_NR_MASK .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1650e3b02e79461e42499268fa8ed30bff667489 Gerrit-Change-Number: 24419 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:52:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: RSL: rx and tx VAMOS Channel Number cbits for VAMOS lchans
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24430 ) Change subject: RSL: rx and tx VAMOS Channel Number cbits for VAMOS lchans .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I957eff0d2c33ec795eda75a4bff21965b0179f73 Gerrit-Change-Number: 24430 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:50:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: RSL: set default TEI according to TRX number
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24395 ) Change subject: RSL: set default TEI according to TRX number .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3c500f7a5afc9143d4ea7102ab96e52aeb67b4b6 Gerrit-Change-Number: 24395 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:49:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: cosmetic loop simplification in gsm48_multirate_config()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24394 ) Change subject: cosmetic loop simplification in gsm48_multirate_config() .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I52424ad6a0bf499fe040cf0a1de00e636a0a40fe Gerrit-Change-Number: 24394 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:49:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: GSM_Types, bsc: add VAMOS cbits
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431 ) Change subject: GSM_Types, bsc: add VAMOS cbits .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2d98495b8c4c9a8466f2154af9bb29124c2cb0b5 Gerrit-Change-Number: 24431 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:48:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: add bsc/BSC_Tests_VAMOS.ttcn
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411 ) Change subject: add bsc/BSC_Tests_VAMOS.ttcn .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c504099163a30ea102cbd26d3615ca2e5ce1e64 Gerrit-Change-Number: 24411 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:47:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: rsl_lchan_lookup(): add comment explaining ts_is_capable_of_pchan()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24429 ) Change subject: rsl_lchan_lookup(): add comment explaining ts_is_capable_of_pchan() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3699db496cfb690ac9302ccd177cdd77dc57ebb Gerrit-Change-Number: 24429 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:47:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: rsl_lchan_lookup(): turn cbits if-cascade into a switch()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24428 ) Change subject: rsl_lchan_lookup(): turn cbits if-cascade into a switch() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4c6ce2f4ca999c19a58909b9adb849a3b8b6ffc8 Gerrit-Change-Number: 24428 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:46:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: implement Channel Mode Modify to VAMOS mode
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24374 ) Change subject: implement Channel Mode Modify to VAMOS mode .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibf53f4797d7491b17a33946fd7d920f038362b4c Gerrit-Change-Number: 24374 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:46:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: allow explixit TSC Set and TSC on chan activ / modif / assignment
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24369 ) Change subject: allow explixit TSC Set and TSC on chan activ / modif / assignment .. Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/24369/7/src/osmo-bsc/gsm_04_08_rr.c File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/24369/7/src/osmo-bsc/gsm_04_08_rr.c@694 PS7, Line 694: tsc = (lchan->modify.info.tsc >= 0) ? lchan->modify.info.tsc : gsm_ts_tsc(lchan->ts); /* FIXME */ why this FIXME here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic665125255d7354f5499d10dda1dd866ab243d24 Gerrit-Change-Number: 24369 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:43:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: meas rep logging: use log_check_level() to skip a logging loop
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24427 ) Change subject: meas rep logging: use log_check_level() to skip a logging loop .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71a402a0940857bbedbaf25d293429934706a83c Gerrit-Change-Number: 24427 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:38:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: meas rep logging: replace a dozen DEBUGPC() with one DEBUGP()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24426 ) Change subject: meas rep logging: replace a dozen DEBUGPC() with one DEBUGP() .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cb607ff43a1cb30408427d99d97c103776b6e69 Gerrit-Change-Number: 24426 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:36:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: change bs_power to bs_power_db
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24421 ) Change subject: change bs_power to bs_power_db .. Patch Set 6: (1 comment) I'm not really sure we really gain something with this patch, specially since ms_power is probably also stored the same way and you are then leaving each one with different metrics. https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/24421/6/src/osmo-bsc/abis_rsl.c@594 PS6, Line 594: msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power_db / 2); aren't you missing here the 0x10 flag? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I229db1d6bcf532af95aff56b2ad18b5ed9d81616 Gerrit-Change-Number: 24421 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:33:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: hodec2: remove code dup of rxlev averaging
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24422 ) Change subject: hodec2: remove code dup of rxlev averaging .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic49b94ea243898535c82018c14df8a3ba216ea83 Gerrit-Change-Number: 24422 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 27 May 2021 10:29:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: cards: rename class "Card" to "SimCard"
Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/24142 to look at the new patch set (#4). Change subject: cards: rename class "Card" to "SimCard" .. cards: rename class "Card" to "SimCard" There are the classes IsimCard and UsimCard, which inheret from Card, which is the base class for a normal non ISIM/USIM simcard. Card also has methods in it that are related to simcards, so it is not just any "Card", it is a SimCard and should be called that way. Change-Id: I2077ded44bc2297b8d478c5bd1895951b494efcc --- M pySim-read.py M pySim-shell.py M pySim/cards.py 3 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/24142/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2077ded44bc2297b8d478c5bd1895951b494efcc Gerrit-Change-Number: 24142 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in pysim[master]: filesystem: add unit tests for encoder/decoder methods
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/pysim/+/24012 )
Change subject: filesystem: add unit tests for encoder/decoder methods
..
Patch Set 5:
(7 comments)
https://gerrit.osmocom.org/c/pysim/+/24012/4/pySim/ts_31_102.py
File pySim/ts_31_102.py:
https://gerrit.osmocom.org/c/pysim/+/24012/4/pySim/ts_31_102.py@294
PS4, Line 294: _encode_decode_testvector = ['{"prot_scheme_id_list":
[{"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1,
"identifier": 1, "key_index": 2}, {"priority": 2, "identifier": 0, "key_index":
0}], "hnet_pubkey_list": [{"hnet_pubkey_identifier": 27, "hnet_pubkey":
"0272da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd1"},
{"hnet_pubkey_identifier": 30, "hnet_pubkey":
"5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650"}]}']
> one could use a dict and then json-serialize that. […]
The json line is what would also work in the shell. I think it is important to
use the same format that would also work in the shell. (I was starting with
dict format as test vector but quickly noticed that the dict not always matched
the json I had in mind)
I agree that this line is not easy to read but you can copy+paste it into
pySim-shell and it will work. I don't think there is much won when I now start
to split up the strings to match any coding style cosmetics
https://gerrit.osmocom.org/c/pysim/+/24012/4/tests/test_files.py
File tests/test_files.py:
https://gerrit.osmocom.org/c/pysim/+/24012/4/tests/test_files.py@22
PS4, Line 22: def test_encode_decode(testcase, ef, verbose=False):
> As I pointed out below, this function should become a method of DecTestCase.
Done
https://gerrit.osmocom.org/c/pysim/+/24012/4/tests/test_files.py@49
PS4, Line 49: if not has_testvec:
> This condition looks common for both branches, I would move it below.
Done
https://gerrit.osmocom.org/c/pysim/+/24012/4/tests/test_files.py@57
PS4, Line 57: for testvec_json in ef.__class__._encode_decode_testvector:
> Probably makes sense to wrap each vector into self.subTest too.
I do not understand what you mean. Do you mean to define a testvector class
which then contains the encode_decode_testvector[] list?
https://gerrit.osmocom.org/c/pysim/+/24012/4/tests/test_files.py@71
PS4, Line 71: testcase.assertEqual(testvec_json, decoded_json)
> there's pros and cons. […]
In my opinion matching the strings is the best way possible. There should not
be any difference between the original input and the output.
https://gerrit.osmocom.org/c/pysim/+/24012/4/tests/test_files.py@82
PS4, Line 82: DecTestCase
> Is it only decoding or encoding and decoding together? The name looks
> confusing.
Done
https://gerrit.osmocom.org/c/pysim/+/24012/4/tests/test_files.py@101
PS4, Line 101: test_encode_decode
> So you have a function that accepts a reference to the test case instance,
> but for some reason it's […]
Done
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/24012
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I02d884547f4982e0b8ed7ef21b8cda75237942e2
Gerrit-Change-Number: 24012
Gerrit-PatchSet: 5
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-CC: Falkenber9
Gerrit-Comment-Date: Thu, 27 May 2021 09:55:33 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Comment-In-Reply-To: fixeria
Gerrit-MessageType: comment
