From ff117a8d1138d9629df543ed00e698ee3a0bdb73 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 23 May 2009 05:22:08 +0000 Subject: * rename the timer functions to avoid name collisions with libmisdn. * the return value of bsc_update_timers() is required for applications to find out if a timer was fired (Andreas Eversberg) --- include/openbsc/gsm_data.h | 2 +- include/openbsc/timer.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include/openbsc') diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h index 8ad127a16..4da9e3aa6 100644 --- a/include/openbsc/gsm_data.h +++ b/include/openbsc/gsm_data.h @@ -39,7 +39,7 @@ typedef int gsm_cbfn(unsigned int hooknum, #define LCHAN_RELEASE_TIMEOUT 4, 0 #define use_lchan(lchan) \ do { lchan->use_count++; \ - schedule_timer(&lchan->release_timer, LCHAN_RELEASE_TIMEOUT); } while(0); + bsc_schedule_timer(&lchan->release_timer, LCHAN_RELEASE_TIMEOUT); } while(0); #define put_lchan(lchan) \ do { lchan->use_count--; } while(0); diff --git a/include/openbsc/timer.h b/include/openbsc/timer.h index b3e809e79..ae67a5a1a 100644 --- a/include/openbsc/timer.h +++ b/include/openbsc/timer.h @@ -55,17 +55,17 @@ struct timer_list { /** * timer management */ -void add_timer(struct timer_list *timer); -void schedule_timer(struct timer_list *timer, int seconds, int microseconds); -void del_timer(struct timer_list *timer); -int timer_pending(struct timer_list *timer); +void bsc_add_timer(struct timer_list *timer); +void bsc_schedule_timer(struct timer_list *timer, int seconds, int microseconds); +void bsc_del_timer(struct timer_list *timer); +int bsc_timer_pending(struct timer_list *timer); /** * internal timer list management */ -struct timeval *nearest_timer(); -void prepare_timers(); -void update_timers(); +struct timeval *bsc_nearest_timer(); +void bsc_prepare_timers(); +int bsc_update_timers(); #endif -- cgit v1.2.3