From 2fbf4d1c67e80715c7cc8d82053b72d31b75fc41 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Tue, 28 Aug 2018 03:40:14 +0700 Subject: mobile/voice.c: abstract gsm_send_voice() from MNCC Change-Id: I37241555cd648a8e2b57fa072c708f93cd1ba5a9 --- src/host/layer23/include/osmocom/bb/mobile/voice.h | 8 +++++++- src/host/layer23/src/mobile/gsm48_cc.c | 2 +- src/host/layer23/src/mobile/voice.c | 17 ++++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/host/layer23/include/osmocom/bb/mobile/voice.h b/src/host/layer23/include/osmocom/bb/mobile/voice.h index b9817f8a..689361c3 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/voice.h +++ b/src/host/layer23/include/osmocom/bb/mobile/voice.h @@ -1,4 +1,10 @@ #pragma once +#include + +#include +#include + 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(struct osmocom_ms *ms, struct msgb *msg); +int gsm_send_voice_mncc(struct osmocom_ms *ms, 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 f1e81098..28576d29 100644 --- a/src/host/layer23/src/mobile/gsm48_cc.c +++ b/src/host/layer23/src/mobile/gsm48_cc.c @@ -1970,7 +1970,7 @@ int mncc_tx_to_cc(void *inst, int msg_type, void *arg) switch (msg_type) { case GSM_TCHF_FRAME: - return gsm_send_voice(ms, arg); + return gsm_send_voice_mncc(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 b7678337..76c116cd 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -53,7 +53,18 @@ static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) /* * send voice */ -int gsm_send_voice(struct osmocom_ms *ms, struct gsm_data_frame *data) +int gsm_send_voice(struct osmocom_ms *ms, struct msgb *msg) +{ + /** + * Nothing to do for now... + * TODO: compose l1ctl_traffic_ind header here + */ + + /* Forward to RR */ + return gsm48_rr_tx_voice(ms, msg); +} + +int gsm_send_voice_mncc(struct osmocom_ms *ms, struct gsm_data_frame *frame) { struct msgb *nmsg; @@ -61,9 +72,9 @@ int gsm_send_voice(struct osmocom_ms *ms, struct gsm_data_frame *data) if (!nmsg) return -ENOMEM; nmsg->l2h = msgb_put(nmsg, 33); - memcpy(nmsg->l2h, data->data, 33); + memcpy(nmsg->l2h, frame->data, 33); - return gsm48_rr_tx_voice(ms, nmsg); + return gsm_send_voice(ms, nmsg); } /* -- cgit v1.2.3