diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-02-11 18:59:31 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-02-13 15:49:24 +0100 |
| commit | 03cc8a810b944288aea7d49f8dba7d485a0f671f (patch) | |
| tree | 459e5c1b0f9c2d31efd518c3dcc7568191c44627 /openbsc/src | |
| parent | db44f6012dbb603281707c961d02f8b35e653eb6 (diff) | |
[RBS2000] Actually activate the RBS2000 support
The previous patch introduces new code for the RBS2000 but didn't
actually activate/call it yet.
After this patch, you can see LAPD being established and OM2000 messages
will fall into abis_nm.c (which of course has no clue about them).
Diffstat (limited to 'openbsc/src')
| -rw-r--r-- | openbsc/src/bsc_hack.c | 1 | ||||
| -rw-r--r-- | openbsc/src/bts_ericsson_rbs2000.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/openbsc/src/bsc_hack.c b/openbsc/src/bsc_hack.c index dacaad382..14e5d8674 100644 --- a/openbsc/src/bsc_hack.c +++ b/openbsc/src/bsc_hack.c @@ -237,6 +237,7 @@ int main(int argc, char **argv) bts_model_unknown_init(); bts_model_bs11_init(); bts_model_nanobts_init(); + bts_model_rbs2k_init(); e1inp_init(); diff --git a/openbsc/src/bts_ericsson_rbs2000.c b/openbsc/src/bts_ericsson_rbs2000.c index a0b5d970e..484dba611 100644 --- a/openbsc/src/bts_ericsson_rbs2000.c +++ b/openbsc/src/bts_ericsson_rbs2000.c @@ -77,7 +77,7 @@ static void sabm_timer_cb(void *_line) { struct e1inp_ts *e1i_ts = _line; - lapd_transmit_sabm(e1i_ts->driver.dahdi.lapd, 62, 62); + lapd_send_sabm(e1i_ts->driver.dahdi.lapd, 62, 62); bsc_schedule_timer(&sabm_timer, 0, 50); } @@ -93,12 +93,14 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal, switch (signal) { case S_INP_TEI_UP: + bsc_del_timer(&sabm_timer); switch (isd->link_type) { case E1INP_SIGN_OML: if (isd->trx->bts->type == GSM_BTS_TYPE_BS11) bootstrap_om_rbs2k(isd->trx->bts); break; } + break; case S_INP_LINE_INIT: /* Right now Ericsson RBS are only supported on DAHDI */ if (strcasecmp(isd->line->driver->name, "DAHDI")) |