Attention is currently required from: fixeria.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmocom-bb/+/32921
to look at the new patch set (#4).
Change subject: trxcon/l1sched: rework burst buffer shifting for TCH/[FH]
......................................................................
trxcon/l1sched: rework burst buffer shifting for TCH/[FH]
This is how the buffer shifting is implemented in osmo-bts-trx. Keep
trxcon's l1sched implementation as close to osmo-bts-trx as possible
in order to simplify the integration of CSD support.
Change-Id: Idb6e415f37f41b8ab92a3864962dac0a40c2fbaa
Related: OS#4396
---
M src/host/trxcon/src/sched_lchan_tchf.c
M src/host/trxcon/src/sched_lchan_tchh.c
2 files changed, 45 insertions(+), 40 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/21/32921/4
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32921
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Idb6e415f37f41b8ab92a3864962dac0a40c2fbaa
Gerrit-Change-Number: 32921
Gerrit-PatchSet: 4
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-MessageType: newpatchset
Attention is currently required from: fixeria.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmocom-bb/+/32920
to look at the new patch set (#4).
Change subject: trxcon/l1sched: cosmetic: use variable names like in osmo-bts-trx
......................................................................
trxcon/l1sched: cosmetic: use variable names like in osmo-bts-trx
This way it's easier to keep trxcon in sync with osmo-bts-trx.
Change-Id: I8138a45cca4e9063bf7d36ebc920b20b755138dd
Related: OS#4396
---
M src/host/trxcon/src/sched_lchan_pdtch.c
M src/host/trxcon/src/sched_lchan_tchf.c
M src/host/trxcon/src/sched_lchan_tchh.c
M src/host/trxcon/src/sched_lchan_xcch.c
4 files changed, 93 insertions(+), 79 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/20/32920/4
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32920
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I8138a45cca4e9063bf7d36ebc920b20b755138dd
Gerrit-Change-Number: 32920
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32918 )
Change subject: trxcon/l1sched: cosmetic: get rid of amr_is_cmr/fn_is_cmi
......................................................................
trxcon/l1sched: cosmetic: get rid of amr_is_cmr/fn_is_cmi
Change-Id: Ic8df73326befa387daead0a0dcbb8c9a1461021e
Related: OS#4396
---
M src/host/trxcon/src/sched_lchan_tchf.c
M src/host/trxcon/src/sched_lchan_tchh.c
2 files changed, 25 insertions(+), 18 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c
index 1a00a93..3674bb7 100644
--- a/src/host/trxcon/src/sched_lchan_tchf.c
+++ b/src/host/trxcon/src/sched_lchan_tchf.c
@@ -66,7 +66,6 @@
size_t l2_len;
int amr = 0;
uint8_t ft;
- bool amr_is_cmr;
/* Set up pointers */
mask = &lchan->rx_burst_mask;
@@ -122,20 +121,19 @@
1, 1, &n_errors, &n_bits_total);
break;
case GSM48_CMODE_SPEECH_AMR: /* AMR */
- /* the first FN 4,13,21 defines that CMI is included in frame,
- * the first FN 0,8,17 defines that CMR/CMC is included in frame.
- * NOTE: A frame ends 7 FN after start.
- */
- amr_is_cmr = !sched_tchf_dl_amr_cmi_map[bi->fn % 26];
-
/* we store tch_data + 2 header bytes, the amr variable set to
* 2 will allow us to skip the first 2 bytes in case we did
* receive an FACCH frame instead of a voice frame (we do not
* know this before we actually decode the frame) */
amr = 2;
rc = gsm0503_tch_afs_decode_dtx(l2 + amr, buffer,
- amr_is_cmr, lchan->amr.codec, lchan->amr.codecs, &lchan->amr.dl_ft,
- &lchan->amr.dl_cmr, &n_errors, &n_bits_total, &lchan->amr.last_dtx);
+ !sched_tchf_dl_amr_cmi_map[bi->fn % 26],
+ lchan->amr.codec,
+ lchan->amr.codecs,
+ &lchan->amr.dl_ft,
+ &lchan->amr.dl_cmr,
+ &n_errors, &n_bits_total,
+ &lchan->amr.last_dtx);
/* only good speech frames get rtp header */
if (rc != GSM_MACBLOCK_LEN && rc >= 4) {
diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c
index 303d59e..04a8bff 100644
--- a/src/host/trxcon/src/sched_lchan_tchh.c
+++ b/src/host/trxcon/src/sched_lchan_tchh.c
@@ -243,7 +243,6 @@
size_t l2_len;
int amr = 0;
uint8_t ft;
- bool fn_is_cmi;
/* Set up pointers */
mask = &lchan->rx_burst_mask;
@@ -307,17 +306,17 @@
&n_errors, &n_bits_total);
break;
case GSM48_CMODE_SPEECH_AMR: /* AMR */
- /* the first FN FN 4,13,21 or 5,14,22 defines that CMI is
- * included in frame, the first FN FN 0,8,17 or 1,9,18 defines
- * that CMR/CMC is included in frame. */
- fn_is_cmi = sched_tchh_dl_amr_cmi_map[bi->fn % 26];
-
/* See comment in function rx_tchf_fn() */
amr = 2;
rc = gsm0503_tch_ahs_decode_dtx(l2 + amr, buffer,
- !sched_tchh_dl_facch_map[bi->fn % 26],
- !fn_is_cmi, lchan->amr.codec, lchan->amr.codecs, &lchan->amr.dl_ft,
- &lchan->amr.dl_cmr, &n_errors, &n_bits_total, &lchan->amr.last_dtx);
+ !sched_tchh_dl_facch_map[bi->fn % 26],
+ !sched_tchh_dl_amr_cmi_map[bi->fn % 26],
+ lchan->amr.codec,
+ lchan->amr.codecs,
+ &lchan->amr.dl_ft,
+ &lchan->amr.dl_cmr,
+ &n_errors, &n_bits_total,
+ &lchan->amr.last_dtx);
/* only good speech frames get rtp header */
if (rc != GSM_MACBLOCK_LEN && rc >= 4) {
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32918
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ic8df73326befa387daead0a0dcbb8c9a1461021e
Gerrit-Change-Number: 32918
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32919 )
Change subject: trxcon/l1sched: use sched_tchh_dl_facch_map[] in rx_tchh_fn()
......................................................................
trxcon/l1sched: use sched_tchh_dl_facch_map[] in rx_tchh_fn()
This is a more effecient way to check if FACCH/H is allowed. The
mapping was added in a53e93fe9 and is already used for AMR.
Change-Id: Ib4b409956326480679a436d28224b539d00779e2
Related: a53e93fe9 "trxcon: Initial support for forwarding AMR"
Related: OS#4396
---
M src/host/trxcon/src/sched_lchan_tchh.c
1 file changed, 16 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c
index 04a8bff..acf362e 100644
--- a/src/host/trxcon/src/sched_lchan_tchh.c
+++ b/src/host/trxcon/src/sched_lchan_tchh.c
@@ -302,8 +302,8 @@
case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1: /* HR */
rc = gsm0503_tch_hr_decode(l2, buffer,
- !l1sched_tchh_facch_end(lchan->type, bi->fn, 0),
- &n_errors, &n_bits_total);
+ !sched_tchh_dl_facch_map[bi->fn % 26],
+ &n_errors, &n_bits_total);
break;
case GSM48_CMODE_SPEECH_AMR: /* AMR */
/* See comment in function rx_tchf_fn() */
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32919
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ib4b409956326480679a436d28224b539d00779e2
Gerrit-Change-Number: 32919
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33072 )
Change subject: BTS_Tests: add TC_data_rtp_tch* for CSD
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33072/comment/93339668_b00d…
PS1, Line 10: temporarily
> all the code for the rate adaptation functions to go to proper AoIP RTP CSD format is already in lib […]
For now I am trying to get the basic stuff to work. This includes reliable Uplink and Downlink transmission. So I'll mark this patch Work-in-Progress and rework the testsuites later to expect properly formatted V.110 frames.
So far I managed to get only TCH/F9.6 and TCH/F4.8 to work. Other channel modes are not working as expected (I guess due to some limitations in L1SAP and/or RTP related code). This needs to be fixed first.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33072
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: I9a0dc0fcf722f862d8dcf04660d4448662210f44
Gerrit-Change-Number: 33072
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Mon, 29 May 2023 14:59:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: laforge.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-gprs/+/33001
to look at the new patch set (#5).
Change subject: gmm: Implement rx GMM STATUS msg
......................................................................
gmm: Implement rx GMM STATUS msg
Change-Id: I46719a3bf6d5e93e25f41f01f5c2ab889ff62803
---
M src/gmm/gmm.c
1 file changed, 29 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/01/33001/5
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33001
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I46719a3bf6d5e93e25f41f01f5c2ab889ff62803
Gerrit-Change-Number: 33001
Gerrit-PatchSet: 5
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33001 )
Change subject: gmm: Implement rx GMM STATUS msg
......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS4:
> You can go even more generic than the "Rx foobar" and "msg_size check" by doing the tlv_parse in the […]
logging: We could move it to a generic place, but sometimes it's also useful to log message specific stuff in the same Rx line, hence why I preferred keeping it separate.
tlv_parse: GMM has a lot of adhoc IEs without T or L parts, which makes it difficult to parse all messages generically. One needs to first manually parse the first fields which are dependent on each message, until arriving to the TLV part.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33001
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I46719a3bf6d5e93e25f41f01f5c2ab889ff62803
Gerrit-Change-Number: 33001
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Mon, 29 May 2023 14:20:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment