summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2001-04-02 17:11:26 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2001-04-02 17:11:26 +0000
commit7c98ecacfb0f16e0a91a74652ef4cc8fec519d7b (patch)
tree577272aec370ed86beace59e212d24bb1a9a3f57
parent2b4622b41db6f35a760f7533a3477c43650980c0 (diff)
Add padding and new field 'flags2' to struct scsi_inquiry_data,
bringing it in line with the spc-2 definition of standard inquiry data. scsi_inquiry_data grows from 50 to 57 bytes in size. The new 'flags2' field gives access to PPR related information, the IUS, QAS and DT bits, used in negotiating Ultra3 transfers. Also add PPR related extended message defines. ok deraadt@
-rw-r--r--sys/scsi/scsi_all.h8
-rw-r--r--sys/scsi/scsi_message.h9
2 files changed, 14 insertions, 3 deletions
diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h
index dd6494758ec..509955ae009 100644
--- a/sys/scsi/scsi_all.h
+++ b/sys/scsi/scsi_all.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_all.h,v 1.8 2001/01/09 17:36:34 krw Exp $ */
+/* $OpenBSD: scsi_all.h,v 1.9 2001/04/02 17:11:25 krw Exp $ */
/* $NetBSD: scsi_all.h,v 1.10 1996/09/12 01:57:17 thorpej Exp $ */
/*
@@ -237,7 +237,11 @@ struct scsi_inquiry_data {
char vendor[8];
char product[16];
char revision[4];
- u_int8_t extra[14];
+ u_int8_t extra[20];
+ u_int8_t flags2;
+#define SID_IUS 0x01
+#define SID_QAS 0x02
+#define SID_CLOCKING 0x0c /* 0 == ST only, 1 == DT only, 3 == both */
};
struct scsi_sense_data_unextended {
diff --git a/sys/scsi/scsi_message.h b/sys/scsi/scsi_message.h
index 068dabe0f96..fb2969dbc90 100644
--- a/sys/scsi/scsi_message.h
+++ b/sys/scsi/scsi_message.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_message.h,v 1.4 2000/03/09 06:35:53 smurph Exp $ */
+/* $OpenBSD: scsi_message.h,v 1.5 2001/04/02 17:11:25 krw Exp $ */
/* Messages (1 byte) */ /* I/T (M)andatory or (O)ptional */
#define MSG_CMDCOMPLETE 0x00 /* M/M */
@@ -43,3 +43,10 @@
#define MSG_EXT_WDTR_BUS_8_BIT 0x00
#define MSG_EXT_WDTR_BUS_16_BIT 0x01
#define MSG_EXT_WDTR_BUS_32_BIT 0x02
+
+#define MSG_EXT_PPR 0x04
+#define MSG_EXT_PPR_LEN 0x06
+
+#define MSG_EXT_PPR_PROT_QAS 0x04
+#define MSG_EXT_PPR_PROT_DT 0x02
+#define MSG_EXT_PPR_PROT_IUS 0x01