linux-libc-headers/trunk/include/scsi: scsi.h sg.h

[pluto]

Author: pluto
Date: Fri Nov  4 16:43:31 2005
New Revision: 6515

Modified:
   linux-libc-headers/trunk/include/scsi/scsi.h
   linux-libc-headers/trunk/include/scsi/sg.h
Log:
- updated to 2.6.14.


Modified: linux-libc-headers/trunk/include/scsi/scsi.h
==============================================================================
--- linux-libc-headers/trunk/include/scsi/scsi.h	(original)
+++ linux-libc-headers/trunk/include/scsi/scsi.h	Fri Nov  4 16:43:31 2005
@@ -28,7 +28,7 @@
  *	SCSI device types
  */
 
-#define MAX_SCSI_DEVICE_CODE 14
+#define MAX_SCSI_DEVICE_CODE 15
 extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
 
 /*
@@ -41,6 +41,7 @@
 #define FORMAT_UNIT           0x04
 #define READ_BLOCK_LIMITS     0x05
 #define REASSIGN_BLOCKS       0x07
+#define INITIALIZE_ELEMENT_STATUS 0x07
 #define READ_6                0x08
 #define WRITE_6               0x0a
 #define SEEK_6                0x0b
@@ -65,6 +66,7 @@
 #define READ_10               0x28
 #define WRITE_10              0x2a
 #define SEEK_10               0x2b
+#define POSITION_TO_ELEMENT   0x2b
 #define WRITE_VERIFY          0x2e
 #define VERIFY                0x2f
 #define SEARCH_HIGH           0x30
@@ -97,6 +99,7 @@
 #define PERSISTENT_RESERVE_OUT 0x5f
 #define REPORT_LUNS           0xa0
 #define MOVE_MEDIUM           0xa5
+#define EXCHANGE_MEDIUM       0xa6
 #define READ_12               0xa8
 #define WRITE_12              0xaa
 #define WRITE_VERIFY_12       0xae
@@ -138,7 +141,7 @@
  * This returns true for known good conditions that may be treated as
  * command completed normally
  */
-static int scsi_status_is_good(int status)
+static inline int scsi_status_is_good(int status)
 {
 	/*
 	 * FIXME: bit0 is listed as reserved in SCSI-2, but is
@@ -208,8 +211,9 @@
 				     * - treated as TYPE_DISK */
 #define TYPE_MEDIUM_CHANGER 0x08
 #define TYPE_COMM           0x09    /* Communications device */
-#define TYPE_ENCLOSURE      0x0d    /* Enclosure Services Device */
 #define TYPE_RAID           0x0c
+#define TYPE_ENCLOSURE      0x0d    /* Enclosure Services Device */
+#define TYPE_RBC            0x0e
 #define TYPE_NO_LUN         0x7f
 
 /*

Modified: linux-libc-headers/trunk/include/scsi/sg.h
==============================================================================
--- linux-libc-headers/trunk/include/scsi/sg.h	(original)
+++ linux-libc-headers/trunk/include/scsi/sg.h	Fri Nov  4 16:43:31 2005
@@ -108,7 +108,7 @@
     void * dxferp;              /* [i], [*io] points to data transfer memory
 					      or scatter gather list */
     unsigned char * cmdp;       /* [i], [*i] points to command to perform */
-    unsigned char * sbp;        /* [i], [*o] points to sense_buffer memory */
+    void * sbp;		 /* [i], [*o] points to sense_buffer memory */
     unsigned int timeout;       /* [i] MAX_UINT->no timeout (unit: millisec) */
     unsigned int flags;         /* [i] 0 -> default, see SG_FLAG... */
     int pack_id;                /* [i->o] unused internally (normally) */