phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

mobile: rename voice.[ch] to tch.[ch] 

Also take a chance to change the 'tch_' prefix for all functions.

Change-Id: I05e1ae777add73672db61565c77c68d8ab2b08f0
Related: OS#4396
This commit is contained in:
Vadim Yanitskiy 2023-10-23 23:38:38 +07:00
parent b6083dcd13
commit efe2c7b7bd
9 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/host/layer23/include/osmocom/bb/mobile/Makefile.am
View File

@ -1,4 +1,4 @@
noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \
gsm48_rr.h mncc.h gsm44068_gcc_bcc.h \ gsm48_rr.h mncc.h gsm44068_gcc_bcc.h \
transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \ tch.h transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \
app_mobile.h voice.h gapk_io.h app_mobile.h gapk_io.h

9
src/host/layer23/include/osmocom/bb/mobile/tch.h Normal file
View File

@ -0,0 +1,9 @@
#pragma once
struct osmocom_ms;
struct gsm_data_frame;
struct msgb;
int tch_init(struct osmocom_ms *ms);
int tch_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg);
int tch_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame);

9
src/host/layer23/include/osmocom/bb/mobile/voice.h
View File

@ -1,9 +0,0 @@
#pragma once
struct osmocom_ms;
struct gsm_data_frame;
struct msgb;
int gsm_voice_init(struct osmocom_ms *ms);
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);

2
src/host/layer23/src/mobile/Makefile.am
View File

@ -30,9 +30,9 @@ libmobile_a_SOURCES = \
mnccms.c \ mnccms.c \
mncc_sock.c \ mncc_sock.c \
primitives.c \ primitives.c \
tch.c \
transaction.c \ transaction.c \
vty_interface.c \ vty_interface.c \
voice.c \
$(NULL) $(NULL)
bin_PROGRAMS = mobile bin_PROGRAMS = mobile

4
src/host/layer23/src/mobile/app_mobile.c
View File

@ -41,7 +41,7 @@
#include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/vty.h>
#include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/bb/mobile/app_mobile.h>
#include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/mncc.h>
#include <osmocom/bb/mobile/voice.h> #include <osmocom/bb/mobile/tch.h>
#include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/gapk_io.h>
#include <osmocom/bb/mobile/primitives.h> #include <osmocom/bb/mobile/primitives.h>
@ -256,7 +256,7 @@ static int mobile_init(struct osmocom_ms *ms)
gsm480_ss_init(ms); gsm480_ss_init(ms);
gsm411_sms_init(ms); gsm411_sms_init(ms);
gsm44068_gcc_init(ms); gsm44068_gcc_init(ms);
gsm_voice_init(ms); tch_init(ms);
gsm_subscr_init(ms); gsm_subscr_init(ms);
gsm48_rr_init(ms); gsm48_rr_init(ms);
gsm48_mm_init(ms); gsm48_mm_init(ms);

4
src/host/layer23/src/mobile/gapk_io.c
View File

@ -36,7 +36,7 @@
#include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/ms.h>
#include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/logging.h>
#include <osmocom/bb/mobile/voice.h> #include <osmocom/bb/mobile/tch.h>
#include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/gapk_io.h>
/* The RAW PCM format is common for both audio source and sink */ /* The RAW PCM format is common for both audio source and sink */
@ -585,7 +585,7 @@ int gapk_io_serve_ms(struct osmocom_ms *ms)
&gapk_io->tch_ul_fb_len); &gapk_io->tch_ul_fb_len);
/* Push a voice frame to the lower layers */ /* Push a voice frame to the lower layers */
gsm_send_voice_msg(ms, tch_msg); tch_send_voice_msg(ms, tch_msg);
work |= 1; work |= 1;
} }

2
src/host/layer23/src/mobile/gsm44068_gcc_bcc.c
View File

@ -64,7 +64,7 @@
#include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/mncc.h>
#include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/transaction.h>
#include <osmocom/bb/mobile/gsm44068_gcc_bcc.h> #include <osmocom/bb/mobile/gsm44068_gcc_bcc.h>
#include <osmocom/bb/mobile/voice.h> #include <osmocom/bb/mobile/tch.h>
#include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/vty.h>
#include <l1ctl_proto.h> #include <l1ctl_proto.h>

4
src/host/layer23/src/mobile/gsm48_cc.c
View File

@ -33,7 +33,7 @@
#include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/transaction.h>
#include <osmocom/bb/mobile/gsm48_cc.h> #include <osmocom/bb/mobile/gsm48_cc.h>
#include <osmocom/bb/mobile/gsm44068_gcc_bcc.h> #include <osmocom/bb/mobile/gsm44068_gcc_bcc.h>
#include <osmocom/bb/mobile/voice.h> #include <osmocom/bb/mobile/tch.h>
#include <l1ctl_proto.h> #include <l1ctl_proto.h>
static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg); static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg);
@ -1978,7 +1978,7 @@ int mncc_tx_to_cc(void *inst, int msg_type, void *arg)
case GSM_TCHH_FRAME: case GSM_TCHH_FRAME:
case GSM_TCH_FRAME_AMR: case GSM_TCH_FRAME_AMR:
case GSM_BAD_FRAME: case GSM_BAD_FRAME:
return gsm_send_voice_frame(ms, arg); return tch_send_voice_frame(ms, arg);
case MNCC_LCHAN_MODIFY: case MNCC_LCHAN_MODIFY:
return 0; return 0;
case MNCC_FRAME_RECV: case MNCC_FRAME_RECV:

24
src/host/layer23/src/mobile/voice.c → src/host/layer23/src/mobile/tch.c
View File

@ -31,10 +31,10 @@
#include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/gapk_io.h>
#include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/mncc.h>
#include <osmocom/bb/mobile/mncc_sock.h> #include <osmocom/bb/mobile/mncc_sock.h>
#include <osmocom/bb/mobile/voice.h> #include <osmocom/bb/mobile/tch.h>
/* Forward a Downlink voice frame to the external MNCC handler */ /* Forward a Downlink voice frame to the external MNCC handler */
static int gsm_forward_mncc(struct osmocom_ms *ms, struct msgb *msg) static int tch_forward_mncc(struct osmocom_ms *ms, struct msgb *msg)
{ {
struct gsm_data_frame *mncc; struct gsm_data_frame *mncc;
@ -74,16 +74,16 @@ exit_free:
} }
/* Receive a Downlink voice frame from the lower layers */ /* Receive a Downlink voice frame from the lower layers */
static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) static int tch_recv_voice(struct osmocom_ms *ms, struct msgb *msg)
{ {
switch (ms->settings.tch_voice.io_handler) { switch (ms->settings.tch_voice.io_handler) {
case TCH_VOICE_IOH_LOOPBACK: case TCH_VOICE_IOH_LOOPBACK:
/* Remove the DL info header */ /* Remove the DL info header */
msgb_pull_to_l2(msg); msgb_pull_to_l2(msg);
/* Send voice frame back */ /* Send voice frame back */
return gsm_send_voice_msg(ms, msg); return tch_send_voice_msg(ms, msg);
case TCH_VOICE_IOH_MNCC_SOCK: case TCH_VOICE_IOH_MNCC_SOCK:
return gsm_forward_mncc(ms, msg); return tch_forward_mncc(ms, msg);
case TCH_VOICE_IOH_GAPK: case TCH_VOICE_IOH_GAPK:
#ifdef WITH_GAPK_IO #ifdef WITH_GAPK_IO
/* Enqueue a frame to the DL TCH buffer */ /* Enqueue a frame to the DL TCH buffer */
@ -103,14 +103,14 @@ static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg)
} }
/* Send an Uplink voice frame to the lower layers */ /* Send an Uplink voice frame to the lower layers */
int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) int tch_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg)
{ {
/* Forward to RR */ /* Forward to RR */
return gsm48_rr_tx_traffic(ms, msg); return gsm48_rr_tx_traffic(ms, msg);
} }
/* gsm_send_voice_msg() wrapper accepting an MNCC structure */ /* tch_send_voice_msg() wrapper accepting an MNCC structure */
int gsm_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame) int tch_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame)
{ {
struct msgb *nmsg; struct msgb *nmsg;
int len; int len;
@ -139,13 +139,13 @@ int gsm_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *fra
nmsg->l2h = msgb_put(nmsg, len); nmsg->l2h = msgb_put(nmsg, len);
memcpy(nmsg->l2h, frame->data, len); memcpy(nmsg->l2h, frame->data, len);
return gsm_send_voice_msg(ms, nmsg); return tch_send_voice_msg(ms, nmsg);
} }
/* Initialize voice router */ /* Initialize the TCH router */
int gsm_voice_init(struct osmocom_ms *ms) int tch_init(struct osmocom_ms *ms)
{ {
ms->l1_entity.l1_traffic_ind = gsm_recv_voice; ms->l1_entity.l1_traffic_ind = tch_recv_voice;
return 0; return 0;
} }