This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / sys / scsi / scsi_changer.h

diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h
index 63a5b13..4cadd32 100644 (file)
--- a/sys/scsi/scsi_changer.h
+++ b/sys/scsi/scsi_changer.h
@@ -1,15 +1,3 @@
-/*
- * 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
  */
 /*
  * SCSI changer interface description
  */


@@ -29,10 +17,9 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *

- */
-
-/*

  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992

+ *
+ *     $Id$

  */
 
 /*
  */
 
 /*


@@ -41,17 +28,15 @@
 struct scsi_read_element_status
 {
         u_char  op_code;
 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  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
 };
 #define RE_ALL_ELEMENTS                        0
 #define RE_MEDIUM_TRANSPORT_ELEMENT    1


@@ -62,32 +47,24 @@ struct scsi_read_element_status
 struct scsi_move_medium
 {
        u_char  op_code;
 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  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;
 };
 
 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  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;

 };
        
 /*
 };
        
 /*


@@ -108,9 +85,9 @@ struct scsi_element_status_data
 struct element_status_page 
 {
        u_char  element_type_code;
 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];
        u_char element_descriptor_length[2];
        u_char rsvd;
        u_char byte_count_of_descriptor_data[3];