diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-05-22 12:36:55 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-05-22 12:36:55 +0200 |
| commit | 308f9e506e6ae2f30a4b49895f80aa26605e50c0 (patch) | |
| tree | a88bdc521c92de44dbe78fdde8f415c6b625637c /src/host/layer23/src/common/l1ctl.c | |
| parent | 8226b8eae946c70bb7d23730029146f2cd320ad8 (diff) | |
layer23: update to new GSMTAP API in libosmocore >= 0.3.1
Diffstat (limited to 'src/host/layer23/src/common/l1ctl.c')
| -rw-r--r-- | src/host/layer23/src/common/l1ctl.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 2482c615..8c922442 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -47,6 +47,8 @@ #include <osmocom/bb/common/lapdm.h> #include <osmocom/bb/common/logging.h> +extern struct gsmtap_inst *gsmtap_inst; + static struct msgb *osmo_l1_alloc(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -214,9 +216,9 @@ printf("Dropping frame with %u bit errors\n", dl->num_biterr); /* send CCCH data via GSMTAP */ gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, dl->link_id); - gsmtap_sendmsg(ntohs(dl->band_arfcn), chan_ts, gsmtap_chan_type, chan_ss, - tm.fn, dl->rx_level-110, dl->snr, ccch->data, - sizeof(ccch->data)); + gsmtap_send(gsmtap_inst, ntohs(dl->band_arfcn), chan_ts, + gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, + dl->snr, ccch->data, sizeof(ccch->data)); /* determine LAPDm entity based on SACCH or not */ if (dl->link_id & 0x40) @@ -280,8 +282,8 @@ int l1ctl_tx_data_req(struct osmocom_ms *ms, struct msgb *msg, /* send copy via GSMTAP */ rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, link_id); - gsmtap_sendmsg(0|0x4000, chan_ts, gsmtap_chan_type, chan_ss, - 0, 127, 255, msg->l2h, msgb_l2len(msg)); + gsmtap_send(gsmtap_inst, 0|0x4000, chan_ts, gsmtap_chan_type, + chan_ss, 0, 127, 255, msg->l2h, msgb_l2len(msg)); /* prepend uplink info header */ l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); |