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
diff --git a/openbsc/src/libgb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c
index 95e5a55..1c3c1b6 100644
--- a/openbsc/src/libgb/gprs_ns.c
+++ b/openbsc/src/libgb/gprs_ns.c
@@ -166,8 +166,8 @@
void nsvc_delete(struct gprs_nsvc *nsvc)
{
- if (bsc_timer_pending(&nsvc->timer))
- bsc_del_timer(&nsvc->timer);
+ if (osmo_timer_pending(&nsvc->timer))
+ osmo_timer_del(&nsvc->timer);
llist_del(&nsvc->list);
talloc_free(nsvc);
}
@@ -405,11 +405,11 @@
nsvc->nsei, get_value_string(timer_mode_strs, mode),
seconds);
- if (bsc_timer_pending(&nsvc->timer))
- bsc_del_timer(&nsvc->timer);
+ if (osmo_timer_pending(&nsvc->timer))
+ osmo_timer_del(&nsvc->timer);
nsvc->timer_mode = mode;
- bsc_schedule_timer(&nsvc->timer, seconds, 0);
+ osmo_timer_schedule(&nsvc->timer, seconds, 0);
}
static void gprs_ns_timer_cb(void *data)
@@ -786,7 +786,7 @@
rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_BLOCKED]);
if (nsvc->persistent || nsvc->remote_end_is_sgsn) {
/* stop RESET timer */
- bsc_del_timer(&nsvc->timer);
+ osmo_timer_del(&nsvc->timer);
}
/* Initiate TEST proc.: Send ALIVE and start timer */
rc = gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE);