mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-04 12:52:15 +00:00
Code Issues Releases Activity

Fixed pedantic semantics errors (bitfields not of type int, signed int

Browse Source 
or unsigned int (this doesn't change the struct layout, size or
alignment in any of the files changed in this commit, at least for
gcc on i386's.  Using bitfields of type u_char may affect size and
alignment but not packing)).
This commit is contained in:
Bruce Evans 1998-06-08 09:47:47 +00:00
parent c2a0fb7410
commit a09bee1aa8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=36767
20 changed files with 184 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/de/if_devar.h
View File

@ -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;

44
sys/dev/fxp/if_fxpreg.h
View File

@ -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;
};

6
sys/dev/isp/ispvar.h
View File

@ -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 */

6
sys/dev/scd/scd.c
View File

@ -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;

8
sys/i386/eisa/aha1742.c
View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.61 1997/09/21 21:35:21 gibbs Exp $
* $Id: aha1742.c,v 1.62 1998/04/17 22:36:23 des Exp $
*/
#ifdef KERNEL /* don't laugh, it compiles as a program too.. look */
@ -189,9 +189,9 @@ struct ahb_ecb_status {
struct ecb {
u_char opcode;
#define ECB_SCSI_OP 0x01
u_char:4;
u_char options:3;
u_char:1;
u_int:4;
u_int options:3;
int:1;
short opt1;
#define ECB_CNE 0x0001
#define ECB_DI 0x0080

6
sys/i386/include/vm86.h
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: vm86.h,v 1.4 1997/11/20 18:43:55 bde Exp $
* $Id: vm86.h,v 1.5 1998/03/23 19:52:57 jlemon Exp $
*/
#ifndef _MACHINE_VM86_H_
@ -37,12 +37,12 @@ typedef union {
u_long r_ex;
struct {
u_short r_x;
u_short :16;
u_int :16;
} r_w;
struct {
u_char r_l;
u_char r_h;
u_short :16;
u_int :16;
} r_b;
} reg86_t;

14
sys/i386/isa/atapi.h
View File

@ -241,13 +241,13 @@ struct atapicmd { /* ATAPI command block */
struct atapi { /* ATAPI controller data */
u_short port; /* i/o port base */
u_char ctrlr; /* physical controller number */
u_char debug : 1; /* trace enable flag */
u_char cmd16 : 1; /* 16-byte command flag */
u_char intrcmd : 1; /* interrupt before cmd flag */
u_char slow : 1; /* slow reaction device */
u_char accel : 1; /* accelerated reaction device */
u_char use_dsc : 1; /* use DSC completition handeling */
u_char wait_for_dsc : 1;
u_int debug : 1; /* trace enable flag */
u_int cmd16 : 1; /* 16-byte command flag */
u_int intrcmd : 1; /* interrupt before cmd flag */
u_int slow : 1; /* slow reaction device */
u_int accel : 1; /* accelerated reaction device */
u_int use_dsc : 1; /* use DSC completition handeling */
u_int wait_for_dsc : 1;
u_int dsc_timeout;
u_char attached[2]; /* units are attached to subdrivers */
struct atapi_params *params[2]; /* params for units 0,1 */

2
sys/i386/isa/ic/am7990.h
View File

@ -19,7 +19,7 @@
typedef struct {
unsigned short r_addr_lo;
unsigned short LN_BITFIELD3(r_addr_hi : 8,
unsigned int LN_BITFIELD3(r_addr_hi : 8,
: 5,
r_log2_size : 3);
} ln_ring_t;

6
sys/i386/isa/scd.c
View File

@ -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;

18
sys/i386/isa/ultra14f.c
View File

@ -22,7 +22,7 @@
* today: Fri Jun 2 17:21:03 EST 1994
* added 24F support ++sg
*
* $Id: ultra14f.c,v 1.58 1998/03/25 22:40:06 imp Exp $
* $Id: ultra14f.c,v 1.59 1998/04/17 22:36:42 des Exp $
*/
#ifdef KERNEL /* don't laugh.. this compiles to a program too.. look */
@ -205,21 +205,21 @@ struct uha_dma_seg {
};
struct mscp {
unsigned char opcode:3;
unsigned int opcode:3;
#define U14_HAC 0x01 /* host adapter command */
#define U14_TSP 0x02 /* target scsi pass through command */
#define U14_SDR 0x04 /* scsi device reset */
unsigned char xdir:2; /* xfer direction */
unsigned int xdir:2; /* xfer direction */
#define U14_SDET 0x00 /* determined by scsi command */
#define U14_SDIN 0x01 /* scsi data in */
#define U14_SDOUT 0x02 /* scsi data out */
#define U14_NODATA 0x03 /* no data xfer */
unsigned char dcn:1; /* disable disconnect for this command */
unsigned char ca:1; /* cache control */
unsigned char sgth:1; /* scatter gather flag */
unsigned char target:3;
unsigned char chan:2; /* scsi channel (always 0 for 14f) */
unsigned char lun:3;
unsigned int dcn:1; /* disable disconnect for this command */
unsigned int ca:1; /* cache control */
unsigned int sgth:1; /* scatter gather flag */
unsigned int target:3;
unsigned int chan:2; /* scsi channel (always 0 for 14f) */
unsigned int lun:3;
physaddr data;
physlen datalen;
physaddr link;

68
sys/i386/isa/wst.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: wst.c,v 1.4 1998/04/20 18:51:33 sos Exp $
* $Id: wst.c,v 1.5 1998/06/08 06:18:52 bde Exp $
*/
#include "wdc.h"
@ -108,33 +108,33 @@ struct wst_header {
#define ATAPI_TAPE_CAP_PAGE 0x2a
struct wst_cappage {
u_char page_code :6; /* Page code == 0x2a */
u_char reserved1_67 :2;
u_int page_code :6; /* Page code == 0x2a */
u_int reserved1_67 :2;
u_char page_length; /* Page Length == 0x12 */
u_char reserved2;
u_char reserved3;
u_char readonly :1; /* Read Only Mode */
u_char reserved4_1234 :4;
u_char reverse :1; /* Supports reverse direction */
u_char reserved4_67 :2;
u_char reserved5_012 :3;
u_char eformat :1; /* Supports ERASE formatting */
u_char reserved5_4 :1;
u_char qfa :1; /* Supports QFA formats */
u_char reserved5_67 :2;
u_char lock :1; /* Supports locking media */
u_char locked :1; /* The media is locked */
u_char prevent :1; /* Defaults to prevent state */
u_char eject :1; /* Supports eject */
u_char disconnect :1; /* Can break request > ctl */
u_char reserved6_5 :1;
u_char ecc :1; /* Supports error correction */
u_char compress :1; /* Supports data compression */
u_char reserved7_0 :1;
u_char blk512 :1; /* Supports 512b block size */
u_char blk1024 :1; /* Supports 1024b block size */
u_char reserved7_3456 :4;
u_char slowb :1; /* Restricts byte count */
u_int readonly :1; /* Read Only Mode */
u_int reserved4_1234 :4;
u_int reverse :1; /* Supports reverse direction */
u_int reserved4_67 :2;
u_int reserved5_012 :3;
u_int eformat :1; /* Supports ERASE formatting */
u_int reserved5_4 :1;
u_int qfa :1; /* Supports QFA formats */
u_int reserved5_67 :2;
u_int lock :1; /* Supports locking media */
u_int locked :1; /* The media is locked */
u_int prevent :1; /* Defaults to prevent state */
u_int eject :1; /* Supports eject */
u_int disconnect :1; /* Can break request > ctl */
u_int reserved6_5 :1;
u_int ecc :1; /* Supports error correction */
u_int compress :1; /* Supports data compression */
u_int reserved7_0 :1;
u_int blk512 :1; /* Supports 512b block size */
u_int blk1024 :1; /* Supports 1024b block size */
u_int reserved7_3456 :4;
u_int slowb :1; /* Restricts byte count */
u_short max_speed; /* Supported speed in KBps */
u_short max_defects; /* Max stored defect entries */
u_short ctl; /* Continuous Transfer Limit */
@ -148,22 +148,22 @@ struct wst_cappage {
* REQUEST SENSE structure
*/
struct wst_reqsense {
u_char error_code :7; /* Current or deferred errors */
u_char valid :1; /* Follows QIC-157C */
u_int error_code :7; /* Current or deferred errors */
u_int valid :1; /* Follows QIC-157C */
u_char reserved1; /* Segment Number - Reserved */
u_char sense_key :4; /* Sense Key */
u_char reserved2_4 :1; /* Reserved */
u_char ili :1; /* Incorrect Length Indicator */
u_char eom :1; /* End Of Medium */
u_char filemark :1; /* Filemark */
u_int sense_key :4; /* Sense Key */
u_int reserved2_4 :1; /* Reserved */
u_int ili :1; /* Incorrect Length Indicator */
u_int eom :1; /* End Of Medium */
u_int filemark :1; /* Filemark */
u_int info __attribute__((packed)); /* Cmd specific info */
u_char asl; /* Additional sense length (n-7) */
u_int command_specific; /* Additional cmd specific info */
u_char asc; /* Additional Sense Code */
u_char ascq; /* Additional Sense Code Qualifier */
u_char replaceable_unit_code; /* Field Replaceable Unit Code */
u_char sk_specific1 :7; /* Sense Key Specific */
u_char sksv :1; /* Sense Key Specific info valid */
u_int sk_specific1 :7; /* Sense Key Specific */
u_int sksv :1; /* Sense Key Specific info valid */
u_char sk_specific2; /* Sense Key Specific */
u_char sk_specific3; /* Sense Key Specific */
u_char pad[2]; /* Padding */

4
sys/i386/scsi/btreg.h
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id$
* $Id: btreg.h,v 1.6 1997/02/22 09:38:43 peter Exp $
*/
#ifndef _BTREG_H_
@ -80,7 +80,7 @@ struct bt_ccb {
#define BT_TARGET_CCB 0x01 /* SCSI Target CCB */
#define BT_INIT_SCAT_GATH_CCB 0x02 /* SCSI Initiator w/sg */
#define BT_RESET_CCB 0x81 /* SCSI Bus reset */
unsigned char:3, data_in:1, data_out:1,:3;
unsigned :3, data_in:1, data_out:1,:3;
unsigned char scsi_cmd_length;
unsigned char req_sense_length;
unsigned long data_length;

6
sys/netinet/ip_fil.h
View File

@ -6,7 +6,7 @@
* to the original author and the contributors.
*
* @(#)ip_fil.h 1.35 6/5/96
* $Id: ip_fil.h,v 1.3 1998/06/07 17:12:15 dfr Exp $
* $Id: ip_fil.h,v 1.4 1998/06/08 06:04:11 bde Exp $
*/
#ifndef __IP_FIL_H__
@ -82,8 +82,8 @@
#define SIOCINSFR SIOCINAFR
typedef struct fr_ip {
u_char fi_v:4; /* IP version */
u_char fi_fl:4; /* packet flags */
u_int fi_v:4; /* IP version */
u_int fi_fl:4; /* packet flags */
u_char fi_tos;
u_char fi_ttl;
u_char fi_p;

6
sys/netinet/ip_var.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_var.h 8.2 (Berkeley) 1/9/95
* $Id: ip_var.h,v 1.39 1998/06/05 22:40:01 julian Exp $
* $Id: ip_var.h,v 1.40 1998/06/06 19:39:10 julian Exp $
*/
#ifndef _NETINET_IP_VAR_H_
@ -76,11 +76,11 @@ struct ipq {
*/
struct ipasfrag {
#if BYTE_ORDER == LITTLE_ENDIAN
u_char ip_hl:4,
u_int ip_hl:4,
ip_v:4;
#endif
#if BYTE_ORDER == BIG_ENDIAN
u_char ip_v:4,
u_int ip_v:4,
ip_hl:4;
#endif
u_char ipf_mff; /* XXX overlays ip_tos: use low bit

6
sys/netinet/tcp.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tcp.h 8.1 (Berkeley) 6/10/93
* $Id$
* $Id: tcp.h,v 1.8 1997/02/22 09:41:37 peter Exp $
*/
#ifndef _NETINET_TCP_H_
@ -50,11 +50,11 @@ struct tcphdr {
tcp_seq th_seq; /* sequence number */
tcp_seq th_ack; /* acknowledgement number */
#if BYTE_ORDER == LITTLE_ENDIAN
u_char th_x2:4, /* (unused) */
u_int th_x2:4, /* (unused) */
th_off:4; /* data offset */
#endif
#if BYTE_ORDER == BIG_ENDIAN
u_char th_off:4, /* data offset */
u_int th_off:4, /* data offset */
th_x2:4; /* (unused) */
#endif
u_char th_flags;

14
sys/pc98/pc98/atapi.h
View File

@ -241,13 +241,13 @@ struct atapicmd { /* ATAPI command block */
struct atapi { /* ATAPI controller data */
u_short port; /* i/o port base */
u_char ctrlr; /* physical controller number */
u_char debug : 1; /* trace enable flag */
u_char cmd16 : 1; /* 16-byte command flag */
u_char intrcmd : 1; /* interrupt before cmd flag */
u_char slow : 1; /* slow reaction device */
u_char accel : 1; /* accelerated reaction device */
u_char use_dsc : 1; /* use DSC completition handeling */
u_char wait_for_dsc : 1;
u_int debug : 1; /* trace enable flag */
u_int cmd16 : 1; /* 16-byte command flag */
u_int intrcmd : 1; /* interrupt before cmd flag */
u_int slow : 1; /* slow reaction device */
u_int accel : 1; /* accelerated reaction device */
u_int use_dsc : 1; /* use DSC completition handeling */
u_int wait_for_dsc : 1;
u_int dsc_timeout;
u_char attached[2]; /* units are attached to subdrivers */
struct atapi_params *params[2]; /* params for units 0,1 */

68
sys/pc98/pc98/wst.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: wst.c,v 1.4 1998/04/20 18:51:33 sos Exp $
* $Id: wst.c,v 1.5 1998/06/08 06:18:52 bde Exp $
*/
#include "wdc.h"
@ -108,33 +108,33 @@ struct wst_header {
#define ATAPI_TAPE_CAP_PAGE 0x2a
struct wst_cappage {
u_char page_code :6; /* Page code == 0x2a */
u_char reserved1_67 :2;
u_int page_code :6; /* Page code == 0x2a */
u_int reserved1_67 :2;
u_char page_length; /* Page Length == 0x12 */
u_char reserved2;
u_char reserved3;
u_char readonly :1; /* Read Only Mode */
u_char reserved4_1234 :4;
u_char reverse :1; /* Supports reverse direction */
u_char reserved4_67 :2;
u_char reserved5_012 :3;
u_char eformat :1; /* Supports ERASE formatting */
u_char reserved5_4 :1;
u_char qfa :1; /* Supports QFA formats */
u_char reserved5_67 :2;
u_char lock :1; /* Supports locking media */
u_char locked :1; /* The media is locked */
u_char prevent :1; /* Defaults to prevent state */
u_char eject :1; /* Supports eject */
u_char disconnect :1; /* Can break request > ctl */
u_char reserved6_5 :1;
u_char ecc :1; /* Supports error correction */
u_char compress :1; /* Supports data compression */
u_char reserved7_0 :1;
u_char blk512 :1; /* Supports 512b block size */
u_char blk1024 :1; /* Supports 1024b block size */
u_char reserved7_3456 :4;
u_char slowb :1; /* Restricts byte count */
u_int readonly :1; /* Read Only Mode */
u_int reserved4_1234 :4;
u_int reverse :1; /* Supports reverse direction */
u_int reserved4_67 :2;
u_int reserved5_012 :3;
u_int eformat :1; /* Supports ERASE formatting */
u_int reserved5_4 :1;
u_int qfa :1; /* Supports QFA formats */
u_int reserved5_67 :2;
u_int lock :1; /* Supports locking media */
u_int locked :1; /* The media is locked */
u_int prevent :1; /* Defaults to prevent state */
u_int eject :1; /* Supports eject */
u_int disconnect :1; /* Can break request > ctl */
u_int reserved6_5 :1;
u_int ecc :1; /* Supports error correction */
u_int compress :1; /* Supports data compression */
u_int reserved7_0 :1;
u_int blk512 :1; /* Supports 512b block size */
u_int blk1024 :1; /* Supports 1024b block size */
u_int reserved7_3456 :4;
u_int slowb :1; /* Restricts byte count */
u_short max_speed; /* Supported speed in KBps */
u_short max_defects; /* Max stored defect entries */
u_short ctl; /* Continuous Transfer Limit */
@ -148,22 +148,22 @@ struct wst_cappage {
* REQUEST SENSE structure
*/
struct wst_reqsense {
u_char error_code :7; /* Current or deferred errors */
u_char valid :1; /* Follows QIC-157C */
u_int error_code :7; /* Current or deferred errors */
u_int valid :1; /* Follows QIC-157C */
u_char reserved1; /* Segment Number - Reserved */
u_char sense_key :4; /* Sense Key */
u_char reserved2_4 :1; /* Reserved */
u_char ili :1; /* Incorrect Length Indicator */
u_char eom :1; /* End Of Medium */
u_char filemark :1; /* Filemark */
u_int sense_key :4; /* Sense Key */
u_int reserved2_4 :1; /* Reserved */
u_int ili :1; /* Incorrect Length Indicator */
u_int eom :1; /* End Of Medium */
u_int filemark :1; /* Filemark */
u_int info __attribute__((packed)); /* Cmd specific info */
u_char asl; /* Additional sense length (n-7) */
u_int command_specific; /* Additional cmd specific info */
u_char asc; /* Additional Sense Code */
u_char ascq; /* Additional Sense Code Qualifier */
u_char replaceable_unit_code; /* Field Replaceable Unit Code */
u_char sk_specific1 :7; /* Sense Key Specific */
u_char sksv :1; /* Sense Key Specific info valid */
u_int sk_specific1 :7; /* Sense Key Specific */
u_int sksv :1; /* Sense Key Specific info valid */
u_char sk_specific2; /* Sense Key Specific */
u_char sk_specific3; /* Sense Key Specific */
u_char pad[2]; /* Padding */

4
sys/pci/if_devar.h
View File

@ -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;

44
sys/pci/if_fxpreg.h
View File

@ -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;
};

34
sys/sys/cdio.h
View File

@ -1,7 +1,7 @@
/*
* 16 Feb 93 Julian Elischer (julian@dialix.oz.au)
*
* $Id: cdio.h,v 1.16 1997/02/22 09:44:53 peter Exp $
* $Id: cdio.h,v 1.17 1997/05/04 15:24:23 joerg Exp $
*/
/*
@ -43,16 +43,16 @@ union msf_lba {
};
struct cd_toc_entry {
u_char :8;
u_char control:4;
u_char addr_type:4;
u_int :8;
u_int control:4;
u_int addr_type:4;
u_char track;
u_char :8;
u_int :8;
union msf_lba addr;
};
struct cd_sub_channel_header {
u_char :8;
u_int :8;
u_char audio_status;
#define CD_AS_AUDIO_INVALID 0x00
#define CD_AS_PLAY_IN_PROGRESS 0x11
@ -65,8 +65,8 @@ struct cd_sub_channel_header {
struct cd_sub_channel_position_data {
u_char data_format;
u_char control:4;
u_char addr_type:4;
u_int control:4;
u_int addr_type:4;
u_char track_number;
u_char index_number;
union msf_lba absaddr;
@ -75,21 +75,21 @@ struct cd_sub_channel_position_data {
struct cd_sub_channel_media_catalog {
u_char data_format;
u_char :8;
u_char :8;
u_char :8;
u_char :7;
u_char mc_valid:1;
u_int :8;
u_int :8;
u_int :8;
u_int :7;
u_int mc_valid:1;
u_char mc_number[15];
};
struct cd_sub_channel_track_info {
u_char data_format;
u_char :8;
u_int :8;
u_char track_number;
u_char :8;
u_char :7;
u_char ti_valid:1;
u_int :8;
u_int :7;
u_int ti_valid:1;
u_char ti_number[15];
};