[gprs] Use stdint.h types (uintXX_t instead of u_intXX_t)

libosmocore already uses them, it's time (at least for new code)
in openbsc to do the same.

1 files changed, 32 insertions, 30 deletions

diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/openbsc/include/openbsc/gprs_sgsn.h
index 92ce34d42..a3c7c78f4 100644
--- a/openbsc/include/openbsc/gprs_sgsn.h
+++ b/openbsc/include/openbsc/gprs_sgsn.h
@@ -1,6 +1,8 @@
 #ifndef _GPRS_SGSN_H
 #define _GPRS_SGSN_H
 
+#include <stdint.h>
+
 /* TS 04.08 4.1.3.3 GMM mobility management states on the network side */
 enum gprs_mm_state {
 	GMM_DEREGISTERED,		/* 4.1.3.3.1.1 */
@@ -25,43 +27,43 @@ struct sgsn_mm_ctx {
 
 	char 			imsi[GSM_IMSI_LENGTH];
 	enum gprs_mm_state	mm_state;
-	u_int32_t 		p_tmsi;
-	u_int32_t 		p_tmsi_sig;
+	uint32_t 		p_tmsi;
+	uint32_t 		p_tmsi_sig;
 	char 			imei[GSM_IMEI_LENGTH];
 	/* Opt: Software Version Numbber / TS 23.195 */
 	char 			msisdn[GSM_EXTENSION_LENGTH];
 	struct gprs_ra_id	ra;
-	u_int16_t		cell_id;
-	u_int32_t		cell_id_age;
-	u_int16_t		sac;	/* Iu: Service Area Code */
-	u_int32_t		sac_age;/* Iu: Service Area Code age */
+	uint16_t		cell_id;
+	uint32_t		cell_id_age;
+	uint16_t		sac;	/* Iu: Service Area Code */
+	uint32_t		sac_age;/* Iu: Service Area Code age */
 	/* VLR number */
-	u_int32_t		new_sgsn_addr;
+	uint32_t		new_sgsn_addr;
 	/* Authentication Triplets */
 	/* Kc */
 	/* Iu: CK, IK, KSI */
 	/* CKSN */
 	enum gprs_ciph_algo	ciph_algo;
 	struct {
-		u_int8_t	buf[14];	/* 10.5.5.12a */
-		u_int8_t	len;
+		uint8_t	buf[14];	/* 10.5.5.12a */
+		uint8_t	len;
 	} ms_radio_access_capa;
 	struct {
-		u_int8_t	buf[4];		/* 10.5.5.12 */
-		u_int8_t	len;
+		uint8_t	buf[4];		/* 10.5.5.12 */
+		uint8_t	len;
 	} ms_network_capa;
-	u_int16_t		drx_parms;
+	uint16_t		drx_parms;
 	int			mnrg;	/* MS reported to HLR? */
 	int			ngaf;	/* MS reported to MSC/VLR? */
 	int			ppf;	/* paging for GPRS + non-GPRS? */
 	/* SMS Parameters */
 	int			recovery;
-	u_int8_t		radio_prio_sms;
+	uint8_t		radio_prio_sms;
 
 	struct llist_head	pdp_list;
 
 	/* Additional bits not present in the GSM TS */
-	u_int32_t		tlli;
+	uint32_t		tlli;
 	struct timer_list	timer;
 	unsigned int		T;
 };
@@ -80,33 +82,33 @@ struct sgsn_pdp_ctx {
 	unsigned int		id;
 	enum pdp_ctx_state	state;
 	enum pdp_type		type;
-	u_int32_t		addresss;
+	uint32_t		addresss;
 	char 			*apn_subscribed;
 	char 			*apn_used;
-	u_int16_t		nsapi;
-	u_int8_t		ti;	/* transaction identifier */
-	u_int32_t		ggsn_in_use;
+	uint16_t		nsapi;
+	uint8_t		ti;	/* transaction identifier */
+	uint32_t		ggsn_in_use;
 	int			vplmn_allowed;
-	u_int32_t		qos_profile_subscr;
-	u_int32_t		qos_profile_req;
-	u_int32_t		qos_profile_neg;
-	u_int8_t		radio_prio;
-	u_int32_t		tx_npdu_nr;
-	u_int32_t		rx_npdu_nr;
-	u_int32_t		tx_gtp_snd;
-	u_int32_t		rx_gtp_snu;
-	u_int32_t		charging_id;
+	uint32_t		qos_profile_subscr;
+	uint32_t		qos_profile_req;
+	uint32_t		qos_profile_neg;
+	uint8_t		radio_prio;
+	uint32_t		tx_npdu_nr;
+	uint32_t		rx_npdu_nr;
+	uint32_t		tx_gtp_snd;
+	uint32_t		rx_gtp_snu;
+	uint32_t		charging_id;
 	int			reordering_reqd;
 };
 
 /* look-up a SGSN MM context based on TLLI + RAI */
-struct sgsn_mm_ctx *sgsn_mm_ctx_by_tlli(u_int32_t tlli,
+struct sgsn_mm_ctx *sgsn_mm_ctx_by_tlli(uint32_t tlli,
 					const struct gprs_ra_id *raid);
-struct sgsn_mm_ctx *sgsn_mm_ctx_by_ptmsi(u_int32_t tmsi);
+struct sgsn_mm_ctx *sgsn_mm_ctx_by_ptmsi(uint32_t tmsi);
 struct sgsn_mm_ctx *sgsn_mm_ctx_by_imsi(const char *imsi);
 
 /* Allocate a new SGSN MM context */
-struct sgsn_mm_ctx *sgsn_mm_ctx_alloc(u_int32_t tlli,
+struct sgsn_mm_ctx *sgsn_mm_ctx_alloc(uint32_t tlli,
 					const struct gprs_ra_id *raid);
 
 #endif /* _GPRS_SGSN_H */