summaryrefslogtreecommitdiffstats
path: root/sys/dev/ciss/cissio.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ciss/cissio.h')
-rw-r--r--sys/dev/ciss/cissio.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/ciss/cissio.h b/sys/dev/ciss/cissio.h
index b4cce85..abc14ab 100644
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.h
@@ -108,18 +108,18 @@ typedef union {
u_int8_t Dev;
u_int8_t Bus:6;
u_int8_t Mode:2;
- } PeripDev __attribute__ ((__packed__));
+ } PeripDev __packed;
struct {
u_int8_t DevLSB;
u_int8_t DevMSB:6;
u_int8_t Mode:2;
- } LogDev __attribute__ ((__packed__));
+ } LogDev __packed;
struct {
u_int8_t Dev:5;
u_int8_t Bus:3;
u_int8_t Targ:6;
u_int8_t Mode:2;
- } LogUnit __attribute__ ((__packed__));
+ } LogUnit __packed;
} SCSI3Addr_struct;
typedef struct {
@@ -127,20 +127,20 @@ typedef struct {
u_int32_t Bus:6;
u_int32_t Mode:2;
SCSI3Addr_struct Target[2];
-} PhysDevAddr_struct __attribute__ ((__packed__));
+} PhysDevAddr_struct __packed;
typedef struct {
u_int32_t VolId:30;
u_int32_t Mode:2;
u_int8_t reserved[4];
-} LogDevAddr_struct __attribute__ ((__packed__));
+} LogDevAddr_struct __packed;
typedef union {
u_int8_t LunAddrBytes[8];
SCSI3Addr_struct SCSI3Lun[4];
PhysDevAddr_struct PhysDev;
LogDevAddr_struct LogDev;
-} LUNAddr_struct __attribute__ ((__packed__));
+} LUNAddr_struct __packed;
typedef struct {
u_int8_t CDBLen;
@@ -148,24 +148,24 @@ typedef struct {
u_int8_t Type:3;
u_int8_t Attribute:3;
u_int8_t Direction:2;
- } Type __attribute__ ((__packed__));
+ } Type __packed;
u_int16_t Timeout;
u_int8_t CDB[16];
-} RequestBlock_struct __attribute__ ((__packed__));
+} RequestBlock_struct __packed;
typedef union {
struct {
u_int8_t Reserved[3];
u_int8_t Type;
u_int32_t ErrorInfo;
- } Common_Info __attribute__ ((__packed__));
+ } Common_Info __packed;
struct {
u_int8_t Reserved[2];
u_int8_t offense_size;
u_int8_t offense_num;
u_int32_t offense_value;
- } Invalid_Cmd __attribute__ ((__packed__));
-} MoreErrInfo_struct __attribute__ ((__packed__));
+ } Invalid_Cmd __packed;
+} MoreErrInfo_struct __packed;
typedef struct {
u_int8_t ScsiStatus;
@@ -174,7 +174,7 @@ typedef struct {
u_int32_t ResidualCnt;
MoreErrInfo_struct MoreErrInfo;
u_int8_t SenseInfo[SENSEINFOBYTES];
-} ErrorInfo_struct __attribute__ ((__packed__));
+} ErrorInfo_struct __packed;
typedef struct {
LUNAddr_struct LUN_info; /* 8 */
@@ -182,7 +182,7 @@ typedef struct {
ErrorInfo_struct error_info; /* 48 */
u_int16_t buf_size; /* 2 */
u_int8_t *buf; /* 4 */
-} IOCTL_Command_struct __attribute__ ((__packed__));
+} IOCTL_Command_struct __packed;
/*
* Note that we'd normally pass the struct in directly, but
OpenPOWER on IntegriCloud