diff options
| author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-06 12:11:06 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-06 12:11:06 +0200 |
| commit | bf540cb7c3e8fbcb6bd978cc3876340812dbf142 (patch) | |
| tree | 97ef8c98516a99b217a9a64e16bbe5c295da0c7a /openbsc/src/ipaccess | |
| parent | 286ba0e68f0317c7e1d3d905101a1bc68a59d15f (diff) | |
src: use namespace prefix osmo_timer* for timer functions
Summary of changes:
s/struct timer_list/struct osmo_timer_list/g
s/bsc_add_timer/osmo_timer_add/g
s/bsc_schedule_timer/osmo_timer_schedule/g
s/bsc_del_timer/osmo_timer_del/g
s/bsc_timer_pending/osmo_timer_pending/g
s/bsc_nearest_timer/osmo_timers_nearest/g
s/bsc_prepare_timers/osmo_timers_prepare/g
s/bsc_update_timers/osmo_timers_update/g
s/bsc_timer_check/osmo_timers_check/g
Diffstat (limited to 'openbsc/src/ipaccess')
| -rw-r--r-- | openbsc/src/ipaccess/ipaccess-find.c | 6 | ||||
| -rw-r--r-- | openbsc/src/ipaccess/ipaccess-proxy.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/openbsc/src/ipaccess/ipaccess-find.c b/openbsc/src/ipaccess/ipaccess-find.c index 9335ec835..24f602e5c 100644 --- a/openbsc/src/ipaccess/ipaccess-find.c +++ b/openbsc/src/ipaccess/ipaccess-find.c @@ -152,7 +152,7 @@ static int bfd_cb(struct bsc_fd *bfd, unsigned int flags) return 0; } -static struct timer_list timer; +static struct osmo_timer_list timer; static void timer_cb(void *_data) { @@ -160,7 +160,7 @@ static void timer_cb(void *_data) bfd->when |= BSC_FD_WRITE; - bsc_schedule_timer(&timer, 5, 0); + osmo_timer_schedule(&timer, 5, 0); } int main(int argc, char **argv) @@ -192,7 +192,7 @@ int main(int argc, char **argv) timer.cb = timer_cb; timer.data = &bfd; - bsc_schedule_timer(&timer, 5, 0); + osmo_timer_schedule(&timer, 5, 0); printf("Trying to find ip.access BTS by broadcast UDP...\n"); diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c index bb4841c67..f40590a7e 100644 --- a/openbsc/src/ipaccess/ipaccess-proxy.c +++ b/openbsc/src/ipaccess/ipaccess-proxy.c @@ -57,7 +57,7 @@ struct ipa_proxy { /* list of BTS's (struct ipa_bts_conn */ struct llist_head bts_list; /* the BSC reconnect timer */ - struct timer_list reconn_timer; + struct osmo_timer_list reconn_timer; /* global GPRS NS data */ struct in_addr gprs_addr; struct in_addr listen_addr; @@ -657,7 +657,7 @@ static void reconn_tmr_cb(void *data) return; reschedule: - bsc_schedule_timer(&ipp->reconn_timer, 5, 0); + osmo_timer_schedule(&ipp->reconn_timer, 5, 0); } static void handle_dead_socket(struct bsc_fd *bfd) @@ -709,13 +709,13 @@ static void handle_dead_socket(struct bsc_fd *bfd) ipbc->bsc_oml_conn = NULL; bsc_conn = ipbc->oml_conn; /* start reconnect timer */ - bsc_schedule_timer(&ipp->reconn_timer, 5, 0); + osmo_timer_schedule(&ipp->reconn_timer, 5, 0); break; case RSL_TO_BSC: /* incoming RSL data from BSC, forward to BTS RSL */ ipbc->bsc_rsl_conn[trx_id] = NULL; bsc_conn = ipbc->rsl_conn[trx_id]; /* start reconnect timer */ - bsc_schedule_timer(&ipp->reconn_timer, 5, 0); + osmo_timer_schedule(&ipp->reconn_timer, 5, 0); break; default: bsc_conn = NULL; |