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

Change in osmo-trx[master]: clang-format: proper c++ standard

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/30536 to look at the new patch set (#7). Change subject: clang-format: proper c++ standard ...................................................................... clang-format: proper c++ standard Change-Id: I9828093a08ed8b4c2a11f482f674368ac137d4dc --- M .clang-format 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/36/30536/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9828093a08ed8b4c2a11f482f674368ac137d4dc Gerrit-Change-Number: 30536 Gerrit-PatchSet: 7 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: update osmocom-bb submodule to fix make distcheck

by Hoernchen

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30567 ) Change subject: update osmocom-bb submodule to fix make distcheck ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie7b10891b69c3dc863c76284f422f9e9509ac244 Gerrit-Change-Number: 30567 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 13 Dec 2022 10:05:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: l1sap: remove unused pointer variable

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30522 ) Change subject: l1sap: remove unused pointer variable ...................................................................... l1sap: remove unused pointer variable The pointer variable l1sap is only used to determine the size of the related struct but for nothing else. We can use the struct name in sizeof also directly and get rid of it. Change-Id: I93abdce1dec60d53ddceb1fce6e9e7451ba6283a --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 8bcd417..22b5e8c 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1882,7 +1882,6 @@ { struct gsm_lchan *lchan = rs->priv; struct msgb *msg; - struct osmo_phsap_prim *l1sap; /* if we're in loopback mode, we don't accept frames from the * RTP socket anymore */ @@ -1893,7 +1892,7 @@ if (!msg) return; memcpy(msgb_put(msg, rtp_pl_len), rtp_pl, rtp_pl_len); - msgb_pull(msg, sizeof(*l1sap)); + msgb_pull(msg, sizeof(struct osmo_phsap_prim)); /* Store RTP header Marker bit in control buffer */ rtpmsg_marker_bit(msg) = marker; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I93abdce1dec60d53ddceb1fce6e9e7451ba6283a Gerrit-Change-Number: 30522 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: sched_lchan_tchf: replace numeric constant with define constant

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30521 ) Change subject: sched_lchan_tchf: replace numeric constant with define constant ...................................................................... sched_lchan_tchf: replace numeric constant with define constant An RFC 5993 HR GSM payload is 15 bytes long. That is GSM_HR_BYTES + 1 Change-Id: I7008ba7e50562e9366fd9ecc97e2e22fad4aa641 --- M src/osmo-bts-trx/sched_lchan_tchf.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 6a6331f..eff0f63 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -412,7 +412,7 @@ switch (tch_mode) { case GSM48_CMODE_SPEECH_V1: /* FR / HR */ if (br->chan != TRXC_TCHF) /* HR */ - len = 15; + len = GSM_HR_BYTES + 1; /* RFC 5993 */ else len = GSM_FR_BYTES; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7008ba7e50562e9366fd9ecc97e2e22fad4aa641 Gerrit-Change-Number: 30521 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: update osmocom-bb submodule to fix make distcheck

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30567 ) Change subject: update osmocom-bb submodule to fix make distcheck ...................................................................... update osmocom-bb submodule to fix make distcheck see https://gerrit.osmocom.org/c/osmocom-bb/+/30563 Change-Id: Ie7b10891b69c3dc863c76284f422f9e9509ac244 --- M .gitmodules 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/67/30567/1 diff --git a/.gitmodules b/.gitmodules index bc94e80..a964ce2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "osmocom-bb"] path = osmocom-bb url = https://gitea.osmocom.org/phone-side/osmocom-bb.git - branch = a4aac5c3554559c2c994609f90b92a9daf6e8a89 + branch = a6d2e1a12b0204f1b1690c42371980dd6895f076 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie7b10891b69c3dc863c76284f422f9e9509ac244 Gerrit-Change-Number: 30567 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: Move control_ts explicit checks out of the scheduler implementation

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30564 ) Change subject: Move control_ts explicit checks out of the scheduler implementation ...................................................................... Patch Set 1: (3 comments) File src/nacc_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-1854): https://gerrit.osmocom.org/c/osmo-pcu/+/30564/comment/6e39b2e1_13635d52 PS1, Line 910: } adding a line without newline at end of file File src/tbf_dl_ass_fsm.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-1854): https://gerrit.osmocom.org/c/osmo-pcu/+/30564/comment/b9c53582_5caac257 PS1, Line 66: bool tbf_dl_ass_rts(const struct gprs_rlcmac_tbf* tbf, const struct gprs_rlcmac_pdch *pdch); "foo* bar" should be "foo *bar" File src/tbf_ul_ass_fsm.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-1854): https://gerrit.osmocom.org/c/osmo-pcu/+/30564/comment/b9edf27d_73c0c732 PS1, Line 69: bool tbf_ul_ass_rts(const struct gprs_rlcmac_tbf* tbf, const struct gprs_rlcmac_pdch *pdch); "foo* bar" should be "foo *bar" -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifaf7dde651d56942779d84aa9135fc8c974b6f26 Gerrit-Change-Number: 30564 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 12 Dec 2022 20:46:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: encoding::write_immediate_assignment(): Constify tbf param

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30540 ) Change subject: encoding::write_immediate_assignment(): Constify tbf param ...................................................................... encoding::write_immediate_assignment(): Constify tbf param Change-Id: Ic0b6e81dbeb44f200065dba92cadc33fa52ae75d --- M src/encoding.cpp M src/encoding.h 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/encoding.cpp b/src/encoding.cpp index 74b80c1..c5f4dd4 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -435,7 +435,7 @@ */ int Encoding::write_immediate_assignment( const struct gprs_rlcmac_pdch *pdch, - struct gprs_rlcmac_tbf *tbf, + const struct gprs_rlcmac_tbf *tbf, bitvec * dest, bool downlink, uint16_t ra, uint32_t ref_fn, uint8_t ta, uint8_t usf, bool polling, uint32_t fn, uint8_t alpha, @@ -506,9 +506,9 @@ /* 3GPP TS 44.018 §10.5.2.16 IA Rest Octets */ dest->cur_bit = wp; if (downlink) { - OSMO_ASSERT(tbf_as_dl_tbf(tbf) != NULL); + OSMO_ASSERT(tbf_as_dl_tbf_const(tbf) != NULL); - rc = write_ia_rest_downlink(tbf_as_dl_tbf(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma, + rc = write_ia_rest_downlink(tbf_as_dl_tbf_const(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma, ta_idx); } else if (((burst_type == GSM_L1_BURST_TYPE_ACCESS_1) || (burst_type == GSM_L1_BURST_TYPE_ACCESS_2))) { SET_L(dest); SET_H(dest); // "LH" @@ -518,8 +518,8 @@ SET_0(dest); // No < Access Technologies Request struct > - if (tbf_as_ul_tbf(tbf) != NULL) - rc = write_ia_rest_egprs_uplink_sba(tbf_as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); + if (tbf_as_ul_tbf_const(tbf) != NULL) + rc = write_ia_rest_egprs_uplink_sba(tbf_as_ul_tbf_const(tbf), dest, usf, alpha, gamma, ta_idx); else rc = write_ia_rest_egprs_uplink_mba(dest, fn, alpha, gamma); } else { @@ -528,8 +528,8 @@ SET_H(dest); SET_H(dest); // "HH" SET_0(dest); SET_0(dest); // "00" < Packet Uplink Assignment > - if (tbf_as_ul_tbf(tbf) != NULL) - rc = write_ia_rest_uplink_mba(tbf_as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); + if (tbf_as_ul_tbf_const(tbf) != NULL) + rc = write_ia_rest_uplink_mba(tbf_as_ul_tbf_const(tbf), dest, usf, alpha, gamma, ta_idx); else rc = write_ia_rest_uplink_sba(dest, fn, alpha, gamma); } diff --git a/src/encoding.h b/src/encoding.h index fd2225e..27ffe46 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -44,7 +44,7 @@ public: static int write_immediate_assignment( const struct gprs_rlcmac_pdch *pdch, - struct gprs_rlcmac_tbf *tbf, + const struct gprs_rlcmac_tbf *tbf, bitvec * dest, bool downlink, uint16_t ra, uint32_t ref_fn, uint8_t ta, uint8_t usf, bool polling, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic0b6e81dbeb44f200065dba92cadc33fa52ae75d Gerrit-Change-Number: 30540 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

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: Pass pdch ptr to tbf_compute_priority

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30538 ) Change subject: Pass pdch ptr to tbf_compute_priority ...................................................................... Pass pdch ptr to tbf_compute_priority Change-Id: Idbac59343c4bac3214ecd8a14c201b4e42c74557 --- M src/gprs_rlcmac_sched.cpp 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve; Verified diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 90710ab..f641013 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -227,25 +227,25 @@ } static inline enum tbf_dl_prio tbf_compute_priority(const struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_dl_tbf *tbf, - uint8_t ts, uint32_t fn, int age) + const struct gprs_rlcmac_pdch *pdch, uint32_t fn, int age) { const gprs_rlc_dl_window *w = static_cast<gprs_rlc_dl_window *>(tbf->window()); unsigned long msecs_t3190 = osmo_tdef_get(the_pcu->T_defs, 3190, OSMO_TDEF_MS, -1); unsigned long dl_tbf_idle_msec = osmo_tdef_get(the_pcu->T_defs, -2031, OSMO_TDEF_MS, -1); int age_thresh1 = msecs_to_frames(200); int age_thresh2 = msecs_to_frames(OSMO_MIN(msecs_t3190/2, dl_tbf_idle_msec)); - const struct gprs_rlcmac_pdch *pdch = &tbf_get_trx(tbf)->pdch[ts]; + const bool is_control_ts = tbf_is_control_ts(tbf, pdch); - if (tbf_is_control_ts(tbf, pdch) && tbf->need_poll_for_dl_ack_nack()) + if (is_control_ts && tbf->need_poll_for_dl_ack_nack()) return DL_PRIO_CONTROL; - if (tbf_is_control_ts(tbf, pdch) && age > age_thresh2 && age_thresh2 > 0) + if (is_control_ts && age > age_thresh2 && age_thresh2 > 0) return DL_PRIO_HIGH_AGE; if ((tbf->state_is(TBF_ST_FLOW) && tbf->have_data()) || w->resend_needed() >= 0) return DL_PRIO_NEW_DATA; - if (tbf_is_control_ts(tbf, pdch) && age > age_thresh1 && tbf->keep_open(fn)) + if (is_control_ts && age > age_thresh1 && tbf->keep_open(fn)) return DL_PRIO_LOW_AGE; if (!w->window_empty()) @@ -313,7 +313,7 @@ age = tbf->frames_since_last_poll(fn); /* compute priority */ - prio = tbf_compute_priority(bts, tbf, ts, fn, age); + prio = tbf_compute_priority(bts, tbf, pdch, fn, age); if (prio == DL_PRIO_NONE) continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbac59343c4bac3214ecd8a14c201b4e42c74557 Gerrit-Change-Number: 30538 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: pdch_ulc_get_node(): assert if ulc pointer is null

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30535 ) Change subject: pdch_ulc_get_node(): assert if ulc pointer is null ...................................................................... pdch_ulc_get_node(): assert if ulc pointer is null Make crah more obvious if this condition is reached. Related: SYS#6231 Change-Id: I2689ceaf39009c5e708d5c72e41744658681c917 --- M src/pdch_ul_controller.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved pespin: Verified diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c index 2ae553f..1746333 100644 --- a/src/pdch_ul_controller.c +++ b/src/pdch_ul_controller.c @@ -71,6 +71,7 @@ struct pdch_ulc_node *pdch_ulc_get_node(struct pdch_ulc *ulc, uint32_t fn) { + OSMO_ASSERT(ulc); struct rb_node *node = ulc->tree_root.rb_node; struct pdch_ulc_node *it; int res; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2689ceaf39009c5e708d5c72e41744658681c917 Gerrit-Change-Number: 30535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: Pass gprs_rlcmac_pdch to tbf_is_control_ts

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30537 ) Change subject: Pass gprs_rlcmac_pdch to tbf_is_control_ts ...................................................................... Pass gprs_rlcmac_pdch to tbf_is_control_ts This will allow also validate easily the TRX is the correct one too, not only the TS number in any random TRX. Change-Id: Ib1a62b6e7b465253ee7cba63bf5e277f8aa8eaea --- M src/gprs_rlcmac_sched.cpp M src/pcu_vty_functions.cpp M src/tbf.cpp M src/tbf.h M src/tbf_dl_ass_fsm.c 5 files changed, 12 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 1857c3c..90710ab 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -48,7 +48,7 @@ ul_tbf = tbf_as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); OSMO_ASSERT(ul_tbf); /* this trx, this ts */ - if (!ul_tbf->is_control_ts(pdch->ts_no)) + if (!tbf_is_control_ts(ul_tbf, pdch)) continue; if (tbf_ul_ack_rts(ul_tbf)) tbf_cand->ul_ack = ul_tbf; @@ -66,7 +66,7 @@ dl_tbf = tbf_as_dl_tbf((struct gprs_rlcmac_tbf *)pos->entry); OSMO_ASSERT(dl_tbf); /* this trx, this ts */ - if (!dl_tbf->is_control_ts(pdch->ts_no)) + if (!tbf_is_control_ts(dl_tbf, pdch)) continue; if (tbf_dl_ass_rts(dl_tbf)) tbf_cand->dl_ass = dl_tbf; @@ -234,17 +234,18 @@ unsigned long dl_tbf_idle_msec = osmo_tdef_get(the_pcu->T_defs, -2031, OSMO_TDEF_MS, -1); int age_thresh1 = msecs_to_frames(200); int age_thresh2 = msecs_to_frames(OSMO_MIN(msecs_t3190/2, dl_tbf_idle_msec)); + const struct gprs_rlcmac_pdch *pdch = &tbf_get_trx(tbf)->pdch[ts]; - if (tbf->is_control_ts(ts) && tbf->need_poll_for_dl_ack_nack()) + if (tbf_is_control_ts(tbf, pdch) && tbf->need_poll_for_dl_ack_nack()) return DL_PRIO_CONTROL; - if (tbf->is_control_ts(ts) && age > age_thresh2 && age_thresh2 > 0) + if (tbf_is_control_ts(tbf, pdch) && age > age_thresh2 && age_thresh2 > 0) return DL_PRIO_HIGH_AGE; if ((tbf->state_is(TBF_ST_FLOW) && tbf->have_data()) || w->resend_needed() >= 0) return DL_PRIO_NEW_DATA; - if (tbf->is_control_ts(ts) && age > age_thresh1 && tbf->keep_open(fn)) + if (tbf_is_control_ts(tbf, pdch) && age > age_thresh1 && tbf->keep_open(fn)) return DL_PRIO_LOW_AGE; if (!w->window_empty()) diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 1fac787..76baffe 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -72,7 +72,7 @@ VTY_NEWLINE); vty_out(vty, " TS_alloc="); for (int i = 0; i < 8; i++) { - bool is_ctrl = tbf->is_control_ts(i); + bool is_ctrl = tbf_is_control_ts(tbf, tbf->pdch[i]); if (tbf->pdch[i]) vty_out(vty, "%d%s ", i, is_ctrl ? "!" : ""); } diff --git a/src/tbf.cpp b/src/tbf.cpp index 86b501e..3d9d453 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -486,7 +486,7 @@ uint32_t *poll_fn_, unsigned int *rrbp_) const { int rc; - if (!is_control_ts(ts)) { + if (!tbf_is_control_ts(this, &this->trx->pdch[ts])) { LOGPTBF(this, LOGL_DEBUG, "Polling cannot be " "scheduled in this TS %d (first control TS %d)\n", ts, control_ts); @@ -751,11 +751,6 @@ return slots; } -bool gprs_rlcmac_tbf::is_control_ts(uint8_t ts) const -{ - return ts == control_ts; -} - void gprs_rlcmac_tbf::enable_egprs() { /* Decrease GPRS TBF count of attached PDCHs */ @@ -886,9 +881,9 @@ tbf->poll_timeout(pdch, poll_fn, reason); } -bool tbf_is_control_ts(const struct gprs_rlcmac_tbf *tbf, uint8_t ts) +bool tbf_is_control_ts(const struct gprs_rlcmac_tbf *tbf, const struct gprs_rlcmac_pdch *pdch) { - return tbf->is_control_ts(ts); + return tbf->control_ts == pdch->ts_no; } bool tbf_can_upgrade_to_multislot(const struct gprs_rlcmac_tbf *tbf) diff --git a/src/tbf.h b/src/tbf.h index 8155e1d..211b8a7 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -146,7 +146,7 @@ void tbf_poll_timeout(struct gprs_rlcmac_tbf *tbf, struct gprs_rlcmac_pdch *pdch, uint32_t poll_fn, enum pdch_ulc_tbf_poll_reason reason); void tbf_update_state_fsm_name(struct gprs_rlcmac_tbf *tbf); const char* tbf_rlcmac_diag(const struct gprs_rlcmac_tbf *tbf); -bool tbf_is_control_ts(const struct gprs_rlcmac_tbf *tbf, uint8_t ts); +bool tbf_is_control_ts(const struct gprs_rlcmac_tbf *tbf, const struct gprs_rlcmac_pdch *pdch); bool tbf_can_upgrade_to_multislot(const struct gprs_rlcmac_tbf *tbf); int tbf_update(struct gprs_rlcmac_tbf *tbf); struct gprs_rlcmac_trx *tbf_get_trx(struct gprs_rlcmac_tbf *tbf); @@ -211,8 +211,6 @@ uint8_t dl_slots() const; uint8_t ul_slots() const; - bool is_control_ts(uint8_t ts) const; - /* EGPRS */ bool is_egprs_enabled() const; diff --git a/src/tbf_dl_ass_fsm.c b/src/tbf_dl_ass_fsm.c index 37c5a1b..fe959cc 100644 --- a/src/tbf_dl_ass_fsm.c +++ b/src/tbf_dl_ass_fsm.c @@ -59,7 +59,7 @@ bool old_tfi_is_valid = tbf_is_tfi_assigned(ctx->tbf); /* We only use this function in control TS (PACCH) so that MS can always answer the poll */ - OSMO_ASSERT(tbf_is_control_ts(ctx->tbf, d->ts)); + OSMO_ASSERT(tbf_is_control_ts(ctx->tbf, &tbf_get_trx(ctx->tbf)->pdch[d->ts])); rc = tbf_check_polling(ctx->tbf, d->fn, d->ts, &new_poll_fn, &rrbp); if (rc < 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib1a62b6e7b465253ee7cba63bf5e277f8aa8eaea Gerrit-Change-Number: 30537 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022