m68k/scsi: a3000 - Do not use legacy Scsi_Host.base

[safe/jmp/linux-2.6] / drivers / scsi / hpsa.h

diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 0ba1aa3..1bb5233 100644 (file)
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -83,6 +83,10 @@ struct ctlr_info {
        unsigned int maxQsinceinit;
        unsigned int maxSG;
        spinlock_t lock;
+       int maxsgentries;
+       u8 max_cmd_sg_entries;
+       int chainsize;
+       struct SGDescriptor **cmd_sg_list;
 
        /* pointers to command and error info pool */
        struct CommandList      *cmd_pool;
@@ -94,9 +98,9 @@ struct ctlr_info {
        int                     nr_frees;
        int                     busy_initializing;
        int                     busy_scanning;
-       struct mutex            busy_shutting_down;
-       struct list_head        scan_list;
-       struct completion       scan_wait;
+       int                     scan_finished;
+       spinlock_t              scan_lock;
+       wait_queue_head_t       scan_wait_queue;
 
        struct Scsi_Host *scsi_host;
        spinlock_t devlock; /* to protect hba[ctlr]->dev[];  */
@@ -120,6 +124,7 @@ struct ctlr_info {
        size_t reply_pool_size;
        unsigned char reply_pool_wraparound;
        u32 *blockFetchTable;
+       unsigned char *hba_inquiry_data;
 };
 #define HPSA_ABORT_MSG 0
 #define HPSA_DEVICE_RESET_MSG 1