patch-2.3.20 linux/include/scsi/sg.h

Next file: linux/init/main.c
Previous file: linux/include/linux/sunrpc/xprt.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.19/linux/include/scsi/sg.h linux/include/scsi/sg.h
@@ -12,10 +12,16 @@
 *       Copyright (C) 1998, 1999 Douglas Gilbert
 
 
-    Version: 2.1.34 (990603)
-    This version for later 2.1.x and 2.2.x series kernels
-    D. P. Gilbert (dgilbert@interlog.com, dougg@triode.net.au)
-
+    Version: 2.3.35 (990708)
+    This version for 2.3 series kernels. It only differs from sg version
+    2.1.35 used in the 2.2 series kernels by changes to wait_queue. This
+    in an internal kernel interface and should not effect users.
+        D. P. Gilbert (dgilbert@interlog.com, dougg@triode.net.au)
+
+    Changes since 2.1.34 (990603)
+        - add queuing info into struct sg_scsi_id
+        - block negative timeout values
+        - add back write() wait on previous read() when no cmd queuing
     Changes since 2.1.33 (990521)
         - implement SG_SET_RESERVED_SIZE and associated memory re-org.
         - add SG_NEXT_CMD_LEN to override SCSI command lengths
@@ -144,9 +150,10 @@
     int scsi_id;        /* scsi id of target device */
     int lun;
     int scsi_type;      /* TYPE_... defined in scsi/scsi.h */
+    short h_cmd_per_lun;/* host (adapter) maximum commands per lun */
+    short d_queue_depth;/* device (or adapter) maximum queue length */
     int unused1;        /* probably find a good use, set 0 for now */
     int unused2;        /* ditto */
-    int unused3;  
 } Sg_scsi_id;
 
 /* IOCTLs: ( _GET_s yield result via 'int *' 3rd argument unless 
@@ -204,6 +211,10 @@
 #define SG_GET_VERSION_NUM 0x2282 /* Example: version 2.1.34 yields 20134 */
 #define SG_NEXT_CMD_LEN 0x2283  /* override SCSI command length with given
                    number on the next write() on this file descriptor */
+
+/* Returns -EBUSY if occupied else takes as input: 0 -> do nothing,
+   1 -> device reset or  2 -> bus reset (may not be activated yet) */
+#define SG_SCSI_RESET 0x2284
 
 
 #define SG_SCATTER_SZ (8 * 4096)  /* PAGE_SIZE not available to user */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)