Change in osmo-bsc[master]: pcu_sock: rework check logic for ts

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30876 ) Change subject: pcu_sock: rework check logic for ts ...................................................................... pcu_sock: rework check logic for ts Before filling in the TS in the info indication, it is checked that the MO opstate is enabled. Also it is checked that the TS serves a PDCH. Lets restructure this check and move the PDCH check into a helper function as we need to check for PDCH from other location as well later. Change-Id: Icaab52ab73c38889dfadb523b89bb54cafacc99a Related: OS#5198 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index b778cbd..def2df0 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -92,6 +92,20 @@ return msg; } +/* Check if the timeslot can be utilized as PDCH now + * (PDCH is currently active on BTS) */ +static bool ts_now_usable_as_pdch(const struct gsm_bts_trx_ts *ts) +{ + switch (ts->pchan_is) { + case GSM_PCHAN_PDCH: + /* NOTE: We currently only support Ericsson RBS as a BSC + * co-located BTS. This BTS only supports dynamic channels. */ + return true; + default: + return false; + } +} + /* Fill the frequency hopping parameter */ static void info_ind_fill_fhp(struct gsm_pcu_if_info_trx_ts *ts_info, const struct gsm_bts_trx_ts *ts) @@ -124,8 +138,9 @@ for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { ts = &trx->ts[tn]; - if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || - ts->pchan_is != GSM_PCHAN_PDCH) + if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED) + continue; + if (!ts_now_usable_as_pdch(ts)) continue; trx_info->pdch_mask |= (1 << tn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icaab52ab73c38889dfadb523b89bb54cafacc99a Gerrit-Change-Number: 30876 Gerrit-PatchSet: 8 Gerrit-Owner: dexter &lt;pmaier(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged