fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32024 )

Change subject: gsm_04_08: add more enum gsm48_chan_mode speech values ......................................................................

gsm_04_08: add more enum gsm48_chan_mode speech values

From 3GPP TS 44.018 (version 15.4.0), table 10.5.2.6.1.

Change-Id: I6adda28698c0e479ef20f5d090c1f7f76a2ec97e Related: OS#1572 --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c 2 files changed, 26 insertions(+), 1 deletion(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/32024/1

diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 7522623..5b8dd51 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -756,6 +756,12 @@ GSM48_CMODE_SPEECH_EFR = 0x21, /*!< a.k.a. V2 */ /*! Speech: AMR (TCH/AFS or TCH/AHS) */ GSM48_CMODE_SPEECH_AMR = 0x41, /*!< a.k.a. V3 */ + /*! Speech: OFR AMR-WB (O-TCH/WFS) or OHR AMR-WB (O-TCH/WHS) */ + GSM48_CMODE_SPEECH_V4 = 0x81, + /*! Speech: FR AMR-WB (TCH/WFS) */ + GSM48_CMODE_SPEECH_V5 = 0x82, + /*! Speech: OHR AMR (O-TCH/AHS) */ + GSM48_CMODE_SPEECH_V6 = 0x83,

/*! CSD: 14.5 kbit/s radio interface rate, 14.4 kbit/s services (TCH/F14.4) */ GSM48_CMODE_DATA_14k5 = 0x0f, @@ -772,7 +778,7 @@ GSM48_CMODE_SPEECH_V2_VAMOS = 0xc2, /*! Same as GSM48_CMODE_SPEECH_AMR, in VAMOS mode */ GSM48_CMODE_SPEECH_V3_VAMOS = 0xc3, - /*! Speech: FR AMR-WB, in VAMOS mode */ + /*! Speech: GSM48_CMODE_SPEECH_V5, in VAMOS mode */ GSM48_CMODE_SPEECH_V5_VAMOS = 0xc5, };

diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 1657864..59393d1 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -448,10 +448,15 @@ { GSM48_CMODE_SPEECH_V1, "SPEECH_V1" }, { GSM48_CMODE_SPEECH_EFR, "SPEECH_EFR" }, { GSM48_CMODE_SPEECH_AMR, "SPEECH_AMR" }, + { GSM48_CMODE_SPEECH_V4, "SPEECH_V4" }, + { GSM48_CMODE_SPEECH_V5, "SPEECH_V5" }, + { GSM48_CMODE_SPEECH_V6, "SPEECH_V6" }, + { GSM48_CMODE_DATA_14k5, "DATA_14k5" }, { GSM48_CMODE_DATA_12k0, "DATA_12k0" }, { GSM48_CMODE_DATA_6k0, "DATA_6k0" }, { GSM48_CMODE_DATA_3k6, "DATA_3k6" }, + { GSM48_CMODE_SPEECH_V1_VAMOS, "SPEECH_V1_VAMOS" }, { GSM48_CMODE_SPEECH_V2_VAMOS, "SPEECH_V2_VAMOS" }, { GSM48_CMODE_SPEECH_V3_VAMOS, "SPEECH_V3_VAMOS" }, @@ -493,6 +498,8 @@ return GSM48_CMODE_SPEECH_EFR; case GSM48_CMODE_SPEECH_V3_VAMOS: return GSM48_CMODE_SPEECH_AMR; + case GSM48_CMODE_SPEECH_V5_VAMOS: + return GSM48_CMODE_SPEECH_V5; default: return mode; }