January 2023 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31115 ) Change subject: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31115/comment/7f8ca305_51789386 PS1, Line 453: l1sched_lchan_set_amr_cfg(lchan, > you are missing calling "continue;" here if error is returned. I think a better idea would be to validate AMR params before trying to apply them here. Otherwise we set lchan->tch_mode above, fail to apply the AMR params and thus do not set req->applied, which is weird. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e Gerrit-Change-Number: 31115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:06:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by pespin

Attention is currently required from: jolly, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/8d0298c5_1ce808be PS2, Line 26: gsmtap-category > I'm not really liking this proposal, it differs too much from separations done in other apps. If you really think I should, I can remove the "gsmtap-" prefix from commands (I actually prefer the way it is now). Other than that, I don't see it makes sense to substantialy change namings. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:05:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by pespin

Attention is currently required from: jolly, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/c88183a4_f02fdff1 PS2, Line 13: gsmtap > But there is no dedicated 'gsmtap' node in other apps, so it already does not match. […] I'm not mixing them here, I'm establishing 2 layers of granularity. First based on lchan, and then further specify in the lchan which kind of messages we want (this is important in gprs because there may be lots of DUMMY messages). https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/86c174e5_70ce782d PS2, Line 26: gsmtap-category > I don't like the inconsistency between 'gsmtap-sapi' and 'gsmtap-category'. My proposal: […] I'm not really liking this proposal, it differs too much from separations done in other apps. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:04:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Integreate mobile further into l23_app

by pespin

Attention is currently required from: osmith, jolly, pespin. Hello osmith, Jenkins Builder, jolly, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 to look at the new patch set (#2). Change subject: layer23: Integreate mobile further into l23_app ...................................................................... layer23: Integreate mobile further into l23_app Several functions and data structures in mobile app are refactored to follow more closely the l23_app API and structures. These movements allow starting to use already some shared infrastructure defined under layer23/common. This is not a full migration to l23_app, since mobile still keeps a separate main() with a few extra code. This commit is rather a step towards an eventual merge of mobile's main.cpp into layer23/common/main.c This is a preparation commit to later one adding gsmtap VTY configuration to all l23 apps. Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c --- M src/host/layer23/include/osmocom/bb/mobile/app_mobile.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 165 insertions(+), 91 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/07/31107/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c Gerrit-Change-Number: 31107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31115 ) Change subject: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31115/comment/ccf819e0_e3dc3bce PS1, Line 453: l1sched_lchan_set_amr_cfg(lchan, you are missing calling "continue;" here if error is returned. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e Gerrit-Change-Number: 31115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 10:45:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31114 ) Change subject: trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5dd16cff1c9730a496748681842f571d25653cb9 Gerrit-Change-Number: 31114 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 10:43:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: pcuif_proto: add indication to communicate E1 parameters

by pespin

Attention is currently required from: laforge, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31113 ) Change subject: pcuif_proto: add indication to communicate E1 parameters ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31113/comment/68e22a68_7c0b77e8 PS1, Line 11: E1 parameters (which TS, SS etc.) to the PCU. Lets add a new primitive > duplicate would mean that both the PCU and the BSC would have to have "matching" configuration of ho […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia7928489130c1205b06bb9b10de0fb1461843301 Gerrit-Change-Number: 31113 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 09:38:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 ) Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/rlcmac/llc_queue.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/31098/comment/267dbdb9_008a83c0 PS3, Line 155: break; > Good catch, this is wrong :) that's because I added an extra axis of priorities and updated the code […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e Gerrit-Change-Number: 31098 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 08:02:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31114 ) Change subject: trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind ...................................................................... trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind Change-Id: I5dd16cff1c9730a496748681842f571d25653cb9 --- M src/host/trxcon/src/sched_trx.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/31114/1 diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 4cedd8a..d2040c5 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -623,20 +623,20 @@ } static void l1sched_a5_burst_dec(struct l1sched_lchan_state *lchan, - uint32_t fn, sbit_t *burst) + struct l1sched_burst_ind *bi) { ubit_t ks[114]; int i; /* Generate keystream for a DL burst */ - osmo_a5(lchan->a5.algo, lchan->a5.key, fn, ks, NULL); + osmo_a5(lchan->a5.algo, lchan->a5.key, bi->fn, ks, NULL); /* Apply keystream over ciphertext */ for (i = 0; i < 57; i++) { if (ks[i]) - burst[i + 3] *= -1; + bi->burst[i + 3] *= -1; if (ks[i + 57]) - burst[i + 88] *= -1; + bi->burst[i + 88] *= -1; } } @@ -782,7 +782,7 @@ /* Perform A5/X decryption if required */ if (lchan->a5.algo) - l1sched_a5_burst_dec(lchan, bi->fn, &bi->burst[0]); + l1sched_a5_burst_dec(lchan, bi); /* Put burst to handler */ handler(lchan, bi); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5dd16cff1c9730a496748681842f571d25653cb9 Gerrit-Change-Number: 31114 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31115 ) Change subject: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() ...................................................................... trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 32 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/31115/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 4b743ca..0ea1ba0 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -436,6 +436,8 @@ void l1sched_deactivate_all_lchans(struct l1sched_ts *ts); int l1sched_set_lchans(struct l1sched_ts *ts, uint8_t chan_nr, int active, uint8_t tch_mode, uint8_t tsc); +int l1sched_lchan_set_amr_cfg(struct l1sched_lchan_state *lchan, + uint8_t codecs_bitmask, uint8_t start_codec); int l1sched_activate_lchan(struct l1sched_ts *ts, enum l1sched_lchan_type chan); int l1sched_deactivate_lchan(struct l1sched_ts *ts, enum l1sched_lchan_type chan); struct l1sched_lchan_state *l1sched_find_lchan(struct l1sched_ts *ts, diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index d2040c5..267f128 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -452,6 +452,33 @@ return rc; } +int l1sched_lchan_set_amr_cfg(struct l1sched_lchan_state *lchan, + uint8_t codecs_bitmask, uint8_t start_codec) +{ + int n = 0; + int acum = 0; + int pos; + + while ((pos = ffs(codecs_bitmask)) != 0) { + acum += pos; + LOGP_LCHANC(lchan, LOGL_DEBUG, "AMR codec[%u] = %u\n", n, acum - 1); + lchan->amr.codec[n++] = acum - 1; + codecs_bitmask >>= pos; + } + if (n == 0) { + LOGP_LCHANC(lchan, LOGL_ERROR, "Empty AMR codec mode bitmask!\n"); + return -EINVAL; + } + + lchan->amr.codecs = n; + lchan->amr.dl_ft = start_codec; + lchan->amr.dl_cmr = start_codec; + lchan->amr.ul_ft = start_codec; + lchan->amr.ul_cmr = start_codec; + + return 0; +} + int l1sched_activate_lchan(struct l1sched_ts *ts, enum l1sched_lchan_type chan) { const struct l1sched_lchan_desc *lchan_desc = &l1sched_lchan_desc[chan]; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index e3224a9..0c37f35 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -35,7 +35,6 @@ #include <osmocom/bb/trxcon/phyif.h> #include <osmocom/bb/trxcon/l1ctl.h> #include <osmocom/bb/l1sched/l1sched.h> -#include <osmocom/bb/l1sched/logging.h> #define S(x) (1 << (x)) @@ -451,29 +450,9 @@ continue; lchan->tch_mode = req->mode; if (req->mode == GSM48_CMODE_SPEECH_AMR) { - uint8_t bmask = req->amr.codecs_bitmask; - int n = 0; - int acum = 0; - int pos; - while ((pos = ffs(bmask)) != 0) { - acum += pos; - LOGPFSML(fi, LOGL_DEBUG, - LOGP_LCHAN_NAME_FMT " AMR codec[%u] = %u\n", - LOGP_LCHAN_NAME_ARGS(lchan), n, acum - 1); - lchan->amr.codec[n++] = acum - 1; - bmask >>= pos; - } - if (n == 0) { - LOGPFSML(fi, LOGL_ERROR, - LOGP_LCHAN_NAME_FMT " Empty AMR codec mode bitmask!\n", - LOGP_LCHAN_NAME_ARGS(lchan)); - continue; - } - lchan->amr.codecs = n; - lchan->amr.dl_ft = req->amr.start_codec; - lchan->amr.dl_cmr = req->amr.start_codec; - lchan->amr.ul_ft = req->amr.start_codec; - lchan->amr.ul_cmr = req->amr.start_codec; + l1sched_lchan_set_amr_cfg(lchan, + req->amr.codecs_bitmask, + req->amr.start_codec); } req->applied = true; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e Gerrit-Change-Number: 31115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023