diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-07-28 00:22:17 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-08-10 10:51:01 +0200 |
| commit | c8755af8a526dbc95e31fa38547bc42a10f44971 (patch) | |
| tree | 7c22b49bd0bc063c510bb3540dd9b42d9b78d56d | |
| parent | 9d2f377927856a55c5e8e1077f82de40723acdbd (diff) | |
NOKIA: Move more static variables into 'struct gsm_bts'
| -rw-r--r-- | openbsc/include/openbsc/gsm_data_shared.h | 7 | ||||
| -rw-r--r-- | openbsc/src/libbsc/bts_nokia_site.c | 23 |
2 files changed, 16 insertions, 14 deletions
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index b9829222f..e3ab5f483 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -488,6 +488,13 @@ struct gsm_bts { struct { unsigned long serno; } hsl; + struct { + uint8_t bts_type; + int configured:1, + do_reset:1, + wait_reset:1; + struct osmo_timer_list reset_timer; + } nokia; }; /* Not entirely sure how ip.access specific this is */ diff --git a/openbsc/src/libbsc/bts_nokia_site.c b/openbsc/src/libbsc/bts_nokia_site.c index 6cafaae1c..30e590043 100644 --- a/openbsc/src/libbsc/bts_nokia_site.c +++ b/openbsc/src/libbsc/bts_nokia_site.c @@ -42,11 +42,6 @@ /* TODO: put in a separate file ? */ -/* TODO: move statics to BTS context */ -static int do_reset = 1; -/*static*/ int wait_reset = 0; -struct osmo_timer_list reset_timer; /* timer to re-start after reset */ - #define RESET_INTERVAL 0, 3000000 /* 3 seconds */ extern int abis_nm_sendmsg(struct gsm_bts *bts, struct msgb *msg); @@ -62,7 +57,7 @@ static void bootstrap_om_bts(struct gsm_bts *bts) { LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for BTS %u\n", bts->nr); - if (do_reset) + if (bts->nokia.do_reset) abis_nm_reset(bts, 1); } @@ -1686,7 +1681,7 @@ static void reset_timer_cb(void *_bts) struct gsm_e1_subslot *e1_link = &bts->oml_e1_link; struct e1inp_line *line; - wait_reset = 0; + bts->nokia.wait_reset = 0; /* OML link */ line = e1inp_line_get(e1_link->e1_nr); @@ -1730,7 +1725,7 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb) int str_len; int len_data; - if (wait_reset) { + if (bts->nokia.wait_reset) { LOGP(DNM, LOGL_INFO, "Ignore message while waiting for reset\n"); return ret; @@ -1786,8 +1781,8 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb) /* TODO: the assumption for the following is that no NACK was received */ /* ACK for reset message ? */ - if (do_reset != 0) { - do_reset = 0; + if (bts->nokia.do_reset != 0) { + bts->nokia.do_reset = 0; /* TODO: For the InSite processing the received data is @@ -1798,11 +1793,11 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb) (function handle_ts1_read()) and ignoring the received data. It seems to be necessary for the MetroSite too. */ - wait_reset = 1; + bts->nokia.wait_reset = 1; - reset_timer.cb = &reset_timer_cb; - reset_timer.data = bts; - osmo_timer_schedule(&reset_timer, RESET_INTERVAL); + bts->nokia.reset_timer.cb = &reset_timer_cb; + bts->nokia.reset_timer.data = bts; + osmo_timer_schedule(&bts->nokia.reset_timer, RESET_INTERVAL); struct gsm_e1_subslot *e1_link = &bts->oml_e1_link; struct e1inp_line *line; |