diff options
| author | bms <bms@FreeBSD.org> | 2004-10-13 09:31:04 +0000 |
|---|---|---|
| committer | bms <bms@FreeBSD.org> | 2004-10-13 09:31:04 +0000 |
| commit | 2d923cd7cbce1e1ad1d15a90838c610cfb1920f3 (patch) | |
| tree | c62fde103162d384c92f54436e43ab53f88537b8 /sys/cam | |
| parent | 47c2584ada884664c7b47583d0e7a0ad0d73ae43 (diff) | |
| download | FreeBSD-src-2d923cd7cbce1e1ad1d15a90838c610cfb1920f3.zip FreeBSD-src-2d923cd7cbce1e1ad1d15a90838c610cfb1920f3.tar.gz | |
Remove references to the second byte of a CCB containing the LUN, as this
is valid only for SCSI-2 and older devices.
Rename the second byte of the VERIFY CCB from 'lun' to 'byte2'.
Submitted by: ken
MFC after: 2 weeks
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/scsi/scsi_da.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h index ea250b3..d31a160 100644 --- a/sys/cam/scsi/scsi_da.h +++ b/sys/cam/scsi/scsi_da.h @@ -188,7 +188,7 @@ struct format_ipat_descriptor struct scsi_read_format_capacities { uint8_t opcode; /* READ_FORMAT_CAPACITIES */ - uint8_t byte2; /* top 3 bits contain LUN */ + uint8_t byte2; #define SRFC_LUN_MASK 0xE0 uint8_t reserved0[5]; uint8_t alloc_length[2]; @@ -198,11 +198,11 @@ struct scsi_read_format_capacities struct scsi_verify { uint8_t opcode; /* VERIFY */ - uint8_t lun; /* All other bits should be zero */ + uint8_t byte2; +#define SVFY_LUN_MASK 0xE0 #define SVFY_RELADR 0x01 #define SVFY_BYTECHK 0x02 #define SVFY_DPO 0x10 -#define SVFY_LUN_MASK 0xE0 /* Top 3 MSBs are LUN */ uint8_t addr[4]; /* LBA to begin verification at */ uint8_t reserved0[1]; uint8_t len[2]; /* number of blocks to verify */ @@ -212,7 +212,7 @@ struct scsi_verify struct scsi_write_and_verify { uint8_t opcode; /* WRITE_AND_VERIFY */ - uint8_t byte2; /* top 3 bits are the LUN */ + uint8_t byte2; #define SWVY_LUN_MASK 0xE0 #define SWVY_RELADR 0x01 #define SWVY_BYTECHK 0x02 |
