diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2020-04-27 15:56:36 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2020-05-05 12:22:32 +0200 |
| commit | 901ac89735d2bb40d774184587aabf4c8940ce63 (patch) | |
| tree | ac4035a0532bc3597aa01cf40dca390e0fd57062 /src/host/layer23/src | |
| parent | 8f04fa975819113f2a75a1803cbc3d06877fd36d (diff) | |
mobile: loopback: support EFR
Related: SYS#4924
Change-Id: I73d1f88b0865ad97b85418ff76739febf2e128a7
Diffstat (limited to 'src/host/layer23/src')
| -rw-r--r-- | src/host/layer23/src/mobile/voice.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 4aae8aaa..c3792650 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -22,7 +22,9 @@ #include <stdlib.h> #include <osmocom/core/msgb.h> +#include <osmocom/codec/codec.h> +#include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/voice.h> @@ -43,11 +45,14 @@ static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) msgb_push(msg, sizeof(struct gsm_data_frame)); mncc->callref = ms->mncc_entity.ref; - /* FIXME: FR only! */ + /* FIXME: FR, EFR only! */ switch (ms->rrlayer.cd_now.mode) { case GSM48_CMODE_SPEECH_V1: mncc->msg_type = GSM_TCHF_FRAME; break; + case GSM48_CMODE_SPEECH_EFR: + mncc->msg_type = GSM_TCHF_FRAME_EFR; + break; default: /* TODO: print error message here */ goto exit_free; @@ -73,12 +78,26 @@ exit_free: int gsm_send_voice(struct osmocom_ms *ms, struct gsm_data_frame *data) { struct msgb *nmsg; + int len; + + switch (ms->rrlayer.cd_now.mode) { + case GSM48_CMODE_SPEECH_V1: + /* FIXME: FR only, check for TCH/F (FR) and TCH/H (HR) */ + len = GSM_FR_BYTES; + break; + case GSM48_CMODE_SPEECH_EFR: + len = GSM_EFR_BYTES; + break; + default: + LOGP(DL1C, LOGL_ERROR, "gsm_send_voice, msg_type=0x%02x: not implemented\n", data->msg_type); + return -EINVAL; + } - nmsg = msgb_alloc_headroom(33 + 64, 64, "TCH/F"); + nmsg = msgb_alloc_headroom(len + 64, 64, "TCH/F"); if (!nmsg) return -ENOMEM; - nmsg->l2h = msgb_put(nmsg, 33); - memcpy(nmsg->l2h, data->data, 33); + nmsg->l2h = msgb_put(nmsg, len); + memcpy(nmsg->l2h, data->data, len); return gsm48_rr_tx_voice(ms, nmsg); } |