laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/33290 )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: validate RSL "channel rate and type" against VGCS/VBS flags
......................................................................
validate RSL "channel rate and type" against VGCS/VBS flags
We already have specfied (but not yet implemented BTS_FEAT_{VBS,VGCS}).
Let's add code to validate "channel rate and type" compatibility
in bts_supports_cm() once a BTS model would actually exhibit those
feature flags.
Change-Id: I5e7f65b44cef6e2f7ad4f152f80a1686a4f511e3
Related: OS#4851
---
M src/common/bts.c
1 file changed, 30 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/common/bts.c b/src/common/bts.c
index 28f7567..6652ce6 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -791,6 +791,16 @@
return 1;
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;
+ 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;
+ break;
case RSL_CMOD_SPD_DATA:
default:
return 0;
@@ -804,6 +814,8 @@
return 0;
/* fall-through */
case RSL_CMOD_CRT_TCH_Bm:
+ case RSL_CMOD_CRT_TCH_GROUP_Bm:
+ case RSL_CMOD_CRT_TCH_BCAST_Bm:
switch (cm->chan_rate) {
case RSL_CMOD_SP_GSM1:
feature = BTS_FEAT_SPEECH_F_V1;
@@ -825,6 +837,8 @@
return 0;
/* fall-through */
case RSL_CMOD_CRT_TCH_Lm:
+ case RSL_CMOD_CRT_TCH_GROUP_Lm:
+ case RSL_CMOD_CRT_TCH_BCAST_Lm:
switch (cm->chan_rate) {
case RSL_CMOD_SP_GSM1:
feature = BTS_FEAT_SPEECH_H_V1;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33290
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I5e7f65b44cef6e2f7ad4f152f80a1686a4f511e3
Gerrit-Change-Number: 33290
Gerrit-PatchSet: 4
Gerrit-Owner: jolly <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
