14 files changed, 99 insertions, 99 deletions

diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index e2314c63e655..6a070870694c 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -314,7 +314,7 @@ struct aac_softc
 	/* command/fib resources */
 	bus_dma_tag_t		aac_fib_dmat;	/* DMA tag for allocing FIBs */
 	TAILQ_HEAD(,aac_fibmap)	aac_fibmap_tqh;
-	uint			total_fibs;
+	u_int			total_fibs;
 	struct aac_command	*aac_commands;
 
 	/* command management */
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index 7fca8bed2f3c..ba6e42ee02a8 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -132,7 +132,7 @@ acpi_pcib_acpi_attach(device_t dev)
 {
     struct acpi_hpcib_softc	*sc;
     ACPI_STATUS			status;
-    uint addr, slot, func, busok;
+    u_int addr, slot, func, busok;
     uint8_t busno;
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
diff --git a/sys/dev/dgb/dgreg.h b/sys/dev/dgb/dgreg.h
index 8dcca02d03ef..0f8aea06eef1 100644
--- a/sys/dev/dgb/dgreg.h
+++ b/sys/dev/dgb/dgreg.h
@@ -114,48 +114,48 @@ typedef struct digi_struct digi_t;
 
 
 struct global_data {
-	volatile ushort cin;
-	volatile ushort cout;
-	volatile ushort cstart;
-	volatile ushort cmax;
-	volatile ushort ein;
-	volatile ushort eout;
-	volatile ushort istart;
-	volatile ushort imax;
+	volatile u_short cin;
+	volatile u_short cout;
+	volatile u_short cstart;
+	volatile u_short cmax;
+	volatile u_short ein;
+	volatile u_short eout;
+	volatile u_short istart;
+	volatile u_short imax;
 };
 
 
 struct board_chan {
 	int filler1; 
 	int filler2;
-	volatile ushort tseg;
-	volatile ushort tin;
-	volatile ushort tout;
-	volatile ushort tmax;
+	volatile u_short tseg;
+	volatile u_short tin;
+	volatile u_short tout;
+	volatile u_short tmax;
 	
-	volatile ushort rseg;
-	volatile ushort rin;
-	volatile ushort rout;
-	volatile ushort rmax;
+	volatile u_short rseg;
+	volatile u_short rin;
+	volatile u_short rout;
+	volatile u_short rmax;
 	
-	volatile ushort tlow;
-	volatile ushort rlow;
-	volatile ushort rhigh;
-	volatile ushort incr;
+	volatile u_short tlow;
+	volatile u_short rlow;
+	volatile u_short rhigh;
+	volatile u_short incr;
 	
-	volatile ushort etime;
-	volatile ushort edelay;
+	volatile u_short etime;
+	volatile u_short edelay;
 	volatile u_char *dev;
 	
-	volatile ushort iflag;
-	volatile ushort oflag;
-	volatile ushort cflag;
-	volatile ushort gmask;
+	volatile u_short iflag;
+	volatile u_short oflag;
+	volatile u_short cflag;
+	volatile u_short gmask;
 	
-	volatile ushort col;
-	volatile ushort delay;
-	volatile ushort imask;
-	volatile ushort tflush;
+	volatile u_short col;
+	volatile u_short delay;
+	volatile u_short imask;
+	volatile u_short tflush;
 
 	int filler3;
 	int filler4;
@@ -274,8 +274,8 @@ struct board_info	{
 	u_char status;
 	u_char type;
 	u_char altpin;
-	ushort numports;
-	ushort port;
+	u_short numports;
+	u_short port;
 	u_long  membase;
 };
 
@@ -313,19 +313,19 @@ struct channel {
 	u_char fepstartca;
 	u_char txwin;
 	u_char rxwin;
-	ushort fepiflag;
-	ushort fepcflag;
-	ushort fepoflag;
-	ushort txbufhead;
-	ushort txbufsize;
-	ushort rxbufhead;
-	ushort rxbufsize;
+	u_short fepiflag;
+	u_short fepcflag;
+	u_short fepoflag;
+	u_short txbufhead;
+	u_short txbufsize;
+	u_short rxbufhead;
+	u_short rxbufsize;
 	int close_delay;
 	int count;
 	int blocked_open;
 	int event;
 	int asyncflags;
-	uint dev;
+	u_int dev;
 	long session;
 	long pgrp;
 	u_long statusflags;
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index 22f1b2eb7355..8c3656b471c4 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.c
@@ -1815,7 +1815,7 @@ fepcmd(struct digi_p *port, int cmd, int op1, int ncmds)
 	head = port->sc->gdata->cin;
 	mem[head + 0] = cmd;
 	mem[head + 1] = port->pnum;
-	*(ushort *)(mem + head + 2) = op1;
+	*(u_short *)(mem + head + 2) = op1;
 
 	head = (head + 4) & port->sc->gdata->cmax;
 	port->sc->gdata->cin = head;
diff --git a/sys/dev/digi/digi.h b/sys/dev/digi/digi.h
index c5c1a4c60342..f0c9f0e59cef 100644
--- a/sys/dev/digi/digi.h
+++ b/sys/dev/digi/digi.h
@@ -67,8 +67,8 @@ struct digi_p {
 #define PAUSE_RX 16
 
 	int opencnt;
-	ushort txbufsize;
-	ushort rxbufsize;
+	u_short txbufsize;
+	u_short rxbufsize;
 	volatile struct board_chan *bc;
 	struct tty *tp;
 
@@ -151,7 +151,7 @@ struct digi_softc {
 
 	const char *name;
 	enum digi_board_status status;
-	ushort numports;		/* number of ports on card */
+	u_short numports;		/* number of ports on card */
 	u_int port;			/* I/O port */
 	u_int wport;			/* window select I/O port */
 
diff --git a/sys/dev/digi/digireg.h b/sys/dev/digi/digireg.h
index 8de46b03af45..4a1641f92d7e 100644
--- a/sys/dev/digi/digireg.h
+++ b/sys/dev/digi/digireg.h
@@ -30,52 +30,52 @@
  */
 
 struct global_data {
-	volatile ushort cin;
-	volatile ushort cout;
-	volatile ushort cstart;
-	volatile ushort cmax;
-	volatile ushort ein;
-	volatile ushort eout;
-	volatile ushort istart;
-	volatile ushort imax;
+	volatile u_short cin;
+	volatile u_short cout;
+	volatile u_short cstart;
+	volatile u_short cmax;
+	volatile u_short ein;
+	volatile u_short eout;
+	volatile u_short istart;
+	volatile u_short imax;
 };
 
 
 struct board_chan {
-	volatile ushort tpjmp;
-	volatile ushort tcjmp;
-	volatile ushort fil1;
-	volatile ushort rpjmp;
+	volatile u_short tpjmp;
+	volatile u_short tcjmp;
+	volatile u_short fil1;
+	volatile u_short rpjmp;
 	
-	volatile ushort tseg;
-	volatile ushort tin;
-	volatile ushort tout;
-	volatile ushort tmax;
+	volatile u_short tseg;
+	volatile u_short tin;
+	volatile u_short tout;
+	volatile u_short tmax;
 	
-	volatile ushort rseg;
-	volatile ushort rin;
-	volatile ushort rout;
-	volatile ushort rmax;
+	volatile u_short rseg;
+	volatile u_short rin;
+	volatile u_short rout;
+	volatile u_short rmax;
 	
-	volatile ushort tlow;
-	volatile ushort rlow;
-	volatile ushort rhigh;
-	volatile ushort incr;
+	volatile u_short tlow;
+	volatile u_short rlow;
+	volatile u_short rhigh;
+	volatile u_short incr;
 	
-	volatile ushort dev;
-	volatile ushort edelay;
-	volatile ushort blen;
-	volatile ushort btime;
+	volatile u_short dev;
+	volatile u_short edelay;
+	volatile u_short blen;
+	volatile u_short btime;
 	
-	volatile ushort iflag;
-	volatile ushort oflag;
-	volatile ushort cflag;
-	volatile ushort gmask;
+	volatile u_short iflag;
+	volatile u_short oflag;
+	volatile u_short cflag;
+	volatile u_short gmask;
 	
-	volatile ushort col;
-	volatile ushort delay;
-	volatile ushort imask;
-	volatile ushort tflush;
+	volatile u_short col;
+	volatile u_short delay;
+	volatile u_short imask;
+	volatile u_short tflush;
 
 	volatile u_char _1[16];
 	
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 06a182595f18..bcc4671d1c63 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -3153,7 +3153,7 @@ ed_hpp_write_mbufs(struct ed_softc *sc, struct mbuf *m, int dst)
 				/* finish the last word of the previous mbuf */
 				if (wantbyte) {
 					savebyte[1] = *data;
-					*d = *((ushort *) savebyte);
+					*d = *((u_short *) savebyte);
 					data++; len--; wantbyte = 0;
 				}
 				/* output contiguous words */
diff --git a/sys/dev/en/midwayvar.h b/sys/dev/en/midwayvar.h
index 4869dbd05902..27da2f57aed2 100644
--- a/sys/dev/en/midwayvar.h
+++ b/sys/dev/en/midwayvar.h
@@ -136,7 +136,7 @@ struct en_rxslot {
 struct en_vcc {
 	struct atmio_vcc vcc;		/* required by common code */
 	void		*rxhand;
-	uint		vflags;
+	u_int		vflags;
 	uint32_t	ipackets;
 	uint32_t	opackets;
 	uint32_t	ibytes;
diff --git a/sys/dev/fatm/if_fatmvar.h b/sys/dev/fatm/if_fatmvar.h
index 57df04183851..8919d24b0712 100644
--- a/sys/dev/fatm/if_fatmvar.h
+++ b/sys/dev/fatm/if_fatmvar.h
@@ -168,7 +168,7 @@ LIST_HEAD(rbuf_list, rbuf);
 struct card_vcc {
 	struct atmio_vcc param;		/* traffic parameters */
 	void		*rxhand;
-	uint		vflags;
+	u_int		vflags;
 	uint32_t	ipackets;
 	uint32_t	opackets;
 	uint32_t	ibytes;
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 8576bde393e3..d79a4accc40b 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -132,9 +132,9 @@ static int nshift;
 
 struct indir {
 	uintptr_t	*array;
-	uint		total;
-	uint		used;
-	uint		shift;
+	u_int		total;
+	u_int		used;
+	u_int		shift;
 };
 
 struct md_s {
@@ -174,7 +174,7 @@ struct md_s {
 static int mddestroy(struct md_s *sc, struct thread *td);
 
 static struct indir *
-new_indir(uint shift)
+new_indir(u_int shift)
 {
 	struct indir *ip;
 
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index fe4c44543b08..91a22d9ccb78 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -240,7 +240,7 @@ static int	cbb_cardbus_deactivate_resource(device_t brdev,
 		    device_t child, int type, int rid, struct resource *res);
 static struct resource	*cbb_cardbus_alloc_resource(device_t brdev,
 		    device_t child, int type, int *rid, u_long start,
-		    u_long end, u_long count, uint flags);
+		    u_long end, u_long count, u_int flags);
 static int	cbb_cardbus_release_resource(device_t brdev, device_t child,
 		    int type, int rid, struct resource *res);
 static int	cbb_power_enable_socket(device_t brdev, device_t child);
@@ -251,7 +251,7 @@ static int	cbb_deactivate_resource(device_t brdev, device_t child,
 		    int type, int rid, struct resource *r);
 static struct resource	*cbb_alloc_resource(device_t brdev, device_t child,
 		    int type, int *rid, u_long start, u_long end, u_long count,
-		    uint flags);
+		    u_int flags);
 static int	cbb_release_resource(device_t brdev, device_t child,
 		    int type, int rid, struct resource *r);
 static int	cbb_read_ivar(device_t brdev, device_t child, int which,
@@ -1515,7 +1515,7 @@ cbb_cardbus_deactivate_resource(device_t brdev, device_t child, int type,
 
 static struct resource *
 cbb_cardbus_alloc_resource(device_t brdev, device_t child, int type,
-    int *rid, u_long start, u_long end, u_long count, uint flags)
+    int *rid, u_long start, u_long end, u_long count, u_int flags)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
 	int tmp;
@@ -1663,7 +1663,7 @@ cbb_pcic_deactivate_resource(device_t brdev, device_t child, int type,
 
 static struct resource *
 cbb_pcic_alloc_resource(device_t brdev, device_t child, int type, int *rid,
-    u_long start, u_long end, u_long count, uint flags)
+    u_long start, u_long end, u_long count, u_int flags)
 {
 	struct resource *res = NULL;
 	struct cbb_softc *sc = device_get_softc(brdev);
@@ -1800,7 +1800,7 @@ cbb_deactivate_resource(device_t brdev, device_t child, int type,
 
 static struct resource *
 cbb_alloc_resource(device_t brdev, device_t child, int type, int *rid,
-    u_long start, u_long end, u_long count, uint flags)
+    u_long start, u_long end, u_long count, u_int flags)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
 
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 96b7b1bf15c9..eb1f64ec68ae 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -187,10 +187,10 @@ struct ppb_device {
 
 	const char *name;		/* name of the device */
 
-	ushort mode;			/* current mode of the device */
-	ushort avm;			/* available IEEE1284 modes of 
+	u_short mode;			/* current mode of the device */
+	u_short avm;			/* available IEEE1284 modes of 
 					 * the device */
-	uint flags;			/* flags */
+	u_int flags;			/* flags */
 
 	struct ppb_context ctx;		/* context of the device */
 
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index aafb3fda68f3..6817d02ce6da 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -1012,7 +1012,7 @@ rc_hardclose(struct rc_chans *rc)
 
 /* Reset the bastard */
 static void
-rc_hwreset(struct rc_softc *sc, uint chipid)
+rc_hwreset(struct rc_softc *sc, u_int chipid)
 {
 	CCRCMD(sc, -1, CCR_HWRESET);            /* Hardware reset */
 	DELAY(20000);
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index 58966eac6803..ec56e809fe1d 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -718,7 +718,7 @@ camdump(sc)
 	wbflush();
 
 	for (i = 0; i < 16; i++) {
-		ushort  ap2, ap1, ap0;
+		u_short  ap2, ap1, ap0;
 		NIC_PUT(sc, SNCR_CEP, i);
 		wbflush();
 		ap2 = NIC_GET(sc, SNCR_CAP2);