aboutsummaryrefslogtreecommitdiffstats
path: root/include/openbsc
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2009-05-23 05:22:08 +0000
committerHarald Welte <laforge@gnumonks.org>2009-05-23 05:22:08 +0000
commitff117a8d1138d9629df543ed00e698ee3a0bdb73 (patch)
tree6e27b6ebaa4229d8cea5adb8ab8025f96cd3229c /include/openbsc
parentd6cab81175ec6afe5708ade7557d35330c0cb973 (diff)
* 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)
Diffstat (limited to 'include/openbsc')
-rw-r--r--include/openbsc/gsm_data.h2
-rw-r--r--include/openbsc/timer.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h
index 8ad127a1..4da9e3aa 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 b3e809e7..ae67a5a1 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