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/libbsc/bsc_msc.c | |
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/libbsc/bsc_msc.c')
-rw-r--r-- | openbsc/src/libbsc/bsc_msc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsc/src/libbsc/bsc_msc.c b/openbsc/src/libbsc/bsc_msc.c index 8eef6f4e6..f4eee9ca5 100644 --- a/openbsc/src/libbsc/bsc_msc.c +++ b/openbsc/src/libbsc/bsc_msc.c @@ -77,7 +77,7 @@ static int msc_connection_connect(struct bsc_fd *fd, unsigned int what) con = container_of(queue, struct bsc_msc_connection, write_queue); /* From here on we will either be connected or reconnect */ - bsc_del_timer(&con->timeout_timer); + osmo_timer_del(&con->timeout_timer); /* check the socket state */ rc = getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &val, &len); @@ -184,7 +184,7 @@ int bsc_msc_connect(struct bsc_msc_connection *con) fd->cb = msc_connection_connect; con->timeout_timer.cb = msc_con_timeout; con->timeout_timer.data = con; - bsc_schedule_timer(&con->timeout_timer, 20, 0); + osmo_timer_schedule(&con->timeout_timer, 20, 0); } else if (ret < 0) { perror("Connection failed"); connection_loss(con); @@ -226,7 +226,7 @@ struct bsc_msc_connection *bsc_msc_create(void *ctx, struct llist_head *dests) void bsc_msc_lost(struct bsc_msc_connection *con) { write_queue_clear(&con->write_queue); - bsc_del_timer(&con->timeout_timer); + osmo_timer_del(&con->timeout_timer); if (con->write_queue.bfd.fd >= 0) bsc_unregister_fd(&con->write_queue.bfd); @@ -246,7 +246,7 @@ void bsc_msc_schedule_connect(struct bsc_msc_connection *con) LOGP(DMSC, LOGL_NOTICE, "Attempting to reconnect to the MSC.\n"); con->reconnect_timer.cb = reconnect_msc; con->reconnect_timer.data = con; - bsc_schedule_timer(&con->reconnect_timer, 5, 0); + osmo_timer_schedule(&con->reconnect_timer, 5, 0); } struct msgb *bsc_msc_id_get_resp(const char *token) |