December 2022 - gerrit-log - lists.osmocom.org

Change in osmo-trx[master]: ms: init trash used to escape the usb callbacks

by Hoernchen

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

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: ms: init trash used to escape the usb callbacks

by fixeria

Attention is currently required from: Hoernchen. fixeria 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: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-trx/+/30796/comment/d61d95f6_13791cd2 PS2, Line 7: trash o_O -- 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: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Dec 2022 16:49:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT

by fixeria

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

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: cosmetic: rearrange MS TRX related logic

by fixeria

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

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: allow building without cloning submodules

by fixeria

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

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: ms: init trash used to escape the usb callbacks

by Hoernchen

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

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: ms: init trash used to escape the usb callbacks

by Hoernchen

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

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... coverity: git pull --recursive / update submodules osmo-trx has just started to use submodules, so let's add the related git commands here. Closes: OS#5846 Related: osmo-trx.git Change-Id I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e --- M coverity/prepare_source_Osmocom.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 526e9d3..0ea829f 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -52,13 +52,13 @@ for proj in $PROJECTS $PROJECTS_DONT_BUILD_TEST; do if [ -d $proj ]; then if [ -z "$SRC_SKIP_FETCH" ]; then - (cd $proj && git fetch && git checkout -f -B master origin/master) + (cd $proj && git fetch && git checkout -f -B master origin/master && git submodule update --recursive --remote) fi if [ -n "$SRC_CLEAN" ]; then git -C "$proj" clean -ffxd fi else - git clone "$(osmo_git_clone_url "$proj")" + git clone --recursive "$(osmo_git_clone_url "$proj")" fi done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT

by laforge

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

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: cosmetic: rearrange MS TRX related logic

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30793 ) Change subject: configure.ac: cosmetic: rearrange MS TRX related logic ...................................................................... Patch Set 1: Code-Review+2 -- 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Dec 2022 15:55:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022