fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30336 )
Change subject: mobile: split gsm_send_voice() -> gsm_send_voice_{msg,frame}()
......................................................................
mobile: split gsm_send_voice() -> gsm_send_voice_{msg,frame}()
This is needed to avoid sending voice frames to the L1PHY without
having to use MNCC specific struct gsm_data_frame.
Change-Id: I37241555cd648a8e2b57fa072c708f93cd1ba5a9
Related: OS#5599
---
M src/host/layer23/include/osmocom/bb/mobile/voice.h
M src/host/layer23/src/mobile/gsm48_cc.c
M src/host/layer23/src/mobile/voice.c
3 files changed, 16 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/host/layer23/include/osmocom/bb/mobile/voice.h
b/src/host/layer23/include/osmocom/bb/mobile/voice.h
index 623f6c8..8c4c5b6 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/voice.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/voice.h
@@ -2,6 +2,8 @@
struct osmocom_ms;
struct gsm_data_frame;
+struct msgb;
int gsm_voice_init(struct osmocom_ms *ms);
-int gsm_send_voice(struct osmocom_ms *ms, struct gsm_data_frame *data);
+int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg);
+int gsm_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame
*frame);
diff --git a/src/host/layer23/src/mobile/gsm48_cc.c
b/src/host/layer23/src/mobile/gsm48_cc.c
index a8d7a65..503c9fd 100644
--- a/src/host/layer23/src/mobile/gsm48_cc.c
+++ b/src/host/layer23/src/mobile/gsm48_cc.c
@@ -1966,7 +1966,7 @@
switch (msg_type) {
case GSM_TCHF_FRAME:
- return gsm_send_voice(ms, arg);
+ return gsm_send_voice_frame(ms, arg);
case MNCC_LCHAN_MODIFY:
return 0;
case MNCC_FRAME_RECV:
diff --git a/src/host/layer23/src/mobile/voice.c
b/src/host/layer23/src/mobile/voice.c
index 7bcf8a6..4b5f792 100644
--- a/src/host/layer23/src/mobile/voice.c
+++ b/src/host/layer23/src/mobile/voice.c
@@ -56,7 +56,7 @@
/* send voice frame back, if appropriate */
if (ms->settings.audio.io_handler == AUDIO_IOH_LOOPBACK)
- gsm_send_voice(ms, mncc);
+ gsm_send_voice_frame(ms, mncc);
/* distribute and then free */
if (ms->mncc_entity.mncc_recv && ms->mncc_entity.ref) {
@@ -71,7 +71,13 @@
/*
* send voice
*/
-int gsm_send_voice(struct osmocom_ms *ms, struct gsm_data_frame *data)
+int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg)
+{
+ /* Forward to RR */
+ return gsm48_rr_tx_voice(ms, msg);
+}
+
+int gsm_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame
*frame)
{
struct msgb *nmsg;
int len;
@@ -85,7 +91,8 @@
len = GSM_EFR_BYTES;
break;
default:
- LOGP(DL1C, LOGL_ERROR, "gsm_send_voice, msg_type=0x%02x: not
implemented\n", data->msg_type);
+ LOGP(DL1C, LOGL_ERROR, "%s(): msg_type=0x%02x: not
implemented\n",
+ __func__, frame->msg_type);
return -EINVAL;
}
@@ -93,9 +100,9 @@
if (!nmsg)
return -ENOMEM;
nmsg->l2h = msgb_put(nmsg, len);
- memcpy(nmsg->l2h, data->data, len);
+ memcpy(nmsg->l2h, frame->data, len);
- return gsm48_rr_tx_voice(ms, nmsg);
+ return gsm_send_voice_msg(ms, nmsg);
}
/*
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30336
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I37241555cd648a8e2b57fa072c708f93cd1ba5a9
Gerrit-Change-Number: 30336
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-CC: msuraev <msur...@sysmocom.de>
Gerrit-MessageType: merged
