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

[M] Change in osmo-bsc[master]: simplify storage of bsc_msc_data->audio_support

by laforge

Attention is currently required from: neels, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31609 ) Change subject: simplify storage of bsc_msc_data->audio_support ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I625cedc4bb040d649fd6e1794ba468f4c6ad6adc Gerrit-Change-Number: 31609 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 11:30:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-trx[master]: .clang-format: adjust template formatting

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30970 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: .clang-format: adjust template formatting ...................................................................... .clang-format: adjust template formatting Change-Id: I9345693982ce33e6bc811be9e98b9d3da2add7a1 --- M .clang-format 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.clang-format b/.clang-format index 8c68525..4de65a5 100644 --- a/.clang-format +++ b/.clang-format @@ -25,7 +25,7 @@ AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: false +AlwaysBreakTemplateDeclarations: true BinPackArguments: true BinPackParameters: true BraceWrapping: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9345693982ce33e6bc811be9e98b9d3da2add7a1 Gerrit-Change-Number: 30970 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: update submodule to currently known working version

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30967 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ms: update submodule to currently known working version ...................................................................... ms: update submodule to currently known working version Change-Id: I690f508d1f0cee0b623196dd4574c3ee456f07fa --- M osmocom-bb 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmocom-bb b/osmocom-bb index 040bf41..c209242 160000 --- a/osmocom-bb +++ b/osmocom-bb @@ -1 +1 @@ -Subproject commit 040bf4102892ddba1a4574d85b31653131c5ede4 +Subproject commit c209242d196a9c30401c383104f5063d4dbde4cd -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I690f508d1f0cee0b623196dd4574c3ee456f07fa Gerrit-Change-Number: 30967 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(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

2 years, 4 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: adjust tx scaling for tx samples

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31642 ) Change subject: ms: adjust tx scaling for tx samples ...................................................................... ms: adjust tx scaling for tx samples The "safe" scaling factor introduced in 7ac54b10d3373865cddd0f2e3821b0346cb9dd7c is too low and dates back to the beginning and the move from usrp1->uhd, but the modulator will exceed +-1 so "proper" scaling leads to overflows. Let's just do what osmotrx has been doing for many years... Change-Id: I75a2eba1f7f7b81249c06ce3fc9dfeee08878cb9 --- M Transceiver52M/ms/ms.cpp M Transceiver52M/ms/uhd_specific.h 2 files changed, 17 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index 6f63a73..ec2c5f8 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -58,7 +58,7 @@ pthread_setschedparam(pthread_self(), SCHED_FIFO, &sch_params); auto burst = genRandAccessBurst(0, 4, 0); - scaleVector(*burst, t->txFullScale * 0.7); + scaleVector(*burst, t->txFullScale); // float -> int16 blade_sample_type burst_buf[burst->size()]; diff --git a/Transceiver52M/ms/uhd_specific.h b/Transceiver52M/ms/uhd_specific.h index edf7f79..8295a54 100644 --- a/Transceiver52M/ms/uhd_specific.h +++ b/Transceiver52M/ms/uhd_specific.h @@ -82,7 +82,7 @@ { delete[] one_pkt_buf; } - uhd_hw() : rxFullScale(32767), txFullScale(32767), rxtxdelay(-67) + uhd_hw() : rxFullScale(32767), txFullScale(32767 * 0.3), rxtxdelay(-67) { } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I75a2eba1f7f7b81249c06ce3fc9dfeee08878cb9 Gerrit-Change-Number: 31642 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in osmo-trx[master]: ms: adjust float<->integral type conversion

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30966 ) Change subject: ms: adjust float<->integral type conversion ...................................................................... ms: adjust float<->integral type conversion Given integral type A and non integral type B and depending on rounding mode, optimization, compiler, and phase of the moon A(A)*B != A(A*B) so split the two cases. While at it, also make the template automagically work for complex types instead of requiring manual casts, the general idea here is to allow inlining and vectorization by treating all args as plain arrays, which is fine. This works as expected with -tune=native, x64 implies sse2, and we do not target any neon-less arm versions either. Clang only array length hints can improve this even more. Change-Id: I93f077f967daf2ed382d12cc20a54846b3688634 --- M Transceiver52M/Complex.h M Transceiver52M/ms/ms.cpp M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_rx_burst_test.cpp M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/ms_upper.cpp 6 files changed, 80 insertions(+), 21 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/Complex.h b/Transceiver52M/Complex.h index 6e72346..597a26f 100644 --- a/Transceiver52M/Complex.h +++ b/Transceiver52M/Complex.h @@ -29,7 +29,7 @@ template<class Real> class Complex { public: - + typedef Real value_type; Real r, i; /**@name constructors */ diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index ddcfc3e..6f63a73 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -62,7 +62,7 @@ // float -> int16 blade_sample_type burst_buf[burst->size()]; - convert_and_scale<int16_t, float>(burst_buf, burst->begin(), burst->size() * 2, 1); + convert_and_scale(burst_buf, burst->begin(), burst->size() * 2, 1); while (1) { GSM::Time target; @@ -126,7 +126,7 @@ t->submit_burst_ts(buf2, burst->size() + pad, send_ts - pad); #ifdef DBGXX signalVector test(burst->size() + pad); - convert_and_scale<float, int16_t>(test.begin(), buf2, burst->size() * 2 + pad, 1.f / float(scale)); + convert_and_scale(test.begin(), buf2, burst->size() * 2 + pad, 1.f / float(scale)); estim_burst_params ebp; auto det = detectAnyBurst(test, 0, 4, 4, CorrType::RACH, 40, &ebp); if (det > 0) diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index 5425283..8ea9932 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -38,6 +38,7 @@ #error wat? no device.. #endif +#include "Complex.h" #include "GSMCommon.h" #include "itrq.h" @@ -45,7 +46,8 @@ const unsigned int NUM_RXQ_FRAMES = 1; // rx thread <-> upper rx queue const unsigned int SCH_LEN_SPS = (ONE_TS_BURST_LEN * 8 /*ts*/ * 12 /*frames*/); -template <typename T> void clamp_array(T *start2, unsigned int len, T max) +template <typename T> +void clamp_array(T *start2, unsigned int len, T max) { for (int i = 0; i < len; i++) { const T t1 = start2[i] < -max ? -max : start2[i]; @@ -53,15 +55,54 @@ start2[i] = t2; } } -template <typename DST_T, typename SRC_T, typename ST> -void convert_and_scale(void *dst, void *src, unsigned int src_len, ST scale) + +namespace cvt_internal +{ + +template <typename SRC_T, typename ST> +void convert_and_scale_i(float *dst, const SRC_T *src, unsigned int src_len, ST scale) { for (unsigned int i = 0; i < src_len; i++) - reinterpret_cast<DST_T *>(dst)[i] = static_cast<DST_T>((reinterpret_cast<SRC_T *>(src)[i])) * scale; + dst[i] = static_cast<float>(src[i]) * scale; } -template <typename DST_T, typename SRC_T> void convert_and_scale_default(void *dst, void *src, unsigned int src_len) + +template <typename DST_T, typename ST> +void convert_and_scale_i(DST_T *dst, const float *src, unsigned int src_len, ST scale) { - return convert_and_scale<DST_T, SRC_T>(dst, src, src_len, SAMPLE_SCALE_FACTOR); + for (unsigned int i = 0; i < src_len; i++) + dst[i] = static_cast<DST_T>(src[i] * scale); +} + +template <typename ST> +void convert_and_scale_i(float *dst, const float *src, unsigned int src_len, ST scale) +{ + for (unsigned int i = 0; i < src_len; i++) + dst[i] = src[i] * scale; +} + +template <typename T> +struct is_complex : std::false_type { + using baset = T; +}; + +template <typename T> +struct is_complex<std::complex<T>> : std::true_type { + using baset = typename std::complex<T>::value_type; +}; + +template <typename T> +struct is_complex<Complex<T>> : std::true_type { + using baset = typename Complex<T>::value_type; +}; + +} // namespace cvt_internal + +template <typename DST_T, typename SRC_T, typename ST> +void convert_and_scale(DST_T *dst, const SRC_T *src, unsigned int src_len, ST scale) +{ + using vd = typename cvt_internal::is_complex<DST_T>::baset; + using vs = typename cvt_internal::is_complex<SRC_T>::baset; + return cvt_internal::convert_and_scale_i((vd *)dst, (vs *)src, src_len, scale); } struct one_burst { diff --git a/Transceiver52M/ms/ms_rx_burst_test.cpp b/Transceiver52M/ms/ms_rx_burst_test.cpp index 7018301..c3ba4ee 100644 --- a/Transceiver52M/ms/ms_rx_burst_test.cpp +++ b/Transceiver52M/ms/ms_rx_burst_test.cpp @@ -90,7 +90,7 @@ if (is_sch) { char outbin[148]; - convert_and_scale_default<float, int16_t>(burst.begin(), e.burst, ONE_TS_BURST_LEN * 2); + convert_and_scale(burst.begin(), e.burst, ONE_TS_BURST_LEN * 2, SAMPLE_SCALE_FACTOR); std::stringstream dbgout; #if 0 { @@ -109,8 +109,7 @@ } #endif { - convert_and_scale<float, float>(burst.begin(), burst.begin(), ONE_TS_BURST_LEN * 2, - 1.f / float(scale)); + convert_and_scale(burst.begin(), burst.begin(), ONE_TS_BURST_LEN * 2, 1.f / float(scale)); std::complex<float> channel_imp_resp[CHAN_IMP_RESP_LENGTH * d_OSR]; auto ss = reinterpret_cast<std::complex<float> *>(burst.begin()); @@ -133,7 +132,7 @@ return; } #if 1 - convert_and_scale<float, int16_t>(burst.begin(), e.burst, ONE_TS_BURST_LEN * 2, 1.f / float(scale)); + convert_and_scale(burst.begin(), e.burst, ONE_TS_BURST_LEN * 2, 1.f / float(scale)); // std::cerr << "@" << tsc << " " << e.gsmts.FN() << ":" << e.gsmts.TN() << " " << ebp.toa << " " // << std::endl; diff --git a/Transceiver52M/ms/ms_rx_lower.cpp b/Transceiver52M/ms/ms_rx_lower.cpp index bec1691..e39d72d 100644 --- a/Transceiver52M/ms/ms_rx_lower.cpp +++ b/Transceiver52M/ms/ms_rx_lower.cpp @@ -180,13 +180,11 @@ memset((void *)&sch_acq_buffer[0], 0, sizeof(sch_acq_buffer)); if (is_first_sch_acq) { float max_corr = 0; - convert_and_scale<float, int16_t>(which_out_buffer, which_in_buffer, buf_len * 2, - 1.f / float(rxFullScale)); + convert_and_scale(which_out_buffer, which_in_buffer, buf_len * 2, 1.f / float(rxFullScale)); start = get_sch_buffer_chan_imp_resp(ss, &channel_imp_resp[0], buf_len, &max_corr); detect_burst(&ss[start], &channel_imp_resp[0], 0, sch_demod_bits); } else { - convert_and_scale<float, int16_t>(which_out_buffer, which_in_buffer, buf_len * 2, - 1.f / float(rxFullScale)); + convert_and_scale(which_out_buffer, which_in_buffer, buf_len * 2, 1.f / float(rxFullScale)); start = get_sch_chan_imp_resp(ss, &channel_imp_resp[0]); start = start < 39 ? start : 39; start = start > -39 ? start : -39; diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp index 2f3bdc6..63f5926 100644 --- a/Transceiver52M/ms/ms_upper.cpp +++ b/Transceiver52M/ms/ms_upper.cpp @@ -191,7 +191,7 @@ return true; } - convert_and_scale<float, int16_t>(ss, e.burst, ONE_TS_BURST_LEN * 2, 1.f / float(rxFullScale)); + convert_and_scale(ss, e.burst, ONE_TS_BURST_LEN * 2, 1.f / float(rxFullScale)); pow = energyDetect(sv, 20 * 4 /*sps*/); if (pow < -1) { @@ -292,10 +292,10 @@ // float -> int16 blade_sample_type burst_buf[txburst->size()]; - convert_and_scale<int16_t, float>(burst_buf, txburst->begin(), txburst->size() * 2, 1); + convert_and_scale(burst_buf, txburst->begin(), txburst->size() * 2, 1); #ifdef TXDEBUG auto check = signalVector(txburst->size(), 40); - convert_and_scale<float, int16_t, 1>(check.begin(), burst_buf, txburst->size() * 2); + convert_and_scale(check.begin(), burst_buf, txburst->size() * 2, 1); estim_burst_params ebp; auto d = detectAnyBurst(check, 2, 4, 4, CorrType::RACH, 40, &ebp); if (d) @@ -462,7 +462,6 @@ { auto tall_trxcon_ctx = talloc_init("trxcon context"); signal(SIGPIPE, sighandler); - fesetround(FE_TOWARDZERO); trxcon::msgb_talloc_ctx_init(tall_trxcon_ctx, 0); trxc_log_init(tall_trxcon_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I93f077f967daf2ed382d12cc20a54846b3688634 Gerrit-Change-Number: 30966 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in osmo-trx[master]: ms: adjust float<->integral type conversion

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30966 ) Change subject: ms: adjust float<->integral type conversion ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I93f077f967daf2ed382d12cc20a54846b3688634 Gerrit-Change-Number: 30966 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 11:29:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: adjust tx scaling for tx samples

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31642 ) Change subject: ms: adjust tx scaling for tx samples ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I75a2eba1f7f7b81249c06ce3fc9dfeee08878cb9 Gerrit-Change-Number: 31642 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 11:29:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: support multiple BTS (in theory)

by dexter

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/31649 to look at the new patch set (#2). Change subject: pcu_l1_if_phy: support multiple BTS (in theory) ...................................................................... pcu_l1_if_phy: support multiple BTS (in theory) The PCU already has a list that can hold multiple BTS objects but the API for the direct PHY access has no way to associate a PHY with a certain BTS object. Lets update the API so that we can associate a BTS object when opening a PDCH. Unfortunately OsmoPCU has never been tested with more than one BTS so it is very likely that there are still shortcomings that prevent OsmoPCU to work properly when more then one BTS is attached. To make users aware of this, also print a warning as soon as more than one BTS object exists. Related: OS#5198 Related: OS#5930 Change-Id: I33518cbbe83f7f8c071afa5e995d30930099ba92 --- M src/osmo-bts-litecell15/lc15_l1_if.c M src/osmo-bts-oc2g/oc2g_l1_if.c M src/osmo-bts-sysmo/sysmo_l1_if.c M src/pcu_l1_if.cpp M src/pcu_l1_if_phy.h 5 files changed, 29 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/49/31649/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I33518cbbe83f7f8c071afa5e995d30930099ba92 Gerrit-Change-Number: 31649 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: support multiple BTS (in theory)

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31649 ) Change subject: pcu_l1_if_phy: support multiple BTS (in theory) ...................................................................... pcu_l1_if_phy: support multiple BTS (in theory) The PCU already has a list that can hold multiple BTS objects but the API for the direct PHY access has no way to associate a PHY with a certain BTS object. Lets update the API so that we can associate a BTS object when opening a PDCH. Unfortunately OsmoPCU has never been tested with more than one BTS so it is very likely that there are still shortcomings that prevent OsmoPCU to work properly when more then one BTS is attached. To make users aware of this, also print a warning as soon as more than one BTS object exists. Related: OS#5198 Related: OS#5930 Change-Id: I33518cbbe83f7f8c071afa5e995d30930099ba92 --- M src/osmo-bts-litecell15/lc15_l1_if.c M src/osmo-bts-oc2g/oc2g_l1_if.c M src/osmo-bts-sysmo/sysmo_l1_if.c M src/pcu_l1_if.cpp M src/pcu_l1_if_phy.h 5 files changed, 29 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/49/31649/1 diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c index 043a3ba..dca1b77 100644 --- a/src/osmo-bts-litecell15/lc15_l1_if.c +++ b/src/osmo-bts-litecell15/lc15_l1_if.c @@ -367,7 +367,7 @@ return 0; } -void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) +void *l1if_open_pdch(uint8_t trx_no, uint8_t bts_nr, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct lc15l1_hdl *fl1h; int rc; diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c index c827d72..90e3550 100644 --- a/src/osmo-bts-oc2g/oc2g_l1_if.c +++ b/src/osmo-bts-oc2g/oc2g_l1_if.c @@ -372,7 +372,7 @@ return 0; } -void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) +void *l1if_open_pdch(uint8_t trx_no, uint8_t bts_nr, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct oc2gl1_hdl *fl1h; int rc; diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c index 348497f..5000227 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_if.c +++ b/src/osmo-bts-sysmo/sysmo_l1_if.c @@ -352,7 +352,7 @@ return 0; } -void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) +void *l1if_open_pdch(uint8_t trx_no, uint8_t bts_nr, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct femtol1_hdl *fl1h; int rc; diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 258a118..c312e91 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -864,7 +864,7 @@ info_ind->trx[trx_nr].hlayer1); if (!bts->trx[trx_nr].fl1h) bts->trx[trx_nr].fl1h = l1if_open_pdch( - trx_nr, + trx_nr, bts->nr, info_ind->trx[trx_nr].hlayer1, the_pcu->gsmtap); if (!bts->trx[trx_nr].fl1h) { @@ -1140,6 +1140,9 @@ } } + if (llist_count(&the_pcu->bts_list) > 1) + LOGP(DL1IF, LOGL_ERROR, "more then one BTS regsitered at this PCU. This PCU has only been tested with one BTS! OS#5930\n"); + switch (pcu_prim->msg_type) { case PCU_IF_MSG_DATA_IND: CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.data_ind); diff --git a/src/pcu_l1_if_phy.h b/src/pcu_l1_if_phy.h index 297883b..46290b1 100644 --- a/src/pcu_l1_if_phy.h +++ b/src/pcu_l1_if_phy.h @@ -4,7 +4,7 @@ #include <osmocom/core/gsmtap_util.h> int l1if_init(void); -void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap); +void *l1if_open_pdch(uint8_t trx_no, uint8_t bts_nr, uint32_t hlayer1, struct gsmtap_inst *gsmtap); int l1if_connect_pdch(void *obj, uint8_t ts); int l1if_pdch_req(void *obj, uint8_t ts, int is_ptcch, uint32_t fn, uint16_t arfcn, uint8_t block_nr, uint8_t *data, uint8_t len); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I33518cbbe83f7f8c071afa5e995d30930099ba92 Gerrit-Change-Number: 31649 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[L] Change in osmo-bsc[master]: bssmap_handle_ass_req_ct_data: implement

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31547 ) Change subject: bssmap_handle_ass_req_ct_data: implement ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I350bea15fd2158eb6edc9bc92f2dca48930736e9 Gerrit-Change-Number: 31547 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 03 Mar 2023 10:44:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2023