diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-05-22 20:26:58 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-05-22 20:26:58 +0200 |
| commit | 8a183fb4235cdd51b660380f7e05de40713bdfa8 (patch) | |
| tree | ead8f542ec53421d5109c5239303bef6ce8e65d1 /src/common/bts.c | |
| parent | 430f35194d1f0ed01f53bea6a8611ca0dae30065 (diff) | |
[partial] port to new libosmocore-0.3 APIs
Diffstat (limited to 'src/common/bts.c')
| -rw-r--r-- | src/common/bts.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/common/bts.c b/src/common/bts.c index ff23bdde..1c912f03 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -24,11 +24,11 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <osmocore/select.h> -#include <osmocore/timer.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/protocol/gsm_12_21.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmo-bts/logging.h> //#include <osmocom/bb/common/osmocom_data.h> //#include <osmocom/bb/common/l1l2_interface.h> @@ -259,8 +259,8 @@ void destroy_bts(struct osmocom_bts *bts) struct osmobts_ms, entry); destroy_ms(ms); } - if (bsc_timer_pending(&bts->trx[i]->si.timer)) - bsc_del_timer(&bts->trx[i]->si.timer); + if (osmo_timer_pending(&bts->trx[i]->si.timer)) + osmo_timer_del(&bts->trx[i]->si.timer); talloc_free(bts->trx[i]); bts->trx[i] = NULL; } @@ -332,7 +332,7 @@ void bts_new_si(void *arg) struct osmobts_trx *trx = arg; int i; - if (bsc_timer_pending(&trx->si.timer)) + if (osmo_timer_pending(&trx->si.timer)) return; i = 0; @@ -353,7 +353,7 @@ void bts_new_si(void *arg) /* delay until next SI */ trx->si.timer.cb = bts_new_si; trx->si.timer.data = trx; - bsc_schedule_timer(&trx->si.timer, 0, 200000); + osmo_timer_schedule(&trx->si.timer, 0, 200000); } /* handle bts instance (including MS instances) */ |