fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h
index c43673b..fd79068 100644 (file)
--- a/drivers/scsi/dpti.h
+++ b/drivers/scsi/dpti.h
@@ -3,7 +3,6 @@
                              -------------------
     begin                : Thu Sep 7 2000
     copyright            : (C) 2001 by Adaptec
-    email                : deanna_bonds@adaptec.com
 
     See Documentation/scsi/dpti.txt for history, notes, license info
     and credits
@@ -21,15 +20,7 @@
 #ifndef _DPT_H
 #define _DPT_H
 
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,00)
-#define MAX_TO_IOP_MESSAGES   (210)
-#else
 #define MAX_TO_IOP_MESSAGES   (255)
-#endif
 #define MAX_FROM_IOP_MESSAGES (255)
 
 
@@ -53,7 +44,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd);
 
 
 /*
- * Scsi_Host_Template (see hosts.h) 
+ * struct scsi_host_template (see scsi/scsi_host.h)
  */
 
 #define DPT_DRIVER_NAME        "Adaptec I2O RAID"
@@ -228,12 +219,12 @@ typedef struct _adpt_hba {
        char name[32];
        char detail[55];
 
-       ulong base_addr_virt;
-       ulong msg_addr_virt;
+       void __iomem *base_addr_virt;
+       void __iomem *msg_addr_virt;
        ulong base_addr_phys;
-       ulong  post_port;
-       ulong  reply_port;
-       ulong  irq_mask;
+       void __iomem *post_port;
+       void __iomem *reply_port;
+       void __iomem *irq_mask;
        u16  post_count;
        u32  post_fifo_size;
        u32  reply_fifo_size;
@@ -251,12 +242,12 @@ typedef struct _adpt_hba {
        struct adpt_channel channel[MAX_CHANNEL];
        struct proc_dir_entry* proc_entry;      /* /proc dir */
 
-       ulong FwDebugBuffer_P;  // Virtual Address Of FW Debug Buffer
+       void __iomem *FwDebugBuffer_P;  // Virtual Address Of FW Debug Buffer
        u32   FwDebugBufferSize;        // FW Debug Buffer Size In Bytes
-       ulong FwDebugStrLength_P;       // Virtual Addr Of FW Debug String Len
-       ulong FwDebugFlags_P;   // Virtual Address Of FW Debug Flags 
-       ulong FwDebugBLEDflag_P;        // Virtual Addr Of FW Debug BLED
-       ulong FwDebugBLEDvalue_P;       // Virtual Addr Of FW Debug BLED
+       void __iomem *FwDebugStrLength_P;// Virtual Addr Of FW Debug String Len
+       void __iomem *FwDebugFlags_P;   // Virtual Address Of FW Debug Flags 
+       void __iomem *FwDebugBLEDflag_P;// Virtual Addr Of FW Debug BLED
+       void __iomem *FwDebugBLEDvalue_P;// Virtual Addr Of FW Debug BLED
        u32 FwDebugFlags;
 } adpt_hba;
 
@@ -272,7 +263,7 @@ struct sg_simple_element {
 static void adpt_i2o_sys_shutdown(void);
 static int adpt_init(void);
 static int adpt_i2o_build_sys_table(void);
-static irqreturn_t adpt_isr(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t adpt_isr(int irq, void *dev_id);
 #ifdef REBOOT_NOTIFIER
 static int adpt_reboot_event(struct notifier_block *n, ulong code, void *p);
 #endif
@@ -297,7 +288,7 @@ static s32 adpt_i2o_status_get(adpt_hba* pHba);
 static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba);
 static s32 adpt_i2o_hrt_get(adpt_hba* pHba);
 static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_device* dptdevice);
-static s32 adpt_i2o_to_scsi(ulong reply, struct scsi_cmnd* cmd);
+static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd);
 static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht);
 static s32 adpt_hba_reset(adpt_hba* pHba);
 static s32 adpt_i2o_reset_hba(adpt_hba* pHba);
@@ -322,10 +313,6 @@ static int adpt_close(struct inode *inode, struct file *file);
 static void adpt_delay(int millisec);
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-static struct pci_dev* adpt_pci_find_device(uint vendor, struct pci_dev* from);
-#endif
-
 #if defined __ia64__ 
 static void adpt_ia64_info(sysInfo_S* si);
 #endif