From 5a45b156d4165fed159a290c46676d1383ffcc80 Mon Sep 17 00:00:00 2001 From: Jonathan Santos Date: Wed, 17 Aug 2011 15:33:57 -0400 Subject: New upstream version 0.9.14 --- include/openbsc/transaction.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'include/openbsc/transaction.h') diff --git a/include/openbsc/transaction.h b/include/openbsc/transaction.h index e41d8ef91..acb2e6c8b 100644 --- a/include/openbsc/transaction.h +++ b/include/openbsc/transaction.h @@ -3,8 +3,9 @@ #include #include -#include +#include #include +#include /* One transaction */ struct gsm_trans { @@ -12,10 +13,10 @@ struct gsm_trans { struct llist_head entry; /* The protocol within which we live */ - u_int8_t protocol; + uint8_t protocol; /* The current transaction ID */ - u_int8_t transaction_id; + uint8_t transaction_id; /* To whom we belong, unique identifier of remote MM entity */ struct gsm_subscriber *subscr; @@ -24,7 +25,7 @@ struct gsm_trans { struct gsm_subscriber_connection *conn; /* reference from MNCC or other application */ - u_int32_t callref; + uint32_t callref; /* if traffic channel receive was requested */ int tch_recv; @@ -41,14 +42,14 @@ 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; struct { - u_int8_t link_id; /* RSL Link ID to be used for this 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; @@ -60,16 +61,16 @@ struct gsm_trans { struct gsm_trans *trans_find_by_id(struct gsm_subscriber *subscr, - u_int8_t proto, u_int8_t trans_id); + uint8_t proto, uint8_t trans_id); struct gsm_trans *trans_find_by_callref(struct gsm_network *net, - u_int32_t callref); + uint32_t callref); struct gsm_trans *trans_alloc(struct gsm_subscriber *subscr, - u_int8_t protocol, u_int8_t trans_id, - u_int32_t callref); + uint8_t protocol, uint8_t trans_id, + uint32_t callref); void trans_free(struct gsm_trans *trans); int trans_assign_trans_id(struct gsm_subscriber *subscr, - u_int8_t protocol, u_int8_t ti_flag); + uint8_t protocol, uint8_t ti_flag); #endif -- cgit v1.2.3