summaryrefslogtreecommitdiffstats
path: root/src/host/layer23/src/mobile/app_mobile.c
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-05-22 20:10:34 +0200
committerHarald Welte <laforge@gnumonks.org>2011-06-21 19:51:01 +0200
commit7ad100b94e49f29d2f5c4586504840ee7df577c9 (patch)
tree88aedd9da82ce76484cf08fb4e26bc5540c80fdb /src/host/layer23/src/mobile/app_mobile.c
parentddb20b8b4e39e7342350ed5b34a2b64029fce7b0 (diff)
layer23: make LAPDm code mostly independent of 'struct osmocom_ms'
This is one step in the direction of re-using the lapdm code in osmo-bts.
Diffstat (limited to 'src/host/layer23/src/mobile/app_mobile.c')
-rw-r--r--src/host/layer23/src/mobile/app_mobile.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c
index 5bb580a3..ed672c9c 100644
--- a/src/host/layer23/src/mobile/app_mobile.c
+++ b/src/host/layer23/src/mobile/app_mobile.c
@@ -143,8 +143,7 @@ int mobile_exit(struct osmocom_ms *ms, int force)
gsm_subscr_exit(ms);
gsm48_cc_exit(ms);
gsm_sim_exit(ms);
- lapdm_exit(&ms->l2_entity.lapdm_acch);
- lapdm_exit(&ms->l2_entity.lapdm_dcch);
+ lapdm_channel_exit(&ms->lapdm_channel);
ms->shutdown = 2; /* being down */
vty_notify(ms, NULL);
@@ -160,12 +159,11 @@ int mobile_init(struct osmocom_ms *ms)
int rc;
gsm_settings_arfcn(ms);
- ms->l2_entity.lapdm_dcch.l1_ctx = ms;
- ms->l2_entity.lapdm_dcch.l3_ctx = ms;
- lapdm_init(&ms->l2_entity.lapdm_dcch);
- ms->l2_entity.lapdm_acch.l1_ctx = ms;
- ms->l2_entity.lapdm_acch.l3_ctx = ms;
- lapdm_init(&ms->l2_entity.lapdm_acch);
+ ms->lapdm_channel.lapdm_dcch.l1_ctx = ms;
+ ms->lapdm_channel.lapdm_dcch.l3_ctx = ms;
+ ms->lapdm_channel.lapdm_acch.l1_ctx = ms;
+ ms->lapdm_channel.lapdm_acch.l3_ctx = ms;
+ lapdm_channel_init(&ms->lapdm_channel);
gsm_sim_init(ms);
gsm48_cc_init(ms);
gsm_subscr_init(ms);