Attention is currently required from: fixeria.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmocom-bb/+/30811
to look at the new patch set (#2).
Change subject: layer23: make all apps depend on libosmo-gprs-rlcmac
......................................................................
layer23: make all apps depend on libosmo-gprs-rlcmac
This will be needed for the modem application, and is also used
in a follow-up commit adding support for parsing SI13 Rest Octets.
Change-Id: I8e0f826c9b2a886f94624176e34e7d197e93d25f
Related: OS#5500
---
M contrib/jenkins.sh
M src/host/layer23/configure.ac
M src/host/layer23/src/common/Makefile.am
M src/host/layer23/src/misc/Makefile.am
M src/host/layer23/src/mobile/Makefile.am
M src/host/layer23/src/modem/Makefile.am
6 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/11/30811/2
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30811
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I8e0f826c9b2a886f94624176e34e7d197e93d25f
Gerrit-Change-Number: 30811
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30801 )
Change subject: coverity: build osmo-trx with MS TRX (--with-mstrx)
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30801
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I4fbb052eacd8e6b8ddb8130d2e280a248719b250
Gerrit-Change-Number: 30801
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 30 Dec 2022 18:38:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30803 )
Change subject: rlcmac: use OSMO_ASSERT instead of plain assert()
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30803
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Ia834285cbaba34e2f0783bf83bd2f3934d74d778
Gerrit-Change-Number: 30803
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 30 Dec 2022 18:38:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30798 )
Change subject: rlcmac: fix coding of EGPRS Packet Uplink Assignment in IA RestOctets
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30798
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I7fedbad1ac4d744d1d3941553e573d4202e9d24a
Gerrit-Change-Number: 30798
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 30 Dec 2022 18:37:25 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30805 )
Change subject: layer23: use osmo_stderr_target in misc apps
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30805
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I56770f04fa3c440e6ccabe6f6fccfe171d41d751
Gerrit-Change-Number: 30805
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 30 Dec 2022 18:36:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30797 )
Change subject: rlcmac: add decoder and test vectors for IA Rest Octets
......................................................................
Patch Set 1: Verified+1
(1 comment)
Patchset:
PS1:
The linter suggests that the array with test vectors "should probably be const char * const". I don't think this is really that important for a unit test, so overwriting its vote.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30797
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I39a29dc9b5b22ce4374ae33336696014e326d012
Gerrit-Change-Number: 30797
Gerrit-PatchSet: 1
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-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 29 Dec 2022 01:12:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
fixeria has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30797 )
Change subject: rlcmac: add decoder and test vectors for IA Rest Octets
......................................................................
Removed Verified-1 by Jenkins Builder (1000002)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30797
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I39a29dc9b5b22ce4374ae33336696014e326d012
Gerrit-Change-Number: 30797
Gerrit-PatchSet: 1
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: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: deleteVote
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30797 )
Change subject: rlcmac: add decoder and test vectors for IA Rest Octets
......................................................................
Patch Set 1:
(1 comment)
File tests/rlcmac/ts_44_018_test.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2298):
https://gerrit.osmocom.org/c/libosmo-gprs/+/30797/comment/a2843a18_3e3cd63a
PS1, Line 63: static const char *testData[] = {
static const char * array should probably be static const char * const
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30797
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I39a29dc9b5b22ce4374ae33336696014e326d012
Gerrit-Change-Number: 30797
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Thu, 29 Dec 2022 00:50:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: osmith, pespin, fixeria.
Hello osmith, Jenkins Builder, laforge, fixeria, lynxis lazus,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-sgsn/+/30786
to look at the new patch set (#5).
Change subject: Rename gprs_gb.[c,h] -> gprs_ns.[c,h]
......................................................................
Rename gprs_gb.[c,h] -> gprs_ns.[c,h]
All remaining code in that file is NS protocol related, hence let's
rename it so that we end up with one file per protocol in the Gb stack.
Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2
---
M include/osmocom/sgsn/Makefile.am
R include/osmocom/sgsn/gprs_ns.h
M src/sgsn/Makefile.am
R src/sgsn/gprs_ns.c
M src/sgsn/gprs_sndcp.c
M src/sgsn/sgsn_libgtp.c
M src/sgsn/sgsn_main.c
M src/sgsn/sgsn_vty.c
M tests/sgsn/Makefile.am
9 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/86/30786/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30786
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2
Gerrit-Change-Number: 30786
Gerrit-PatchSet: 5
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: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith, pespin, fixeria, msuraev.
Hello osmith, Jenkins Builder, laforge, fixeria, lynxis lazus,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-sgsn/+/30785
to look at the new patch set (#5).
Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]
......................................................................
Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]
This leaves only NS protocol related code in gprs_gb.[c,h], which will
be renamed to gprs_ns.[c,h] in a follow up patch.
Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2
---
M include/osmocom/sgsn/gprs_gb.h
M include/osmocom/sgsn/gprs_gmm.h
M src/sgsn/gprs_gb.c
M src/sgsn/gprs_gmm.c
M src/sgsn/gprs_sndcp.c
5 files changed, 55 insertions(+), 55 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/85/30785/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2
Gerrit-Change-Number: 30785
Gerrit-PatchSet: 5
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: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith, pespin, fixeria.
Hello osmith, Jenkins Builder, laforge, fixeria, lynxis lazus,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-sgsn/+/30784
to look at the new patch set (#4).
Change subject: Create new specific file for BSSGP code
......................................................................
Create new specific file for BSSGP code
Right now there's no much code there since the related code is totally
entangled with the LLC one.
This will eventually change in the future when we switch to use
libosmo-gprs.
Hence, this commit is a preparation to have already some place to put
new BSSGP specific code in the future.
Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780
---
M include/osmocom/sgsn/Makefile.am
A include/osmocom/sgsn/gprs_bssgp.h
M include/osmocom/sgsn/gprs_gb.h
M src/sgsn/Makefile.am
A src/sgsn/gprs_bssgp.c
M src/sgsn/gprs_gb.c
M src/sgsn/sgsn_libgtp.c
M src/sgsn/sgsn_main.c
M src/sgsn/sgsn_vty.c
M tests/sgsn/Makefile.am
10 files changed, 118 insertions(+), 69 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/84/30784/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30784
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780
Gerrit-Change-Number: 30784
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: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30796 )
Change subject: ms: init trash used to escape the usb callbacks
......................................................................
ms: init trash used to escape the usb callbacks
Closes: OS#5847
Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
---
M Transceiver52M/ms/ms_upper.cpp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hoernchen: Looks good to me, approved; Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp
index e59aeae..281716e 100644
--- a/Transceiver52M/ms/ms_upper.cpp
+++ b/Transceiver52M/ms/ms_upper.cpp
@@ -449,8 +449,8 @@
// we know the flag is atomic and it prevents the trxcon cb handlers from writing
// to the queues, so submit some trash to unblock the threads & exit
- trxcon::trxcon_phyif_cmd cmd;
- trxcon::internal_q_tx_buf b;
+ trxcon::trxcon_phyif_cmd cmd = {};
+ trxcon::internal_q_tx_buf b = {};
trxcon::txq.spsc_push(&b);
trxcon::cmdq_to_phy.spsc_push(&cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30796
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
Gerrit-Change-Number: 30796
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30796 )
Change subject: ms: init trash used to escape the usb callbacks
......................................................................
Patch Set 3: Verified+1 Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30796
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
Gerrit-Change-Number: 30796
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Dec 2022 17:01:15 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30796 )
Change subject: ms: init trash used to escape the usb callbacks
......................................................................
Patch Set 2: Verified+1 Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30796
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
Gerrit-Change-Number: 30796
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Dec 2022 17:01:08 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30796 )
Change subject: ms: init trash used to escape the usb callbacks
......................................................................
Patch Set 2:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-trx/+/30796/comment/9cac77ad_7e9b1755
PS2, Line 7: trash
> o_O
literally what the comment in the code also says and why it was not initialized..
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30796
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
Gerrit-Change-Number: 30796
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Dec 2022 16:55:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30794 )
Change subject: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT
......................................................................
configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT
Always log whether the MS TRX is going to be built, event if it's not.
Change-Id: I1c5648b8090ba2b6638b71f2d3332dfae87b2772
Related: OS#5599
---
M configure.ac
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/configure.ac b/configure.ac
index fd8d577..2c4bb28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,16 +209,18 @@
PKG_CHECK_MODULES(BLADE, libbladeRF >= 2.0)
])
+AC_MSG_CHECKING([whether to enable building MS TRX])
AS_IF([test "x$with_mstrx" = "xyes"], [
- AC_MSG_NOTICE(["Enabling ms-trx..."])
AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon])
AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon")
+ AC_MSG_RESULT([yes])
], [
# Despite LIBTRXCON_DIR is added to SUBDIRS conditionally,
# autoconf/automake still requires the directory to be present
# and thus the submodule to be fetched (even if MS TRX is not needed).
# Work this around by pointing it to an empty dir.
AC_SUBST(LIBTRXCON_DIR, "osmocom-bb")
+ AC_MSG_RESULT([no])
])
AS_IF([test "x$with_singledb" = "xyes"], [
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30794
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1c5648b8090ba2b6638b71f2d3332dfae87b2772
Gerrit-Change-Number: 30794
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30793 )
Change subject: configure.ac: cosmetic: rearrange MS TRX related logic
......................................................................
configure.ac: cosmetic: rearrange MS TRX related logic
Make it consistent with the existing AS_IF/AM_CONDITIONAL locations.
Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1
Related: OS#5599
---
M configure.ac
1 file changed, 12 insertions(+), 13 deletions(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/configure.ac b/configure.ac
index eab0e22..fd8d577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,17 @@
PKG_CHECK_MODULES(BLADE, libbladeRF >= 2.0)
])
-AM_CONDITIONAL([ENABLE_MS_TRX], [test "x$with_mstrx" = "xyes"])
+AS_IF([test "x$with_mstrx" = "xyes"], [
+ AC_MSG_NOTICE(["Enabling ms-trx..."])
+ AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon])
+ AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon")
+], [
+ # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally,
+ # autoconf/automake still requires the directory to be present
+ # and thus the submodule to be fetched (even if MS TRX is not needed).
+ # Work this around by pointing it to an empty dir.
+ AC_SUBST(LIBTRXCON_DIR, "osmocom-bb")
+])
AS_IF([test "x$with_singledb" = "xyes"], [
AC_DEFINE(SINGLEDB, 1, Define to 1 for single daughterboard)
@@ -267,6 +277,7 @@
AM_CONDITIONAL(DEVICE_BLADE, [test "x$with_bladerf" = "xyes"])
AM_CONDITIONAL(ARCH_ARM, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes"])
AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
+AM_CONDITIONAL(ENABLE_MS_TRX, [test "x$with_mstrx" = "xyes"])
PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
PKG_CHECK_MODULES(FFTWF, fftw3f)
@@ -334,18 +345,6 @@
AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])
AC_MSG_RESULT([LDFLAGS="$LDFLAGS"])
-if test "x$with_mstrx" = "xyes"; then
- AC_MSG_NOTICE(["Enabling ms-trx..."])
- AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon])
- AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon")
-else
- # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally,
- # autoconf/automake still requires the directory to be present
- # and thus the submodule to be fetched (even if MS TRX is not needed).
- # Work this around by pointing it to an empty dir.
- AC_SUBST(LIBTRXCON_DIR, "osmocom-bb")
-fi
-
dnl Output files
AC_CONFIG_FILES([\
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30793
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1
Gerrit-Change-Number: 30793
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30792 )
Change subject: configure.ac: allow building without cloning submodules
......................................................................
configure.ac: allow building without cloning submodules
The MS TRX was intentionally added [1] as an optional feature, which
requires a git submodule to be present in order to build libtrxcon.
This feature can be enabled by passing --with-mstrx to the configure.
But autoconf/automake is a mess. Despite in the root Makefile.am we
are adding full submodule path to the SUBDIRS *conditionally*, the
configure script would still fail if the submodule is not fetched:
Makefile.am:32: error: required directory
./osmocom-bb/src/host/trxcon
does not exist
It would not even enter that directory if it's present, but somehow
it's still required to exist. For the end user this means that
cloning the submodule becomes a *necessary* step in order to build
osmo-trx from source, even when the MS TRX is not really needed.
The fact that we're unconditionally requiring the submodule, which
is meant to be used by an optional feature feels wrong to me. It's
also unusual for osmocom projects to require submodules, so it may
(and already did) cause build failures when cloning as usual.
Let's work this problem around by defining LIBTRXCON_DIR variable
in configure.ac and using it in the root Makefile.am. If the MS
TRX is not enabled explicitly, make autoconf/automake happy by
assigning LIBTRXCON_DIR the submodule's root directory, which is
always present but empty if the submodule is not fetched.
Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968
Related: [1] b7253c6fdc88a3e2e0c8b441dc3c34dfb1c15d24
Related: OS#5599, OS#5846
---
M Makefile.am
M configure.ac
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Verified
laforge: Looks good to me, but someone else must approve
Hoernchen: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index 580544b..7b2198c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@
SUBDIRS =
if ENABLE_MS_TRX
-SUBDIRS += osmocom-bb/src/host/trxcon
+SUBDIRS += $(LIBTRXCON_DIR)
endif
# Order must be preserved
diff --git a/configure.ac b/configure.ac
index ff1ae8b..eab0e22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,6 +337,13 @@
if test "x$with_mstrx" = "xyes"; then
AC_MSG_NOTICE(["Enabling ms-trx..."])
AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon])
+ AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon")
+else
+ # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally,
+ # autoconf/automake still requires the directory to be present
+ # and thus the submodule to be fetched (even if MS TRX is not needed).
+ # Work this around by pointing it to an empty dir.
+ AC_SUBST(LIBTRXCON_DIR, "osmocom-bb")
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30792
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968
Gerrit-Change-Number: 30792
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
Hoernchen has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-trx/+/30796 )
Change subject: ms: init trash used to escape the usb callbacks
......................................................................
ms: init trash used to escape the usb callbacks
Closes: OS#5847
Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
---
M Transceiver52M/ms/ms_upper.cpp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/96/30796/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30796
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
Gerrit-Change-Number: 30796
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30796 )
Change subject: ms: init trash used to escape the usb callbacks
......................................................................
ms: init trash used to escape the usb callbacks
Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
---
M Transceiver52M/ms/ms_upper.cpp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/96/30796/1
diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp
index e59aeae..281716e 100644
--- a/Transceiver52M/ms/ms_upper.cpp
+++ b/Transceiver52M/ms/ms_upper.cpp
@@ -449,8 +449,8 @@
// we know the flag is atomic and it prevents the trxcon cb handlers from writing
// to the queues, so submit some trash to unblock the threads & exit
- trxcon::trxcon_phyif_cmd cmd;
- trxcon::internal_q_tx_buf b;
+ trxcon::trxcon_phyif_cmd cmd = {};
+ trxcon::internal_q_tx_buf b = {};
trxcon::txq.spsc_push(&b);
trxcon::cmdq_to_phy.spsc_push(&cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30796
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1b41350f981bd9f68163509b94d5457218b415d6
Gerrit-Change-Number: 30796
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30794 )
Change subject: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30794
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1c5648b8090ba2b6638b71f2d3332dfae87b2772
Gerrit-Change-Number: 30794
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Dec 2022 15:55:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30794 )
Change subject: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30794
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1c5648b8090ba2b6638b71f2d3332dfae87b2772
Gerrit-Change-Number: 30794
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Dec 2022 15:22:37 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment