Import of Linux/MIPS 2.1.14

1 files changed, 482 insertions, 208 deletions

diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index 1905014c5..e7347c127 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -98,8 +98,41 @@
  *  one of the FD boards, it would be nice to come up with a signature
  *  for it.
  *                                                           J.B. Jan 1994.
+ *
+ *
+ *  Revisions by Miroslav Zagorac <zaga@fly.cc.fer.hr>
+ *
+ *  08/24/1996.
+ *
+ *  Enhancement for wd7000_detect function has been made, so you don't have
+ *  to enter BIOS ROM adress in initialisation data (see struct Config).
+ *  We cannot detect IRQ, DMA and I/O base address for now, so we have to
+ *  enter them as arguments while wd_7000 is detected. If someone has IRQ,
+ *  DMA or I/O base address set to some other value, he can enter them in
+ *  configuration without any problem. Also I wrote a function wd7000_setup,
+ *  so now you can enter WD-7000 definition as kernel arguments,
+ *  as in lilo.conf:
+ *
+ *     append="wd7000=IRQ,DMA,IO"
+ *
+ *  PS: If card BIOS ROM is disabled, function wd7000_detect now will recognize
+ *      adapter, unlike the old one. Anyway, BIOS ROM from WD7000 adapter is
+ *      useless for Linux. B^)
+ *
+ *
+ *  09/06/1996.
+ *
+ *  Autodetecting of I/O base address from wd7000_detect function is removed,
+ *  some little bugs removed, etc...
+ *
+ *  Thanks to Roger Scott for driver debugging.
+ *
  */
 
+#ifdef MODULE
+#include <linux/module.h>
+#endif
+
 #include <stdarg.h>
 #include <linux/kernel.h>
 #include <linux/head.h>
@@ -111,17 +144,24 @@
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
-
-#include "../block/blk.h"
+#include <linux/proc_fs.h>
+#include <linux/blk.h>
 #include "scsi.h"
 #include "hosts.h"
 #include "sd.h"
 
-#define ANY2SCSI_INLINE    /* undef this to use old macros */
+#define ANY2SCSI_INLINE		/* undef this to use old macros */
 #undef DEBUG
 
 #include "wd7000.h"
 
+#include<linux/stat.h>
+
+struct proc_dir_entry proc_scsi_wd7000 = {
+    PROC_SCSI_7000FASST, 6, "wd7000",
+    S_IFDIR | S_IRUGO | S_IXUGO, 2
+};
+
 
 /*
  *  Mailbox structure sizes.
@@ -147,7 +187,7 @@
  */
 typedef volatile struct mailbox{
   unchar status;
-  unchar scbptr[3];             /* SCSI-style - MSB first (big endian) */
+  unchar scbptr[3];		/* SCSI-style - MSB first (big endian) */
 } Mailbox;
 
 /*
@@ -156,17 +196,17 @@ typedef volatile struct mailbox{
  *
  */
 typedef struct adapter {
-  struct Scsi_Host *sh;             /* Pointer to Scsi_Host structure */
-  int iobase;                       /* This adapter's I/O base address */
-  int irq;                          /* This adapter's IRQ level */
-  int dma;                          /* This adapter's DMA channel */
-  struct {                          /* This adapter's mailboxes */
-    Mailbox ogmb[OGMB_CNT];             /* Outgoing mailboxes */
-    Mailbox icmb[ICMB_CNT];             /* Incoming mailboxes */
+  struct Scsi_Host *sh;		/* Pointer to Scsi_Host structure */
+  int iobase;			/* This adapter's I/O base address */
+  int irq;			/* This adapter's IRQ level */
+  int dma;			/* This adapter's DMA channel */
+  struct {			/* This adapter's mailboxes */
+    Mailbox ogmb[OGMB_CNT];	/* Outgoing mailboxes */
+    Mailbox icmb[ICMB_CNT];	/* Incoming mailboxes */
   } mb;
-  int next_ogmb;                    /* to reduce contention at mailboxes */
-  unchar control;                   /* shadows CONTROL port value */
-  unchar rev1, rev2;                /* filled in by wd7000_revision */
+  int next_ogmb;		/* to reduce contention at mailboxes */
+  unchar control;		/* shadows CONTROL port value */
+  unchar rev1, rev2;		/* filled in by wd7000_revision */
 } Adapter;
 
 /*
@@ -175,22 +215,48 @@ typedef struct adapter {
  * Note that if SA_INTERRUPT is not used, wd7000_intr_handle must be
  * changed to pick up the IRQ level correctly.
  */
-Adapter *irq2host[16] = {NULL};  /* Possible IRQs are 0-15 */
+Adapter *irq2host[16] = {NULL};	/* Possible IRQs are 0-15 */
 
 /*
+ * (linear) base address for ROM BIOS
+ */
+static const long wd7000_biosaddr[] = {
+  0xc0000, 0xc2000, 0xc4000, 0xc6000, 0xc8000, 0xca000, 0xcc000, 0xce000,
+  0xd0000, 0xd2000, 0xd4000, 0xd6000, 0xd8000, 0xda000, 0xdc000, 0xde000
+};
+#define NUM_ADDRS (sizeof(wd7000_biosaddr)/sizeof(long))
+
+static const unsigned short wd7000_iobase[] = {
+  0x0300, 0x0308, 0x0310, 0x0318, 0x0320, 0x0328, 0x0330, 0x0338,
+  0x0340, 0x0348, 0x0350, 0x0358, 0x0360, 0x0368, 0x0370, 0x0378,
+  0x0380, 0x0388, 0x0390, 0x0398, 0x03a0, 0x03a8, 0x03b0, 0x03b8,
+  0x03c0, 0x03c8, 0x03d0, 0x03d8, 0x03e0, 0x03e8, 0x03f0, 0x03f8
+};
+#define NUM_IOPORTS (sizeof(wd7000_iobase)/sizeof(unsigned short))
+
+static const short wd7000_irq[] = { 3, 4, 5, 7, 9, 10, 11, 12, 14, 15 };
+#define NUM_IRQS (sizeof(wd7000_irq)/sizeof(short))
+
+static const short wd7000_dma[] = { 5, 6, 7 };
+#define NUM_DMAS (sizeof(wd7000_dma)/sizeof(short))
+  
+/*
  *  Standard Adapter Configurations - used by wd7000_detect
  */
 typedef struct {
-  const void *bios;             /* (linear) base address for ROM BIOS */
-  int iobase;                   /* I/O ports base address */
-  int irq;                      /* IRQ level */
-  int dma;                      /* DMA channel */
+  int      irq;			/* IRQ level        */
+  int      dma;			/* DMA channel      */
+  unsigned iobase;		/* I/O base address */
 } Config;
 
+/*
+ * Add here your configuration...
+ */
 static const Config configs[] = {
-  {(void *) 0xce000, 0x350, 15, 6},  /* defaults for single adapter */
-  {(void *) 0xc8000, 0x330, 11, 5},  /* defaults for second adapter */
-  {(void *) 0xd8000, 0x350, 15, 6},  /* Arghhh.... who added this ? */
+  { 15,  6, 0x350 },		/* defaults for single adapter */
+  { 11,  5, 0x320 },		/* defaults for second adapter */
+  {  7,  6, 0x350 },		/* My configuration (Zaga)     */
+  { -1, -1, 0x0   }		/* Empty slot                  */
 };
 #define NUM_CONFIGS (sizeof(configs)/sizeof(Config))
 
@@ -200,13 +266,13 @@ static const Config configs[] = {
  *  added for the Future Domain version.
  */
 typedef struct signature {
-    void    *sig;           /* String to look for */
-    unsigned ofs;           /* offset from BIOS base address */
-    unsigned len;           /* length of string */
+    const void *sig;		/* String to look for */
+    unsigned    ofs;		/* offset from BIOS base address */
+    unsigned    len;		/* length of string */
 } Signature;
 
 static const Signature signatures[] = {
-  {"SSTBIOS",0x0000d,7}                  /* "SSTBIOS" @ offset 0x0000d */
+  { "SSTBIOS", 0x0000d, 7 }	/* "SSTBIOS" @ offset 0x0000d */
 };
 #define NUM_SIGNATURES (sizeof(signatures)/sizeof(Signature))
 
@@ -215,19 +281,20 @@ static const Signature signatures[] = {
  *  I/O Port Offsets and Bit Definitions
  *  4 addresses are used.  Those not defined here are reserved.
  */
-#define ASC_STAT        0       /* Status,  Read */
-#define ASC_COMMAND     0       /* Command, Write */
-#define ASC_INTR_STAT   1       /* Interrupt Status, Read */
-#define ASC_INTR_ACK    1       /* Acknowledge, Write */
-#define ASC_CONTROL     2       /* Control, Write */
+#define ASC_STAT        0	/* Status,  Read */
+#define ASC_COMMAND     0	/* Command, Write */
+#define ASC_INTR_STAT   1	/* Interrupt Status, Read */
+#define ASC_INTR_ACK    1	/* Acknowledge, Write */
+#define ASC_CONTROL     2	/* Control, Write */
 
-/* ASC Status Port
+/*
+ * ASC Status Port
  */
-#define INT_IM	        0x80		/* Interrupt Image Flag */
-#define CMD_RDY	        0x40		/* Command Port Ready */
-#define CMD_REJ	        0x20		/* Command Port Byte Rejected */
-#define ASC_INIT        0x10		/* ASC Initialized Flag */
-#define ASC_STATMASK    0xf0		/* The lower 4 Bytes are reserved */
+#define INT_IM		0x80	/* Interrupt Image Flag */
+#define CMD_RDY		0x40	/* Command Port Ready */
+#define CMD_REJ		0x20	/* Command Port Byte Rejected */
+#define ASC_INIT        0x10	/* ASC Initialized Flag */
+#define ASC_STATMASK    0xf0	/* The lower 4 Bytes are reserved */
 
 /* COMMAND opcodes
  *
@@ -237,31 +304,31 @@ static const Signature signatures[] = {
  *  discernible effect whatsoever.  I think they may be related to certain
  *  ICB commands, but again, the OEM manual doesn't make that clear.
  */
-#define NO_OP             0     /* NO-OP toggles CMD_RDY bit in ASC_STAT */
-#define INITIALIZATION    1     /* initialization (10 bytes) */
-#define DISABLE_UNS_INTR  2     /* disable unsolicited interrupts */
-#define ENABLE_UNS_INTR   3     /* enable unsolicited interrupts */
-#define INTR_ON_FREE_OGMB 4     /* interrupt on free OGMB */
-#define SOFT_RESET        5     /* SCSI bus soft reset */
-#define HARD_RESET_ACK    6     /* SCSI bus hard reset acknowledge */
-#define START_OGMB        0x80  /* start command in OGMB (n) */
-#define SCAN_OGMBS        0xc0  /* start multiple commands, signature (n) */
-                                /*    where (n) = lower 6 bits */
+#define NO_OP             0	/* NO-OP toggles CMD_RDY bit in ASC_STAT */
+#define INITIALIZATION    1	/* initialization (10 bytes) */
+#define DISABLE_UNS_INTR  2	/* disable unsolicited interrupts */
+#define ENABLE_UNS_INTR   3	/* enable unsolicited interrupts */
+#define INTR_ON_FREE_OGMB 4	/* interrupt on free OGMB */
+#define SOFT_RESET        5	/* SCSI bus soft reset */
+#define HARD_RESET_ACK    6	/* SCSI bus hard reset acknowledge */
+#define START_OGMB        0x80	/* start command in OGMB (n) */
+#define SCAN_OGMBS        0xc0	/* start multiple commands, signature (n) */
+				/*    where (n) = lower 6 bits */
 /* For INITIALIZATION:
  */
 typedef struct initCmd {
-  unchar op;                   /* command opcode (= 1) */
-  unchar ID;                   /* Adapter's SCSI ID */
-  unchar bus_on;               /* Bus on time, x 125ns (see below) */
-  unchar bus_off;              /* Bus off time, ""         ""      */
-  unchar rsvd;                 /* Reserved */
-  unchar mailboxes[3];         /* Address of Mailboxes, MSB first  */
-  unchar ogmbs;                /* Number of outgoing MBs, max 64, 0,1 = 1 */
-  unchar icmbs;                /* Number of incoming MBs,   ""       ""   */
+  unchar op;			/* command opcode (= 1) */
+  unchar ID;			/* Adapter's SCSI ID */
+  unchar bus_on;		/* Bus on time, x 125ns (see below) */
+  unchar bus_off;		/* Bus off time, ""         ""      */
+  unchar rsvd;			/* Reserved */
+  unchar mailboxes[3];		/* Address of Mailboxes, MSB first  */
+  unchar ogmbs;			/* Number of outgoing MBs, max 64, 0,1 = 1 */
+  unchar icmbs;			/* Number of incoming MBs,   ""       ""   */
 } InitCmd;
 
-#define BUS_ON            64    /* x 125ns = 8000ns (BIOS default) */
-#define BUS_OFF           15    /* x 125ns = 1875ns (BIOS default) */
+#define BUS_ON            64	/* x 125ns = 8000ns (BIOS default) */
+#define BUS_OFF           15	/* x 125ns = 1875ns (BIOS default) */
  
 /* Interrupt Status Port - also returns diagnostic codes at ASC reset
  *
@@ -284,35 +351,35 @@ typedef struct initCmd {
 
 /* CONTROL port bits
  */
-#define INT_EN	        0x08	/* Interrupt Enable	*/
-#define DMA_EN	        0x04	/* DMA Enable		*/
+#define INT_EN		0x08	/* Interrupt Enable	*/
+#define DMA_EN		0x04	/* DMA Enable		*/
 #define SCSI_RES	0x02	/* SCSI Reset		*/
-#define ASC_RES	        0x01	/* ASC Reset		*/
+#define ASC_RES		0x01	/* ASC Reset		*/
 
 /*
-   Driver data structures:
-   - mb and scbs are required for interfacing with the host adapter.
-     An SCB has extra fields not visible to the adapter; mb's
-     _cannot_ do this, since the adapter assumes they are contiguous in
-     memory, 4 bytes each, with ICMBs following OGMBs, and uses this fact
-     to access them.
-   - An icb is for host-only (non-SCSI) commands.  ICBs are 16 bytes each;
-     the additional bytes are used only by the driver.
-   - For now, a pool of SCBs are kept in global storage by this driver,
-     and are allocated and freed as needed.
-
-  The 7000-FASST2 marks OGMBs empty as soon as it has _started_ a command,
-  not when it has finished.  Since the SCB must be around for completion,
-  problems arise when SCBs correspond to OGMBs, which may be reallocated
-  earlier (or delayed unnecessarily until a command completes).
-  Mailboxes are used as transient data structures, simply for
-  carrying SCB addresses to/from the 7000-FASST2.
-
-  Note also since SCBs are not "permanently" associated with mailboxes,
-  there is no need to keep a global list of Scsi_Cmnd pointers indexed
-  by OGMB.   Again, SCBs reference their Scsi_Cmnds directly, so mailbox
-  indices need not be involved.
-*/
+ *   Driver data structures:
+ *   - mb and scbs are required for interfacing with the host adapter.
+ *     An SCB has extra fields not visible to the adapter; mb's
+ *     _cannot_ do this, since the adapter assumes they are contiguous in
+ *     memory, 4 bytes each, with ICMBs following OGMBs, and uses this fact
+ *     to access them.
+ *   - An icb is for host-only (non-SCSI) commands.  ICBs are 16 bytes each;
+ *     the additional bytes are used only by the driver.
+ *   - For now, a pool of SCBs are kept in global storage by this driver,
+ *     and are allocated and freed as needed.
+ *
+ *  The 7000-FASST2 marks OGMBs empty as soon as it has _started_ a command,
+ *  not when it has finished.  Since the SCB must be around for completion,
+ *  problems arise when SCBs correspond to OGMBs, which may be reallocated
+ *  earlier (or delayed unnecessarily until a command completes).
+ *  Mailboxes are used as transient data structures, simply for
+ *  carrying SCB addresses to/from the 7000-FASST2.
+ *
+ *  Note also since SCBs are not "permanently" associated with mailboxes,
+ *  there is no need to keep a global list of Scsi_Cmnd pointers indexed
+ *  by OGMB.   Again, SCBs reference their Scsi_Cmnds directly, so mailbox
+ *  indices need not be involved.
+ */
 
 /*
  *  WD7000-specific scatter/gather element structure
@@ -336,7 +403,7 @@ typedef struct scb {		/* Command Control Block 5.4.1 */
   unchar linkptr[3];		/* Next Command Link Pointer */
   unchar direc;			/* Transfer Direction */
   unchar reserved2[6];		/* SCSI Command Descriptor Block */
-                                /* end of hardware SCB */
+				/* end of hardware SCB */
   Scsi_Cmnd *SCpnt;             /* Scsi_Cmnd using this SCB */
   Sgb sgb[WD7000_SG];           /* Scatter/gather list for this SCB */
   Adapter *host;                /* host adapter */
@@ -361,7 +428,7 @@ typedef struct scb {		/* Command Control Block 5.4.1 */
 #define ICB_OP_RECV_SDATA       0x83  /* receive data with status from init. */
 #define ICB_OP_SEND_DATA        0x84  /* send data with status to initiator */
 #define ICB_OP_SEND_STAT        0x86  /* send command status to initiator */
-                             /* 0x87 is reserved */
+			     /* 0x87 is reserved */
 #define ICB_OP_READ_INIT        0x88  /* read initialization bytes */
 #define ICB_OP_READ_ID          0x89  /* read adapter's SCSI ID */
 #define ICB_OP_SET_UMASK        0x8A  /* set unsolicited interrupt mask */
@@ -472,10 +539,114 @@ static Scb *scbfree = NULL;      /* free list */
 static int freescbs = MAX_SCBS;  /* free list counter */
 
 /*
+ *
+ */
+static short wd7000_setupIRQ[NUM_CONFIGS];
+static short wd7000_setupDMA[NUM_CONFIGS];
+static short wd7000_setupIO[NUM_CONFIGS];
+static short wd7000_card_num = 0;
+
+/*
  *  END of data/declarations - code follows.
  */
 
 
+/*
+ * Note: You can now set these options from the kernel's "command line".
+ * The syntax is:
+ *
+ *     wd7000=IRQ,DMA,IO
+ * eg:
+ *     wd7000=7,6,0x350
+ *
+ * will configure the driver for a WD-7000 controller
+ * using IRQ 15 with a DMA channel 6, at IO base address 0x350.
+ */
+void wd7000_setup (char *str, int *ints)
+{
+    short i, j;
+
+    if (wd7000_card_num >= NUM_CONFIGS) {
+        printk ("wd7000_setup: Too many \"wd7000=\" configurations in "
+	        "command line!\n");
+
+        return;
+    }
+
+    if (ints[0] != 3)
+	printk ("wd7000_setup: Error in command line!  "
+	        "Usage: wd7000=IRQ,DMA,IO\n");
+    else {
+	for (i = 0; i < NUM_IRQS; i++)
+	    if (ints[1] == wd7000_irq[i])
+		break;
+
+	if (i == NUM_IRQS) {
+	    printk ("wd7000_setup: \"wd7000=%d,%d,0x%x\" -> "
+		    "invalid IRQ.\n", ints[1], ints[2], ints[3]);
+	    return;
+	}
+	else
+ 	    wd7000_setupIRQ[wd7000_card_num] = ints[1];
+
+	for (i = 0; i < NUM_DMAS; i++)
+	    if (ints[2] == wd7000_dma[i])
+		break;
+
+	if (i == NUM_DMAS) {
+	    printk ("wd7000_setup: \"wd7000=%d,%d,0x%x\" -> "
+		    "invalid DMA channel.\n", ints[1], ints[2], ints[3]);
+	    return;
+	}
+	else
+	    wd7000_setupDMA[wd7000_card_num] = ints[2];
+
+	for (i = 0; i < NUM_IOPORTS; i++)
+	    if (ints[3] == wd7000_iobase[i])
+		break;
+
+	if (i == NUM_IOPORTS) {
+	    printk ("wd7000_setup: \"wd7000=%d,%d,0x%x\" -> "
+		    "invalid I/O base address.\n", ints[1], ints[2], ints[3]);
+	    return;
+	}
+	else
+	    wd7000_setupIO[wd7000_card_num] = ints[3];
+
+	if (wd7000_card_num)
+	    for (i = 0; i < (wd7000_card_num - 1); i++)
+	        for (j = i + 1; j < wd7000_card_num; j++)
+	            if (wd7000_setupIRQ[i] == wd7000_setupIRQ[j]) {
+	                printk ("wd7000_setup: \"wd7000=%d,%d,0x%x\" -> "
+			        "duplicated IRQ!\n",
+				ints[1], ints[2], ints[3]);
+		        return;
+	            }
+	            else if (wd7000_setupDMA[i] == wd7000_setupDMA[j]) {
+	                printk ("wd7000_setup: \"wd7000=%d,%d,0x%x\" -> "
+			        "duplicated DMA channel!\n",
+				ints[1], ints[2], ints[3]);
+		        return;
+	            }
+	            else if (wd7000_setupIO[i] == wd7000_setupIO[j]) {
+	                printk ("wd7000_setup: \"wd7000=%d,%d,0x%x\" -> "
+			        "duplicated I/O base address!\n",
+				ints[1], ints[2], ints[3]);
+		        return;
+	            }
+
+#ifdef DEBUG
+	printk ("wd7000_setup: IRQ=%d, DMA=%d, I/O=0x%x\n",
+	        wd7000_setupIRQ[wd7000_card_num],
+		wd7000_setupDMA[wd7000_card_num],
+		wd7000_setupIO[wd7000_card_num]);
+#endif
+
+	wd7000_card_num++;
+    }
+}
+
+
 #ifdef ANY2SCSI_INLINE
 /*
    Since they're used a lot, I've redone the following from the macros
@@ -516,7 +687,7 @@ static inline int scsi2int( unchar *scsi )
 */
 #undef any2scsi
 #define any2scsi(up, p)			\
-(up)[0] = (((unsigned long)(p)) >> 16);	        \
+(up)[0] = (((unsigned long)(p)) >> 16);		\
 (up)[1] = ((unsigned long)(p)) >> 8;		\
 (up)[2] = ((unsigned long)(p));
 
@@ -544,16 +715,20 @@ static inline void wd7000_enable_dma(Adapter *host)
 
 #define WAITnexttimeout 200  /* 2 seconds */
 
-#define WAIT(port, mask, allof, noneof)					\
- { register volatile unsigned WAITbits; 				\
-   register unsigned long WAITtimeout = jiffies + WAITnexttimeout;	\
-   while (1) {								\
-     WAITbits = inb(port) & (mask);					\
-     if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \
-       break;                                                         	\
-     if (jiffies > WAITtimeout) goto fail;				\
-   }									\
- }
+static inline short WAIT (unsigned port, unsigned mask, unsigned allof, unsigned noneof)
+{
+    register unsigned WAITbits;
+    register unsigned long WAITtimeout = jiffies + WAITnexttimeout;
+
+    while (jiffies <= WAITtimeout) {
+     	WAITbits = inb (port) & mask;
+
+	if (((WAITbits & allof) == allof) && ((WAITbits & noneof) == 0))
+	    return (0);
+    }
+
+    return (1);
+}
 
 
 static inline void delay( unsigned how_long )
@@ -566,17 +741,19 @@ static inline void delay( unsigned how_long )
 
 static inline int command_out(Adapter *host, unchar *cmd, int len)
 {
-    WAIT(host->iobase+ASC_STAT,ASC_STATMASK,CMD_RDY,0);
-    while (len--)  {
-        do  {
-	    outb(*cmd, host->iobase+ASC_COMMAND);
-	    WAIT(host->iobase+ASC_STAT, ASC_STATMASK, CMD_RDY, 0);
-	}  while (inb(host->iobase+ASC_STAT) & CMD_REJ);
-	cmd++;
+    if (! WAIT (host->iobase+ASC_STAT,ASC_STATMASK,CMD_RDY,0)) {
+	while (len--)  {
+	    do  {
+		outb(*cmd, host->iobase+ASC_COMMAND);
+		WAIT(host->iobase+ASC_STAT, ASC_STATMASK, CMD_RDY, 0);
+	    }  while (inb(host->iobase+ASC_STAT) & CMD_REJ);
+
+	    cmd++;
+	}
+
+	return 1;
     }
-    return 1;
 
-fail:
     printk("wd7000 command_out: WAIT failed(%d)\n", len+1);
     return 0;
 }
@@ -606,17 +783,18 @@ static inline Scb *alloc_scbs(int needed)
     save_flags(flags);
     cli();
     while (busy)  { /* someone else is allocating */
-        sti();	/* Yes this is really needed here */
+	sti();	/* Yes this is really needed here */
 	now = jiffies;  while (jiffies == now)  /* wait a jiffy */;
 	cli();
     }
     busy = 1;          /* not busy now; it's our turn */
 
     while (freescbs < needed)  {
-        timeout = jiffies + WAITnexttimeout;
+	timeout = jiffies + WAITnexttimeout;
 	do {
 	    sti();	/* Yes this is really needed here */
-	    now = jiffies;   while (jiffies == now) /* wait a jiffy */;
+	    now = jiffies;
+	    while (jiffies == now); /* wait a jiffy */
 	    cli();
 	}  while (freescbs < needed && jiffies <= timeout);
 	/*
@@ -688,7 +866,7 @@ static int mail_out( Adapter *host, Scb *scbptr )
     Mailbox *ogmbs = host->mb.ogmb;
     int *next_ogmb = &(host->next_ogmb);
 #ifdef DEBUG
-    printk("wd7000 mail_out: %06x",(unsigned int) scbptr);
+    printk("wd7000 mail_out: 0x%06lx",(long) scbptr);
 #endif
     /* We first look for a free outgoing mailbox */
     save_flags(flags);
@@ -697,7 +875,7 @@ static int mail_out( Adapter *host, Scb *scbptr )
     for (i = 0; i < OGMB_CNT; i++) {
 	if (ogmbs[ogmb].status == 0)  {
 #ifdef DEBUG
-	    printk(" using OGMB %x",ogmb);
+	    printk(" using OGMB 0x%x",ogmb);
 #endif
 	    ogmbs[ogmb].status = 1;
 	    any2scsi((unchar *) ogmbs[ogmb].scbptr, (int) scbptr);
@@ -709,10 +887,10 @@ static int mail_out( Adapter *host, Scb *scbptr )
     }
     restore_flags(flags);
 #ifdef DEBUG
-    printk(", scb is %x",(unsigned int) scbptr);
+    printk(", scb is 0x%06lx",(long) scbptr);
 #endif
     if (i >= OGMB_CNT) {
-        /*
+	/*
 	 *  Alternatively, we might issue the "interrupt on free OGMB",
 	 *  and sleep, but it must be ensured that it isn't the init
 	 *  task running.  Instead, this version assumes that the caller
@@ -720,8 +898,8 @@ static int mail_out( Adapter *host, Scb *scbptr )
 	 *  that marks OGMB's free, waiting even with interrupts off
 	 *  should work, since they are freed very quickly in most cases.
 	 */
-        #ifdef DEBUG
-        printk(", no free OGMBs.\n");
+	#ifdef DEBUG
+	printk(", no free OGMBs.\n");
 #endif
 	return 0;
     }
@@ -763,23 +941,23 @@ int make_code(unsigned hosterr, unsigned scsierr)
 		hosterr = DID_BAD_TARGET;
 		break;
 	case 80: /* Unexpected Reselection */
-        case 81: /* Unexpected Selection */
+	case 81: /* Unexpected Selection */
 		hosterr = DID_BAD_INTR;
 		break;
-        case 82: /* Abort Command Message  */
+	case 82: /* Abort Command Message  */
 		hosterr = DID_ABORT;
 		break;
 	case 83: /* SCSI Bus Software Reset */
 	case 84: /* SCSI Bus Hardware Reset */
 		hosterr = DID_RESET;
 		break;
-        default: /* Reserved */
+	default: /* Reserved */
 		hosterr = DID_ERROR;
 		break;
 	}
 #ifdef DEBUG
     if (scsierr||hosterr)
-        printk("\nSCSI command error: SCSI %02x host %04x return %d",
+	printk("\nSCSI command error: SCSI 0x%02x host 0x%04x return %d\n",
 	       scsierr,in_error,hosterr);
 #endif
     return scsierr | (hosterr << 16);
@@ -789,7 +967,7 @@ int make_code(unsigned hosterr, unsigned scsierr)
 static void wd7000_scsi_done(Scsi_Cmnd * SCpnt)
 {
 #ifdef DEBUG
-    printk("wd7000_scsi_done: %06x\n",(unsigned int) SCpnt);
+    printk ("wd7000_scsi_done: 0x%06lx\n", (long) SCpnt);
 #endif
     SCpnt->SCp.phase = 0;
 }
@@ -797,7 +975,7 @@ static void wd7000_scsi_done(Scsi_Cmnd * SCpnt)
 
 #define wd7000_intr_ack(host)  outb(0,host->iobase+ASC_INTR_ACK)
 
-void wd7000_intr_handle(int irq, struct pt_regs * regs)
+void wd7000_intr_handle(int irq, void *dev_id, struct pt_regs * regs)
 {
     register int flag, icmb, errstatus, icmb_status;
     register int host_error, scsi_error;
@@ -808,16 +986,16 @@ void wd7000_intr_handle(int irq, struct pt_regs * regs)
     Mailbox *icmbs = host->mb.icmb;
 
 #ifdef DEBUG
-    printk("wd7000_intr_handle: irq = %d, host = %06x\n", irq, host);
+    printk("wd7000_intr_handle: irq = %d, host = 0x%06lx\n", irq, (long) host);
 #endif
 
     flag = inb(host->iobase+ASC_INTR_STAT);
 #ifdef DEBUG
-    printk("wd7000_intr_handle: intr stat = %02x\n",flag);
+    printk("wd7000_intr_handle: intr stat = 0x%02x\n",flag);
 #endif
 
     if (!(inb(host->iobase+ASC_STAT) & INT_IM))  {
-        /* NB: these are _very_ possible if IRQ 15 is being used, since
+	/* NB: these are _very_ possible if IRQ 15 is being used, since
 	   it's the "garbage collector" on the 2nd 8259 PIC.  Specifically,
 	   any interrupt signal into the 8259 which can't be identified
 	   comes out as 7 from the 8259, which is 15 to the host.  Thus, it
@@ -833,10 +1011,10 @@ void wd7000_intr_handle(int irq, struct pt_regs * regs)
     }
 
     if (flag & MB_INTR)  {
-        /* The interrupt is for a mailbox */
+	/* The interrupt is for a mailbox */
 	if (!(flag & IMB_INTR)) {
 #ifdef DEBUG
-	    printk("wd7000_intr_handle: free outgoing mailbox");
+	    printk("wd7000_intr_handle: free outgoing mailbox\n");
 #endif
 	    /*
 	     * If sleep_on() and the "interrupt on free OGMB" command are
@@ -851,16 +1029,16 @@ void wd7000_intr_handle(int irq, struct pt_regs * regs)
 	    icmb_status = icmbs[icmb].status;
 	    if (icmb_status & 0x80)  {  /* unsolicited - result in ICMB */
 #ifdef DEBUG
- 	        printk("wd7000_intr_handle: unsolicited interrupt %02xh\n",
+ 		printk("wd7000_intr_handle: unsolicited interrupt 0x%02xh\n",
 		       icmb_status);
 #endif
-	        wd7000_intr_ack(host);
-	        return;
+		wd7000_intr_ack(host);
+		return;
 	    }
 	    scb = (struct scb *) scsi2int((unchar *)icmbs[icmb].scbptr);
 	    icmbs[icmb].status = 0;
 	    if (!(scb->op & ICB_OP_MASK))  {   /* an SCB is done */
-	        SCpnt = scb->SCpnt;
+		SCpnt = scb->SCpnt;
 		if (--(SCpnt->SCp.phase) <= 0)  {  /* all scbs are done */
 		    host_error = scb->vue | (icmb_status << 8);
 		    scsi_error = scb->status;
@@ -872,7 +1050,7 @@ void wd7000_intr_handle(int irq, struct pt_regs * regs)
 		    SCpnt->scsi_done(SCpnt);
 		}
 	    }  else  {    /* an ICB is done */
-	        icb = (IcbAny *) scb;
+		icb = (IcbAny *) scb;
 		icb->status = icmb_status;
 		icb->phase  = 0;
 	    }
@@ -907,10 +1085,10 @@ int wd7000_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *))
     scb->host = host;
 
     if (SCpnt->use_sg)  {
-        struct scatterlist *sg = (struct scatterlist *) SCpnt->request_buffer;
-        unsigned i;
+	struct scatterlist *sg = (struct scatterlist *) SCpnt->request_buffer;
+	unsigned i;
 
-        if (SCpnt->host->sg_tablesize == SG_NONE)  {
+	if (SCpnt->host->sg_tablesize == SG_NONE)  {
 	    panic("wd7000_queuecommand: scatter/gather not supported.\n");
 	}
 #ifdef DEBUG
@@ -925,7 +1103,7 @@ int wd7000_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *))
 	for (i = 0;  i < SCpnt->use_sg;  i++)  {
  	    any2scsi(sgb[i].ptr, (int) sg[i].address);
  	    any2scsi(sgb[i].len, sg[i].length);
-        }
+	}
     }  else  {
 	scb->op = 0;
 	any2scsi(scb->dataptr, (int) SCpnt->request_buffer);
@@ -968,11 +1146,11 @@ int wd7000_diagnostics( Adapter *host, int code )
     	barrier(); /* wait for completion */
 
     if (icb.phase)  {
-        printk("wd7000_diagnostics: timed out.\n");
+	printk("wd7000_diagnostics: timed out.\n");
 	return 0;
     }
     if (make_code(icb.vue|(icb.status << 8),0))  {
-        printk("wd7000_diagnostics: failed (%02x,%02x)\n",
+	printk("wd7000_diagnostics: failed (0x%02x,0x%02x)\n",
 	       icb.vue, icb.status);
 	return 0;
     }
@@ -984,23 +1162,28 @@ int wd7000_diagnostics( Adapter *host, int code )
 int wd7000_init( Adapter *host )
 {
     InitCmd init_cmd = {
-        INITIALIZATION, 7, BUS_ON, BUS_OFF, 0, 0,0,0, OGMB_CNT, ICMB_CNT
+	INITIALIZATION, 7, BUS_ON, BUS_OFF, 0, {0,0,0}, OGMB_CNT, ICMB_CNT
     };
     int diag;
 
     /*
-       Reset the adapter - only.  The SCSI bus was initialized at power-up,
-       and we need to do this just so we control the mailboxes, etc.
-    */
+     *  Reset the adapter - only.  The SCSI bus was initialized at power-up,
+     *  and we need to do this just so we control the mailboxes, etc.
+     */
     outb(ASC_RES, host->iobase+ASC_CONTROL);
     delay(1);  /* reset pulse: this is 10ms, only need 25us */
     outb(0,host->iobase+ASC_CONTROL);
     host->control = 0;   /* this must always shadow ASC_CONTROL */
-    WAIT(host->iobase+ASC_STAT, ASC_STATMASK, CMD_RDY, 0);
 
-    if ((diag = inb(host->iobase+ASC_INTR_STAT)) != 1)  {
-        printk("wd7000_init: ");
-        switch (diag)  {
+    if (WAIT (host->iobase+ASC_STAT, ASC_STATMASK, CMD_RDY, 0)) {
+        printk ("wd7000_init: WAIT timed out.\n"); 
+        return 0;					/* 0 = not ok */
+    }
+
+    if ((diag = inb(host->iobase+ASC_INTR_STAT)) != 1) {
+	printk("wd7000_init: ");
+
+	switch (diag)  {
 	case 2:
 	  printk("RAM failure.\n");
 	  break;
@@ -1020,10 +1203,9 @@ int wd7000_init( Adapter *host )
 	  printk("ROM checksum error.\n");
 	  break;
 	default:
-	  printk("diagnostic code %02Xh received.\n", diag);
-	  break;
+	  printk("diagnostic code 0x%02Xh received.\n", diag);
 	}
-        return 0;
+	return 0;
     }
     
     /* Clear mailboxes */
@@ -1035,31 +1217,31 @@ int wd7000_init( Adapter *host )
 	printk("wd7000_init: adapter initialization failed.\n"); 
 	return 0;
     }
-    WAIT(host->iobase+ASC_STAT, ASC_STATMASK, ASC_INIT, 0);
 
-    if (request_irq(host->irq, wd7000_intr_handle, SA_INTERRUPT, "wd7000")) {
-        printk("wd7000_init: can't get IRQ %d.\n", host->irq);
+    if (WAIT (host->iobase+ASC_STAT, ASC_STATMASK, ASC_INIT, 0)) {
+        printk ("wd7000_init: WAIT timed out.\n"); 
+        return 0;
+    }
+
+    if (request_irq(host->irq, wd7000_intr_handle, SA_INTERRUPT, "wd7000", NULL)) {
+	printk("wd7000_init: can't get IRQ %d.\n", host->irq);
 	return 0;
     }
     if (request_dma(host->dma,"wd7000"))  {
-        printk("wd7000_init: can't get DMA channel %d.\n", host->dma);
-	free_irq(host->irq);
+	printk("wd7000_init: can't get DMA channel %d.\n", host->dma);
+	free_irq(host->irq, NULL);
 	return 0;
     }
     wd7000_enable_dma(host);
     wd7000_enable_intr(host);
 
     if (!wd7000_diagnostics(host,ICB_DIAG_FULL))  {
-        free_dma(host->dma);
-        free_irq(host->irq);
-        return 0;
+	free_dma(host->dma);
+	free_irq(host->irq, NULL);
+	return 0;
     }
 
     return 1;
-
-  fail:
-    printk("wd7000_init: WAIT timed out.\n"); 
-    return 0;					/* 0 = not ok */
 }
 
 
@@ -1082,8 +1264,7 @@ void wd7000_revision(Adapter *host)
 }
 
 
-int wd7000_detect(Scsi_Host_Template * tpnt)
-/* 
+/*
  *  Returns the number of adapters this driver is supporting.
  *
  *  The source for hosts.c says to wait to call scsi_register until 100%
@@ -1093,35 +1274,88 @@ int wd7000_detect(Scsi_Host_Template * tpnt)
  *  calling scsi_unregister.
  *
  */
+int wd7000_detect (Scsi_Host_Template *tpnt)
 {
-    int i,j, present = 0;
-    const Config *cfg;
-    const Signature *sig;
+    short present = 0, biosaddr_ptr, cfg_ptr, sig_ptr, i, pass;
+    short biosptr[NUM_CONFIGS];
+    unsigned iobase;
     Adapter *host = NULL;
     struct Scsi_Host *sh;
 
-    /* Set up SCB free list, which is shared by all adapters */
-    init_scbs();
+    for (i = 0; i < NUM_CONFIGS; biosptr[i++] = -1);
+
+    tpnt->proc_dir = &proc_scsi_wd7000;
+
+    /*
+     * Set up SCB free list, which is shared by all adapters
+     */
+    init_scbs ();
+
+    for (pass = 0, cfg_ptr = 0; pass < NUM_CONFIGS; pass++) {
+        for (biosaddr_ptr = 0; biosaddr_ptr < NUM_ADDRS; biosaddr_ptr++)
+	    for (sig_ptr = 0; sig_ptr < NUM_SIGNATURES; sig_ptr++) {
+	        for (i = 0; i < pass; i++)
+	            if (biosptr[i] == biosaddr_ptr)
+		        break;
+
+		if ((i == pass) &&
+		    !memcmp ((void *) (wd7000_biosaddr[biosaddr_ptr] +
+		             signatures[sig_ptr].ofs), signatures[sig_ptr].sig,
+		             signatures[sig_ptr].len))
+		    goto bios_matched;
+	    }
+
+bios_matched:
 
-    cfg = configs;
-    for (i = 0; i < NUM_CONFIGS; i++)  {
-        sig = signatures;
-	for (j = 0; j < NUM_SIGNATURES; j++)  {
-	    if (!memcmp(cfg->bios+sig->ofs, sig->sig, sig->len))  {
-	        /* matched this one */
 #ifdef DEBUG
-		printk("WD-7000 SST BIOS detected at %04X: checking...\n",
-		       (int) cfg->bios);
+	printk ("wd7000_detect: pass %d\n", pass + 1);
+
+        if (biosaddr_ptr == NUM_ADDRS)
+	    printk ("WD-7000 SST BIOS not detected...\n");
+	else
+	    printk ("WD-7000 SST BIOS detected at 0x%lx: checking...\n",
+	            wd7000_biosaddr[biosaddr_ptr]);
 #endif
-		/*
-		 *  We won't explicitly test the configuration (in this
-		 *  version); instead, we'll just see if it works to
-		 *  setup the adapter; if it does, we'll use it.
-		 */
-		if (check_region(cfg->iobase, 4))  {  /* ports in use */
-		    printk("IO %xh already in use.\n", host->iobase);
-		    continue;
-		}
+
+	if (wd7000_card_num) 
+	    iobase = wd7000_setupIO[wd7000_card_num - 1];
+	else {
+	    if (configs[cfg_ptr++].irq < 0)
+		continue;
+
+	    iobase = configs[cfg_ptr - 1].iobase;
+	}
+
+#ifdef DEBUG
+ 	printk ("wd7000_detect: check IO 0x%x region...\n", iobase);
+#endif
+
+	if (! check_region (iobase, 4)) {
+
+#ifdef DEBUG
+ 	    printk ("wd7000_detect: ASC reset (IO 0x%x) ...", iobase);
+#endif
+
+ 	    /*
+  	     * ASC reset...
+ 	     */
+ 	    outb (ASC_RES, iobase + ASC_CONTROL);
+ 	    delay (1);
+ 	    outb (0, iobase + ASC_CONTROL);
+
+ 	    if (WAIT (iobase + ASC_STAT, ASC_STATMASK, CMD_RDY, 0))
+#ifdef DEBUG
+ 	    {
+  		printk ("failed!\n");
+  		continue;
+ 	    }
+ 	    else
+  		printk ("ok!\n");
+#else
+	    continue;
+#endif
+
+	    if (inb (iobase + ASC_INTR_STAT) == 1) {
 		/*
 		 *  We register here, to get a pointer to the extra space,
 		 *  which we'll use as the Adapter structure (host) for
@@ -1129,49 +1363,82 @@ int wd7000_detect(Scsi_Host_Template * tpnt)
 		 *  Scsi_Host structure (sh), and is located by the empty
 		 *  array hostdata.
 		 */
-		sh = scsi_register(tpnt, sizeof(Adapter) );
+		sh = scsi_register (tpnt, sizeof (Adapter));
 		host = (Adapter *) sh->hostdata;
+
 #ifdef DEBUG
-		printk("wd7000_detect: adapter allocated at %06x\n",
-		       (int)host);
+		printk ("wd7000_detect: adapter allocated at 0x%x\n",
+			(int) host);
 #endif
-		memset( host, 0, sizeof(Adapter) );
-	        host->sh = sh;
-		host->irq = cfg->irq;
-		host->iobase = cfg->iobase;
-		host->dma = cfg->dma;
+
+		memset (host, 0, sizeof (Adapter));
+
+		if (wd7000_card_num) {
+		    host->irq = wd7000_setupIRQ[--wd7000_card_num];
+		    host->dma = wd7000_setupDMA[wd7000_card_num];
+		}
+		else {
+		    host->irq = configs[cfg_ptr - 1].irq;
+		    host->dma = configs[cfg_ptr - 1].dma;
+		}
+
+	    	host->sh = sh;
+    		host->iobase = iobase;
 		irq2host[host->irq] = host;
 
-		if (!wd7000_init(host))  {  /* Initialization failed */
+#ifdef DEBUG
+		printk ("wd7000_detect: Trying init WD-7000 card at IO "
+			"0x%x, IRQ %d, DMA %d...\n",
+			host->iobase, host->irq, host->dma);
+#endif
+
+		if (! wd7000_init (host)) {  /* Initialization failed */
 		    scsi_unregister (sh);
+
 		    continue;
 		}
 
 		/*
 		 *  OK from here - we'll use this adapter/configuration.
 		 */
-		wd7000_revision(host);   /* important for scatter/gather */
+		wd7000_revision (host);   /* important for scatter/gather */
 
-		printk("Western Digital WD-7000 (%d.%d) ",
-		       host->rev1, host->rev2);
-                printk("using IO %xh IRQ %d DMA %d.\n",
-		       host->iobase, host->irq, host->dma);
+		/*
+		 * Register our ports.
+		 */
+		request_region (host->iobase, 4, "wd7000");
 
-		request_region(host->iobase, 4,"wd7000"); /* Register our ports */
 		/*
-		 *  For boards before rev 6.0, scatter/gather isn't supported.
+		 *  For boards before rev 6.0, scatter/gather
+		 *  isn't supported.
 		 */
-		if (host->rev1 < 6)  sh->sg_tablesize = SG_NONE;
+		if (host->rev1 < 6)
+		    sh->sg_tablesize = SG_NONE;
+
+		present++;		/* count it */
+
+		if (biosaddr_ptr != NUM_ADDRS)
+		    biosptr[pass] = biosaddr_ptr;
 
-		present++;                      /* count it */
-		break;                          /* don't try any more sigs */
+		printk ("Western Digital WD-7000 (rev %d.%d) ",
+			host->rev1, host->rev2);
+		printk ("using IO 0x%x, IRQ %d, DMA %d.\n", 
+			host->iobase, host->irq, host->dma);
 	    }
-	    sig++;  /* try next signature with this configuration */
 	}
-	cfg++;      /* try next configuration */
+
+#ifdef DEBUG
+	else
+ 	    printk ("wd7000_detect: IO 0x%x region already allocated!\n",
+		    iobase);
+#endif
+
     }
 
-    return present;
+    if (! present)
+       printk ("Failed initialization of WD-7000 SCSI card!\n");
+
+    return (present);
 }
 
 
@@ -1183,8 +1450,8 @@ int wd7000_abort(Scsi_Cmnd * SCpnt)
     Adapter *host = (Adapter *) SCpnt->host->hostdata;
 
     if (inb(host->iobase+ASC_STAT) & INT_IM)  {
-        printk("wd7000_abort: lost interrupt\n");
-	wd7000_intr_handle(host->irq, NULL);
+	printk("wd7000_abort: lost interrupt\n");
+	wd7000_intr_handle(host->irq, NULL, NULL);
 	return SCSI_ABORT_SUCCESS;
     }
 
@@ -1206,7 +1473,7 @@ int wd7000_reset(Scsi_Cmnd * SCpnt)
  *  this way, so I think it will work OK.  Someone who is ambitious can
  *  borrow a newer or more complete version from another driver.
  */
-int wd7000_biosparam(Disk * disk, int dev, int* ip)
+int wd7000_biosparam(Disk * disk, kdev_t dev, int* ip)
 {
   int size = disk->capacity;
   ip[0] = 64;
@@ -1215,3 +1482,10 @@ int wd7000_biosparam(Disk * disk, int dev, int* ip)
 /*  if (ip[2] >= 1024) ip[2] = 1024; */
   return 0;
 }
+
+#ifdef MODULE
+/* Eventually this will go into an include file, but this will be later */
+Scsi_Host_Template driver_template = WD7000;
+
+#include "scsi_module.c"
+#endif