fixeria has uploaded this change for review.
mobile: cosmetic: rename TCH_IOFF_RTP to TCH_IOFF_OSMO
This parameter will also determine TCH frame format for data calls,
but saying RTP for data calls is incorrect since the BSS performs
rate adaptation before sending data via RTP. Let's use 'osmo',
which is valid for Osmocom's trxcon and virtphy.
Change-Id: I780d0a9fc20244ffa34307fb3d00f3848b6dcc76
Related: OS#4396
---
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/src/common/settings.c
M src/host/layer23/src/mobile/gapk_io.c
M src/host/layer23/src/mobile/vty_interface.c
4 files changed, 22 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/13/34913/1
diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h
index aeb4abd..6cec54b 100644
--- a/src/host/layer23/include/osmocom/bb/common/settings.h
+++ b/src/host/layer23/include/osmocom/bb/common/settings.h
@@ -47,7 +47,7 @@
/* TCH I/O frame format */
enum tch_io_frame_format {
/* RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR, packed bits for data */
- TCH_IOFF_RTP,
+ TCH_IOFF_OSMO,
/* Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx) */
TCH_IOFF_TI,
};
diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c
index 6caaa00..348986b 100644
--- a/src/host/layer23/src/common/settings.c
+++ b/src/host/layer23/src/common/settings.c
@@ -236,7 +236,8 @@
};
const struct value_string tch_io_frame_format_names[] = {
- { TCH_IOFF_RTP, "rtp" },
+ { TCH_IOFF_OSMO, "osmo" },
+ { TCH_IOFF_OSMO, "rtp" }, /* for compatibility */
{ TCH_IOFF_TI, "ti" },
{ 0, NULL }
};
diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c
index e86d625..d6c913a 100644
--- a/src/host/layer23/src/mobile/gapk_io.c
+++ b/src/host/layer23/src/mobile/gapk_io.c
@@ -410,7 +410,7 @@
}
switch (set->tch.frame_format) {
- case TCH_IOFF_RTP:
+ case TCH_IOFF_OSMO:
phy_fmt = phy_fmt_pick_rtp(codec);
break;
case TCH_IOFF_TI:
diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c
index 445ad4a..8acc148 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -2563,9 +2563,10 @@
NO_STR "Disable TCH I/O handling for voice calls\n");
DEFUN(cfg_ms_tch_io_tch_format, cfg_ms_tch_io_tch_format_cmd,
- "io-tch-format (rtp|ti)",
+ "io-tch-format (osmo|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"
+ "Osmocom format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n"
+ "(same as 'osmo', kept for backwards-compatibility)\n"
"Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx)\n")
{
int val = get_string_value(tch_io_frame_format_names, argv[0]);
To view, visit change 34913. To unsubscribe, or for help writing mail filters, visit settings.