dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31801 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: bts: add function to check if a BTS has a BSC co located PCU ...................................................................... bts: add function to check if a BTS has a BSC co located PCU At the momemnt we use is_ericsson_bts() to check if the BTS uses a BSC co-located PCU, this is a bit ambiguous, lets have a function that explicitly checks for a BSC co-located PCU and nothing else. Change-Id: I23ed4219e5ebd188867c17f387ca877efa9bc3b0 Related: OS#5198 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/timeslot_fsm.c 2 files changed, 27 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index ea396cc..ccca186 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -751,6 +751,18 @@ return false; } +static inline bool bsc_co_located_pcu(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_RBS2000: + return true; + default: + break; + } + + return false; +} + static inline const struct osmo_location_area_id *bts_lai(struct gsm_bts *bts) { static struct osmo_location_area_id lai; diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index aa5e0db..790ad77 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -341,7 +341,7 @@ return; } - if (is_ericsson_bts(bts) && !pcu_connected(bts)) { + if (bsc_co_located_pcu(bts) && !pcu_connected(bts)) { LOG_TS(ts, LOGL_DEBUG, "PCU not connected: not activating PDCH.\n"); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23ed4219e5ebd188867c17f387ca877efa9bc3b0 Gerrit-Change-Number: 31801 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged