From 0b21c1c8850d7f33f55d9399d14055a7cdda3614 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 7 May 2011 12:42:28 +0200 Subject: timer: use namespace prefix osmo_timer* 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 --- tests/timer/timer_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/timer/timer_test.c') diff --git a/tests/timer/timer_test.c b/tests/timer/timer_test.c index 30b08ad0..69bcad92 100644 --- a/tests/timer/timer_test.c +++ b/tests/timer/timer_test.c @@ -27,17 +27,17 @@ static void timer_fired(void *data); -static struct timer_list timer_one = { +static struct osmo_timer_list timer_one = { .cb = timer_fired, .data = (void*)1, }; -static struct timer_list timer_two = { +static struct osmo_timer_list timer_two = { .cb = timer_fired, .data = (void*)2, }; -static struct timer_list timer_three = { +static struct osmo_timer_list timer_three = { .cb = timer_fired, .data = (void*)3, }; @@ -48,8 +48,8 @@ static void timer_fired(void *_data) printf("Fired timer: %lu\n", data); if (data == 1) { - bsc_schedule_timer(&timer_one, 3, 0); - bsc_del_timer(&timer_two); + osmo_timer_schedule(&timer_one, 3, 0); + osmo_timer_del(&timer_two); } else if (data == 2) { printf("Should not be fired... bug in del_timer\n"); } else if (data == 3) { @@ -63,9 +63,9 @@ int main(int argc, char** argv) { printf("Starting... timer\n"); - bsc_schedule_timer(&timer_one, 3, 0); - bsc_schedule_timer(&timer_two, 5, 0); - bsc_schedule_timer(&timer_three, 4, 0); + osmo_timer_schedule(&timer_one, 3, 0); + osmo_timer_schedule(&timer_two, 5, 0); + osmo_timer_schedule(&timer_three, 4, 0); #ifdef HAVE_SYS_SELECT_H while (1) { -- cgit v1.2.3