summaryrefslogtreecommitdiffstats
path: root/sys/scsi/scsi_changer.h
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1993-08-20 09:23:30 +0000
committerrgrimes <rgrimes@FreeBSD.org>1993-08-20 09:23:30 +0000
commitcf0a4c9f207124f943e290bcc365b75f8deea2c6 (patch)
tree5dcbce83587cfd32b34f8a919c3f679ce971a405 /sys/scsi/scsi_changer.h
parent2970641bb3922023009c2b42e8d0074196806195 (diff)
downloadFreeBSD-src-cf0a4c9f207124f943e290bcc365b75f8deea2c6.zip
FreeBSD-src-cf0a4c9f207124f943e290bcc365b75f8deea2c6.tar.gz
Update scsi code to the latest from Julian. This code is now identical
to the last copy from Julian. After this commit I will be commiting the local fixes and makeing diffs to send back to Julian so he can update his code. ---- From julian@jules.DIALix.oz.au Thu Aug 5 09:25:23 1993 To: hd@world.std.com, julian@jules.DIALix.oz.au Cc: nate@bsd.coe.montana.edu Subject: Re: new scsi ---- From julian@jules.DIALix.oz.au Sat Aug 7 04:13:17 1993 To: hd@world.std.com (HD Associates) Cc: nate@bsd.coe.montana.edu Subject: Re: timeout diffs Here are the diffs to take the scsi stuff to my latest tree from what Nate and you received.. the changes remove all the local timeout stuff and use (un)timeout(), ---- From julian@jules.DIALix.oz.au Sat Aug 7 04:13:45 1993 To: hd@world.std.com (HD Associates) Cc: nate@bsd.coe.montana.edu, briggs@csugrad.cs.vt.edu here is a fix for a silly bug in the scsiconf I just sent out and a similar fix for st.c
Diffstat (limited to 'sys/scsi/scsi_changer.h')
-rw-r--r--sys/scsi/scsi_changer.h48
1 files changed, 25 insertions, 23 deletions
diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h
index 16ca71f..172f9c3 100644
--- a/sys/scsi/scsi_changer.h
+++ b/sys/scsi/scsi_changer.h
@@ -1,4 +1,16 @@
/*
+ * HISTORY
+ *
+ * PATCHES MAGIC LEVEL PATCH THAT GOT US HERE
+ * -------------------- ----- ----------------------
+ * CURRENT PATCH LEVEL: 1 00098
+ * -------------------- ----- ----------------------
+ *
+ * 16 Feb 93 Julian Elischer ADDED for SCSI system
+ *
+ */
+
+/*
* SCSI changer interface description
*/
@@ -29,17 +41,15 @@
struct scsi_read_element_status
{
u_char op_code;
- u_char element_type_code:4;
- u_char voltag:1;
- u_char lun:3;
+ u_char byte2;
+#define SRES_ELEM_TYPE_CODE 0x0F
+#define SRES_ELEM_VOLTAG 0x10
u_char starting_element_addr[2];
u_char number_of_elements[2];
u_char resv1;
u_char allocation_length[3];
u_char resv2;
- u_char link:1;
- u_char flag:1;
- u_char :6;
+ u_char control;
};
#define RE_ALL_ELEMENTS 0
#define RE_MEDIUM_TRANSPORT_ELEMENT 1
@@ -50,32 +60,24 @@ struct scsi_read_element_status
struct scsi_move_medium
{
u_char op_code;
- u_char :5;
- u_char lun:3;
+ u_char byte2;
u_char transport_element_address[2];
u_char source_address[2];
u_char destination_address[2];
u_char rsvd[2];
- u_char invert:1;
- u_char :7;
- u_char link:1;
- u_char flag:1;
- u_char :6;
+ u_char invert;
+ u_char control;
};
struct scsi_position_to_element
{
u_char op_code;
- u_char :5;
- u_char lun:3;
+ u_char byte2;
u_char transport_element_address[2];
u_char source_address[2];
u_char rsvd[2];
- u_char invert:1;
- u_char :7;
- u_char link:1;
- u_char flag:1;
- u_char :6;
+ u_char invert;
+ u_char control;
};
/*
@@ -96,9 +98,9 @@ struct scsi_element_status_data
struct element_status_page
{
u_char element_type_code;
- u_char :5;
- u_char avoltag:1;
- u_char pvoltag:1;
+ u_char flags;
+#define ESP_AVOLTAG 0x40
+#define ESP_PVOLTAG 0x80
u_char element_descriptor_length[2];
u_char rsvd;
u_char byte_count_of_descriptor_data[3];
OpenPOWER on IntegriCloud