vserver 1.9.5.x5

[linux-2.6.git] / drivers / scsi / st.h

diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h
index 56ca7a7..0e6dd5d 100644 (file)
--- a/drivers/scsi/st.h
+++ b/drivers/scsi/st.h
@@ -2,13 +2,11 @@
 #ifndef _ST_H
 #define _ST_H
 
-#ifndef _SCSI_H
-#include "scsi.h"
-#endif
 #include <linux/completion.h>
 
+
 /* The tape buffer descriptor. */
-typedef struct {
+struct st_buffer {
        unsigned char in_use;
        unsigned char dma;      /* DMA-able buffer */
        unsigned char do_dio;   /* direct i/o set up? */
@@ -19,7 +17,7 @@ typedef struct {
        int writing;
        int midlevel_result;
        int syscall_result;
-       Scsi_Request *last_SRpnt;
+       struct scsi_request *last_SRpnt;
        unsigned char *b_data;
        unsigned short use_sg;  /* zero or max number of s/g segments for this adapter */
        unsigned short sg_segs;         /* number of segments in s/g list */
@@ -28,7 +26,7 @@ typedef struct {
        unsigned int frp_sg_current;    /* driver buffer length currently in s/g list */
        struct st_buf_fragment *frp;    /* the allocated buffer fragment list */
        struct scatterlist sg[1];       /* MUST BE last item */
-} ST_buffer;
+};
 
 /* The tape buffer fragment descriptor */
 struct st_buf_fragment {
@@ -37,7 +35,7 @@ struct st_buf_fragment {
 };
 
 /* The tape mode definition */
-typedef struct {
+struct st_modedef {
        unsigned char defined;
        unsigned char sysv;     /* SYS V semantics? */
        unsigned char do_async_writes;
@@ -48,7 +46,7 @@ typedef struct {
        short default_density;  /* Forced density, -1 = no value */
        int default_blksize;    /* Forced blocksize, -1 = no value */
        struct cdev *cdevs[2];  /* Auto-rewind and non-rewind devices */
-} ST_mode;
+};
 
 /* Number of modes can be changed by changing ST_NBR_MODE_BITS. The maximum
    number of modes is 16 (ST_NBR_MODE_BITS 4) */
@@ -61,7 +59,7 @@ typedef struct {
 #define ST_MAX_TAPE_ENTRIES  (ST_MAX_TAPES << (ST_NBR_MODE_BITS + 1))
 
 /* The status related to each partition */
-typedef struct {
+struct st_partstat {
        unsigned char rw;
        unsigned char eof;
        unsigned char at_sm;
@@ -69,17 +67,17 @@ typedef struct {
        u32 last_block_visited;
        int drv_block;          /* The block where the drive head is */
        int drv_file;
-} ST_partstat;
+};
 
 #define ST_NBR_PARTITIONS 4
 
 /* The tape drive descriptor */
-typedef struct {
+struct scsi_tape {
        struct scsi_driver *driver;
-       Scsi_Device *device;
+       struct scsi_device *device;
        struct semaphore lock;  /* For serialization */
        struct completion wait; /* For SCSI commands */
-       ST_buffer *buffer;
+       struct st_buffer *buffer;
 
        /* Drive characteristics */
        unsigned char omit_blklims;
@@ -105,14 +103,14 @@ typedef struct {
        unsigned long max_pfn;  /* the maximum page number reachable by the HBA */
 
        /* Mode characteristics */
-       ST_mode modes[ST_NBR_MODES];
+       struct st_modedef modes[ST_NBR_MODES];
        int current_mode;
 
        /* Status variables */
        int partition;
        int new_partition;
        int nbr_partitions;     /* zero until partition support enabled */
-       ST_partstat ps[ST_NBR_PARTITIONS];
+       struct st_partstat ps[ST_NBR_PARTITIONS];
        unsigned char dirty;
        unsigned char ready;
        unsigned char write_prot;
@@ -146,7 +144,7 @@ typedef struct {
        unsigned char last_sense[16];
 #endif
        struct gendisk *disk;
-} Scsi_Tape;
+};
 
 /* Bit masks for use_pf */
 #define USE_PF      1