summaryrefslogtreecommitdiffstats
path: root/src/host/layer23/src/mobile
diff options
context:
space:
mode:
Diffstat (limited to 'src/host/layer23/src/mobile')
-rw-r--r--src/host/layer23/src/mobile/gsm322.c12
-rw-r--r--src/host/layer23/src/mobile/gsm48_cc.c6
-rw-r--r--src/host/layer23/src/mobile/gsm48_mm.c48
-rw-r--r--src/host/layer23/src/mobile/gsm48_rr.c50
-rw-r--r--src/host/layer23/src/mobile/mnccms.c6
5 files changed, 61 insertions, 61 deletions
diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c
index c05469d6..2bd4f9c7 100644
--- a/src/host/layer23/src/mobile/gsm322.c
+++ b/src/host/layer23/src/mobile/gsm322.c
@@ -426,15 +426,15 @@ static void start_plmn_timer(struct gsm322_plmn *plmn, int secs)
secs / 60);
plmn->timer.cb = plmn_timer_timeout;
plmn->timer.data = plmn;
- bsc_schedule_timer(&plmn->timer, secs, 0);
+ osmo_timer_schedule(&plmn->timer, secs, 0);
}
/* stop plmn search timer */
static void stop_plmn_timer(struct gsm322_plmn *plmn)
{
- if (bsc_timer_pending(&plmn->timer)) {
+ if (osmo_timer_pending(&plmn->timer)) {
LOGP(DPLMN, LOGL_INFO, "Stopping pending timer.\n");
- bsc_del_timer(&plmn->timer);
+ osmo_timer_del(&plmn->timer);
}
}
@@ -444,15 +444,15 @@ void start_cs_timer(struct gsm322_cellsel *cs, int sec, int micro)
LOGP(DCS, LOGL_DEBUG, "Starting CS timer with %d seconds.\n", sec);
cs->timer.cb = gsm322_cs_timeout;
cs->timer.data = cs;
- bsc_schedule_timer(&cs->timer, sec, micro);
+ osmo_timer_schedule(&cs->timer, sec, micro);
}
/* stop cell selection timer */
static void stop_cs_timer(struct gsm322_cellsel *cs)
{
- if (bsc_timer_pending(&cs->timer)) {
+ if (osmo_timer_pending(&cs->timer)) {
LOGP(DCS, LOGL_DEBUG, "stopping pending CS timer.\n");
- bsc_del_timer(&cs->timer);
+ osmo_timer_del(&cs->timer);
}
}
diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c
index b8812056..5abf3f8e 100644
--- a/src/host/layer23/src/mobile/gsm48_cc.c
+++ b/src/host/layer23/src/mobile/gsm48_cc.c
@@ -338,17 +338,17 @@ static void gsm48_start_cc_timer(struct gsm_trans *trans, int current,
sec);
trans->cc.timer.cb = gsm48_cc_timeout;
trans->cc.timer.data = trans;
- bsc_schedule_timer(&trans->cc.timer, sec, micro);
+ osmo_timer_schedule(&trans->cc.timer, sec, micro);
trans->cc.Tcurrent = current;
}
/* stop various timers */
static void gsm48_stop_cc_timer(struct gsm_trans *trans)
{
- if (bsc_timer_pending(&trans->cc.timer)) {
+ if (osmo_timer_pending(&trans->cc.timer)) {
LOGP(DCC, LOGL_INFO, "stopping pending timer T%x\n",
trans->cc.Tcurrent);
- bsc_del_timer(&trans->cc.timer);
+ osmo_timer_del(&trans->cc.timer);
trans->cc.Tcurrent = 0;
}
}
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c
index bf5bbc24..140750aa 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -382,7 +382,7 @@ static void start_mm_t3210(struct gsm48_mmlayer *mm)
"seconds\n", GSM_T3210_MS);
mm->t3210.cb = timeout_mm_t3210;
mm->t3210.data = mm;
- bsc_schedule_timer(&mm->t3210, GSM_T3210_MS);
+ osmo_timer_schedule(&mm->t3210, GSM_T3210_MS);
}
static void start_mm_t3211(struct gsm48_mmlayer *mm)
@@ -391,7 +391,7 @@ static void start_mm_t3211(struct gsm48_mmlayer *mm)
"%d.%d seconds\n", GSM_T3211_MS);
mm->t3211.cb = timeout_mm_t3211;
mm->t3211.data = mm;
- bsc_schedule_timer(&mm->t3211, GSM_T3211_MS);
+ osmo_timer_schedule(&mm->t3211, GSM_T3211_MS);
}
static void start_mm_t3212(struct gsm48_mmlayer *mm, int sec)
@@ -404,7 +404,7 @@ static void start_mm_t3212(struct gsm48_mmlayer *mm, int sec)
"%d seconds\n", sec);
mm->t3212.cb = timeout_mm_t3212;
mm->t3212.data = mm;
- bsc_schedule_timer(&mm->t3212, sec, 0);
+ osmo_timer_schedule(&mm->t3212, sec, 0);
}
static void start_mm_t3213(struct gsm48_mmlayer *mm)
@@ -413,7 +413,7 @@ static void start_mm_t3213(struct gsm48_mmlayer *mm)
"%d.%d seconds\n", GSM_T3213_MS);
mm->t3213.cb = timeout_mm_t3213;
mm->t3213.data = mm;
- bsc_schedule_timer(&mm->t3213, GSM_T3213_MS);
+ osmo_timer_schedule(&mm->t3213, GSM_T3213_MS);
}
static void start_mm_t3220(struct gsm48_mmlayer *mm)
@@ -422,7 +422,7 @@ static void start_mm_t3220(struct gsm48_mmlayer *mm)
"%d.%d seconds\n", GSM_T3220_MS);
mm->t3220.cb = timeout_mm_t3220;
mm->t3220.data = mm;
- bsc_schedule_timer(&mm->t3220, GSM_T3220_MS);
+ osmo_timer_schedule(&mm->t3220, GSM_T3220_MS);
}
static void start_mm_t3230(struct gsm48_mmlayer *mm)
@@ -431,7 +431,7 @@ static void start_mm_t3230(struct gsm48_mmlayer *mm)
"%d.%d seconds\n", GSM_T3230_MS);
mm->t3230.cb = timeout_mm_t3230;
mm->t3230.data = mm;
- bsc_schedule_timer(&mm->t3230, GSM_T3230_MS);
+ osmo_timer_schedule(&mm->t3230, GSM_T3230_MS);
}
static void start_mm_t3240(struct gsm48_mmlayer *mm)
@@ -440,69 +440,69 @@ static void start_mm_t3240(struct gsm48_mmlayer *mm)
"seconds\n", GSM_T3240_MS);
mm->t3240.cb = timeout_mm_t3240;
mm->t3240.data = mm;
- bsc_schedule_timer(&mm->t3240, GSM_T3240_MS);
+ osmo_timer_schedule(&mm->t3240, GSM_T3240_MS);
}
static void stop_mm_t3210(struct gsm48_mmlayer *mm)
{
- if (bsc_timer_pending(&mm->t3210)) {
+ if (osmo_timer_pending(&mm->t3210)) {
LOGP(DMM, LOGL_INFO, "stopping pending (loc. upd. timeout) "
"timer T3210\n");
- bsc_del_timer(&mm->t3210);
+ osmo_timer_del(&mm->t3210);
}
}
static void stop_mm_t3211(struct gsm48_mmlayer *mm)
{
- if (bsc_timer_pending(&mm->t3211)) {
+ if (osmo_timer_pending(&mm->t3211)) {
LOGP(DMM, LOGL_INFO, "stopping pending (loc. upd. retry "
"delay) timer T3211\n");
- bsc_del_timer(&mm->t3211);
+ osmo_timer_del(&mm->t3211);
}
}
static void stop_mm_t3212(struct gsm48_mmlayer *mm)
{
- if (bsc_timer_pending(&mm->t3212)) {
+ if (osmo_timer_pending(&mm->t3212)) {
LOGP(DMM, LOGL_INFO, "stopping pending (periodic loc. upd. "
"delay) timer T3212\n");
- bsc_del_timer(&mm->t3212);
+ osmo_timer_del(&mm->t3212);
}
}
static void stop_mm_t3213(struct gsm48_mmlayer *mm)
{
- if (bsc_timer_pending(&mm->t3213)) {
+ if (osmo_timer_pending(&mm->t3213)) {
LOGP(DMM, LOGL_INFO, "stopping pending (delay after RA "
"failure) timer T3213\n");
- bsc_del_timer(&mm->t3213);
+ osmo_timer_del(&mm->t3213);
}
}
static void stop_mm_t3220(struct gsm48_mmlayer *mm)
{
- if (bsc_timer_pending(&mm->t3220)) {
+ if (osmo_timer_pending(&mm->t3220)) {
LOGP(DMM, LOGL_INFO, "stopping pending (IMSI detach keepalive) "
"timer T3220\n");
- bsc_del_timer(&mm->t3220);
+ osmo_timer_del(&mm->t3220);
}
}
static void stop_mm_t3230(struct gsm48_mmlayer *mm)
{
- if (bsc_timer_pending(&mm->t3230)) {
+ if (osmo_timer_pending(&mm->t3230)) {
LOGP(DMM, LOGL_INFO, "stopping pending (MM connection timeout) "
"timer T3230\n");
- bsc_del_timer(&mm->t3230);
+ osmo_timer_del(&mm->t3230);
}
}
static void stop_mm_t3240(struct gsm48_mmlayer *mm)
{
- if (bsc_timer_pending(&mm->t3240)) {
+ if (osmo_timer_pending(&mm->t3240)) {
LOGP(DMM, LOGL_INFO, "stopping pending (RR release timeout) "
"timer T3240\n");
- bsc_del_timer(&mm->t3240);
+ osmo_timer_del(&mm->t3240);
}
}
@@ -920,7 +920,7 @@ static void new_mm_state(struct gsm48_mmlayer *mm, int state, int substate)
&& (substate == GSM48_MM_SST_NORMAL_SERVICE
|| substate == GSM48_MM_SST_ATTEMPT_UPDATE)) {
/* start periodic location update timer */
- if (!bsc_timer_pending(&mm->t3212))
+ if (!osmo_timer_pending(&mm->t3212))
start_mm_t3212(mm, mm->t3212_value);
/* perform pending location update */
if (mm->lupd_retry) {
@@ -1954,7 +1954,7 @@ static int gsm48_mm_sysinfo(struct osmocom_ms *ms, struct msgb *msg)
/* new periodic location update timer timeout */
if (s->t3212 && s->t3212 != mm->t3212_value) {
- if (bsc_timer_pending(&mm->t3212)) {
+ if (osmo_timer_pending(&mm->t3212)) {
int t;
struct timeval current_time;
@@ -3865,7 +3865,7 @@ static int gsm48_mm_data_ind(struct osmocom_ms *ms, struct msgb *msg)
stop_mm_t3212(mm); /* 4.4.2 */
/* 11.2 re-start pending RR release timer */
- if (bsc_timer_pending(&mm->t3240)) {
+ if (osmo_timer_pending(&mm->t3240)) {
stop_mm_t3240(mm);
start_mm_t3240(mm);
}
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c
index b2ab2e1d..c1c27f42 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -711,7 +711,7 @@ static void start_rr_t_meas(struct gsm48_rrlayer *rr, int sec, int micro)
{
rr->t_meas.cb = timeout_rr_meas;
rr->t_meas.data = rr;
- bsc_schedule_timer(&rr->t_meas, sec, micro);
+ osmo_timer_schedule(&rr->t_meas, sec, micro);
}
static void start_rr_t_rel_wait(struct gsm48_rrlayer *rr, int sec, int micro)
@@ -720,7 +720,7 @@ static void start_rr_t_rel_wait(struct gsm48_rrlayer *rr, int sec, int micro)
micro / 1000);
rr->t_rel_wait.cb = timeout_rr_t_rel_wait;
rr->t_rel_wait.data = rr;
- bsc_schedule_timer(&rr->t_rel_wait, sec, micro);
+ osmo_timer_schedule(&rr->t_rel_wait, sec, micro);
}
static void start_rr_t_starting(struct gsm48_rrlayer *rr, int sec, int micro)
@@ -729,7 +729,7 @@ static void start_rr_t_starting(struct gsm48_rrlayer *rr, int sec, int micro)
micro / 1000);
rr->t_starting.cb = timeout_rr_t_starting;
rr->t_starting.data = rr;
- bsc_schedule_timer(&rr->t_starting, sec, micro);
+ osmo_timer_schedule(&rr->t_starting, sec, micro);
}
static void start_rr_t3110(struct gsm48_rrlayer *rr, int sec, int micro)
@@ -738,7 +738,7 @@ static void start_rr_t3110(struct gsm48_rrlayer *rr, int sec, int micro)
micro / 1000);
rr->t3110.cb = timeout_rr_t3110;
rr->t3110.data = rr;
- bsc_schedule_timer(&rr->t3110, sec, micro);
+ osmo_timer_schedule(&rr->t3110, sec, micro);
}
static void start_rr_t3122(struct gsm48_rrlayer *rr, int sec, int micro)
@@ -747,7 +747,7 @@ static void start_rr_t3122(struct gsm48_rrlayer *rr, int sec, int micro)
micro / 1000);
rr->t3122.cb = timeout_rr_t3122;
rr->t3122.data = rr;
- bsc_schedule_timer(&rr->t3122, sec, micro);
+ osmo_timer_schedule(&rr->t3122, sec, micro);
}
static void start_rr_t3124(struct gsm48_rrlayer *rr, int sec, int micro)
@@ -756,7 +756,7 @@ static void start_rr_t3124(struct gsm48_rrlayer *rr, int sec, int micro)
micro / 1000);
rr->t3124.cb = timeout_rr_t3124;
rr->t3124.data = rr;
- bsc_schedule_timer(&rr->t3124, sec, micro);
+ osmo_timer_schedule(&rr->t3124, sec, micro);
}
static void start_rr_t3126(struct gsm48_rrlayer *rr, int sec, int micro)
@@ -765,62 +765,62 @@ static void start_rr_t3126(struct gsm48_rrlayer *rr, int sec, int micro)
micro / 1000);
rr->t3126.cb = timeout_rr_t3126;
rr->t3126.data = rr;
- bsc_schedule_timer(&rr->t3126, sec, micro);
+ osmo_timer_schedule(&rr->t3126, sec, micro);
}
static void stop_rr_t_meas(struct gsm48_rrlayer *rr)
{
- if (bsc_timer_pending(&rr->t_meas)) {
+ if (osmo_timer_pending(&rr->t_meas)) {
LOGP(DRR, LOGL_INFO, "stopping pending timer T_meas\n");
- bsc_del_timer(&rr->t_meas);
+ osmo_timer_del(&rr->t_meas);
}
}
static void stop_rr_t_starting(struct gsm48_rrlayer *rr)
{
- if (bsc_timer_pending(&rr->t_starting)) {
+ if (osmo_timer_pending(&rr->t_starting)) {
LOGP(DRR, LOGL_INFO, "stopping pending timer T_starting\n");
- bsc_del_timer(&rr->t_starting);
+ osmo_timer_del(&rr->t_starting);
}
}
static void stop_rr_t_rel_wait(struct gsm48_rrlayer *rr)
{
- if (bsc_timer_pending(&rr->t_rel_wait)) {
+ if (osmo_timer_pending(&rr->t_rel_wait)) {
LOGP(DRR, LOGL_INFO, "stopping pending timer T_rel_wait\n");
- bsc_del_timer(&rr->t_rel_wait);
+ osmo_timer_del(&rr->t_rel_wait);
}
}
static void stop_rr_t3110(struct gsm48_rrlayer *rr)
{
- if (bsc_timer_pending(&rr->t3110)) {
+ if (osmo_timer_pending(&rr->t3110)) {
LOGP(DRR, LOGL_INFO, "stopping pending timer T3110\n");
- bsc_del_timer(&rr->t3110);
+ osmo_timer_del(&rr->t3110);
}
}
static void stop_rr_t3122(struct gsm48_rrlayer *rr)
{
- if (bsc_timer_pending(&rr->t3122)) {
+ if (osmo_timer_pending(&rr->t3122)) {
LOGP(DRR, LOGL_INFO, "stopping pending timer T3122\n");
- bsc_del_timer(&rr->t3122);
+ osmo_timer_del(&rr->t3122);
}
}
static void stop_rr_t3124(struct gsm48_rrlayer *rr)
{
- if (bsc_timer_pending(&rr->t3124)) {
+ if (osmo_timer_pending(&rr->t3124)) {
LOGP(DRR, LOGL_INFO, "stopping pending timer T3124\n");
- bsc_del_timer(&rr->t3124);
+ osmo_timer_del(&rr->t3124);
}
}
static void stop_rr_t3126(struct gsm48_rrlayer *rr)
{
- if (bsc_timer_pending(&rr->t3126)) {
+ if (osmo_timer_pending(&rr->t3126)) {
LOGP(DRR, LOGL_INFO, "stopping pending timer T3126\n");
- bsc_del_timer(&rr->t3126);
+ osmo_timer_del(&rr->t3126);
}
}
@@ -1454,7 +1454,7 @@ fail:
if (!rr->n_chan_req) {
LOGP(DRR, LOGL_INFO, "Done with sending RANDOM ACCESS "
"bursts\n");
- if (!bsc_timer_pending(&rr->t3126))
+ if (!osmo_timer_pending(&rr->t3126))
start_rr_t3126(rr, 5, 0); /* TODO improve! */
return 0;
}
@@ -2494,7 +2494,7 @@ static int gsm48_rr_rx_imm_ass_rej(struct osmocom_ms *ms, struct msgb *msg)
if (t3122_value)
start_rr_t3122(rr, t3122_value, 0);
/* start timer 3126 if not already */
- if (!bsc_timer_pending(&rr->t3126))
+ if (!osmo_timer_pending(&rr->t3126))
start_rr_t3126(rr, 5, 0); /* TODO improve! */
/* stop assignmnet requests */
rr->n_chan_req = 0;
@@ -4232,7 +4232,7 @@ static int gsm48_rr_est_req(struct osmocom_ms *ms, struct msgb *msg)
uint16_t acc_class;
/* 3.3.1.1.3.2 */
- if (bsc_timer_pending(&rr->t3122)) {
+ if (osmo_timer_pending(&rr->t3122)) {
if (rrh->cause != RR_EST_CAUSE_EMERGENCY) {
LOGP(DRR, LOGL_INFO, "T3122 running, rejecting!\n");
cause = RR_REL_CAUSE_T3122;
@@ -5044,7 +5044,7 @@ static int gsm48_rr_rand_acc_cnf_dedicated(struct osmocom_ms *ms, struct msgb *m
}
/* start timer for sending next HANDOVER ACCESS bursts afterwards */
- if (!bsc_timer_pending(&rr->t3124)) {
+ if (!osmo_timer_pending(&rr->t3124)) {
if (allocated channel is SDCCH)
start_rr_t3124(rr, GSM_T3124_675);
else
diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c
index 4d47be46..8d3abe68 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -51,14 +51,14 @@ static void start_dtmf_timer(struct gsm_call *call, uint16_t ms)
LOGP(DCC, LOGL_INFO, "starting DTMF timer %d ms\n", ms);
call->dtmf_timer.cb = timeout_dtmf;
call->dtmf_timer.data = call;
- bsc_schedule_timer(&call->dtmf_timer, 0, ms * 1000);
+ osmo_timer_schedule(&call->dtmf_timer, 0, ms * 1000);
}
static void stop_dtmf_timer(struct gsm_call *call)
{
- if (bsc_timer_pending(&call->dtmf_timer)) {
+ if (osmo_timer_pending(&call->dtmf_timer)) {
LOGP(DCC, LOGL_INFO, "stopping pending DTMF timer\n");
- bsc_del_timer(&call->dtmf_timer);
+ osmo_timer_del(&call->dtmf_timer);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 05:41:57 +0000