- gerrit-log - lists.osmocom.org

Change in osmo-dev[master]: gen_makefile.py: use '$(nproc)' for '--jobs' by default
by fixeria 20 Apr '22

20 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27832 ) Change subject: gen_makefile.py: use '$(nproc)' for '--jobs' by default ...................................................................... gen_makefile.py: use '$(nproc)' for '--jobs' by default Change-Id: I769f032ebf197bac34468683526acf6614e74692 --- M gen_makefile.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved; Verified diff --git a/gen_makefile.py b/gen_makefile.py index abf3288..d83072f 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -84,7 +84,7 @@ parser.add_argument('-o', '--output', dest='output', default='Makefile', help='''Makefile filename (default: 'Makefile').''') -parser.add_argument('-j', '--jobs', dest='jobs', default='9', +parser.add_argument('-j', '--jobs', dest='jobs', default='$(nproc)', help='''-j option to pass to 'make'.''') parser.add_argument('-I', '--sudo-make-install', dest='sudo_make_install', -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I769f032ebf197bac34468683526acf6614e74692 Gerrit-Change-Number: 27832 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-dev[master]: osmo-add-gerrit-hooks.sh: do not use ssh host alias 'go'
by fixeria 20 Apr '22

20 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27831 ) Change subject: osmo-add-gerrit-hooks.sh: do not use ssh host alias 'go' ...................................................................... osmo-add-gerrit-hooks.sh: do not use ssh host alias 'go' ... because it may not be defined. Specify the address explicitly. Change-Id: I55c1501de61fe6b63be12b8e138742bd4b8baf64 --- M src/osmo-add-gerrit-hooks.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved; Verified diff --git a/src/osmo-add-gerrit-hooks.sh b/src/osmo-add-gerrit-hooks.sh index 1fbba38..05f1b90 100755 --- a/src/osmo-add-gerrit-hooks.sh +++ b/src/osmo-add-gerrit-hooks.sh @@ -13,7 +13,7 @@ for r in $(find . -maxdepth 2 -name '.git'); do cd "$base/$r" if [ ! -f "hooks/commit-msg" ]; then - scp go:hooks/commit-msg hooks/ + scp -P 29418 gerrit.osmocom.org:hooks/commit-msg hooks/ fi sed -i 's/if (unprinted /if (0 \&\& unprinted /' hooks/commit-msg done -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I55c1501de61fe6b63be12b8e138742bd4b8baf64 Gerrit-Change-Number: 27831 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-dev[master]: gen_makefile.py: use '$(nproc)' for '--jobs' by default
by fixeria 20 Apr '22

20 Apr '22

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27832 ) Change subject: gen_makefile.py: use '$(nproc)' for '--jobs' by default ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I769f032ebf197bac34468683526acf6614e74692 Gerrit-Change-Number: 27832 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Apr 2022 20:39:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-dev[master]: osmo-add-gerrit-hooks.sh: do not use ssh host alias 'go'
by fixeria 20 Apr '22

20 Apr '22

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27831 ) Change subject: osmo-add-gerrit-hooks.sh: do not use ssh host alias 'go' ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I55c1501de61fe6b63be12b8e138742bd4b8baf64 Gerrit-Change-Number: 27831 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Apr 2022 20:39:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed
by fixeria 20 Apr '22

20 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27836 ) Change subject: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27836/comment/6a31ff75_9b743ebe PS1, Line 414: if (!sched_tchh_dl_facch_map[br->fn % 26]) > I'm a bit lost here. […] "Why first try to send dummy stuff" - where? This is not the case. Currently (without this patch) if tch_dl_dequeue() yields nothing we're scheduling dummy FACCH *regardless* if it's permitted to start at the given TDMA FN or not. This may result in misaligned FACCH transmission, so the MS will not able to decode anything and will report BER>0. With this patch applied we a) schedule FACCH if it's allowed to start at the current TDMA FN; b) send whatever was in the burst buffer (garbage) if FACCH is not permitted. This is the best we can do without introducing additional complexity. Ideally the upper layers should guarantee that the queue is never empty, but currently this is not the case. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Gerrit-Change-Number: 27836 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Apr 2022 20:35:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner
by fixeria 20 Apr '22

20 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27835 ) Change subject: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27835/comment/ac4502e5_59716e7f PS1, Line 395: msgb_free(msg); /* steal 2nd speech frame */ > by steal you mean drop here? Ack, I can update the comment if you find it cleaner. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib923b8f5cc1063e9fc18acd2bdd003fd09f4b70f Gerrit-Change-Number: 27835 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Apr 2022 19:20:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed
by pespin 20 Apr '22

20 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27836 ) Change subject: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27836/comment/848efed4_f05c2fd4 PS1, Line 414: if (!sched_tchh_dl_facch_map[br->fn % 26]) I'm a bit lost here. Why first try to send dummy stuff and later on check if it's time to send it? doesn't make more sense to directly first check if it's time to send it, and only then, try to send something? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Gerrit-Change-Number: 27836 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Apr 2022 19:13:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner
by pespin 20 Apr '22

20 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27835 ) Change subject: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27835/comment/70434d2f_6dae4abb PS1, Line 395: msgb_free(msg); /* steal 2nd speech frame */ by steal you mean drop here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib923b8f5cc1063e9fc18acd2bdd003fd09f4b70f Gerrit-Change-Number: 27835 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Apr 2022 19:10:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F
by pespin 20 Apr '22

20 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Apr 2022 19:08:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed
by fixeria 20 Apr '22

20 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27836 ) Change subject: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed ...................................................................... osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Related: SYS#5919, OS#4823 --- M src/common/scheduler.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/36/27836/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 96189ef..422572d 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -998,7 +998,7 @@ /* FACCH/H channel mapping for Downlink (see 3GPP TS 45.002, table 1). * This mapping is valid for both FACCH/H(0) and FACCH/H(1). */ -static const uint8_t sched_tchh_dl_facch_map[26] = { +const uint8_t sched_tchh_dl_facch_map[26] = { [4] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [5] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ [13] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index e9e59e7..a163b31 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -75,6 +75,9 @@ [3] = 1, /* FACCH/H(1): B2(18,20,22,24,1,3) */ }; +/* TDMA frame number of burst 'a' is used as the table index. */ +extern const uint8_t sched_tchh_dl_facch_map[26]; + /*! \brief a single TCH/H burst was received by the PHY, process it */ int rx_tchh_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) { @@ -406,6 +409,11 @@ }; LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); + + /* FACCH/H can only be scheduled at specific TDMA offset */ + if (!sched_tchh_dl_facch_map[br->fn % 26]) + goto send_burst; /* send garbage */ + gsm0503_tch_hr_encode(*bursts_p, dummy, sizeof(dummy)); chan_state->dl_ongoing_facch = 1; chan_state->dl_facch_bursts = 6; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Gerrit-Change-Number: 27836 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log