4 files changed, 30 insertions, 30 deletions

diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h
index eb2b4c7ff2b4a..b3c349cfd16d8 100644
--- a/sys/dev/de/if_devar.h
+++ b/sys/dev/de/if_devar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_devar.h,v 1.26 1998/02/11 01:28:29 thorpej Exp $	*/
-/*	$Id: if_devar.h,v 1.5 1998/03/08 16:54:00 peter Exp $ */
+/*	$Id: if_devar.h,v 1.6 1998/06/07 17:12:37 dfr Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -270,7 +270,7 @@ typedef struct {
 	    u_int32_t gpr_gpdata;
 	    u_int8_t gpr_actmask;
 	    u_int8_t gpr_actdata;
-	    u_int8_t gpr_default : 1;
+	    u_int    gpr_default : 1;
 	} un_gpr;
 	struct {
 	    u_int32_t mii_mediamask;
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index d391dd9734d71..8203e1747096c 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpreg.h,v 1.11 1997/09/29 11:27:42 davidg Exp $
+ *	$Id: if_fxpreg.h,v 1.12 1998/03/03 14:19:09 dg Exp $
  */
 
 #define FXP_VENDORID_INTEL	0x8086
@@ -116,57 +116,57 @@ struct fxp_cb_config {
 	volatile u_int16_t	cb_status;
 	volatile u_int16_t	cb_command;
 	volatile u_int32_t	link_addr;
-	volatile u_int8_t	byte_count:6,
+	volatile u_int		byte_count:6,
 				:2;
-	volatile u_int8_t	rx_fifo_limit:4,
+	volatile u_int		rx_fifo_limit:4,
 				tx_fifo_limit:3,
 				:1;
 	volatile u_int8_t	adaptive_ifs;
-	volatile u_int8_t	:8;
-	volatile u_int8_t	rx_dma_bytecount:7,
+	volatile u_int		:8;
+	volatile u_int		rx_dma_bytecount:7,
 				:1;
-	volatile u_int8_t	tx_dma_bytecount:7,
+	volatile u_int		tx_dma_bytecount:7,
 				dma_bce:1;
-	volatile u_int8_t	late_scb:1,
+	volatile u_int		late_scb:1,
 				:1,
 				tno_int:1,
 				ci_int:1,
 				:3,
 				save_bf:1;
-	volatile u_int8_t	disc_short_rx:1,
+	volatile u_int		disc_short_rx:1,
 				underrun_retry:2,
 				:5;
-	volatile u_int8_t	mediatype:1,
+	volatile u_int		mediatype:1,
 				:7;
-	volatile u_int8_t	:8;
-	volatile u_int8_t	:3,
+	volatile u_int		:8;
+	volatile u_int		:3,
 				nsai:1,
 				preamble_length:2,
 				loopback:2;
-	volatile u_int8_t	linear_priority:3,
+	volatile u_int		linear_priority:3,
 				:5;
-	volatile u_int8_t	linear_pri_mode:1,
+	volatile u_int		linear_pri_mode:1,
 				:3,
 				interfrm_spacing:4;
-	volatile u_int8_t	:8;
-	volatile u_int8_t	:8;
-	volatile u_int8_t	promiscuous:1,
+	volatile u_int		:8;
+	volatile u_int		:8;
+	volatile u_int		promiscuous:1,
 				bcast_disable:1,
 				:5,
 				crscdt:1;
-	volatile u_int8_t	:8;
-	volatile u_int8_t	:8;
-	volatile u_int8_t	stripping:1,
+	volatile u_int		:8;
+	volatile u_int		:8;
+	volatile u_int		stripping:1,
 				padding:1,
 				rcv_crc_xfer:1,
 				:5;
-	volatile u_int8_t	:6,
+	volatile u_int		:6,
 				force_fdx:1,
 				fdx_pin_en:1;
-	volatile u_int8_t	:6,
+	volatile u_int		:6,
 				multi_ia:1,
 				:1;
-	volatile u_int8_t	:3,
+	volatile u_int		:3,
 				mc_all:1,
 				:4;
 };
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 4e2ed9e846417..cda1eb61d6dcd 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,4 +1,4 @@
-/* $Id: ispvar.h,v 1.1 1998/04/22 17:54:58 mjacob Exp $ */
+/* $Id: ispvar.h,v 1.2 1998/05/01 18:10:50 bde Exp $ */
 /*
  * Soft Definitions for for Qlogic ISP SCSI adapters.
  *
@@ -89,7 +89,7 @@ struct ispmdvec {
  */
 
 typedef struct {
-        u_int16_t	isp_adapter_enabled	: 1,
+        u_int		isp_adapter_enabled	: 1,
         		isp_req_ack_active_neg	: 1,	
 	        	isp_data_line_active_neg: 1,
 			isp_cmd_dma_burst_enable: 1,
@@ -109,7 +109,7 @@ typedef struct {
 		u_int8_t	dev_flags;	/* Device Flags - see below */
 		u_int8_t	exc_throttle;
 		u_int8_t	sync_period;
-		u_int8_t	sync_offset	: 4,
+		u_int		sync_offset	: 4,
 				dev_enable	: 1;
 	} isp_devparam[MAX_TARGETS];
 } sdparam;	/* scsi device parameters */
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 339ccfd98b489..0494a4935cd61 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.36 1998/04/15 17:45:48 bde Exp $ */
+/* $Id: scd.c,v 1.37 1998/06/07 17:10:56 dfr Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -125,8 +125,8 @@ static struct scd_data {
 	struct disklabel dlabel;
 	int	openflag;
 	struct {
-		unsigned char adr :4;
-		unsigned char ctl :4; /* xcdplayer needs this */
+		unsigned int  adr :4;
+		unsigned int  ctl :4; /* xcdplayer needs this */
 		unsigned char start_msf[3];
 	} toc[MAX_TRACKS];
 	short	first_track;