Change u_intXX_t to uintXX_t. Change a couple of 'unsigned long's to

uint32_t where appropriate.

1 files changed, 50 insertions, 50 deletions

diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h
index d4bba82..7441725 100644
--- a/sys/dev/firewire/iec13213.h
+++ b/sys/dev/firewire/iec13213.h
@@ -124,22 +124,22 @@
 
 struct csrreg {
 #if BYTE_ORDER == BIG_ENDIAN
-	u_int32_t key:8,
-		  val:24;
+	uint32_t key:8,
+		 val:24;
 #else
-	u_int32_t val:24,
-		  key:8;
+	uint32_t val:24,
+		 key:8;
 #endif
 };
 struct csrhdr {
 #if BYTE_ORDER == BIG_ENDIAN
-	u_int32_t info_len:8,
-		  crc_len:8,
-		  crc:16;
+	uint32_t info_len:8,
+		 crc_len:8,
+		 crc:16;
 #else
-	u_int32_t crc:16,
-		  crc_len:8,
-		  info_len:8;
+	uint32_t crc:16,
+		 crc_len:8,
+		 info_len:8;
 #endif
 };
 struct csrdirectory {
@@ -149,47 +149,47 @@ struct csrdirectory {
 struct csrtext {
 	BIT16x2(crc_len, crc);
 #if BYTE_ORDER == BIG_ENDIAN
-	u_int32_t spec_type:8,
-		  spec_id:24;
+	uint32_t spec_type:8,
+		 spec_id:24;
 #else
-	u_int32_t spec_id:24,
-		  spec_type:8;
+	uint32_t spec_id:24,
+		 spec_type:8;
 #endif
-	u_int32_t lang_id;
-	u_int32_t text[0];
+	uint32_t lang_id;
+	uint32_t text[0];
 };
 
 struct bus_info {
 #define	CSR_BUS_NAME_IEEE1394	0x31333934
-	u_int32_t bus_name;	
+	uint32_t bus_name;	
 #if BYTE_ORDER == BIG_ENDIAN
-	u_int32_t irmc:1,		/* iso. resource manager capable */
-		  cmc:1,		/* cycle master capable */
-		  isc:1,		/* iso. operation support */
-		  bmc:1,		/* bus manager capable */
-		  pmc:1,		/* power manager capable */
-		  :3,
-		  cyc_clk_acc:8,	/* 0 <= ppm <= 100 */
-		  max_rec:4,		/* (2 << max_rec) bytes */
-		  :2,
-		  max_rom:2,
-		  generation:4,
-		  :1,
-		  link_spd:3;
+	uint32_t irmc:1,		/* iso. resource manager capable */
+		 cmc:1,			/* cycle master capable */
+		 isc:1,			/* iso. operation support */
+		 bmc:1,			/* bus manager capable */
+		 pmc:1,			/* power manager capable */
+		 :3,
+		 cyc_clk_acc:8,		/* 0 <= ppm <= 100 */
+		 max_rec:4,		/* (2 << max_rec) bytes */
+		 :2,
+		 max_rom:2,
+		 generation:4,
+		 :1,
+		 link_spd:3;
 #else
-	u_int32_t link_spd:3,
-		  :1,
-		  generation:4,
-		  max_rom:2,
-		  :2,
-		  max_rec:4,		/* (2 << max_rec) bytes */
-		  cyc_clk_acc:8,	/* 0 <= ppm <= 100 */
-		  :3,
-		  pmc:1,		/* power manager capable */
-		  bmc:1,		/* bus manager capable */
-		  isc:1,		/* iso. operation support */
-		  cmc:1,		/* cycle master capable */
-		  irmc:1;		/* iso. resource manager capable */
+	uint32_t link_spd:3,
+		 :1,
+		 generation:4,
+		 max_rom:2,
+		 :2,
+		 max_rec:4,		/* (2 << max_rec) bytes */
+		 cyc_clk_acc:8,		/* 0 <= ppm <= 100 */
+		 :3,
+		 pmc:1,			/* power manager capable */
+		 bmc:1,			/* bus manager capable */
+		 isc:1,			/* iso. operation support */
+		 cmc:1,			/* cycle master capable */
+		 irmc:1;		/* iso. resource manager capable */
 #endif
 	struct fw_eui64 eui64;
 };
@@ -209,13 +209,13 @@ struct crom_context {
 	struct crom_ptr stack[CROM_MAX_DEPTH];
 };
 
-void crom_init_context(struct crom_context *, u_int32_t *);
+void crom_init_context(struct crom_context *, uint32_t *);
 struct csrreg *crom_get(struct crom_context *);
 void crom_next(struct crom_context *);
 void crom_parse_text(struct crom_context *, char *, int);
-u_int16_t crom_crc(u_int32_t *r, int);
-struct csrreg *crom_search_key(struct crom_context *, u_int8_t);
-int crom_has_specver(u_int32_t *, u_int32_t, u_int32_t);
+uint16_t crom_crc(uint32_t *r, int);
+struct csrreg *crom_search_key(struct crom_context *, uint8_t);
+int crom_has_specver(uint32_t *, uint32_t, uint32_t);
 
 #ifndef _KERNEL
 char *crom_desc(struct crom_context *, char *, int);
@@ -237,15 +237,15 @@ struct crom_chunk {
 	int offset;
 	struct {
 		BIT16x2(crc_len, crc);
-		u_int32_t buf[CROM_MAX_CHUNK_LEN]; 
+		uint32_t buf[CROM_MAX_CHUNK_LEN]; 
 	} data;
 };
 
-extern int crom_add_quad(struct crom_chunk *, u_int32_t);
+extern int crom_add_quad(struct crom_chunk *, uint32_t);
 extern int crom_add_entry(struct crom_chunk *, int, int);
 extern int crom_add_chunk(struct crom_src *src, struct crom_chunk *,
 					struct crom_chunk *, int);
 extern int crom_add_simple_text(struct crom_src *src, struct crom_chunk *,
 					struct crom_chunk *, char *);
-extern int crom_load(struct crom_src *, u_int32_t *, int);
+extern int crom_load(struct crom_src *, uint32_t *, int);
 #endif