diff options
| author | Andreas.Eversberg <jolly@eversberg.eu> | 2011-07-28 20:54:42 +0200 |
|---|---|---|
| committer | Sylvain Munaut <tnt@246tNt.com> | 2011-07-28 21:30:51 +0200 |
| commit | 1a5461fb2beb96bfa004245a102cd4c1422baa2a (patch) | |
| tree | 71b3dce4ea3765b61610015b58c79c2322127456 /src/host/layer23/src/mobile/app_mobile.c | |
| parent | e042cbb29763f21fd2ed7076c15db87b037ce73a (diff) | |
layer23: Add mobile support for sending / receiving voice frame through MNCC
Support GSM FR codec only so far.
Written-by: Andreas Eversberg <jolly@eversberg.eu>
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Diffstat (limited to 'src/host/layer23/src/mobile/app_mobile.c')
| -rw-r--r-- | src/host/layer23/src/mobile/app_mobile.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 164f3edb..8b3b5524 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -35,6 +35,7 @@ #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/voice.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/core/msgb.h> @@ -167,6 +168,7 @@ int mobile_init(struct osmocom_ms *ms) gsm_sim_init(ms); gsm48_cc_init(ms); + gsm_voice_init(ms); gsm_subscr_init(ms); gsm48_rr_init(ms); gsm48_mm_init(ms); @@ -191,13 +193,6 @@ int mobile_init(struct osmocom_ms *ms) } #endif - if (mncc_recv_app) - ms->cclayer.mncc_recv = mncc_recv_app; - else if (ms->settings.ch_cap == GSM_CAP_SDCCH) - ms->cclayer.mncc_recv = mncc_recv_dummy; - else - ms->cclayer.mncc_recv = mncc_recv_mobile; - gsm_random_imei(&ms->settings); ms->shutdown = 0; @@ -247,9 +242,12 @@ struct osmocom_ms *mobile_new(char *name) mncc->msg_type = MS_NEW; mncc_recv_app(ms, mncc->msg_type, mncc); } - ms->cclayer.mncc_recv = mncc_recv_app; - } else - ms->cclayer.mncc_recv = mncc_recv_dummy; + ms->mncc_entity.mncc_recv = mncc_recv_app; + } else if (ms->settings.ch_cap == GSM_CAP_SDCCH) + ms->mncc_entity.mncc_recv = mncc_recv_dummy; + else + ms->mncc_entity.mncc_recv = mncc_recv_mobile; + return ms; } |