fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34911?usp=email )
Change subject: mobile: rename 'audio' node to 'tch-voice' node
......................................................................
mobile: rename 'audio' node to 'tch-voice' node
Change-Id: I2cab597c5de92ecb343cad7aaaa48035ca5f8365
Related: OS#4396
---
M src/host/layer23/include/osmocom/bb/mobile/vty.h
M src/host/layer23/src/mobile/vty_interface.c
2 files changed, 37 insertions(+), 20 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h
b/src/host/layer23/include/osmocom/bb/mobile/vty.h
index 511348b..b681440 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/vty.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h
@@ -10,7 +10,7 @@
enum ms_vty_node {
SUPPORT_NODE = _LAST_L23VTY_NODE + 1,
- AUDIO_NODE,
+ TCH_VOICE_NODE,
VGCS_NODE,
VBS_NODE,
};
diff --git a/src/host/layer23/src/mobile/vty_interface.c
b/src/host/layer23/src/mobile/vty_interface.c
index e79a5a1..a91ab77 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -49,9 +49,9 @@
1
};
-struct cmd_node audio_node = {
- AUDIO_NODE,
- "%s(audio)# ",
+struct cmd_node tch_voice_node = {
+ TCH_VOICE_NODE,
+ "%s(tch-voice)# ",
1
};
@@ -1475,7 +1475,7 @@
vty_out(vty, " %sasci-allow-any%s",
(set->asci_allow_any) ? "" : "no ", VTY_NEWLINE);
- vty_out(vty, " audio%s", VTY_NEWLINE);
+ vty_out(vty, " tch-voice%s", VTY_NEWLINE);
vty_out(vty, " io-handler %s%s",
audio_io_handler_name(set->audio.io_handler), VTY_NEWLINE);
if (set->audio.io_handler == AUDIO_IOH_GAPK) {
@@ -2477,14 +2477,20 @@
SUP_EN_DI(vgcs, "vgcs", "Voice Group Call Service (VGCS)", 0);
SUP_EN_DI(vbs, "vbs", "Voice Broadcast Service (VBS)", 0);
-/* per audio config */
-DEFUN(cfg_ms_audio, cfg_ms_audio_cmd, "audio",
- "Configure audio settings")
+/* TCH config */
+DEFUN(cfg_ms_tch_voice,
+ cfg_ms_tch_voice_cmd,
+ "tch-voice", "Configure TCH (Traffic CHannel) params for voice calls\n")
{
- vty->node = AUDIO_NODE;
+ vty->node = TCH_VOICE_NODE;
return CMD_SUCCESS;
}
+ALIAS_DEPRECATED(cfg_ms_tch_voice, /* alias to 'tch-voice' */
+ cfg_ms_audio_cmd,
+ "audio", "(deprecated alias for 'tch-voice')\n");
+
+
static int set_audio_io_handler(struct vty *vty, enum audio_io_handler val)
{
struct osmocom_ms *ms = (struct osmocom_ms *) vty->index;
@@ -2501,7 +2507,7 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_ms_audio_io_handler, cfg_ms_audio_io_handler_cmd,
+DEFUN(cfg_ms_tch_voice_io_handler, cfg_ms_tch_voice_io_handler_cmd,
"io-handler (none|gapk|l1phy|mncc-sock|loopback)",
"Set TCH frame I/O handler\n"
"No handler, drop TCH frames (default)\n"
@@ -2531,13 +2537,13 @@
return set_audio_io_handler(vty, val);
}
-DEFUN(cfg_ms_audio_no_io_handler, cfg_ms_audio_no_io_handler_cmd,
+DEFUN(cfg_ms_tch_voice_no_io_handler, cfg_ms_tch_voice_no_io_handler_cmd,
"no io-handler", NO_STR "Disable TCH frame processing")
{
return set_audio_io_handler(vty, AUDIO_IOH_NONE);
}
-DEFUN(cfg_ms_audio_io_tch_format, cfg_ms_audio_io_tch_format_cmd,
+DEFUN(cfg_ms_tch_voice_io_tch_format, cfg_ms_tch_voice_io_tch_format_cmd,
"io-tch-format (rtp|ti)",
"Set TCH I/O frame format used by the L1 PHY (for GAPK only)\n"
"RTP format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n"
@@ -2558,7 +2564,7 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_ms_audio_alsa_out_dev, cfg_ms_audio_alsa_out_dev_cmd,
+DEFUN(cfg_ms_tch_voice_alsa_out_dev, cfg_ms_tch_voice_alsa_out_dev_cmd,
"alsa-output-dev (default|NAME)",
"Set ALSA output (playback) device name (for GAPK only)\n"
"Default system playback device (default)\n"
@@ -2572,7 +2578,7 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_ms_audio_alsa_in_dev, cfg_ms_audio_alsa_in_dev_cmd,
+DEFUN(cfg_ms_tch_voice_alsa_in_dev, cfg_ms_tch_voice_alsa_in_dev_cmd,
"alsa-input-dev (default|NAME)",
"Set ALSA input (capture) device name (for GAPK only)\n"
"Default system recording device (default)\n"
@@ -2757,6 +2763,7 @@
install_element(MS_NODE, &cfg_ms_no_codec_half_cmd);
install_element(MS_NODE, &cfg_ms_abbrev_cmd);
install_element(MS_NODE, &cfg_ms_no_abbrev_cmd);
+ install_element(MS_NODE, &cfg_ms_tch_voice_cmd);
install_element(MS_NODE, &cfg_ms_audio_cmd);
install_element(MS_NODE, &cfg_ms_neighbour_cmd);
install_element(MS_NODE, &cfg_ms_no_neighbour_cmd);
@@ -2842,12 +2849,12 @@
install_element(MS_NODE, &cfg_ms_script_load_run_cmd);
install_element(MS_NODE, &cfg_ms_no_script_load_run_cmd);
- install_node(&audio_node, config_write_dummy);
- install_element(AUDIO_NODE, &cfg_ms_audio_io_handler_cmd);
- install_element(AUDIO_NODE, &cfg_ms_audio_no_io_handler_cmd);
- install_element(AUDIO_NODE, &cfg_ms_audio_io_tch_format_cmd);
- install_element(AUDIO_NODE, &cfg_ms_audio_alsa_out_dev_cmd);
- install_element(AUDIO_NODE, &cfg_ms_audio_alsa_in_dev_cmd);
+ install_node(&tch_voice_node, config_write_dummy);
+ install_element(TCH_VOICE_NODE, &cfg_ms_tch_voice_io_handler_cmd);
+ install_element(TCH_VOICE_NODE, &cfg_ms_tch_voice_no_io_handler_cmd);
+ install_element(TCH_VOICE_NODE, &cfg_ms_tch_voice_io_tch_format_cmd);
+ install_element(TCH_VOICE_NODE, &cfg_ms_tch_voice_alsa_out_dev_cmd);
+ install_element(TCH_VOICE_NODE, &cfg_ms_tch_voice_alsa_in_dev_cmd);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34911?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: I2cab597c5de92ecb343cad7aaaa48035ca5f8365
Gerrit-Change-Number: 34911
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
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
