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

[S] Change in osmo-ci[master]: DAHDI gerrit verification job diversification
by laforge 06 Jun '23

06 Jun '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33191 ) Change subject: DAHDI gerrit verification job diversification ...................................................................... DAHDI gerrit verification job diversification * we never really wanted to build against fixed tags but branches, i.e. "the latest tag within a given stable series", so switch from a fixed tag like "v5.10" in torvalds/linux.git to "linux-5.10.y" in stable/linux.git * we also want to build against 6.1.y, as that is what upcoming Debian bookworm will ship Change-Id: I60aa61cb5020c9ce50126b048a0fa546a535236f --- M jobs/gerrit-verifications-dahdi.yml 1 file changed, 34 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/33191/1 diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml index 76657f1..88971b8 100644 --- a/jobs/gerrit-verifications-dahdi.yml +++ b/jobs/gerrit-verifications-dahdi.yml @@ -1,14 +1,26 @@ - project: - name: gerrit-dahdi-linux + name: gerrit-dahdi-linux-stable + type: stable + repo: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git' linux-ver: - - "v4.19" - - "v5.10" + - "linux-4.19.y" + - "linux-5.10.y" + - "linux-6.1.y" + jobs: + - 'gerrit-dahdi-linux-{type}-{linux-ver}' + +- project: + name: gerrit-dahdi-linux-torvalds + type: torvalds + repo: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' + linux-ver: - "master" jobs: - - 'gerrit-dahdi-linux-{linux-ver}' + - 'gerrit-dahdi-linux-{type}-{linux-ver}' + - job-template: - name: 'gerrit-dahdi-linux-{linux-ver}' + name: 'gerrit-dahdi-linux-{type}-{linux-ver}' project-type: freestyle node: osmocom-gerrit concurrent: true @@ -31,7 +43,7 @@ # the shell part below. - git: basedir: 'linux' - url: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' + url: '{repo}' branches: - '{linux-ver}' refspec: '{linux-ver}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I60aa61cb5020c9ce50126b048a0fa546a535236f Gerrit-Change-Number: 33191 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: DAHDI master build diversification
by laforge 06 Jun '23

06 Jun '23

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/33190 to look at the new patch set (#3). Change subject: DAHDI master build diversification ...................................................................... DAHDI master build diversification * we never really wanted to build against fixed tags but branches, i.e. "the latest tag within a given stable series", so switch from a fixed tag like "v5.10" in torvalds/linux.git to "linux-5.10.y" in stable/linux.git * we also want to build against 6.1.y, as that is what upcoming Debian bookworm will ship Change-Id: Ibc0527a6f7d11c4f99c19e73c948b9baacd4e5a2 --- M jobs/master-builds-dahdi.yml 1 file changed, 33 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/90/33190/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibc0527a6f7d11c4f99c19e73c948b9baacd4e5a2 Gerrit-Change-Number: 33190 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ci[master]: DAHDI master build diversification
by fixeria 06 Jun '23

06 Jun '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33190 ) Change subject: DAHDI master build diversification ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibc0527a6f7d11c4f99c19e73c948b9baacd4e5a2 Gerrit-Change-Number: 33190 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 06 Jun 2023 14:28:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add templates for UPLINK REQUEST
by fixeria 06 Jun '23

06 Jun '23

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33148 ) Change subject: BSSMAP_Templates: Add templates for UPLINK REQUEST ...................................................................... Patch Set 3: (1 comment) File library/BSSMAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33148/comment/c5a7233f_8eea… PS3, Line 2490: talkerPriority := omit, : cellIdentifier := omit, : layer3Information := omit, : mob This template is expecting all fields to be omitted. Maybe relax it a bit and use `*` instead? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0b02be6a87899d5c9a2ef92011e09a8897328a05 Gerrit-Change-Number: 33148 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 06 Jun 2023 14:25:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: Submit UL block to lower layers before freeing TBF
by pespin 06 Jun '23

06 Jun '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33187 ) Change subject: rlcmac: Submit UL block to lower layers before freeing TBF ...................................................................... rlcmac: Submit UL block to lower layers before freeing TBF Change-Id: I236a5fd0e97b0b323153a4b6cf95b785348cf7df --- M src/rlcmac/sched.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 3 files changed, 27 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/rlcmac/sched.c b/src/rlcmac/sched.c index 25ee6da..8709f71 100644 --- a/src/rlcmac/sched.c +++ b/src/rlcmac/sched.c @@ -155,14 +155,22 @@ return NULL; } - +/*! Select a CTRL message to transmit, based on different messages priority. + * \param[in] bi RTS block indication information. + * \param[in] tbfs TBF candidates having CTRL messages to send, filled in by get_ctrl_msg_tbf_candidates() + * \param[out] tbf_to_free TBF to free after sending the generated message + */ static struct msgb *sched_select_ctrl_msg(const struct gprs_rlcmac_rts_block_ind *bi, - struct tbf_sched_ctrl_candidates *tbfs) + const struct tbf_sched_ctrl_candidates *tbfs, + struct gprs_rlcmac_tbf **tbf_to_free) { struct msgb *msg = NULL; struct gprs_rlcmac_entity *gre; int rc; + /* No TBF to be freed by default: */ + *tbf_to_free = NULL; + /* 8.1.2.2 1) (EGPRS) PACKET DOWNLINK ACK/NACK w/ FinalAckInd=1 */ if (tbfs->poll_dl_ack_final_ack) { LOGRLCMAC(LOGL_DEBUG, "(ts=%u,fn=%u,usf=%u) Tx DL ACK/NACK FinalAck=1\n", @@ -200,8 +208,8 @@ LOGRLCMAC(LOGL_DEBUG, "(ts=%u,fn=%u,usf=%u) Tx Pkt Control Ack (UL ACK/NACK poll)\n", bi->ts, bi->fn, bi->usf); msg = gprs_rlcmac_gre_create_pkt_ctrl_ack(ul_tbf_as_tbf(tbfs->poll_ul_ack)->gre); - /* Last UL message, freeing */ - gprs_rlcmac_ul_tbf_free(tbfs->poll_ul_ack); + /* Last UL message, freeing (after passing msg to lower layers) */ + *tbf_to_free = ul_tbf_as_tbf(tbfs->poll_ul_ack); return msg; } if (tbfs->poll_dl_ass) { @@ -280,6 +288,7 @@ { struct msgb *msg = NULL; struct tbf_sched_ctrl_candidates tbf_cand = {0}; + struct gprs_rlcmac_tbf *tbf_to_free; struct osmo_gprs_rlcmac_prim *rlcmac_prim_tx; int rc = 0; @@ -287,7 +296,7 @@ get_ctrl_msg_tbf_candidates(bi, &tbf_cand); - if ((msg = sched_select_ctrl_msg(bi, &tbf_cand))) + if ((msg = sched_select_ctrl_msg(bi, &tbf_cand, &tbf_to_free))) goto tx_msg; if ((msg = sched_select_ul_data_msg(bi))) @@ -305,6 +314,8 @@ rlcmac_prim_tx->l1ctl.pdch_data_req.data_len = msgb_length(msg); rc = gprs_rlcmac_prim_call_down_cb(rlcmac_prim_tx); msgb_free(msg); + if (tbf_to_free) + gprs_rlcmac_tbf_free(tbf_to_free); ret_rc: gprs_rlcmac_pdch_ulc_expire_fn(g_rlcmac_ctx->sched.ulc[bi->ts], bi->fn); diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index 120458a..24ee965 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -63,11 +63,11 @@ DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG (ts=7,fn=21,usf=0) Tx Pkt Control Ack (UL ACK/NACK poll) DLGLOBAL DEBUG GRE(00002342) Tx Packet Control Ack +DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO UL_TBF{RELEASING}: Send L1CTL-CFG_UL_TBF.req ul_tbf_nr=0 (release) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{RELEASING}: Deallocated -DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly diff --git a/tests/rlcmac/rlcmac_prim_test.ok b/tests/rlcmac/rlcmac_prim_test.ok index b555cbe..34b82f1 100644 --- a/tests/rlcmac/rlcmac_prim_test.ok +++ b/tests/rlcmac/rlcmac_prim_test.ok @@ -5,8 +5,8 @@ test_rlcmac_prim_up_cb(): Rx GMMRR-LLC_TRANSMITTED.indication TLLI=0x00002342 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=4 ts=7 data_len=34 data=[3c 01 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=8 ts=7 data_len=34 data=[00 01 02 1d 00 00 23 42 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] -test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=21 ts=7 data_len=23 data=[40 04 00 00 8d 08 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b ] +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 === test_ul_tbf_attach end === === test_ul_tbf_t3164_timeout start === sys={0.000000}, mono={0.000000}: clock_override_set -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I236a5fd0e97b0b323153a4b6cf95b785348cf7df Gerrit-Change-Number: 33187 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: rlcmac: Submit UL block to lower layers before freeing TBF
by pespin 06 Jun '23

06 Jun '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33187 ) Change subject: rlcmac: Submit UL block to lower layers before freeing TBF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I236a5fd0e97b0b323153a4b6cf95b785348cf7df Gerrit-Change-Number: 33187 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Jun 2023 14:23:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: Add codec list to *VGCS_VBS_AssignmentReq templates
by fixeria 06 Jun '23

06 Jun '23

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33146 ) Change subject: Add codec list to *VGCS_VBS_AssignmentReq templates ...................................................................... Patch Set 3: (1 comment) File library/BSSMAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33146/comment/1ef08b30_71b0… PS3, Line 2336: ? Just to be sure: `?` means the Speech Codec List IE is expected to be *present*, but may contain anything. Maybe we want to use `*` here, meaning that it can either be present and contain anything, or be omitted? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3ce78ad795c418650ca924a953294c3380b8198 Gerrit-Change-Number: 33146 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 06 Jun 2023 14:23:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: modem: Forward LLC-TRANSMITTED.ind RLCMAC->GMM
by pespin 06 Jun '23

06 Jun '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33186 ) Change subject: layer23: modem: Forward LLC-TRANSMITTED.ind RLCMAC->GMM ...................................................................... layer23: modem: Forward LLC-TRANSMITTED.ind RLCMAC->GMM Change-Id: Ife91ad87fed78daf86e9f28ceed981d61799758e --- M src/host/layer23/src/modem/rlcmac.c 1 file changed, 23 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index e030299..161effd 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -85,8 +85,8 @@ switch (rlcmac_prim->oph.primitive) { case OSMO_GPRS_RLCMAC_GMMRR_PAGE: /* Forward it to upper layers, pass ownership over to GMM: */ - /* Optimization: RLCMAC-GMMRR-ASSIGN-REQ is 1-to-1 ABI compatible with - GMM-GMMRR-ASSIGN-REQ, we just need to adapt the header. + /* Optimization: RLCMAC-GMMRR-PAGE-IND is 1-to-1 ABI compatible with + GMM-GMMRR-PAGE-IND, we just need to adapt the header. See osmo_static_assert(_gmmrr_prim_size) above. */ gmm_prim = (struct osmo_gprs_gmm_prim *)rlcmac_prim; @@ -95,6 +95,18 @@ osmo_gprs_gmm_prim_lower_up(gmm_prim); rc = 1; /* Tell RLCMAC that we take ownership of the prim. */ break; + case OSMO_GPRS_RLCMAC_GMMRR_LLC_TRANSMITTED: + /* Forward it to upper layers, pass ownership over to GMM: */ + /* Optimization: RLCMAC-GMMRR-LLC-TRANSMITTED-IND is 1-to-1 ABI compatible with + GMM-GMMRR-LLC-TRANSMITTED-IND, we just need to adapt the header. + See osmo_static_assert(_gmmrr_prim_size) above. + */ + gmm_prim = (struct osmo_gprs_gmm_prim *)rlcmac_prim; + gmm_prim->oph.sap = OSMO_GPRS_GMM_SAP_GMMRR; + gmm_prim->oph.primitive = OSMO_GPRS_GMM_GMMRR_LLC_TRANSMITTED; + osmo_gprs_gmm_prim_lower_up(gmm_prim); + rc = 1; /* Tell RLCMAC that we take ownership of the prim. */ + break; default: LOGP(DRLCMAC, LOGL_NOTICE, "%s(): Unexpected Rx RLCMAC GMMRR prim %u\n", __func__, rlcmac_prim->oph.primitive); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ife91ad87fed78daf86e9f28ceed981d61799758e Gerrit-Change-Number: 33186 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: layer23: modem: Add helper function to get FN from gsm48_req_ref
by pespin 06 Jun '23

06 Jun '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33189 ) Change subject: layer23: modem: Add helper function to get FN from gsm48_req_ref ...................................................................... layer23: modem: Add helper function to get FN from gsm48_req_ref Change-Id: I1265a580f55473f52e77af6c5f53c1573f8f3e70 --- M src/host/layer23/src/modem/grr.c 1 file changed, 25 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index c4e8537..b290c8b 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -47,6 +47,16 @@ #include <l1ctl_proto.h> +static uint32_t _gsm48_req_ref2fn(const struct gsm48_req_ref *ref) +{ + const struct gsm_time time = { + .t3 = ref->t3_high << 3 | ref->t3_low, + .t2 = ref->t2, + .t1 = ref->t1, + }; + return gsm_gsmtime2fn(&time); +} + /* Generate an 8-bit CHANNEL REQUEST message as per 3GPP TS 44.018, 9.1.8 */ uint8_t modem_grr_gen_chan_req(bool single_block) { @@ -254,9 +264,10 @@ return 0; } if (!grr_match_req_ref(ms, &ia->req_ref)) { - LOGP(DRR, LOGL_INFO, "%s(): req_ref mismatch (RA=0x%02x, T1=%u, T3=%u, T2=%u)\n", + LOGP(DRR, LOGL_INFO, "%s(): req_ref mismatch (RA=0x%02x, T1=%u, T3=%u, T2=%u, FN=%u)\n", __func__, ia->req_ref.ra, ia->req_ref.t1, - ia->req_ref.t3_high << 3 | ia->req_ref.t3_low, ia->req_ref.t2); + ia->req_ref.t3_high << 3 | ia->req_ref.t3_low, ia->req_ref.t2, + _gsm48_req_ref2fn(&ia->req_ref)); return 0; } @@ -460,8 +471,9 @@ if (rr->state == GSM48_RR_ST_CONN_PEND) { const struct gsm48_req_ref *ref = (void *)&ch->data[1]; LOGP(DRSL, LOGL_NOTICE, - "Rx RACH.conf (RA=0x%02x, T1=%u, T3=%u, T2=%u)\n", - rr->cr_ra, ref->t1, ref->t3_high << 3 | ref->t3_low, ref->t2); + "Rx RACH.conf (RA=0x%02x, T1=%u, T3=%u, T2=%u, FN=%u)\n", + rr->cr_ra, ref->t1, ref->t3_high << 3 | ref->t3_low, ref->t2, + _gsm48_req_ref2fn(ref)); /* shift the CHANNEL REQUEST history buffer */ memmove(&rr->cr_hist[1], &rr->cr_hist[0], ARRAY_SIZE(rr->cr_hist) - 1); /* store the new entry */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1265a580f55473f52e77af6c5f53c1573f8f3e70 Gerrit-Change-Number: 33189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: layer23: modem: Add helper function to get FN from gsm48_req_ref
by fixeria 06 Jun '23

06 Jun '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33189 ) Change subject: layer23: modem: Add helper function to get FN from gsm48_req_ref ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1265a580f55473f52e77af6c5f53c1573f8f3e70 Gerrit-Change-Number: 33189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Jun 2023 14:21:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0