Consistently use the BSD u_int and u_short instead of the SYSV uint and

ushort.  In most of these files, there was a mixture of both styles and
this change just makes them self-consistent.

Requested by:	bde (kern_ktrace.c)

3 files changed, 40 insertions, 40 deletions

diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index 22f1b2e..8c3656b 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 c5c1a4c..f0c9f0e 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 8de46b0..4a1641f 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];