diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-01-14 15:55:42 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-02-11 16:26:31 +0100 |
| commit | f338a03b0cc85ca20bfe8e1ebe3b98e86bcef3c1 (patch) | |
| tree | 687ce70060164c999855bdf734a08c91a6c5b5f1 /openbsc/src/input/ipaccess.c | |
| parent | f3956cbb20ce92c3df20169a8a3c625759290696 (diff) | |
[BSC] Move the BTS-type specific code from bcs_init.c to bts_*.c
bsc_init.c was a big mess even only for two supported BTS models,
so before adding more BTS types, this needs a cleanup.
All the BTS specific code from bsc_init.c has now moved into
bts_{siemens_bs11,ipaccess_nanobts}.c
This has required that input_event() and nm_state_event() get both
converted to proper libosmocore signals instead of referencing external
symbols.
Diffstat (limited to 'openbsc/src/input/ipaccess.c')
| -rw-r--r-- | openbsc/src/input/ipaccess.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openbsc/src/input/ipaccess.c b/openbsc/src/input/ipaccess.c index e7098dcaf..dcf8d1a53 100644 --- a/openbsc/src/input/ipaccess.c +++ b/openbsc/src/input/ipaccess.c @@ -36,6 +36,7 @@ #include <osmocore/select.h> #include <osmocore/tlv.h> #include <osmocore/msgb.h> +#include <osmocore/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> @@ -44,7 +45,7 @@ #include <openbsc/e1_input.h> #include <openbsc/ipaccess.h> #include <openbsc/socket.h> -#include <osmocore/talloc.h> +#include <openbsc/signal.h> #define PRIV_OML 1 #define PRIV_RSL 2 @@ -367,7 +368,7 @@ int ipaccess_drop_oml(struct gsm_bts *bts) /* send OML down */ ts = bts->oml_link->ts; line = ts->line; - e1inp_event(ts, EVT_E1_TEI_DN, bts->oml_link->tei, bts->oml_link->sapi); + e1inp_event(ts, S_INP_TEI_DN, bts->oml_link->tei, bts->oml_link->sapi); bfd = &ts->driver.ipaccess.fd; bsc_unregister_fd(bfd); @@ -436,7 +437,7 @@ int ipaccess_drop_rsl(struct gsm_bts_trx *trx) /* send RSL down */ ts = trx->rsl_link->ts; - e1inp_event(ts, EVT_E1_TEI_DN, trx->rsl_link->tei, trx->rsl_link->sapi); + e1inp_event(ts, S_INP_TEI_DN, trx->rsl_link->tei, trx->rsl_link->sapi); /* close the socket */ bfd = &ts->driver.ipaccess.fd; @@ -499,14 +500,14 @@ static int handle_ts1_read(struct bsc_fd *bfd) switch (link->type) { case E1INP_SIGN_RSL: if (!(msg->trx->bts->ip_access.flags & (RSL_UP << msg->trx->nr))) { - e1inp_event(e1i_ts, EVT_E1_TEI_UP, link->tei, link->sapi); + e1inp_event(e1i_ts, S_INP_TEI_UP, link->tei, link->sapi); msg->trx->bts->ip_access.flags |= (RSL_UP << msg->trx->nr); } ret = abis_rsl_rcvmsg(msg); break; case E1INP_SIGN_OML: if (!(msg->trx->bts->ip_access.flags & OML_UP)) { - e1inp_event(e1i_ts, EVT_E1_TEI_UP, link->tei, link->sapi); + e1inp_event(e1i_ts, S_INP_TEI_UP, link->tei, link->sapi); msg->trx->bts->ip_access.flags |= OML_UP; } ret = abis_nm_rcvmsg(msg); |