jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34483?usp=email )
(
7 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ASCI: Add support flags to mobile (and VTY) for VGCS/VBS
......................................................................
ASCI: Add support flags to mobile (and VTY) for VGCS/VBS
These support flags can be enabled or disabled and are sent in the
class mark IE. Also they allow or disallow making VGCS/VBS calls.
Related: OS#5364
Change-Id: Ia23eb190e533660cce4ba4c856a83b5f3d534202
---
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/src/common/support.c
M src/host/layer23/src/mobile/vty_interface.c
3 files changed, 34 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h
b/src/host/layer23/include/osmocom/bb/common/settings.h
index 56475e3..c5469c1 100644
--- a/src/host/layer23/include/osmocom/bb/common/settings.h
+++ b/src/host/layer23/include/osmocom/bb/common/settings.h
@@ -161,6 +161,10 @@
uint8_t ch_cap; /* channel capability */
int8_t min_rxlev_dbm; /* min dBm to access */
+ /* support for ASCI */
+ bool vgcs; /* support of VGCS */
+ bool vbs; /* support of VBS */
+
/* radio */
uint16_t dsc_max;
uint8_t force_rekey;
diff --git a/src/host/layer23/src/common/support.c
b/src/host/layer23/src/common/support.c
index e82d49f..2f93016 100644
--- a/src/host/layer23/src/common/support.c
+++ b/src/host/layer23/src/common/support.c
@@ -34,9 +34,9 @@
/* revision level */
sup->rev_lev = 1; /* phase 2 mobile station */
/* support of VGCS */
- sup->vgcs = 0; /* no */
+ sup->vgcs = true; /* yes */
/* support of VBS */
- sup->vbs = 0; /* no */
+ sup->vbs = true; /* yes */
/* support of SMS */
sup->sms_ptp = 1; /* no */
/* screening indicator */
diff --git a/src/host/layer23/src/mobile/vty_interface.c
b/src/host/layer23/src/mobile/vty_interface.c
index 9b9ba95..feb5f84 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -1075,6 +1075,8 @@
if (!l23_vty_hide_default || set->any_timeout !=
MOB_C7_DEFLT_ANY_TIMEOUT)
vty_out(vty, " c7-any-timeout %d%s",
set->any_timeout, VTY_NEWLINE);
+ SUP_WRITE(vgcs, "vgcs");
+ SUP_WRITE(vbs, "vbs");
vty_out(vty, " audio%s", VTY_NEWLINE);
vty_out(vty, " io-handler %s%s",
@@ -2052,6 +2054,15 @@
return CMD_SUCCESS;
}
+SUP_EN(cfg_ms_sup_vbs, cfg_ms_sup_vbs_cmd, vbs, "vbs",
+ "Voice Broadcast Service (VBS)", 0);
+SUP_DI(cfg_ms_sup_no_vbs, cfg_ms_sup_no_vbs_cmd, vbs,
+ "vbs", "Voice Broadcast Service (VBS)", 0);
+SUP_EN(cfg_ms_sup_vgcs, cfg_ms_sup_vgcs_cmd, vgcs, "vgcs",
+ "Voice Group Call Service (VGCS)", 0);
+SUP_DI(cfg_ms_sup_no_vgcs, cfg_ms_sup_no_vgcs_cmd, vgcs,
+ "vgcs", "Voice Group Call Service (VBS)", 0);
+
/* per audio config */
DEFUN(cfg_ms_audio, cfg_ms_audio_cmd, "audio",
"Configure audio settings")
@@ -2380,6 +2391,10 @@
install_element(SUPPORT_NODE, &cfg_ms_sup_dsc_max_cmd);
install_element(SUPPORT_NODE, &cfg_ms_sup_skip_max_per_band_cmd);
install_element(SUPPORT_NODE, &cfg_ms_sup_no_skip_max_per_band_cmd);
+ install_element(SUPPORT_NODE, &cfg_ms_sup_vbs_cmd);
+ install_element(SUPPORT_NODE, &cfg_ms_sup_no_vbs_cmd);
+ install_element(SUPPORT_NODE, &cfg_ms_sup_vgcs_cmd);
+ install_element(SUPPORT_NODE, &cfg_ms_sup_no_vgcs_cmd);
install_element(MS_NODE, &cfg_ms_script_load_run_cmd);
install_element(MS_NODE, &cfg_ms_no_script_load_run_cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34483?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ia23eb190e533660cce4ba4c856a83b5f3d534202
Gerrit-Change-Number: 34483
Gerrit-PatchSet: 9
Gerrit-Owner: jolly <andr...@eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: jolly <andr...@eversberg.eu>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
