diff options
author | dann frazier <dannf@hp.com> | 2010-02-17 18:53:31 -0500 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:44:45 -0500 |
commit | b028461d66a4dc2754d4e5dab1b3974c44798c5d (patch) | |
tree | d12b0275b3fd1af7d6c841ae053248d6efb57169 /include/linux/cciss_ioctl.h | |
parent | 488991e28e55b4fbca8067edf0259f69d1a6f92c (diff) |
cciss: remove C99-style comments
Some cleanup before the header file split-out so we don't propagate this style
into new files.
Acked-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: dann frazier <dannf@hp.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux/cciss_ioctl.h')
-rw-r--r-- | include/linux/cciss_ioctl.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h index eb130b4d8e72..e7343a1a9ea8 100644 --- a/include/linux/cciss_ioctl.h +++ b/include/linux/cciss_ioctl.h | |||
@@ -37,12 +37,13 @@ typedef __u32 DriverVer_type; | |||
37 | #define MAX_KMALLOC_SIZE 128000 | 37 | #define MAX_KMALLOC_SIZE 128000 |
38 | 38 | ||
39 | #ifndef CCISS_CMD_H | 39 | #ifndef CCISS_CMD_H |
40 | // This defines are duplicated in cciss_cmd.h in the driver directory | 40 | /* This defines are duplicated in cciss_cmd.h in the driver directory */ |
41 | 41 | ||
42 | //general boundary definitions | 42 | /* general boundary definitions */ |
43 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations | 43 | #define SENSEINFOBYTES 32 /* note that this value may vary |
44 | between host implementations */ | ||
44 | 45 | ||
45 | //Command Status value | 46 | /* Command Status value */ |
46 | #define CMD_SUCCESS 0x0000 | 47 | #define CMD_SUCCESS 0x0000 |
47 | #define CMD_TARGET_STATUS 0x0001 | 48 | #define CMD_TARGET_STATUS 0x0001 |
48 | #define CMD_DATA_UNDERRUN 0x0002 | 49 | #define CMD_DATA_UNDERRUN 0x0002 |
@@ -57,24 +58,24 @@ typedef __u32 DriverVer_type; | |||
57 | #define CMD_TIMEOUT 0x000B | 58 | #define CMD_TIMEOUT 0x000B |
58 | #define CMD_UNABORTABLE 0x000C | 59 | #define CMD_UNABORTABLE 0x000C |
59 | 60 | ||
60 | //transfer direction | 61 | /* transfer direction */ |
61 | #define XFER_NONE 0x00 | 62 | #define XFER_NONE 0x00 |
62 | #define XFER_WRITE 0x01 | 63 | #define XFER_WRITE 0x01 |
63 | #define XFER_READ 0x02 | 64 | #define XFER_READ 0x02 |
64 | #define XFER_RSVD 0x03 | 65 | #define XFER_RSVD 0x03 |
65 | 66 | ||
66 | //task attribute | 67 | /* task attribute */ |
67 | #define ATTR_UNTAGGED 0x00 | 68 | #define ATTR_UNTAGGED 0x00 |
68 | #define ATTR_SIMPLE 0x04 | 69 | #define ATTR_SIMPLE 0x04 |
69 | #define ATTR_HEADOFQUEUE 0x05 | 70 | #define ATTR_HEADOFQUEUE 0x05 |
70 | #define ATTR_ORDERED 0x06 | 71 | #define ATTR_ORDERED 0x06 |
71 | #define ATTR_ACA 0x07 | 72 | #define ATTR_ACA 0x07 |
72 | 73 | ||
73 | //cdb type | 74 | /* cdb type */ |
74 | #define TYPE_CMD 0x00 | 75 | #define TYPE_CMD 0x00 |
75 | #define TYPE_MSG 0x01 | 76 | #define TYPE_MSG 0x01 |
76 | 77 | ||
77 | // Type defs used in the following structs | 78 | /* Type defs used in the following structs */ |
78 | #define BYTE __u8 | 79 | #define BYTE __u8 |
79 | #define WORD __u16 | 80 | #define WORD __u16 |
80 | #define HWORD __u16 | 81 | #define HWORD __u16 |
@@ -82,28 +83,28 @@ typedef __u32 DriverVer_type; | |||
82 | 83 | ||
83 | #define CISS_MAX_LUN 1024 | 84 | #define CISS_MAX_LUN 1024 |
84 | 85 | ||
85 | #define LEVEL2LUN 1 // index into Target(x) structure, due to byte swapping | 86 | #define LEVEL2LUN 1 /* index into Target(x) structure, due to byte swapping */ |
86 | #define LEVEL3LUN 0 | 87 | #define LEVEL3LUN 0 |
87 | 88 | ||
88 | #pragma pack(1) | 89 | #pragma pack(1) |
89 | 90 | ||
90 | //Command List Structure | 91 | /* Command List Structure */ |
91 | typedef union _SCSI3Addr_struct { | 92 | typedef union _SCSI3Addr_struct { |
92 | struct { | 93 | struct { |
93 | BYTE Dev; | 94 | BYTE Dev; |
94 | BYTE Bus:6; | 95 | BYTE Bus:6; |
95 | BYTE Mode:2; // b00 | 96 | BYTE Mode:2; /* b00 */ |
96 | } PeripDev; | 97 | } PeripDev; |
97 | struct { | 98 | struct { |
98 | BYTE DevLSB; | 99 | BYTE DevLSB; |
99 | BYTE DevMSB:6; | 100 | BYTE DevMSB:6; |
100 | BYTE Mode:2; // b01 | 101 | BYTE Mode:2; /* b01 */ |
101 | } LogDev; | 102 | } LogDev; |
102 | struct { | 103 | struct { |
103 | BYTE Dev:5; | 104 | BYTE Dev:5; |
104 | BYTE Bus:3; | 105 | BYTE Bus:3; |
105 | BYTE Targ:6; | 106 | BYTE Targ:6; |
106 | BYTE Mode:2; // b10 | 107 | BYTE Mode:2; /* b10 */ |
107 | } LogUnit; | 108 | } LogUnit; |
108 | } SCSI3Addr_struct; | 109 | } SCSI3Addr_struct; |
109 | 110 | ||
@@ -111,7 +112,7 @@ typedef struct _PhysDevAddr_struct { | |||
111 | DWORD TargetId:24; | 112 | DWORD TargetId:24; |
112 | DWORD Bus:6; | 113 | DWORD Bus:6; |
113 | DWORD Mode:2; | 114 | DWORD Mode:2; |
114 | SCSI3Addr_struct Target[2]; //2 level target device addr | 115 | SCSI3Addr_struct Target[2]; /* 2 level target device addr */ |
115 | } PhysDevAddr_struct; | 116 | } PhysDevAddr_struct; |
116 | 117 | ||
117 | typedef struct _LogDevAddr_struct { | 118 | typedef struct _LogDevAddr_struct { |
@@ -146,8 +147,8 @@ typedef union _MoreErrInfo_struct{ | |||
146 | }Common_Info; | 147 | }Common_Info; |
147 | struct{ | 148 | struct{ |
148 | BYTE Reserved[2]; | 149 | BYTE Reserved[2]; |
149 | BYTE offense_size;//size of offending entry | 150 | BYTE offense_size; /* size of offending entry */ |
150 | BYTE offense_num; //byte # of offense 0-base | 151 | BYTE offense_num; /* byte # of offense 0-base */ |
151 | DWORD offense_value; | 152 | DWORD offense_value; |
152 | }Invalid_Cmd; | 153 | }Invalid_Cmd; |
153 | }MoreErrInfo_struct; | 154 | }MoreErrInfo_struct; |