misc: u_intX -> uintX in the host directory

Use C99 stdint.h for the inttypes.

5 files changed, 13 insertions, 13 deletions

diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
index 1d7f7794..7bf4df6a 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
@@ -130,11 +130,11 @@ struct gsm_call {
 
 struct gsm_mncc {
 	/* context based information */
-	u_int32_t	msg_type;
-	u_int32_t	callref;
+	uint32_t	msg_type;
+	uint32_t	callref;
 
 	/* which fields are present */
-	u_int32_t	fields;
+	uint32_t	fields;
 
 	/* data derived informations (MNCC_F_ based) */
 	struct gsm_mncc_bearer_cap	bearer_cap;
@@ -165,8 +165,8 @@ struct gsm_mncc {
 };
 
 struct gsm_data_frame {
-	u_int32_t	msg_type;
-	u_int32_t	callref;
+	uint32_t	msg_type;
+	uint32_t	callref;
 	unsigned char	data[0];
 };
 
diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c
index abaa64f6..0d6f8c92 100644
--- a/src/host/layer23/src/common/l1l2_interface.c
+++ b/src/host/layer23/src/common/l1l2_interface.c
@@ -45,7 +45,7 @@
 static int layer2_read(struct osmo_fd *fd)
 {
 	struct msgb *msg;
-	u_int16_t len;
+	uint16_t len;
 	int rc;
 
 	msg = msgb_alloc_headroom(GSM_L2_LENGTH+GSM_L2_HEADROOM, GSM_L2_HEADROOM, "Layer2");
diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c
index fd5cdc3b..f1f4b0ec 100644
--- a/src/host/layer23/src/common/sap_interface.c
+++ b/src/host/layer23/src/common/sap_interface.c
@@ -45,7 +45,7 @@
 static int sap_read(struct osmo_fd *fd)
 {
 	struct msgb *msg;
-	u_int16_t len;
+	uint16_t len;
 	int rc;
 	struct osmocom_ms *ms = (struct osmocom_ms *) fd->data;
 
diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c
index 2e978197..55e14d57 100644
--- a/src/host/layer23/src/mobile/gsm48_cc.c
+++ b/src/host/layer23/src/mobile/gsm48_cc.c
@@ -43,7 +43,7 @@ extern void *l23_ctx;
 static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg);
 static int gsm48_rel_null_free(struct gsm_trans *trans);
 int mncc_release_ind(struct osmocom_ms *ms, struct gsm_trans *trans,
-		     u_int32_t callref, int location, int value);
+		     uint32_t callref, int location, int value);
 static int gsm48_cc_tx_disconnect(struct gsm_trans *trans, void *arg);
 static int gsm48_cc_tx_connect_ack(struct gsm_trans *trans, void *arg);
 
@@ -416,7 +416,7 @@ void mncc_set_cause(struct gsm_mncc *data, int loc, int val)
 
 /* send release indication to upper layer */
 int mncc_release_ind(struct osmocom_ms *ms, struct gsm_trans *trans,
-		     u_int32_t callref, int location, int value)
+		     uint32_t callref, int location, int value)
 {
 	struct gsm_mncc rel;
 
@@ -1846,7 +1846,7 @@ static int gsm48_cc_rx_release_compl(struct gsm_trans *trans, struct msgb *msg)
 
 /* state trasitions for MNCC messages (upper layer) */
 static struct downstate {
-	u_int32_t	states;
+	uint32_t	states;
 	int		type;
 	int		(*rout) (struct gsm_trans *trans, void *arg);
 } downstatelist[] = {
@@ -2004,7 +2004,7 @@ int mncc_tx_to_cc(void *inst, int msg_type, void *arg)
 
 /* state trasitions for call control messages (lower layer) */
 static struct datastate {
-	u_int32_t	states;
+	uint32_t	states;
 	int		type;
 	int		(*rout) (struct gsm_trans *trans, struct msgb *msg);
 } datastatelist[] = {
diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c
index 8a0b21c0..2d558394 100644
--- a/src/host/osmocon/osmoload.c
+++ b/src/host/osmocon/osmoload.c
@@ -186,7 +186,7 @@ static void osmoload_osmo_hexdump(const uint8_t *data, unsigned int len)
 static void
 loader_send_request(struct msgb *msg) {
 	int rc;
-	u_int16_t len = htons(msg->len);
+	uint16_t len = htons(msg->len);
 
 	if(osmoload.print_requests) {
 		printf("Sending %d bytes:\n", msg->len);
@@ -453,7 +453,7 @@ loader_handle_reply(struct msgb *msg) {
 static int
 loader_read_cb(struct osmo_fd *fd, unsigned int flags) {
 	struct msgb *msg;
-	u_int16_t len;
+	uint16_t len;
 	int rc;
 
 	msg = msgb_alloc(MSGB_MAX, "loader");