6c6
< * Copyright 1999 I2O Special Interest Group (I2O SIG). All rights reserved.
---
> * Copyright 1999 I2O Special Interest Group (I2O SIG). All rights reserved.
29c29
< * conditions. By accepting and/or using this header file, you agree to abide
---
> * conditions. By accepting and/or using this header file, you agree to abide
64c64
< * on this header file. Any distribution of such derivative work: (1) must
---
> * on this header file. Any distribution of such derivative work: (1) must
75c75
< * header file at the I2O SIG Web site. Furthermore, to become a Registered
---
> * header file at the I2O SIG Web site. Furthermore, to become a Registered
79c79
< * $FreeBSD: head/sys/dev/asr/i2obscsi.h 96551 2002-05-14 00:53:08Z obrien $
---
> * $FreeBSD: head/sys/dev/asr/i2obscsi.h 96554 2002-05-14 01:09:03Z obrien $
84c84
< #define I2O_BASE_SCSI_HDR
---
> #define I2O_BASE_SCSI_HDR
88c88
< # include "i386/pci/i2omsg.h" /* Include the Base Message file */
---
> # include "i386/pci/i2omsg.h" /* Include the Base Message file */
93c93
< # include "i2omsg.h" /* Include the Base Message file */
---
> # include "i2omsg.h" /* Include the Base Message file */
97c97
< #define I2OBSCSI_REV 1_5_1 /* Header file revision string */
---
> #define I2OBSCSI_REV 1_5_1 /* Header file revision string */
105,106c105,106
< * This file contains information presented in Chapter 6, Section 6 & 7 of
< * the I2O Specification.
---
> * This file contains information presented in Chapter 6, Section 6 & 7 of
> * the I2O Specification.
109c109
< * specification)
---
> * specification)
111,113c111,113
< * .92 - First marked revsion used for Proof of Concept.
< * .93 - Change to match the rev .93 of the spec.
< * .95 - Updated to Rev .95 of 2/5/96.
---
> * .92 - First marked revsion used for Proof of Concept.
> * .93 - Change to match the rev .93 of the spec.
> * .95 - Updated to Rev .95 of 2/5/96.
117,119c117,119
< * 1) Removed duplicate device type definitions.
< * 2) Added "DSC" to Detailed Status Code definitions.
< * 3) Changed SCSI-3 LUN fields from U64 to U8 array.
---
> * 1) Removed duplicate device type definitions.
> * 2) Added "DSC" to Detailed Status Code definitions.
> * 3) Changed SCSI-3 LUN fields from U64 to U8 array.
124,125c124,125
< * 1) Converted SCSI bus adapter class to generic in i2oadptr.h.
< * 2) Fixed DSC reference: changed from _BUS_SCAN to _BUS_RESET.
---
> * 1) Converted SCSI bus adapter class to generic in i2oadptr.h.
> * 2) Fixed DSC reference: changed from _BUS_SCAN to _BUS_RESET.
128,129c128,129
< * 1) Corrected typo in I2O_SCSI_PERIPHERAL_TYPE_PARALLEL.
< * 2) Corrected typo in I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD.
---
> * 1) Corrected typo in I2O_SCSI_PERIPHERAL_TYPE_PARALLEL.
> * 2) Corrected typo in I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD.
131,134c131,134
< * 1) Remove #include for i2omstor.h.
< * 2) Add revision string.
< * 3) Convert tabs to spaces.
< * 4) New disclaimer.
---
> * 1) Remove #include for i2omstor.h.
> * 2) Add revision string.
> * 3) Convert tabs to spaces.
> * 4) New disclaimer.
169,171c169,171
< #define I2O_SCSI_DEVICE_RESET 0x27
< #define I2O_SCSI_SCB_ABORT 0x83
< #define I2O_SCSI_SCB_EXEC 0x81
---
> #define I2O_SCSI_DEVICE_RESET 0x27
> #define I2O_SCSI_SCB_ABORT 0x83
> #define I2O_SCSI_SCB_EXEC 0x81
178,179c178,179
< Device Status information. The upper 8 bits are used to report
< Adapter Status information. The definitions for these two fields,
---
> Device Status information. The upper 8 bits are used to report
> Adapter Status information. The definitions for these two fields,
187c187
< #define I2O_SCSI_DEVICE_DSC_MASK 0x00FF
---
> #define I2O_SCSI_DEVICE_DSC_MASK 0x00FF
189,195c189,195
< #define I2O_SCSI_DSC_SUCCESS 0x0000
< #define I2O_SCSI_DSC_CHECK_CONDITION 0x0002
< #define I2O_SCSI_DSC_BUSY 0x0008
< #define I2O_SCSI_DSC_RESERVATION_CONFLICT 0x0018
< #define I2O_SCSI_DSC_COMMAND_TERMINATED 0x0022
< #define I2O_SCSI_DSC_TASK_SET_FULL 0x0028
< #define I2O_SCSI_DSC_ACA_ACTIVE 0x0030
---
> #define I2O_SCSI_DSC_SUCCESS 0x0000
> #define I2O_SCSI_DSC_CHECK_CONDITION 0x0002
> #define I2O_SCSI_DSC_BUSY 0x0008
> #define I2O_SCSI_DSC_RESERVATION_CONFLICT 0x0018
> #define I2O_SCSI_DSC_COMMAND_TERMINATED 0x0022
> #define I2O_SCSI_DSC_TASK_SET_FULL 0x0028
> #define I2O_SCSI_DSC_ACA_ACTIVE 0x0030
199c199
< #define I2O_SCSI_HBA_DSC_MASK 0xFF00
---
> #define I2O_SCSI_HBA_DSC_MASK 0xFF00
201c201
< #define I2O_SCSI_HBA_DSC_SUCCESS 0x0000
---
> #define I2O_SCSI_HBA_DSC_SUCCESS 0x0000
203,212c203,212
< #define I2O_SCSI_HBA_DSC_REQUEST_ABORTED 0x0200
< #define I2O_SCSI_HBA_DSC_UNABLE_TO_ABORT 0x0300
< #define I2O_SCSI_HBA_DSC_COMPLETE_WITH_ERROR 0x0400
< #define I2O_SCSI_HBA_DSC_ADAPTER_BUSY 0x0500
< #define I2O_SCSI_HBA_DSC_REQUEST_INVALID 0x0600
< #define I2O_SCSI_HBA_DSC_PATH_INVALID 0x0700
< #define I2O_SCSI_HBA_DSC_DEVICE_NOT_PRESENT 0x0800
< #define I2O_SCSI_HBA_DSC_UNABLE_TO_TERMINATE 0x0900
< #define I2O_SCSI_HBA_DSC_SELECTION_TIMEOUT 0x0A00
< #define I2O_SCSI_HBA_DSC_COMMAND_TIMEOUT 0x0B00
---
> #define I2O_SCSI_HBA_DSC_REQUEST_ABORTED 0x0200
> #define I2O_SCSI_HBA_DSC_UNABLE_TO_ABORT 0x0300
> #define I2O_SCSI_HBA_DSC_COMPLETE_WITH_ERROR 0x0400
> #define I2O_SCSI_HBA_DSC_ADAPTER_BUSY 0x0500
> #define I2O_SCSI_HBA_DSC_REQUEST_INVALID 0x0600
> #define I2O_SCSI_HBA_DSC_PATH_INVALID 0x0700
> #define I2O_SCSI_HBA_DSC_DEVICE_NOT_PRESENT 0x0800
> #define I2O_SCSI_HBA_DSC_UNABLE_TO_TERMINATE 0x0900
> #define I2O_SCSI_HBA_DSC_SELECTION_TIMEOUT 0x0A00
> #define I2O_SCSI_HBA_DSC_COMMAND_TIMEOUT 0x0B00
214,225c214,225
< #define I2O_SCSI_HBA_DSC_MR_MESSAGE_RECEIVED 0x0D00
< #define I2O_SCSI_HBA_DSC_SCSI_BUS_RESET 0x0E00
< #define I2O_SCSI_HBA_DSC_PARITY_ERROR_FAILURE 0x0F00
< #define I2O_SCSI_HBA_DSC_AUTOSENSE_FAILED 0x1000
< #define I2O_SCSI_HBA_DSC_NO_ADAPTER 0x1100
< #define I2O_SCSI_HBA_DSC_DATA_OVERRUN 0x1200
< #define I2O_SCSI_HBA_DSC_UNEXPECTED_BUS_FREE 0x1300
< #define I2O_SCSI_HBA_DSC_SEQUENCE_FAILURE 0x1400
< #define I2O_SCSI_HBA_DSC_REQUEST_LENGTH_ERROR 0x1500
< #define I2O_SCSI_HBA_DSC_PROVIDE_FAILURE 0x1600
< #define I2O_SCSI_HBA_DSC_BDR_MESSAGE_SENT 0x1700
< #define I2O_SCSI_HBA_DSC_REQUEST_TERMINATED 0x1800
---
> #define I2O_SCSI_HBA_DSC_MR_MESSAGE_RECEIVED 0x0D00
> #define I2O_SCSI_HBA_DSC_SCSI_BUS_RESET 0x0E00
> #define I2O_SCSI_HBA_DSC_PARITY_ERROR_FAILURE 0x0F00
> #define I2O_SCSI_HBA_DSC_AUTOSENSE_FAILED 0x1000
> #define I2O_SCSI_HBA_DSC_NO_ADAPTER 0x1100
> #define I2O_SCSI_HBA_DSC_DATA_OVERRUN 0x1200
> #define I2O_SCSI_HBA_DSC_UNEXPECTED_BUS_FREE 0x1300
> #define I2O_SCSI_HBA_DSC_SEQUENCE_FAILURE 0x1400
> #define I2O_SCSI_HBA_DSC_REQUEST_LENGTH_ERROR 0x1500
> #define I2O_SCSI_HBA_DSC_PROVIDE_FAILURE 0x1600
> #define I2O_SCSI_HBA_DSC_BDR_MESSAGE_SENT 0x1700
> #define I2O_SCSI_HBA_DSC_REQUEST_TERMINATED 0x1800
227,239c227,239
< #define I2O_SCSI_HBA_DSC_IDE_MESSAGE_SENT 0x3300
< #define I2O_SCSI_HBA_DSC_RESOURCE_UNAVAILABLE 0x3400
< #define I2O_SCSI_HBA_DSC_UNACKNOWLEDGED_EVENT 0x3500
< #define I2O_SCSI_HBA_DSC_MESSAGE_RECEIVED 0x3600
< #define I2O_SCSI_HBA_DSC_INVALID_CDB 0x3700
< #define I2O_SCSI_HBA_DSC_LUN_INVALID 0x3800
< #define I2O_SCSI_HBA_DSC_SCSI_TID_INVALID 0x3900
< #define I2O_SCSI_HBA_DSC_FUNCTION_UNAVAILABLE 0x3A00
< #define I2O_SCSI_HBA_DSC_NO_NEXUS 0x3B00
< #define I2O_SCSI_HBA_DSC_SCSI_IID_INVALID 0x3C00
< #define I2O_SCSI_HBA_DSC_CDB_RECEIVED 0x3D00
< #define I2O_SCSI_HBA_DSC_LUN_ALREADY_ENABLED 0x3E00
< #define I2O_SCSI_HBA_DSC_BUS_BUSY 0x3F00
---
> #define I2O_SCSI_HBA_DSC_IDE_MESSAGE_SENT 0x3300
> #define I2O_SCSI_HBA_DSC_RESOURCE_UNAVAILABLE 0x3400
> #define I2O_SCSI_HBA_DSC_UNACKNOWLEDGED_EVENT 0x3500
> #define I2O_SCSI_HBA_DSC_MESSAGE_RECEIVED 0x3600
> #define I2O_SCSI_HBA_DSC_INVALID_CDB 0x3700
> #define I2O_SCSI_HBA_DSC_LUN_INVALID 0x3800
> #define I2O_SCSI_HBA_DSC_SCSI_TID_INVALID 0x3900
> #define I2O_SCSI_HBA_DSC_FUNCTION_UNAVAILABLE 0x3A00
> #define I2O_SCSI_HBA_DSC_NO_NEXUS 0x3B00
> #define I2O_SCSI_HBA_DSC_SCSI_IID_INVALID 0x3C00
> #define I2O_SCSI_HBA_DSC_CDB_RECEIVED 0x3D00
> #define I2O_SCSI_HBA_DSC_LUN_ALREADY_ENABLED 0x3E00
> #define I2O_SCSI_HBA_DSC_BUS_BUSY 0x3F00
241c241
< #define I2O_SCSI_HBA_DSC_QUEUE_FROZEN 0x4000
---
> #define I2O_SCSI_HBA_DSC_QUEUE_FROZEN 0x4000
254,255c254,255
< #define I2O_SCSI_DEVICE_INFO_GROUP_NO 0x0000
< #define I2O_SCSI_DEVICE_BUS_PORT_INFO_GROUP_NO 0x0001
---
> #define I2O_SCSI_DEVICE_INFO_GROUP_NO 0x0000
> #define I2O_SCSI_DEVICE_BUS_PORT_INFO_GROUP_NO 0x0001
262,276c262,276
< #define I2O_SCSI_DEVICE_TYPE_DIRECT 0x00
< #define I2O_SCSI_DEVICE_TYPE_SEQUENTIAL 0x01
< #define I2O_SCSI_DEVICE_TYPE_PRINTER 0x02
< #define I2O_SCSI_DEVICE_TYPE_PROCESSOR 0x03
< #define I2O_SCSI_DEVICE_TYPE_WORM 0x04
< #define I2O_SCSI_DEVICE_TYPE_CDROM 0x05
< #define I2O_SCSI_DEVICE_TYPE_SCANNER 0x06
< #define I2O_SCSI_DEVICE_TYPE_OPTICAL 0x07
< #define I2O_SCSI_DEVICE_TYPE_MEDIA_CHANGER 0x08
< #define I2O_SCSI_DEVICE_TYPE_COMM 0x09
< #define I2O_SCSI_DEVICE_GRAPHICS_1 0x0A
< #define I2O_SCSI_DEVICE_GRAPHICS_2 0x0B
< #define I2O_SCSI_DEVICE_TYPE_ARRAY_CONT 0x0C
< #define I2O_SCSI_DEVICE_TYPE_SES 0x0D
< #define I2O_SCSI_DEVICE_TYPE_UNKNOWN 0x1F
---
> #define I2O_SCSI_DEVICE_TYPE_DIRECT 0x00
> #define I2O_SCSI_DEVICE_TYPE_SEQUENTIAL 0x01
> #define I2O_SCSI_DEVICE_TYPE_PRINTER 0x02
> #define I2O_SCSI_DEVICE_TYPE_PROCESSOR 0x03
> #define I2O_SCSI_DEVICE_TYPE_WORM 0x04
> #define I2O_SCSI_DEVICE_TYPE_CDROM 0x05
> #define I2O_SCSI_DEVICE_TYPE_SCANNER 0x06
> #define I2O_SCSI_DEVICE_TYPE_OPTICAL 0x07
> #define I2O_SCSI_DEVICE_TYPE_MEDIA_CHANGER 0x08
> #define I2O_SCSI_DEVICE_TYPE_COMM 0x09
> #define I2O_SCSI_DEVICE_GRAPHICS_1 0x0A
> #define I2O_SCSI_DEVICE_GRAPHICS_2 0x0B
> #define I2O_SCSI_DEVICE_TYPE_ARRAY_CONT 0x0C
> #define I2O_SCSI_DEVICE_TYPE_SES 0x0D
> #define I2O_SCSI_DEVICE_TYPE_UNKNOWN 0x1F
280,282c280,282
< #define I2O_SCSI_PERIPHERAL_TYPE_FLAG 0x01
< #define I2O_SCSI_PERIPHERAL_TYPE_PARALLEL 0x00
< #define I2O_SCSI_PERIPHERAL_TYPE_SERIAL 0x01
---
> #define I2O_SCSI_PERIPHERAL_TYPE_FLAG 0x01
> #define I2O_SCSI_PERIPHERAL_TYPE_PARALLEL 0x00
> #define I2O_SCSI_PERIPHERAL_TYPE_SERIAL 0x01
284c284
< #define I2O_SCSI_RESERVED_FLAG 0x02
---
> #define I2O_SCSI_RESERVED_FLAG 0x02
286,288c286,288
< #define I2O_SCSI_DISCONNECT_FLAG 0x04
< #define I2O_SCSI_DISABLE_DISCONNECT 0x00
< #define I2O_SCSI_ENABLE_DISCONNECT 0x04
---
> #define I2O_SCSI_DISCONNECT_FLAG 0x04
> #define I2O_SCSI_DISABLE_DISCONNECT 0x00
> #define I2O_SCSI_ENABLE_DISCONNECT 0x04
290,293c290,293
< #define I2O_SCSI_MODE_MASK 0x18
< #define I2O_SCSI_MODE_SET_DATA 0x00
< #define I2O_SCSI_MODE_SET_DEFAULT 0x08
< #define I2O_SCSI_MODE_SET_SAFEST 0x10
---
> #define I2O_SCSI_MODE_MASK 0x18
> #define I2O_SCSI_MODE_SET_DATA 0x00
> #define I2O_SCSI_MODE_SET_DEFAULT 0x08
> #define I2O_SCSI_MODE_SET_SAFEST 0x10
295,298c295,298
< #define I2O_SCSI_DATA_WIDTH_MASK 0x60
< #define I2O_SCSI_DATA_WIDTH_8 0x00
< #define I2O_SCSI_DATA_WIDTH_16 0x20
< #define I2O_SCSI_DATA_WIDTH_32 0x40
---
> #define I2O_SCSI_DATA_WIDTH_MASK 0x60
> #define I2O_SCSI_DATA_WIDTH_8 0x00
> #define I2O_SCSI_DATA_WIDTH_16 0x20
> #define I2O_SCSI_DATA_WIDTH_32 0x40
300,302c300,302
< #define I2O_SCSI_SYNC_NEGOTIATION_FLAG 0x80
< #define I2O_SCSI_DISABLE_SYNC_NEGOTIATION 0x00
< #define I2O_SCSI_ENABLE_SYNC_NEGOTIATION 0x80
---
> #define I2O_SCSI_SYNC_NEGOTIATION_FLAG 0x80
> #define I2O_SCSI_DISABLE_SYNC_NEGOTIATION 0x00
> #define I2O_SCSI_ENABLE_SYNC_NEGOTIATION 0x80
309,314c309,314
< #define I2O_SCSI_PORT_PHYS_OTHER 0x01
< #define I2O_SCSI_PORT_PHYS_UNKNOWN 0x02
< #define I2O_SCSI_PORT_PHYS_PARALLEL 0x03
< #define I2O_SCSI_PORT_PHYS_FIBRE_CHANNEL 0x04
< #define I2O_SCSI_PORT_PHYS_SERIAL_P1394 0x05
< #define I2O_SCSI_PORT_PHYS_SERIAL_SSA 0x06
---
> #define I2O_SCSI_PORT_PHYS_OTHER 0x01
> #define I2O_SCSI_PORT_PHYS_UNKNOWN 0x02
> #define I2O_SCSI_PORT_PHYS_PARALLEL 0x03
> #define I2O_SCSI_PORT_PHYS_FIBRE_CHANNEL 0x04
> #define I2O_SCSI_PORT_PHYS_SERIAL_P1394 0x05
> #define I2O_SCSI_PORT_PHYS_SERIAL_SSA 0x06
318,323c318,323
< #define I2O_SCSI_PORT_ELEC_OTHER 0x01
< #define I2O_SCSI_PORT_ELEC_UNKNOWN 0x02
< #define I2O_SCSI_PORT_ELEC_SINGLE_ENDED 0x03
< #define I2O_SCSI_PORT_ELEC_DIFFERENTIAL 0x04
< #define I2O_SCSI_PORT_ELEC_LOW_VOLT_DIFF 0x05
< #define I2O_SCSI_PORT_ELEC_OPTICAL 0x06
---
> #define I2O_SCSI_PORT_ELEC_OTHER 0x01
> #define I2O_SCSI_PORT_ELEC_UNKNOWN 0x02
> #define I2O_SCSI_PORT_ELEC_SINGLE_ENDED 0x03
> #define I2O_SCSI_PORT_ELEC_DIFFERENTIAL 0x04
> #define I2O_SCSI_PORT_ELEC_LOW_VOLT_DIFF 0x05
> #define I2O_SCSI_PORT_ELEC_OPTICAL 0x06
327,329c327,329
< #define I2O_SCSI_PORT_ISOC_NO 0x00
< #define I2O_SCSI_PORT_ISOC_YES 0x01
< #define I2O_SCSI_PORT_ISOC_UNKNOWN 0x02
---
> #define I2O_SCSI_PORT_ISOC_NO 0x00
> #define I2O_SCSI_PORT_ISOC_YES 0x01
> #define I2O_SCSI_PORT_ISOC_UNKNOWN 0x02
333,348c333,348
< #define I2O_SCSI_PORT_CONN_OTHER 0x01
< #define I2O_SCSI_PORT_CONN_UNKNOWN 0x02
< #define I2O_SCSI_PORT_CONN_NONE 0x03
< #define I2O_SCSI_PORT_CONN_SHIELDED_A_HD 0x04
< #define I2O_SCSI_PORT_CONN_UNSHIELDED_A_HD 0x05
< #define I2O_SCSI_PORT_CONN_SHIELDED_A_LD 0x06
< #define I2O_SCSI_PORT_CONN_UNSHIELDED_A_LD 0x07
< #define I2O_SCSI_PORT_CONN_SHIELDED_P_HD 0x08
< #define I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD 0x09
< #define I2O_SCSI_PORT_CONN_SCA_I 0x0A
< #define I2O_SCSI_PORT_CONN_SCA_II 0x0B
< #define I2O_SCSI_PORT_CONN_FC_DB9 0x0C
< #define I2O_SCSI_PORT_CONN_FC_FIBRE 0x0D
< #define I2O_SCSI_PORT_CONN_FC_SCA_II_40 0x0E
< #define I2O_SCSI_PORT_CONN_FC_SCA_II_20 0x0F
< #define I2O_SCSI_PORT_CONN_FC_BNC 0x10
---
> #define I2O_SCSI_PORT_CONN_OTHER 0x01
> #define I2O_SCSI_PORT_CONN_UNKNOWN 0x02
> #define I2O_SCSI_PORT_CONN_NONE 0x03
> #define I2O_SCSI_PORT_CONN_SHIELDED_A_HD 0x04
> #define I2O_SCSI_PORT_CONN_UNSHIELDED_A_HD 0x05
> #define I2O_SCSI_PORT_CONN_SHIELDED_A_LD 0x06
> #define I2O_SCSI_PORT_CONN_UNSHIELDED_A_LD 0x07
> #define I2O_SCSI_PORT_CONN_SHIELDED_P_HD 0x08
> #define I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD 0x09
> #define I2O_SCSI_PORT_CONN_SCA_I 0x0A
> #define I2O_SCSI_PORT_CONN_SCA_II 0x0B
> #define I2O_SCSI_PORT_CONN_FC_DB9 0x0C
> #define I2O_SCSI_PORT_CONN_FC_FIBRE 0x0D
> #define I2O_SCSI_PORT_CONN_FC_SCA_II_40 0x0E
> #define I2O_SCSI_PORT_CONN_FC_SCA_II_20 0x0F
> #define I2O_SCSI_PORT_CONN_FC_BNC 0x10
352,355c352,355
< #define I2O_SCSI_PORT_CONN_GENDER_OTHER 0x01
< #define I2O_SCSI_PORT_CONN_GENDER_UNKOWN 0x02
< #define I2O_SCSI_PORT_CONN_GENDER_FEMALE 0x03
< #define I2O_SCSI_PORT_CONN_GENDER_MALE 0x04
---
> #define I2O_SCSI_PORT_CONN_GENDER_OTHER 0x01
> #define I2O_SCSI_PORT_CONN_GENDER_UNKOWN 0x02
> #define I2O_SCSI_PORT_CONN_GENDER_FEMALE 0x03
> #define I2O_SCSI_PORT_CONN_GENDER_MALE 0x04
361,371c361,371
< U8 DeviceType;
< U8 Flags;
< U16 Reserved2;
< U32 Identifier;
< U8 LunInfo[8]; /* SCSI-2 8-bit scalar LUN goes into offset 1 */
< U32 QueueDepth;
< U8 Reserved1a;
< U8 NegOffset;
< U8 NegDataWidth;
< U8 Reserved1b;
< U64 NegSyncRate;
---
> U8 DeviceType;
> U8 Flags;
> U16 Reserved2;
> U32 Identifier;
> U8 LunInfo[8]; /* SCSI-2 8-bit scalar LUN goes into offset 1 */
> U32 QueueDepth;
> U8 Reserved1a;
> U8 NegOffset;
> U8 NegDataWidth;
> U8 Reserved1b;
> U64 NegSyncRate;
379,386c379,386
< U8 PhysicalInterface;
< U8 ElectricalInterface;
< U8 Isochronous;
< U8 ConnectorType;
< U8 ConnectorGender;
< U8 Reserved1;
< U16 Reserved2;
< U32 MaxNumberDevices;
---
> U8 PhysicalInterface;
> U8 ElectricalInterface;
> U8 Isochronous;
> U8 ConnectorType;
> U8 ConnectorGender;
> U8 Reserved1;
> U16 Reserved2;
> U32 MaxNumberDevices;
395c395
< #define I2O_SCSI_EVENT_SCSI_SMART 0x00000010
---
> #define I2O_SCSI_EVENT_SCSI_SMART 0x00000010
411c411
< U32 TransferCount;
---
> U32 TransferCount;
420c420
< #define I2O_SCSI_SENSE_DATA_SZ 44
---
> #define I2O_SCSI_SENSE_DATA_SZ 44
422c422
< #define I2O_SCSI_SENSE_DATA_SZ 40
---
> #define I2O_SCSI_SENSE_DATA_SZ 40
427,429c427,429
< U32 TransferCount;
< U32 AutoSenseTransferCount;
< U8 SenseData[I2O_SCSI_SENSE_DATA_SZ];
---
> U32 TransferCount;
> U32 AutoSenseTransferCount;
> U8 SenseData[I2O_SCSI_SENSE_DATA_SZ];
438c438
< I2O_MESSAGE_FRAME StdMessageFrame;
---
> I2O_MESSAGE_FRAME StdMessageFrame;
448c448
< I2O_MESSAGE_FRAME StdMessageFrame;
---
> I2O_MESSAGE_FRAME StdMessageFrame;
458c458
< #define I2O_SCSI_CDB_LENGTH 16
---
> #define I2O_SCSI_CDB_LENGTH 16
460c460
< typedef U16 I2O_SCB_FLAGS;
---
> typedef U16 I2O_SCB_FLAGS;
462,465c462,465
< #define I2O_SCB_FLAG_XFER_DIR_MASK 0xC000
< #define I2O_SCB_FLAG_NO_DATA_XFER 0x0000
< #define I2O_SCB_FLAG_XFER_FROM_DEVICE 0x4000
< #define I2O_SCB_FLAG_XFER_TO_DEVICE 0x8000
---
> #define I2O_SCB_FLAG_XFER_DIR_MASK 0xC000
> #define I2O_SCB_FLAG_NO_DATA_XFER 0x0000
> #define I2O_SCB_FLAG_XFER_FROM_DEVICE 0x4000
> #define I2O_SCB_FLAG_XFER_TO_DEVICE 0x8000
467c467
< #define I2O_SCB_FLAG_ENABLE_DISCONNECT 0x2000
---
> #define I2O_SCB_FLAG_ENABLE_DISCONNECT 0x2000
469,474c469,474
< #define I2O_SCB_FLAG_TAG_TYPE_MASK 0x0380
< #define I2O_SCB_FLAG_NO_TAG_QUEUEING 0x0000
< #define I2O_SCB_FLAG_SIMPLE_QUEUE_TAG 0x0080
< #define I2O_SCB_FLAG_HEAD_QUEUE_TAG 0x0100
< #define I2O_SCB_FLAG_ORDERED_QUEUE_TAG 0x0180
< #define I2O_SCB_FLAG_ACA_QUEUE_TAG 0x0200
---
> #define I2O_SCB_FLAG_TAG_TYPE_MASK 0x0380
> #define I2O_SCB_FLAG_NO_TAG_QUEUEING 0x0000
> #define I2O_SCB_FLAG_SIMPLE_QUEUE_TAG 0x0080
> #define I2O_SCB_FLAG_HEAD_QUEUE_TAG 0x0100
> #define I2O_SCB_FLAG_ORDERED_QUEUE_TAG 0x0180
> #define I2O_SCB_FLAG_ACA_QUEUE_TAG 0x0200
476,479c476,479
< #define I2O_SCB_FLAG_AUTOSENSE_MASK 0x0060
< #define I2O_SCB_FLAG_DISABLE_AUTOSENSE 0x0000
< #define I2O_SCB_FLAG_SENSE_DATA_IN_MESSAGE 0x0020
< #define I2O_SCB_FLAG_SENSE_DATA_IN_BUFFER 0x0060
---
> #define I2O_SCB_FLAG_AUTOSENSE_MASK 0x0060
> #define I2O_SCB_FLAG_DISABLE_AUTOSENSE 0x0000
> #define I2O_SCB_FLAG_SENSE_DATA_IN_MESSAGE 0x0020
> #define I2O_SCB_FLAG_SENSE_DATA_IN_BUFFER 0x0060
482c482
< I2O_MESSAGE_FRAME StdMessageFrame;
---
> I2O_MESSAGE_FRAME StdMessageFrame;
484,489c484,489
< U8 CDBLength;
< U8 Reserved;
< I2O_SCB_FLAGS SCBFlags;
< U8 CDB[I2O_SCSI_CDB_LENGTH];
< U32 ByteCount;
< I2O_SG_ELEMENT SGL;
---
> U8 CDBLength;
> U8 Reserved;
> I2O_SCB_FLAGS SCBFlags;
> U8 CDB[I2O_SCSI_CDB_LENGTH];
> U32 ByteCount;
> I2O_SG_ELEMENT SGL;
497c497
< #endif /* I2O_BASE_SCSI_HDR */
---
> #endif /* I2O_BASE_SCSI_HDR */
< * Copyright 1999 I2O Special Interest Group (I2O SIG). All rights reserved.
---
> * Copyright 1999 I2O Special Interest Group (I2O SIG). All rights reserved.
29c29
< * conditions. By accepting and/or using this header file, you agree to abide
---
> * conditions. By accepting and/or using this header file, you agree to abide
64c64
< * on this header file. Any distribution of such derivative work: (1) must
---
> * on this header file. Any distribution of such derivative work: (1) must
75c75
< * header file at the I2O SIG Web site. Furthermore, to become a Registered
---
> * header file at the I2O SIG Web site. Furthermore, to become a Registered
79c79
< * $FreeBSD: head/sys/dev/asr/i2obscsi.h 96551 2002-05-14 00:53:08Z obrien $
---
> * $FreeBSD: head/sys/dev/asr/i2obscsi.h 96554 2002-05-14 01:09:03Z obrien $
84c84
< #define I2O_BASE_SCSI_HDR
---
> #define I2O_BASE_SCSI_HDR
88c88
< # include "i386/pci/i2omsg.h" /* Include the Base Message file */
---
> # include "i386/pci/i2omsg.h" /* Include the Base Message file */
93c93
< # include "i2omsg.h" /* Include the Base Message file */
---
> # include "i2omsg.h" /* Include the Base Message file */
97c97
< #define I2OBSCSI_REV 1_5_1 /* Header file revision string */
---
> #define I2OBSCSI_REV 1_5_1 /* Header file revision string */
105,106c105,106
< * This file contains information presented in Chapter 6, Section 6 & 7 of
< * the I2O Specification.
---
> * This file contains information presented in Chapter 6, Section 6 & 7 of
> * the I2O Specification.
109c109
< * specification)
---
> * specification)
111,113c111,113
< * .92 - First marked revsion used for Proof of Concept.
< * .93 - Change to match the rev .93 of the spec.
< * .95 - Updated to Rev .95 of 2/5/96.
---
> * .92 - First marked revsion used for Proof of Concept.
> * .93 - Change to match the rev .93 of the spec.
> * .95 - Updated to Rev .95 of 2/5/96.
117,119c117,119
< * 1) Removed duplicate device type definitions.
< * 2) Added "DSC" to Detailed Status Code definitions.
< * 3) Changed SCSI-3 LUN fields from U64 to U8 array.
---
> * 1) Removed duplicate device type definitions.
> * 2) Added "DSC" to Detailed Status Code definitions.
> * 3) Changed SCSI-3 LUN fields from U64 to U8 array.
124,125c124,125
< * 1) Converted SCSI bus adapter class to generic in i2oadptr.h.
< * 2) Fixed DSC reference: changed from _BUS_SCAN to _BUS_RESET.
---
> * 1) Converted SCSI bus adapter class to generic in i2oadptr.h.
> * 2) Fixed DSC reference: changed from _BUS_SCAN to _BUS_RESET.
128,129c128,129
< * 1) Corrected typo in I2O_SCSI_PERIPHERAL_TYPE_PARALLEL.
< * 2) Corrected typo in I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD.
---
> * 1) Corrected typo in I2O_SCSI_PERIPHERAL_TYPE_PARALLEL.
> * 2) Corrected typo in I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD.
131,134c131,134
< * 1) Remove #include for i2omstor.h.
< * 2) Add revision string.
< * 3) Convert tabs to spaces.
< * 4) New disclaimer.
---
> * 1) Remove #include for i2omstor.h.
> * 2) Add revision string.
> * 3) Convert tabs to spaces.
> * 4) New disclaimer.
169,171c169,171
< #define I2O_SCSI_DEVICE_RESET 0x27
< #define I2O_SCSI_SCB_ABORT 0x83
< #define I2O_SCSI_SCB_EXEC 0x81
---
> #define I2O_SCSI_DEVICE_RESET 0x27
> #define I2O_SCSI_SCB_ABORT 0x83
> #define I2O_SCSI_SCB_EXEC 0x81
178,179c178,179
< Device Status information. The upper 8 bits are used to report
< Adapter Status information. The definitions for these two fields,
---
> Device Status information. The upper 8 bits are used to report
> Adapter Status information. The definitions for these two fields,
187c187
< #define I2O_SCSI_DEVICE_DSC_MASK 0x00FF
---
> #define I2O_SCSI_DEVICE_DSC_MASK 0x00FF
189,195c189,195
< #define I2O_SCSI_DSC_SUCCESS 0x0000
< #define I2O_SCSI_DSC_CHECK_CONDITION 0x0002
< #define I2O_SCSI_DSC_BUSY 0x0008
< #define I2O_SCSI_DSC_RESERVATION_CONFLICT 0x0018
< #define I2O_SCSI_DSC_COMMAND_TERMINATED 0x0022
< #define I2O_SCSI_DSC_TASK_SET_FULL 0x0028
< #define I2O_SCSI_DSC_ACA_ACTIVE 0x0030
---
> #define I2O_SCSI_DSC_SUCCESS 0x0000
> #define I2O_SCSI_DSC_CHECK_CONDITION 0x0002
> #define I2O_SCSI_DSC_BUSY 0x0008
> #define I2O_SCSI_DSC_RESERVATION_CONFLICT 0x0018
> #define I2O_SCSI_DSC_COMMAND_TERMINATED 0x0022
> #define I2O_SCSI_DSC_TASK_SET_FULL 0x0028
> #define I2O_SCSI_DSC_ACA_ACTIVE 0x0030
199c199
< #define I2O_SCSI_HBA_DSC_MASK 0xFF00
---
> #define I2O_SCSI_HBA_DSC_MASK 0xFF00
201c201
< #define I2O_SCSI_HBA_DSC_SUCCESS 0x0000
---
> #define I2O_SCSI_HBA_DSC_SUCCESS 0x0000
203,212c203,212
< #define I2O_SCSI_HBA_DSC_REQUEST_ABORTED 0x0200
< #define I2O_SCSI_HBA_DSC_UNABLE_TO_ABORT 0x0300
< #define I2O_SCSI_HBA_DSC_COMPLETE_WITH_ERROR 0x0400
< #define I2O_SCSI_HBA_DSC_ADAPTER_BUSY 0x0500
< #define I2O_SCSI_HBA_DSC_REQUEST_INVALID 0x0600
< #define I2O_SCSI_HBA_DSC_PATH_INVALID 0x0700
< #define I2O_SCSI_HBA_DSC_DEVICE_NOT_PRESENT 0x0800
< #define I2O_SCSI_HBA_DSC_UNABLE_TO_TERMINATE 0x0900
< #define I2O_SCSI_HBA_DSC_SELECTION_TIMEOUT 0x0A00
< #define I2O_SCSI_HBA_DSC_COMMAND_TIMEOUT 0x0B00
---
> #define I2O_SCSI_HBA_DSC_REQUEST_ABORTED 0x0200
> #define I2O_SCSI_HBA_DSC_UNABLE_TO_ABORT 0x0300
> #define I2O_SCSI_HBA_DSC_COMPLETE_WITH_ERROR 0x0400
> #define I2O_SCSI_HBA_DSC_ADAPTER_BUSY 0x0500
> #define I2O_SCSI_HBA_DSC_REQUEST_INVALID 0x0600
> #define I2O_SCSI_HBA_DSC_PATH_INVALID 0x0700
> #define I2O_SCSI_HBA_DSC_DEVICE_NOT_PRESENT 0x0800
> #define I2O_SCSI_HBA_DSC_UNABLE_TO_TERMINATE 0x0900
> #define I2O_SCSI_HBA_DSC_SELECTION_TIMEOUT 0x0A00
> #define I2O_SCSI_HBA_DSC_COMMAND_TIMEOUT 0x0B00
214,225c214,225
< #define I2O_SCSI_HBA_DSC_MR_MESSAGE_RECEIVED 0x0D00
< #define I2O_SCSI_HBA_DSC_SCSI_BUS_RESET 0x0E00
< #define I2O_SCSI_HBA_DSC_PARITY_ERROR_FAILURE 0x0F00
< #define I2O_SCSI_HBA_DSC_AUTOSENSE_FAILED 0x1000
< #define I2O_SCSI_HBA_DSC_NO_ADAPTER 0x1100
< #define I2O_SCSI_HBA_DSC_DATA_OVERRUN 0x1200
< #define I2O_SCSI_HBA_DSC_UNEXPECTED_BUS_FREE 0x1300
< #define I2O_SCSI_HBA_DSC_SEQUENCE_FAILURE 0x1400
< #define I2O_SCSI_HBA_DSC_REQUEST_LENGTH_ERROR 0x1500
< #define I2O_SCSI_HBA_DSC_PROVIDE_FAILURE 0x1600
< #define I2O_SCSI_HBA_DSC_BDR_MESSAGE_SENT 0x1700
< #define I2O_SCSI_HBA_DSC_REQUEST_TERMINATED 0x1800
---
> #define I2O_SCSI_HBA_DSC_MR_MESSAGE_RECEIVED 0x0D00
> #define I2O_SCSI_HBA_DSC_SCSI_BUS_RESET 0x0E00
> #define I2O_SCSI_HBA_DSC_PARITY_ERROR_FAILURE 0x0F00
> #define I2O_SCSI_HBA_DSC_AUTOSENSE_FAILED 0x1000
> #define I2O_SCSI_HBA_DSC_NO_ADAPTER 0x1100
> #define I2O_SCSI_HBA_DSC_DATA_OVERRUN 0x1200
> #define I2O_SCSI_HBA_DSC_UNEXPECTED_BUS_FREE 0x1300
> #define I2O_SCSI_HBA_DSC_SEQUENCE_FAILURE 0x1400
> #define I2O_SCSI_HBA_DSC_REQUEST_LENGTH_ERROR 0x1500
> #define I2O_SCSI_HBA_DSC_PROVIDE_FAILURE 0x1600
> #define I2O_SCSI_HBA_DSC_BDR_MESSAGE_SENT 0x1700
> #define I2O_SCSI_HBA_DSC_REQUEST_TERMINATED 0x1800
227,239c227,239
< #define I2O_SCSI_HBA_DSC_IDE_MESSAGE_SENT 0x3300
< #define I2O_SCSI_HBA_DSC_RESOURCE_UNAVAILABLE 0x3400
< #define I2O_SCSI_HBA_DSC_UNACKNOWLEDGED_EVENT 0x3500
< #define I2O_SCSI_HBA_DSC_MESSAGE_RECEIVED 0x3600
< #define I2O_SCSI_HBA_DSC_INVALID_CDB 0x3700
< #define I2O_SCSI_HBA_DSC_LUN_INVALID 0x3800
< #define I2O_SCSI_HBA_DSC_SCSI_TID_INVALID 0x3900
< #define I2O_SCSI_HBA_DSC_FUNCTION_UNAVAILABLE 0x3A00
< #define I2O_SCSI_HBA_DSC_NO_NEXUS 0x3B00
< #define I2O_SCSI_HBA_DSC_SCSI_IID_INVALID 0x3C00
< #define I2O_SCSI_HBA_DSC_CDB_RECEIVED 0x3D00
< #define I2O_SCSI_HBA_DSC_LUN_ALREADY_ENABLED 0x3E00
< #define I2O_SCSI_HBA_DSC_BUS_BUSY 0x3F00
---
> #define I2O_SCSI_HBA_DSC_IDE_MESSAGE_SENT 0x3300
> #define I2O_SCSI_HBA_DSC_RESOURCE_UNAVAILABLE 0x3400
> #define I2O_SCSI_HBA_DSC_UNACKNOWLEDGED_EVENT 0x3500
> #define I2O_SCSI_HBA_DSC_MESSAGE_RECEIVED 0x3600
> #define I2O_SCSI_HBA_DSC_INVALID_CDB 0x3700
> #define I2O_SCSI_HBA_DSC_LUN_INVALID 0x3800
> #define I2O_SCSI_HBA_DSC_SCSI_TID_INVALID 0x3900
> #define I2O_SCSI_HBA_DSC_FUNCTION_UNAVAILABLE 0x3A00
> #define I2O_SCSI_HBA_DSC_NO_NEXUS 0x3B00
> #define I2O_SCSI_HBA_DSC_SCSI_IID_INVALID 0x3C00
> #define I2O_SCSI_HBA_DSC_CDB_RECEIVED 0x3D00
> #define I2O_SCSI_HBA_DSC_LUN_ALREADY_ENABLED 0x3E00
> #define I2O_SCSI_HBA_DSC_BUS_BUSY 0x3F00
241c241
< #define I2O_SCSI_HBA_DSC_QUEUE_FROZEN 0x4000
---
> #define I2O_SCSI_HBA_DSC_QUEUE_FROZEN 0x4000
254,255c254,255
< #define I2O_SCSI_DEVICE_INFO_GROUP_NO 0x0000
< #define I2O_SCSI_DEVICE_BUS_PORT_INFO_GROUP_NO 0x0001
---
> #define I2O_SCSI_DEVICE_INFO_GROUP_NO 0x0000
> #define I2O_SCSI_DEVICE_BUS_PORT_INFO_GROUP_NO 0x0001
262,276c262,276
< #define I2O_SCSI_DEVICE_TYPE_DIRECT 0x00
< #define I2O_SCSI_DEVICE_TYPE_SEQUENTIAL 0x01
< #define I2O_SCSI_DEVICE_TYPE_PRINTER 0x02
< #define I2O_SCSI_DEVICE_TYPE_PROCESSOR 0x03
< #define I2O_SCSI_DEVICE_TYPE_WORM 0x04
< #define I2O_SCSI_DEVICE_TYPE_CDROM 0x05
< #define I2O_SCSI_DEVICE_TYPE_SCANNER 0x06
< #define I2O_SCSI_DEVICE_TYPE_OPTICAL 0x07
< #define I2O_SCSI_DEVICE_TYPE_MEDIA_CHANGER 0x08
< #define I2O_SCSI_DEVICE_TYPE_COMM 0x09
< #define I2O_SCSI_DEVICE_GRAPHICS_1 0x0A
< #define I2O_SCSI_DEVICE_GRAPHICS_2 0x0B
< #define I2O_SCSI_DEVICE_TYPE_ARRAY_CONT 0x0C
< #define I2O_SCSI_DEVICE_TYPE_SES 0x0D
< #define I2O_SCSI_DEVICE_TYPE_UNKNOWN 0x1F
---
> #define I2O_SCSI_DEVICE_TYPE_DIRECT 0x00
> #define I2O_SCSI_DEVICE_TYPE_SEQUENTIAL 0x01
> #define I2O_SCSI_DEVICE_TYPE_PRINTER 0x02
> #define I2O_SCSI_DEVICE_TYPE_PROCESSOR 0x03
> #define I2O_SCSI_DEVICE_TYPE_WORM 0x04
> #define I2O_SCSI_DEVICE_TYPE_CDROM 0x05
> #define I2O_SCSI_DEVICE_TYPE_SCANNER 0x06
> #define I2O_SCSI_DEVICE_TYPE_OPTICAL 0x07
> #define I2O_SCSI_DEVICE_TYPE_MEDIA_CHANGER 0x08
> #define I2O_SCSI_DEVICE_TYPE_COMM 0x09
> #define I2O_SCSI_DEVICE_GRAPHICS_1 0x0A
> #define I2O_SCSI_DEVICE_GRAPHICS_2 0x0B
> #define I2O_SCSI_DEVICE_TYPE_ARRAY_CONT 0x0C
> #define I2O_SCSI_DEVICE_TYPE_SES 0x0D
> #define I2O_SCSI_DEVICE_TYPE_UNKNOWN 0x1F
280,282c280,282
< #define I2O_SCSI_PERIPHERAL_TYPE_FLAG 0x01
< #define I2O_SCSI_PERIPHERAL_TYPE_PARALLEL 0x00
< #define I2O_SCSI_PERIPHERAL_TYPE_SERIAL 0x01
---
> #define I2O_SCSI_PERIPHERAL_TYPE_FLAG 0x01
> #define I2O_SCSI_PERIPHERAL_TYPE_PARALLEL 0x00
> #define I2O_SCSI_PERIPHERAL_TYPE_SERIAL 0x01
284c284
< #define I2O_SCSI_RESERVED_FLAG 0x02
---
> #define I2O_SCSI_RESERVED_FLAG 0x02
286,288c286,288
< #define I2O_SCSI_DISCONNECT_FLAG 0x04
< #define I2O_SCSI_DISABLE_DISCONNECT 0x00
< #define I2O_SCSI_ENABLE_DISCONNECT 0x04
---
> #define I2O_SCSI_DISCONNECT_FLAG 0x04
> #define I2O_SCSI_DISABLE_DISCONNECT 0x00
> #define I2O_SCSI_ENABLE_DISCONNECT 0x04
290,293c290,293
< #define I2O_SCSI_MODE_MASK 0x18
< #define I2O_SCSI_MODE_SET_DATA 0x00
< #define I2O_SCSI_MODE_SET_DEFAULT 0x08
< #define I2O_SCSI_MODE_SET_SAFEST 0x10
---
> #define I2O_SCSI_MODE_MASK 0x18
> #define I2O_SCSI_MODE_SET_DATA 0x00
> #define I2O_SCSI_MODE_SET_DEFAULT 0x08
> #define I2O_SCSI_MODE_SET_SAFEST 0x10
295,298c295,298
< #define I2O_SCSI_DATA_WIDTH_MASK 0x60
< #define I2O_SCSI_DATA_WIDTH_8 0x00
< #define I2O_SCSI_DATA_WIDTH_16 0x20
< #define I2O_SCSI_DATA_WIDTH_32 0x40
---
> #define I2O_SCSI_DATA_WIDTH_MASK 0x60
> #define I2O_SCSI_DATA_WIDTH_8 0x00
> #define I2O_SCSI_DATA_WIDTH_16 0x20
> #define I2O_SCSI_DATA_WIDTH_32 0x40
300,302c300,302
< #define I2O_SCSI_SYNC_NEGOTIATION_FLAG 0x80
< #define I2O_SCSI_DISABLE_SYNC_NEGOTIATION 0x00
< #define I2O_SCSI_ENABLE_SYNC_NEGOTIATION 0x80
---
> #define I2O_SCSI_SYNC_NEGOTIATION_FLAG 0x80
> #define I2O_SCSI_DISABLE_SYNC_NEGOTIATION 0x00
> #define I2O_SCSI_ENABLE_SYNC_NEGOTIATION 0x80
309,314c309,314
< #define I2O_SCSI_PORT_PHYS_OTHER 0x01
< #define I2O_SCSI_PORT_PHYS_UNKNOWN 0x02
< #define I2O_SCSI_PORT_PHYS_PARALLEL 0x03
< #define I2O_SCSI_PORT_PHYS_FIBRE_CHANNEL 0x04
< #define I2O_SCSI_PORT_PHYS_SERIAL_P1394 0x05
< #define I2O_SCSI_PORT_PHYS_SERIAL_SSA 0x06
---
> #define I2O_SCSI_PORT_PHYS_OTHER 0x01
> #define I2O_SCSI_PORT_PHYS_UNKNOWN 0x02
> #define I2O_SCSI_PORT_PHYS_PARALLEL 0x03
> #define I2O_SCSI_PORT_PHYS_FIBRE_CHANNEL 0x04
> #define I2O_SCSI_PORT_PHYS_SERIAL_P1394 0x05
> #define I2O_SCSI_PORT_PHYS_SERIAL_SSA 0x06
318,323c318,323
< #define I2O_SCSI_PORT_ELEC_OTHER 0x01
< #define I2O_SCSI_PORT_ELEC_UNKNOWN 0x02
< #define I2O_SCSI_PORT_ELEC_SINGLE_ENDED 0x03
< #define I2O_SCSI_PORT_ELEC_DIFFERENTIAL 0x04
< #define I2O_SCSI_PORT_ELEC_LOW_VOLT_DIFF 0x05
< #define I2O_SCSI_PORT_ELEC_OPTICAL 0x06
---
> #define I2O_SCSI_PORT_ELEC_OTHER 0x01
> #define I2O_SCSI_PORT_ELEC_UNKNOWN 0x02
> #define I2O_SCSI_PORT_ELEC_SINGLE_ENDED 0x03
> #define I2O_SCSI_PORT_ELEC_DIFFERENTIAL 0x04
> #define I2O_SCSI_PORT_ELEC_LOW_VOLT_DIFF 0x05
> #define I2O_SCSI_PORT_ELEC_OPTICAL 0x06
327,329c327,329
< #define I2O_SCSI_PORT_ISOC_NO 0x00
< #define I2O_SCSI_PORT_ISOC_YES 0x01
< #define I2O_SCSI_PORT_ISOC_UNKNOWN 0x02
---
> #define I2O_SCSI_PORT_ISOC_NO 0x00
> #define I2O_SCSI_PORT_ISOC_YES 0x01
> #define I2O_SCSI_PORT_ISOC_UNKNOWN 0x02
333,348c333,348
< #define I2O_SCSI_PORT_CONN_OTHER 0x01
< #define I2O_SCSI_PORT_CONN_UNKNOWN 0x02
< #define I2O_SCSI_PORT_CONN_NONE 0x03
< #define I2O_SCSI_PORT_CONN_SHIELDED_A_HD 0x04
< #define I2O_SCSI_PORT_CONN_UNSHIELDED_A_HD 0x05
< #define I2O_SCSI_PORT_CONN_SHIELDED_A_LD 0x06
< #define I2O_SCSI_PORT_CONN_UNSHIELDED_A_LD 0x07
< #define I2O_SCSI_PORT_CONN_SHIELDED_P_HD 0x08
< #define I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD 0x09
< #define I2O_SCSI_PORT_CONN_SCA_I 0x0A
< #define I2O_SCSI_PORT_CONN_SCA_II 0x0B
< #define I2O_SCSI_PORT_CONN_FC_DB9 0x0C
< #define I2O_SCSI_PORT_CONN_FC_FIBRE 0x0D
< #define I2O_SCSI_PORT_CONN_FC_SCA_II_40 0x0E
< #define I2O_SCSI_PORT_CONN_FC_SCA_II_20 0x0F
< #define I2O_SCSI_PORT_CONN_FC_BNC 0x10
---
> #define I2O_SCSI_PORT_CONN_OTHER 0x01
> #define I2O_SCSI_PORT_CONN_UNKNOWN 0x02
> #define I2O_SCSI_PORT_CONN_NONE 0x03
> #define I2O_SCSI_PORT_CONN_SHIELDED_A_HD 0x04
> #define I2O_SCSI_PORT_CONN_UNSHIELDED_A_HD 0x05
> #define I2O_SCSI_PORT_CONN_SHIELDED_A_LD 0x06
> #define I2O_SCSI_PORT_CONN_UNSHIELDED_A_LD 0x07
> #define I2O_SCSI_PORT_CONN_SHIELDED_P_HD 0x08
> #define I2O_SCSI_PORT_CONN_UNSHIELDED_P_HD 0x09
> #define I2O_SCSI_PORT_CONN_SCA_I 0x0A
> #define I2O_SCSI_PORT_CONN_SCA_II 0x0B
> #define I2O_SCSI_PORT_CONN_FC_DB9 0x0C
> #define I2O_SCSI_PORT_CONN_FC_FIBRE 0x0D
> #define I2O_SCSI_PORT_CONN_FC_SCA_II_40 0x0E
> #define I2O_SCSI_PORT_CONN_FC_SCA_II_20 0x0F
> #define I2O_SCSI_PORT_CONN_FC_BNC 0x10
352,355c352,355
< #define I2O_SCSI_PORT_CONN_GENDER_OTHER 0x01
< #define I2O_SCSI_PORT_CONN_GENDER_UNKOWN 0x02
< #define I2O_SCSI_PORT_CONN_GENDER_FEMALE 0x03
< #define I2O_SCSI_PORT_CONN_GENDER_MALE 0x04
---
> #define I2O_SCSI_PORT_CONN_GENDER_OTHER 0x01
> #define I2O_SCSI_PORT_CONN_GENDER_UNKOWN 0x02
> #define I2O_SCSI_PORT_CONN_GENDER_FEMALE 0x03
> #define I2O_SCSI_PORT_CONN_GENDER_MALE 0x04
361,371c361,371
< U8 DeviceType;
< U8 Flags;
< U16 Reserved2;
< U32 Identifier;
< U8 LunInfo[8]; /* SCSI-2 8-bit scalar LUN goes into offset 1 */
< U32 QueueDepth;
< U8 Reserved1a;
< U8 NegOffset;
< U8 NegDataWidth;
< U8 Reserved1b;
< U64 NegSyncRate;
---
> U8 DeviceType;
> U8 Flags;
> U16 Reserved2;
> U32 Identifier;
> U8 LunInfo[8]; /* SCSI-2 8-bit scalar LUN goes into offset 1 */
> U32 QueueDepth;
> U8 Reserved1a;
> U8 NegOffset;
> U8 NegDataWidth;
> U8 Reserved1b;
> U64 NegSyncRate;
379,386c379,386
< U8 PhysicalInterface;
< U8 ElectricalInterface;
< U8 Isochronous;
< U8 ConnectorType;
< U8 ConnectorGender;
< U8 Reserved1;
< U16 Reserved2;
< U32 MaxNumberDevices;
---
> U8 PhysicalInterface;
> U8 ElectricalInterface;
> U8 Isochronous;
> U8 ConnectorType;
> U8 ConnectorGender;
> U8 Reserved1;
> U16 Reserved2;
> U32 MaxNumberDevices;
395c395
< #define I2O_SCSI_EVENT_SCSI_SMART 0x00000010
---
> #define I2O_SCSI_EVENT_SCSI_SMART 0x00000010
411c411
< U32 TransferCount;
---
> U32 TransferCount;
420c420
< #define I2O_SCSI_SENSE_DATA_SZ 44
---
> #define I2O_SCSI_SENSE_DATA_SZ 44
422c422
< #define I2O_SCSI_SENSE_DATA_SZ 40
---
> #define I2O_SCSI_SENSE_DATA_SZ 40
427,429c427,429
< U32 TransferCount;
< U32 AutoSenseTransferCount;
< U8 SenseData[I2O_SCSI_SENSE_DATA_SZ];
---
> U32 TransferCount;
> U32 AutoSenseTransferCount;
> U8 SenseData[I2O_SCSI_SENSE_DATA_SZ];
438c438
< I2O_MESSAGE_FRAME StdMessageFrame;
---
> I2O_MESSAGE_FRAME StdMessageFrame;
448c448
< I2O_MESSAGE_FRAME StdMessageFrame;
---
> I2O_MESSAGE_FRAME StdMessageFrame;
458c458
< #define I2O_SCSI_CDB_LENGTH 16
---
> #define I2O_SCSI_CDB_LENGTH 16
460c460
< typedef U16 I2O_SCB_FLAGS;
---
> typedef U16 I2O_SCB_FLAGS;
462,465c462,465
< #define I2O_SCB_FLAG_XFER_DIR_MASK 0xC000
< #define I2O_SCB_FLAG_NO_DATA_XFER 0x0000
< #define I2O_SCB_FLAG_XFER_FROM_DEVICE 0x4000
< #define I2O_SCB_FLAG_XFER_TO_DEVICE 0x8000
---
> #define I2O_SCB_FLAG_XFER_DIR_MASK 0xC000
> #define I2O_SCB_FLAG_NO_DATA_XFER 0x0000
> #define I2O_SCB_FLAG_XFER_FROM_DEVICE 0x4000
> #define I2O_SCB_FLAG_XFER_TO_DEVICE 0x8000
467c467
< #define I2O_SCB_FLAG_ENABLE_DISCONNECT 0x2000
---
> #define I2O_SCB_FLAG_ENABLE_DISCONNECT 0x2000
469,474c469,474
< #define I2O_SCB_FLAG_TAG_TYPE_MASK 0x0380
< #define I2O_SCB_FLAG_NO_TAG_QUEUEING 0x0000
< #define I2O_SCB_FLAG_SIMPLE_QUEUE_TAG 0x0080
< #define I2O_SCB_FLAG_HEAD_QUEUE_TAG 0x0100
< #define I2O_SCB_FLAG_ORDERED_QUEUE_TAG 0x0180
< #define I2O_SCB_FLAG_ACA_QUEUE_TAG 0x0200
---
> #define I2O_SCB_FLAG_TAG_TYPE_MASK 0x0380
> #define I2O_SCB_FLAG_NO_TAG_QUEUEING 0x0000
> #define I2O_SCB_FLAG_SIMPLE_QUEUE_TAG 0x0080
> #define I2O_SCB_FLAG_HEAD_QUEUE_TAG 0x0100
> #define I2O_SCB_FLAG_ORDERED_QUEUE_TAG 0x0180
> #define I2O_SCB_FLAG_ACA_QUEUE_TAG 0x0200
476,479c476,479
< #define I2O_SCB_FLAG_AUTOSENSE_MASK 0x0060
< #define I2O_SCB_FLAG_DISABLE_AUTOSENSE 0x0000
< #define I2O_SCB_FLAG_SENSE_DATA_IN_MESSAGE 0x0020
< #define I2O_SCB_FLAG_SENSE_DATA_IN_BUFFER 0x0060
---
> #define I2O_SCB_FLAG_AUTOSENSE_MASK 0x0060
> #define I2O_SCB_FLAG_DISABLE_AUTOSENSE 0x0000
> #define I2O_SCB_FLAG_SENSE_DATA_IN_MESSAGE 0x0020
> #define I2O_SCB_FLAG_SENSE_DATA_IN_BUFFER 0x0060
482c482
< I2O_MESSAGE_FRAME StdMessageFrame;
---
> I2O_MESSAGE_FRAME StdMessageFrame;
484,489c484,489
< U8 CDBLength;
< U8 Reserved;
< I2O_SCB_FLAGS SCBFlags;
< U8 CDB[I2O_SCSI_CDB_LENGTH];
< U32 ByteCount;
< I2O_SG_ELEMENT SGL;
---
> U8 CDBLength;
> U8 Reserved;
> I2O_SCB_FLAGS SCBFlags;
> U8 CDB[I2O_SCSI_CDB_LENGTH];
> U32 ByteCount;
> I2O_SG_ELEMENT SGL;
497c497
< #endif /* I2O_BASE_SCSI_HDR */
---
> #endif /* I2O_BASE_SCSI_HDR */