diff options
Diffstat (limited to 'openbsc/src/libbsc/bts_ericsson_rbs2000.c')
-rw-r--r-- | openbsc/src/libbsc/bts_ericsson_rbs2000.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/openbsc/src/libbsc/bts_ericsson_rbs2000.c b/openbsc/src/libbsc/bts_ericsson_rbs2000.c index 9c98a9fef..28e7df4cc 100644 --- a/openbsc/src/libbsc/bts_ericsson_rbs2000.c +++ b/openbsc/src/libbsc/bts_ericsson_rbs2000.c @@ -26,10 +26,10 @@ #include <openbsc/gsm_data.h> #include <openbsc/abis_om2000.h> #include <openbsc/abis_nm.h> -#include <openbsc/e1_input.h> +#include <osmocom/abis/e1_input.h> #include <openbsc/signal.h> -#include "../libabis/input/lapd.h" +#include <osmocom/abis/lapd.h> static void bootstrap_om_bts(struct gsm_bts *bts) { @@ -83,7 +83,7 @@ static int gbl_sig_cb(unsigned int subsys, unsigned int signal, { struct gsm_bts *bts; - if (subsys != SS_GLOBAL) + if (subsys != SS_L_GLOBAL) return 0; switch (signal) { @@ -103,11 +103,11 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal, { struct input_signal_data *isd = signal_data; - if (subsys != SS_INPUT) + if (subsys != SS_L_INPUT) return 0; switch (signal) { - case S_INP_TEI_UP: + case S_L_INP_TEI_UP: switch (isd->link_type) { case E1INP_SIGN_OML: if (isd->trx->bts->type != GSM_BTS_TYPE_RBS2000) @@ -119,18 +119,18 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal, break; } break; - case S_INP_LINE_INIT: + case S_L_INP_LINE_INIT: /* Right now Ericsson RBS are only supported on DAHDI */ if (strcasecmp(isd->line->driver->name, "DAHDI")) break; start_sabm_in_line(isd->line, 1); break; - case S_INP_LINE_ALARM: + case S_L_INP_LINE_ALARM: if (strcasecmp(isd->line->driver->name, "DAHDI")) break; start_sabm_in_line(isd->line, 0); break; - case S_INP_LINE_NOALARM: + case S_L_INP_LINE_NOALARM: if (strcasecmp(isd->line->driver->name, "DAHDI")) break; start_sabm_in_line(isd->line, 1); @@ -244,12 +244,18 @@ static void config_write_bts(struct vty *vty, struct gsm_bts *bts) static int bts_model_rbs2k_start(struct gsm_network *net); +static void bts_model_rbs2k_e1line_bind_ops(struct e1inp_line *line) +{ + e1inp_line_bind_ops(line, &bts_isdn_e1inp_line_ops); +} + static struct gsm_bts_model model_rbs2k = { .type = GSM_BTS_TYPE_RBS2000, .name = "rbs2000", .start = bts_model_rbs2k_start, .oml_rcvmsg = &abis_om2k_rcvmsg, .config_write_bts = &config_write_bts, + .e1line_bind_ops = &bts_model_rbs2k_e1line_bind_ops, }; static int bts_model_rbs2k_start(struct gsm_network *net) @@ -260,8 +266,8 @@ static int bts_model_rbs2k_start(struct gsm_network *net) gsm_btsmodel_set_feature(&model_rbs2k, BTS_FEAT_HOPPING); gsm_btsmodel_set_feature(&model_rbs2k, BTS_FEAT_HSCSD); - osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL); - osmo_signal_register_handler(SS_GLOBAL, gbl_sig_cb, NULL); + osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL); + osmo_signal_register_handler(SS_L_GLOBAL, gbl_sig_cb, NULL); osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); return 0; |