diff options
| author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-15 14:23:02 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-15 14:39:30 +0200 |
| commit | d3ba2f6037dcf051a9235bca2b0145b3917300d9 (patch) | |
| tree | 97f9163304a026ab7690b4cd45c0cefde4efafde /src/host/layer23/src/misc | |
| parent | 6f9af5945e855dab4810641dc72eff6a24c30a77 (diff) | |
src: 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
Diffstat (limited to 'src/host/layer23/src/misc')
| -rw-r--r-- | src/host/layer23/src/misc/app_echo_test.c | 6 | ||||
| -rw-r--r-- | src/host/layer23/src/misc/bcch_scan.c | 4 | ||||
| -rw-r--r-- | src/host/layer23/src/misc/cell_log.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/host/layer23/src/misc/app_echo_test.c b/src/host/layer23/src/misc/app_echo_test.c index 0adab7f9..3d937d23 100644 --- a/src/host/layer23/src/misc/app_echo_test.c +++ b/src/host/layer23/src/misc/app_echo_test.c @@ -34,7 +34,7 @@ static struct { - struct timer_list timer; + struct osmo_timer_list timer; } test_data; static void test_tmr_cb(void *data) @@ -42,7 +42,7 @@ static void test_tmr_cb(void *data) struct osmocom_ms *ms = data; l1ctl_tx_echo_req(ms, 62); - bsc_schedule_timer(&test_data.timer, 1, 0); + osmo_timer_schedule(&test_data.timer, 1, 0); } int l23_app_init(struct osmocom_ms *ms) @@ -50,7 +50,7 @@ int l23_app_init(struct osmocom_ms *ms) test_data.timer.cb = &test_tmr_cb; test_data.timer.data = ms; - bsc_schedule_timer(&test_data.timer, 1, 0); + osmo_timer_schedule(&test_data.timer, 1, 0); return 0; } diff --git a/src/host/layer23/src/misc/bcch_scan.c b/src/host/layer23/src/misc/bcch_scan.c index 351da527..fc882541 100644 --- a/src/host/layer23/src/misc/bcch_scan.c +++ b/src/host/layer23/src/misc/bcch_scan.c @@ -105,7 +105,7 @@ struct full_power_scan { struct llist_head cell_list; struct cell_info *cur_cell; uint16_t cur_arfcn; - struct timer_list timer; + struct osmo_timer_list timer; }; static struct full_power_scan fps; @@ -164,7 +164,7 @@ static int _cinfo_start_arfcn(unsigned int band_arfcn) fps.cur_cell->band_arfcn = band_arfcn; /* FIXME: start timer in case we never get a sync */ fps.state = BSCAN_S_WAIT_DATA; - bsc_schedule_timer(&fps.timer, 2, 0); + osmo_timer_schedule(&fps.timer, 2, 0); return 0; } diff --git a/src/host/layer23/src/misc/cell_log.c b/src/host/layer23/src/misc/cell_log.c index 79800821..a1a764b0 100644 --- a/src/host/layer23/src/misc/cell_log.c +++ b/src/host/layer23/src/misc/cell_log.c @@ -71,7 +71,7 @@ static uint16_t band_range[][2] = {{0, 124}, {512, 885}, {955, 1023}, {0, 0}}; #define INFO_FLG_SI4 128 static struct osmocom_ms *ms; -static struct timer_list timer; +static struct osmo_timer_list timer; static struct pm_info { uint16_t flags; @@ -233,8 +233,8 @@ static void timeout_cb(void *arg) static void stop_timer(void) { - if (bsc_timer_pending(&timer)) - bsc_del_timer(&timer); + if (osmo_timer_pending(&timer)) + osmo_timer_del(&timer); } static void start_timer(int sec, int micro) @@ -242,7 +242,7 @@ static void start_timer(int sec, int micro) stop_timer(); timer.cb = timeout_cb; timer.data = ms; - bsc_schedule_timer(&timer, sec, micro); + osmo_timer_schedule(&timer, sec, micro); } static void start_rach(void) |