summaryrefslogtreecommitdiffstats
path: root/src/host/layer23/include/osmocom/bb
diff options
context:
space:
mode:
Diffstat (limited to 'src/host/layer23/include/osmocom/bb')
-rw-r--r--src/host/layer23/include/osmocom/bb/common/lapdm.h2
-rw-r--r--src/host/layer23/include/osmocom/bb/mobile/gsm322.h4
-rw-r--r--src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h4
-rw-r--r--src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h16
-rw-r--r--src/host/layer23/include/osmocom/bb/mobile/mncc.h2
-rw-r--r--src/host/layer23/include/osmocom/bb/mobile/transaction.h4
6 files changed, 16 insertions, 16 deletions
diff --git a/src/host/layer23/include/osmocom/bb/common/lapdm.h b/src/host/layer23/include/osmocom/bb/common/lapdm.h
index 2d0e2fd4..b502ffd8 100644
--- a/src/host/layer23/include/osmocom/bb/common/lapdm.h
+++ b/src/host/layer23/include/osmocom/bb/common/lapdm.h
@@ -42,7 +42,7 @@ struct lapdm_datalink {
uint32_t state;
int seq_err_cond; /* condition of sequence error */
uint8_t own_busy, peer_busy;
- struct timer_list t200;
+ struct osmo_timer_list t200;
uint8_t retrans_ctr;
struct llist_head send_queue; /* frames from L3 */
struct msgb *send_buffer; /* current frame transmitting */
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h
index 467ff39a..c93e8faa 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h
@@ -119,7 +119,7 @@ struct gsm322_plmn {
struct llist_head sorted_plmn; /* list of sorted PLMN */
struct llist_head forbidden_la; /* forbidden LAs */
- struct timer_list timer;
+ struct osmo_timer_list timer;
int plmn_curr; /* current index in sorted_plmn */
uint16_t mcc, mnc; /* current network selected */
@@ -140,7 +140,7 @@ struct gsm322_cellsel {
struct llist_head event_queue; /* event messages */
struct llist_head ba_list; /* BCCH Allocation per PLMN */
- struct timer_list timer;
+ struct osmo_timer_list timer;
uint16_t mcc, mnc; /* current network to search for */
struct gsm322_cs_list list[1024]; /* cell selection list per freq. */
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index 447dc95f..021b78d8 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
@@ -163,8 +163,8 @@ struct gsm48_mmlayer {
struct llist_head event_queue;
/* timers */
- struct timer_list t3210, t3211, t3212, t3213;
- struct timer_list t3220, t3230, t3240;
+ struct osmo_timer_list t3210, t3211, t3212, t3213;
+ struct osmo_timer_list t3220, t3230, t3240;
int t3212_value;
int start_t3211; /* remember to start timer */
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index b140c186..cccf279a 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
@@ -118,15 +118,15 @@ struct gsm48_rrlayer {
struct llist_head downqueue;
/* timers */
- struct timer_list t_starting; /* starting time for chan. access */
- struct timer_list t_rel_wait; /* wait for L2 to transmit UA */
- struct timer_list t3110;
- struct timer_list t3122;
- struct timer_list t3124;
- struct timer_list t3126;
+ struct osmo_timer_list t_starting; /* starting time for chan. access */
+ struct osmo_timer_list t_rel_wait; /* wait for L2 to transmit UA */
+ struct osmo_timer_list t3110;
+ struct osmo_timer_list t3122;
+ struct osmo_timer_list t3124;
+ struct osmo_timer_list t3126;
int t3126_value;
#ifndef TODO
- struct timer_list temp_rach_ti; /* temporary timer */
+ struct osmo_timer_list temp_rach_ti; /* temporary timer */
#endif
/* states if RR-EST-REQ was used */
@@ -169,7 +169,7 @@ struct gsm48_rrlayer {
uint32_t ba_range[16];
/* measurements */
- struct timer_list t_meas;
+ struct osmo_timer_list t_meas;
struct gsm48_rr_meas meas;
uint8_t monitor;
};
diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
index e378ecc9..a2b48cf7 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
@@ -40,7 +40,7 @@ struct gsm_call {
uint8_t hold; /* call on hold */
uint8_t ring; /* call ringing/knocking */
- struct timer_list dtmf_timer;
+ struct osmo_timer_list dtmf_timer;
uint8_t dtmf_state;
uint8_t dtmf_index;
char dtmf[32]; /* dtmf sequence */
diff --git a/src/host/layer23/include/osmocom/bb/mobile/transaction.h b/src/host/layer23/include/osmocom/bb/mobile/transaction.h
index 6cbc25ba..aa62f465 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/transaction.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/transaction.h
@@ -35,7 +35,7 @@ struct gsm_trans {
/* current timer and message queue */
int Tcurrent; /* current CC timer */
int T308_second; /* used to send release again */
- struct timer_list timer;
+ struct osmo_timer_list timer;
struct gsm_mncc msg; /* stores setup/disconnect/release message */
} cc;
#if 0
@@ -43,7 +43,7 @@ struct gsm_trans {
uint8_t link_id; /* RSL Link ID to be used for this trans */
int is_mt; /* is this a MO (0) or MT (1) transfer */
enum gsm411_cp_state cp_state;
- struct timer_list cp_timer;
+ struct osmo_timer_list cp_timer;
enum gsm411_rp_state rp_state;