diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-05-22 20:10:34 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-06-21 19:51:01 +0200 |
| commit | 7ad100b94e49f29d2f5c4586504840ee7df577c9 (patch) | |
| tree | 88aedd9da82ce76484cf08fb4e26bc5540c80fdb /src/host/layer23/src/misc | |
| parent | ddb20b8b4e39e7342350ed5b34a2b64029fce7b0 (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/misc')
| -rw-r--r-- | src/host/layer23/src/misc/app_cbch_sniff.c | 3 | ||||
| -rw-r--r-- | src/host/layer23/src/misc/cell_log.c | 5 | ||||
| -rw-r--r-- | src/host/layer23/src/misc/rslms.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/host/layer23/src/misc/app_cbch_sniff.c b/src/host/layer23/src/misc/app_cbch_sniff.c index bda9aae8..ec112343 100644 --- a/src/host/layer23/src/misc/app_cbch_sniff.c +++ b/src/host/layer23/src/misc/app_cbch_sniff.c @@ -134,8 +134,9 @@ static int rcv_rll(struct osmocom_ms *ms, struct msgb *msg) return 0; } -static int rcv_rsl(struct msgb *msg, struct osmocom_ms *ms) +static int rcv_rsl(struct msgb *msg, struct lapdm_entity *le, void *l3ctx) { + struct osmocom_ms *ms = l3ctx; struct abis_rsl_common_hdr *rslh = msgb_l2(msg); int rc = 0; diff --git a/src/host/layer23/src/misc/cell_log.c b/src/host/layer23/src/misc/cell_log.c index 3f51f870..ac0d2063 100644 --- a/src/host/layer23/src/misc/cell_log.c +++ b/src/host/layer23/src/misc/cell_log.c @@ -297,7 +297,7 @@ static void start_rach(void) start_timer(RACH_WAIT); - rslms_recvmsg(nmsg, ms); + lapdm_rslms_recvmsg(nmsg, &ms->lapdm_channel); } static void start_sync(void) @@ -757,8 +757,9 @@ static int rcv_cch(struct osmocom_ms *ms, struct msgb *msg) return 0; } -static int rcv_rsl(struct msgb *msg, struct osmocom_ms *ms) +static int rcv_rsl(struct msgb *msg, struct lapdm_entity *le, void *l3ctx) { + struct osmocom_ms *ms = l3ctx; struct abis_rsl_common_hdr *rslh = msgb_l2(msg); int rc = 0; diff --git a/src/host/layer23/src/misc/rslms.c b/src/host/layer23/src/misc/rslms.c index 93d22fd5..02113a38 100644 --- a/src/host/layer23/src/misc/rslms.c +++ b/src/host/layer23/src/misc/rslms.c @@ -44,7 +44,7 @@ int rslms_tx_rll_req(struct osmocom_ms *ms, uint8_t msg_type, msg = rsl_rll_simple(msg_type, chan_nr, link_id, 1); - return rslms_recvmsg(msg, ms); + return lapdm_rslms_recvmsg(msg, ms); } /* Send a RLL request (including L3 info) to L2 */ @@ -53,7 +53,7 @@ int rslms_tx_rll_req_l3(struct osmocom_ms *ms, uint8_t msg_type, { rsl_rll_push_l3(msg, msg_type, chan_nr, link_id, 1); - return rslms_recvmsg(msg, ms); + return lapdm_rslms_recvmsg(msg, ms); } static int rslms_rx_udata_ind(struct msgb *msg, struct osmocom_ms *ms) |