diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2007-07-21 07:37:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:49:14 -0400 |
commit | 28de7948a896763bc97ccd416bba5b9422158350 (patch) | |
tree | abee128b137a6fa9fa4104b7bbc4ee409467c38f /fs/udf/osta_udf.h | |
parent | 71133027febfabd501fde7583b30008224f4d799 (diff) |
UDF: coding style conversion - lindent fixups
This patch fixes up sources after conversion by Lindent.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/udf/osta_udf.h')
-rw-r--r-- | fs/udf/osta_udf.h | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/fs/udf/osta_udf.h b/fs/udf/osta_udf.h index bec5d340d8c5..65ff47902bd2 100644 --- a/fs/udf/osta_udf.h +++ b/fs/udf/osta_udf.h | |||
@@ -66,64 +66,64 @@ | |||
66 | #define IS_DF_SOFT_WRITE_PROTECT 0x02 | 66 | #define IS_DF_SOFT_WRITE_PROTECT 0x02 |
67 | 67 | ||
68 | struct UDFIdentSuffix { | 68 | struct UDFIdentSuffix { |
69 | __le16 UDFRevision; | 69 | __le16 UDFRevision; |
70 | uint8_t OSClass; | 70 | uint8_t OSClass; |
71 | uint8_t OSIdentifier; | 71 | uint8_t OSIdentifier; |
72 | uint8_t reserved[4]; | 72 | uint8_t reserved[4]; |
73 | } __attribute__ ((packed)); | 73 | } __attribute__ ((packed)); |
74 | 74 | ||
75 | struct impIdentSuffix { | 75 | struct impIdentSuffix { |
76 | uint8_t OSClass; | 76 | uint8_t OSClass; |
77 | uint8_t OSIdentifier; | 77 | uint8_t OSIdentifier; |
78 | uint8_t reserved[6]; | 78 | uint8_t reserved[6]; |
79 | } __attribute__ ((packed)); | 79 | } __attribute__ ((packed)); |
80 | 80 | ||
81 | struct appIdentSuffix { | 81 | struct appIdentSuffix { |
82 | uint8_t impUse[8]; | 82 | uint8_t impUse[8]; |
83 | } __attribute__ ((packed)); | 83 | } __attribute__ ((packed)); |
84 | 84 | ||
85 | /* Logical Volume Integrity Descriptor (UDF 2.50 2.2.6) */ | 85 | /* Logical Volume Integrity Descriptor (UDF 2.50 2.2.6) */ |
86 | /* Implementation Use (UDF 2.50 2.2.6.4) */ | 86 | /* Implementation Use (UDF 2.50 2.2.6.4) */ |
87 | struct logicalVolIntegrityDescImpUse { | 87 | struct logicalVolIntegrityDescImpUse { |
88 | regid impIdent; | 88 | regid impIdent; |
89 | __le32 numFiles; | 89 | __le32 numFiles; |
90 | __le32 numDirs; | 90 | __le32 numDirs; |
91 | __le16 minUDFReadRev; | 91 | __le16 minUDFReadRev; |
92 | __le16 minUDFWriteRev; | 92 | __le16 minUDFWriteRev; |
93 | __le16 maxUDFWriteRev; | 93 | __le16 maxUDFWriteRev; |
94 | uint8_t impUse[0]; | 94 | uint8_t impUse[0]; |
95 | } __attribute__ ((packed)); | 95 | } __attribute__ ((packed)); |
96 | 96 | ||
97 | /* Implementation Use Volume Descriptor (UDF 2.50 2.2.7) */ | 97 | /* Implementation Use Volume Descriptor (UDF 2.50 2.2.7) */ |
98 | /* Implementation Use (UDF 2.50 2.2.7.2) */ | 98 | /* Implementation Use (UDF 2.50 2.2.7.2) */ |
99 | struct impUseVolDescImpUse { | 99 | struct impUseVolDescImpUse { |
100 | charspec LVICharset; | 100 | charspec LVICharset; |
101 | dstring logicalVolIdent[128]; | 101 | dstring logicalVolIdent[128]; |
102 | dstring LVInfo1[36]; | 102 | dstring LVInfo1[36]; |
103 | dstring LVInfo2[36]; | 103 | dstring LVInfo2[36]; |
104 | dstring LVInfo3[36]; | 104 | dstring LVInfo3[36]; |
105 | regid impIdent; | 105 | regid impIdent; |
106 | uint8_t impUse[128]; | 106 | uint8_t impUse[128]; |
107 | } __attribute__ ((packed)); | 107 | } __attribute__ ((packed)); |
108 | 108 | ||
109 | struct udfPartitionMap2 { | 109 | struct udfPartitionMap2 { |
110 | uint8_t partitionMapType; | 110 | uint8_t partitionMapType; |
111 | uint8_t partitionMapLength; | 111 | uint8_t partitionMapLength; |
112 | uint8_t reserved1[2]; | 112 | uint8_t reserved1[2]; |
113 | regid partIdent; | 113 | regid partIdent; |
114 | __le16 volSeqNum; | 114 | __le16 volSeqNum; |
115 | __le16 partitionNum; | 115 | __le16 partitionNum; |
116 | } __attribute__ ((packed)); | 116 | } __attribute__ ((packed)); |
117 | 117 | ||
118 | /* Virtual Partition Map (UDF 2.50 2.2.8) */ | 118 | /* Virtual Partition Map (UDF 2.50 2.2.8) */ |
119 | struct virtualPartitionMap { | 119 | struct virtualPartitionMap { |
120 | uint8_t partitionMapType; | 120 | uint8_t partitionMapType; |
121 | uint8_t partitionMapLength; | 121 | uint8_t partitionMapLength; |
122 | uint8_t reserved1[2]; | 122 | uint8_t reserved1[2]; |
123 | regid partIdent; | 123 | regid partIdent; |
124 | __le16 volSeqNum; | 124 | __le16 volSeqNum; |
125 | __le16 partitionNum; | 125 | __le16 partitionNum; |
126 | uint8_t reserved2[24]; | 126 | uint8_t reserved2[24]; |
127 | } __attribute__ ((packed)); | 127 | } __attribute__ ((packed)); |
128 | 128 | ||
129 | /* Sparable Partition Map (UDF 2.50 2.2.9) */ | 129 | /* Sparable Partition Map (UDF 2.50 2.2.9) */ |
@@ -143,62 +143,62 @@ struct sparablePartitionMap { | |||
143 | 143 | ||
144 | /* Metadata Partition Map (UDF 2.4.0 2.2.10) */ | 144 | /* Metadata Partition Map (UDF 2.4.0 2.2.10) */ |
145 | struct metadataPartitionMap { | 145 | struct metadataPartitionMap { |
146 | uint8_t partitionMapType; | 146 | uint8_t partitionMapType; |
147 | uint8_t partitionMapLength; | 147 | uint8_t partitionMapLength; |
148 | uint8_t reserved1[2]; | 148 | uint8_t reserved1[2]; |
149 | regid partIdent; | 149 | regid partIdent; |
150 | __le16 volSeqNum; | 150 | __le16 volSeqNum; |
151 | __le16 partitionNum; | 151 | __le16 partitionNum; |
152 | __le32 metadataFileLoc; | 152 | __le32 metadataFileLoc; |
153 | __le32 metadataMirrorFileLoc; | 153 | __le32 metadataMirrorFileLoc; |
154 | __le32 metadataBitmapFileLoc; | 154 | __le32 metadataBitmapFileLoc; |
155 | __le32 allocUnitSize; | 155 | __le32 allocUnitSize; |
156 | __le16 alignUnitSize; | 156 | __le16 alignUnitSize; |
157 | uint8_t flags; | 157 | uint8_t flags; |
158 | uint8_t reserved2[5]; | 158 | uint8_t reserved2[5]; |
159 | } __attribute__ ((packed)); | 159 | } __attribute__ ((packed)); |
160 | 160 | ||
161 | /* Virtual Allocation Table (UDF 1.5 2.2.10) */ | 161 | /* Virtual Allocation Table (UDF 1.5 2.2.10) */ |
162 | struct virtualAllocationTable15 { | 162 | struct virtualAllocationTable15 { |
163 | __le32 VirtualSector[0]; | 163 | __le32 VirtualSector[0]; |
164 | regid vatIdent; | 164 | regid vatIdent; |
165 | __le32 previousVATICBLoc; | 165 | __le32 previousVATICBLoc; |
166 | } __attribute__ ((packed)); | 166 | } __attribute__ ((packed)); |
167 | 167 | ||
168 | #define ICBTAG_FILE_TYPE_VAT15 0x00U | 168 | #define ICBTAG_FILE_TYPE_VAT15 0x00U |
169 | 169 | ||
170 | /* Virtual Allocation Table (UDF 2.50 2.2.11) */ | 170 | /* Virtual Allocation Table (UDF 2.50 2.2.11) */ |
171 | struct virtualAllocationTable20 { | 171 | struct virtualAllocationTable20 { |
172 | __le16 lengthHeader; | 172 | __le16 lengthHeader; |
173 | __le16 lengthImpUse; | 173 | __le16 lengthImpUse; |
174 | dstring logicalVolIdent[128]; | 174 | dstring logicalVolIdent[128]; |
175 | __le32 previousVATICBLoc; | 175 | __le32 previousVATICBLoc; |
176 | __le32 numFiles; | 176 | __le32 numFiles; |
177 | __le32 numDirs; | 177 | __le32 numDirs; |
178 | __le16 minReadRevision; | 178 | __le16 minReadRevision; |
179 | __le16 minWriteRevision; | 179 | __le16 minWriteRevision; |
180 | __le16 maxWriteRevision; | 180 | __le16 maxWriteRevision; |
181 | __le16 reserved; | 181 | __le16 reserved; |
182 | uint8_t impUse[0]; | 182 | uint8_t impUse[0]; |
183 | __le32 vatEntry[0]; | 183 | __le32 vatEntry[0]; |
184 | } __attribute__ ((packed)); | 184 | } __attribute__ ((packed)); |
185 | 185 | ||
186 | #define ICBTAG_FILE_TYPE_VAT20 0xF8U | 186 | #define ICBTAG_FILE_TYPE_VAT20 0xF8U |
187 | 187 | ||
188 | /* Sparing Table (UDF 2.50 2.2.12) */ | 188 | /* Sparing Table (UDF 2.50 2.2.12) */ |
189 | struct sparingEntry { | 189 | struct sparingEntry { |
190 | __le32 origLocation; | 190 | __le32 origLocation; |
191 | __le32 mappedLocation; | 191 | __le32 mappedLocation; |
192 | } __attribute__ ((packed)); | 192 | } __attribute__ ((packed)); |
193 | 193 | ||
194 | struct sparingTable { | 194 | struct sparingTable { |
195 | tag descTag; | 195 | tag descTag; |
196 | regid sparingIdent; | 196 | regid sparingIdent; |
197 | __le16 reallocationTableLen; | 197 | __le16 reallocationTableLen; |
198 | __le16 reserved; | 198 | __le16 reserved; |
199 | __le32 sequenceNum; | 199 | __le32 sequenceNum; |
200 | struct sparingEntry | 200 | struct sparingEntry |
201 | mapEntry[0]; | 201 | mapEntry[0]; |
202 | } __attribute__ ((packed)); | 202 | } __attribute__ ((packed)); |
203 | 203 | ||
204 | /* Metadata File (and Metadata Mirror File) (UDF 2.50 2.2.13.1) */ | 204 | /* Metadata File (and Metadata Mirror File) (UDF 2.50 2.2.13.1) */ |
@@ -208,8 +208,8 @@ struct sparingTable { | |||
208 | 208 | ||
209 | /* struct long_ad ICB - ADImpUse (UDF 2.50 2.2.4.3) */ | 209 | /* struct long_ad ICB - ADImpUse (UDF 2.50 2.2.4.3) */ |
210 | struct allocDescImpUse { | 210 | struct allocDescImpUse { |
211 | __le16 flags; | 211 | __le16 flags; |
212 | uint8_t impUse[4]; | 212 | uint8_t impUse[4]; |
213 | } __attribute__ ((packed)); | 213 | } __attribute__ ((packed)); |
214 | 214 | ||
215 | #define AD_IU_EXT_ERASED 0x0001 | 215 | #define AD_IU_EXT_ERASED 0x0001 |
@@ -220,23 +220,23 @@ struct allocDescImpUse { | |||
220 | /* Implementation Use Extended Attribute (UDF 2.50 3.3.4.5) */ | 220 | /* Implementation Use Extended Attribute (UDF 2.50 3.3.4.5) */ |
221 | /* FreeEASpace (UDF 2.50 3.3.4.5.1.1) */ | 221 | /* FreeEASpace (UDF 2.50 3.3.4.5.1.1) */ |
222 | struct freeEaSpace { | 222 | struct freeEaSpace { |
223 | __le16 headerChecksum; | 223 | __le16 headerChecksum; |
224 | uint8_t freeEASpace[0]; | 224 | uint8_t freeEASpace[0]; |
225 | } __attribute__ ((packed)); | 225 | } __attribute__ ((packed)); |
226 | 226 | ||
227 | /* DVD Copyright Management Information (UDF 2.50 3.3.4.5.1.2) */ | 227 | /* DVD Copyright Management Information (UDF 2.50 3.3.4.5.1.2) */ |
228 | struct DVDCopyrightImpUse { | 228 | struct DVDCopyrightImpUse { |
229 | __le16 headerChecksum; | 229 | __le16 headerChecksum; |
230 | uint8_t CGMSInfo; | 230 | uint8_t CGMSInfo; |
231 | uint8_t dataType; | 231 | uint8_t dataType; |
232 | uint8_t protectionSystemInfo[4]; | 232 | uint8_t protectionSystemInfo[4]; |
233 | } __attribute__ ((packed)); | 233 | } __attribute__ ((packed)); |
234 | 234 | ||
235 | /* Application Use Extended Attribute (UDF 2.50 3.3.4.6) */ | 235 | /* Application Use Extended Attribute (UDF 2.50 3.3.4.6) */ |
236 | /* FreeAppEASpace (UDF 2.50 3.3.4.6.1) */ | 236 | /* FreeAppEASpace (UDF 2.50 3.3.4.6.1) */ |
237 | struct freeAppEASpace { | 237 | struct freeAppEASpace { |
238 | __le16 headerChecksum; | 238 | __le16 headerChecksum; |
239 | uint8_t freeEASpace[0]; | 239 | uint8_t freeEASpace[0]; |
240 | } __attribute__ ((packed)); | 240 | } __attribute__ ((packed)); |
241 | 241 | ||
242 | /* UDF Defined System Stream (UDF 2.50 3.3.7) */ | 242 | /* UDF Defined System Stream (UDF 2.50 3.3.7) */ |
@@ -276,4 +276,4 @@ struct freeAppEASpace { | |||
276 | #define UDF_OS_ID_BEOS 0x00U | 276 | #define UDF_OS_ID_BEOS 0x00U |
277 | #define UDF_OS_ID_WINCE 0x00U | 277 | #define UDF_OS_ID_WINCE 0x00U |
278 | 278 | ||
279 | #endif /* _OSTA_UDF_H */ | 279 | #endif /* _OSTA_UDF_H */ |