projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added the missing bzero after the malloc in aha1542.c that seems to
[unix-history] / sys / i386 / isa / aha1542.c
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 5aedbc3..53929f4 100644 (file)
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,97 +12,44 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *     $Id: aha1542.c,v 1.12 1993/10/16 12:27:20 rgrimes Exp $
+ *      $Id: aha1542.c,v 1.20 1994/01/22 21:54:10 rgrimes Exp $
  */
 
 /*
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  */
 
  */
 
 /*
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  */
 
-/*
- * a FEW lines in this driver come from a MACH adaptec-disk driver
- * so the copyright below is included:
- *
- * Copyright 1990 by Open Software Foundation,
- * Grenoble, FRANCE
- *
- *             All Rights Reserved
- * 
- *   Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both the copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OSF or Open Software
- * Foundation not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.
- * 
- *   OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-
 #include <sys/types.h>
 #include <sys/types.h>
+#ifdef KERNEL                  /* don't laugh.. look for main() */
 #include <aha.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <aha.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
+#include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/user.h>
-
-#ifdef  MACH    /* EITHER CMU OR OSF */
-#include <i386/ipl.h>
-#include <i386at/scsi.h>
-#include <i386at/scsiconf.h>
-
-#ifdef  OSF     /* OSF ONLY */
-#include <sys/table.h>
-#include <i386/handler.h>
-#include <i386/dispatcher.h>
-#include <i386/AT386/atbus.h>
-
-#else   OSF     /* CMU ONLY */
-#include <i386at/atbus.h>
-#include <i386/pio.h>
-#endif  OSF
-#endif  MACH    /* end of MACH specific */
-
-#ifdef  __386BSD__      /* 386BSD specific */
-#define isa_dev isa_device
-#define dev_unit id_unit
-#define dev_addr id_iobase
-
 #include <i386/isa/isa_device.h>
 #include <i386/isa/isa_device.h>
+#endif /* KERNEL */
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
-#endif  __386BSD__
 
 
-
-#ifdef __386BSD__
+#ifdef KERNEL
 #include "ddb.h"
 #include "ddb.h"
-#if    NDDB > 0
-int    Debugger();
-#else  NDDB
-#define Debugger() panic("should call debugger here (adaptec.c)")
-#endif NDDB
-#endif __386BSD__
-extern int     hz;
-extern int delaycount;  /* from clock setup code */
+#include "kernel.h"
+#else /*KERNEL */
+#define NAHA 1
+#endif /*KERNEL */
 
 /************************** board definitions *******************************/
 
 /************************** board definitions *******************************/
+
 /*
  * I/O Port Interface
  */
 
 /*
  * I/O Port Interface
  */
 
-#define        AHA_BASE                aha_base[unit]
+#define        AHA_BASE                aha->aha_base
 #define        AHA_CTRL_STAT_PORT      (AHA_BASE + 0x0)        /* control & status */
 #define        AHA_CMD_DATA_PORT       (AHA_BASE + 0x1)        /* cmds and datas */
 #define        AHA_INTR_PORT           (AHA_BASE + 0x2)        /* Intr. stat */
 #define        AHA_CTRL_STAT_PORT      (AHA_BASE + 0x0)        /* control & status */
 #define        AHA_CMD_DATA_PORT       (AHA_BASE + 0x1)        /* cmds and datas */
 #define        AHA_INTR_PORT           (AHA_BASE + 0x2)        /* Intr. stat */
@@ -155,7 +102,7 @@ extern int delaycount;  /* from clock setup code */
 #define AHA_MBX_ENABLE         0x29    /* enable mail box interface */
 
 struct aha_cmd_buf {
 #define AHA_MBX_ENABLE         0x29    /* enable mail box interface */
 
 struct aha_cmd_buf {
-        u_char byte[16];       
+       u_char  byte[16];
 };
 
 /*
 };
 
 /*
@@ -178,8 +125,8 @@ struct aha_mbx {
        struct aha_mbx_out {
                unsigned char cmd;
                unsigned char ccb_addr[3];
        struct aha_mbx_out {
                unsigned char cmd;
                unsigned char ccb_addr[3];
-       } mbo [AHA_MBX_SIZE];
-       struct aha_mbx_in{
+       } mbo[AHA_MBX_SIZE];
+       struct aha_mbx_in {
                unsigned char stat;
                unsigned char ccb_addr[3];
        } mbi[AHA_MBX_SIZE];
                unsigned char stat;
                unsigned char ccb_addr[3];
        } mbi[AHA_MBX_SIZE];
@@ -193,60 +140,59 @@ struct aha_mbx {
 #define AHA_MBO_START  0x1     /* MBO activate entry */
 #define AHA_MBO_ABORT  0x2     /* MBO abort entry */
 
 #define AHA_MBO_START  0x1     /* MBO activate entry */
 #define AHA_MBO_ABORT  0x2     /* MBO abort entry */
 
+/*
+ * mbi.stat values
+ */
+
 #define AHA_MBI_FREE   0x0     /* MBI entry is free */
 #define AHA_MBI_OK     0x1     /* completed without error */
 #define AHA_MBI_ABORT  0x2     /* aborted ccb */
 #define AHA_MBI_UNKNOWN        0x3     /* Tried to abort invalid CCB */
 #define AHA_MBI_ERROR  0x4     /* Completed with error */
 
 #define AHA_MBI_FREE   0x0     /* MBI entry is free */
 #define AHA_MBI_OK     0x1     /* completed without error */
 #define AHA_MBI_ABORT  0x2     /* aborted ccb */
 #define AHA_MBI_UNKNOWN        0x3     /* Tried to abort invalid CCB */
 #define AHA_MBI_ERROR  0x4     /* Completed with error */
 
-extern struct aha_mbx aha_mbx[];
-
 /* FOR OLD VERSIONS OF THE !%$@ this may have to be 16 (yuk) */
 #define        AHA_NSEG        17      /* Number of scatter gather segments <= 16 */
                                /* allow 64 K i/o (min) */
 
 struct aha_ccb {
 /* FOR OLD VERSIONS OF THE !%$@ this may have to be 16 (yuk) */
 #define        AHA_NSEG        17      /* Number of scatter gather segments <= 16 */
                                /* allow 64 K i/o (min) */
 
 struct aha_ccb {
-       unsigned char   opcode;
-       unsigned char   lun:3;
-       unsigned char   data_in:1;              /* must be 0 */
-       unsigned char   data_out:1;             /* must be 0 */
-       unsigned char   target:3;
-       unsigned char   scsi_cmd_length;
-       unsigned char   req_sense_length;
-       unsigned char   data_length[3];
-       unsigned char   data_addr[3];
-       unsigned char   link_addr[3];
-       unsigned char   link_id;
-       unsigned char   host_stat;
-       unsigned char   target_stat;
-       unsigned char   reserved[2];
-       struct  scsi_generic    scsi_cmd;
-       struct  scsi_sense_data scsi_sense;
-       struct  aha_scat_gath {
+       unsigned char opcode;
+       unsigned char lun:3;
+       unsigned char data_in:1;        /* must be 0 */
+       unsigned char data_out:1;       /* must be 0 */
+       unsigned char target:3;
+       unsigned char scsi_cmd_length;
+       unsigned char req_sense_length;
+       unsigned char data_length[3];
+       unsigned char data_addr[3];
+       unsigned char link_addr[3];
+       unsigned char link_id;
+       unsigned char host_stat;
+       unsigned char target_stat;
+       unsigned char reserved[2];
+       struct scsi_generic scsi_cmd;
+       struct scsi_sense_data scsi_sense;
+       struct aha_scat_gath {
                unsigned char seg_len[3];
                unsigned char seg_addr[3];
        } scat_gath[AHA_NSEG];
                unsigned char seg_len[3];
                unsigned char seg_addr[3];
        } scat_gath[AHA_NSEG];
-       struct  aha_ccb *next;
-       struct  scsi_xfer       *xfer;          /* the scsi_xfer for this cmd */
-       struct  aha_mbx_out     *mbx;           /* pointer to mail box */
-       int     flags;
+       struct aha_ccb *next;
+       struct scsi_xfer *xfer; /* the scsi_xfer for this cmd */
+       struct aha_mbx_out *mbx;        /* pointer to mail box */
+       int     flags;
 #define CCB_FREE        0
 #define CCB_ACTIVE      1
 #define CCB_ABORTED     2
 #define CCB_FREE        0
 #define CCB_ACTIVE      1
 #define CCB_ABORTED     2
-
 };
 
 };
 
-
 /*
  * opcode fields
  */
 
 #define AHA_INITIATOR_CCB      0x00    /* SCSI Initiator CCB */
 #define AHA_TARGET_CCB         0x01    /* SCSI Target CCB */
 /*
  * opcode fields
  */
 
 #define AHA_INITIATOR_CCB      0x00    /* SCSI Initiator CCB */
 #define AHA_TARGET_CCB         0x01    /* SCSI Target CCB */
-#define AHA_INIT_SCAT_GATH_CCB 0x02    /* SCSI Initiator with scattter gather*/
+#define AHA_INIT_SCAT_GATH_CCB 0x02    /* SCSI Initiator with scatter gather */
 #define AHA_RESET_CCB          0x81    /* SCSI Bus reset */
 
 #define AHA_RESET_CCB          0x81    /* SCSI Bus reset */
 
-
 /*
  * aha_ccb.host_stat values
  */
 /*
  * aha_ccb.host_stat values
  */
@@ -266,34 +212,28 @@ struct aha_ccb {
 #define AHA_INV_CCB    0x1a    /* Invalid CCB or segment list */
 #define AHA_ABORTED      42
 
 #define AHA_INV_CCB    0x1a    /* Invalid CCB or segment list */
 #define AHA_ABORTED      42
 
-
-
-
-struct aha_setup
-{
-       u_char  sync_neg:1;
-       u_char  parity:1;
-       u_char  :6;
-       u_char  speed;
-       u_char  bus_on;
-       u_char  bus_off;
-       u_char  num_mbx;
-       u_char  mbx[3];
-       struct
-       {
-               u_char  offset:4;
-               u_char  period:3;
-               u_char  valid:1;
-       }sync[8];
-       u_char  disc_sts;
+struct aha_setup {
+       u_char  sync_neg:1;
+       u_char  parity:1;
+               u_char:6;
+       u_char  speed;
+       u_char  bus_on;
+       u_char  bus_off;
+       u_char  num_mbx;
+       u_char  mbx[3];
+       struct {
+               u_char  offset:4;
+               u_char  period:3;
+               u_char  valid:1;
+       } sync[8];
+       u_char  disc_sts;
 };
 
 };
 
-struct aha_config
-{
-       u_char  chan;
-       u_char  intr;
-       u_char  scsi_dev:3;
-       u_char  :5;
+struct aha_config {
+       u_char  chan;
+       u_char  intr;
+       u_char  scsi_dev:3;
+               u_char:5;
 };
 
 struct aha_inquire
 };
 
 struct aha_inquire
@@ -307,6 +247,7 @@ struct      aha_inquire
                                        /* 0x42 = AHA-1640 */
                                        /* 0x43 = AHA-1542C */
                                        /* 0x44 = AHA-1542CF */
                                        /* 0x42 = AHA-1640 */
                                        /* 0x43 = AHA-1542C */
                                        /* 0x44 = AHA-1542CF */
+                                       /* 0x45 = AHA-1542CF, BIOS v2.01 */
        u_char  spec_opts;              /* special options ID */
                                        /* 0x41 = Board is standard model */
        u_char  revision_1;             /* firmware revision [0-9A-Z] */
        u_char  spec_opts;              /* special options ID */
                                        /* 0x41 = Board is standard model */
        u_char  revision_1;             /* firmware revision [0-9A-Z] */
@@ -331,58 +272,82 @@ struct    aha_extbios
 #define CHAN6  0x40
 #define CHAN7  0x80
 
 #define CHAN6  0x40
 #define CHAN7  0x80
 
-
 /*********************************** end of board definitions***************/
 
 /*********************************** end of board definitions***************/
 
-
-#ifdef MACH
-#define PHYSTOKV(x)    phystokv(x)
-#define KVTOPHYS(x)    kvtophys(x)
-#else  MACH
-#ifdef __386BSD__
+#define PHYSTOKV(x)    (((long int)(x)) ^ aha->kv_phys_xor)
 #define KVTOPHYS(x)    vtophys(x)
 #define KVTOPHYS(x)    vtophys(x)
-#else  __386BSD__
-#endif __386BSD__
-#endif MACH
 #define        AHA_DMA_PAGES   AHA_NSEG
 
 #define PAGESIZ        4096
 #define INVALIDATE_CACHE {asm volatile( ".byte 0x0F ;.byte 0x08" ); }
 
 #define        AHA_DMA_PAGES   AHA_NSEG
 
 #define PAGESIZ        4096
 #define INVALIDATE_CACHE {asm volatile( ".byte 0x0F ;.byte 0x08" ); }
 
-
-u_char                 aha_scratch_buf[256];
-#ifdef MACH
-caddr_t                        aha_base[NAHA];         /* base port for each board */
-#else
-short                  aha_base[NAHA];         /* base port for each board */
-#endif
-struct aha_mbx         aha_mbx[NAHA];
-struct aha_ccb         *aha_ccb_free[NAHA];
-struct aha_ccb         aha_ccb[NAHA][AHA_MBX_SIZE];
-struct scsi_xfer       aha_scsi_xfer[NAHA];
-struct isa_dev         *ahainfo[NAHA];
-struct aha_ccb         *aha_get_ccb();
-int                    aha_int[NAHA];
-int                    aha_dma[NAHA];
-int                    aha_scsi_dev[NAHA];
-int                    aha_initialized[NAHA];
-#ifdef OSF
-int                    aha_attached[NAHA];
-#endif OSF
+u_char  aha_scratch_buf[256];
 #ifdef AHADEBUG
 #ifdef AHADEBUG
-int                    aha_debug = 1;
-#endif /*AHADEBUG*/
+int     aha_debug = 1;
+#endif /*AHADEBUG */
 
 
-int ahaprobe(), ahaattach(), ahaintr();
-#ifdef MACH
-struct isa_driver      ahadriver = { ahaprobe, 0, ahaattach, "aha", 0, 0, 0};
-int                    (*ahaintrs[])() = {ahaintr, 0};
-#endif
-#ifdef __386BSD__
-struct isa_driver      ahadriver = { ahaprobe, ahaattach, "aha",};
-#endif __386BSD__
-static int             ahaunit = 0;
+struct aha_data {
+       short   aha_base;       /* base port for each board */
+       /*
+        * xor this with a physaddr to get a kv addr and visa versa
+        * for items in THIS STRUCT only. 
+        * Used to get the CCD's physical and kv addresses from each
+        * other.
+        */
+       long int kv_phys_xor;
+       struct aha_mbx aha_mbx; /* all the mailboxes */
+       struct aha_ccb *aha_ccb_free;   /* the next free ccb */
+       struct aha_ccb aha_ccb[AHA_MBX_SIZE];   /* all the CCBs      */
+       int     aha_int;        /* our irq level        */
+       int     aha_dma;        /* out DMA req channel  */
+       int     aha_scsi_dev;   /* ourscsi bus address  */
+       struct scsi_link sc_link;       /* prototype for subdevs */
+} *ahadata[NAHA];
+
+struct aha_ccb *aha_get_ccb();
+int     ahaprobe();
+void   aha_done();
+int     ahaattach();
+int     ahaintr();
+int32   aha_scsi_cmd();
+void   aha_timeout(caddr_t, int);
+void    ahaminphys();
+u_int32 aha_adapter_info();
+
+#ifdef KERNEL
+struct scsi_adapter aha_switch =
+{
+    aha_scsi_cmd,
+    ahaminphys,
+    0,
+    0,
+    aha_adapter_info,
+    "aha",
+    0, 0
+};
+
+/* the below structure is so we have a default dev struct for out link struct */
+struct scsi_device aha_dev =
+{
+    NULL,                      /* Use default error handler */
+    NULL,                      /* have a queue, served by this */
+    NULL,                      /* have no async handler */
+    NULL,                      /* Use default 'done' routine */
+    "aha",
+    0,
+    0, 0
+};
 
 
+struct isa_driver ahadriver =
+{
+    ahaprobe,
+    ahaattach,
+    "aha"
+};
+
+#endif /* KERNEL */
+
+static int ahaunit = 0;
 
 #define aha_abortmbx(mbx) \
        (mbx)->cmd = AHA_MBO_ABORT; \
 
 #define aha_abortmbx(mbx) \
        (mbx)->cmd = AHA_MBO_ABORT; \
@@ -391,331 +356,313 @@ static int              ahaunit = 0;
        (mbx)->cmd = AHA_MBO_START; \
        outb(AHA_CMD_DATA_PORT, AHA_START_SCSI);
 
        (mbx)->cmd = AHA_MBO_START; \
        outb(AHA_CMD_DATA_PORT, AHA_START_SCSI);
 
+#define AHA_RESET_TIMEOUT      2000    /* time to wait for reset (mSec) */
+#ifndef        KERNEL
+main()
+{
+       printf("size of aha_data is %d\n", sizeof(struct aha_data));
+       printf("size of aha_ccb is %d\n", sizeof(struct aha_ccb));
+       printf("size of aha_mbx is %d\n", sizeof(struct aha_mbx));
+}
 
 
+#else /*KERNEL */
 
 
-int    aha_scsi_cmd();
-int    aha_timeout();
-void   ahaminphys();
-long int       aha_adapter_info();
-
-struct scsi_switch     aha_switch =
-{
-       aha_scsi_cmd,
-       ahaminphys,
-       0,
-       0,
-       aha_adapter_info,
-       "aha",
-       0,0
-};     
-#define AHA_CMD_TIMEOUT_FUDGE  200     /* multiplied to get Secs       */
-#define AHA_RESET_TIMEOUT      1000000 /* time to wait for reset       */
-#define AHA_SCSI_TIMEOUT_FUDGE 20      /* divided by for mSecs         */
-
-
-/***********************************************************************\
-* aha_cmd(unit,icnt, ocnt,wait, retval, opcode, args)                  *
-* Activate Adapter command                                             *
-*      icnt:   number of args (outbound bytes written after opcode)    *
-*      ocnt:   number of expected returned bytes                       *
-*      wait:   number of seconds to wait for response                  *
-*      retval: buffer where to place returned bytes                    *
-*      opcode: opcode AHA_NOP, AHA_MBX_INIT, AHA_START_SCSI ...        *
-*      args:   parameters                                              *
-*                                                                      *
-* Performs an adapter command through the ports. Not to be confused    *
-*      with a scsi command, which is read in via the dma               *
-* One of the adapter commands tells it to read in a scsi command       *
-\***********************************************************************/
-
-
-aha_cmd(unit,icnt, ocnt, wait,retval, opcode, args)
-
-u_char *retval;
-unsigned opcode;
-u_char args;
+/*
+ * aha_cmd(unit,icnt, ocnt,wait, retval, opcode, args)
+ * Activate Adapter command
+ *    icnt:   number of args (outbound bytes written after opcode)
+ *    ocnt:   number of expected returned bytes
+ *    wait:   number of seconds to wait for response
+ *    retval: buffer where to place returned bytes
+ *    opcode: opcode AHA_NOP, AHA_MBX_INIT, AHA_START_SCSI ...
+ *    args:   parameters
+ *
+ * Performs an adapter command through the ports. Not to be confused
+ * with a scsi command, which is read in via the dma.  One of the adapter
+ * commands tells it to read in a scsi command but that one is done
+ * separately.  This is only called during set-up.
+ */
+int
+aha_cmd(unit, icnt, ocnt, wait, retval, opcode, args)
+       int unit;
+       int icnt;
+       int ocnt;
+       int wait;
+       u_char *retval;
+       unsigned opcode;
+       u_char  args;
 {
 {
+       struct aha_data *aha = ahadata[unit];
        unsigned *ic = &opcode;
        unsigned *ic = &opcode;
-       u_char oc;
+       u_char  oc;
        register i;
        register i;
-       int     sts;
-
-       /*******************************************************\
-       * multiply the wait argument by a big constant          *
-       * zero defaults to 1                                    *
-       \*******************************************************/
-       if(!wait) 
-               wait = AHA_CMD_TIMEOUT_FUDGE * delaycount; 
+       int     sts;
+
+       /*
+        * multiply the wait argument by a big constant
+        * zero defaults to 1 sec..
+        * all wait loops are in 50uSec cycles
+        */
+       if (wait)
+               wait *= 20000;
        else
        else
-               wait *= AHA_CMD_TIMEOUT_FUDGE * delaycount; 
-       /*******************************************************\
-       * Wait for the adapter to go idle, unless it's one of   *
-       * the commands which don't need this                    *
-       \*******************************************************/
-       if (opcode != AHA_MBX_INIT && opcode != AHA_START_SCSI)
-       {
-               i = AHA_CMD_TIMEOUT_FUDGE * delaycount; /* 1 sec?*/
-               while (--i)
-               {
+               wait = 20000;
+       /*
+        * Wait for the adapter to go idle, unless it's one of
+        * the commands which don't need this
+        */
+       if (opcode != AHA_MBX_INIT && opcode != AHA_START_SCSI) {
+               i = 20000;      /*do this for upto about a second */
+               while (--i) {
                        sts = inb(AHA_CTRL_STAT_PORT);
                        sts = inb(AHA_CTRL_STAT_PORT);
-                       if (sts & AHA_IDLE)
-                       {
+                       if (sts & AHA_IDLE) {
                                break;
                        }
                                break;
                        }
+                       DELAY(50);
                }
                }
-               if (!i)
-               {
+               if (!i) {
                        printf("aha%d: aha_cmd, host not idle(0x%x)\n",
                        printf("aha%d: aha_cmd, host not idle(0x%x)\n",
-                               unit,sts);
-                       return(ENXIO);
+                           unit, sts);
+                       return (ENXIO);
                }
        }
                }
        }
-       /*******************************************************\
-       * Now that it is idle, if we expect output, preflush the*
-       * queue feeding to us.                                  *
-       \*******************************************************/
-       if (ocnt)
-       {
-               while((inb(AHA_CTRL_STAT_PORT)) & AHA_DF)
+       /*
+        * Now that it is idle, if we expect output, preflush the
+        * queue feeding to us.
+        */
+       if (ocnt) {
+               while ((inb(AHA_CTRL_STAT_PORT)) & AHA_DF)
                        inb(AHA_CMD_DATA_PORT);
        }
                        inb(AHA_CMD_DATA_PORT);
        }
-                       
-       /*******************************************************\
-       * Output the command and the number of arguments given  *
-       * for each byte, first check the port is empty.         *
-       \*******************************************************/
-       icnt++;         /* include the command */
-       while (icnt--)
-       {
+       /*
+        * Output the command and the number of arguments given
+        * for each byte, first check the port is empty.
+        */
+       icnt++;
+       /* include the command */
+       while (icnt--) {
                sts = inb(AHA_CTRL_STAT_PORT);
                sts = inb(AHA_CTRL_STAT_PORT);
-               for (i=0; i< wait; i++)
-               {
+               for (i = wait; i; i--) {
                        sts = inb(AHA_CTRL_STAT_PORT);
                        if (!(sts & AHA_CDF))
                                break;
                        sts = inb(AHA_CTRL_STAT_PORT);
                        if (!(sts & AHA_CDF))
                                break;
+                       DELAY(50);
                }
                }
-               if (i >=  wait)
-               {
-                       printf("aha%d: aha_cmd, cmd/data port full\n",unit);
-                       outb(AHA_CTRL_STAT_PORT, AHA_SRST); 
-                       return(ENXIO);
+               if (i == 0) {
+                       printf("aha%d: aha_cmd, cmd/data port full\n", unit);
+                       outb(AHA_CTRL_STAT_PORT, AHA_SRST);
+                       return (ENXIO);
                }
                }
-               outb(AHA_CMD_DATA_PORT, (u_char)(*ic++));
+               outb(AHA_CMD_DATA_PORT, (u_char) (*ic++));
        }
        }
-       /*******************************************************\
-       * If we expect input, loop that many times, each time,  *
-       * looking for the data register to have valid data      *
-       \*******************************************************/
-       while (ocnt--)
-       {
+       /*
+        * If we expect input, loop that many times, each time,
+        * looking for the data register to have valid data
+        */
+       while (ocnt--) {
                sts = inb(AHA_CTRL_STAT_PORT);
                sts = inb(AHA_CTRL_STAT_PORT);
-               for (i=0; i< wait; i++)
-               {
+               for (i = wait; i; i--) {
                        sts = inb(AHA_CTRL_STAT_PORT);
                        sts = inb(AHA_CTRL_STAT_PORT);
-                       if (sts  & AHA_DF)
+                       if (sts & AHA_DF)
                                break;
                                break;
+                       DELAY(50);
                }
                }
-               if (i >=  wait)
-               {
+               if (i == 0) {
                        printf("aha%d: aha_cmd, cmd/data port empty %d\n",
                        printf("aha%d: aha_cmd, cmd/data port empty %d\n",
-                               unit,ocnt);
-                       return(ENXIO);
+                           unit, ocnt);
+                       return (ENXIO);
                }
                oc = inb(AHA_CMD_DATA_PORT);
                if (retval)
                        *retval++ = oc;
        }
                }
                oc = inb(AHA_CMD_DATA_PORT);
                if (retval)
                        *retval++ = oc;
        }
-       /*******************************************************\
-       * Wait for the board to report a finised instruction    *
-       \*******************************************************/
-       i=AHA_CMD_TIMEOUT_FUDGE * delaycount;   /* 1 sec? */
-       while (--i)
-       {
+       /*
+        * Wait for the board to report a finised instruction
+        */
+       i = 20000;
+       while (--i) {
                sts = inb(AHA_INTR_PORT);
                sts = inb(AHA_INTR_PORT);
-               if (sts & AHA_HACC)
-               {
+               if (sts & AHA_HACC) {
                        break;
                }
                        break;
                }
+               DELAY(50);
        }
        }
-       if (!i)
-       {
-               printf("aha%d: aha_cmd, host not finished(0x%x)\n",unit,sts);
-               return(ENXIO);
+       if (i == 0) {
+               printf("aha%d: aha_cmd, host not finished(0x%x)\n", unit, sts);
+               return (ENXIO);
        }
        outb(AHA_CTRL_STAT_PORT, AHA_IRST);
        }
        outb(AHA_CTRL_STAT_PORT, AHA_IRST);
-       return(0);
+       return 0;
 }
 
 }
 
-/*******************************************************\
-* Check if the device can be found at the port given   *
-* and if so, set it up ready for further work          *
-* as an argument, takes the isa_dev structure from     *
-* autoconf.c                                           *
-\*******************************************************/
+/*
+ * Check if the device can be found at the port given
+ * and if so, set it up ready for further work
+ * as an argument, takes the isa_device structure from
+ * autoconf.c
+ */
+int
 ahaprobe(dev)
 ahaprobe(dev)
-struct isa_dev *dev;
+       struct isa_device *dev;
 {
 {
-       int     unit = ahaunit;
-#if defined(OSF)
-       static ihandler_t aha_handler[NAHA];
-       static ihandler_id_t *aha_handler_id[NAHA];
-       register ihandler_t *chp = &aha_handler[unit];;
-#endif /* defined(OSF) */
-
-       /***********************************************\
-       /***********************************************\
-       * find unit and check we have that many defined *
-       \***********************************************/
-       dev->dev_unit = unit;
-       aha_base[unit] = dev->dev_addr;
-       if(unit >= NAHA) 
-       {
-               printf("aha%d: unit number too high\n",unit);
-               return(0);
+       int     unit = ahaunit;
+       struct aha_data *aha;
+
+       /*
+        * find unit and check we have that many defined
+        */
+       if (unit >= NAHA) {
+               printf("aha%d: unit number too high\n", unit);
+               return 0;
        }
        }
-       /***********************************************\
-       * Try initialise a unit at this location        *
-       * sets up dma and bus speed, loads aha_int[unit]*
-       \***********************************************/
-       if (aha_init(unit) != 0)
-       {
-               return(0);
+       dev->id_unit = unit;
+
+       /*
+        * a quick safety check so we can be sleazy later
+        */
+       if (sizeof(struct aha_data) > PAGESIZ) {
+               printf("aha struct > pagesize\n");
+               return 0;
        }
        }
+       /*
+        * Allocate a storage area for us
+        */
+       if (ahadata[unit]) {
+               printf("aha%d: memory already allocated\n", unit);
+               return 0;
+       }
+       aha = malloc(sizeof(struct aha_data), M_TEMP, M_NOWAIT);
+       if (!aha) {
+               printf("aha%d: cannot malloc!\n", unit);
+               return 0;
+       }
+       bzero(aha, sizeof(struct aha_data));
+       ahadata[unit] = aha;
+       aha->aha_base = dev->id_iobase;
+       /*
+        * Try initialise a unit at this location
+        * sets up dma and bus speed, loads aha->aha_int
+        */
+       if (aha_init(unit) != 0) {
+               ahadata[unit] = NULL;
+               free(aha, M_TEMP);
+               return 0;
+       }
+       /*
+        * Calculate the xor product of the aha struct's
+        * physical and virtual address. This allows us
+        * to change addresses within the structure
+        * from physical to virtual easily, as long as
+        * the structure is less than 1 page in size.
+        * This is used to recognise CCBs which are in 
+        * this struct and which are refered to by the
+        * hardware using physical addresses.
+        * (assumes malloc returns a chunk that doesn't
+        * span pages)
+        * eventually use the hash table in aha1742.c
+        */
+       aha->kv_phys_xor = (long int) aha ^ (KVTOPHYS(aha));
 
 
-       /***********************************************\
-       * If it's there, put in it's interrupt vectors  *
-       \***********************************************/
-#if !defined(OSF)
-#if    defined MACH
-       iunit[aha_int[unit]] =unit;
-       ivect[aha_int[unit]] = ahaintr;
-       intpri[aha_int[unit]] = dev->dev_spl;
-       form_pic_mask();
-       /*take_dev_irq(dev);*/
-#else
-#ifdef __386BSD__
-       dev->id_irq = (1 << aha_int[unit]);
-       dev->id_drq = aha_dma[unit];
-#endif __386BSD__
-#endif
-#else /* !defined(OSF) */
- 
-       dev->dev_pic = aha_dma[unit];
-       chp->ih_level = dev->dev_pic;
-       chp->ih_handler = dev->dev_intr[0];
-       chp->ih_resolver = i386_resolver;
-       chp->ih_rdev = dev;
-       chp->ih_stats.intr_type = INTR_DEVICE;
-       chp->ih_stats.intr_cnt = 0;
-       chp->ih_hparam[0].intparam = unit;
-       if ((aha_handler_id[unit] = handler_add(chp)) != NULL)
-               handler_enable(aha_handler_id[unit]);
-       else
-               panic("Unable to add aha interrupt handler");
-#endif /* !defined(OSF) */
-#ifndef        __386BSD__
-       printf("port=%x spl=%d\n", dev->dev_addr, dev->dev_spl);
-#endif __386BSD__
-       ahaunit ++;
-       return(1);
+       /*
+        * If it's there, put in it's interrupt vectors
+        */
+       dev->id_irq = (1 << aha->aha_int);
+       dev->id_drq = aha->aha_dma;
+       ahaunit++;
+       return 0x4;
 }
 
 }
 
-/***********************************************\
-* Attach all the sub-devices we can find       *
-\***********************************************/
+/*
+ * Attach all the sub-devices we can find
+ */
+int
 ahaattach(dev)
 ahaattach(dev)
-struct isa_dev *dev;
+       struct isa_device *dev;
 {
 {
-       int     unit = dev->dev_unit;
-
-       /***********************************************\
-       * ask the adapter what subunits are present     *
-       \***********************************************/
-       scsi_attachdevs( unit, aha_scsi_dev[unit], &aha_switch);
-#if defined(OSF)
-       aha_attached[unit]=1;
-#endif /* defined(OSF) */
-       return;
+       int     unit = dev->id_unit;
+       struct aha_data *aha = ahadata[unit];
+
+       /*
+        * fill in the prototype scsi_link.
+        */
+       aha->sc_link.adapter_unit = unit;
+       aha->sc_link.adapter_targ = aha->aha_scsi_dev;
+       aha->sc_link.adapter = &aha_switch;
+       aha->sc_link.device = &aha_dev;
+
+       /*
+        * ask the adapter what subunits are present
+        */
+       scsi_attachdevs(&(aha->sc_link));
+
+       return 1;
 }
 
 }
 
-/***********************************************\
-* Return some information to the caller about  *
-* the adapter and it's capabilities            *
-\***********************************************/
-long int aha_adapter_info(unit)
-int    unit;
+/*
+ * Return some information to the caller about the adapter and its
+ * capabilities.
+ */
+u_int32 
+aha_adapter_info(unit)
+       int     unit;
 {
 {
-       return(2);      /* 2 outstanding requests at a time per device */
+       return (2);             /* 2 outstanding requests at a time per device */
 }
 
 }
 
-/***********************************************\
-* Catch an interrupt from the adaptor          *
-\***********************************************/
+/*
+ * Catch an interrupt from the adaptor
+ */
+int
 ahaintr(unit)
 ahaintr(unit)
+       int unit;
 {
        struct aha_ccb *ccb;
        unsigned char stat;
        register i;
 {
        struct aha_ccb *ccb;
        unsigned char stat;
        register i;
+       struct aha_data *aha = ahadata[unit];
 
 #ifdef AHADEBUG
 
 #ifdef AHADEBUG
-       if(scsi_debug & PRINTROUTINES)
-               printf("ahaintr ");
-#endif /*AHADEBUG*/
-       /***********************************************\
-       * First acknowlege the interrupt, Then if it's  *
-       * not telling about a completed operation       *
-       * just return.                                  *
-       \***********************************************/
+       printf("ahaintr ");
+#endif /*AHADEBUG */
+       /*
+        * First acknowlege the interrupt, Then if it's not telling about
+        * a completed operation just return. 
+        */
        stat = inb(AHA_INTR_PORT);
        outb(AHA_CTRL_STAT_PORT, AHA_IRST);
        stat = inb(AHA_INTR_PORT);
        outb(AHA_CTRL_STAT_PORT, AHA_IRST);
+       if (!(stat & AHA_MBIF))
+               return 1;
 #ifdef AHADEBUG
 #ifdef AHADEBUG
-       if(scsi_debug & TRACEINTERRUPTS)
-               printf("int ");
-#endif /*AHADEBUG*/
-       if (! (stat & AHA_MBIF))
-               return(1);
-#ifdef AHADEBUG
-       if(scsi_debug & TRACEINTERRUPTS)
-               printf("b ");
-#endif /*AHADEBUG*/
-#if defined(OSF)
-       if (!aha_attached[unit])
-       {
-               return(1);
-       }
-#endif /* defined(OSF) */
-       /***********************************************\
-       * If it IS then process the competed operation  *
-       \***********************************************/
-       for (i = 0; i < AHA_MBX_SIZE; i++)
-       {
-               if (aha_mbx[unit].mbi[i].stat != AHA_MBI_FREE) 
-               {
-                       ccb = (struct aha_ccb *)PHYSTOKV(
-                               (_3btol(aha_mbx[unit].mbi[i].ccb_addr)));
-
-                       if((stat =  aha_mbx[unit].mbi[i].stat) != AHA_MBI_OK)
-                       {
-                               switch(stat)
-                               {
-                               case    AHA_MBI_ABORT:
+       printf("mbxin ");
+#endif /*AHADEBUG */
+       /*
+        * If it IS then process the competed operation
+        */
+       for (i = 0; i < AHA_MBX_SIZE; i++) {
+               if (aha->aha_mbx.mbi[i].stat != AHA_MBI_FREE) {
+                       ccb = (struct aha_ccb *) PHYSTOKV(
+                           (_3btol(aha->aha_mbx.mbi[i].ccb_addr)));
+
+                       if ((stat = aha->aha_mbx.mbi[i].stat) != AHA_MBI_OK) {
+                               switch (stat) {
+                               case AHA_MBI_ABORT:
 #ifdef AHADEBUG
 #ifdef AHADEBUG
-                                       if(aha_debug)
-                                           printf("abort");
-#endif /*AHADEBUG*/
+                                       if (aha_debug)
+                                               printf("abort");
+#endif /*AHADEBUG */
                                        ccb->host_stat = AHA_ABORTED;
                                        break;
 
                                        ccb->host_stat = AHA_ABORTED;
                                        break;
 
-                               case    AHA_MBI_UNKNOWN:
-                                       ccb = (struct aha_ccb *)0;
+                               case AHA_MBI_UNKNOWN:
+                                       ccb = (struct aha_ccb *) 0;
 #ifdef AHADEBUG
 #ifdef AHADEBUG
-                                       if(aha_debug)
-                                            printf("unknown ccb for abort ");
-#endif /*AHADEBUG*/
+                                       if (aha_debug)
+                                               printf("unknown ccb for abort ");
+#endif /*AHADEBUG */
                                        /* may have missed it */
                                        /* no such ccb known for abort */
 
                                        /* may have missed it */
                                        /* no such ccb known for abort */
 
-                               case    AHA_MBI_ERROR:
+                               case AHA_MBI_ERROR:
                                        break;
 
                                default:
                                        break;
 
                                default:
@@ -723,214 +670,195 @@ ahaintr(unit)
 
                                }
 #ifdef AHADEBUG
 
                                }
 #ifdef AHADEBUG
-                               if( aha_debug && ccb )
-                               {
-                                       u_char  *cp;
-                                       cp = (u_char *)(&(ccb->scsi_cmd));
-                                       printf("op=%x %x %x %x %x %x\n", 
-                                               cp[0], cp[1], cp[2],
-                                               cp[3], cp[4], cp[5]);
+                                if (aha_debug && ccb) {
+                                       u_char *cp;
+                                       cp = (u_char *) (&(ccb->scsi_cmd));
+                                       printf("op=%x %x %x %x %x %x\n",
+                                           cp[0], cp[1], cp[2],
+                                           cp[3], cp[4], cp[5]);
                                        printf("stat %x for mbi[%d]\n"
                                        printf("stat %x for mbi[%d]\n"
-                                               , aha_mbx[unit].mbi[i].stat, i);
+                                           ,aha->aha_mbx.mbi[i].stat, i);
                                        printf("addr = 0x%x\n", ccb);
                                }
                                        printf("addr = 0x%x\n", ccb);
                                }
-#endif /*AHADEBUG*/
+#endif /*AHADEBUG */
                        }
                        }
-                       if(ccb)
-                       {
-                               untimeout(aha_timeout,ccb);
-                               aha_done(unit,ccb);
+                       if (ccb) {
+                               untimeout(aha_timeout, (caddr_t)ccb);
+                               aha_done(unit, ccb);
                        }
                        }
-                       aha_mbx[unit].mbi[i].stat = AHA_MBI_FREE;
+                       aha->aha_mbx.mbi[i].stat = AHA_MBI_FREE;
                }
        }
                }
        }
-       return(1);
+       return 1;
 }
 
 }
 
-/***********************************************\
-* A ccb (and hence a mbx-out is put onto the   *
-* free list.                                   *
-\***********************************************/
-aha_free_ccb(unit,ccb, flags)
-struct aha_ccb *ccb;
+/*
+ * A ccb (and hence a mbx-out is put onto the 
+ * free list.
+ */
+void
+aha_free_ccb(unit, ccb, flags)
+       int unit;
+       struct aha_ccb *ccb;
+       int flags;
 {
 {
-       unsigned int opri;
-       
-#ifdef AHADEBUG
-       if(scsi_debug & PRINTROUTINES)
-               printf("ccb%d(0x%x)> ",unit,flags);
-#endif /*AHADEBUG*/
-       if (!(flags & SCSI_NOMASK)) 
-               opri = splbio();
-
-       ccb->next = aha_ccb_free[unit];
-       aha_ccb_free[unit] = ccb;
+       struct aha_data *aha = ahadata[unit];
+       unsigned int opri = 0;
+
+       if (!(flags & SCSI_NOMASK))
+               opri = splbio();
+
+       ccb->next = aha->aha_ccb_free;
+       aha->aha_ccb_free = ccb;
        ccb->flags = CCB_FREE;
        ccb->flags = CCB_FREE;
-       /***********************************************\
-       * If there were none, wake abybody waiting for  *
-       * one to come free, starting with queued entries*
-       \***********************************************/
+       /*
+        * If there were none, wake anybody waiting for
+        * one to come free, starting with queued entries
+        */
        if (!ccb->next) {
        if (!ccb->next) {
-               wakeup(&aha_ccb_free[unit]);
+               wakeup((caddr_t)&aha->aha_ccb_free);
        }
        }
-       if (!(flags & SCSI_NOMASK)) 
+       if (!(flags & SCSI_NOMASK))
                splx(opri);
 }
 
                splx(opri);
 }
 
-/***********************************************\
-* Get a free ccb (and hence mbox-out entry)    *
-\***********************************************/
+/*
+ * Get a free ccb (and hence mbox-out entry)
+ */
 struct aha_ccb *
 struct aha_ccb *
-aha_get_ccb(unit,flags)
+aha_get_ccb(unit, flags)
+       int unit;
+       int flags;
 {
 {
-       unsigned opri;
+       struct aha_data *aha = ahadata[unit];
+       unsigned opri = 0;
        struct aha_ccb *rc;
 
        struct aha_ccb *rc;
 
-#ifdef AHADEBUG
-       if(scsi_debug & PRINTROUTINES)
-               printf("<ccb%d(0x%x) ",unit,flags);
-#endif /*AHADEBUG*/
-       if (!(flags & SCSI_NOMASK)) 
-               opri = splbio();
-       /***********************************************\
-       * If we can and have to, sleep waiting for one  *
-       * to come free                                  *
-       \***********************************************/
-       while ((!(rc = aha_ccb_free[unit])) && (!(flags & SCSI_NOSLEEP)))
-       {
-               sleep(&aha_ccb_free[unit], PRIBIO);
+       if (!(flags & SCSI_NOMASK))
+               opri = splbio();
+       /*
+        * If we can and have to, sleep waiting for one
+        * to come free
+        */
+       while ((!(rc = aha->aha_ccb_free)) && (!(flags & SCSI_NOSLEEP))) {
+               sleep(&aha->aha_ccb_free, PRIBIO);
        }
        }
-       if (rc) 
-       {
-               aha_ccb_free[unit] = aha_ccb_free[unit]->next;
+       if (rc) {
+               aha->aha_ccb_free = aha->aha_ccb_free->next;
                rc->flags = CCB_ACTIVE;
        }
                rc->flags = CCB_ACTIVE;
        }
-       if (!(flags & SCSI_NOMASK)) 
+       if (!(flags & SCSI_NOMASK))
                splx(opri);
                splx(opri);
-       return(rc);
+       return (rc);
 }
 }
-               
-
-/***********************************************\
-* We have a ccb which has been processed by the        *
-* adaptor, now we look to see how the operation        *
-* went. Wake up the owner if waiting           *
-\***********************************************/
-aha_done(unit,ccb)
-struct aha_ccb *ccb;
+
+/*
+ * We have a ccb which has been processed by the
+ * adaptor, now we look to see how the operation
+ * went. Wake up the owner if waiting
+ */
+void
+aha_done(unit, ccb)
+       int     unit;
+       struct  aha_ccb *ccb;
 {
 {
-       struct  scsi_sense_data *s1,*s2;
-       struct  scsi_xfer *xs = ccb->xfer;
+       struct aha_data *aha = ahadata[unit];
+       struct scsi_sense_data *s1, *s2;
+       struct scsi_xfer *xs = ccb->xfer;
 
 
-#ifdef AHADEBUG
-       if(scsi_debug & PRINTROUTINES )
-               printf("aha_done ");
-#endif /*AHADEBUG*/
-       /***********************************************\
-       * Otherwise, put the results of the operation   *
-       * into the xfer and call whoever started it     *
-       \***********************************************/
-       if(!(xs->flags & INUSE))
-       {
-               printf("aha%d: exiting but not in use!\n",unit);
-               Debugger();
+       SC_DEBUG(xs->sc_link, SDEV_DB2, ("aha_done\n"));
+       /*
+        * Otherwise, put the results of the operation
+        * into the xfer and call whoever started it
+        */
+       if (!(xs->flags & INUSE)) {
+               printf("aha%d: exiting but not in use!\n", unit);
+               Debugger("aha1542");
        }
        }
-       if (    (       ccb->host_stat != AHA_OK 
-                       || ccb->target_stat != SCSI_OK)
-             && (!(xs->flags & SCSI_ERR_OK)))
-       {
-               s1 = (struct scsi_sense_data *)(((char *)(&ccb->scsi_cmd)) 
-                               + ccb->scsi_cmd_length);
+       if (((ccb->host_stat != AHA_OK) || (ccb->target_stat != SCSI_OK))
+           && ((xs->flags & SCSI_ERR_OK) == 0)) {
+               /*
+                * We have an error, that we cannot ignore.
+                */
+               s1 = (struct scsi_sense_data *) (((char *) (&ccb->scsi_cmd))
+                   + ccb->scsi_cmd_length);
                s2 = &(xs->sense);
 
                s2 = &(xs->sense);
 
-               if(ccb->host_stat)
-               {
-                       switch(ccb->host_stat)
-                       {
-                       case    AHA_ABORTED:
-                       case    AHA_SEL_TIMEOUT:        /* No response */
+               if (ccb->host_stat) {
+                       SC_DEBUG(xs->sc_link, SDEV_DB3, ("host err 0x%x\n",
+                               ccb->host_stat));
+                       switch (ccb->host_stat) {
+                       case AHA_ABORTED:
+                       case AHA_SEL_TIMEOUT:   /* No response */
                                xs->error = XS_TIMEOUT;
                                break;
                        default:        /* Other scsi protocol messes */
                                xs->error = XS_DRIVER_STUFFUP;
                                xs->error = XS_TIMEOUT;
                                break;
                        default:        /* Other scsi protocol messes */
                                xs->error = XS_DRIVER_STUFFUP;
-#ifdef AHADEBUG
-                               if (aha_debug > 1)
-                               {
-                                       printf("host_stat%x\n",
-                                               ccb->host_stat);
-                               }
-#endif /*AHADEBUG*/
+                               printf("aha%d:host_stat%x\n",
+                                   unit, ccb->host_stat);
                        }
                        }
-
-               }
-               else
-               {
-                       switch(ccb->target_stat)
-                       {
+               } else {
+                       SC_DEBUG(xs->sc_link, SDEV_DB3, ("target err 0x%x\n",
+                               ccb->target_stat));
+                       switch (ccb->target_stat) {
                        case 0x02:
                        case 0x02:
-                               /* structure copy!!!!!*/
-                               *s2=*s1;
+                               /* structure copy!!!!! */
+                               *s2 = *s1;
                                xs->error = XS_SENSE;
                                break;
                        case 0x08:
                                xs->error = XS_BUSY;
                                break;
                        default:
                                xs->error = XS_SENSE;
                                break;
                        case 0x08:
                                xs->error = XS_BUSY;
                                break;
                        default:
-#ifdef AHADEBUG
-                               if (aha_debug > 1)
-                               {
-                                       printf("target_stat%x\n",
-                                               ccb->target_stat);
-                               }
-#endif /*AHADEBUG*/
+                               printf("aha%d:target_stat%x\n",
+                                   unit, ccb->target_stat);
                                xs->error = XS_DRIVER_STUFFUP;
                        }
                }
                                xs->error = XS_DRIVER_STUFFUP;
                        }
                }
-       }
-       else            /* All went correctly  OR errors expected */
-       {
+       } else {
+               /* All went correctly  OR errors expected */
                xs->resid = 0;
        }
        xs->flags |= ITSDONE;
                xs->resid = 0;
        }
        xs->flags |= ITSDONE;
-       aha_free_ccb(unit,ccb, xs->flags);
-       if(xs->when_done)
-               (*(xs->when_done))(xs->done_arg,xs->done_arg2);
+       aha_free_ccb(unit, ccb, xs->flags);
+       scsi_done(xs);
 }
 
 }
 
-
-/***********************************************\
-* Start the board, ready for normal operation  *
-\***********************************************/
+/*
+ * Start the board, ready for normal operation
+ */
+int
 aha_init(unit)
 aha_init(unit)
-int    unit;
+       int     unit;
 {
 {
+       struct aha_data *aha = ahadata[unit];
        unsigned char ad[3];
        unsigned char ad[3];
-       volatile int i,sts;
+       volatile int i, sts;
        struct  aha_config conf;
        struct  aha_inquire inquire;
        struct  aha_extbios extbios;
 
        struct  aha_config conf;
        struct  aha_inquire inquire;
        struct  aha_extbios extbios;
 
-       /***********************************************\
-       * reset board, If it doesn't respond, assume    *
-       * that it's not there.. good for the probe      *
-       \***********************************************/
+       /*
+        * reset board, If it doesn't respond, assume 
+        * that it's not there.. good for the probe
+        */
 
 
-       outb(AHA_CTRL_STAT_PORT, AHA_HRST|AHA_SRST);
+       outb(AHA_CTRL_STAT_PORT, AHA_HRST | AHA_SRST);
 
 
-       for (i=0; i < AHA_RESET_TIMEOUT; i++)
-       {
-               sts = inb(AHA_CTRL_STAT_PORT) ;
-               if ( sts == (AHA_IDLE | AHA_INIT))
+       for (i = AHA_RESET_TIMEOUT; i; i--) {
+               sts = inb(AHA_CTRL_STAT_PORT);
+               if (sts == (AHA_IDLE | AHA_INIT))
                        break;
                        break;
+               DELAY(1000);    /* calibrated in msec */
        }
        }
-       if (i >= AHA_RESET_TIMEOUT)
-       {
+       if (i == 0) {
 #ifdef AHADEBUG
                if (aha_debug)
                        printf("aha_init: No answer from adaptec board\n");
 #ifdef AHADEBUG
                if (aha_debug)
                        printf("aha_init: No answer from adaptec board\n");
-#endif /*AHADEBUG*/
-               return(ENXIO);
+#endif /*AHADEBUG */
+               return (ENXIO);
        }
        }
+
        /*
         * Assume we have a board at this stage, do an adapter inquire
         * to find out what type of controller it is
        /*
         * Assume we have a board at this stage, do an adapter inquire
         * to find out what type of controller it is
@@ -959,7 +887,8 @@ int unit;
         * No need to check the extended bios flags as some of the
         * extensions that cause us problems are not flagged in that byte.
         */
         * No need to check the extended bios flags as some of the
         * extensions that cause us problems are not flagged in that byte.
         */
-       if ((inquire.boardid == 0x43) || (inquire.boardid == 0x44)) {
+       if ((inquire.boardid == 0x43) || (inquire.boardid == 0x44) ||
+                       (inquire.boardid == 0x45)) {
                aha_cmd(unit, 0, sizeof(extbios), 0, &extbios, AHA_EXT_BIOS);
 #ifdef AHADEBUG
                printf("aha%d: extended bios flags %x\n", unit, extbios.flags);
                aha_cmd(unit, 0, sizeof(extbios), 0, &extbios, AHA_EXT_BIOS);
 #ifdef AHADEBUG
                printf("aha%d: extended bios flags %x\n", unit, extbios.flags);
@@ -968,514 +897,399 @@ int     unit;
                aha_cmd(unit, 2, 0, 0, 0, AHA_MBX_ENABLE,
                        0, extbios.mailboxlock);
        }
                aha_cmd(unit, 2, 0, 0, 0, AHA_MBX_ENABLE,
                        0, extbios.mailboxlock);
        }
-       /***********************************************\
-       * Setup dma channel from jumpers and save int   *
-       * level                                         *
-       \***********************************************/
-#ifdef __386BSD__
-       printf("aha%d: reading board settings, ",unit);
-#define        PRNT(x) printf(x)
-#else  __386BSD__
-       printf("aha%d:",unit);
+
+       /*
+        * setup dma channel from jumpers and save int
+        * level
+        */
+       printf("aha%d: reading board settings, ", unit);
 #define        PRNT(x) printf(x)
 #define        PRNT(x) printf(x)
-#endif __386BSD__
-       DELAY(10000);   /* for Bustek 545 */
-       aha_cmd(unit,0, sizeof(conf), 0 ,&conf, AHA_CONF_GET);
-       switch(conf.chan)
-       {
-       case    CHAN0:
+       DELAY(1000);            /* for Bustek 545 */
+       aha_cmd(unit, 0, sizeof(conf), 0, &conf, AHA_CONF_GET);
+       switch (conf.chan) {
+       case CHAN0:
                outb(0x0b, 0x0c);
                outb(0x0a, 0x00);
                outb(0x0b, 0x0c);
                outb(0x0a, 0x00);
-               aha_dma[unit] = 0;
+               aha->aha_dma = 0;
                PRNT("dma=0 ");
                break;
                PRNT("dma=0 ");
                break;
-       case    CHAN5:
+       case CHAN5:
                outb(0xd6, 0xc1);
                outb(0xd4, 0x01);
                outb(0xd6, 0xc1);
                outb(0xd4, 0x01);
-               aha_dma[unit] = 5;
+               aha->aha_dma = 5;
                PRNT("dma=5 ");
                break;
                PRNT("dma=5 ");
                break;
-       case    CHAN6:
+       case CHAN6:
                outb(0xd6, 0xc2);
                outb(0xd4, 0x02);
                outb(0xd6, 0xc2);
                outb(0xd4, 0x02);
-               aha_dma[unit] = 6;
+               aha->aha_dma = 6;
                PRNT("dma=6 ");
                break;
                PRNT("dma=6 ");
                break;
-       case    CHAN7:
+       case CHAN7:
                outb(0xd6, 0xc3);
                outb(0xd4, 0x03);
                outb(0xd6, 0xc3);
                outb(0xd4, 0x03);
-               aha_dma[unit] = 7;
+               aha->aha_dma = 7;
                PRNT("dma=7 ");
                break;
        default:
                printf("illegal dma jumper setting\n");
                PRNT("dma=7 ");
                break;
        default:
                printf("illegal dma jumper setting\n");
-               return(EIO);
+               return (EIO);
        }
        }
-       switch(conf.intr)
-       {
-       case    INT9:
-               aha_int[unit] = 9;
+       switch (conf.intr) {
+       case INT9:
+               aha->aha_int = 9;
                PRNT("int=9 ");
                break;
                PRNT("int=9 ");
                break;
-       case    INT10:
-               aha_int[unit] = 10;
+       case INT10:
+               aha->aha_int = 10;
                PRNT("int=10 ");
                break;
                PRNT("int=10 ");
                break;
-       case    INT11:
-               aha_int[unit] = 11;
+       case INT11:
+               aha->aha_int = 11;
                PRNT("int=11 ");
                break;
                PRNT("int=11 ");
                break;
-       case    INT12:
-               aha_int[unit] = 12;
+       case INT12:
+               aha->aha_int = 12;
                PRNT("int=12 ");
                break;
                PRNT("int=12 ");
                break;
-       case    INT14:
-               aha_int[unit] = 14;
+       case INT14:
+               aha->aha_int = 14;
                PRNT("int=14 ");
                break;
                PRNT("int=14 ");
                break;
-       case    INT15:
-               aha_int[unit] = 15;
+       case INT15:
+               aha->aha_int = 15;
                PRNT("int=15 ");
                break;
        default:
                printf("illegal int jumper setting\n");
                PRNT("int=15 ");
                break;
        default:
                printf("illegal int jumper setting\n");
-               return(EIO);
+               return (EIO);
        }
        }
-       /* who are we on the scsi bus */
-       aha_scsi_dev[unit] = conf.scsi_dev;
 
 
+       /* who are we on the scsi bus? */
+       aha->aha_scsi_dev = conf.scsi_dev;
 
 
-       /***********************************************\
-       * Initialize memory transfer speed              *
-       \***********************************************/
-/*
- * XXX This code seems to BREAK more boards than it makes
- * work right, we are just going to NOP this here...
- */ 
-#if 0
-       if(!(aha_set_bus_speed(unit)))
-       {
-               return(EIO);
+       /*
+        * Change the bus on/off times to not clash with other dma users.
+        */
+       aha_cmd(unit, 1, 0, 0, 0, AHA_BUS_ON_TIME_SET, 7);
+       aha_cmd(unit, 1, 0, 0, 0, AHA_BUS_OFF_TIME_SET, 4);
+
+#ifdef TUNE_1542
+       /*
+        * Initialize memory transfer speed
+        * Not compiled in by default because it breaks some machines 
+        */
+       if (!(aha_set_bus_speed(unit))) {
+               return (EIO);
        }
 #else
        printf ("\n");
        }
 #else
        printf ("\n");
-#endif
-       
+#endif /*TUNE_1542*/
+       /*
+        * Initialize mail box 
+        */
+       lto3b(KVTOPHYS(&aha->aha_mbx), ad);
 
 
-       /***********************************************\
-       * Initialize mail box                           *
-       \***********************************************/
-
-       lto3b(KVTOPHYS(&aha_mbx[unit]), ad);
-
-       aha_cmd(unit,4, 0, 0, 0, AHA_MBX_INIT,
-                       AHA_MBX_SIZE,
-                       ad[0],
-                       ad[1],
-                       ad[2]);
-
-
-       /***********************************************\
-       * link the ccb's with the mbox-out entries and  *
-       * into a free-list                              *
-       \***********************************************/
-       for (i=0; i < AHA_MBX_SIZE; i++) {
-               aha_ccb[unit][i].next = aha_ccb_free[unit];
-               aha_ccb_free[unit] = &aha_ccb[unit][i];
-               aha_ccb_free[unit]->flags = CCB_FREE;
-               aha_ccb_free[unit]->mbx = &aha_mbx[unit].mbo[i];
-               lto3b(KVTOPHYS(aha_ccb_free[unit]), aha_mbx[unit].mbo[i].ccb_addr);
-       }
+       aha_cmd(unit, 4, 0, 0, 0, AHA_MBX_INIT,
+           AHA_MBX_SIZE,
+           ad[0],
+           ad[1],
+           ad[2]);
 
 
-       /***********************************************\
-       * Note that we are going and return (to probe)  *
-       \***********************************************/
-       aha_initialized[unit]++;
-       return(0);
+       /*
+        * link the ccb's with the mbox-out entries and
+        * into a free-list
+        * this is a kludge but it works
+        */
+       for (i = 0; i < AHA_MBX_SIZE; i++) {
+               aha->aha_ccb[i].next = aha->aha_ccb_free;
+               aha->aha_ccb_free = &aha->aha_ccb[i];
+               aha->aha_ccb_free->flags = CCB_FREE;
+               aha->aha_ccb_free->mbx = &aha->aha_mbx.mbo[i];
+               lto3b(KVTOPHYS(aha->aha_ccb_free), aha->aha_mbx.mbo[i].ccb_addr);
+       }
+       /*
+        * Note that we are going and return (to probe)
+        */
+       return 0;
 }
 
 }
 
-
-
-
-
-void ahaminphys(bp)
-struct buf *bp;
+void 
+ahaminphys(bp)
+       struct buf *bp;
 {
 {
-#ifdef MACH
-#if !defined(OSF)
-       bp->b_flags |= B_NPAGES;                /* can support scat/gather */
-#endif /* !defined(OSF) */
-#endif MACH
-/*     aha seems to explode with 17 segs (64k may require 17 segs) */
-/*     on old boards so use a max of 16 segs if you have problems here*/
-       if(bp->b_bcount > ((AHA_NSEG - 1) * PAGESIZ))
-       {
+/*      aha seems to explode with 17 segs (64k may require 17 segs) */
+/*      on old boards so use a max of 16 segs if you have problems here */
+       if (bp->b_bcount > ((AHA_NSEG - 1) * PAGESIZ)) {
                bp->b_bcount = ((AHA_NSEG - 1) * PAGESIZ);
        }
 }
                bp->b_bcount = ((AHA_NSEG - 1) * PAGESIZ);
        }
 }
-       
-/***********************************************\
-* start a scsi operation given the command and *
-* the data address. Also needs the unit, target        *
-* and lu                                       *
-\***********************************************/
-int    aha_scsi_cmd(xs)
-struct scsi_xfer *xs;
+
+/*
+ * start a scsi operation given the command and
+ * the data address. Also needs the unit, target
+ * and lu
+ */
+int32 
+aha_scsi_cmd(xs)
+       struct scsi_xfer *xs;
 {
 {
-       struct  scsi_sense_data *s1,*s2;
+       struct scsi_link *sc_link = xs->sc_link;
+       int     unit = sc_link->adapter_unit;
+       struct aha_data *aha = ahadata[unit];
+       struct scsi_sense_data *s1, *s2;
        struct aha_ccb *ccb;
        struct aha_scat_gath *sg;
        struct aha_ccb *ccb;
        struct aha_scat_gath *sg;
-       int     seg;    /* scatter gather seg being worked on */
-       int i   = 0;
-       int rc  =  0;
-       int     thiskv;
-       int     thisphys,nextphys;
-       int     unit =xs->adapter;
-       int     bytes_this_seg,bytes_this_page,datalen,flags;
-       struct  iovec   *iovp;
-       int     s;
-
-#ifdef AHADEBUG
-       if(scsi_debug & PRINTROUTINES)
-               printf("aha_scsi_cmd ");
-#endif /*AHADEBUG*/
-       /***********************************************\
-       * get a ccb (mbox-out) to use. If the transfer  *
-       * is from a buf (possibly from interrupt time)  *
-       * then we can't allow it to sleep               *
-       \***********************************************/
+       int     seg;            /* scatter gather seg being worked on */
+       int     i = 0;
+       int     rc = 0;
+       int     thiskv;
+       int     thisphys, nextphys;
+       int     bytes_this_seg, bytes_this_page, datalen, flags;
+       struct iovec *iovp;
+       int     s;
+
+       SC_DEBUG(xs->sc_link, SDEV_DB2, ("aha_scsi_cmd\n"));
+       /*
+        * get a ccb (mbox-out) to use. If the transfer
+        * is from a buf (possibly from interrupt time)
+        * then we can't allow it to sleep
+        */
        flags = xs->flags;
        flags = xs->flags;
-       if(!(flags & INUSE))
-       {
-               printf("aha%d: not in use!\n",unit);
-               Debugger();
-               xs->flags |= INUSE;
-       }
-       if(flags & ITSDONE)
-       {
-               printf("aha%d: Already done! check device retry code\n",unit);
-               Debugger();
-               xs->flags &= ~ITSDONE;
-       }
-       if(xs->bp) flags |= (SCSI_NOSLEEP); /* just to be sure */
-       if (!(ccb = aha_get_ccb(unit,flags)))
-       {
+       if (!(ccb = aha_get_ccb(unit, flags))) {
                xs->error = XS_DRIVER_STUFFUP;
                xs->error = XS_DRIVER_STUFFUP;
-               return(TRY_AGAIN_LATER);
+               return (TRY_AGAIN_LATER);
        }
        }
-
        if (ccb->mbx->cmd != AHA_MBO_FREE)
        if (ccb->mbx->cmd != AHA_MBO_FREE)
-               printf("aha%d: MBO not free\n",unit);
+               printf("aha%d: MBO not free\n", unit);
 
 
-       /***********************************************\
-       * Put all the arguments for the xfer in the ccb *
-       \***********************************************/
-       ccb->xfer               =       xs;
-       if(flags & SCSI_RESET)
-       {
-               ccb->opcode     =       AHA_RESET_CCB;
-       }
-       else
-       {
+       /*
+        * Put all the arguments for the xfer in the ccb
+        */
+       ccb->xfer = xs;
+       if (flags & SCSI_RESET) {
+               ccb->opcode = AHA_RESET_CCB;
+       } else {
                /* can't use S/G if zero length */
                /* can't use S/G if zero length */
-               ccb->opcode     =       (xs->datalen?
-                                               AHA_INIT_SCAT_GATH_CCB
-                                               :AHA_INITIATOR_CCB);
+               ccb->opcode = (xs->datalen ?
+                   AHA_INIT_SCAT_GATH_CCB
+                   : AHA_INITIATOR_CCB);
        }
        }
-       ccb->target             =       xs->targ;;
-       ccb->data_out           =       0;
-       ccb->data_in            =       0;
-       ccb->lun                =       xs->lu;
-       ccb->scsi_cmd_length    =       xs->cmdlen;
-       ccb->req_sense_length   =       sizeof(ccb->scsi_sense);
-
-       if((xs->datalen) && (!(flags & SCSI_RESET)))
-       { /* can use S/G only if not zero length */
-               lto3b(KVTOPHYS(ccb->scat_gath), ccb->data_addr );
-               sg              =       ccb->scat_gath ;
-               seg             =       0;
-               if(flags & SCSI_DATA_UIO)
-               {
-                       iovp = ((struct uio *)xs->data)->uio_iov;
-                       datalen = ((struct uio *)xs->data)->uio_iovcnt;
-                       while ((datalen) && (seg < AHA_NSEG))
-                       {
-                               lto3b(iovp->iov_base,&(sg->seg_addr));
-                               lto3b(iovp->iov_len,&(sg->seg_len));
-#ifdef AHADEBUG
-                               if(scsi_debug & SHOWSCATGATH)
-                                       printf("(0x%x@0x%x)"
-                                                       ,iovp->iov_len
-                                                       ,iovp->iov_base);
-#endif /*AHADEBUG*/
+       ccb->target = sc_link->target;
+       ccb->data_out = 0;
+       ccb->data_in = 0;
+       ccb->lun = sc_link->lun;
+       ccb->scsi_cmd_length = xs->cmdlen;
+       ccb->req_sense_length = sizeof(ccb->scsi_sense);
+
+       if ((xs->datalen) && (!(flags & SCSI_RESET))) {
+               /* can use S/G only if not zero length */
+               lto3b(KVTOPHYS(ccb->scat_gath), ccb->data_addr);
+               sg = ccb->scat_gath;
+               seg = 0;
+#ifdef TFS_ONLY
+               if (flags & SCSI_DATA_UIO) {
+                       iovp = ((struct uio *) xs->data)->uio_iov;
+                       datalen = ((struct uio *) xs->data)->uio_iovcnt;
+                       while ((datalen) && (seg < AHA_NSEG)) {
+                               lto3b(iovp->iov_base, sg->seg_addr);
+                               lto3b(iovp->iov_len, sg->seg_len);
+                               SC_DEBUGN(xs->sc_link, SDEV_DB4, ("UIO(0x%x@0x%x)"
+                                       ,iovp->iov_len
+                                       ,iovp->iov_base));
                                sg++;
                                iovp++;
                                seg++;
                                datalen--;
                        }
                                sg++;
                                iovp++;
                                seg++;
                                datalen--;
                        }
-               }
-               else
+               } else
+#endif /*TFS_ONLY */
                {
                {
-                       /***********************************************\
-                       * Set up the scatter gather block               *
-                       \***********************************************/
-               
-#ifdef AHADEBUG
-                       if(scsi_debug & SHOWSCATGATH)
-                               printf("%d @0x%x:- ",xs->datalen,xs->data);
-#endif /*AHADEBUG*/
-                       datalen         =       xs->datalen;
-                       thiskv          =       (int)xs->data;
-                       thisphys        =       KVTOPHYS(thiskv);
-               
-                       while ((datalen) && (seg < AHA_NSEG))
-                       {
-                               bytes_this_seg  = 0;
-       
+                       /*
+                        * Set up the scatter gather block
+                        */
+
+                       SC_DEBUG(xs->sc_link, SDEV_DB4,
+                           ("%d @0x%x:- ", xs->datalen, xs->data));
+                       datalen = xs->datalen;
+                       thiskv = (int) xs->data;
+                       thisphys = KVTOPHYS(thiskv);
+
+                       while ((datalen) && (seg < AHA_NSEG)) {
+                               bytes_this_seg = 0;
+
                                /* put in the base address */
                                /* put in the base address */
-                               lto3b(thisphys,&(sg->seg_addr));
-               
-#ifdef AHADEBUG
-                               if(scsi_debug & SHOWSCATGATH)
-                                       printf("0x%x",thisphys);
-#endif /*AHADEBUG*/
-       
+                               lto3b(thisphys, sg->seg_addr);
+
+                               SC_DEBUGN(xs->sc_link, SDEV_DB4,
+                                   ("0x%x", thisphys));
+
                                /* do it at least once */
                                /* do it at least once */
-                               nextphys = thisphys;    
-                               while ((datalen) && (thisphys == nextphys))
-                               /***************************************\
-                               * This page is contiguous (physically)  *
-                               * with the the last, just extend the    *
-                               * length                                *
-                               \***************************************/
-                               {
+                               nextphys = thisphys;
+                               while ((datalen) && (thisphys == nextphys)) {
+                                       /*
+                                        * This page is contiguous (physically)
+                                        * with the the last, just extend the
+                                        * length
+                                        */
+                                       /* check it fits on the ISA bus */
+                                       if (thisphys > 0xFFFFFF)
+                                       {
+                                               printf("aha%d: DMA beyond"
+                                                       " end Of ISA\n", unit);
+                                               xs->error = XS_DRIVER_STUFFUP;
+                                               aha_free_ccb(unit, ccb, flags);
+                                               return (HAD_ERROR);
+                                       }
                                        /** how far to the end of the page ***/
                                        nextphys = (thisphys & (~(PAGESIZ - 1)))
                                        /** how far to the end of the page ***/
                                        nextphys = (thisphys & (~(PAGESIZ - 1)))
-                                                               + PAGESIZ;
-                                       bytes_this_page = nextphys - thisphys;
+                                           + PAGESIZ;
+                                       bytes_this_page = nextphys - thisphys;
                                        /**** or the data ****/
                                        /**** or the data ****/
-                                       bytes_this_page = min(bytes_this_page
-                                                               ,datalen);
-                                       bytes_this_seg  += bytes_this_page;
-                                       datalen         -= bytes_this_page;
-               
+                                       bytes_this_page = min(bytes_this_page
+                                           ,datalen);
+                                       bytes_this_seg += bytes_this_page;
+                                       datalen -= bytes_this_page;
+
                                        /**** get more ready for the next page ****/
                                        /**** get more ready for the next page ****/
-                                       thiskv  = (thiskv & (~(PAGESIZ - 1)))
-                                                               + PAGESIZ;
-                                       if(datalen)
+                                       thiskv = (thiskv & (~(PAGESIZ - 1)))
+                                           + PAGESIZ;
+                                       if (datalen)
                                                thisphys = KVTOPHYS(thiskv);
                                }
                                                thisphys = KVTOPHYS(thiskv);
                                }
-                               /***************************************\
-                               * next page isn't contiguous, finish the seg*
-                               \***************************************/
-#ifdef AHADEBUG
-                               if(scsi_debug & SHOWSCATGATH)
-                                       printf("(0x%x)",bytes_this_seg);
-#endif /*AHADEBUG*/
-                               lto3b(bytes_this_seg,&(sg->seg_len));   
+                               /*
+                                * next page isn't contiguous, finish the seg
+                                */
+                               SC_DEBUGN(xs->sc_link, SDEV_DB4,
+                                   ("(0x%x)", bytes_this_seg));
+                               lto3b(bytes_this_seg, sg->seg_len);
                                sg++;
                                seg++;
                        }
                }
                                sg++;
                                seg++;
                        }
                }
-               lto3b(seg * sizeof(struct aha_scat_gath),ccb->data_length);
-#ifdef AHADEBUG
-               if(scsi_debug & SHOWSCATGATH)
-                       printf("\n");
-#endif /*AHADEBUG*/
-               if (datalen)
-               { /* there's still data, must have run out of segs! */
+               lto3b(seg * sizeof(struct aha_scat_gath), ccb->data_length);
+               SC_DEBUGN(xs->sc_link, SDEV_DB4, ("\n"));
+
+               if (datalen) {  /* there's still data, must have run out of segs! */
                        printf("aha%d: aha_scsi_cmd, more than %d DMA segs\n",
                        printf("aha%d: aha_scsi_cmd, more than %d DMA segs\n",
-                               unit,AHA_NSEG);
+                           unit, AHA_NSEG);
                        xs->error = XS_DRIVER_STUFFUP;
                        xs->error = XS_DRIVER_STUFFUP;
-                       aha_free_ccb(unit,ccb,flags);
-                       return(HAD_ERROR);
+                       aha_free_ccb(unit, ccb, flags);
+                       return (HAD_ERROR);
                }
                }
-
-       }
-       else
-       {       /* No data xfer, use non S/G values */
-               lto3b(0, ccb->data_addr );
-               lto3b(0,ccb->data_length);
+       } else {                /* No data xfer, use non S/G values */
+               lto3b(0, ccb->data_addr);
+               lto3b(0, ccb->data_length);
        }
        }
-       lto3b(0, ccb->link_addr );
-       /***********************************************\
-       * Put the scsi command in the ccb and start it  *
-       \***********************************************/
-       if(!(flags & SCSI_RESET))
+       lto3b(0, ccb->link_addr);
+       /*
+        * Put the scsi command in the ccb and start it
+        */
+       if (!(flags & SCSI_RESET))
                bcopy(xs->cmd, &ccb->scsi_cmd, ccb->scsi_cmd_length);
                bcopy(xs->cmd, &ccb->scsi_cmd, ccb->scsi_cmd_length);
-#ifdef AHADEBUG
-       if(scsi_debug & SHOWCOMMANDS)
-       {
-               u_char  *b = (u_char *)&ccb->scsi_cmd;
-               if(!(flags & SCSI_RESET))
-               {
-                       int i = 0;
-                       printf("aha%d:%d:%d-"
-                               ,unit
-                               ,ccb->target
-                               ,ccb->lun );
-                               while(i < ccb->scsi_cmd_length )
-                               {
-                                       if(i) printf(",");
-                                        printf("%x",b[i++]);
-                               }
-               }
-               else
-               {
-                       printf("aha%d:%d:%d-RESET- " 
-                               ,unit 
-                               ,ccb->target
-                               ,ccb->lun
-                       );
-               }
-       }
-#endif /*AHADEBUG*/
-       if (!(flags & SCSI_NOMASK))
-       {
-               s= splbio(); /* stop instant timeouts */
-               timeout(aha_timeout,ccb,(xs->timeout * hz) / 1000);
+       if (!(flags & SCSI_NOMASK)) {
+               s = splbio();   /* stop instant timeouts */
+               timeout(aha_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
                aha_startmbx(ccb->mbx);
                aha_startmbx(ccb->mbx);
-               /***********************************************\
-               * Usually return SUCCESSFULLY QUEUED            *
-               \***********************************************/
+               /*
+                * Usually return SUCCESSFULLY QUEUED
+                */
                splx(s);
                splx(s);
-#ifdef AHADEBUG
-               if(scsi_debug & TRACEINTERRUPTS)
-                       printf("sent ");
-#endif /*AHADEBUG*/
-               return(SUCCESSFULLY_QUEUED);
+               SC_DEBUG(xs->sc_link, SDEV_DB3, ("sent\n"));
+               return (SUCCESSFULLY_QUEUED);
        }
        aha_startmbx(ccb->mbx);
        }
        aha_startmbx(ccb->mbx);
-#ifdef AHADEBUG
-       if(scsi_debug & TRACEINTERRUPTS)
-               printf("cmd_sent, waiting ");
-#endif /*AHADEBUG*/
-       /***********************************************\
-       * If we can't use interrupts, poll on completion*
-       \***********************************************/
-       {
-               int done = 0;
-               int count = delaycount * xs->timeout / AHA_SCSI_TIMEOUT_FUDGE;
-               while((!done) && count)
-               {
-                       i=0;
-                       while ( (!done) && i<AHA_MBX_SIZE)
-                       {
-                               if ((aha_mbx[unit].mbi[i].stat != AHA_MBI_FREE )
-                                  && (PHYSTOKV(_3btol(aha_mbx[unit].mbi[i].ccb_addr)
-                                       == (int)ccb)))
-                               {
-                                       aha_mbx[unit].mbi[i].stat = AHA_MBI_FREE;
-                                       aha_done(unit,ccb);
-                                       done++;
-                               }
-                               i++;
-                       }
-                       count--;
-               }
-               if (!count)
-               {
-                       if (!(xs->flags & SCSI_SILENT))
-                               printf("aha%d: cmd fail\n",unit);
-                       aha_abortmbx(ccb->mbx);
-                       count = delaycount * 2000 / AHA_SCSI_TIMEOUT_FUDGE;
-                       while((!done) && count)
-                       {
-                               i=0;
-                               while ( (!done) && i<AHA_MBX_SIZE)
-                               {
-                                       if ((aha_mbx[unit].mbi[i].stat != AHA_MBI_FREE )
-                                       && (PHYSTOKV(_3btol(aha_mbx[unit].mbi[i].ccb_addr)
-                                               == (int)ccb)))
-                                       {
-                                               aha_mbx[unit].mbi[i].stat = AHA_MBI_FREE;
-                                               aha_done(unit,ccb);
-                                               done++;
-                                       }
-                                       i++;
-                               }
-                               count--;
-                       }
-                       if(!count)
-                       {
-                               printf("aha%d: abort failed in wait\n",unit);
-                               ccb->mbx->cmd = AHA_MBO_FREE;
-                       }
-                       aha_free_ccb(unit,ccb,flags);
-                       ahaintr(unit);
-                       xs->error = XS_DRIVER_STUFFUP;
-                       return(HAD_ERROR);
-               }
-               ahaintr(unit);
-               if(xs->error) return(HAD_ERROR);
-               return(COMPLETE);
+       SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd sent, waiting\n"));
 
 
-       } 
+       /*
+        * If we can't use interrupts, poll on completion
+        */
+       return (aha_poll(unit, xs, ccb));       /* only during boot */
 }
 }
-/***************************************************************\
-* try each speed in turn, when we find one that works, use     *
-* the NEXT one for a safety margin, unless that doesn't exist  *
-* or doesn't work. returns the nSEC value of the time used     *
-* or 0 if it could get a working speed ( or the NEXT speed     *
-* failed)                                                      *
-\***************************************************************/
-
-int    aha_set_bus_speed(unit)
-int    unit;
-{
-       int     speed;
-       int     retval,retval2;
 
 
-#ifdef EISA
-       speed = 0; /* start at the fastest */
-#else  EISA
-       speed = 1; /* 100 ns can crash some ISA busses (!?!) */
-#endif EISA
-       while (1)
-       {
-               retval = aha_bus_speed_check(unit,speed);
-               if(retval == HAD_ERROR) 
-               {
-                       printf("no working bus speed!!!\n");
-                       return(0);
+/*
+ * Poll a particular unit, looking for a particular xs
+ */
+int 
+aha_poll(unit, xs, ccb)
+       int     unit;
+       struct scsi_xfer *xs;
+       struct aha_ccb *ccb;
+{
+       struct aha_data *aha = ahadata[unit];
+       int     done = 0;
+       int     count = xs->timeout;
+       u_char  stat;
+
+       /*timeouts are in msec, so we loop in 1000uSec cycles */
+       while (count) {
+               /*
+                * If we had interrupts enabled, would we
+                * have got an interrupt?
+                */
+               stat = inb(AHA_INTR_PORT);
+               if (stat & AHA_ANY_INTR) {
+                       ahaintr(unit);
                }
                }
-               if(retval == 0)
-               {
-                       speed++;
+               if (xs->flags & ITSDONE) {
+                       break;
                }
                }
-               else    /* Go one slower to be safe */
-               {       /* unless eisa at 100 ns.. trust it */
-                       if(speed != 0)
-                       {
-                               speed++;
-                       }
-                       printf("%d nSEC ok, using ",retval);
-                       retval2 = aha_bus_speed_check(unit,speed);
-                       if(retval2 == HAD_ERROR) /* retval is slowest already */
-                       {
-                               printf("marginal ");
-                               retval2 = retval;
-                       }
-                       if(retval2)
-                       {
-                               printf("%d nSEC\n",retval2);
-                               return(retval2);
+               DELAY(1000);    /* only happens in boot so ok */
+               count--;
+       }
+       if (count == 0) {
+               /*
+                * We timed out, so call the timeout handler
+                * manually, accout  for the fact that the
+                * clock is not running yet by taking out the 
+                * clock queue entry it makes
+                */
+               aha_timeout((caddr_t)ccb, 0);
+
+               /*
+                * because we are polling,
+                * take out the timeout entry aha_timeout made
+                */
+               untimeout(aha_timeout, (caddr_t)ccb);
+               count = 2000;
+               while (count) {
+                       /*
+                        * Once again, wait for the int bit
+                        */
+                       stat = inb(AHA_INTR_PORT);
+                       if (stat & AHA_ANY_INTR) {
+                               ahaintr(unit);
                        }
                        }
-                       else
-                       {
-                               printf(".. slower failed, abort\n",retval);
-                               return(0);
+                       if (xs->flags & ITSDONE) {
+                               break;
                        }
                        }
-
+                       DELAY(1000);    /* only happens in boot so ok */
+                       count--;
+               }
+               if (count == 0) {
+                       /*
+                        * We timed out again.. this is bad
+                        * Notice that this time there is no
+                        * clock queue entry to remove
+                        */
+                       aha_timeout((caddr_t)ccb, 0);
                }
        }
                }
        }
+       if (xs->error)
+               return (HAD_ERROR);
+       return (COMPLETE);
+
 }
 
 }
 
-/***************************************************************\
-* Set the DMA speed to the Nth speed and try an xfer. If it    *
-* fails return 0, if it succeeds return the nSec value selected        *
-* If there is no such speed return HAD_ERROR.                  *
-\***************************************************************/
+#ifdef TUNE_1542
+/*
+ * Try all the speeds from slowest to fastest.. if it finds a
+ * speed that fails, back off one notch from the last working
+ * speed (unless there is no other notch).
+ * Returns the nSEC value of the time used
+ * or 0 if it could get a working speed (or the NEXT speed 
+ * failed)
+ */
 static struct bus_speed
 {
        char    arg;
 static struct bus_speed
 {
        char    arg;
@@ -1491,93 +1305,147 @@ static struct bus_speed
        {0xee,400},
        {0xff,450}
 };
        {0xee,400},
        {0xff,450}
 };
-static char aha_test_string[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@";
 
 
-int aha_bus_speed_check(unit,speed)
-int    unit,speed;
+int    
+aha_set_bus_speed(unit)
+       int     unit;
 {
 {
-       int     numspeeds = sizeof(aha_bus_speeds)/sizeof(struct bus_speed);
-       u_char  ad[3];
+       int     speed;
+       int     lastworking;
+       int     retval,retval2;
+       struct  aha_data *aha = ahadata[unit];
 
 
-       /*******************************************************\
-       * Check we have such an entry                           *
-       \*******************************************************/
-       if(speed >= numspeeds) return(HAD_ERROR);       /* illegal speed */
-       
-       /*******************************************************\
-       * Set the dma-speed                                     *
-       \*******************************************************/
-       aha_cmd(unit,1, 0, 0, 0, AHA_SPEED_SET,aha_bus_speeds[speed].arg);
-
-       /*******************************************************\
-       * put the test data into the buffer and calculate       *
-       * it's address. Read it onto the board                  *
-       \*******************************************************/
-       strcpy(aha_scratch_buf,aha_test_string);
-       lto3b(KVTOPHYS(aha_scratch_buf),ad);
-
-       aha_cmd(unit,3, 0, 0, 0, AHA_WRITE_FIFO, ad[0], ad[1], ad[2]);
-
-       /*******************************************************\
-       * clear the buffer then copy the contents back from the *
-       * board.                                                *
-       \*******************************************************/
-       bzero(aha_scratch_buf,54);      /* 54 bytes transfered by test */
-
-       aha_cmd(unit,3, 0, 0, 0, AHA_READ_FIFO, ad[0], ad[1], ad[2]);
-
-       /*******************************************************\
-       * Compare the original data and the final data and      *
-       * return the correct value depending upon the result    *
-       \*******************************************************/
-       if(strcmp(aha_test_string,aha_scratch_buf))
-       {       /* copy failed.. assume too fast */
-               return(0);
-       }
-       else
-       {       /* copy succeded assume speed ok */
-               return(aha_bus_speeds[speed].nsecs);
+       lastworking = -1;
+       speed = 7;
+       while (1) {
+               retval = aha_bus_speed_check(unit,speed);
+               if(retval != 0) {
+                       lastworking = speed;
+               }
+               if((retval == 0) || (speed == 0)) {
+                       if(lastworking == -1) {
+                               printf("No working bus speed for aha154X\n");
+                               return 0;
+                       }
+                       printf("%d nSEC ok, using "
+                               ,aha_bus_speeds[lastworking].nsecs);
+                       if(lastworking == 7) { /* is slowest already */
+                               printf("marginal ");
+                       } else {
+                               lastworking++;
+                       }
+                       retval2 = aha_bus_speed_check(unit,lastworking);
+                       if(retval2 == 0) {
+                               printf("test retry failed.. aborting.\n");
+                               return 0;
+                       }
+                       printf("%d nSEC\n",retval2);
+                       return retval2 ;
+
+               }
+               speed--;
        }
 }
 
        }
 }
 
+/*
+ * Set the DMA speed to the Nth speed and try an xfer. If it
+ * fails return 0, if it succeeds return the nSec value selected
+ * If there is no such speed return HAD_ERROR.
+ */
+static char aha_test_string[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@";
 
 
-
-aha_timeout(struct aha_ccb *ccb)
+int 
+aha_bus_speed_check(unit, speed)
+       int     unit, speed;
 {
 {
-       int     unit;
-       int     s       = splbio();
+       int     numspeeds = sizeof(aha_bus_speeds) / sizeof(struct bus_speed);
+       int     loopcount;
+       u_char  ad[3];
+       struct aha_data *aha = ahadata[unit];
+
+       /*
+        * Check we have such an entry
+        */
+       if (speed >= numspeeds)
+               return (HAD_ERROR);     /* illegal speed */
 
 
-       unit = ccb->xfer->adapter;
-       printf("aha%d: device %d timed out ",unit ,ccb->xfer->targ);
+       /*
+        * Set the dma-speed
+        */
+       aha_cmd(unit, 1, 0, 0, 0, AHA_SPEED_SET, aha_bus_speeds[speed].arg);
 
 
-       /***************************************\
-       * If The ccb's mbx is not free, then    *
-       * the board has gone south              *
-       \***************************************/
-       if(ccb->mbx->cmd != AHA_MBO_FREE)
+       /*
+        * put the test data into the buffer and calculate
+        * it's address. Read it onto the board
+        */
+       lto3b(KVTOPHYS(aha_scratch_buf), ad);
+       for(loopcount = 2000;loopcount;loopcount--)
        {
        {
-               printf("aha%d: not taking commands!\n",unit);
-               Debugger();
+               strcpy(aha_scratch_buf, aha_test_string);
+
+               aha_cmd(unit, 3, 0, 0, 0, AHA_WRITE_FIFO, ad[0], ad[1], ad[2]);
+
+               /*
+               * clear the buffer then copy the contents back from the
+               * board.
+               */
+               bzero(aha_scratch_buf, 54);     /* 54 bytes transfered by test */
+       
+               aha_cmd(unit, 3, 0, 0, 0, AHA_READ_FIFO, ad[0], ad[1], ad[2]);
+       
+               /*
+               * Compare the original data and the final data and
+               * return the correct value depending upon the result
+               */
+               if (strcmp(aha_test_string, aha_scratch_buf))   
+                       return 0; /* failed test */
        }
        }
-       /***************************************\
-       * If it has been through before, then   *
-       * a previous abort has failed, don't    *
-       * try abort again                       *
-       \***************************************/
-       if(ccb->flags == CCB_ABORTED) /* abort timed out */
-       {
+                       /* copy succeded assume speed ok */
+
+       return (aha_bus_speeds[speed].nsecs);
+       
+}
+#endif /*TUNE_1542*/
+
+void
+aha_timeout(caddr_t arg1, int arg2)
+{
+       struct aha_ccb * ccb = (struct aha_ccb *)arg1;
+       int     unit;
+       int     s = splbio();
+       struct aha_data *aha;
+
+       unit = ccb->xfer->sc_link->adapter_unit;
+       aha = ahadata[unit];
+       sc_print_addr(ccb->xfer->sc_link);
+       printf("timed out ");
+
+       /*
+        * If The ccb's mbx is not free, then
+        * the board has gone south
+        */
+       if (ccb->mbx->cmd != AHA_MBO_FREE) {
+               printf("\nadapter not taking commands.. frozen?!\n");
+               Debugger("aha1542");
+       }
+       /*
+        * If it has been through before, then
+        * a previous abort has failed, don't
+        * try abort again
+        */
+       if (ccb->flags == CCB_ABORTED) {
+               /* abort timed out */
                printf(" AGAIN\n");
                printf(" AGAIN\n");
-               ccb->xfer->retries = 0; /* I MEAN IT ! */
+               ccb->xfer->retries = 0;         /* I MEAN IT ! */
                ccb->host_stat = AHA_ABORTED;
                ccb->host_stat = AHA_ABORTED;
-               aha_done(unit,ccb);
-       }
-       else    /* abort the operation that has timed out */
-       {
+               aha_done(unit, ccb);
+       } else {
+               /* abort the operation that has timed out */
                printf("\n");
                aha_abortmbx(ccb->mbx);
                printf("\n");
                aha_abortmbx(ccb->mbx);
-                               /* 2 secs for the abort */
-               timeout(aha_timeout,ccb,2 * hz);
+               /* 4 secs for the abort */
+               timeout(aha_timeout, (caddr_t)ccb, 4 * hz);
                ccb->flags = CCB_ABORTED;
                ccb->flags = CCB_ABORTED;
-       }
-       splx(s);
+       } splx(s);
 }
 }
+#endif /* KERNEL */
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.