diff options
| author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2017-05-08 20:57:52 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2017-05-10 11:21:24 +0200 |
| commit | 5121576b0c6c323ae5f92d8d987b8c0899d99db0 (patch) | |
| tree | c0157908247ea2f068fa942575753be416e43402 /openbsc/src/libbsc/bsc_rf_ctrl.c | |
| parent | 7b62d54b52457ecae649ead12e67369b3e09c235 (diff) | |
src: use osmo_timer_setup()
Use new function available in libosmocore to set up timers. Compile
tested only.
Change-Id: Ibcfd915688e97d370a888888a83a7c95cbe16819
Diffstat (limited to 'openbsc/src/libbsc/bsc_rf_ctrl.c')
| -rw-r--r-- | openbsc/src/libbsc/bsc_rf_ctrl.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/openbsc/src/libbsc/bsc_rf_ctrl.c b/openbsc/src/libbsc/bsc_rf_ctrl.c index d13c68546..b7b6fc819 100644 --- a/openbsc/src/libbsc/bsc_rf_ctrl.c +++ b/openbsc/src/libbsc/bsc_rf_ctrl.c @@ -266,8 +266,7 @@ static int enter_grace(struct osmo_bsc_rf *rf) return 0; } - rf->grace_timeout.cb = grace_timeout; - rf->grace_timeout.data = rf; + osmo_timer_setup(&rf->grace_timeout, grace_timeout, rf); osmo_timer_schedule(&rf->grace_timeout, rf->gsm_network->bsc_data->mid_call_timeout, 0); LOGP(DLINP, LOGL_NOTICE, "Going to switch RF off in %d seconds.\n", rf->gsm_network->bsc_data->mid_call_timeout); @@ -514,15 +513,12 @@ struct osmo_bsc_rf *osmo_bsc_rf_create(const char *path, struct gsm_network *net rf->last_rf_lock_ctrl_command = talloc_strdup(rf, ""); /* check the rf state */ - rf->rf_check.data = rf; - rf->rf_check.cb = rf_check_cb; + osmo_timer_setup(&rf->rf_check, rf_check_cb, rf); /* delay cmd handling */ - rf->delay_cmd.data = rf; - rf->delay_cmd.cb = rf_delay_cmd_cb; + osmo_timer_setup(&rf->delay_cmd, rf_delay_cmd_cb, rf); - rf->auto_off_timer.data = rf; - rf->auto_off_timer.cb = rf_auto_off_cb; + osmo_timer_setup(&rf->auto_off_timer, rf_auto_off_cb, rf); /* listen to RF signals */ osmo_signal_register_handler(SS_MSC, msc_signal_handler, net); |