diff options
-rw-r--r-- | drivers/scsi/BusLogic.c | 42 | ||||
-rw-r--r-- | drivers/scsi/BusLogic.h | 300 | ||||
-rw-r--r-- | drivers/scsi/FlashPoint.c | 4 |
3 files changed, 170 insertions, 176 deletions
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index 6272ec2125ec..e874b8944875 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c | |||
@@ -192,7 +192,7 @@ static void BusLogic_InitializeCCBs(struct BusLogic_HostAdapter *HostAdapter, vo | |||
192 | BusLogic_CreateInitialCCBs allocates the initial CCBs for Host Adapter. | 192 | BusLogic_CreateInitialCCBs allocates the initial CCBs for Host Adapter. |
193 | */ | 193 | */ |
194 | 194 | ||
195 | static boolean __init BusLogic_CreateInitialCCBs(struct BusLogic_HostAdapter *HostAdapter) | 195 | static bool __init BusLogic_CreateInitialCCBs(struct BusLogic_HostAdapter *HostAdapter) |
196 | { | 196 | { |
197 | int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); | 197 | int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); |
198 | void *BlockPointer; | 198 | void *BlockPointer; |
@@ -238,7 +238,7 @@ static void BusLogic_DestroyCCBs(struct BusLogic_HostAdapter *HostAdapter) | |||
238 | multiple host adapters share the same IRQ Channel. | 238 | multiple host adapters share the same IRQ Channel. |
239 | */ | 239 | */ |
240 | 240 | ||
241 | static void BusLogic_CreateAdditionalCCBs(struct BusLogic_HostAdapter *HostAdapter, int AdditionalCCBs, boolean SuccessMessageP) | 241 | static void BusLogic_CreateAdditionalCCBs(struct BusLogic_HostAdapter *HostAdapter, int AdditionalCCBs, bool SuccessMessageP) |
242 | { | 242 | { |
243 | int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); | 243 | int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(struct BusLogic_CCB); |
244 | int PreviouslyAllocated = HostAdapter->AllocatedCCBs; | 244 | int PreviouslyAllocated = HostAdapter->AllocatedCCBs; |
@@ -637,9 +637,9 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd | |||
637 | struct BusLogic_ProbeInfo *PrimaryProbeInfo = &BusLogic_ProbeInfoList[BusLogic_ProbeInfoCount]; | 637 | struct BusLogic_ProbeInfo *PrimaryProbeInfo = &BusLogic_ProbeInfoList[BusLogic_ProbeInfoCount]; |
638 | int NonPrimaryPCIMultiMasterIndex = BusLogic_ProbeInfoCount + 1; | 638 | int NonPrimaryPCIMultiMasterIndex = BusLogic_ProbeInfoCount + 1; |
639 | int NonPrimaryPCIMultiMasterCount = 0, PCIMultiMasterCount = 0; | 639 | int NonPrimaryPCIMultiMasterCount = 0, PCIMultiMasterCount = 0; |
640 | boolean ForceBusDeviceScanningOrder = false; | 640 | bool ForceBusDeviceScanningOrder = false; |
641 | boolean ForceBusDeviceScanningOrderChecked = false; | 641 | bool ForceBusDeviceScanningOrderChecked = false; |
642 | boolean StandardAddressSeen[6]; | 642 | bool StandardAddressSeen[6]; |
643 | struct pci_dev *PCI_Device = NULL; | 643 | struct pci_dev *PCI_Device = NULL; |
644 | int i; | 644 | int i; |
645 | if (BusLogic_ProbeInfoCount >= BusLogic_MaxHostAdapters) | 645 | if (BusLogic_ProbeInfoCount >= BusLogic_MaxHostAdapters) |
@@ -1009,7 +1009,7 @@ static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter | |||
1009 | BusLogic_Failure prints a standardized error message, and then returns false. | 1009 | BusLogic_Failure prints a standardized error message, and then returns false. |
1010 | */ | 1010 | */ |
1011 | 1011 | ||
1012 | static boolean BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char *ErrorMessage) | 1012 | static bool BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char *ErrorMessage) |
1013 | { | 1013 | { |
1014 | BusLogic_AnnounceDriver(HostAdapter); | 1014 | BusLogic_AnnounceDriver(HostAdapter); |
1015 | if (HostAdapter->HostAdapterBusType == BusLogic_PCI_Bus) { | 1015 | if (HostAdapter->HostAdapterBusType == BusLogic_PCI_Bus) { |
@@ -1028,7 +1028,7 @@ static boolean BusLogic_Failure(struct BusLogic_HostAdapter *HostAdapter, char * | |||
1028 | BusLogic_ProbeHostAdapter probes for a BusLogic Host Adapter. | 1028 | BusLogic_ProbeHostAdapter probes for a BusLogic Host Adapter. |
1029 | */ | 1029 | */ |
1030 | 1030 | ||
1031 | static boolean __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *HostAdapter) | 1031 | static bool __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *HostAdapter) |
1032 | { | 1032 | { |
1033 | union BusLogic_StatusRegister StatusRegister; | 1033 | union BusLogic_StatusRegister StatusRegister; |
1034 | union BusLogic_InterruptRegister InterruptRegister; | 1034 | union BusLogic_InterruptRegister InterruptRegister; |
@@ -1099,8 +1099,8 @@ static boolean __init BusLogic_ProbeHostAdapter(struct BusLogic_HostAdapter *Hos | |||
1099 | SCSI Bus Reset. | 1099 | SCSI Bus Reset. |
1100 | */ | 1100 | */ |
1101 | 1101 | ||
1102 | static boolean BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter | 1102 | static bool BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter |
1103 | *HostAdapter, boolean HardReset) | 1103 | *HostAdapter, bool HardReset) |
1104 | { | 1104 | { |
1105 | union BusLogic_StatusRegister StatusRegister; | 1105 | union BusLogic_StatusRegister StatusRegister; |
1106 | int TimeoutCounter; | 1106 | int TimeoutCounter; |
@@ -1203,11 +1203,11 @@ static boolean BusLogic_HardwareResetHostAdapter(struct BusLogic_HostAdapter | |||
1203 | Host Adapter. | 1203 | Host Adapter. |
1204 | */ | 1204 | */ |
1205 | 1205 | ||
1206 | static boolean __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *HostAdapter) | 1206 | static bool __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *HostAdapter) |
1207 | { | 1207 | { |
1208 | struct BusLogic_ExtendedSetupInformation ExtendedSetupInformation; | 1208 | struct BusLogic_ExtendedSetupInformation ExtendedSetupInformation; |
1209 | unsigned char RequestedReplyLength; | 1209 | unsigned char RequestedReplyLength; |
1210 | boolean Result = true; | 1210 | bool Result = true; |
1211 | /* | 1211 | /* |
1212 | FlashPoint Host Adapters do not require this protection. | 1212 | FlashPoint Host Adapters do not require this protection. |
1213 | */ | 1213 | */ |
@@ -1237,7 +1237,7 @@ static boolean __init BusLogic_CheckHostAdapter(struct BusLogic_HostAdapter *Hos | |||
1237 | from Host Adapter and initializes the Host Adapter structure. | 1237 | from Host Adapter and initializes the Host Adapter structure. |
1238 | */ | 1238 | */ |
1239 | 1239 | ||
1240 | static boolean __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_HostAdapter | 1240 | static bool __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_HostAdapter |
1241 | *HostAdapter) | 1241 | *HostAdapter) |
1242 | { | 1242 | { |
1243 | struct BusLogic_BoardID BoardID; | 1243 | struct BusLogic_BoardID BoardID; |
@@ -1684,14 +1684,14 @@ static boolean __init BusLogic_ReadHostAdapterConfiguration(struct BusLogic_Host | |||
1684 | Host Adapter. | 1684 | Host Adapter. |
1685 | */ | 1685 | */ |
1686 | 1686 | ||
1687 | static boolean __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_HostAdapter | 1687 | static bool __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_HostAdapter |
1688 | *HostAdapter) | 1688 | *HostAdapter) |
1689 | { | 1689 | { |
1690 | unsigned short AllTargetsMask = (1 << HostAdapter->MaxTargetDevices) - 1; | 1690 | unsigned short AllTargetsMask = (1 << HostAdapter->MaxTargetDevices) - 1; |
1691 | unsigned short SynchronousPermitted, FastPermitted; | 1691 | unsigned short SynchronousPermitted, FastPermitted; |
1692 | unsigned short UltraPermitted, WidePermitted; | 1692 | unsigned short UltraPermitted, WidePermitted; |
1693 | unsigned short DisconnectPermitted, TaggedQueuingPermitted; | 1693 | unsigned short DisconnectPermitted, TaggedQueuingPermitted; |
1694 | boolean CommonSynchronousNegotiation, CommonTaggedQueueDepth; | 1694 | bool CommonSynchronousNegotiation, CommonTaggedQueueDepth; |
1695 | char SynchronousString[BusLogic_MaxTargetDevices + 1]; | 1695 | char SynchronousString[BusLogic_MaxTargetDevices + 1]; |
1696 | char WideString[BusLogic_MaxTargetDevices + 1]; | 1696 | char WideString[BusLogic_MaxTargetDevices + 1]; |
1697 | char DisconnectString[BusLogic_MaxTargetDevices + 1]; | 1697 | char DisconnectString[BusLogic_MaxTargetDevices + 1]; |
@@ -1833,7 +1833,7 @@ static boolean __init BusLogic_ReportHostAdapterConfiguration(struct BusLogic_Ho | |||
1833 | Host Adapter. | 1833 | Host Adapter. |
1834 | */ | 1834 | */ |
1835 | 1835 | ||
1836 | static boolean __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *HostAdapter) | 1836 | static bool __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *HostAdapter) |
1837 | { | 1837 | { |
1838 | if (HostAdapter->IRQ_Channel == 0) { | 1838 | if (HostAdapter->IRQ_Channel == 0) { |
1839 | BusLogic_Error("NO LEGAL INTERRUPT CHANNEL ASSIGNED - DETACHING\n", HostAdapter); | 1839 | BusLogic_Error("NO LEGAL INTERRUPT CHANNEL ASSIGNED - DETACHING\n", HostAdapter); |
@@ -1901,7 +1901,7 @@ static void BusLogic_ReleaseResources(struct BusLogic_HostAdapter *HostAdapter) | |||
1901 | of the Host Adapter from its initial power on or hard reset state. | 1901 | of the Host Adapter from its initial power on or hard reset state. |
1902 | */ | 1902 | */ |
1903 | 1903 | ||
1904 | static boolean BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter | 1904 | static bool BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter |
1905 | *HostAdapter) | 1905 | *HostAdapter) |
1906 | { | 1906 | { |
1907 | struct BusLogic_ExtendedMailboxRequest ExtendedMailboxRequest; | 1907 | struct BusLogic_ExtendedMailboxRequest ExtendedMailboxRequest; |
@@ -2000,7 +2000,7 @@ static boolean BusLogic_InitializeHostAdapter(struct BusLogic_HostAdapter | |||
2000 | through Host Adapter. | 2000 | through Host Adapter. |
2001 | */ | 2001 | */ |
2002 | 2002 | ||
2003 | static boolean __init BusLogic_TargetDeviceInquiry(struct BusLogic_HostAdapter | 2003 | static bool __init BusLogic_TargetDeviceInquiry(struct BusLogic_HostAdapter |
2004 | *HostAdapter) | 2004 | *HostAdapter) |
2005 | { | 2005 | { |
2006 | u16 InstalledDevices; | 2006 | u16 InstalledDevices; |
@@ -2737,7 +2737,7 @@ static irqreturn_t BusLogic_InterruptHandler(int IRQ_Channel, void *DeviceIdenti | |||
2737 | already have been acquired by the caller. | 2737 | already have been acquired by the caller. |
2738 | */ | 2738 | */ |
2739 | 2739 | ||
2740 | static boolean BusLogic_WriteOutgoingMailbox(struct BusLogic_HostAdapter | 2740 | static bool BusLogic_WriteOutgoingMailbox(struct BusLogic_HostAdapter |
2741 | *HostAdapter, enum BusLogic_ActionCode ActionCode, struct BusLogic_CCB *CCB) | 2741 | *HostAdapter, enum BusLogic_ActionCode ActionCode, struct BusLogic_CCB *CCB) |
2742 | { | 2742 | { |
2743 | struct BusLogic_OutgoingMailbox *NextOutgoingMailbox; | 2743 | struct BusLogic_OutgoingMailbox *NextOutgoingMailbox; |
@@ -3056,7 +3056,7 @@ static int BusLogic_AbortCommand(struct scsi_cmnd *Command) | |||
3056 | currently executing SCSI Commands as having been Reset. | 3056 | currently executing SCSI Commands as having been Reset. |
3057 | */ | 3057 | */ |
3058 | 3058 | ||
3059 | static int BusLogic_ResetHostAdapter(struct BusLogic_HostAdapter *HostAdapter, boolean HardReset) | 3059 | static int BusLogic_ResetHostAdapter(struct BusLogic_HostAdapter *HostAdapter, bool HardReset) |
3060 | { | 3060 | { |
3061 | struct BusLogic_CCB *CCB; | 3061 | struct BusLogic_CCB *CCB; |
3062 | int TargetID; | 3062 | int TargetID; |
@@ -3307,7 +3307,7 @@ Target Requested Completed Requested Completed Requested Completed\n\ | |||
3307 | static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Format, struct BusLogic_HostAdapter *HostAdapter, ...) | 3307 | static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Format, struct BusLogic_HostAdapter *HostAdapter, ...) |
3308 | { | 3308 | { |
3309 | static char Buffer[BusLogic_LineBufferSize]; | 3309 | static char Buffer[BusLogic_LineBufferSize]; |
3310 | static boolean BeginningOfLine = true; | 3310 | static bool BeginningOfLine = true; |
3311 | va_list Arguments; | 3311 | va_list Arguments; |
3312 | int Length = 0; | 3312 | int Length = 0; |
3313 | va_start(Arguments, HostAdapter); | 3313 | va_start(Arguments, HostAdapter); |
@@ -3345,7 +3345,7 @@ static void BusLogic_Message(enum BusLogic_MessageLevel MessageLevel, char *Form | |||
3345 | and updates the pointer if the keyword is recognized and false otherwise. | 3345 | and updates the pointer if the keyword is recognized and false otherwise. |
3346 | */ | 3346 | */ |
3347 | 3347 | ||
3348 | static boolean __init BusLogic_ParseKeyword(char **StringPointer, char *Keyword) | 3348 | static bool __init BusLogic_ParseKeyword(char **StringPointer, char *Keyword) |
3349 | { | 3349 | { |
3350 | char *Pointer = *StringPointer; | 3350 | char *Pointer = *StringPointer; |
3351 | while (*Keyword != '\0') { | 3351 | while (*Keyword != '\0') { |
diff --git a/drivers/scsi/BusLogic.h b/drivers/scsi/BusLogic.h index cca6d45eee4d..bfbfb5c3a8f6 100644 --- a/drivers/scsi/BusLogic.h +++ b/drivers/scsi/BusLogic.h | |||
@@ -234,12 +234,6 @@ enum BusLogic_BIOS_DiskGeometryTranslation { | |||
234 | 234 | ||
235 | 235 | ||
236 | /* | 236 | /* |
237 | Define a Boolean data type. | ||
238 | */ | ||
239 | |||
240 | typedef bool boolean; | ||
241 | |||
242 | /* | ||
243 | Define a 10^18 Statistics Byte Counter data type. | 237 | Define a 10^18 Statistics Byte Counter data type. |
244 | */ | 238 | */ |
245 | 239 | ||
@@ -269,19 +263,19 @@ struct BusLogic_ProbeInfo { | |||
269 | */ | 263 | */ |
270 | 264 | ||
271 | struct BusLogic_ProbeOptions { | 265 | struct BusLogic_ProbeOptions { |
272 | boolean NoProbe:1; /* Bit 0 */ | 266 | bool NoProbe:1; /* Bit 0 */ |
273 | boolean NoProbeISA:1; /* Bit 1 */ | 267 | bool NoProbeISA:1; /* Bit 1 */ |
274 | boolean NoProbePCI:1; /* Bit 2 */ | 268 | bool NoProbePCI:1; /* Bit 2 */ |
275 | boolean NoSortPCI:1; /* Bit 3 */ | 269 | bool NoSortPCI:1; /* Bit 3 */ |
276 | boolean MultiMasterFirst:1; /* Bit 4 */ | 270 | bool MultiMasterFirst:1;/* Bit 4 */ |
277 | boolean FlashPointFirst:1; /* Bit 5 */ | 271 | bool FlashPointFirst:1; /* Bit 5 */ |
278 | boolean LimitedProbeISA:1; /* Bit 6 */ | 272 | bool LimitedProbeISA:1; /* Bit 6 */ |
279 | boolean Probe330:1; /* Bit 7 */ | 273 | bool Probe330:1; /* Bit 7 */ |
280 | boolean Probe334:1; /* Bit 8 */ | 274 | bool Probe334:1; /* Bit 8 */ |
281 | boolean Probe230:1; /* Bit 9 */ | 275 | bool Probe230:1; /* Bit 9 */ |
282 | boolean Probe234:1; /* Bit 10 */ | 276 | bool Probe234:1; /* Bit 10 */ |
283 | boolean Probe130:1; /* Bit 11 */ | 277 | bool Probe130:1; /* Bit 11 */ |
284 | boolean Probe134:1; /* Bit 12 */ | 278 | bool Probe134:1; /* Bit 12 */ |
285 | }; | 279 | }; |
286 | 280 | ||
287 | /* | 281 | /* |
@@ -289,10 +283,10 @@ struct BusLogic_ProbeOptions { | |||
289 | */ | 283 | */ |
290 | 284 | ||
291 | struct BusLogic_GlobalOptions { | 285 | struct BusLogic_GlobalOptions { |
292 | boolean TraceProbe:1; /* Bit 0 */ | 286 | bool TraceProbe:1; /* Bit 0 */ |
293 | boolean TraceHardwareReset:1; /* Bit 1 */ | 287 | bool TraceHardwareReset:1; /* Bit 1 */ |
294 | boolean TraceConfiguration:1; /* Bit 2 */ | 288 | bool TraceConfiguration:1; /* Bit 2 */ |
295 | boolean TraceErrors:1; /* Bit 3 */ | 289 | bool TraceErrors:1; /* Bit 3 */ |
296 | }; | 290 | }; |
297 | 291 | ||
298 | /* | 292 | /* |
@@ -300,7 +294,7 @@ struct BusLogic_GlobalOptions { | |||
300 | */ | 294 | */ |
301 | 295 | ||
302 | struct BusLogic_LocalOptions { | 296 | struct BusLogic_LocalOptions { |
303 | boolean InhibitTargetInquiry:1; /* Bit 0 */ | 297 | bool InhibitTargetInquiry:1; /* Bit 0 */ |
304 | }; | 298 | }; |
305 | 299 | ||
306 | /* | 300 | /* |
@@ -322,10 +316,10 @@ union BusLogic_ControlRegister { | |||
322 | unsigned char All; | 316 | unsigned char All; |
323 | struct { | 317 | struct { |
324 | unsigned char:4; /* Bits 0-3 */ | 318 | unsigned char:4; /* Bits 0-3 */ |
325 | boolean SCSIBusReset:1; /* Bit 4 */ | 319 | bool SCSIBusReset:1; /* Bit 4 */ |
326 | boolean InterruptReset:1; /* Bit 5 */ | 320 | bool InterruptReset:1; /* Bit 5 */ |
327 | boolean SoftReset:1; /* Bit 6 */ | 321 | bool SoftReset:1; /* Bit 6 */ |
328 | boolean HardReset:1; /* Bit 7 */ | 322 | bool HardReset:1; /* Bit 7 */ |
329 | } cr; | 323 | } cr; |
330 | }; | 324 | }; |
331 | 325 | ||
@@ -336,14 +330,14 @@ union BusLogic_ControlRegister { | |||
336 | union BusLogic_StatusRegister { | 330 | union BusLogic_StatusRegister { |
337 | unsigned char All; | 331 | unsigned char All; |
338 | struct { | 332 | struct { |
339 | boolean CommandInvalid:1; /* Bit 0 */ | 333 | bool CommandInvalid:1; /* Bit 0 */ |
340 | boolean Reserved:1; /* Bit 1 */ | 334 | bool Reserved:1; /* Bit 1 */ |
341 | boolean DataInRegisterReady:1; /* Bit 2 */ | 335 | bool DataInRegisterReady:1; /* Bit 2 */ |
342 | boolean CommandParameterRegisterBusy:1; /* Bit 3 */ | 336 | bool CommandParameterRegisterBusy:1; /* Bit 3 */ |
343 | boolean HostAdapterReady:1; /* Bit 4 */ | 337 | bool HostAdapterReady:1; /* Bit 4 */ |
344 | boolean InitializationRequired:1; /* Bit 5 */ | 338 | bool InitializationRequired:1; /* Bit 5 */ |
345 | boolean DiagnosticFailure:1; /* Bit 6 */ | 339 | bool DiagnosticFailure:1; /* Bit 6 */ |
346 | boolean DiagnosticActive:1; /* Bit 7 */ | 340 | bool DiagnosticActive:1; /* Bit 7 */ |
347 | } sr; | 341 | } sr; |
348 | }; | 342 | }; |
349 | 343 | ||
@@ -354,12 +348,12 @@ union BusLogic_StatusRegister { | |||
354 | union BusLogic_InterruptRegister { | 348 | union BusLogic_InterruptRegister { |
355 | unsigned char All; | 349 | unsigned char All; |
356 | struct { | 350 | struct { |
357 | boolean IncomingMailboxLoaded:1; /* Bit 0 */ | 351 | bool IncomingMailboxLoaded:1; /* Bit 0 */ |
358 | boolean OutgoingMailboxAvailable:1; /* Bit 1 */ | 352 | bool OutgoingMailboxAvailable:1;/* Bit 1 */ |
359 | boolean CommandComplete:1; /* Bit 2 */ | 353 | bool CommandComplete:1; /* Bit 2 */ |
360 | boolean ExternalBusReset:1; /* Bit 3 */ | 354 | bool ExternalBusReset:1; /* Bit 3 */ |
361 | unsigned char Reserved:3; /* Bits 4-6 */ | 355 | unsigned char Reserved:3; /* Bits 4-6 */ |
362 | boolean InterruptValid:1; /* Bit 7 */ | 356 | bool InterruptValid:1; /* Bit 7 */ |
363 | } ir; | 357 | } ir; |
364 | }; | 358 | }; |
365 | 359 | ||
@@ -373,7 +367,7 @@ union BusLogic_GeometryRegister { | |||
373 | enum BusLogic_BIOS_DiskGeometryTranslation Drive0Geometry:2; /* Bits 0-1 */ | 367 | enum BusLogic_BIOS_DiskGeometryTranslation Drive0Geometry:2; /* Bits 0-1 */ |
374 | enum BusLogic_BIOS_DiskGeometryTranslation Drive1Geometry:2; /* Bits 2-3 */ | 368 | enum BusLogic_BIOS_DiskGeometryTranslation Drive1Geometry:2; /* Bits 2-3 */ |
375 | unsigned char:3; /* Bits 4-6 */ | 369 | unsigned char:3; /* Bits 4-6 */ |
376 | boolean ExtendedTranslationEnabled:1; /* Bit 7 */ | 370 | bool ExtendedTranslationEnabled:1; /* Bit 7 */ |
377 | } gr; | 371 | } gr; |
378 | }; | 372 | }; |
379 | 373 | ||
@@ -445,16 +439,16 @@ struct BusLogic_BoardID { | |||
445 | 439 | ||
446 | struct BusLogic_Configuration { | 440 | struct BusLogic_Configuration { |
447 | unsigned char:5; /* Byte 0 Bits 0-4 */ | 441 | unsigned char:5; /* Byte 0 Bits 0-4 */ |
448 | boolean DMA_Channel5:1; /* Byte 0 Bit 5 */ | 442 | bool DMA_Channel5:1; /* Byte 0 Bit 5 */ |
449 | boolean DMA_Channel6:1; /* Byte 0 Bit 6 */ | 443 | bool DMA_Channel6:1; /* Byte 0 Bit 6 */ |
450 | boolean DMA_Channel7:1; /* Byte 0 Bit 7 */ | 444 | bool DMA_Channel7:1; /* Byte 0 Bit 7 */ |
451 | boolean IRQ_Channel9:1; /* Byte 1 Bit 0 */ | 445 | bool IRQ_Channel9:1; /* Byte 1 Bit 0 */ |
452 | boolean IRQ_Channel10:1; /* Byte 1 Bit 1 */ | 446 | bool IRQ_Channel10:1; /* Byte 1 Bit 1 */ |
453 | boolean IRQ_Channel11:1; /* Byte 1 Bit 2 */ | 447 | bool IRQ_Channel11:1; /* Byte 1 Bit 2 */ |
454 | boolean IRQ_Channel12:1; /* Byte 1 Bit 3 */ | 448 | bool IRQ_Channel12:1; /* Byte 1 Bit 3 */ |
455 | unsigned char:1; /* Byte 1 Bit 4 */ | 449 | unsigned char:1; /* Byte 1 Bit 4 */ |
456 | boolean IRQ_Channel14:1; /* Byte 1 Bit 5 */ | 450 | bool IRQ_Channel14:1; /* Byte 1 Bit 5 */ |
457 | boolean IRQ_Channel15:1; /* Byte 1 Bit 6 */ | 451 | bool IRQ_Channel15:1; /* Byte 1 Bit 6 */ |
458 | unsigned char:1; /* Byte 1 Bit 7 */ | 452 | unsigned char:1; /* Byte 1 Bit 7 */ |
459 | unsigned char HostAdapterID:4; /* Byte 2 Bits 0-3 */ | 453 | unsigned char HostAdapterID:4; /* Byte 2 Bits 0-3 */ |
460 | unsigned char:4; /* Byte 2 Bits 4-7 */ | 454 | unsigned char:4; /* Byte 2 Bits 4-7 */ |
@@ -467,12 +461,12 @@ struct BusLogic_Configuration { | |||
467 | struct BusLogic_SynchronousValue { | 461 | struct BusLogic_SynchronousValue { |
468 | unsigned char Offset:4; /* Bits 0-3 */ | 462 | unsigned char Offset:4; /* Bits 0-3 */ |
469 | unsigned char TransferPeriod:3; /* Bits 4-6 */ | 463 | unsigned char TransferPeriod:3; /* Bits 4-6 */ |
470 | boolean Synchronous:1; /* Bit 7 */ | 464 | bool Synchronous:1; /* Bit 7 */ |
471 | }; | 465 | }; |
472 | 466 | ||
473 | struct BusLogic_SetupInformation { | 467 | struct BusLogic_SetupInformation { |
474 | boolean SynchronousInitiationEnabled:1; /* Byte 0 Bit 0 */ | 468 | bool SynchronousInitiationEnabled:1; /* Byte 0 Bit 0 */ |
475 | boolean ParityCheckingEnabled:1; /* Byte 0 Bit 1 */ | 469 | bool ParityCheckingEnabled:1; /* Byte 0 Bit 1 */ |
476 | unsigned char:6; /* Byte 0 Bits 2-7 */ | 470 | unsigned char:6; /* Byte 0 Bits 2-7 */ |
477 | unsigned char BusTransferRate; /* Byte 1 */ | 471 | unsigned char BusTransferRate; /* Byte 1 */ |
478 | unsigned char PreemptTimeOnBus; /* Byte 2 */ | 472 | unsigned char PreemptTimeOnBus; /* Byte 2 */ |
@@ -523,13 +517,13 @@ enum BusLogic_ISACompatibleIOPort { | |||
523 | struct BusLogic_PCIHostAdapterInformation { | 517 | struct BusLogic_PCIHostAdapterInformation { |
524 | enum BusLogic_ISACompatibleIOPort ISACompatibleIOPort; /* Byte 0 */ | 518 | enum BusLogic_ISACompatibleIOPort ISACompatibleIOPort; /* Byte 0 */ |
525 | unsigned char PCIAssignedIRQChannel; /* Byte 1 */ | 519 | unsigned char PCIAssignedIRQChannel; /* Byte 1 */ |
526 | boolean LowByteTerminated:1; /* Byte 2 Bit 0 */ | 520 | bool LowByteTerminated:1; /* Byte 2 Bit 0 */ |
527 | boolean HighByteTerminated:1; /* Byte 2 Bit 1 */ | 521 | bool HighByteTerminated:1; /* Byte 2 Bit 1 */ |
528 | unsigned char:2; /* Byte 2 Bits 2-3 */ | 522 | unsigned char:2; /* Byte 2 Bits 2-3 */ |
529 | boolean JP1:1; /* Byte 2 Bit 4 */ | 523 | bool JP1:1; /* Byte 2 Bit 4 */ |
530 | boolean JP2:1; /* Byte 2 Bit 5 */ | 524 | bool JP2:1; /* Byte 2 Bit 5 */ |
531 | boolean JP3:1; /* Byte 2 Bit 6 */ | 525 | bool JP3:1; /* Byte 2 Bit 6 */ |
532 | boolean GenericInfoValid:1; /* Byte 2 Bit 7 */ | 526 | bool GenericInfoValid:1;/* Byte 2 Bit 7 */ |
533 | unsigned char:8; /* Byte 3 */ | 527 | unsigned char:8; /* Byte 3 */ |
534 | }; | 528 | }; |
535 | 529 | ||
@@ -545,17 +539,17 @@ struct BusLogic_ExtendedSetupInformation { | |||
545 | u32 BaseMailboxAddress; /* Bytes 5-8 */ | 539 | u32 BaseMailboxAddress; /* Bytes 5-8 */ |
546 | struct { | 540 | struct { |
547 | unsigned char:2; /* Byte 9 Bits 0-1 */ | 541 | unsigned char:2; /* Byte 9 Bits 0-1 */ |
548 | boolean FastOnEISA:1; /* Byte 9 Bit 2 */ | 542 | bool FastOnEISA:1; /* Byte 9 Bit 2 */ |
549 | unsigned char:3; /* Byte 9 Bits 3-5 */ | 543 | unsigned char:3; /* Byte 9 Bits 3-5 */ |
550 | boolean LevelSensitiveInterrupt:1; /* Byte 9 Bit 6 */ | 544 | bool LevelSensitiveInterrupt:1; /* Byte 9 Bit 6 */ |
551 | unsigned char:1; /* Byte 9 Bit 7 */ | 545 | unsigned char:1; /* Byte 9 Bit 7 */ |
552 | } Misc; | 546 | } Misc; |
553 | unsigned char FirmwareRevision[3]; /* Bytes 10-12 */ | 547 | unsigned char FirmwareRevision[3]; /* Bytes 10-12 */ |
554 | boolean HostWideSCSI:1; /* Byte 13 Bit 0 */ | 548 | bool HostWideSCSI:1; /* Byte 13 Bit 0 */ |
555 | boolean HostDifferentialSCSI:1; /* Byte 13 Bit 1 */ | 549 | bool HostDifferentialSCSI:1; /* Byte 13 Bit 1 */ |
556 | boolean HostSupportsSCAM:1; /* Byte 13 Bit 2 */ | 550 | bool HostSupportsSCAM:1; /* Byte 13 Bit 2 */ |
557 | boolean HostUltraSCSI:1; /* Byte 13 Bit 3 */ | 551 | bool HostUltraSCSI:1; /* Byte 13 Bit 3 */ |
558 | boolean HostSmartTermination:1; /* Byte 13 Bit 4 */ | 552 | bool HostSmartTermination:1; /* Byte 13 Bit 4 */ |
559 | unsigned char:3; /* Byte 13 Bits 5-7 */ | 553 | unsigned char:3; /* Byte 13 Bits 5-7 */ |
560 | } PACKED; | 554 | } PACKED; |
561 | 555 | ||
@@ -590,35 +584,35 @@ struct BusLogic_AutoSCSIData { | |||
590 | unsigned char InformationByteCount; /* Byte 2 */ | 584 | unsigned char InformationByteCount; /* Byte 2 */ |
591 | unsigned char HostAdapterType[6]; /* Bytes 3-8 */ | 585 | unsigned char HostAdapterType[6]; /* Bytes 3-8 */ |
592 | unsigned char:8; /* Byte 9 */ | 586 | unsigned char:8; /* Byte 9 */ |
593 | boolean FloppyEnabled:1; /* Byte 10 Bit 0 */ | 587 | bool FloppyEnabled:1; /* Byte 10 Bit 0 */ |
594 | boolean FloppySecondary:1; /* Byte 10 Bit 1 */ | 588 | bool FloppySecondary:1; /* Byte 10 Bit 1 */ |
595 | boolean LevelSensitiveInterrupt:1; /* Byte 10 Bit 2 */ | 589 | bool LevelSensitiveInterrupt:1; /* Byte 10 Bit 2 */ |
596 | unsigned char:2; /* Byte 10 Bits 3-4 */ | 590 | unsigned char:2; /* Byte 10 Bits 3-4 */ |
597 | unsigned char SystemRAMAreaForBIOS:3; /* Byte 10 Bits 5-7 */ | 591 | unsigned char SystemRAMAreaForBIOS:3; /* Byte 10 Bits 5-7 */ |
598 | unsigned char DMA_Channel:7; /* Byte 11 Bits 0-6 */ | 592 | unsigned char DMA_Channel:7; /* Byte 11 Bits 0-6 */ |
599 | boolean DMA_AutoConfiguration:1; /* Byte 11 Bit 7 */ | 593 | bool DMA_AutoConfiguration:1; /* Byte 11 Bit 7 */ |
600 | unsigned char IRQ_Channel:7; /* Byte 12 Bits 0-6 */ | 594 | unsigned char IRQ_Channel:7; /* Byte 12 Bits 0-6 */ |
601 | boolean IRQ_AutoConfiguration:1; /* Byte 12 Bit 7 */ | 595 | bool IRQ_AutoConfiguration:1; /* Byte 12 Bit 7 */ |
602 | unsigned char DMA_TransferRate; /* Byte 13 */ | 596 | unsigned char DMA_TransferRate; /* Byte 13 */ |
603 | unsigned char SCSI_ID; /* Byte 14 */ | 597 | unsigned char SCSI_ID; /* Byte 14 */ |
604 | boolean LowByteTerminated:1; /* Byte 15 Bit 0 */ | 598 | bool LowByteTerminated:1; /* Byte 15 Bit 0 */ |
605 | boolean ParityCheckingEnabled:1; /* Byte 15 Bit 1 */ | 599 | bool ParityCheckingEnabled:1; /* Byte 15 Bit 1 */ |
606 | boolean HighByteTerminated:1; /* Byte 15 Bit 2 */ | 600 | bool HighByteTerminated:1; /* Byte 15 Bit 2 */ |
607 | boolean NoisyCablingEnvironment:1; /* Byte 15 Bit 3 */ | 601 | bool NoisyCablingEnvironment:1; /* Byte 15 Bit 3 */ |
608 | boolean FastSynchronousNegotiation:1; /* Byte 15 Bit 4 */ | 602 | bool FastSynchronousNegotiation:1; /* Byte 15 Bit 4 */ |
609 | boolean BusResetEnabled:1; /* Byte 15 Bit 5 */ | 603 | bool BusResetEnabled:1; /* Byte 15 Bit 5 */ |
610 | boolean:1; /* Byte 15 Bit 6 */ | 604 | bool:1; /* Byte 15 Bit 6 */ |
611 | boolean ActiveNegationEnabled:1; /* Byte 15 Bit 7 */ | 605 | bool ActiveNegationEnabled:1; /* Byte 15 Bit 7 */ |
612 | unsigned char BusOnDelay; /* Byte 16 */ | 606 | unsigned char BusOnDelay; /* Byte 16 */ |
613 | unsigned char BusOffDelay; /* Byte 17 */ | 607 | unsigned char BusOffDelay; /* Byte 17 */ |
614 | boolean HostAdapterBIOSEnabled:1; /* Byte 18 Bit 0 */ | 608 | bool HostAdapterBIOSEnabled:1; /* Byte 18 Bit 0 */ |
615 | boolean BIOSRedirectionOfINT19Enabled:1; /* Byte 18 Bit 1 */ | 609 | bool BIOSRedirectionOfINT19Enabled:1; /* Byte 18 Bit 1 */ |
616 | boolean ExtendedTranslationEnabled:1; /* Byte 18 Bit 2 */ | 610 | bool ExtendedTranslationEnabled:1; /* Byte 18 Bit 2 */ |
617 | boolean MapRemovableAsFixedEnabled:1; /* Byte 18 Bit 3 */ | 611 | bool MapRemovableAsFixedEnabled:1; /* Byte 18 Bit 3 */ |
618 | boolean:1; /* Byte 18 Bit 4 */ | 612 | bool:1; /* Byte 18 Bit 4 */ |
619 | boolean BIOSSupportsMoreThan2DrivesEnabled:1; /* Byte 18 Bit 5 */ | 613 | bool BIOSSupportsMoreThan2DrivesEnabled:1; /* Byte 18 Bit 5 */ |
620 | boolean BIOSInterruptModeEnabled:1; /* Byte 18 Bit 6 */ | 614 | bool BIOSInterruptModeEnabled:1; /* Byte 18 Bit 6 */ |
621 | boolean FlopticalSupportEnabled:1; /* Byte 19 Bit 7 */ | 615 | bool FlopticalSupportEnabled:1; /* Byte 19 Bit 7 */ |
622 | unsigned short DeviceEnabled; /* Bytes 19-20 */ | 616 | unsigned short DeviceEnabled; /* Bytes 19-20 */ |
623 | unsigned short WidePermitted; /* Bytes 21-22 */ | 617 | unsigned short WidePermitted; /* Bytes 21-22 */ |
624 | unsigned short FastPermitted; /* Bytes 23-24 */ | 618 | unsigned short FastPermitted; /* Bytes 23-24 */ |
@@ -628,22 +622,22 @@ struct BusLogic_AutoSCSIData { | |||
628 | unsigned short IgnoreInBIOSScan; /* Bytes 31-32 */ | 622 | unsigned short IgnoreInBIOSScan; /* Bytes 31-32 */ |
629 | unsigned char PCIInterruptPin:2; /* Byte 33 Bits 0-1 */ | 623 | unsigned char PCIInterruptPin:2; /* Byte 33 Bits 0-1 */ |
630 | unsigned char HostAdapterIOPortAddress:2; /* Byte 33 Bits 2-3 */ | 624 | unsigned char HostAdapterIOPortAddress:2; /* Byte 33 Bits 2-3 */ |
631 | boolean StrictRoundRobinModeEnabled:1; /* Byte 33 Bit 4 */ | 625 | bool StrictRoundRobinModeEnabled:1; /* Byte 33 Bit 4 */ |
632 | boolean VESABusSpeedGreaterThan33MHz:1; /* Byte 33 Bit 5 */ | 626 | bool VESABusSpeedGreaterThan33MHz:1; /* Byte 33 Bit 5 */ |
633 | boolean VESABurstWriteEnabled:1; /* Byte 33 Bit 6 */ | 627 | bool VESABurstWriteEnabled:1; /* Byte 33 Bit 6 */ |
634 | boolean VESABurstReadEnabled:1; /* Byte 33 Bit 7 */ | 628 | bool VESABurstReadEnabled:1; /* Byte 33 Bit 7 */ |
635 | unsigned short UltraPermitted; /* Bytes 34-35 */ | 629 | unsigned short UltraPermitted; /* Bytes 34-35 */ |
636 | unsigned int:32; /* Bytes 36-39 */ | 630 | unsigned int:32; /* Bytes 36-39 */ |
637 | unsigned char:8; /* Byte 40 */ | 631 | unsigned char:8; /* Byte 40 */ |
638 | unsigned char AutoSCSIMaximumLUN; /* Byte 41 */ | 632 | unsigned char AutoSCSIMaximumLUN; /* Byte 41 */ |
639 | boolean:1; /* Byte 42 Bit 0 */ | 633 | bool:1; /* Byte 42 Bit 0 */ |
640 | boolean SCAM_Dominant:1; /* Byte 42 Bit 1 */ | 634 | bool SCAM_Dominant:1; /* Byte 42 Bit 1 */ |
641 | boolean SCAM_Enabled:1; /* Byte 42 Bit 2 */ | 635 | bool SCAM_Enabled:1; /* Byte 42 Bit 2 */ |
642 | boolean SCAM_Level2:1; /* Byte 42 Bit 3 */ | 636 | bool SCAM_Level2:1; /* Byte 42 Bit 3 */ |
643 | unsigned char:4; /* Byte 42 Bits 4-7 */ | 637 | unsigned char:4; /* Byte 42 Bits 4-7 */ |
644 | boolean INT13ExtensionEnabled:1; /* Byte 43 Bit 0 */ | 638 | bool INT13ExtensionEnabled:1; /* Byte 43 Bit 0 */ |
645 | boolean:1; /* Byte 43 Bit 1 */ | 639 | bool:1; /* Byte 43 Bit 1 */ |
646 | boolean CDROMBootEnabled:1; /* Byte 43 Bit 2 */ | 640 | bool CDROMBootEnabled:1; /* Byte 43 Bit 2 */ |
647 | unsigned char:5; /* Byte 43 Bits 3-7 */ | 641 | unsigned char:5; /* Byte 43 Bits 3-7 */ |
648 | unsigned char BootTargetID:4; /* Byte 44 Bits 0-3 */ | 642 | unsigned char BootTargetID:4; /* Byte 44 Bits 0-3 */ |
649 | unsigned char BootChannel:4; /* Byte 44 Bits 4-7 */ | 643 | unsigned char BootChannel:4; /* Byte 44 Bits 4-7 */ |
@@ -852,7 +846,7 @@ struct BusLogic_CCB { | |||
852 | enum BusLogic_CCB_Opcode Opcode; /* Byte 0 */ | 846 | enum BusLogic_CCB_Opcode Opcode; /* Byte 0 */ |
853 | unsigned char:3; /* Byte 1 Bits 0-2 */ | 847 | unsigned char:3; /* Byte 1 Bits 0-2 */ |
854 | enum BusLogic_DataDirection DataDirection:2; /* Byte 1 Bits 3-4 */ | 848 | enum BusLogic_DataDirection DataDirection:2; /* Byte 1 Bits 3-4 */ |
855 | boolean TagEnable:1; /* Byte 1 Bit 5 */ | 849 | bool TagEnable:1; /* Byte 1 Bit 5 */ |
856 | enum BusLogic_QueueTag QueueTag:2; /* Byte 1 Bits 6-7 */ | 850 | enum BusLogic_QueueTag QueueTag:2; /* Byte 1 Bits 6-7 */ |
857 | unsigned char CDB_Length; /* Byte 2 */ | 851 | unsigned char CDB_Length; /* Byte 2 */ |
858 | unsigned char SenseDataLength; /* Byte 3 */ | 852 | unsigned char SenseDataLength; /* Byte 3 */ |
@@ -864,7 +858,7 @@ struct BusLogic_CCB { | |||
864 | enum BusLogic_TargetDeviceStatus TargetDeviceStatus; /* Byte 15 */ | 858 | enum BusLogic_TargetDeviceStatus TargetDeviceStatus; /* Byte 15 */ |
865 | unsigned char TargetID; /* Byte 16 */ | 859 | unsigned char TargetID; /* Byte 16 */ |
866 | unsigned char LogicalUnit:5; /* Byte 17 Bits 0-4 */ | 860 | unsigned char LogicalUnit:5; /* Byte 17 Bits 0-4 */ |
867 | boolean LegacyTagEnable:1; /* Byte 17 Bit 5 */ | 861 | bool LegacyTagEnable:1; /* Byte 17 Bit 5 */ |
868 | enum BusLogic_QueueTag LegacyQueueTag:2; /* Byte 17 Bits 6-7 */ | 862 | enum BusLogic_QueueTag LegacyQueueTag:2; /* Byte 17 Bits 6-7 */ |
869 | SCSI_CDB_T CDB; /* Bytes 18-29 */ | 863 | SCSI_CDB_T CDB; /* Bytes 18-29 */ |
870 | unsigned char:8; /* Byte 30 */ | 864 | unsigned char:8; /* Byte 30 */ |
@@ -939,13 +933,13 @@ struct BusLogic_DriverOptions { | |||
939 | */ | 933 | */ |
940 | 934 | ||
941 | struct BusLogic_TargetFlags { | 935 | struct BusLogic_TargetFlags { |
942 | boolean TargetExists:1; | 936 | bool TargetExists:1; |
943 | boolean TaggedQueuingSupported:1; | 937 | bool TaggedQueuingSupported:1; |
944 | boolean WideTransfersSupported:1; | 938 | bool WideTransfersSupported:1; |
945 | boolean TaggedQueuingActive:1; | 939 | bool TaggedQueuingActive:1; |
946 | boolean WideTransfersActive:1; | 940 | bool WideTransfersActive:1; |
947 | boolean CommandSuccessfulFlag:1; | 941 | bool CommandSuccessfulFlag:1; |
948 | boolean TargetInfoReported:1; | 942 | bool TargetInfoReported:1; |
949 | }; | 943 | }; |
950 | 944 | ||
951 | /* | 945 | /* |
@@ -992,7 +986,7 @@ typedef unsigned int FlashPoint_CardHandle_T; | |||
992 | 986 | ||
993 | struct FlashPoint_Info { | 987 | struct FlashPoint_Info { |
994 | u32 BaseAddress; /* Bytes 0-3 */ | 988 | u32 BaseAddress; /* Bytes 0-3 */ |
995 | boolean Present; /* Byte 4 */ | 989 | bool Present; /* Byte 4 */ |
996 | unsigned char IRQ_Channel; /* Byte 5 */ | 990 | unsigned char IRQ_Channel; /* Byte 5 */ |
997 | unsigned char SCSI_ID; /* Byte 6 */ | 991 | unsigned char SCSI_ID; /* Byte 6 */ |
998 | unsigned char SCSI_LUN; /* Byte 7 */ | 992 | unsigned char SCSI_LUN; /* Byte 7 */ |
@@ -1002,15 +996,15 @@ struct FlashPoint_Info { | |||
1002 | unsigned short UltraPermitted; /* Bytes 14-15 */ | 996 | unsigned short UltraPermitted; /* Bytes 14-15 */ |
1003 | unsigned short DisconnectPermitted; /* Bytes 16-17 */ | 997 | unsigned short DisconnectPermitted; /* Bytes 16-17 */ |
1004 | unsigned short WidePermitted; /* Bytes 18-19 */ | 998 | unsigned short WidePermitted; /* Bytes 18-19 */ |
1005 | boolean ParityCheckingEnabled:1; /* Byte 20 Bit 0 */ | 999 | bool ParityCheckingEnabled:1; /* Byte 20 Bit 0 */ |
1006 | boolean HostWideSCSI:1; /* Byte 20 Bit 1 */ | 1000 | bool HostWideSCSI:1; /* Byte 20 Bit 1 */ |
1007 | boolean HostSoftReset:1; /* Byte 20 Bit 2 */ | 1001 | bool HostSoftReset:1; /* Byte 20 Bit 2 */ |
1008 | boolean ExtendedTranslationEnabled:1; /* Byte 20 Bit 3 */ | 1002 | bool ExtendedTranslationEnabled:1; /* Byte 20 Bit 3 */ |
1009 | boolean LowByteTerminated:1; /* Byte 20 Bit 4 */ | 1003 | bool LowByteTerminated:1; /* Byte 20 Bit 4 */ |
1010 | boolean HighByteTerminated:1; /* Byte 20 Bit 5 */ | 1004 | bool HighByteTerminated:1; /* Byte 20 Bit 5 */ |
1011 | boolean ReportDataUnderrun:1; /* Byte 20 Bit 6 */ | 1005 | bool ReportDataUnderrun:1; /* Byte 20 Bit 6 */ |
1012 | boolean SCAM_Enabled:1; /* Byte 20 Bit 7 */ | 1006 | bool SCAM_Enabled:1; /* Byte 20 Bit 7 */ |
1013 | boolean SCAM_Level2:1; /* Byte 21 Bit 0 */ | 1007 | bool SCAM_Level2:1; /* Byte 21 Bit 0 */ |
1014 | unsigned char:7; /* Byte 21 Bits 1-7 */ | 1008 | unsigned char:7; /* Byte 21 Bits 1-7 */ |
1015 | unsigned char Family; /* Byte 22 */ | 1009 | unsigned char Family; /* Byte 22 */ |
1016 | unsigned char BusType; /* Byte 23 */ | 1010 | unsigned char BusType; /* Byte 23 */ |
@@ -1044,29 +1038,29 @@ struct BusLogic_HostAdapter { | |||
1044 | unsigned char IRQ_Channel; | 1038 | unsigned char IRQ_Channel; |
1045 | unsigned char DMA_Channel; | 1039 | unsigned char DMA_Channel; |
1046 | unsigned char SCSI_ID; | 1040 | unsigned char SCSI_ID; |
1047 | boolean IRQ_ChannelAcquired:1; | 1041 | bool IRQ_ChannelAcquired:1; |
1048 | boolean DMA_ChannelAcquired:1; | 1042 | bool DMA_ChannelAcquired:1; |
1049 | boolean ExtendedTranslationEnabled:1; | 1043 | bool ExtendedTranslationEnabled:1; |
1050 | boolean ParityCheckingEnabled:1; | 1044 | bool ParityCheckingEnabled:1; |
1051 | boolean BusResetEnabled:1; | 1045 | bool BusResetEnabled:1; |
1052 | boolean LevelSensitiveInterrupt:1; | 1046 | bool LevelSensitiveInterrupt:1; |
1053 | boolean HostWideSCSI:1; | 1047 | bool HostWideSCSI:1; |
1054 | boolean HostDifferentialSCSI:1; | 1048 | bool HostDifferentialSCSI:1; |
1055 | boolean HostSupportsSCAM:1; | 1049 | bool HostSupportsSCAM:1; |
1056 | boolean HostUltraSCSI:1; | 1050 | bool HostUltraSCSI:1; |
1057 | boolean ExtendedLUNSupport:1; | 1051 | bool ExtendedLUNSupport:1; |
1058 | boolean TerminationInfoValid:1; | 1052 | bool TerminationInfoValid:1; |
1059 | boolean LowByteTerminated:1; | 1053 | bool LowByteTerminated:1; |
1060 | boolean HighByteTerminated:1; | 1054 | bool HighByteTerminated:1; |
1061 | boolean BounceBuffersRequired:1; | 1055 | bool BounceBuffersRequired:1; |
1062 | boolean StrictRoundRobinModeSupport:1; | 1056 | bool StrictRoundRobinModeSupport:1; |
1063 | boolean SCAM_Enabled:1; | 1057 | bool SCAM_Enabled:1; |
1064 | boolean SCAM_Level2:1; | 1058 | bool SCAM_Level2:1; |
1065 | boolean HostAdapterInitialized:1; | 1059 | bool HostAdapterInitialized:1; |
1066 | boolean HostAdapterExternalReset:1; | 1060 | bool HostAdapterExternalReset:1; |
1067 | boolean HostAdapterInternalError:1; | 1061 | bool HostAdapterInternalError:1; |
1068 | boolean ProcessCompletedCCBsActive; | 1062 | bool ProcessCompletedCCBsActive; |
1069 | volatile boolean HostAdapterCommandCompleted; | 1063 | volatile bool HostAdapterCommandCompleted; |
1070 | unsigned short HostAdapterScatterGatherLimit; | 1064 | unsigned short HostAdapterScatterGatherLimit; |
1071 | unsigned short DriverScatterGatherLimit; | 1065 | unsigned short DriverScatterGatherLimit; |
1072 | unsigned short MaxTargetDevices; | 1066 | unsigned short MaxTargetDevices; |
@@ -1141,25 +1135,25 @@ struct SCSI_Inquiry { | |||
1141 | unsigned char PeripheralDeviceType:5; /* Byte 0 Bits 0-4 */ | 1135 | unsigned char PeripheralDeviceType:5; /* Byte 0 Bits 0-4 */ |
1142 | unsigned char PeripheralQualifier:3; /* Byte 0 Bits 5-7 */ | 1136 | unsigned char PeripheralQualifier:3; /* Byte 0 Bits 5-7 */ |
1143 | unsigned char DeviceTypeModifier:7; /* Byte 1 Bits 0-6 */ | 1137 | unsigned char DeviceTypeModifier:7; /* Byte 1 Bits 0-6 */ |
1144 | boolean RMB:1; /* Byte 1 Bit 7 */ | 1138 | bool RMB:1; /* Byte 1 Bit 7 */ |
1145 | unsigned char ANSI_ApprovedVersion:3; /* Byte 2 Bits 0-2 */ | 1139 | unsigned char ANSI_ApprovedVersion:3; /* Byte 2 Bits 0-2 */ |
1146 | unsigned char ECMA_Version:3; /* Byte 2 Bits 3-5 */ | 1140 | unsigned char ECMA_Version:3; /* Byte 2 Bits 3-5 */ |
1147 | unsigned char ISO_Version:2; /* Byte 2 Bits 6-7 */ | 1141 | unsigned char ISO_Version:2; /* Byte 2 Bits 6-7 */ |
1148 | unsigned char ResponseDataFormat:4; /* Byte 3 Bits 0-3 */ | 1142 | unsigned char ResponseDataFormat:4; /* Byte 3 Bits 0-3 */ |
1149 | unsigned char:2; /* Byte 3 Bits 4-5 */ | 1143 | unsigned char:2; /* Byte 3 Bits 4-5 */ |
1150 | boolean TrmIOP:1; /* Byte 3 Bit 6 */ | 1144 | bool TrmIOP:1; /* Byte 3 Bit 6 */ |
1151 | boolean AENC:1; /* Byte 3 Bit 7 */ | 1145 | bool AENC:1; /* Byte 3 Bit 7 */ |
1152 | unsigned char AdditionalLength; /* Byte 4 */ | 1146 | unsigned char AdditionalLength; /* Byte 4 */ |
1153 | unsigned char:8; /* Byte 5 */ | 1147 | unsigned char:8; /* Byte 5 */ |
1154 | unsigned char:8; /* Byte 6 */ | 1148 | unsigned char:8; /* Byte 6 */ |
1155 | boolean SftRe:1; /* Byte 7 Bit 0 */ | 1149 | bool SftRe:1; /* Byte 7 Bit 0 */ |
1156 | boolean CmdQue:1; /* Byte 7 Bit 1 */ | 1150 | bool CmdQue:1; /* Byte 7 Bit 1 */ |
1157 | boolean:1; /* Byte 7 Bit 2 */ | 1151 | bool:1; /* Byte 7 Bit 2 */ |
1158 | boolean Linked:1; /* Byte 7 Bit 3 */ | 1152 | bool Linked:1; /* Byte 7 Bit 3 */ |
1159 | boolean Sync:1; /* Byte 7 Bit 4 */ | 1153 | bool Sync:1; /* Byte 7 Bit 4 */ |
1160 | boolean WBus16:1; /* Byte 7 Bit 5 */ | 1154 | bool WBus16:1; /* Byte 7 Bit 5 */ |
1161 | boolean WBus32:1; /* Byte 7 Bit 6 */ | 1155 | bool WBus32:1; /* Byte 7 Bit 6 */ |
1162 | boolean RelAdr:1; /* Byte 7 Bit 7 */ | 1156 | bool RelAdr:1; /* Byte 7 Bit 7 */ |
1163 | unsigned char VendorIdentification[8]; /* Bytes 8-15 */ | 1157 | unsigned char VendorIdentification[8]; /* Bytes 8-15 */ |
1164 | unsigned char ProductIdentification[16]; /* Bytes 16-31 */ | 1158 | unsigned char ProductIdentification[16]; /* Bytes 16-31 */ |
1165 | unsigned char ProductRevisionLevel[4]; /* Bytes 32-35 */ | 1159 | unsigned char ProductRevisionLevel[4]; /* Bytes 32-35 */ |
@@ -1348,7 +1342,7 @@ static int BusLogic_ProcDirectoryInfo(struct Scsi_Host *, char *, char **, off_t | |||
1348 | static int BusLogic_SlaveConfigure(struct scsi_device *); | 1342 | static int BusLogic_SlaveConfigure(struct scsi_device *); |
1349 | static void BusLogic_QueueCompletedCCB(struct BusLogic_CCB *); | 1343 | static void BusLogic_QueueCompletedCCB(struct BusLogic_CCB *); |
1350 | static irqreturn_t BusLogic_InterruptHandler(int, void *); | 1344 | static irqreturn_t BusLogic_InterruptHandler(int, void *); |
1351 | static int BusLogic_ResetHostAdapter(struct BusLogic_HostAdapter *, boolean HardReset); | 1345 | static int BusLogic_ResetHostAdapter(struct BusLogic_HostAdapter *, bool HardReset); |
1352 | static void BusLogic_Message(enum BusLogic_MessageLevel, char *, struct BusLogic_HostAdapter *, ...); | 1346 | static void BusLogic_Message(enum BusLogic_MessageLevel, char *, struct BusLogic_HostAdapter *, ...); |
1353 | static int __init BusLogic_Setup(char *); | 1347 | static int __init BusLogic_Setup(char *); |
1354 | 1348 | ||
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c index 7c0068049586..a7f916c0c9cd 100644 --- a/drivers/scsi/FlashPoint.c +++ b/drivers/scsi/FlashPoint.c | |||
@@ -7609,7 +7609,7 @@ FlashPoint__AbortCCB(FlashPoint_CardHandle_T CardHandle, | |||
7609 | FlashPoint_AbortCCB(CardHandle, (struct sccb *)CCB); | 7609 | FlashPoint_AbortCCB(CardHandle, (struct sccb *)CCB); |
7610 | } | 7610 | } |
7611 | 7611 | ||
7612 | static inline boolean | 7612 | static inline bool |
7613 | FlashPoint__InterruptPending(FlashPoint_CardHandle_T CardHandle) | 7613 | FlashPoint__InterruptPending(FlashPoint_CardHandle_T CardHandle) |
7614 | { | 7614 | { |
7615 | return FlashPoint_InterruptPending(CardHandle); | 7615 | return FlashPoint_InterruptPending(CardHandle); |
@@ -7640,7 +7640,7 @@ extern FlashPoint_CardHandle_T | |||
7640 | FlashPoint_HardwareResetHostAdapter(struct FlashPoint_Info *); | 7640 | FlashPoint_HardwareResetHostAdapter(struct FlashPoint_Info *); |
7641 | extern void FlashPoint_StartCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *); | 7641 | extern void FlashPoint_StartCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *); |
7642 | extern int FlashPoint_AbortCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *); | 7642 | extern int FlashPoint_AbortCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *); |
7643 | extern boolean FlashPoint_InterruptPending(FlashPoint_CardHandle_T); | 7643 | extern bool FlashPoint_InterruptPending(FlashPoint_CardHandle_T); |
7644 | extern int FlashPoint_HandleInterrupt(FlashPoint_CardHandle_T); | 7644 | extern int FlashPoint_HandleInterrupt(FlashPoint_CardHandle_T); |
7645 | extern void FlashPoint_ReleaseHostAdapter(FlashPoint_CardHandle_T); | 7645 | extern void FlashPoint_ReleaseHostAdapter(FlashPoint_CardHandle_T); |
7646 | 7646 | ||