summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/osmocom/abis/e1_input.h8
-rw-r--r--src/e1_input.c9
2 files changed, 9 insertions, 8 deletions
diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h
index a7ac578..24af27a 100644
--- a/include/osmocom/abis/e1_input.h
+++ b/include/osmocom/abis/e1_input.h
@@ -172,11 +172,13 @@ e1inp_sign_link_create(struct e1inp_ts *ts, enum e1inp_sign_type type,
struct gsm_bts_trx *trx, uint8_t tei,
uint8_t sapi);
-/* configure and initialize one e1inp_ts */
+/* configure and initialize one signalling e1inp_ts */
int e1inp_ts_config_sign(struct e1inp_ts *ts, struct e1inp_line *line);
+
+/* configure and initialize one timeslot dedicated to TRAU frames. */
int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line,
- int (*subch_cb)(struct subch_demux *dmx, int ch,
- uint8_t *data, int len, void *_priv));
+ int (*trau_rcv_cb)(struct subch_demux *dmx, int ch,
+ uint8_t *data, int len, void *_priv));
/* Call from the Stack: configuration of this TS has changed */
int e1inp_update_ts(struct e1inp_ts *ts);
diff --git a/src/e1_input.c b/src/e1_input.c
index fb3d9a6..fcaada5 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -259,8 +259,8 @@ int abis_nm_sendmsg(struct msgb *msg)
/* Timeslot */
int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line,
- int (*subch_cb)(struct subch_demux *dmx, int ch,
- uint8_t *data, int len, void *_priv))
+ int (*trau_rcv_cb)(struct subch_demux *dmx, int ch,
+ uint8_t *data, int len, void *_priv))
{
if (ts->type == E1INP_TS_TYPE_TRAU && ts->line && line)
return 0;
@@ -269,7 +269,7 @@ int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line,
ts->line = line;
subchan_mux_init(&ts->trau.mux);
- ts->trau.demux.out_cb = subch_cb;
+ ts->trau.demux.out_cb = trau_rcv_cb;
ts->trau.demux.data = ts;
subch_demux_init(&ts->trau.demux);
return 0;
@@ -474,8 +474,7 @@ int e1inp_rx_ts(struct e1inp_ts *ts, struct msgb *msg,
ts->line->rx(msg, ts);
break;
case E1INP_TS_TYPE_TRAU:
- ts->line->rx(msg, ts);
-// ret = subch_demux_in(&ts->trau.demux, msg->l2h, msgb_l2len(msg));
+ ret = subch_demux_in(&ts->trau.demux, msg->l2h, msgb_l2len(msg));
break;
default:
ret = -EINVAL;