1 files changed, 40 insertions, 40 deletions

diff --git a/sys/dev/dgb/dgreg.h b/sys/dev/dgb/dgreg.h
index 8dcca02d03ef5..0f8aea06eef14 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;