diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-14 04:09:18 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-14 04:09:18 +0000 |
| commit | 3237113ee6497bdf81974f24d03b6e5d1eaf6d47 (patch) | |
| tree | 084de2514e030d0657a3c675a6f90f1a5f811a00 /sys/scsi/scsi_all.h | |
| parent | 7e3f93e1b77c8f4cf6793193e29fc7ac401f5b4a (diff) | |
Merge in various pieces of current NetBSD scsi code, including but not limited
to:
* New changer driver.
* Better optical support.
* Different `done' semantics.
* New quirks for SCSI QIC tape driver, SCSI floppy drives.
* Better support for SCSI-I devices.
Everybody needs to test this.
Diffstat (limited to 'sys/scsi/scsi_all.h')
| -rw-r--r-- | sys/scsi/scsi_all.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h index c9492a5bb48..746d6dbf086 100644 --- a/sys/scsi/scsi_all.h +++ b/sys/scsi/scsi_all.h @@ -1,5 +1,5 @@ -/* $OpenBSD: scsi_all.h,v 1.4 1996/07/02 20:18:49 deraadt Exp $ */ -/* $NetBSD: scsi_all.h,v 1.7 1996/03/19 03:06:10 mycroft Exp $ */ +/* $OpenBSD: scsi_all.h,v 1.5 1997/04/14 04:09:06 downsj Exp $ */ +/* $NetBSD: scsi_all.h,v 1.10 1996/09/12 01:57:17 thorpej Exp $ */ /* * SCSI general interface description @@ -35,8 +35,14 @@ #define SCSI_CTL_LINK 0x01 #define SCSI_CTL_FLAG 0x02 #define SCSI_CTL_VENDOR 0xC0 -#define SCSI_CMD_LUN 0xA0 /* these two should not be needed */ -#define SCSI_CMD_LUN_SHIFT 5 /* LUN in the cmd is no longer SCSI */ + + +/* + * Some old SCSI devices need the LUN to be set in the top 3 bits of the + * second byte of the CDB. + */ +#define SCSI_CMD_LUN_MASK 0xe0 +#define SCSI_CMD_LUN_SHIFT 5 struct scsi_generic { @@ -176,8 +182,6 @@ struct scsi_changedef { #define CHANGE_DEFINITION 0x40 #define MODE_SENSE_BIG 0x54 #define MODE_SELECT_BIG 0x55 -#define MOVE_MEDIUM 0xa5 -#define READ_ELEMENT_STATUS 0xb8 /* * Sort of an extra one, for SCSI_RESET. |