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

[M] Change in osmo-bts[master]: Change return value of bts_supports_cm() from int to bool
by jolly 07 Jul '23

07 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33622 ) Change subject: Change return value of bts_supports_cm() from int to bool ...................................................................... Change return value of bts_supports_cm() from int to bool Change-Id: I72e30fe852ab69a162b117a534071ebddd4b16ba --- M include/osmo-bts/bts.h M src/common/bts.c M src/common/rsl.c M tests/misc/misc_test.c 4 files changed, 32 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/33622/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 5cdfc94..d103b60 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -416,8 +416,8 @@ int bts_main(int argc, char **argv); -int bts_supports_cm(const struct gsm_bts *bts, - const struct rsl_ie_chan_mode *cm); +bool bts_supports_cm(const struct gsm_bts *bts, + const struct rsl_ie_chan_mode *cm); int32_t bts_get_avg_fn_advance(const struct gsm_bts *bts); diff --git a/src/common/bts.c b/src/common/bts.c index 6652ce6..0ca4b6d 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -779,8 +779,8 @@ return &bts->gsm_time; } -int bts_supports_cm(const struct gsm_bts *bts, - const struct rsl_ie_chan_mode *cm) +bool bts_supports_cm(const struct gsm_bts *bts, + const struct rsl_ie_chan_mode *cm) { enum osmo_bts_features feature = _NUM_BTS_FEAT; @@ -788,22 +788,22 @@ case RSL_CMOD_SPD_SIGN: /* We assume that signalling support is mandatory, * there is no BTS_FEAT_* definition to check that. */ - return 1; + return true; case RSL_CMOD_SPD_SPEECH: break; case RSL_CMOD_CRT_TCH_GROUP_Bm: case RSL_CMOD_CRT_TCH_GROUP_Lm: if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VGCS)) - return 0; + return false; break; case RSL_CMOD_CRT_TCH_BCAST_Bm: case RSL_CMOD_CRT_TCH_BCAST_Lm: if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VBS)) - return 0; + return false; break; case RSL_CMOD_SPD_DATA: default: - return 0; + return false; } /* Before the requested pchan/cm combination can be checked, we need to @@ -811,7 +811,7 @@ switch (cm->chan_rt) { case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm: if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VAMOS)) - return 0; + return false; /* fall-through */ case RSL_CMOD_CRT_TCH_Bm: case RSL_CMOD_CRT_TCH_GROUP_Bm: @@ -828,13 +828,13 @@ break; default: /* Invalid speech codec type => Not supported! */ - return 0; + return false; } break; case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm: if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VAMOS)) - return 0; + return false; /* fall-through */ case RSL_CMOD_CRT_TCH_Lm: case RSL_CMOD_CRT_TCH_GROUP_Lm: @@ -848,7 +848,7 @@ break; default: /* Invalid speech codec type => Not supported! */ - return 0; + return false; } break; @@ -856,14 +856,14 @@ LOGP(DRSL, LOGL_ERROR, "Unhandled RSL channel type=0x%02x/rate=0x%02x\n", cm->chan_rt, cm->chan_rate); - return 0; + return false; } /* Check if the feature is supported by this BTS */ if (osmo_bts_has_feature(bts->features, feature)) - return 1; + return true; - return 0; + return false; } /* return the gsm_lchan for the CBCH (if it exists at all) */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 7bd950f..ad643ae 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -248,7 +248,7 @@ #undef RSL_CMODE - if (bts_supports_cm(lchan->ts->trx->bts, cm) != 1) { + if (bts_supports_cm(lchan->ts->trx->bts, cm) == false) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Channel type=0x%02x/mode=%s " "is not supported by the PHY\n", cm->chan_rt, gsm48_chan_mode_name(lchan->tch_mode)); diff --git a/tests/misc/misc_test.c b/tests/misc/misc_test.c index b1b9820..cdc57df 100644 --- a/tests/misc/misc_test.c +++ b/tests/misc/misc_test.c @@ -172,11 +172,11 @@ /* Signalling shall be supported regardless of the features */ cm = (struct rsl_ie_chan_mode) { .chan_rt = RSL_CMOD_CRT_TCH_Bm, .spd_ind = RSL_CMOD_SPD_SIGN }; - OSMO_ASSERT(bts_supports_cm(bts, &cm) == 1); /* TCH/F */ + OSMO_ASSERT(bts_supports_cm(bts, &cm) == true); /* TCH/F */ cm = (struct rsl_ie_chan_mode) { .chan_rt = RSL_CMOD_CRT_TCH_Lm, .spd_ind = RSL_CMOD_SPD_SIGN }; - OSMO_ASSERT(bts_supports_cm(bts, &cm) == 1); /* TCH/H */ + OSMO_ASSERT(bts_supports_cm(bts, &cm) == true); /* TCH/H */ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1); @@ -186,27 +186,27 @@ cm = (struct rsl_ie_chan_mode) { .chan_rt = RSL_CMOD_CRT_TCH_Bm, .spd_ind = RSL_CMOD_SPD_SPEECH, .chan_rate = RSL_CMOD_SP_GSM1 }; - OSMO_ASSERT(bts_supports_cm(bts, &cm) == 1); /* TCH/FS */ + OSMO_ASSERT(bts_supports_cm(bts, &cm) == true); /* TCH/FS */ cm = (struct rsl_ie_chan_mode) { .chan_rt = RSL_CMOD_CRT_TCH_Lm, .spd_ind = RSL_CMOD_SPD_SPEECH, .chan_rate = RSL_CMOD_SP_GSM1 }; - OSMO_ASSERT(bts_supports_cm(bts, &cm) == 1); /* TCH/HS */ + OSMO_ASSERT(bts_supports_cm(bts, &cm) == true); /* TCH/HS */ cm = (struct rsl_ie_chan_mode) { .chan_rt = RSL_CMOD_CRT_TCH_Bm, .spd_ind = RSL_CMOD_SPD_SPEECH, .chan_rate = RSL_CMOD_SP_GSM2 }; - OSMO_ASSERT(bts_supports_cm(bts, &cm) == 0); /* TCH/EFS */ + OSMO_ASSERT(bts_supports_cm(bts, &cm) == false); /* TCH/EFS */ cm = (struct rsl_ie_chan_mode) { .chan_rt = RSL_CMOD_CRT_TCH_Bm, .spd_ind = RSL_CMOD_SPD_SPEECH, .chan_rate = RSL_CMOD_SP_GSM3 }; - OSMO_ASSERT(bts_supports_cm(bts, &cm) == 1); /* TCH/AFS */ + OSMO_ASSERT(bts_supports_cm(bts, &cm) == true); /* TCH/AFS */ cm = (struct rsl_ie_chan_mode) { .chan_rt = RSL_CMOD_CRT_TCH_Lm, .spd_ind = RSL_CMOD_SPD_SPEECH, .chan_rate = RSL_CMOD_SP_GSM3 }; - OSMO_ASSERT(bts_supports_cm(bts, &cm) == 1); /* TCH/AHS */ + OSMO_ASSERT(bts_supports_cm(bts, &cm) == true); /* TCH/AHS */ talloc_free(bts); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I72e30fe852ab69a162b117a534071ebddd4b16ba Gerrit-Change-Number: 33622 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-msc[master]: ASCI: rtp_stream_commit(): Also update MGW on conn mode change
by jolly 07 Jul '23

07 Jul '23

Attention is currently required from: jolly. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/33499 to look at the new patch set (#8). Change subject: ASCI: rtp_stream_commit(): Also update MGW on conn mode change ...................................................................... ASCI: rtp_stream_commit(): Also update MGW on conn mode change So far rtp_stream_commit() triggers an MGCP MDCX message only when codecs or the RTP address changed. Do the same for mode changes. ('sendrecv', 'recvonly', 'sendonly',...) Change-Id: I7a5637d0a7f1df13133e522fc78ba75eeeb2873e Related: OS#4854 --- M include/osmocom/msc/rtp_stream.h M src/libmsc/call_leg.c M src/libmsc/rtp_stream.c 3 files changed, 45 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/99/33499/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7a5637d0a7f1df13133e522fc78ba75eeeb2873e Gerrit-Change-Number: 33499 Gerrit-PatchSet: 8 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in gapk[master]: aarch64: add get_cycles
by Hoernchen 06 Jul '23

06 Jul '23

Hoernchen has removed a vote from this change. ( https://gerrit.osmocom.org/c/gapk/+/33620 ) Change subject: aarch64: add get_cycles ...................................................................... Removed Verified+1 by Hoernchen <ewild(a)sysmocom.de> -- To view, visit https://gerrit.osmocom.org/c/gapk/+/33620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I489fb8346fbc7440f40695f01d80a89b90761165 Gerrit-Change-Number: 33620 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: deleteVote

1 0

[M] Change in osmo-trx[master]: ms: use single thread pool
by Hoernchen 06 Jul '23

06 Jul '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/32946 to look at the new patch set (#3). Change subject: ms: use single thread pool ...................................................................... ms: use single thread pool ...so we don't spawn threads all the time. Used for gain avg/setting. Change-Id: Id675550f55e8ccbbbe6b0d91fbffd01b6ede15f7 --- M Transceiver52M/Makefile.am M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_rx_lower.cpp A Transceiver52M/ms/threadpool.h 4 files changed, 134 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/46/32946/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id675550f55e8ccbbbe6b0d91fbffd01b6ede15f7 Gerrit-Change-Number: 32946 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-trx[master]: ms: fix the gain init for blade
by Hoernchen 06 Jul '23

06 Jul '23

Attention is currently required from: pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32942 ) Change subject: ms: fix the gain init for blade ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic5a25d6f5606fba599b8144fbec7285047dca3c9 Gerrit-Change-Number: 32942 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Jul 2023 16:19:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: ms: block burst q to upper layer
by Hoernchen 06 Jul '23

06 Jul '23

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32945 ) Change subject: ms: block burst q to upper layer ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id0aad606a296b2885617013ce6637204357b13d7 Gerrit-Change-Number: 32945 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 06 Jul 2023 16:19:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-trx[master]: ms: use single thread pool
by Hoernchen 06 Jul '23

06 Jul '23

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32946 ) Change subject: ms: use single thread pool ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id675550f55e8ccbbbe6b0d91fbffd01b6ede15f7 Gerrit-Change-Number: 32946 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 06 Jul 2023 16:19:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in osmo-trx[master]: ms: rearrange internal trxcon<->phy if
by Hoernchen 06 Jul '23

06 Jul '23

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32951 ) Change subject: ms: rearrange internal trxcon<->phy if ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I20aef3844f7699e164fe089358aa7e2325608c85 Gerrit-Change-Number: 32951 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 06 Jul 2023 16:18:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-trx[master]: ms: first exit fix using queue timeouts
by Hoernchen 06 Jul '23

06 Jul '23

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32954 ) Change subject: ms: first exit fix using queue timeouts ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0b8deebc63cf4d936666fd68e1666d1917e89a5d Gerrit-Change-Number: 32954 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 06 Jul 2023 16:18:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: ms: prune common sch acq code
by Hoernchen 06 Jul '23

06 Jul '23

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32953 ) Change subject: ms: prune common sch acq code ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ife639a78a4463f992247c19e0177f683db2ae0b7 Gerrit-Change-Number: 32953 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 06 Jul 2023 16:18:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0