revert to older ahc driver until the new one's bugs are fixed

23 files changed, 6587 insertions, 12250 deletions

diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index 2da6e735ba5..190cb371001 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ahc.4,v 1.18 2002/02/16 06:11:09 smurph Exp $
+.\"	$OpenBSD: ahc.4,v 1.19 2002/03/19 02:49:20 millert Exp $
 .\"	$NetBSD: ahc.4,v 1.1.2.1 1996/08/25 17:22:14 thorpej Exp $
 .\"
 .\" Copyright (c) 1995, 1996
@@ -70,9 +70,9 @@ bus(es) connected to Adaptec
 .Tn AIC7880,
 .Tn AIC7890,
 .Tn AIC7891,
-.Tn AIC7892,
 .Tn AIC7895,
 .Tn AIC7896,
+.Tn AIC7892,
 .Tn AIC7897,
 or
 .Tn AIC7899
@@ -106,8 +106,8 @@ and
 .Tn 3985.
 .Pp
 Driver features include support for twin and wide busses,
-fast, ultra, ultra2, and ultra160 synchronous transfers 
-depending on controller type, tagged queuing, and SCB paging.
+fast, ultra and ultra2 synchronous transfers depending on controller type,
+tagged queuing, and SCB paging.
 .Pp
 Memory mapped I/O can be enabled for PCI devices with the
 .Dq Dv AHC_ALLOW_MEMIO
@@ -163,11 +163,9 @@ aic7870     10    PCI/32     10MHz     16Bit    16
 aic7880     10    PCI/32     20MHz     16Bit    16
 aic7890     20    PCI/32     40MHz     16Bit    16        3 4 5 6 7
 aic7891     20    PCI/64     40MHz     16Bit    16        3 4 5 6 7
-aic7892     20    PCI/64     80MHz     16Bit    16        3 4 5 6 7
 aic7895     15    PCI/32     20MHz     16Bit    16      2 3 4 5
 aic7896     20    PCI/32     40MHz     16Bit    16      2 3 4 5 6 7
 aic7897     20    PCI/64     40MHz     16Bit    16      2 3 4 5 6 7
-aic7899     20    PCI/64     80MHz     16Bit    16      2 3 4 5 6 7
 .El
 .Pp
 .Bl -enum -compact
@@ -233,14 +231,13 @@ and restoring SCB data.
 .Xr isa 4 ,
 .Xr pci 4
 .Sh AUTHORS
-The core 
+The
 .Nm
 driver, the
 .Tn AIC7xxx
 sequencer-code assembler, and the firmware running on the aic7xxx chips
 were written by
 .An Justin T. Gibbs .
-The OpenBSD platform code was written by Steve Murphree, Jr.
 .Sh BUGS
 Some Quantum drives (at least the Empire 2100 and 1080s) will not run on an
 .Tn AIC7870
diff --git a/sys/arch/i386/isa/ahc_isa.c b/sys/arch/i386/isa/ahc_isa.c
index 1a6b16452e3..882e2f2d34f 100644
--- a/sys/arch/i386/isa/ahc_isa.c
+++ b/sys/arch/i386/isa/ahc_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_isa.c,v 1.7 2002/03/14 01:26:33 millert Exp $	*/
+/*	$OpenBSD: ahc_isa.c,v 1.8 2002/03/19 02:49:20 millert Exp $	*/
 /*	$NetBSD: ahc_isa.c,v 1.5 1996/10/21 22:27:39 thorpej Exp $	*/
 
 /*
@@ -83,9 +83,8 @@
 #include <dev/eisa/eisadevs.h>
 
 #include <dev/ic/aic7xxxreg.h>
-#include <dev/ic/aic7xxx_openbsd.h>
-#include <dev/ic/aic7xxx_inline.h>
-#include <dev/ic/aic7xxx_93cx6.h>
+#include <dev/ic/aic7xxxvar.h>
+#include <dev/ic/smc93cx6var.h>
 
 #ifdef DEBUG
 #define bootverbose	1
@@ -103,6 +102,7 @@
 /*
  * I/O port offsets
  */
+#define INTDEF			0x5cul	/* Interrupt Definition Register */
 #define	AHC_ISA_VID		(EISA_SLOTOFF_VID - AHC_ISA_SLOT_OFFSET)
 #define	AHC_ISA_PID		(EISA_SLOTOFF_PID - AHC_ISA_SLOT_OFFSET)
 #define	AHC_ISA_PRIMING		AHC_ISA_VID	/* enable vendor/product ID */
@@ -113,13 +113,13 @@
 #define	AHC_ISA_PRIMING_VID(index)	(AHC_ISA_VID + (index))
 #define	AHC_ISA_PRIMING_PID(index)	(AHC_ISA_PID + (index))
 
-int	ahc_isa_irq(bus_space_tag_t, bus_space_handle_t);
-int	ahc_isa_idstring(bus_space_tag_t, bus_space_handle_t, char *);
-int	ahc_isa_match(struct isa_attach_args *, bus_addr_t);
+int	ahc_isa_irq __P((bus_space_tag_t, bus_space_handle_t));
+int	ahc_isa_idstring __P((bus_space_tag_t, bus_space_handle_t, char *));
+int	ahc_isa_match __P((struct isa_attach_args *, bus_addr_t));
 
-int	ahc_isa_probe(struct device *, void *, void *);
-void	ahc_isa_attach(struct device *, struct device *, void *);
-void	aha2840_load_seeprom(struct ahc_softc *ahc);
+int	ahc_isa_probe __P((struct device *, void *, void *));
+void	ahc_isa_attach __P((struct device *, struct device *, void *));
+void	aha2840_load_seeprom __P((struct ahc_softc *ahc));
 
 struct cfattach ahc_isa_ca = {
 	sizeof(struct ahc_softc), ahc_isa_probe, ahc_isa_attach
@@ -159,7 +159,7 @@ ahc_isa_irq(iot, ioh)
 	bus_space_write_1(iot, ioh, HCNTRL, hcntrl | PAUSE);
 
 	intdef = bus_space_read_1(iot, ioh, INTDEF);
-	switch (irq = (intdef & VECTOR)) {
+	switch (irq = (intdef & 0xf)) {
 	case 9:
 	case 10:
 	case 11:
@@ -346,6 +346,7 @@ ahc_isa_attach(parent, self, aux)
 	struct device *parent, *self;
 	void *aux;
 {
+	ahc_chip chip;
 	struct ahc_softc *ahc = (void *)self;
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot = ia->ia_iot;
@@ -353,24 +354,10 @@ ahc_isa_attach(parent, self, aux)
 	int irq;
 	char idstring[EISA_IDSTRINGLEN];
 	const char *model;
-	u_int intdef;
-	/* 
-	 * We really don't allocate our softc, but 
-	 * we need to do the initialization. And this 
-	 * also allocates the platform_data structure.
-	 */
-	ahc_alloc(ahc, ahc->sc_dev.dv_xname);
-	
-	ahc_set_name(ahc, ahc->sc_dev.dv_xname);
-	ahc_set_unit(ahc, ahc->sc_dev.dv_unit);
-	
-	/* set dma tags */
-	ahc->parent_dmat = ia->ia_dmat;
-	ahc->buffer_dmat = ia->ia_dmat;
-        ahc->shared_data_dmat = ia->ia_dmat;
-	
-	ahc->chip = AHC_VL; /* We are a VL Bus Controller */  
-	
+	u_char channel = 'A';
+
+	ahc->sc_dmat = ia->ia_dmat;
+	chip = AHC_VL; /* We are a VL Bus Controller */  
 	if (bus_space_map(iot, ia->ia_iobase, ia->ia_iosize, 0, &ioh))
 		panic("ahc_isa_attach: could not map slot I/O addresses");
 	if (!ahc_isa_idstring(iot, ioh, idstring))
@@ -380,23 +367,16 @@ ahc_isa_attach(parent, self, aux)
 
 	if (strcmp(idstring, "ADP7756") == 0) {
 		model = EISA_PRODUCT_ADP7756;
+		chip |= AHC_AIC7770;
 	} else if (strcmp(idstring, "ADP7757") == 0) {
 		model = EISA_PRODUCT_ADP7757;
+		chip |= AHC_AIC7770;
 	} else {
 		panic("ahc_isa_attach: Unknown device type %s", idstring);
 	}
 	printf(": %s\n", model);
-	
-	ahc->channel = 'A';
-	ahc->channel_b = 'B';
-	ahc->chip = AHC_AIC7770;
-	ahc->features = AHC_AIC7770_FE;
-	ahc->bugs |= AHC_TMODE_WIDEODD_BUG;
-	ahc->flags |= AHC_PAGESCBS;
-	
-	/* set tag and handle */
-	ahc->tag = iot;
-	ahc->bsh = ioh;
+
+	ahc_construct(ahc, iot, ioh, chip, AHC_FNONE, AHC_AIC7770_FE, channel);
 
 #ifdef DEBUG
 	/*
@@ -407,14 +387,10 @@ ahc_isa_attach(parent, self, aux)
 	    ahc->pause & IRQMS ?  "Level Sensitive" : "Edge Triggered");
 #endif
 
+	ahc->channel = 'A';
+	ahc->channel_b = 'B';
 	if (ahc_reset(ahc) != 0)
 		return;
-	
-	/* See if we are edge triggered */
-	intdef = ahc_inb(ahc, INTDEF);
-	if ((intdef & EDGE_TRIG) != 0)
-		ahc->flags |= AHC_EDGE_INTERRUPT;
-
 	/*
 	 * Now that we know we own the resources we need, do the 
 	 * card initialization.
@@ -434,10 +410,10 @@ ahc_isa_attach(parent, self, aux)
 		u_char sblkctl;
 		u_char sblkctl_orig;
 
-		sblkctl_orig = ahc_inb(ahc, SBLKCTL);
+		sblkctl_orig = AHC_INB(ahc, SBLKCTL);
 		sblkctl = sblkctl_orig ^ AUTOFLUSHDIS;
-		ahc_outb(ahc, SBLKCTL, sblkctl);
-		sblkctl = ahc_inb(ahc, SBLKCTL);
+		AHC_OUTB(ahc, SBLKCTL, sblkctl);
+		sblkctl = AHC_INB(ahc, SBLKCTL);
 		if(sblkctl != sblkctl_orig)
 		{
 			id_string = "aic7770 >= Rev E, ";
@@ -445,7 +421,7 @@ ahc_isa_attach(parent, self, aux)
 			 * Ensure autoflush is enabled
 			 */
 			sblkctl &= ~AUTOFLUSHDIS;
-			ahc_outb(ahc, SBLKCTL, sblkctl);
+			AHC_OUTB(ahc, SBLKCTL, sblkctl);
 
 			/* Allow paging on this adapter */
 			ahc->flags |= AHC_PAGESCBS;
@@ -458,9 +434,9 @@ ahc_isa_attach(parent, self, aux)
 
 	/* Setup the FIFO threshold and the bus off time */
 	{
-		u_char hostconf = ahc_inb(ahc, HOSTCONF);
-		ahc_outb(ahc, BUSSPD, hostconf & DFTHRSH);
-		ahc_outb(ahc, BUSTIME, (hostconf << 2) & BOFF);
+		u_char hostconf = AHC_INB(ahc, HOSTCONF);
+		AHC_OUTB(ahc, BUSSPD, hostconf & DFTHRSH);
+		AHC_OUTB(ahc, BUSTIME, (hostconf << 2) & BOFF);
 	}
 
 	/*
@@ -470,36 +446,26 @@ ahc_isa_attach(parent, self, aux)
 		ahc_free(ahc);
 		return;
 	}
-	
-	/* Special func to force negotiation */
-	ahc_force_neg(ahc);
-	
-	/*
-	 * Link this softc in with all other ahc instances.
-	 */
-	ahc_softc_insert(ahc);
 
 	/*
 	 * Enable the board's BUS drivers
 	 */
-	ahc_outb(ahc, BCTL, ENABLE);
+	AHC_OUTB(ahc, BCTL, ENABLE);
 
 	/*
 	 * The IRQMS bit enables level sensitive interrupts only allow
 	 * IRQ sharing if its set.
 	 */
-	ahc->platform_data->ih = isa_intr_establish(ia->ia_ic, irq,
-	    ahc->pause & IRQMS ? IST_LEVEL : IST_EDGE, IPL_BIO, ahc_platform_intr,
+	ahc->sc_ih = isa_intr_establish(ia->ia_ic, irq,
+	    ahc->pause & IRQMS ? IST_LEVEL : IST_EDGE, IPL_BIO, ahc_intr,
 	    ahc, ahc->sc_dev.dv_xname);
-	if (ahc->platform_data->ih == NULL) {
+	if (ahc->sc_ih == NULL) {
 		printf("%s: couldn't establish interrupt\n",
 		       ahc->sc_dev.dv_xname);
 		ahc_free(ahc);
 		return;
 	}
 
-	ahc_intr_enable(ahc, TRUE);
-	
 	/* Attach sub-devices - always succeeds */
 	ahc_attach(ahc);
 }
@@ -516,6 +482,8 @@ aha2840_load_seeprom(struct ahc_softc *ahc)
 	u_int8_t  scsi_conf;
 	int	  have_seeprom;
 
+	sd.sd_tag = ahc->sc_iot;
+	sd.sd_bsh = ahc->sc_ioh;
 	sd.sd_control_offset = SEECTL_2840;
 	sd.sd_status_offset = STATUS_2840;
 	sd.sd_dataout_offset = STATUS_2840;		
@@ -529,8 +497,8 @@ aha2840_load_seeprom(struct ahc_softc *ahc)
 
 	if (bootverbose)
 		printf("%s: Reading SEEPROM...", ahc_name(ahc));
-	have_seeprom = read_seeprom(&sd, 
-				    (u_int16_t *)&sc, 
+	have_seeprom = read_seeprom(&sd,
+				    (u_int16_t *)&sc,
 				    /*start_addr*/0,
 				    sizeof(sc)/2);
 
diff --git a/sys/conf/files b/sys/conf/files
index 1640314fffe..16a6d5f56da 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.243 2002/03/14 20:15:00 jason Exp $
+#	$OpenBSD: files,v 1.244 2002/03/19 02:49:20 millert Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -101,8 +101,7 @@ file	dev/ic/wdc.c wdc_base
 # Adaptec 2[789]4X, 394X, aic7770 and aic78[5678]0 SCSI controllers
 device	ahc: scsi
 file	dev/ic/aic7xxx.c	ahc
-file	dev/ic/aic7xxx_openbsd.c	ahc
-file	dev/ic/aic7xxx_93cx6.c	ahc
+file	dev/ic/smc93cx6.c	ahc
 
 # Adaptec AIC-6[23]60 SCSI controllers
 device	aic: scsi
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index 722b5e83a6b..8d95b3e03f6 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_eisa.c,v 1.11 2002/03/14 01:26:53 millert Exp $	*/
+/*	$OpenBSD: ahc_eisa.c,v 1.12 2002/03/19 02:49:20 millert Exp $	*/
 /*	$NetBSD: ahc_eisa.c,v 1.10 1996/10/21 22:30:58 thorpej Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.11 2002/03/14 01:26:53 millert Exp $
+ *	$Id: ahc_eisa.c,v 1.12 2002/03/19 02:49:20 millert Exp $
  */
 
 #include "eisa.h"
@@ -51,16 +51,26 @@
 #include <dev/eisa/eisareg.h>
 #include <dev/eisa/eisavar.h>
 #include <dev/eisa/eisadevs.h>
-#include <dev/ic/aic7xxx_openbsd.h>
-#include <dev/ic/aic7xxx_inline.h>
 #include <dev/ic/aic7xxxreg.h>
+#include <dev/ic/aic7xxxvar.h>
 
 #define AHC_EISA_SLOT_OFFSET	0xc00
 #define AHC_EISA_IOSIZE		0x100
+#define INTDEF			0x5cul	/* Interrupt Definition Register */
 
-int   ahc_eisa_irq(bus_space_tag_t, bus_space_handle_t);
-int   ahc_eisa_match(struct device *, void *, void *);
-void  ahc_eisa_attach(struct device *, struct device *, void *);
+/*
+ * Under normal circumstances, these messages are unnecessary
+ * and not terribly cosmetic.
+ */
+#ifdef DEBUG
+#define bootverbose	1
+#else
+#define bootverbose	1
+#endif
+
+int   ahc_eisa_irq __P((bus_space_tag_t, bus_space_handle_t));
+int   ahc_eisa_match __P((struct device *, void *, void *));
+void  ahc_eisa_attach __P((struct device *, struct device *, void *));
 
 
 struct cfattach ahc_eisa_ca = {
@@ -84,7 +94,7 @@ bus_space_handle_t ioh;
 	bus_space_write_1(iot, ioh, HCNTRL, hcntrl | PAUSE);
 	
 	intdef = bus_space_read_1(iot, ioh, INTDEF);
-	switch (irq = (intdef & VECTOR)) {
+	switch (irq = (intdef & 0xf)) {
 	case 9:
 	case 10:
 	case 11:
@@ -142,6 +152,8 @@ ahc_eisa_attach(parent, self, aux)
 struct device *parent, *self;
 void *aux;
 {
+	ahc_chip chip;
+	u_char channel = 'A'; /* Only one channel */
 	struct ahc_softc *ahc = (void *)self;
 	struct eisa_attach_args *ea = aux;
 	bus_space_tag_t iot = ea->ea_iot;
@@ -153,23 +165,8 @@ void *aux;
 	u_int biosctrl;
 	u_int scsiconf;
 	u_int scsiconf1;
-	u_int intdef;
 	
-	/* 
-	 * We really don't allocate our softc, but 
-	 * we need to do the initialization. And this 
-	 * also allocates the platform_data structure.
-	 */
-	ahc_alloc(ahc, ahc->sc_dev.dv_xname);
-	
-	ahc_set_name(ahc, ahc->sc_dev.dv_xname);
-	ahc_set_unit(ahc, ahc->sc_dev.dv_unit);
-	
-	/* set dma tags */
-	ahc->parent_dmat = ea->ea_dmat;
-	ahc->buffer_dmat = ea->ea_dmat;
-        ahc->shared_data_dmat = ea->ea_dmat;
-
+	ahc->sc_dmat = ea->ea_dmat;
 	if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) +
 			  AHC_EISA_SLOT_OFFSET, AHC_EISA_IOSIZE, 0, &ioh))
 		panic("ahc_eisa_attach: could not map I/O addresses");
@@ -178,29 +175,23 @@ void *aux;
 
 	if (strcmp(ea->ea_idstring, "ADP7770") == 0) {
 		model = EISA_PRODUCT_ADP7770;
+		chip = AHC_AIC7770|AHC_EISA;
 	} else if (strcmp(ea->ea_idstring, "ADP7771") == 0) {
 		model = EISA_PRODUCT_ADP7771;
+		chip = AHC_AIC7770|AHC_EISA;
 	} else {
 		panic("ahc_eisa_attach: Unknown device type %s",
 				ea->ea_idstring);
 	}
 	printf(": %s\n", model);
+
+	ahc_construct(ahc, iot, ioh, chip, AHC_FNONE, AHC_AIC7770_FE, channel);
 	
 	ahc->channel = 'A';
 	ahc->channel_b = 'B';
-	ahc->chip = AHC_AIC7770|AHC_EISA;
-	ahc->features = AHC_AIC7770_FE;
-	ahc->bugs |= AHC_TMODE_WIDEODD_BUG;
-	ahc->flags |= AHC_PAGESCBS;
-	
 	if (ahc_reset(ahc) != 0)
 		return;
 	
-	/* See if we are edge triggered */
-	intdef = ahc_inb(ahc, INTDEF);
-	if ((intdef & EDGE_TRIG) != 0)
-		ahc->flags |= AHC_EDGE_INTERRUPT;
-	
 	if (eisa_intr_map(ec, irq, &ih)) {
 		printf("%s: couldn't map interrupt (%d)\n",
 		       ahc->sc_dev.dv_xname, irq);
@@ -230,7 +221,7 @@ void *aux;
 	
 	/* Get the primary channel information */
 	if ((biosctrl & CHANNEL_B_PRIMARY) != 0)
-		ahc->platform_data->channel_b_primary = TRUE;
+		ahc->flags |= AHC_CHANNEL_B_PRIMARY;
 
 	if ((biosctrl & BIOSMODE) == BIOSDISABLED) {
 		ahc->flags |= AHC_USEDEFAULTS;
@@ -266,17 +257,17 @@ void *aux;
 		u_char sblkctl;
 		u_char sblkctl_orig;
 
-		sblkctl_orig = ahc_inb(ahc, SBLKCTL);
+		sblkctl_orig = AHC_INB(ahc, SBLKCTL);
 		sblkctl = sblkctl_orig ^ AUTOFLUSHDIS;
-		ahc_outb(ahc, SBLKCTL, sblkctl);
-		sblkctl = ahc_inb(ahc, SBLKCTL);
+		AHC_OUTB(ahc, SBLKCTL, sblkctl);
+		sblkctl = AHC_INB(ahc, SBLKCTL);
 		if (sblkctl != sblkctl_orig) {
 			id_string = "aic7770 >= Rev E, ";
 			/*
 			 * Ensure autoflush is enabled
 			 */
 			sblkctl &= ~AUTOFLUSHDIS;
-			ahc_outb(ahc, SBLKCTL, sblkctl);
+			AHC_OUTB(ahc, SBLKCTL, sblkctl);
 
 			/* Allow paging on this adapter */
 			ahc->flags |= AHC_PAGESCBS;
@@ -288,9 +279,9 @@ void *aux;
 
 	/* Setup the FIFO threshold and the bus off time */
 	{
-		u_char hostconf = ahc_inb(ahc, HOSTCONF);
-		ahc_outb(ahc, BUSSPD, hostconf & DFTHRSH);
-		ahc_outb(ahc, BUSTIME, (hostconf << 2) & BOFF);
+		u_char hostconf = AHC_INB(ahc, HOSTCONF);
+		AHC_OUTB(ahc, BUSSPD, hostconf & DFTHRSH);
+		AHC_OUTB(ahc, BUSTIME, (hostconf << 2) & BOFF);
 	}
 
 	/*
@@ -301,29 +292,21 @@ void *aux;
 		return;
 	}
  
-       	/* Special func to force negotiation */
-	ahc_force_neg(ahc);
-
-	/*
-	 * Link this softc in with all other ahc instances.
-	 */
-	ahc_softc_insert(ahc);
-	
 	/*
 	 * Enable the board's BUS drivers
 	 */
-	ahc_outb(ahc, BCTL, ENABLE);
+	AHC_OUTB(ahc, BCTL, ENABLE);
 
 	intrstr = eisa_intr_string(ec, ih);
 	/*
 	 * The IRQMS bit enables level sensitive interrupts only allow
 	 * IRQ sharing if its set.
 	 */
-	ahc->platform_data->ih = eisa_intr_establish(ec, ih, ahc->pause & IRQMS
+	ahc->sc_ih = eisa_intr_establish(ec, ih, ahc->pause & IRQMS
 					 ? IST_LEVEL : IST_EDGE,
-					 IPL_BIO, ahc_platform_intr, ahc,
+					 IPL_BIO, ahc_intr, ahc,
 					 ahc->sc_dev.dv_xname);
-	if (ahc->platform_data->ih == NULL) {
+	if (ahc->sc_ih == NULL) {
 		printf("%s: couldn't establish interrupt",
 		       ahc->sc_dev.dv_xname);
 		if (intrstr != NULL)
@@ -335,8 +318,6 @@ void *aux;
 	if (intrstr != NULL)
 		printf("%s: interrupting at %s\n", ahc->sc_dev.dv_xname,
 		       intrstr);
-	
-	ahc_intr_enable(ahc, TRUE);
 
 	/* Attach sub-devices - always succeeds */
 	ahc_attach(ahc);
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 54b867c6515..e5e0f8b171d 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,7 +1,11 @@
 /*
- * Core routines and tables shareable across OS platforms.
+ * Generic driver for the aic7xxx based adaptec SCSI controllers
+ * Product specific probe and attach routines can be found in:
+ * i386/eisa/ahc_eisa.c	27/284X and aic7770 motherboard controllers
+ * pci/ahc_pci.c	3985, 3980, 3940, 2940, aic7895, aic7890,
+ *			aic7880, aic7870, aic7860, and aic7850 controllers
  *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
+ * Copyright (c) 1994, 1995, 1996, 1997, 1998, 1999, 2000 Justin T. Gibbs.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +18,7 @@
  *    derived from this software without specific prior written permission.
  *
  * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
+ * the GNU Public License ("GPL").
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -28,53 +32,787 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aic7xxx.c,v 1.35 2002/02/16 04:36:33 smurph Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.40 2000/01/07 23:08:17 gibbs Exp $
+ * $OpenBSD: aic7xxx.c,v 1.36 2002/03/19 02:49:20 millert Exp $
+ */
+/*
+ * A few notes on features of the driver.
+ *
+ * SCB paging takes advantage of the fact that devices stay disconnected
+ * from the bus a relatively long time and that while they're disconnected,
+ * having the SCBs for these transactions down on the host adapter is of
+ * little use.  Instead of leaving this idle SCB down on the card we copy
+ * it back up into kernel memory and reuse the SCB slot on the card to
+ * schedule another transaction.  This can be a real payoff when doing random
+ * I/O to tagged queueing devices since there are more transactions active at
+ * once for the device to sort for optimal seek reduction. The algorithm goes
+ * like this...
+ *
+ * The sequencer maintains two lists of its hardware SCBs.  The first is the
+ * singly linked free list which tracks all SCBs that are not currently in
+ * use.  The second is the doubly linked disconnected list which holds the
+ * SCBs of transactions that are in the disconnected state sorted most
+ * recently disconnected first.  When the kernel queues a transaction to
+ * the card, a hardware SCB to "house" this transaction is retrieved from
+ * either of these two lists.  If the SCB came from the disconnected list,
+ * a check is made to see if any data transfer or SCB linking (more on linking
+ * in a bit) information has been changed since it was copied from the host
+ * and if so, DMAs the SCB back up before it can be used.  Once a hardware
+ * SCB has been obtained, the SCB is DMAed from the host.  Before any work
+ * can begin on this SCB, the sequencer must ensure that either the SCB is
+ * for a tagged transaction or the target is not already working on another
+ * non-tagged transaction.  If a conflict arises in the non-tagged case, the
+ * sequencer finds the SCB for the active transactions and sets the SCB_LINKED
+ * field in that SCB to this next SCB to execute.  To facilitate finding
+ * active non-tagged SCBs, the last four bytes of up to the first four hardware
+ * SCBs serve as a storage area for the currently active SCB ID for each
+ * target.
+ *
+ * When a device reconnects, a search is made of the hardware SCBs to find
+ * the SCB for this transaction.  If the search fails, a hardware SCB is
+ * pulled from either the free or disconnected SCB list and the proper
+ * SCB is DMAed from the host.  If the MK_MESSAGE control bit is set
+ * in the control byte of the SCB while it was disconnected, the sequencer
+ * will assert ATN and attempt to issue a message to the host.
+ *
+ * When a command completes, a check for non-zero status and residuals is
+ * made.  If either of these conditions exists, the SCB is DMAed back up to
+ * the host so that it can interpret this information.  Additionally, in the
+ * case of bad status, the sequencer generates a special interrupt and pauses
+ * itself.  This allows the host to setup a request sense command if it 
+ * chooses for this target synchronously with the error so that sense
+ * information isn't lost.
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.80 2001/12/16 17:38:30 gibbs Exp $
  */
 
-#ifdef __OpenBSD__
-#include <dev/ic/aic7xxx_openbsd.h>
-#include <dev/ic/aic7xxx_inline.h>
-#include <dev/microcode/aic7xxx/aicasm_insformat.h>
-#endif 
-#ifdef __FreeBSD__
-#include <dev/aic7xxx/aic7xxx_freebsd.h>
-#include <dev/aic7xxx/aic7xxx_inline.h>
-#include <dev/aic7xxx/aicasm/aicasm_insformat.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <sys/malloc.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+
+#include <scsi/scsi_all.h>
+#include <scsi/scsi_message.h>
+#include <scsi/scsi_debug.h>
+#include <scsi/scsiconf.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <dev/ic/aic7xxxreg.h>
+#include <dev/ic/aic7xxxvar.h>
+#include <dev/microcode/aic7xxx/aic7xxx_seq.h>
+#include <dev/microcode/aic7xxx/sequencer.h>
+#include "pci.h"
+
+/*
+ * Some ISA devices (e.g. on a VLB) can perform 32-bit DMA.  This
+ * flag is passed to bus_dmamap_create() to indicate that fact.
+ */
+#ifndef ISABUS_DMA_32BIT
+#define ISABUS_DMA_32BIT	BUS_DMA_BUS1
 #endif 
-/****************************** Softc Data ************************************/
-struct ahc_softc_tailq ahc_tailq = TAILQ_HEAD_INITIALIZER(ahc_tailq);
 
-/***************************** Lookup Tables **********************************/
-char *ahc_chip_names[] =
+#ifndef AHC_TMODE_ENABLE
+#define AHC_TMODE_ENABLE 0
+#endif
+#include <sys/kernel.h>
+
+#ifndef le32toh
+#define le32toh	letoh32  /* to match Free/Net macros */
+#endif
+
+#define	IS_SCSIBUS_B(ahc, sc_link)	\
+	((sc_link)->scsibus == (ahc)->sc_link_b.scsibus)
+#define ALL_CHANNELS '\0'
+#define ALL_TARGETS_MASK 0xFFFF
+#define INITIATOR_WILDCARD	(~0)
+
+#define	SIM_IS_SCSIBUS_B(ahc, sc_link)	\
+	((sc_link)->scsibus == (ahc)->sc_link_b.scsibus)
+#define	SIM_CHANNEL(ahc, sc_link)	\
+	(SIM_IS_SCSIBUS_B(ahc, sc_link) ? 'B' : 'A')
+#define	SIM_SCSI_ID(ahc, sc_link)	\
+	(SIM_IS_SCSIBUS_B(ahc, sc_link) ? ahc->our_id_b : ahc->our_id)
+#define	SCB_IS_SCSIBUS_B(scb)	\
+	(((scb)->hscb->tcl & SELBUSB) != 0)
+#define	SCB_TARGET(scb)	\
+	(((scb)->hscb->tcl & TID) >> 4)
+#define	SCB_CHANNEL(scb) \
+	(SCB_IS_SCSIBUS_B(scb) ? 'B' : 'A')
+#define	SCB_LUN(scb)	\
+	((scb)->hscb->tcl & LID)
+#define SCB_TARGET_OFFSET(scb)		\
+	(SCB_TARGET(scb) + (SCB_IS_SCSIBUS_B(scb) ? 8 : 0))
+#define SCB_TARGET_MASK(scb)		\
+	(0x01 << (SCB_TARGET_OFFSET(scb)))
+#define TCL_CHANNEL(ahc, tcl)		\
+	((((ahc)->features & AHC_TWIN) && ((tcl) & SELBUSB)) ? 'B' : 'A')
+#define TCL_SCSI_ID(ahc, tcl)		\
+	(TCL_CHANNEL((ahc), (tcl)) == 'B' ? (ahc)->our_id_b : (ahc)->our_id)
+#define TCL_TARGET(tcl) (((tcl) & TID) >> TCL_TARGET_SHIFT)
+#define TCL_LUN(tcl) ((tcl) & LID)
+
+#define XS_TCL(ahc, xs) \
+	((((xs)->sc_link->target << 4) & 0xF0) \
+	| (SIM_IS_SCSIBUS_B((ahc), (xs)->sc_link) ? SELBUSB : 0) \
+	| ((xs)->sc_link->lun & 0x07))
+
+/*
+ * Under normal circumstances, these messages are unnecessary
+ * and not terribly cosmetic.
+ */
+#ifdef DEBUG
+#define bootverbose	1
+#define STATIC
+#define INLINE
+#else
+#define bootverbose	0
+#define STATIC	static
+#define INLINE __inline
+#endif
+
+typedef enum {
+	ROLE_UNKNOWN,
+	ROLE_INITIATOR,
+	ROLE_TARGET
+} role_t;
+
+struct ahc_devinfo {
+	int	  our_scsiid;
+	int	  target_offset;
+	u_int16_t target_mask;
+	u_int8_t  target;
+	u_int8_t  lun;
+	char	  channel;
+	role_t	  role;		/*
+				 * Only guaranteed to be correct if not
+				 * in the busfree state.
+				 */
+};
+
+typedef enum {
+	SEARCH_COMPLETE,
+	SEARCH_COUNT,
+	SEARCH_REMOVE
+} ahc_search_action;
+
+#ifdef AHC_DEBUG
+static int     ahc_debug = AHC_DEBUG;
+#endif
+
+#if NPCI > 0
+void ahc_pci_intr(struct ahc_softc *ahc);
+#endif
+
+STATIC int	ahcinitscbdata(struct ahc_softc *ahc);
+STATIC void	ahcfiniscbdata(struct ahc_softc *ahc);
+
+STATIC int	ahc_poll __P((struct ahc_softc *ahc, int wait));
+STATIC void	ahc_shutdown __P((void *arg));
+STATIC int	ahc_execute_scb __P((void *arg, bus_dma_segment_t *dm_segs,
+				     int nsegments));
+STATIC int	ahc_setup_data __P((struct ahc_softc *ahc,
+				    struct scsi_xfer *xs, struct scb *scb));
+STATIC void	ahc_freeze_devq __P((struct ahc_softc *ahc,
+				     struct scsi_link *sc_link));
+STATIC void	ahcallocscbs __P((struct ahc_softc *ahc));
+STATIC void	ahc_fetch_devinfo __P((struct ahc_softc *ahc,
+				       struct ahc_devinfo *devinfo));
+STATIC void	ahc_compile_devinfo __P((struct ahc_devinfo *devinfo,
+					 u_int our_id, u_int target,
+					 u_int lun, char channel,
+					 role_t role));
+STATIC u_int	ahc_abort_wscb __P((struct ahc_softc *ahc,
+				    u_int scbpos, u_int prev));
+STATIC void	ahc_done __P((struct ahc_softc *ahc, struct scb *scbp));
+STATIC struct tmode_tstate *
+		ahc_alloc_tstate __P((struct ahc_softc *ahc, u_int scsi_id,
+				      char channel));
+STATIC void	ahc_handle_seqint __P((struct ahc_softc *ahc, u_int intstat));
+STATIC void	ahc_handle_scsiint __P((struct ahc_softc *ahc, u_int intstat));
+STATIC void	ahc_build_transfer_msg __P((struct ahc_softc *ahc,
+					    struct ahc_devinfo *devinfo));
+STATIC void	ahc_setup_initiator_msgout __P((struct ahc_softc *ahc,
+						struct ahc_devinfo *devinfo,
+						struct scb *scb));
+STATIC void	ahc_setup_target_msgin __P((struct ahc_softc *ahc,
+					    struct ahc_devinfo *devinfo));
+STATIC int	ahc_handle_msg_reject __P((struct ahc_softc *ahc,
+					   struct ahc_devinfo *devinfo));
+STATIC void	ahc_clear_msg_state __P((struct ahc_softc *ahc));
+STATIC void	ahc_handle_message_phase __P((struct ahc_softc *ahc,
+					      struct scsi_link *sc_link));
+STATIC int	ahc_sent_msg __P((struct ahc_softc *ahc, u_int msgtype,
+				  int full));
+
+typedef enum {
+	MSGLOOP_IN_PROG,
+	MSGLOOP_MSGCOMPLETE,
+	MSGLOOP_TERMINATED
+} msg_loop_stat;
+
+STATIC int	ahc_parse_msg __P((struct ahc_softc *ahc,
+				   struct scsi_link *sc_link,
+				   struct ahc_devinfo *devinfo));
+STATIC void	ahc_handle_ign_wide_residue __P((struct ahc_softc *ahc,
+						 struct ahc_devinfo *devinfo));
+STATIC void	ahc_handle_devreset __P((struct ahc_softc *ahc,
+					 struct ahc_devinfo *devinfo,
+					 int status, char *message,
+					 int verbose_level));
+#ifdef AHC_DUMP_SEQ
+STATIC void	ahc_dumpseq __P((struct ahc_softc *ahc));
+#endif
+STATIC void	ahc_loadseq __P((struct ahc_softc *ahc));
+STATIC int	ahc_check_patch __P((struct ahc_softc *ahc,
+				     struct patch **start_patch,
+				     int start_instr, int *skip_addr));
+STATIC void	ahc_download_instr __P((struct ahc_softc *ahc,
+					int instrptr, u_int8_t *dconsts));
+STATIC int	ahc_match_scb __P((struct scb *scb, int target, char channel,
+				   int lun, u_int tag, role_t role));
+#ifdef AHC_DEBUG
+STATIC void	ahc_print_scb __P((struct scb *scb));
+#endif
+STATIC int	ahc_search_qinfifo __P((struct ahc_softc *ahc, int target,
+					char channel, int lun, u_int tag,
+					role_t role, u_int32_t status,
+					ahc_search_action action));
+STATIC int	ahc_reset_channel __P((struct ahc_softc *ahc, char channel,
+				       int initiate_reset));
+STATIC int	ahc_abort_scbs __P((struct ahc_softc *ahc, int target,
+				    char channel, int lun, u_int tag,
+				    role_t role, u_int32_t status));
+STATIC int	ahc_search_disc_list __P((struct ahc_softc *ahc, int target,
+					  char channel, int lun, u_int tag,
+					  int stop_on_first, int remove,
+					  int save_state));
+STATIC u_int	ahc_rem_scb_from_disc_list __P((struct ahc_softc *ahc,
+						u_int prev, u_int scbptr));
+STATIC void	ahc_add_curscb_to_free_list __P((struct ahc_softc *ahc));
+STATIC void	ahc_clear_intstat __P((struct ahc_softc *ahc));
+STATIC void	ahc_reset_current_bus __P((struct ahc_softc *ahc));
+STATIC struct ahc_syncrate *
+		ahc_devlimited_syncrate __P((struct ahc_softc *ahc, u_int *period));
+STATIC struct ahc_syncrate *
+		ahc_find_syncrate __P((struct ahc_softc *ahc, u_int *period,
+				       u_int maxsync));
+STATIC u_int ahc_find_period __P((struct ahc_softc *ahc, u_int scsirate,
+				  u_int maxsync));
+STATIC void	ahc_validate_offset __P((struct ahc_softc *ahc,
+					 struct ahc_syncrate *syncrate,
+					 u_int *offset, int wide)); 
+STATIC void	ahc_update_target_msg_request __P((struct ahc_softc *ahc,
+					      struct ahc_devinfo *devinfo,
+					      struct ahc_initiator_tinfo *tinfo,
+					      int force, int paused));
+STATIC void	ahc_set_syncrate __P((struct ahc_softc *ahc,
+				      struct ahc_devinfo *devinfo,
+				      struct ahc_syncrate *syncrate,
+				      u_int period, u_int offset,
+				      u_int type, int paused, int done));
+STATIC void	ahc_set_width __P((struct ahc_softc *ahc,
+			      struct ahc_devinfo *devinfo,
+			      u_int width, u_int type, int paused, int done));
+STATIC void	ahc_set_tags __P((struct ahc_softc *ahc,
+				  struct ahc_devinfo *devinfo,int enable));
+STATIC int      ahc_istagged_device __P((struct ahc_softc *ahc,
+					 struct scsi_xfer *xs,
+					 int nocmdcheck));
+STATIC void     ahc_check_tags __P((struct ahc_softc *ahc,
+				    struct scsi_xfer *xs));
+STATIC void	ahc_construct_sdtr __P((struct ahc_softc *ahc,
+				   u_int period, u_int offset));
+STATIC void	ahc_construct_wdtr __P((struct ahc_softc *ahc, u_int bus_width));
+
+STATIC void	ahc_calc_residual __P((struct scb *scb));
+
+STATIC void	ahc_update_pending_syncrates __P((struct ahc_softc *ahc));
+
+STATIC void	ahc_set_recoveryscb __P((struct ahc_softc *ahc,
+					 struct scb *scb));
+STATIC void ahc_timeout __P((void *));
+
+static __inline int  sequencer_paused __P((struct ahc_softc *ahc));
+static __inline void pause_sequencer __P((struct ahc_softc *ahc));
+static __inline void unpause_sequencer __P((struct ahc_softc *ahc));
+STATIC void restart_sequencer __P((struct ahc_softc *ahc));
+static __inline u_int ahc_index_busy_tcl __P((struct ahc_softc *ahc,
+					      u_int tcl, int unbusy));
+ 
+static __inline void	ahc_busy_tcl __P((struct ahc_softc *ahc,
+					  struct scb *scb));
+static __inline int	ahc_isbusy_tcl __P((struct ahc_softc *ahc,
+					    struct scb *scb));
+static __inline void ahc_freeze_ccb __P((struct scb* scb));
+static __inline void ahcsetccbstatus __P((struct scsi_xfer *xs, int status));
+STATIC void ahc_run_qoutfifo __P((struct ahc_softc *ahc));
+
+static __inline struct ahc_initiator_tinfo *
+	ahc_fetch_transinfo __P((struct ahc_softc *ahc, char channel,
+				 u_int our_id, u_int target,
+				 struct tmode_tstate **tstate));
+STATIC void ahcfreescb __P((struct ahc_softc *ahc, struct scb *scb));
+static __inline struct scb *ahcgetscb __P((struct ahc_softc *ahc));
+int    ahc_createdmamem __P((struct ahc_softc *ahc, int size,
+			     bus_dmamap_t *mapp, caddr_t *vaddr,
+			     bus_addr_t *baddr, bus_dma_segment_t *segs,
+			     int *nseg, const char *what));
+STATIC void ahc_freedmamem __P((bus_dma_tag_t tag, int size,
+				bus_dmamap_t map, caddr_t vaddr,
+				bus_dma_segment_t *seg, int nseg));
+STATIC void ahcminphys __P((struct buf *bp));
+
+STATIC INLINE	struct scsi_xfer *ahc_first_xs __P((struct ahc_softc *));
+STATIC INLINE	void   ahc_list_insert_before __P((struct ahc_softc *ahc,
+						   struct scsi_xfer *xs,
+						   struct scsi_xfer *next_xs));
+STATIC INLINE	void   ahc_list_insert_head __P((struct ahc_softc *ahc,
+						 struct scsi_xfer *xs));
+STATIC INLINE	void   ahc_list_insert_tail __P((struct ahc_softc *ahc,
+						 struct scsi_xfer *xs));
+STATIC INLINE	void   ahc_list_remove __P((struct ahc_softc *ahc,
+					    struct scsi_xfer *xs));
+STATIC INLINE	struct scsi_xfer *ahc_list_next __P((struct ahc_softc *ahc,
+						     struct scsi_xfer *xs));
+STATIC int32_t ahc_scsi_cmd __P((struct scsi_xfer *xs));
+static __inline void ahc_swap_hscb __P((struct hardware_scb *));
+static __inline void ahc_swap_sg __P((struct ahc_dma_seg *));
+
+struct cfdriver ahc_cd = {
+	NULL, "ahc", DV_DULL
+};
+
+static struct scsi_adapter ahc_switch =
 {
-	"NONE",
-	"aic7770",
-	"aic7850",
-	"aic7855",
-	"aic7859",
-	"aic7860",
-	"aic7870",
-	"aic7880",
-	"aic7895",
-	"aic7895C",
-	"aic7890/91",
-	"aic7896/97",
-	"aic7892",
-	"aic7899"
+	ahc_scsi_cmd,
+	ahcminphys,
+	0,
+	0,
 };
-static const u_int num_chip_names = NUM_ELEMENTS(ahc_chip_names);
 
+/* the below structure is so we have a default dev struct for our link struct */
+static struct scsi_device ahc_dev =
+{
+	NULL, /* Use default error handler */
+	NULL, /* have a queue, served by this */
+	NULL, /* have no async handler */
+	NULL, /* Use default 'done' routine */
+};
+
+static __inline void
+ahc_swap_hscb(struct hardware_scb *hscb)
+{
+	hscb->SG_pointer = htole32(hscb->SG_pointer);
+	hscb->data = htole32(hscb->data);
+	hscb->datalen = htole32(hscb->datalen);
+	/*
+	 * No need to swap cmdpointer; it's either 0 or set to
+	 * cmdstore_busaddr, which is already swapped.
+	 */
+}
+
+static __inline void
+ahc_swap_sg(struct ahc_dma_seg *sg)
+{
+	sg->addr = htole32(sg->addr);
+	sg->len = htole32(sg->len);
+}
+
+STATIC void
+ahcminphys(bp)
+	struct buf *bp;
+{
 /*
- * Hardware error codes.
+ * Even though the card can transfer up to 16megs per command
+ * we are limited by the number of segments in the dma segment
+ * list that we can hold.  The worst case is that all pages are
+ * discontinuous physically, hense the "page per segment" limit
+ * enforced here.
  */
-struct ahc_hard_error_entry {
-        uint8_t errno;
-	char *errmesg;
-};
+	if (bp->b_bcount > ((AHC_NSEG - 1) * PAGE_SIZE)) {
+		bp->b_bcount = ((AHC_NSEG - 1) * PAGE_SIZE);
+	}
+	minphys(bp);
+}
+
+
+static __inline u_int32_t
+ahc_hscb_busaddr(struct ahc_softc *ahc, u_int index)
+{
+	return (ahc->scb_data->hscb_busaddr
+		+ (sizeof(struct hardware_scb) * index));
+}
+
+#define AHC_BUSRESET_DELAY	25	/* Reset delay in us */
+
+static __inline int
+sequencer_paused(ahc)
+	struct ahc_softc *ahc;
+{
+	return ((ahc_inb(ahc, HCNTRL) & PAUSE) != 0);
+}
+
+static __inline void
+pause_sequencer(ahc)
+	struct ahc_softc *ahc;
+{
+	ahc_outb(ahc, HCNTRL, ahc->pause);
+
+	/*
+	 * Since the sequencer can disable pausing in a critical section, we
+	 * must loop until it actually stops.
+	 */
+	while (sequencer_paused(ahc) == 0)
+		;
+}
+
+static __inline void
+unpause_sequencer(ahc)
+	struct ahc_softc *ahc;
+{
+	if ((ahc_inb(ahc, INTSTAT) & (SCSIINT | SEQINT | BRKADRINT)) == 0)
+		ahc_outb(ahc, HCNTRL, ahc->unpause);
+}
+
+/*
+ * Restart the sequencer program from address zero
+ */
+STATIC void
+restart_sequencer(ahc)
+	struct ahc_softc *ahc;
+{
+	u_int i;
 
-static struct ahc_hard_error_entry ahc_hard_errors[] = {
+	pause_sequencer(ahc);
+
+	/*
+	 * Everytime we restart the sequencer, there
+	 * is the possiblitity that we have restarted
+	 * within a three instruction window where an
+	 * SCB has been marked free but has not made it
+	 * onto the free list.  Since SCSI events(bus reset,
+	 * unexpected bus free) will always freeze the
+	 * sequencer, we cannot close this window.  To
+	 * avoid losing an SCB, we reconsitute the free
+	 * list every time we restart the sequencer.
+	 */
+	ahc_outb(ahc, FREE_SCBH, SCB_LIST_NULL);
+	for (i = 0; i < ahc->scb_data->maxhscbs; i++) {
+		
+		ahc_outb(ahc, SCBPTR, i);
+		if (ahc_inb(ahc, SCB_TAG) == SCB_LIST_NULL)
+			ahc_add_curscb_to_free_list(ahc);
+	}
+	ahc_outb(ahc, SEQCTL, FASTMODE|SEQRESET);
+	unpause_sequencer(ahc);
+}
+
+static __inline u_int
+ahc_index_busy_tcl(ahc, tcl, unbusy)
+	struct ahc_softc *ahc;
+	u_int tcl;
+	int unbusy;
+{
+	u_int scbid;
+
+	scbid = ahc->untagged_scbs[tcl];
+	if (unbusy) {
+		ahc->untagged_scbs[tcl] = SCB_LIST_NULL;
+		bus_dmamap_sync(ahc->sc_dmat, ahc->shared_data_dmamap,
+		    UNTAGGEDSCB_OFFSET * 256, 256, BUS_DMASYNC_PREWRITE);
+	}
+
+	return (scbid);
+}
+
+static __inline void
+ahc_busy_tcl(ahc, scb)
+	struct ahc_softc *ahc;
+	struct scb *scb;
+{
+	ahc->untagged_scbs[scb->hscb->tcl] = scb->hscb->tag;
+	bus_dmamap_sync(ahc->sc_dmat, ahc->shared_data_dmamap, 
+	    UNTAGGEDSCB_OFFSET * 256, 256, BUS_DMASYNC_PREWRITE);
+}
+
+static __inline int
+ahc_isbusy_tcl(ahc, scb)
+	struct ahc_softc *ahc;
+	struct scb *scb;
+{
+	return ahc->untagged_scbs[scb->hscb->tcl] != SCB_LIST_NULL;
+}
+
+static __inline void
+ahc_freeze_ccb(scb)
+	struct scb *scb;
+{
+	struct scsi_xfer *xs = scb->xs;
+	struct ahc_softc *ahc = (struct ahc_softc *)xs->sc_link->adapter_softc;
+	int target;
+
+	target = xs->sc_link->target;
+	if (!(scb->flags & SCB_FREEZE_QUEUE)) {
+		ahc->devqueue_blocked[target]++;
+		scb->flags |= SCB_FREEZE_QUEUE;
+	}
+}
+
+static __inline void
+ahcsetccbstatus(xs, status)
+	struct scsi_xfer *xs;
+	int status;
+{
+	xs->error = status;
+}
+
+static __inline struct ahc_initiator_tinfo *
+ahc_fetch_transinfo(ahc, channel, our_id, remote_id, tstate)
+	struct ahc_softc *ahc;
+	char channel;
+	u_int our_id;
+	u_int remote_id;
+	struct tmode_tstate **tstate;
+{
+	/*
+	 * Transfer data structures are stored from the perspective
+	 * of the target role.  Since the parameters for a connection
+	 * in the initiator role to a given target are the same as
+	 * when the roles are reversed, we pretend we are the target.
+	 */
+	if (channel == 'B')
+		our_id += 8;
+	*tstate = ahc->enabled_targets[our_id];
+	return (&(*tstate)->transinfo[remote_id]);
+}
+
+STATIC void
+ahc_run_qoutfifo(ahc)
+	struct ahc_softc *ahc;
+{
+	struct scb *scb;
+	u_int  scb_index;
+
+	bus_dmamap_sync(ahc->sc_dmat, ahc->shared_data_dmamap, 
+	    0, 256, BUS_DMASYNC_POSTREAD);
+
+	while (ahc->qoutfifo[ahc->qoutfifonext] != SCB_LIST_NULL) {
+		scb_index = ahc->qoutfifo[ahc->qoutfifonext];
+		ahc->qoutfifo[ahc->qoutfifonext++] = SCB_LIST_NULL;
+
+		scb = &ahc->scb_data->scbarray[scb_index];
+		if (scb_index >= ahc->scb_data->numscbs
+		  || (scb->flags & SCB_ACTIVE) == 0) {
+			printf("%s: WARNING no command for scb %d "
+			       "(cmdcmplt)\nQOUTPOS = %d\n",
+			       ahc_name(ahc), scb_index,
+			       ahc->qoutfifonext - 1);
+			continue;
+		}
+
+		/*
+		 * Save off the residual
+		 * if there is one.
+		 */
+		if (scb->hscb->residual_SG_count != 0)
+			ahc_calc_residual(scb);
+		else
+			scb->xs->resid = 0;
+		ahc_done(ahc, scb);
+	}
+}
+
+
+/*
+ * An scb (and hence an scb entry on the board) is put onto the
+ * free list.
+ */
+STATIC void
+ahcfreescb(ahc, scb)
+	struct ahc_softc *ahc;
+	struct scb *scb;
+{       
+	struct hardware_scb *hscb;
+	int opri;
+
+	hscb = scb->hscb;
+
+#ifdef AHC_DEBUG
+	if (ahc_debug & AHC_SHOWSCBS)
+		printf("%s: free SCB tag %x\n", ahc_name(ahc), hscb->tag);
+#endif
+
+	opri = splbio();
+
+	if ((ahc->flags & AHC_RESOURCE_SHORTAGE) != 0 ||
+	    (scb->flags & SCB_RECOVERY_SCB) != 0) {
+		ahc->flags &= ~AHC_RESOURCE_SHORTAGE;
+		ahc->queue_blocked = 0;
+	}
+
+	/* Clean up for the next user */
+	scb->flags = SCB_FREE;
+	hscb->control = 0;
+	hscb->status = 0;
+	timeout_del(&scb->xs->stimeout);
+
+	SLIST_INSERT_HEAD(&ahc->scb_data->free_scbs, scb, links);
+
+	splx(opri);
+}
+
+/*
+ * Get a free scb, either one already assigned to a hardware slot
+ * on the adapter or one that will require an SCB to be paged out before
+ * use. If there are none, see if we can allocate a new SCB.  Otherwise
+ * either return an error or sleep.
+ */
+static __inline struct scb *
+ahcgetscb(ahc)
+	struct ahc_softc *ahc;
+{
+	struct scb *scbp;
+	int opri;
+
+	opri = splbio();
+	if ((scbp = SLIST_FIRST(&ahc->scb_data->free_scbs))) {
+		SLIST_REMOVE_HEAD(&ahc->scb_data->free_scbs, links);
+	} else {
+		ahcallocscbs(ahc);
+		scbp = SLIST_FIRST(&ahc->scb_data->free_scbs);
+		if (scbp != NULL)
+			SLIST_REMOVE_HEAD(&ahc->scb_data->free_scbs, links);
+	}
+
+	splx(opri);
+
+	return (scbp);
+}
+
+int
+ahc_createdmamem(ahc, size, mapp, vaddr, baddr, seg, nseg, what)
+	struct ahc_softc *ahc;
+	int size;
+	bus_dmamap_t *mapp;
+	caddr_t *vaddr;
+	bus_addr_t *baddr;
+	bus_dma_segment_t *seg;
+	int *nseg;
+	const char *what;
+{
+	int error, level = 0;
+	int dma_flags = BUS_DMA_NOWAIT;
+	bus_dma_tag_t tag = ahc->sc_dmat;
+	const char *myname = ahc_name(ahc);
+	if ((ahc->chip & AHC_VL) !=0)
+		dma_flags |= ISABUS_DMA_32BIT;
+	
+	if ((error = bus_dmamem_alloc(tag, size, NBPG, 0,
+			seg, 1, nseg, BUS_DMA_NOWAIT)) != 0) {
+		printf("%s: failed to allocate DMA mem for %s, error = %d\n",
+			myname, what, error);
+		goto out;
+	}
+	level++;
+
+	if ((error = bus_dmamem_map(tag, seg, *nseg, size, vaddr,
+			BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) {
+		printf("%s: failed to map DMA mem for %s, error = %d\n",
+			myname, what, error);
+		goto out;
+	}
+	level++;
+
+	if ((error = bus_dmamap_create(tag, size, 1, size, 0,
+			dma_flags, mapp)) != 0) {
+		printf("%s: failed to create DMA map for %s, error = %d\n",
+			myname, what, error);
+		goto out;
+        }
+	level++;
+
+	if ((error = bus_dmamap_load(tag, *mapp, *vaddr, size, NULL,
+			BUS_DMA_NOWAIT)) != 0) {
+		printf("%s: failed to load DMA map for %s, error = %d\n",
+			myname, what, error);
+		goto out;
+        }
+
+	*baddr = (*mapp)->dm_segs[0].ds_addr;
+	return 0;
+out:
+	switch (level) {
+	case 3:
+		bus_dmamap_destroy(tag, *mapp);
+		/* FALLTHROUGH */
+	case 2:
+		bus_dmamem_unmap(tag, *vaddr, size);
+		/* FALLTHROUGH */
+	case 1:
+		bus_dmamem_free(tag, seg, *nseg);
+		break;
+	default:
+		break;
+	}
+
+	return error;
+}
+
+STATIC void
+ahc_freedmamem(tag, size, map, vaddr, seg, nseg)
+	bus_dma_tag_t tag;
+	int size;
+	bus_dmamap_t map;
+	caddr_t vaddr;
+	bus_dma_segment_t *seg;
+	int nseg;
+{
+
+	bus_dmamap_unload(tag, map);
+	bus_dmamap_destroy(tag, map);
+	bus_dmamem_unmap(tag, vaddr, size);
+	bus_dmamem_free(tag, seg, nseg);
+}
+
+#ifdef  AHC_DEBUG
+STATIC void
+ahc_print_scb(scb)
+	struct scb *scb;
+{
+	struct hardware_scb *hscb = scb->hscb;
+
+	printf("scb:%p tag %x control:0x%x tcl:0x%x cmdlen:%d cmdpointer:0x%lx\n",
+		scb,
+		hscb->tag,
+		hscb->control,
+		hscb->tcl,
+		hscb->cmdlen,
+		(unsigned long)le32toh(hscb->cmdpointer));
+	printf("        datlen:%u data:0x%lx segs:0x%x segp:0x%lx\n",
+		le32toh(hscb->datalen),
+		(unsigned long)(le32toh(hscb->data)),
+		hscb->SG_count,
+		(unsigned long)(le32toh(hscb->SG_pointer)));
+	printf("	sg_addr:%lx sg_len:%lu\n",
+		(unsigned long)(le32toh(scb->sg_list[0].addr)),
+		(unsigned long)(le32toh(scb->sg_list[0].len)));
+	printf("	cdb:%x %x %x %x %x %x %x %x %x %x %x %x\n",
+		hscb->cmdstore[0], hscb->cmdstore[1], hscb->cmdstore[2],
+		hscb->cmdstore[3], hscb->cmdstore[4], hscb->cmdstore[5],
+		hscb->cmdstore[6], hscb->cmdstore[7], hscb->cmdstore[8],
+		hscb->cmdstore[9], hscb->cmdstore[10], hscb->cmdstore[11]);
+}
+#endif
+
+static struct {
+        u_int8_t errno;
+	char *errmesg;
+} hard_error[] = {
 	{ ILLHADDR,	"Illegal Host Access" },
 	{ ILLSADDR,	"Illegal Sequencer Address referrenced" },
 	{ ILLOPCODE,	"Illegal Opcode in sequencer program" },
@@ -84,14 +822,15 @@ static struct ahc_hard_error_entry ahc_hard_errors[] = {
 	{ PCIERRSTAT,	"PCI Error detected" },
 	{ CIOPARERR,	"CIOBUS Parity Error" },
 };
-static const u_int num_errors = NUM_ELEMENTS(ahc_hard_errors);
+static const int num_errors = sizeof(hard_error)/sizeof(hard_error[0]);
 
-static struct ahc_phase_table_entry ahc_phase_table[] =
-{
+static struct {
+        u_int8_t phase;
+        u_int8_t mesg_out; /* Message response to parity errors */
+	char *phasemsg;
+} phase_table[] = {
 	{ P_DATAOUT,	MSG_NOOP,		"in Data-out phase"	},
 	{ P_DATAIN,	MSG_INITIATOR_DET_ERR,	"in Data-in phase"	},
-	{ P_DATAOUT_DT,	MSG_NOOP,		"in DT Data-out phase"	},
-	{ P_DATAIN_DT,	MSG_INITIATOR_DET_ERR,	"in DT Data-in phase"	},
 	{ P_COMMAND,	MSG_NOOP,		"in Command phase"	},
 	{ P_MESGOUT,	MSG_NOOP,		"in Message-out phase"	},
 	{ P_STATUS,	MSG_INITIATOR_DET_ERR,	"in Status phase"	},
@@ -99,20 +838,18 @@ static struct ahc_phase_table_entry ahc_phase_table[] =
 	{ P_BUSFREE,	MSG_NOOP,		"while idle"		},
 	{ 0,		MSG_NOOP,		"in unknown phase"	}
 };
-
-/*
- * In most cases we only wish to itterate over real phases, so
- * exclude the last element from the count.
- */
-static const u_int num_phases = NUM_ELEMENTS(ahc_phase_table) - 1;
+static const int num_phases = (sizeof(phase_table)/sizeof(phase_table[0])) - 1;
 
 /*
  * Valid SCSIRATE values.  (p. 3-17)
  * Provides a mapping of tranfer periods in ns to the proper value to
- * stick in the scsixfer reg.
+ * stick in the scsiscfr reg to use that transfer rate.
  */
-static struct ahc_syncrate ahc_syncrates[] =
-{
+#define AHC_SYNCRATE_DT		0
+#define AHC_SYNCRATE_ULTRA2	1
+#define AHC_SYNCRATE_ULTRA	3
+#define AHC_SYNCRATE_FAST	6
+static struct ahc_syncrate ahc_syncrates[] = {
       /* ultra2    fast/ultra  period     rate */
 	{ 0x42,      0x000,      9,      "80.0" },
 	{ 0x03,      0x000,     10,      "40.0" },
@@ -131,272 +868,864 @@ static struct ahc_syncrate ahc_syncrates[] =
 	{ 0x00,      0x000,      0,      NULL   }
 };
 
-/* Our Sequencer Program */
-#ifdef __OpenBSD__
-#include <dev/microcode/aic7xxx/aic7xxx_seq.h>
-#else
-#include "aic7xxx_seq.h"
-#endif 
-
-/**************************** Function Declarations ***************************/
-static struct ahc_tmode_tstate*
-			ahc_alloc_tstate(struct ahc_softc *ahc,
-					 u_int scsi_id, char channel);
-#ifdef AHC_TARGET_MODE
-static void		ahc_free_tstate(struct ahc_softc *ahc,
-					u_int scsi_id, char channel, int force);
-#endif
-static struct ahc_syncrate*
-			ahc_devlimited_syncrate(struct ahc_softc *ahc,
-					        struct ahc_initiator_tinfo *,
-						u_int *period,
-						u_int *ppr_options,
-						role_t role);
-static void		ahc_update_pending_scbs(struct ahc_softc *ahc);
-static void		ahc_fetch_devinfo(struct ahc_softc *ahc,
-					  struct ahc_devinfo *devinfo);
-static void		ahc_scb_devinfo(struct ahc_softc *ahc,
-					struct ahc_devinfo *devinfo,
-					struct scb *scb);
-static void		ahc_assert_atn(struct ahc_softc *ahc);
-static void		ahc_setup_initiator_msgout(struct ahc_softc *ahc,
-						   struct ahc_devinfo *devinfo,
-						   struct scb *scb);
-static void		ahc_build_transfer_msg(struct ahc_softc *ahc,
-					       struct ahc_devinfo *devinfo);
-static void		ahc_construct_sdtr(struct ahc_softc *ahc,
-					   struct ahc_devinfo *devinfo,
-					   u_int period, u_int offset);
-static void		ahc_construct_wdtr(struct ahc_softc *ahc,
-					   struct ahc_devinfo *devinfo,
-					   u_int bus_width);
-static void		ahc_construct_ppr(struct ahc_softc *ahc,
-					  struct ahc_devinfo *devinfo,
-					  u_int period, u_int offset,
-					  u_int bus_width, u_int ppr_options);
-static void		ahc_clear_msg_state(struct ahc_softc *ahc);
-static void		ahc_handle_message_phase(struct ahc_softc *ahc);
-typedef enum {
-	AHCMSG_1B,
-	AHCMSG_2B,
-	AHCMSG_EXT
-} ahc_msgtype;
-static int		ahc_sent_msg(struct ahc_softc *ahc, ahc_msgtype type,
-				     u_int msgval, int full);
-static int		ahc_parse_msg(struct ahc_softc *ahc,
-				      struct ahc_devinfo *devinfo);
-static int		ahc_handle_msg_reject(struct ahc_softc *ahc,
-					      struct ahc_devinfo *devinfo);
-static void		ahc_handle_ign_wide_residue(struct ahc_softc *ahc,
-						struct ahc_devinfo *devinfo);
-static void		ahc_reinitialize_dataptrs(struct ahc_softc *ahc);
-static void		ahc_handle_devreset(struct ahc_softc *ahc,
-					    struct ahc_devinfo *devinfo,
-					    cam_status status, char *message,
-					    int verbose_level);
-#if AHC_TARGET_MODE
-static void		ahc_setup_target_msgin(struct ahc_softc *ahc,
-					       struct ahc_devinfo *devinfo,
-					       struct scb *scb);
-#endif
-
-#ifdef __OpenBSD__
-int			ahc_init_scbdata(struct ahc_softc *ahc);
-void			ahc_fini_scbdata(struct ahc_softc *ahc);
-void			ahc_build_free_scb_list(struct ahc_softc *ahc);
-#else
-static bus_dmamap_callback_t	ahc_dmamap_cb;
-static int		ahc_init_scbdata(struct ahc_softc *ahc);
-static void		ahc_fini_scbdata(struct ahc_softc *ahc);
-static void		ahc_build_free_scb_list(struct ahc_softc *ahc);
-#endif 
-
-static void		ahc_qinfifo_requeue(struct ahc_softc *ahc,
-					    struct scb *prev_scb,
-					    struct scb *scb);
-static int		ahc_qinfifo_count(struct ahc_softc *ahc);
-static u_int		ahc_rem_scb_from_disc_list(struct ahc_softc *ahc,
-						   u_int prev, u_int scbptr);
-static void		ahc_add_curscb_to_free_list(struct ahc_softc *ahc);
-static u_int		ahc_rem_wscb(struct ahc_softc *ahc,
-				     u_int scbpos, u_int prev);
-static int		ahc_abort_scbs(struct ahc_softc *ahc, int target,
-				       char channel, int lun, u_int tag,
-				       role_t role, uint32_t status);
-static void		ahc_reset_current_bus(struct ahc_softc *ahc);
-#ifdef AHC_DUMP_SEQ
-static void		ahc_dumpseq(struct ahc_softc *ahc);
-#endif
-static void		ahc_loadseq(struct ahc_softc *ahc);
-static int		ahc_check_patch(struct ahc_softc *ahc,
-					struct patch **start_patch,
-					u_int start_instr, u_int *skip_addr);
-static void		ahc_download_instr(struct ahc_softc *ahc,
-					   u_int instrptr, uint8_t *dconsts);
-#ifdef AHC_TARGET_MODE
-static void		ahc_queue_lstate_event(struct ahc_softc *ahc,
-					       struct ahc_tmode_lstate *lstate,
-					       u_int initiator_id,
-					       u_int event_type,
-					       u_int event_arg);
-static void		ahc_update_scsiid(struct ahc_softc *ahc,
-					  u_int targid_mask);
-static int		ahc_handle_target_cmd(struct ahc_softc *ahc,
-					      struct target_cmd *cmd);
-#endif
-/************************* Sequencer Execution Control ************************/
 /*
- * Restart the sequencer program from address zero
+ * Allocate a controller structure for a new device and initialize it.
+ * ahc_reset should be called before now since we assume that the card
+ * is paused.
  */
 void
-ahc_restart(struct ahc_softc *ahc)
+ahc_construct(ahc, iot, ioh, chip, flags, features, channel)
+	struct  ahc_softc *ahc;
+	bus_space_tag_t iot;
+	bus_space_handle_t ioh;
+	ahc_chip chip;
+	ahc_flag flags;
+	ahc_feature features;
+	u_char channel;
+{
+	/*
+	 * find unit and check we have that many defined
+	 */
+	LIST_INIT(&ahc->pending_scbs);
+	ahc->sc_iot = iot;
+	ahc->sc_ioh = ioh;
+	ahc->chip = chip;
+	ahc->flags = flags;
+	ahc->features = features;
+	ahc->channel = channel;
+	ahc->scb_data = NULL;
+	ahc->pci_intr_func = NULL;
+
+	ahc->unpause = (ahc_inb(ahc, HCNTRL) & IRQMS) | INTEN;
+	/* The IRQMS bit is only valid on VL and EISA chips */
+	if ((ahc->chip & AHC_PCI) != 0)
+		ahc->unpause &= ~IRQMS;
+	ahc->pause = ahc->unpause | PAUSE;
+}
+
+void
+ahc_free(ahc)
+	struct ahc_softc *ahc;
+{
+	ahcfiniscbdata(ahc);
+	if (ahc->init_level != 0)
+		ahc_freedmamem(ahc->sc_dmat, ahc->shared_data_size,
+		    ahc->shared_data_dmamap, ahc->qoutfifo,
+		    &ahc->shared_data_seg, ahc->shared_data_nseg);
+
+	if (ahc->scb_data != NULL)
+		free(ahc->scb_data, M_DEVBUF);
+	if (ahc->pci_data != NULL)
+		free(ahc->pci_data, M_DEVBUF);
+	return;
+}
+
+STATIC int
+ahcinitscbdata(ahc)
+	struct ahc_softc *ahc;
 {
+	struct scb_data *scb_data;
+	int i;
+	
+	scb_data = ahc->scb_data;
+	SLIST_INIT(&scb_data->free_scbs);
+	SLIST_INIT(&scb_data->sg_maps);
+
+	/* Allocate SCB resources */
+	scb_data->scbarray =
+	    (struct scb *)malloc(sizeof(struct scb) * AHC_SCB_MAX,
+				 M_DEVBUF, M_NOWAIT);
+	if (scb_data->scbarray == NULL)
+		return (ENOMEM);
+	bzero(scb_data->scbarray, sizeof(struct scb) * AHC_SCB_MAX);
+
+	/* Determine the number of hardware SCBs and initialize them */
+
+	scb_data->maxhscbs = ahc_probe_scbs(ahc);
+	/* SCB 0 heads the free list */
+	ahc_outb(ahc, FREE_SCBH, 0);
+	for (i = 0; i < ahc->scb_data->maxhscbs; i++) {
+		ahc_outb(ahc, SCBPTR, i);
+
+		/* Clear the control byte. */
+		ahc_outb(ahc, SCB_CONTROL, 0);
+
+		/* Set the next pointer */
+		ahc_outb(ahc, SCB_NEXT, i+1);
+
+		/* Make the tag number invalid */
+		ahc_outb(ahc, SCB_TAG, SCB_LIST_NULL);
+	}
+
+	/* Make sure that the last SCB terminates the free list */
+	ahc_outb(ahc, SCBPTR, i-1);
+	ahc_outb(ahc, SCB_NEXT, SCB_LIST_NULL);
+
+	/* Ensure we clear the 0 SCB's control byte. */
+	ahc_outb(ahc, SCBPTR, 0);
+	ahc_outb(ahc, SCB_CONTROL, 0);
 
-	ahc_pause(ahc);
+	scb_data->maxhscbs = i;
 
-	ahc_outb(ahc, SCSISIGO, 0);		/* De-assert BSY */
-	ahc_outb(ahc, MSG_OUT, MSG_NOOP);	/* No message to send */
-	ahc_outb(ahc, SXFRCTL1, ahc_inb(ahc, SXFRCTL1) & ~BITBUCKET);
+	if (ahc->scb_data->maxhscbs == 0)
+		panic("%s: No SCB space found", ahc_name(ahc));
 
 	/*
-	 * Ensure that the sequencer's idea of TQINPOS
-	 * matches our own.  The sequencer increments TQINPOS
-	 * only after it sees a DMA complete and a reset could
-	 * occur before the increment leaving the kernel to believe
-	 * the command arrived but the sequencer to not.
+	 * Create our DMA tags.  These tags define the kinds of device
+	 * accessable memory allocations and memory mappings we will
+	 * need to perform during normal operation.
+	 *
+	 * Unless we need to further restrict the allocation, we rely
+	 * on the restrictions of the parent dmat, hence the common
+	 * use of MAXADDR and MAXSIZE.
 	 */
-	ahc_outb(ahc, TQINPOS, ahc->tqinfifonext);
 
-	/* Always allow reselection */
-	ahc_outb(ahc, SCSISEQ,
-		 ahc_inb(ahc, SCSISEQ_TEMPLATE) & (ENSELI|ENRSELI|ENAUTOATNP));
-	if ((ahc->features & AHC_CMD_CHAN) != 0) {
-		/* Ensure that no DMA operations are in progress */
-		ahc_outb(ahc, CCSCBCNT, 0);
-		ahc_outb(ahc, CCSGCTL, 0);
-		ahc_outb(ahc, CCSCBCTL, 0);
+	if (ahc_createdmamem(ahc,
+	    AHC_SCB_MAX * sizeof(struct hardware_scb), 
+	    &scb_data->hscb_dmamap, (caddr_t *)&scb_data->hscbs, 
+	    &scb_data->hscb_busaddr, &scb_data->hscb_seg,
+	    &scb_data->hscb_nseg, "hardware SCB structures") < 0)
+		goto error_exit;
+
+	scb_data->init_level++;
+
+	if (ahc_createdmamem(ahc,
+	    AHC_SCB_MAX * sizeof(struct scsi_sense_data),
+	    &scb_data->sense_dmamap, (caddr_t *)&scb_data->sense,
+	    &scb_data->sense_busaddr, &scb_data->sense_seg,
+	    &scb_data->sense_nseg, "sense buffers") < 0)
+		goto error_exit;
+
+	scb_data->init_level++;
+
+	/* Perform initial CCB allocation */
+	bzero(scb_data->hscbs, AHC_SCB_MAX * sizeof(struct hardware_scb));
+	ahcallocscbs(ahc);
+
+	if (scb_data->numscbs == 0) {
+		printf("%s: ahc_init_scb_data - "
+		       "Unable to allocate initial scbs\n",
+		       ahc_name(ahc));
+		goto error_exit;
 	}
+
+	scb_data->init_level++;
+
 	/*
-	 * If we were in the process of DMA'ing SCB data into
-	 * an SCB, replace that SCB on the free list.  This prevents
-	 * an SCB leak.
+	 * Note that we were successfull
 	 */
-	if ((ahc_inb(ahc, SEQ_FLAGS2) & SCB_DMA) != 0) {
-		ahc_add_curscb_to_free_list(ahc);
-		ahc_outb(ahc, SEQ_FLAGS2,
-			 ahc_inb(ahc, SEQ_FLAGS2) & ~SCB_DMA);
+	return 0; 
+
+error_exit:
+
+	return ENOMEM;
+}
+
+STATIC void
+ahcfiniscbdata(ahc)
+	struct ahc_softc *ahc;
+{
+	struct scb_data *scb_data;
+
+	scb_data = ahc->scb_data;
+
+	switch (scb_data->init_level) {
+	default:
+	case 3:
+	{
+		struct sg_map_node *sg_map;
+
+		while ((sg_map = SLIST_FIRST(&scb_data->sg_maps))!= NULL) {
+			SLIST_REMOVE_HEAD(&scb_data->sg_maps, links);
+			ahc_freedmamem(ahc->sc_dmat, PAGE_SIZE,
+			    sg_map->sg_dmamap, (caddr_t)sg_map->sg_vaddr,
+			    &sg_map->sg_dmasegs, sg_map->sg_nseg);
+			free(sg_map, M_DEVBUF);
+		}
 	}
-	ahc_outb(ahc, MWI_RESIDUAL, 0);
-	ahc_outb(ahc, SEQCTL, FASTMODE);
-	ahc_outb(ahc, SEQADDR0, 0);
-	ahc_outb(ahc, SEQADDR1, 0);
-	ahc_unpause(ahc);
+	/*FALLTHROUGH*/
+	case 2:
+		ahc_freedmamem(ahc->sc_dmat,
+		    AHC_SCB_MAX * sizeof(struct scsi_sense_data),
+		    scb_data->sense_dmamap, (caddr_t)scb_data->sense,
+		    &scb_data->sense_seg, scb_data->sense_nseg);
+	/*FALLTHROUGH*/
+	case 1:
+		ahc_freedmamem(ahc->sc_dmat,
+		    AHC_SCB_MAX * sizeof(struct hardware_scb), 
+		    scb_data->hscb_dmamap, (caddr_t)scb_data->hscbs,
+		    &scb_data->hscb_seg, scb_data->hscb_nseg);
+	/*FALLTHROUGH*/
+	}
+	if (scb_data->scbarray != NULL)
+		free(scb_data->scbarray, M_DEVBUF);
 }
 
-/************************* Input/Output Queues ********************************/
 void
-ahc_run_qoutfifo(struct ahc_softc *ahc)
+ahc_xxx_reset(devname, iot, ioh)
+	char *devname;
+	bus_space_tag_t iot;
+	bus_space_handle_t ioh;
 {
-	struct scb *scb;
-	u_int  scb_index;
+	u_char hcntrl;
+	int wait;
 
-	ahc_sync_qoutfifo(ahc, BUS_DMASYNC_POSTREAD);
-	while (ahc->qoutfifo[ahc->qoutfifonext] != SCB_LIST_NULL) {
+#ifdef AHC_DUMP_SEQ
+	ahc_dumpseq(ahc);
+#endif
+	/* Retain the IRQ type accross the chip reset */
+	hcntrl = (bus_space_read_1(iot, ioh, HCNTRL) & IRQMS) | INTEN;
 
-		scb_index = ahc->qoutfifo[ahc->qoutfifonext];
-		if ((ahc->qoutfifonext & 0x03) == 0x03) {
-			u_int modnext;
+	bus_space_write_1(iot, ioh, HCNTRL, CHIPRST | PAUSE);
+	/*
+	 * Ensure that the reset has finished
+	 */
+	wait = 1000;
+	while (--wait && !(bus_space_read_1(iot, ioh, HCNTRL) & CHIPRSTACK))
+		DELAY(1000);
+	if (wait == 0) {
+		printf("%s: WARNING - Failed chip reset!  "
+				 "Trying to initialize anyway.\n", devname);
+	}
+	bus_space_write_1(iot, ioh, HCNTRL, hcntrl | PAUSE);
+}
+
+int
+ahc_reset(ahc)
+	struct ahc_softc *ahc;
+{
+	u_int	sblkctl;
+	int	wait;
+	
+#ifdef AHC_DUMP_SEQ
+	if (ahc->init_level == 0)
+		ahc_dumpseq(ahc);
+#endif
+	ahc_outb(ahc, HCNTRL, CHIPRST | ahc->pause);
+	/*
+	 * Ensure that the reset has finished
+	 */
+	wait = 1000;
+	do {
+		DELAY(1000);
+	} while (--wait && !(ahc_inb(ahc, HCNTRL) & CHIPRSTACK));
+
+	if (wait == 0) {
+		printf("%s: WARNING - Failed chip reset!  "
+		       "Trying to initialize anyway.\n", ahc_name(ahc));
+	}
+	ahc_outb(ahc, HCNTRL, ahc->pause);
+
+	/* Determine channel configuration */
+	sblkctl = ahc_inb(ahc, SBLKCTL) & (SELBUSB|SELWIDE);
+	/* No Twin Channel PCI cards */
+	if ((ahc->chip & AHC_PCI) != 0)
+		sblkctl &= ~SELBUSB;
+	switch (sblkctl) {
+	case 0:
+		/* Single Narrow Channel */
+		break;
+	case 2:
+		/* Wide Channel */
+		ahc->features |= AHC_WIDE;
+		break;
+	case 8:
+		/* Twin Channel */
+		ahc->features |= AHC_TWIN;
+		break;
+	default:
+		printf(" Unsupported adapter type.  Ignoring\n");
+		return(-1);
+	}
+	return (0);
+}
+
+/*
+ * Called when we have an active connection to a target on the bus,
+ * this function finds the nearest syncrate to the input period limited
+ * by the capabilities of the bus connectivity of the target.
+ */
+STATIC struct ahc_syncrate *
+ahc_devlimited_syncrate(ahc, period)
+	struct ahc_softc *ahc;
+	u_int *period;
+{
+	u_int	maxsync;
+
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		if ((ahc_inb(ahc, SBLKCTL) & ENAB40) != 0
+		 && (ahc_inb(ahc, SSTAT2) & EXP_ACTIVE) == 0) {
+			maxsync = AHC_SYNCRATE_ULTRA2;
+		} else {
+			maxsync = AHC_SYNCRATE_ULTRA;
+		}
+	} else if ((ahc->features & AHC_ULTRA) != 0) {
+		maxsync = AHC_SYNCRATE_ULTRA;
+	} else {
+		maxsync = AHC_SYNCRATE_FAST;
+	}
+	return (ahc_find_syncrate(ahc, period, maxsync));
+}
 
+/*
+ * Look up the valid period to SCSIRATE conversion in our table.
+ * Return the period and offset that should be sent to the target
+ * if this was the beginning of an SDTR.
+ */
+STATIC struct ahc_syncrate *
+ahc_find_syncrate(ahc, period, maxsync)
+	struct ahc_softc *ahc;
+	u_int *period;
+	u_int maxsync;
+{
+	struct ahc_syncrate *syncrate;
+
+	syncrate = &ahc_syncrates[maxsync];
+	while ((syncrate->rate != NULL)
+	    && ((ahc->features & AHC_ULTRA2) == 0
+	     || (syncrate->sxfr_u2 != 0))) {
+
+		if (*period <= syncrate->period) {
 			/*
-			 * Clear 32bits of QOUTFIFO at a time
-			 * so that we don't clobber an incoming
-			 * byte DMA to the array on architectures
-			 * that only support 32bit load and store
-			 * operations.
+			 * When responding to a target that requests
+			 * sync, the requested rate may fall between
+			 * two rates that we can output, but still be
+			 * a rate that we can receive.  Because of this,
+			 * we want to respond to the target with
+			 * the same rate that it sent to us even
+			 * if the period we use to send data to it
+			 * is lower.  Only lower the response period
+			 * if we must.
 			 */
-			modnext = ahc->qoutfifonext & ~0x3;
-			*((uint32_t *)(&ahc->qoutfifo[modnext])) = 0xFFFFFFFFUL;
-			ahc_dmamap_sync(ahc, ahc->shared_data_dmat,
-					ahc->shared_data_dmamap,
-					/*offset*/modnext, /*len*/4,
-					BUS_DMASYNC_PREREAD);
+			if (syncrate == &ahc_syncrates[maxsync])
+				*period = syncrate->period;
+			break;
 		}
-		ahc->qoutfifonext++;
+		syncrate++;
+	}
 
-		scb = ahc_lookup_scb(ahc, scb_index);
-		if (scb == NULL) {
-			printf("%s: WARNING no command for scb %d "
-			       "(cmdcmplt)\nQOUTPOS = %d\n",
-			       ahc_name(ahc), scb_index,
-			       ahc->qoutfifonext - 1);
-			continue;
+	if ((*period == 0)
+	 || (syncrate->rate == NULL)
+	 || ((ahc->features & AHC_ULTRA2) != 0
+	  && (syncrate->sxfr_u2 == 0))) {
+		/* Use asynchronous transfers. */
+		*period = 0;
+		syncrate = NULL;
+	}
+	return (syncrate);
+}
+
+STATIC u_int
+ahc_find_period(ahc, scsirate, maxsync)
+	struct ahc_softc *ahc;
+	u_int scsirate;
+	u_int maxsync;
+{
+	struct ahc_syncrate *syncrate;
+
+	if ((ahc->features & AHC_ULTRA2) != 0)
+		scsirate &= SXFR_ULTRA2;
+	else
+		scsirate &= SXFR;
+
+	syncrate = &ahc_syncrates[maxsync];
+	while (syncrate->rate != NULL) {
+
+		if ((ahc->features & AHC_ULTRA2) != 0) {
+			if (syncrate->sxfr_u2 == 0)
+				break;
+			else if (scsirate == (syncrate->sxfr_u2 & SXFR_ULTRA2))
+				return (syncrate->period);
+		} else if (scsirate == (syncrate->sxfr & SXFR)) {
+				return (syncrate->period);
 		}
+		syncrate++;
+	}
+	return (0); /* async */
+}
 
-		/*
-		 * Save off the residual
-		 * if there is one.
-		 */
-		ahc_update_residual(scb);
-		ahc_done(ahc, scb);
+STATIC void
+ahc_validate_offset(ahc, syncrate, offset, wide)
+	struct ahc_softc *ahc;
+	struct ahc_syncrate *syncrate;
+	u_int *offset;
+	int wide;
+{
+	u_int maxoffset;
+
+	/* Limit offset to what we can do */
+	if (syncrate == NULL) {
+		maxoffset = 0;
+	} else if ((ahc->features & AHC_ULTRA2) != 0) {
+		maxoffset = MAX_OFFSET_ULTRA2;
+	} else {
+		if (wide)
+			maxoffset = MAX_OFFSET_16BIT;
+		else
+			maxoffset = MAX_OFFSET_8BIT;
 	}
+	*offset = MIN(*offset, maxoffset);
 }
 
-void
-ahc_run_untagged_queues(struct ahc_softc *ahc)
+STATIC void
+ahc_update_target_msg_request(ahc, devinfo, tinfo, force, paused)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
+	struct ahc_initiator_tinfo *tinfo;
+	int force;
+	int paused;
 {
-	int i;
+	u_int targ_msg_req_orig;
+
+	targ_msg_req_orig = ahc->targ_msg_req;
+	if (tinfo->current.period != tinfo->goal.period
+	    || tinfo->current.width != tinfo->goal.width
+	    || tinfo->current.offset != tinfo->goal.offset
+	    || (force && (tinfo->goal.period != 0
+	    || tinfo->goal.width != MSG_EXT_WDTR_BUS_8_BIT)))
+		ahc->targ_msg_req |= devinfo->target_mask;
+	else
+		ahc->targ_msg_req &= ~devinfo->target_mask;
+
+	if (ahc->targ_msg_req != targ_msg_req_orig) {
+		/* Update the message request bit for this target */
+		if ((ahc->features & AHC_HS_MAILBOX) != 0) {
+			if (paused) {
+				ahc_outb(ahc, TARGET_MSG_REQUEST,
+					 ahc->targ_msg_req & 0xFF);
+				ahc_outb(ahc, TARGET_MSG_REQUEST + 1,
+					 (ahc->targ_msg_req >> 8) & 0xFF);
+			} else {
+				ahc_outb(ahc, HS_MAILBOX,
+					 0x01 << HOST_MAILBOX_SHIFT);
+			}
+		} else {
+			if (!paused)
+				pause_sequencer(ahc);
+
+			ahc_outb(ahc, TARGET_MSG_REQUEST,
+				 ahc->targ_msg_req & 0xFF);
+			ahc_outb(ahc, TARGET_MSG_REQUEST + 1,
+				 (ahc->targ_msg_req >> 8) & 0xFF);
 
-	for (i = 0; i < 16; i++)
-		ahc_run_untagged_queue(ahc, &ahc->untagged_queues[i]);
+			if (!paused)
+				unpause_sequencer(ahc);
+		}
+	}
 }
 
-void
-ahc_run_untagged_queue(struct ahc_softc *ahc, struct scb_tailq *queue)
+STATIC void
+ahc_set_syncrate(ahc, devinfo, syncrate, period, offset, type, paused, done)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
+	struct ahc_syncrate *syncrate;
+	u_int period;
+	u_int offset;
+	u_int type;
+	int paused;
+	int done;
 {
-	struct scb *scb;
+	struct	ahc_initiator_tinfo *tinfo;
+	struct	tmode_tstate *tstate;
+	u_int	old_period;
+	u_int	old_offset;
+	int	active = (type & AHC_TRANS_ACTIVE) == AHC_TRANS_ACTIVE;
 
-	if (ahc->untagged_queue_lock != 0)
-		return;
+	if (syncrate == NULL) {
+		period = 0;
+		offset = 0;
+	}
+
+	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel,
+				    devinfo->our_scsiid,
+				    devinfo->target, &tstate);
+	old_period = tinfo->current.period;
+	old_offset = tinfo->current.offset;
 
-	if ((scb = TAILQ_FIRST(queue)) != NULL
-	 && (scb->flags & SCB_ACTIVE) == 0) {
-		scb->flags |= SCB_ACTIVE;
-		ahc_queue_scb(ahc, scb);
+	if ((type & AHC_TRANS_CUR) != 0
+	 && (old_period != period || old_offset != offset)) {
+		u_int	scsirate;
+
+		scsirate = tinfo->scsirate;
+		if ((ahc->features & AHC_ULTRA2) != 0) {
+
+			/* XXX */
+			/* Force single edge until DT is fully implemented */
+			scsirate &= ~(SXFR_ULTRA2|SINGLE_EDGE|ENABLE_CRC);
+			if (syncrate != NULL)
+				scsirate |= syncrate->sxfr_u2|SINGLE_EDGE;
+
+			if (active)
+				ahc_outb(ahc, SCSIOFFSET, offset);
+		} else {
+
+			scsirate &= ~(SXFR|SOFS);
+			/*
+			 * Ensure Ultra mode is set properly for
+			 * this target.
+			 */
+			tstate->ultraenb &= ~devinfo->target_mask;
+			if (syncrate != NULL) {
+				if (syncrate->sxfr & ULTRA_SXFR) {
+					tstate->ultraenb |=
+						devinfo->target_mask;
+				}
+				scsirate |= syncrate->sxfr & SXFR;
+				scsirate |= offset & SOFS;
+			}
+			if (active) {
+				u_int sxfrctl0;
+
+				sxfrctl0 = ahc_inb(ahc, SXFRCTL0);
+				sxfrctl0 &= ~FAST20;
+				if (tstate->ultraenb & devinfo->target_mask)
+					sxfrctl0 |= FAST20;
+				ahc_outb(ahc, SXFRCTL0, sxfrctl0);
+			}
+		}
+		if (active)
+			ahc_outb(ahc, SCSIRATE, scsirate);
+
+		tinfo->scsirate = scsirate;
+		tinfo->current.period = period;
+		tinfo->current.offset = offset;
+
+		/* Update the syncrates in any pending scbs */
+		ahc_update_pending_syncrates(ahc);
+	}
+
+	/*
+	 * Print messages if we're verbose and at the end of a negotiation
+	 * cycle.
+	 */
+	if (done) {
+		if (offset != 0) {
+			printf("%s: target %d synchronous at %sMHz, "
+			       "offset = 0x%x\n", ahc_name(ahc),
+			       devinfo->target, syncrate->rate, offset);
+		} else {
+			printf("%s: target %d using "
+			       "asynchronous transfers\n",
+			       ahc_name(ahc), devinfo->target);
+		}
 	}
+
+	if ((type & AHC_TRANS_GOAL) != 0) {
+		tinfo->goal.period = period;
+		tinfo->goal.offset = offset;
+	}
+
+	if ((type & AHC_TRANS_USER) != 0) {
+		tinfo->user.period = period;
+		tinfo->user.offset = offset;
+	}
+
+	ahc_update_target_msg_request(ahc, devinfo, tinfo,
+				      /*force*/FALSE,
+				      paused);
 }
 
-/************************* Interrupt Handling *********************************/
-void
-ahc_handle_brkadrint(struct ahc_softc *ahc)
+STATIC void
+ahc_set_width(ahc, devinfo, width, type, paused, done)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
+	u_int width;
+	u_int type;
+	int paused;
+	int done;
+{
+	struct ahc_initiator_tinfo *tinfo;
+	struct tmode_tstate *tstate;
+	u_int  oldwidth;
+	int    active = (type & AHC_TRANS_ACTIVE) == AHC_TRANS_ACTIVE;
+
+	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel,
+				    devinfo->our_scsiid,
+				    devinfo->target,
+				    &tstate);
+	oldwidth = tinfo->current.width;
+
+	if ((type & AHC_TRANS_CUR) != 0 && oldwidth != width) {
+		u_int	scsirate;
+
+		scsirate =  tinfo->scsirate;
+		scsirate &= ~WIDEXFER;
+		if (width == MSG_EXT_WDTR_BUS_16_BIT)
+			scsirate |= WIDEXFER;
+
+		tinfo->scsirate = scsirate;
+
+		if (active)
+			ahc_outb(ahc, SCSIRATE, scsirate);
+
+		tinfo->current.width = width;
+	}
+
+	if (done) {
+		printf("%s: target %d using %dbit transfers\n",
+		       ahc_name(ahc), devinfo->target,
+		       8 * (0x01 << width));
+	}
+
+	if ((type & AHC_TRANS_GOAL) != 0)
+		tinfo->goal.width = width;
+	if ((type & AHC_TRANS_USER) != 0)
+		tinfo->user.width = width;
+
+	ahc_update_target_msg_request(ahc, devinfo, tinfo,
+				      /*force*/FALSE, paused);
+}
+
+STATIC void
+ahc_set_tags(ahc, devinfo, enable)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
+	int enable;
+{
+	struct ahc_initiator_tinfo *tinfo;
+	struct tmode_tstate *tstate;
+
+	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel,
+				    devinfo->our_scsiid,
+				    devinfo->target,
+				    &tstate);
+	if (enable)
+		tstate->tagenable |= devinfo->target_mask;
+	else {
+		tstate->tagenable &= ~devinfo->target_mask;
+		tstate->tagdisable |= devinfo->target_mask;
+	}
+}
+
+/*
+ * Attach all the sub-devices we can find
+ */
+int
+ahc_attach(ahc)
+	struct ahc_softc *ahc;
 {
 	/*
-	 * We upset the sequencer :-(
-	 * Lookup the error message
+	 * Initialize the software queue.
 	 */
-	int i;
-	int error;
+	LIST_INIT(&ahc->sc_xxxq);
 
-	error = ahc_inb(ahc, ERROR);
-	for (i = 0; error != 1 && i < num_errors; i++)
-		error >>= 1;
-	printf("%s: brkadrint, %s at seqaddr = 0x%x\n",
-	       ahc_name(ahc), ahc_hard_errors[i].errmesg,
-	       ahc_inb(ahc, SEQADDR0) |
-	       (ahc_inb(ahc, SEQADDR1) << 8));
+#ifdef AHC_BROKEN_CACHE
+	if (cpu_class == CPUCLASS_386)	/* doesn't have "wbinvd" instruction */
+		ahc_broken_cache = 0;
+#endif
+	/*
+	 * fill in the prototype scsi_links.
+	 */
+	ahc->sc_link.adapter_target = ahc->our_id;
+	if (ahc->features & AHC_WIDE)
+		ahc->sc_link.adapter_buswidth = 16;
+	ahc->sc_link.adapter_softc = ahc;
+	ahc->sc_link.adapter = &ahc_switch;
+	ahc->sc_link.openings = 2;
+	ahc->sc_link.device = &ahc_dev;
+	ahc->sc_link.flags = SCSIDEBUG_LEVEL;
+	
+	if (ahc->features & AHC_TWIN) {
+		/* Configure the second scsi bus */
+		ahc->sc_link_b = ahc->sc_link;
+		ahc->sc_link_b.adapter_target = ahc->our_id_b;
+		if (ahc->features & AHC_WIDE)
+			ahc->sc_link.adapter_buswidth = 16;
+	}
 
-	ahc_dump_card_state(ahc);
+	/*
+	 * ask the adapter what subunits are present
+	 */
+	if ((ahc->flags & AHC_CHANNEL_B_PRIMARY) == 0) {
+		/* make IS_SCSIBUS_B() == false, while probing channel A */
+		ahc->sc_link_b.scsibus = 0xff;
 
-	/* Tell everyone that this HBA is no longer availible */
-	ahc_abort_scbs(ahc, CAM_TARGET_WILDCARD, ALL_CHANNELS,
-		       CAM_LUN_WILDCARD, SCB_LIST_NULL, ROLE_UNKNOWN,
-		       CAM_NO_HBA);
+		config_found((void *)ahc, &ahc->sc_link, scsiprint);
+		if (ahc->features & AHC_TWIN)
+			config_found((void *)ahc, &ahc->sc_link_b, scsiprint);
+	} else {
+		/*
+		 * if implementation of IS_SCSIBUS_B() is changed to use
+		 * ahc->sc_link.scsibus, then "ahc->sc_link.scsibus = 0xff;"
+		 * is needed, here.
+		 */
 
-	/* Disable all interrupt sources by resetting the controller */
-	ahc_shutdown(ahc);
+		/* assert(ahc->features & AHC_TWIN); */
+		config_found((void *)ahc, &ahc->sc_link_b, scsiprint);
+		config_found((void *)ahc, &ahc->sc_link, scsiprint);
+	}
+	return 1;
 }
 
-void
-ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
+STATIC void
+ahc_fetch_devinfo(ahc, devinfo)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
+{
+	u_int	saved_tcl;
+	role_t	role;
+	int	our_id;
+
+	if (ahc_inb(ahc, SSTAT0) & TARGET)
+		role = ROLE_TARGET;
+	else
+		role = ROLE_INITIATOR;
+
+	if (role == ROLE_TARGET
+	 && (ahc->features & AHC_MULTI_TID) != 0
+	 && (ahc_inb(ahc, SEQ_FLAGS) & CMDPHASE_PENDING) != 0) {
+		/* We were selected, so pull our id from TARGIDIN */
+		our_id = ahc_inb(ahc, TARGIDIN) & OID;
+	} else if ((ahc->features & AHC_ULTRA2) != 0)
+		our_id = ahc_inb(ahc, SCSIID_ULTRA2) & OID;
+	else
+		our_id = ahc_inb(ahc, SCSIID) & OID;
+
+	saved_tcl = ahc_inb(ahc, SAVED_TCL);
+	ahc_compile_devinfo(devinfo, our_id, TCL_TARGET(saved_tcl),
+			    TCL_LUN(saved_tcl), TCL_CHANNEL(ahc, saved_tcl),
+			    role);
+}
+
+STATIC void
+ahc_compile_devinfo(devinfo, our_id, target, lun, channel, role)
+	struct ahc_devinfo *devinfo;
+	u_int our_id;
+	u_int target;
+	u_int lun;
+	char channel;
+	role_t role;
+{
+	devinfo->our_scsiid = our_id;
+	devinfo->target = target;
+	devinfo->lun = lun;
+	devinfo->target_offset = target;
+	devinfo->channel = channel;
+	devinfo->role = role;
+	if (channel == 'B')
+		devinfo->target_offset += 8;
+	devinfo->target_mask = (0x01 << devinfo->target_offset);
+}
+
+/*
+ * Catch an interrupt from the adapter
+ */
+int
+ahc_intr(void *arg)
+{
+	struct	ahc_softc *ahc;
+	u_int	intstat;
+
+	ahc = (struct ahc_softc *)arg; 
+
+	intstat = ahc_inb(ahc, INTSTAT);
+
+	/*
+	 * Any interrupts to process?
+	 */
+	if ((intstat & INT_PEND) == 0) {
+		if (ahc->pci_intr_func && ahc->pci_intr_func(ahc)) {
+#ifdef AHC_DEBUG
+			printf("%s: bus intr: CCHADDR %x HADDR %x SEQADDR %x\n",
+			    ahc_name(ahc),
+			    ahc_inb(ahc, CCHADDR) |
+			    (ahc_inb(ahc, CCHADDR+1) << 8)
+			    | (ahc_inb(ahc, CCHADDR+2) << 16)
+			    | (ahc_inb(ahc, CCHADDR+3) << 24),
+			    ahc_inb(ahc, HADDR) | (ahc_inb(ahc, HADDR+1) << 8)
+			    | (ahc_inb(ahc, HADDR+2) << 16)
+			    | (ahc_inb(ahc, HADDR+3) << 24),
+			    ahc_inb(ahc, SEQADDR0) |
+			    (ahc_inb(ahc, SEQADDR1) << 8));
+#endif
+			return 1;
+		}
+		return 0;
+	}
+
+	if (intstat & CMDCMPLT) {
+		ahc_outb(ahc, CLRINT, CLRCMDINT);
+		ahc_run_qoutfifo(ahc);
+	}
+	if (intstat & BRKADRINT) {
+		/*
+		 * We upset the sequencer :-(
+		 * Lookup the error message
+		 */
+		int i, error, num_errors;
+
+		error = ahc_inb(ahc, ERROR);
+		num_errors =  sizeof(hard_error)/sizeof(hard_error[0]);
+		for (i = 0; error != 1 && i < num_errors; i++)
+			error >>= 1;
+		panic("%s: brkadrint, %s at seqaddr = 0x%x\n",
+		      ahc_name(ahc), hard_error[i].errmesg,
+		      ahc_inb(ahc, SEQADDR0) |
+		      (ahc_inb(ahc, SEQADDR1) << 8));
+
+		/* Tell everyone that this HBA is no longer availible */
+		ahc_abort_scbs(ahc, ALL_TARGETS, ALL_CHANNELS,
+			       ALL_LUNS, SCB_LIST_NULL, ROLE_UNKNOWN,
+			       XS_DRIVER_STUFFUP);
+	}
+	if (intstat & SEQINT)
+		ahc_handle_seqint(ahc, intstat);
+
+	if (intstat & SCSIINT)
+		ahc_handle_scsiint(ahc, intstat);
+	return(1);
+}
+
+STATIC struct tmode_tstate *
+ahc_alloc_tstate(ahc, scsi_id, channel)
+	struct ahc_softc *ahc;
+	u_int scsi_id;
+	char channel;
+{
+	struct tmode_tstate *master_tstate;
+	struct tmode_tstate *tstate;
+	int i, s;
+
+	master_tstate = ahc->enabled_targets[ahc->our_id];
+	if (channel == 'B') {
+		scsi_id += 8;
+		master_tstate = ahc->enabled_targets[ahc->our_id_b + 8];
+	}
+	if (ahc->enabled_targets[scsi_id] != NULL
+	 && ahc->enabled_targets[scsi_id] != master_tstate)
+		panic("%s: ahc_alloc_tstate - Target already allocated",
+		      ahc_name(ahc));
+	tstate = malloc(sizeof(*tstate), M_DEVBUF, M_NOWAIT);
+	if (tstate == NULL)
+		return (NULL);
+
+	/*
+	 * If we have allocated a master tstate, copy user settings from
+	 * the master tstate (taken from SRAM or the EEPROM) for this
+	 * channel, but reset our current and goal settings to async/narrow
+	 * until an initiator talks to us.
+	 */
+	if (master_tstate != NULL) {
+		bcopy(master_tstate, tstate, sizeof(*tstate));
+		tstate->ultraenb = 0;
+		for (i = 0; i < 16; i++) {
+			bzero(&tstate->transinfo[i].current,
+			      sizeof(tstate->transinfo[i].current));
+			bzero(&tstate->transinfo[i].goal,
+			      sizeof(tstate->transinfo[i].goal));
+		}
+	} else
+		bzero(tstate, sizeof(*tstate));
+	s = splbio();
+	ahc->enabled_targets[scsi_id] = tstate;
+	splx(s);
+	return (tstate);
+}
+
+STATIC void
+ahc_handle_seqint(ahc, intstat)
+	struct ahc_softc *ahc;
+	u_int intstat;
 {
 	struct scb *scb;
 	struct ahc_devinfo devinfo;
@@ -411,18 +1740,86 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 	 */
 	ahc_outb(ahc, CLRINT, CLRSEQINT);
 	switch (intstat & SEQINT_MASK) {
-	case BAD_STATUS:
+	case NO_MATCH:
 	{
-		u_int  scb_index;
-		struct hardware_scb *hscb;
+		/* Ensure we don't leave the selection hardware on */
+		ahc_outb(ahc, SCSISEQ,
+			 ahc_inb(ahc, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP));
 
+		printf("%s:%c:%d: no active SCB for reconnecting "
+		       "target - issuing BUS DEVICE RESET\n",
+		       ahc_name(ahc), devinfo.channel, devinfo.target);
+		printf("SAVED_TCL == 0x%x, ARG_1 == 0x%x, SEQ_FLAGS == 0x%x\n",
+		       ahc_inb(ahc, SAVED_TCL), ahc_inb(ahc, ARG_1),
+		       ahc_inb(ahc, SEQ_FLAGS));
+		ahc->msgout_buf[0] = MSG_BUS_DEV_RESET;
+		ahc->msgout_len = 1;
+		ahc->msgout_index = 0;
+		ahc->msg_type = MSG_TYPE_INITIATOR_MSGOUT;
+		ahc_outb(ahc, MSG_OUT, HOST_MSG);
+		ahc_outb(ahc, SCSISIGO, ahc_inb(ahc, LASTPHASE) | ATNO);
+		break;
+	}
+	case UPDATE_TMSG_REQ:
+		ahc_outb(ahc, TARGET_MSG_REQUEST, ahc->targ_msg_req & 0xFF);
+		ahc_outb(ahc, TARGET_MSG_REQUEST + 1,
+			 (ahc->targ_msg_req >> 8) & 0xFF);
+		ahc_outb(ahc, HS_MAILBOX, 0);
+		break;
+	case SEND_REJECT: 
+	{
+		u_int rejbyte = ahc_inb(ahc, ACCUM);
+		printf("%s:%c:%d: Warning - unknown message received from "
+		       "target (0x%x).  Rejecting\n", 
+		       ahc_name(ahc), devinfo.channel, devinfo.target, rejbyte);
+		break; 
+	}
+	case NO_IDENT: 
+	{
 		/*
-		 * Set the default return value to 0 (don't
-		 * send sense).  The sense code will change
-		 * this if needed.
+		 * The reconnecting target either did not send an identify
+		 * message, or did, but we didn't find and SCB to match and
+		 * before it could respond to our ATN/abort, it hit a dataphase.
+		 * The only safe thing to do is to blow it away with a bus
+		 * reset.
 		 */
-		ahc_outb(ahc, RETURN_1, 0);
+		int found;
 
+		printf("%s:%c:%d: Target did not send an IDENTIFY message. "
+		       "LASTPHASE = 0x%x, SAVED_TCL == 0x%x\n",
+		       ahc_name(ahc), devinfo.channel, devinfo.target,
+		       ahc_inb(ahc, LASTPHASE), ahc_inb(ahc, SAVED_TCL));
+		found = ahc_reset_channel(ahc, devinfo.channel, 
+					  /*initiate reset*/TRUE);
+		printf("%s: Issued Channel %c Bus Reset. "
+		       "%d SCBs aborted\n", ahc_name(ahc), devinfo.channel,
+		       found);
+		return;
+	}
+	case BAD_PHASE:
+	{
+		u_int lastphase;
+
+		lastphase = ahc_inb(ahc, LASTPHASE);
+		if (lastphase == P_BUSFREE) {
+			printf("%s:%c:%d: Missed busfree.  Curphase = 0x%x\n",
+			       ahc_name(ahc), devinfo.channel, devinfo.target,
+			       ahc_inb(ahc, SCSISIGI));
+			restart_sequencer(ahc);
+			return;
+		} else {
+			printf("%s:%c:%d: unknown scsi bus phase %x.  "
+			       "Attempting to continue\n",
+			       ahc_name(ahc), devinfo.channel, devinfo.target,
+			       ahc_inb(ahc, SCSISIGI));
+		}
+		break; 
+	}
+	case BAD_STATUS:
+	{
+		u_int  scb_index;
+		struct hardware_scb *hscb;
+		struct scsi_xfer *xs;
 		/*
 		 * The sequencer will notify us when a command
 		 * has an error that would be of interest to
@@ -433,18 +1830,25 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 		 * the in kernel copy directly.
 		 */
 		scb_index = ahc_inb(ahc, SCB_TAG);
-		scb = ahc_lookup_scb(ahc, scb_index);
-		if (scb == NULL) {
+		scb = &ahc->scb_data->scbarray[scb_index];
+
+		/*
+		 * Set the default return value to 0 (don't
+		 * send sense).  The sense code will change
+		 * this if needed.
+		 */
+		ahc_outb(ahc, RETURN_1, 0);
+		if (!(scb_index < ahc->scb_data->numscbs
+		   && (scb->flags & SCB_ACTIVE) != 0)) {
 			printf("%s:%c:%d: ahc_intr - referenced scb "
 			       "not valid during seqint 0x%x scb(%d)\n",
 			       ahc_name(ahc), devinfo.channel,
 			       devinfo.target, intstat, scb_index);
-			ahc_dump_card_state(ahc);
-			panic("for safety");
 			goto unpause;
 		}
 
 		hscb = scb->hscb; 
+		xs = scb->xs;
 
 		/* Don't want to clobber the original sense code */
 		if ((scb->flags & SCB_SENSE) != 0) {
@@ -454,236 +1858,147 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 			 * complete.
 			 */
 			scb->flags &= ~SCB_SENSE;
-			printf("ahc_handle_seqint: sense fail\n");
-			ahc_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
+			ahcsetccbstatus(xs, XS_DRIVER_STUFFUP);
 			break;
 		}
-		ahc_set_transaction_status(scb, CAM_SCSI_STATUS_ERROR);
-		/* Freeze the queue until the client sees the error. */
-		ahc_freeze_devq(ahc, scb);
-		ahc_freeze_scb(scb);
-		ahc_set_scsi_status(scb, hscb->shared_data.status.scsi_status);
-		switch (hscb->shared_data.status.scsi_status) {
-		case SCSI_STATUS_OK:
+		/* Freeze the queue unit the client sees the error. */
+		ahc_freeze_devq(ahc, xs->sc_link);
+		ahc_freeze_ccb(scb);
+		xs->status = hscb->status;
+		switch (hscb->status) {
+		case SCSI_OK:
 			printf("%s: Interrupted for staus of 0???\n",
 			       ahc_name(ahc));
 			break;
-		case SCSI_STATUS_CMD_TERMINATED:
-		case SCSI_STATUS_CHECK_COND:
-		{
-			struct ahc_dma_seg *sg;
-			struct scsi_sense *sc;
-			struct ahc_initiator_tinfo *targ_info;
-			struct ahc_tmode_tstate *tstate;
-			struct ahc_transinfo *tinfo;
+		case SCSI_CHECK:
 #ifdef AHC_DEBUG
 			if (ahc_debug & AHC_SHOWSENSE) {
-				ahc_print_path(ahc, scb);
+				sc_print_addr(scb->xs->sc_link);
 				printf("SCB %d: requests Check Status\n",
 				       scb->hscb->tag);
 			}
 #endif
+				
+			if (xs->error == XS_NOERROR &&
+			    !(scb->flags & SCB_SENSE)) {
+				struct ahc_dma_seg *sg;
+				struct scsi_sense *sc;
+				struct ahc_initiator_tinfo *tinfo;
+				struct tmode_tstate *tstate;
 
-			if (ahc_perform_autosense(scb) == 0)
-				break;
+				sg = scb->sg_list;
+				sc = (struct scsi_sense *)(&hscb->cmdstore); 
+				/*
+				 * Save off the residual if there is one.
+				 */
+				if (hscb->residual_SG_count != 0)
+					ahc_calc_residual(scb);
+				else
+					xs->resid = 0;
 
-			targ_info = ahc_fetch_transinfo(ahc,
-							devinfo.channel,
-							devinfo.our_scsiid,
-							devinfo.target,
-							&tstate);
-			tinfo = &targ_info->curr;
-			sg = scb->sg_list;
-			sc = (struct scsi_sense *)(&hscb->shared_data.cdb); 
-			/*
-			 * Save off the residual if there is one.
- 			 */
-			ahc_update_residual(scb);
 #ifdef AHC_DEBUG
-			if (ahc_debug & AHC_SHOWSENSE) {
-				ahc_print_path(ahc, scb);
-				printf("Sending Sense\n");
-			}
+				if (ahc_debug & AHC_SHOWSENSE) {
+					sc_print_addr(scb->xs->sc_link);
+					printf("Sending Sense\n");
+				}
 #endif
-			sg->addr = ahc_get_sense_bufaddr(ahc, scb);
-			sg->len = ahc_get_sense_bufsize(ahc, scb);
-			sg->len |= AHC_DMA_LAST_SEG;
-			
-			/* Fixup byte order */
-			sg->addr = ahc_htole32(sg->addr);
-			sg->len = ahc_htole32(sg->len);
-
-			sc->opcode = REQUEST_SENSE;
-			sc->byte2 = 0;
-			if (tinfo->protocol_version <= SCSI_REV_2
-			 && SCB_GET_LUN(scb) < 8)
-				sc->byte2 = SCB_GET_LUN(scb) << 5;
-			sc->unused[0] = 0;
-			sc->unused[1] = 0;
-			sc->length = sg->len;
-			sc->control = 0;
+				sg->addr = ahc->scb_data->sense_busaddr +
+					(hscb->tag*sizeof(struct scsi_sense_data));
+				
+				sg->len = sizeof(struct scsi_sense_data);
 
-			/*
-			 * We can't allow the target to disconnect.
-			 * This will be an untagged transaction and
-			 * having the target disconnect will make this
-			 * transaction indestinguishable from outstanding
-			 * tagged transactions.
-			 */
-			hscb->control = 0;
+				sc->opcode = REQUEST_SENSE;
+				sc->byte2 =  SCB_LUN(scb) << 5;
+				sc->unused[0] = 0;
+				sc->unused[1] = 0;
+				sc->length = sg->len;
+				sc->control = 0;
 
-			/*
-			 * This request sense could be because the
-			 * the device lost power or in some other
-			 * way has lost our transfer negotiations.
-			 * Renegotiate if appropriate.  Unit attention
-			 * errors will be reported before any data
-			 * phases occur.
-			 */
-#ifdef __OpenBSD__
-			if (ahc_get_transfer_length(scb) > 0 &&
-			    ahc_get_residual(scb) == 
-			    ahc_get_transfer_length(scb)) {
-#else 
-			if (ahc_get_residual(scb) 
-			 == ahc_get_transfer_length(scb)) {
+				/*
+				 * Would be nice to preserve DISCENB here,
+				 * but due to the way we page SCBs, we can't.
+				 */
+				hscb->control = 0;
+
+				/*
+				 * This request sense could be because the
+				 * the device lost power or in some other
+				 * way has lost our transfer negotiations.
+				 * Renegotiate if appropriate.
+				 */
+				ahc_calc_residual(scb);
+#ifdef AHC_DEBUG
+				if (ahc_debug & AHC_SHOWSENSE) {
+					sc_print_addr(xs->sc_link);
+					printf("Sense: datalen %d resid %d"
+					       "chan %d id %d targ %d\n",
+					       xs->datalen, xs->resid,
+					       devinfo.channel,
+					       devinfo.our_scsiid,
+					       devinfo.target);
+				}
 #endif
-				ahc_update_neg_request(ahc, &devinfo,
-						       tstate, targ_info,
-						       /*force*/TRUE);
-			}
-			if (tstate->auto_negotiate & devinfo.target_mask) {
-				hscb->control |= MK_MESSAGE;
-				scb->flags &= ~SCB_NEGOTIATE;
-				scb->flags |= SCB_AUTO_NEGOTIATE;
+				if (xs->datalen > 0 &&
+				    xs->resid == xs->datalen) {
+				tinfo = ahc_fetch_transinfo(ahc,
+							    devinfo.channel,
+							    devinfo.our_scsiid,
+							    devinfo.target,
+							    &tstate);
+					ahc_update_target_msg_request(ahc,
+							      &devinfo,
+							      tinfo,
+							      /*force*/TRUE,
+							      /*paused*/TRUE);
+				}
+				hscb->status = 0;
+				hscb->SG_count = 1;
+				hscb->SG_pointer = scb->sg_list_phys;
+				hscb->data = sg->addr; 
+				hscb->datalen = sg->len;
+				hscb->cmdpointer = hscb->cmdstore_busaddr;
+				hscb->cmdlen = sizeof(*sc);
+				scb->sg_count = hscb->SG_count;
+				ahc_swap_hscb(hscb);
+				ahc_swap_sg(scb->sg_list);
+				scb->flags |= SCB_SENSE;
+				/*
+				 * Ensure the target is busy since this
+				 * will be an untagged request.
+				 */
+				ahc_busy_tcl(ahc, scb);
+				ahc_outb(ahc, RETURN_1, SEND_SENSE);
+
+				/*
+				 * Ensure we have enough time to actually
+				 * retrieve the sense.
+				 */
+				if (!(scb->xs->flags & SCSI_POLL))
+					timeout_add(&scb->xs->stimeout, 5 * hz);
 			}
-			hscb->cdb_len = sizeof(*sc);
-			hscb->dataptr = ahc_htole32(sg->addr); 
-			hscb->datacnt = ahc_htole32(sg->len);
-			hscb->sgptr = scb->sg_list_phys | SG_FULL_RESID;
-			hscb->sgptr = ahc_htole32(hscb->sgptr);
-			scb->sg_count = 1;
-			scb->flags |= SCB_SENSE;
-			ahc_qinfifo_requeue_tail(ahc, scb);
-			ahc_outb(ahc, RETURN_1, SEND_SENSE);
-#ifdef __OpenBSD__
-			if (!(scb->io_ctx->flags & SCSI_POLL))
-				timeout_add(&scb->io_ctx->stimeout, 5 * hz);
-#endif 
-#ifdef __FreeBSD__
+			break;
+		case SCSI_BUSY:
 			/*
-			 * Ensure we have enough time to actually
-			 * retrieve the sense.
+			 * Requeue any transactions that haven't been
+			 * sent yet.
 			 */
-			untimeout(ahc_timeout, (caddr_t)scb,
-				  scb->io_ctx->ccb_h.timeout_ch);
-			scb->io_ctx->ccb_h.timeout_ch =
-			    timeout(ahc_timeout, (caddr_t)scb, 5 * hz);
-#endif
-			break;
-		}
-		default:
+			ahc_freeze_devq(ahc, xs->sc_link);
+			ahc_freeze_ccb(scb);
 			break;
 		}
 		break;
 	}
-	case NO_MATCH:
+	case TRACE_POINT:
 	{
-		/* Ensure we don't leave the selection hardware on */
-		ahc_outb(ahc, SCSISEQ,
-			 ahc_inb(ahc, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP));
-
-		printf("%s:%c:%d: no active SCB for reconnecting "
-		       "target - issuing BUS DEVICE RESET\n",
-		       ahc_name(ahc), devinfo.channel, devinfo.target);
-		printf("SAVED_SCSIID == 0x%x, SAVED_LUN == 0x%x, "
-		       "ARG_1 == 0x%x ACCUM = 0x%x\n",
-		       ahc_inb(ahc, SAVED_SCSIID), ahc_inb(ahc, SAVED_LUN),
-		       ahc_inb(ahc, ARG_1), ahc_inb(ahc, ACCUM));
-		printf("SEQ_FLAGS == 0x%x, SCBPTR == 0x%x, BTT == 0x%x, "
-		       "SINDEX == 0x%x\n",
-		       ahc_inb(ahc, SEQ_FLAGS), ahc_inb(ahc, SCBPTR),
-		       ahc_index_busy_tcl(ahc,
-			    BUILD_TCL(ahc_inb(ahc, SAVED_SCSIID),
-				      ahc_inb(ahc, SAVED_LUN))),
-		       ahc_inb(ahc, SINDEX));
-		printf("SCSIID == 0x%x, SCB_SCSIID == 0x%x, SCB_LUN == 0x%x, "
-		       "SCB_TAG == 0x%x, SCB_CONTROL == 0x%x\n",
-		       ahc_inb(ahc, SCSIID), ahc_inb(ahc, SCB_SCSIID),
-		       ahc_inb(ahc, SCB_LUN), ahc_inb(ahc, SCB_TAG),
-		       ahc_inb(ahc, SCB_CONTROL));
-		printf("SCSIBUSL == 0x%x, SCSISIGI == 0x%x\n",
-		       ahc_inb(ahc, SCSIBUSL), ahc_inb(ahc, SCSISIGI));
-		printf("SXFRCTL0 == 0x%x\n", ahc_inb(ahc, SXFRCTL0));
-		printf("SEQCTL == 0x%x\n", ahc_inb(ahc, SEQCTL));
-		ahc_dump_card_state(ahc);
-		ahc->msgout_buf[0] = MSG_BUS_DEV_RESET;
-		ahc->msgout_len = 1;
-		ahc->msgout_index = 0;
-		ahc->msg_type = MSG_TYPE_INITIATOR_MSGOUT;
-		ahc_outb(ahc, MSG_OUT, HOST_MSG);
-		ahc_assert_atn(ahc);
+		printf("SSTAT2 = 0x%x DFCNTRL = 0x%x\n", ahc_inb(ahc, SSTAT2),
+		       ahc_inb(ahc, DFCNTRL));
+		printf("SSTAT3 = 0x%x DSTATUS = 0x%x\n", ahc_inb(ahc, SSTAT3),
+		       ahc_inb(ahc, DFSTATUS));
+		printf("SSTAT0 = 0x%x, SCB_DATACNT = 0x%x\n",
+		       ahc_inb(ahc, SSTAT0),
+		       ahc_inb(ahc, SCB_DATACNT));
 		break;
 	}
-	case SEND_REJECT: 
-	{
-		u_int rejbyte = ahc_inb(ahc, ACCUM);
-		printf("%s:%c:%d: Warning - unknown message received from "
-		       "target (0x%x).  Rejecting\n", 
-		       ahc_name(ahc), devinfo.channel, devinfo.target, rejbyte);
-		break; 
-	}
-	case NO_IDENT: 
-	{
-		/*
-		 * The reconnecting target either did not send an identify
-		 * message, or did, but we didn't find an SCB to match and
-		 * before it could respond to our ATN/abort, it hit a dataphase.
-		 * The only safe thing to do is to blow it away with a bus
-		 * reset.
-		 */
-		int found;
-
-		printf("%s:%c:%d: Target did not send an IDENTIFY message. "
-		       "LASTPHASE = 0x%x, SAVED_SCSIID == 0x%x\n",
-		       ahc_name(ahc), devinfo.channel, devinfo.target,
-		       ahc_inb(ahc, LASTPHASE), ahc_inb(ahc, SAVED_SCSIID));
-		found = ahc_reset_channel(ahc, devinfo.channel, 
-					  /*initiate reset*/TRUE);
-		printf("%s: Issued Channel %c Bus Reset. "
-		       "%d SCBs aborted\n", ahc_name(ahc), devinfo.channel,
-		       found);
-		return;
-	}
-	case IGN_WIDE_RES:
-		ahc_handle_ign_wide_residue(ahc, &devinfo);
-		break;
-	case PDATA_REINIT:
-		ahc_reinitialize_dataptrs(ahc);
-		break;
-	case BAD_PHASE:
-	{
-		u_int lastphase;
-
-		lastphase = ahc_inb(ahc, LASTPHASE);
-		printf("%s:%c:%d: unknown scsi bus phase %x, "
-		       "lastphase = 0x%x.  Attempting to continue\n",
-		       ahc_name(ahc), devinfo.channel, devinfo.target,
-		       lastphase, ahc_inb(ahc, SCSISIGI));
-		break;
-	}
-	case MISSED_BUSFREE:
-	{
-		u_int lastphase;
-
-		lastphase = ahc_inb(ahc, LASTPHASE);
-		printf("%s:%c:%d: Missed busfree. "
-		       "Lastphase = 0x%x, Curphase = 0x%x\n",
-		       ahc_name(ahc), devinfo.channel, devinfo.target,
-		       lastphase, ahc_inb(ahc, SCSISIGI));
-		ahc_restart(ahc);
-		return;
-	}
 	case HOST_MSG_LOOP:
 	{
 		/*
@@ -691,15 +2006,12 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 		 * that requires host assistance for completion.
 		 * While handling the message phase(s), we will be
 		 * notified by the sequencer after each byte is
-		 * transfered so we can track bus phase changes.
+		 * transfered so we can track bus phases.
 		 *
-		 * If this is the first time we've seen a HOST_MSG_LOOP
-		 * interrupt, initialize the state of the host message
-		 * loop.
+		 * If this is the first time we've seen a HOST_MSG_LOOP,
+		 * initialize the state of the host message loop.
 		 */
 		if (ahc->msg_type == MSG_TYPE_NONE) {
-			struct scb *scb;
-			u_int scb_index;
 			u_int bus_phase;
 
 			bus_phase = ahc_inb(ahc, SCSISIGI) & PHASE_MASK;
@@ -713,16 +2025,15 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 				 * we got here.  Just punt the message.
 				 */
 				ahc_clear_intstat(ahc);
-				ahc_restart(ahc);
-				return;
+				restart_sequencer(ahc);
 			}
 
-			scb_index = ahc_inb(ahc, SCB_TAG);
-			scb = ahc_lookup_scb(ahc, scb_index);
 			if (devinfo.role == ROLE_INITIATOR) {
-				if (scb == NULL)
-					panic("HOST_MSG_LOOP with "
-					      "invalid SCB %x\n", scb_index);
+				struct scb *scb;
+				u_int scb_index;
+
+				scb_index = ahc_inb(ahc, SCB_TAG);
+				scb = &ahc->scb_data->scbarray[scb_index];
 
 				if (bus_phase == P_MESGOUT)
 					ahc_setup_initiator_msgout(ahc,
@@ -738,17 +2049,14 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 					ahc->msg_type =
 					    MSG_TYPE_TARGET_MSGOUT;
 					ahc->msgin_index = 0;
-				}
-#if AHC_TARGET_MODE
-				else 
-					ahc_setup_target_msgin(ahc,
-							       &devinfo,
-							       scb);
-#endif
+				} else 
+					/* XXX Ever executed??? */
+					ahc_setup_target_msgin(ahc, &devinfo);
 			}
 		}
 
-		ahc_handle_message_phase(ahc);
+		/* Pass a NULL path so that handlers generate their own */
+		ahc_handle_message_phase(ahc, /*path*/NULL);
 		break;
 	}
 	case PERR_DETECTED:
@@ -766,20 +2074,17 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 		 */
 		if ((intstat & SCSIINT) == 0
 		 && (ahc_inb(ahc, SSTAT1) & SCSIPERR) != 0) {
+			u_int curphase;
 
-			if ((ahc->features & AHC_DT) == 0) {
-				u_int curphase;
-
-				/*
-				 * The hardware will only let you ack bytes
-				 * if the expected phase in SCSISIGO matches
-				 * the current phase.  Make sure this is
-				 * currently the case.
-				 */
-				curphase = ahc_inb(ahc, SCSISIGI) & PHASE_MASK;
-				ahc_outb(ahc, LASTPHASE, curphase);
-				ahc_outb(ahc, SCSISIGO, curphase);
-			}
+			/*
+			 * The hardware will only let you ack bytes
+			 * if the expected phase in SCSISIGO matches
+			 * the current phase.  Make sure this is
+			 * currently the case.
+			 */
+			curphase = ahc_inb(ahc, SCSISIGI) & PHASE_MASK;
+			ahc_outb(ahc, LASTPHASE, curphase);
+			ahc_outb(ahc, SCSISIGO, curphase);
 			ahc_inb(ahc, SCSIDATL);
 		}
 		break;
@@ -796,158 +2101,98 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 		 */
 		u_int scbindex = ahc_inb(ahc, SCB_TAG);
 		u_int lastphase = ahc_inb(ahc, LASTPHASE);
-		u_int i;
+		int i;
 
-		scb = ahc_lookup_scb(ahc, scbindex);
+		scb = &ahc->scb_data->scbarray[scbindex];
 		for (i = 0; i < num_phases; i++) {
-			if (lastphase == ahc_phase_table[i].phase)
+			if (lastphase == phase_table[i].phase)
 				break;
 		}
-		ahc_print_path(ahc, scb);
+		sc_print_addr(scb->xs->sc_link);
 		printf("data overrun detected %s."
 		       "  Tag == 0x%x.\n",
-		       ahc_phase_table[i].phasemsg,
+		       phase_table[i].phasemsg,
   		       scb->hscb->tag);
-		ahc_print_path(ahc, scb);
-		printf("%s seen Data Phase.  Length = %ld.  NumSGs = %d.\n",
+		sc_print_addr(scb->xs->sc_link);
+		printf("%s seen Data Phase.  Length = %d.  NumSGs = %d.\n",
 		       ahc_inb(ahc, SEQ_FLAGS) & DPHASE ? "Have" : "Haven't",
-		       ahc_get_transfer_length(scb), scb->sg_count);
+		       scb->xs->datalen, scb->sg_count);
 		if (scb->sg_count > 0) {
 			for (i = 0; i < scb->sg_count; i++) {
-
-				printf("sg[%d] - Addr 0x%x%x : Length %d\n",
+				printf("sg[%d] - Addr 0x%x : Length %d\n",
 				       i,
-				       (ahc_le32toh(scb->sg_list[i].len) >> 24
-				        & SG_HIGH_ADDR_BITS),
-				       ahc_le32toh(scb->sg_list[i].addr),
-				       ahc_le32toh(scb->sg_list[i].len)
-				       & AHC_SG_LEN_MASK);
+				       (unsigned int)le32toh(scb->sg_list[i].addr),
+				       (unsigned int)le32toh(scb->sg_list[i].len));
 			}
 		}
 		/*
-		 * Set this and it will take effect when the
+		 * Set this and it will take affect when the
 		 * target does a command complete.
 		 */
-		ahc_freeze_devq(ahc, scb);
-		ahc_set_transaction_status(scb, CAM_DATA_RUN_ERR);
-		ahc_freeze_scb(scb);
-
-		if ((ahc->features & AHC_ULTRA2) != 0) {
-			/*
-			 * Clear the channel in case we return
-			 * to data phase later.
-			 */
-			ahc_outb(ahc, SXFRCTL0,
-				 ahc_inb(ahc, SXFRCTL0) | CLRSTCNT|CLRCHN);
-			ahc_outb(ahc, SXFRCTL0,
-				 ahc_inb(ahc, SXFRCTL0) | CLRSTCNT|CLRCHN);
-		}
-		if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-			u_int dscommand1;
-
-			/* Ensure HHADDR is 0 for future DMA operations. */
-			dscommand1 = ahc_inb(ahc, DSCOMMAND1);
-			ahc_outb(ahc, DSCOMMAND1, dscommand1 | HADDLDSEL0);
-			ahc_outb(ahc, HADDR, 0);
-			ahc_outb(ahc, DSCOMMAND1, dscommand1);
-		}
-		break;
-	}
-	case MKMSG_FAILED:
-	{
-		u_int scbindex;
-
-		printf("%s:%c:%d:%d: Attempt to issue message failed\n",
-		       ahc_name(ahc), devinfo.channel, devinfo.target,
-		       devinfo.lun);
-		scbindex = ahc_inb(ahc, SCB_TAG);
-		scb = ahc_lookup_scb(ahc, scbindex);
-		if (scb != NULL
-		 && (scb->flags & SCB_RECOVERY_SCB) != 0)
-			/*
-			 * Ensure that we didn't put a second instance of this
-			 * SCB into the QINFIFO.
-			 */
-			ahc_search_qinfifo(ahc, SCB_GET_TARGET(ahc, scb),
-					   SCB_GET_CHANNEL(ahc, scb),
-					   SCB_GET_LUN(scb), scb->hscb->tag,
-					   ROLE_INITIATOR, /*status*/0,
-					   SEARCH_REMOVE);
+		ahc_freeze_devq(ahc, scb->xs->sc_link);
+		ahcsetccbstatus(scb->xs, XS_DRIVER_STUFFUP);
+		ahc_freeze_ccb(scb);
 		break;
 	}
-	case NO_FREE_SCB:
+	case TRACEPOINT:
 	{
-		printf("%s: No free or disconnected SCBs\n", ahc_name(ahc));
-		ahc_dump_card_state(ahc);
-		panic("for safety");
+		printf("TRACEPOINT: RETURN_2 = %d\n", ahc_inb(ahc, RETURN_2));
+#if 0
+		printf("SSTAT1 == 0x%x\n", ahc_inb(ahc, SSTAT1));
+		printf("SSTAT0 == 0x%x\n", ahc_inb(ahc, SSTAT0));
+		printf(", SCSISIGI == 0x%x\n", ahc_inb(ahc, SCSISIGI));
+		printf("TRACEPOINT: CCHCNT = %d, SG_COUNT = %d\n",
+		       ahc_inb(ahc, CCHCNT), ahc_inb(ahc, SG_COUNT));
+		printf("TRACEPOINT: SCB_TAG = %d\n", ahc_inb(ahc, SCB_TAG));
+		printf("TRACEPOINT1: CCHADDR = %d, CCHCNT = %d, SCBPTR = %d\n",
+		       ahc_inb(ahc, CCHADDR)
+		    | (ahc_inb(ahc, CCHADDR+1) << 8)
+		    | (ahc_inb(ahc, CCHADDR+2) << 16)
+		    | (ahc_inb(ahc, CCHADDR+3) << 24),
+		       ahc_inb(ahc, CCHCNT)
+		    | (ahc_inb(ahc, CCHCNT+1) << 8)
+		    | (ahc_inb(ahc, CCHCNT+2) << 16),
+		       ahc_inb(ahc, SCBPTR));
+		printf("TRACEPOINT: WAITING_SCBH = %d\n", 
+		       ahc_inb(ahc, WAITING_SCBH));
+		printf("TRACEPOINT: SCB_TAG = %d\n", ahc_inb(ahc, SCB_TAG));
+#endif
 		break;
 	}
-	case SCB_MISMATCH:
-	{
-		u_int scbptr;
-
-		scbptr = ahc_inb(ahc, SCBPTR);
-		printf("Bogus TAG after DMA.  SCBPTR %d, tag %d, our tag %d\n",
-		       scbptr, ahc_inb(ahc, ARG_1),
-		       ahc->scb_data->hscbs[scbptr].tag);
-		ahc_dump_card_state(ahc);
-		panic("for saftey");
+#if NOT_YET
+	/* XXX Fill these in later */
+	case MESG_BUFFER_BUSY:
 		break;
-	}
-	case OUT_OF_RANGE:
-	{
-		printf("%s: BTT calculation out of range\n", ahc_name(ahc));
-		printf("SAVED_SCSIID == 0x%x, SAVED_LUN == 0x%x, "
-		       "ARG_1 == 0x%x ACCUM = 0x%x\n",
-		       ahc_inb(ahc, SAVED_SCSIID), ahc_inb(ahc, SAVED_LUN),
-		       ahc_inb(ahc, ARG_1), ahc_inb(ahc, ACCUM));
-		printf("SEQ_FLAGS == 0x%x, SCBPTR == 0x%x, BTT == 0x%x, "
-		       "SINDEX == 0x%x\n, A == 0x%x\n",
-		       ahc_inb(ahc, SEQ_FLAGS), ahc_inb(ahc, SCBPTR),
-		       ahc_index_busy_tcl(ahc,
-			    BUILD_TCL(ahc_inb(ahc, SAVED_SCSIID),
-				      ahc_inb(ahc, SAVED_LUN))),
-		       ahc_inb(ahc, SINDEX),
-		       ahc_inb(ahc, ACCUM));
-		printf("SCSIID == 0x%x, SCB_SCSIID == 0x%x, SCB_LUN == 0x%x, "
-		       "SCB_TAG == 0x%x, SCB_CONTROL == 0x%x\n",
-		       ahc_inb(ahc, SCSIID), ahc_inb(ahc, SCB_SCSIID),
-		       ahc_inb(ahc, SCB_LUN), ahc_inb(ahc, SCB_TAG),
-		       ahc_inb(ahc, SCB_CONTROL));
-		printf("SCSIBUSL == 0x%x, SCSISIGI == 0x%x\n",
-		       ahc_inb(ahc, SCSIBUSL), ahc_inb(ahc, SCSISIGI));
-		ahc_dump_card_state(ahc);
-		panic("for safety");
+	case MSGIN_PHASEMIS:
 		break;
-	}
+#endif
 	default:
 		printf("ahc_intr: seqint, "
 		       "intstat == 0x%x, scsisigi = 0x%x\n",
 		       intstat, ahc_inb(ahc, SCSISIGI));
 		break;
 	}
+	
 unpause:
 	/*
 	 *  The sequencer is paused immediately on
 	 *  a SEQINT, so we should restart it when
 	 *  we're done.
 	 */
-	ahc_unpause(ahc);
+	unpause_sequencer(ahc);
 }
 
-void
-ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
+STATIC void
+ahc_handle_scsiint(ahc, intstat)
+	struct ahc_softc *ahc;
+	u_int intstat;
 {
 	u_int	scb_index;
-	u_int	status0;
 	u_int	status;
 	struct	scb *scb;
 	char	cur_channel;
 	char	intr_channel;
 
-	/* Make sure the sequencer is in a safe location. */
-	ahc_clear_critical_section(ahc);
-
 	if ((ahc->features & AHC_TWIN) != 0
 	 && ((ahc_inb(ahc, SBLKCTL) & SELBUSB) != 0))
 		cur_channel = 'B';
@@ -955,59 +2200,34 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
 		cur_channel = 'A';
 	intr_channel = cur_channel;
 
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		status0 = ahc_inb(ahc, SSTAT0) & IOERR;
-	else
-		status0 = 0;
-	status = ahc_inb(ahc, SSTAT1) & (SELTO|SCSIRSTI|BUSFREE|SCSIPERR);
-	if (status == 0 && status0 == 0) {
+	status = ahc_inb(ahc, SSTAT1);
+	if (status == 0) {
 		if ((ahc->features & AHC_TWIN) != 0) {
 			/* Try the other channel */
 		 	ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) ^ SELBUSB);
-			status = ahc_inb(ahc, SSTAT1)
-			       & (SELTO|SCSIRSTI|BUSFREE|SCSIPERR);
+			status = ahc_inb(ahc, SSTAT1);
+		 	ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) ^ SELBUSB);
 			intr_channel = (cur_channel == 'A') ? 'B' : 'A';
 		}
 		if (status == 0) {
 			printf("%s: Spurious SCSI interrupt\n", ahc_name(ahc));
-			ahc_outb(ahc, CLRINT, CLRSCSIINT);
-			ahc_unpause(ahc);
 			return;
 		}
 	}
 
 	scb_index = ahc_inb(ahc, SCB_TAG);
-	scb = ahc_lookup_scb(ahc, scb_index);
-	if (scb != NULL
-	 && (ahc_inb(ahc, SEQ_FLAGS) & IDENTIFY_SEEN) == 0)
+	if (scb_index < ahc->scb_data->numscbs) {
+		scb = &ahc->scb_data->scbarray[scb_index];
+		if ((scb->flags & SCB_ACTIVE) == 0
+		 || (ahc_inb(ahc, SEQ_FLAGS) & IDENTIFY_SEEN) == 0)
+			scb = NULL;
+	} else
 		scb = NULL;
 
-	if ((ahc->features & AHC_ULTRA2) != 0
-	 && (status0 & IOERR) != 0) {
-		int now_lvd;
-
-		now_lvd = ahc_inb(ahc, SBLKCTL) & ENAB40;
-		printf("%s: Transceiver State Has Changed to %s mode\n",
-		       ahc_name(ahc), now_lvd ? "LVD" : "SE");
-		ahc_outb(ahc, CLRSINT0, CLRIOERR);
-		/*
-		 * When transitioning to SE mode, the reset line
-		 * glitches, triggering an arbitration bug in some
-		 * Ultra2 controllers.  This bug is cleared when we
-		 * assert the reset line.  Since a reset glitch has
-		 * already occurred with this transition and a
-		 * transceiver state change is handled just like
-		 * a bus reset anyway, asserting the reset line
-		 * ourselves is safe.
-		 */
-		ahc_reset_channel(ahc, intr_channel,
-				 /*Initiate Reset*/now_lvd == 0);
-	} else if ((status & SCSIRSTI) != 0) {
+	if ((status & SCSIRSTI) != 0) {
 		printf("%s: Someone reset channel %c\n",
 			ahc_name(ahc), intr_channel);
-		if (intr_channel != cur_channel)
-		 	ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) ^ SELBUSB);
-		ahc_reset_channel(ahc, intr_channel, /*Initiate Reset*/FALSE);
+		ahc_reset_channel(ahc, intr_channel, /* Initiate Reset */FALSE);
 	} else if ((status & SCSIPERR) != 0) {
 		/*
 		 * Determine the bus phase and queue an appropriate message.
@@ -1023,13 +2243,10 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
 		u_int curphase;
 		u_int errorphase;
 		u_int lastphase;
-		u_int scsirate;
-		u_int i;
-		u_int sstat2;
+		int   i;
 
 		lastphase = ahc_inb(ahc, LASTPHASE);
 		curphase = ahc_inb(ahc, SCSISIGI) & PHASE_MASK;
-		sstat2 = ahc_inb(ahc, SSTAT2);
 		ahc_outb(ahc, CLRSINT1, CLRSCSIPERR);
 		/*
 		 * For all phases save DATA, the sequencer won't
@@ -1043,40 +2260,28 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
 		 * curphase and lastphase.
 		 */
 		if ((ahc_inb(ahc, SSTAT1) & SCSIPERR) != 0
-		 || curphase == P_DATAIN || curphase == P_DATAIN_DT)
+		 || curphase == P_DATAIN)
 			errorphase = curphase;
 		else
 			errorphase = lastphase;
 
 		for (i = 0; i < num_phases; i++) {
-			if (errorphase == ahc_phase_table[i].phase)
+			if (errorphase == phase_table[i].phase)
 				break;
 		}
-		mesg_out = ahc_phase_table[i].mesg_out;
+		mesg_out = phase_table[i].mesg_out;
 		if (scb != NULL)
-			ahc_print_path(ahc, scb);
+			sc_print_addr(scb->xs->sc_link);
 		else
-			printf("%s:%c:%d: ", ahc_name(ahc), intr_channel,
-			       SCSIID_TARGET(ahc, ahc_inb(ahc, SAVED_SCSIID)));
-		scsirate = ahc_inb(ahc, SCSIRATE);
+			printf("%s:%c:%d: ", ahc_name(ahc),
+			       intr_channel,
+			       TCL_TARGET(ahc_inb(ahc, SAVED_TCL)));
+		
 		printf("parity error detected %s. "
 		       "SEQADDR(0x%x) SCSIRATE(0x%x)\n",
-		       ahc_phase_table[i].phasemsg,
+		       phase_table[i].phasemsg,
 		       ahc_inb(ahc, SEQADDR0) | (ahc_inb(ahc, SEQADDR1) << 8),
-		       scsirate);
-
-		if ((ahc->features & AHC_DT) != 0) {
-
-			if ((sstat2 & CRCVALERR) != 0)
-				printf("\tCRC Value Mismatch\n");
-			if ((sstat2 & CRCENDERR) != 0)
-				printf("\tNo terminal CRC packet recevied\n");
-			if ((sstat2 & CRCREQERR) != 0)
-				printf("\tIllegal CRC packet request\n");
-			if ((sstat2 & DUAL_EDGE_ERR) != 0)
-				printf("\tUnexpected %sDT Data Phase\n",
-				       (scsirate & SINGLE_EDGE) ? "" : "non-");
-		}
+		       ahc_inb(ahc, SCSIRATE));
 
 		/*
 		 * We've set the hardware to assert ATN if we   
@@ -1092,179 +2297,76 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
 				ahc_outb(ahc, MSG_OUT, mesg_out);
 		}
 		ahc_outb(ahc, CLRINT, CLRSCSIINT);
-		ahc_unpause(ahc);
-	} else if ((status & SELTO) != 0) {
-		u_int scbptr;
-
-		/* Stop the selection */
-		ahc_outb(ahc, SCSISEQ, 0);
-
-		/* No more pending messages */
-		ahc_clear_msg_state(ahc);
-
-		/* Clear interrupt state */
-		ahc_outb(ahc, SIMODE1, ahc_inb(ahc, SIMODE1) & ~ENBUSFREE);
-		ahc_outb(ahc, CLRSINT1, CLRSELTIMEO|CLRBUSFREE|CLRSCSIPERR);
-
-		/*
-		 * Although the driver does not care about the
-		 * 'Selection in Progress' status bit, the busy
-		 * LED does.  SELINGO is only cleared by a sucessfull
-		 * selection, so we must manually clear it to insure
-		 * the LED turns off just incase no future successful
-		 * selections occur (e.g. no devices on the bus).
-		 */
-		ahc_outb(ahc, CLRSINT0, CLRSELINGO);
-
-		scbptr = ahc_inb(ahc, WAITING_SCBH);
-		ahc_outb(ahc, SCBPTR, scbptr);
-		scb_index = ahc_inb(ahc, SCB_TAG);
-
-		scb = ahc_lookup_scb(ahc, scb_index);
-		if (scb == NULL) {
-			printf("%s: ahc_intr - referenced scb not "
-			       "valid during SELTO scb(%d, %d)\n",
-			       ahc_name(ahc), scbptr, scb_index);
-		} else {
-			ahc_set_transaction_status(scb, CAM_SEL_TIMEOUT);
-			ahc_freeze_devq(ahc, scb);
-		}
-		ahc_outb(ahc, CLRINT, CLRSCSIINT);
-		ahc_restart(ahc);
+		unpause_sequencer(ahc);
 	} else if ((status & BUSFREE) != 0
 		&& (ahc_inb(ahc, SIMODE1) & ENBUSFREE) != 0) {
-		u_int lastphase;
-		u_int saved_scsiid;
-		u_int saved_lun;
-		u_int target;
-		u_int initiator_role_id;
-		char channel;
-		int printerror;
-
-		/*
-		 * Clear our selection hardware as soon as possible.
-		 * We may have an entry in the waiting Q for this target,
-		 * that is affected by this busfree and we don't want to
-		 * go about selecting the target while we handle the event.
-		 */
-		ahc_outb(ahc, SCSISEQ,
-			 ahc_inb(ahc, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP));
-
 		/*
-		 * Disable busfree interrupts and clear the busfree
-		 * interrupt status.  We do this here so that several
-		 * bus transactions occur prior to clearing the SCSIINT
-		 * latch.  It can take a bit for the clearing to take effect.
-		 */
-		ahc_outb(ahc, SIMODE1, ahc_inb(ahc, SIMODE1) & ~ENBUSFREE);
-		ahc_outb(ahc, CLRSINT1, CLRBUSFREE|CLRSCSIPERR);
-
-		/*
-		 * Look at what phase we were last in.
+		 * First look at what phase we were last in.
 		 * If its message out, chances are pretty good
 		 * that the busfree was in response to one of
 		 * our abort requests.
 		 */
-		lastphase = ahc_inb(ahc, LASTPHASE);
-		saved_scsiid = ahc_inb(ahc, SAVED_SCSIID);
-		saved_lun = ahc_inb(ahc, SAVED_LUN);
-		target = SCSIID_TARGET(ahc, saved_scsiid);
-		initiator_role_id = SCSIID_OUR_ID(saved_scsiid);
-		channel = SCSIID_CHANNEL(ahc, saved_scsiid);
-		printerror = 1;
+		u_int lastphase = ahc_inb(ahc, LASTPHASE);
+		u_int saved_tcl = ahc_inb(ahc, SAVED_TCL);
+		u_int target = TCL_TARGET(saved_tcl);
+		u_int initiator_role_id = TCL_SCSI_ID(ahc, saved_tcl);
+		char channel = TCL_CHANNEL(ahc, saved_tcl);
+		int printerror = 1;
 
+		ahc_outb(ahc, SCSISEQ,
+			 ahc_inb(ahc, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP));
 		if (lastphase == P_MESGOUT) {
-			struct ahc_devinfo devinfo;
+			u_int message;
 			u_int tag;
 
-			ahc_fetch_devinfo(ahc, &devinfo);
+			message = ahc->msgout_buf[ahc->msgout_index - 1];
 			tag = SCB_LIST_NULL;
-			if (ahc_sent_msg(ahc, AHCMSG_1B, MSG_ABORT_TAG, TRUE)
-			 || ahc_sent_msg(ahc, AHCMSG_1B, MSG_ABORT, TRUE)) {
-				if (ahc->msgout_buf[ahc->msgout_index - 1]
-				 == MSG_ABORT_TAG)
-					tag = scb->hscb->tag;
-				ahc_print_path(ahc, scb);
-				printf("SCB %d - Abort%s Completed.\n",
+			switch (message) {
+			case MSG_ABORT_TAG:
+				tag = scb->hscb->tag;
+				/* FALLTRHOUGH */
+			case MSG_ABORT:
+				sc_print_addr(scb->xs->sc_link);
+				printf("SCB %d - Abort %s Completed.\n",
 				       scb->hscb->tag, tag == SCB_LIST_NULL ?
-				       "" : " Tag");
+				       "" : "Tag");
 				ahc_abort_scbs(ahc, target, channel,
-					       saved_lun, tag,
+					       TCL_LUN(saved_tcl), tag,
 					       ROLE_INITIATOR,
-					       CAM_REQ_ABORTED);
+					       XS_DRIVER_STUFFUP);
 				printerror = 0;
-			} else if (ahc_sent_msg(ahc, AHCMSG_1B,
-						MSG_BUS_DEV_RESET, TRUE)) {
+				break;
+			case MSG_BUS_DEV_RESET:
+			{
 				struct ahc_devinfo devinfo;
-#ifdef __FreeBSD__
-				/*
-				 * Don't mark the user's request for this BDR
-				 * as completing with CAM_BDR_SENT.  CAM3
-				 * specifies CAM_REQ_CMP.
-				 */
-				if (scb != NULL
-				 && scb->io_ctx->ccb_h.func_code== XPT_RESET_DEV
-				 && ahc_match_scb(ahc, scb, target, channel,
-						  CAM_LUN_WILDCARD,
+
+				if (scb != NULL &&
+				    (scb->xs->flags & SCSI_RESET)
+				 && ahc_match_scb(scb, target, channel,
+						  TCL_LUN(saved_tcl),
 						  SCB_LIST_NULL,
 						  ROLE_INITIATOR)) {
-					ahc_set_transaction_status(scb, CAM_REQ_CMP);
+					ahcsetccbstatus(scb->xs, XS_NOERROR);
 				}
-#endif
 				ahc_compile_devinfo(&devinfo,
 						    initiator_role_id,
 						    target,
-						    CAM_LUN_WILDCARD,
+						    TCL_LUN(saved_tcl),
 						    channel,
 						    ROLE_INITIATOR);
 				ahc_handle_devreset(ahc, &devinfo,
-						    CAM_BDR_SENT,
+						    XS_RESET,
 						    "Bus Device Reset",
 						    /*verbose_level*/0);
 				printerror = 0;
-			} else if (ahc_sent_msg(ahc, AHCMSG_EXT,
-						MSG_EXT_PPR, FALSE)) {
-				struct ahc_initiator_tinfo *tinfo;
-				struct ahc_tmode_tstate *tstate;
-
-				/*
-				 * PPR Rejected.  Try non-ppr negotiation
-				 * and retry command.
-				 */
-				tinfo = ahc_fetch_transinfo(ahc,
-							    devinfo.channel,
-							    devinfo.our_scsiid,
-							    devinfo.target,
-							    &tstate);
-				tinfo->curr.transport_version = 2;
-				tinfo->goal.transport_version = 2;
-				tinfo->goal.ppr_options = 0;
-				ahc_qinfifo_requeue_tail(ahc, scb);
-				printerror = 0;
-			} else if (ahc_sent_msg(ahc, AHCMSG_EXT,
-						MSG_EXT_WDTR, FALSE)
-				|| ahc_sent_msg(ahc, AHCMSG_EXT,
-						MSG_EXT_SDTR, FALSE)) {
-				/*
-				 * Negotiation Rejected.  Go-async and
-				 * retry command.
-				 */
-				ahc_set_width(ahc, &devinfo,
-					      MSG_EXT_WDTR_BUS_8_BIT,
-					      AHC_TRANS_CUR|AHC_TRANS_GOAL,
-					      /*paused*/TRUE);
-				ahc_set_syncrate(ahc, &devinfo,
-						/*syncrate*/NULL,
-						/*period*/0, /*offset*/0,
-						/*ppr_options*/0,
-						AHC_TRANS_CUR|AHC_TRANS_GOAL,
-						/*paused*/TRUE);
-				ahc_qinfifo_requeue_tail(ahc, scb);
-				printerror = 0;
+				break;
+			}
+			default:
+				break;
 			}
 		}
 		if (printerror != 0) {
-			u_int i;
+			int i;
 
 			if (scb != NULL) {
 				u_int tag;
@@ -1273,11 +2375,11 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
 					tag = scb->hscb->tag;
 				else
 					tag = SCB_LIST_NULL;
-				ahc_print_path(ahc, scb);
 				ahc_abort_scbs(ahc, target, channel,
-					       SCB_GET_LUN(scb), tag,
+					       SCB_LUN(scb), tag,
 					       ROLE_INITIATOR,
-					       CAM_UNEXP_BUSFREE);
+					       XS_DRIVER_STUFFUP);
+				sc_print_addr(scb->xs->sc_link);
 			} else {
 				/*
 				 * We had not fully identified this connection,
@@ -1286,853 +2388,133 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
 				printf("%s: ", ahc_name(ahc));
 			}
 			for (i = 0; i < num_phases; i++) {
-				if (lastphase == ahc_phase_table[i].phase)
+				if (lastphase == phase_table[i].phase)
 					break;
 			}
 			printf("Unexpected busfree %s\n"
 			       "SEQADDR == 0x%x\n",
-			       ahc_phase_table[i].phasemsg,
-			       ahc_inb(ahc, SEQADDR0)
+			       phase_table[i].phasemsg, ahc_inb(ahc, SEQADDR0)
 				| (ahc_inb(ahc, SEQADDR1) << 8));
 		}
 		ahc_clear_msg_state(ahc);
+		ahc_outb(ahc, SIMODE1, ahc_inb(ahc, SIMODE1) & ~ENBUSFREE);
+		ahc_outb(ahc, CLRSINT1, CLRBUSFREE|CLRSCSIPERR);
 		ahc_outb(ahc, CLRINT, CLRSCSIINT);
-		ahc_restart(ahc);
-	} else {
-		printf("%s: Missing case in ahc_handle_scsiint. status = %x\n",
-		       ahc_name(ahc), status);
-		ahc_outb(ahc, CLRINT, CLRSCSIINT);
-	}
-}
-
-#define AHC_MAX_STEPS 2000
-void
-ahc_clear_critical_section(struct ahc_softc *ahc)
-{
-	int	stepping;
-	int	steps;
-	u_int	simode0;
-	u_int	simode1;
-
-	if (ahc->num_critical_sections == 0)
-		return;
-
-	stepping = FALSE;
-	steps = 0;
-	simode0 = 0;
-	simode1 = 0;
-	for (;;) {
-		struct	cs *cs;
-		u_int	seqaddr;
-		u_int	i;
-
-		seqaddr = ahc_inb(ahc, SEQADDR0)
-			| (ahc_inb(ahc, SEQADDR1) << 8);
-
-		/*
-		 * Seqaddr represents the next instruction to execute, 
-		 * so we are really executing the instruction just
-		 * before it.
-		 */
-		if (seqaddr != 0)
-			seqaddr -= 1;
-		cs = ahc->critical_sections;
-		for (i = 0; i < ahc->num_critical_sections; i++, cs++) {
-			
-			if (cs->begin < seqaddr && cs->end >= seqaddr)
-				break;
-		}
-
-		if (i == ahc->num_critical_sections)
-			break;
-
-		if (steps > AHC_MAX_STEPS) {
-			printf("%s: Infinite loop in critical section\n",
-			       ahc_name(ahc));
-			ahc_dump_card_state(ahc);
-			panic("critical section loop");
-		}
-
-		steps++;
-		if (stepping == FALSE) {
-
-			/*
-			 * Disable all interrupt sources so that the
-			 * sequencer will not be stuck by a pausing
-			 * interrupt condition while we attempt to
-			 * leave a critical section.
-			 */
-			simode0 = ahc_inb(ahc, SIMODE0);
-			ahc_outb(ahc, SIMODE0, 0);
-			simode1 = ahc_inb(ahc, SIMODE1);
-			ahc_outb(ahc, SIMODE1, 0);
-			ahc_outb(ahc, CLRINT, CLRSCSIINT);
-			ahc_outb(ahc, SEQCTL, ahc_inb(ahc, SEQCTL) | STEP);
-			stepping = TRUE;
-		}
-		ahc_outb(ahc, HCNTRL, ahc->unpause);
-		do {
-			ahc_delay(200);
-		} while (!ahc_is_paused(ahc));
-	}
-	if (stepping) {
-		ahc_outb(ahc, SIMODE0, simode0);
-		ahc_outb(ahc, SIMODE1, simode1);
-		ahc_outb(ahc, SEQCTL, ahc_inb(ahc, SEQCTL) & ~STEP);
-	}
-}
-
-/*
- * Clear any pending interrupt status.
- */
-void
-ahc_clear_intstat(struct ahc_softc *ahc)
-{
-	/* Clear any interrupt conditions this may have caused */
-	ahc_outb(ahc, CLRSINT1, CLRSELTIMEO|CLRATNO|CLRSCSIRSTI
-				|CLRBUSFREE|CLRSCSIPERR|CLRPHASECHG|
-				CLRREQINIT);
-	ahc_outb(ahc, CLRSINT0, CLRSELDO|CLRSELDI|CLRSELINGO);
-	ahc_outb(ahc, CLRINT, CLRSCSIINT);
-}
-
-/**************************** Debugging Routines ******************************/
-void
-ahc_print_scb(struct scb *scb)
-{
-	int i;
-
-	struct hardware_scb *hscb = scb->hscb;
-
-	printf("scb:%p control:0x%x scsiid:0x%x lun:%d cdb_len:%d\n",
-	       (void *)scb,
-	       hscb->control,
-	       hscb->scsiid,
-	       hscb->lun,
-	       hscb->cdb_len);
-	printf("Shared Data: ");
-	for (i = 0; i < sizeof(hscb->shared_data.cdb); i++)
-		printf("%#02x", hscb->shared_data.cdb[i]);
-	printf("        dataptr:%#x datacnt:%#x sgptr:%#x tag:%#x\n",
-		ahc_le32toh(hscb->dataptr),
-		ahc_le32toh(hscb->datacnt),
-		ahc_le32toh(hscb->sgptr),
-		hscb->tag);
-	if (scb->sg_count > 0) {
-		for (i = 0; i < scb->sg_count; i++) {
-			printf("sg[%d] - Addr 0x%x%x : Length %d\n",
-			       i,
-			       (ahc_le32toh(scb->sg_list[i].len) >> 24
-			        & SG_HIGH_ADDR_BITS),
-			       ahc_le32toh(scb->sg_list[i].addr),
-			       ahc_le32toh(scb->sg_list[i].len));
-		}
-	}
-}
-
-/************************* Transfer Negotiation *******************************/
-/*
- * Allocate per target mode instance (ID we respond to as a target)
- * transfer negotiation data structures.
- */
-static struct ahc_tmode_tstate *
-ahc_alloc_tstate(struct ahc_softc *ahc, u_int scsi_id, char channel)
-{
-	struct ahc_tmode_tstate *master_tstate;
-	struct ahc_tmode_tstate *tstate;
-	int i;
-
-	master_tstate = ahc->enabled_targets[ahc->our_id];
-	if (channel == 'B') {
-		scsi_id += 8;
-		master_tstate = ahc->enabled_targets[ahc->our_id_b + 8];
-	}
-	if (ahc->enabled_targets[scsi_id] != NULL
-	 && ahc->enabled_targets[scsi_id] != master_tstate)
-		panic("%s: ahc_alloc_tstate - Target already allocated",
-		      ahc_name(ahc));
-	tstate = malloc(sizeof(*tstate), M_DEVBUF, M_NOWAIT);
-	if (tstate == NULL)
-		return (NULL);
-
-	/*
-	 * If we have allocated a master tstate, copy user settings from
-	 * the master tstate (taken from SRAM or the EEPROM) for this
-	 * channel, but reset our current and goal settings to async/narrow
-	 * until an initiator talks to us.
-	 */
-	if (master_tstate != NULL) {
-		memcpy(tstate, master_tstate, sizeof(*tstate));
-		memset(tstate->enabled_luns, 0, sizeof(tstate->enabled_luns));
-		tstate->ultraenb = 0;
-		for (i = 0; i < 16; i++) {
-			memset(&tstate->transinfo[i].curr, 0,
-			      sizeof(tstate->transinfo[i].curr));
-			memset(&tstate->transinfo[i].goal, 0,
-			      sizeof(tstate->transinfo[i].goal));
-		}
-	} else
-		memset(tstate, 0, sizeof(*tstate));
-	ahc->enabled_targets[scsi_id] = tstate;
-	return (tstate);
-}
-
-#ifdef AHC_TARGET_MODE
-/*
- * Free per target mode instance (ID we respond to as a target)
- * transfer negotiation data structures.
- */
-static void
-ahc_free_tstate(struct ahc_softc *ahc, u_int scsi_id, char channel, int force)
-{
-	struct ahc_tmode_tstate *tstate;
-
-	/*
-	 * Don't clean up our "master" tstate.
-	 * It has our default user settings.
-	 */
-	if (((channel == 'B' && scsi_id == ahc->our_id_b)
-	  || (channel == 'A' && scsi_id == ahc->our_id))
-	 && force == FALSE)
-		return;
+		restart_sequencer(ahc);
+	} else if ((status & SELTO) != 0) {
+		u_int scbptr;
 
-	if (channel == 'B')
-		scsi_id += 8;
-	tstate = ahc->enabled_targets[scsi_id];
-	if (tstate != NULL)
-		free(tstate, M_DEVBUF);
-	ahc->enabled_targets[scsi_id] = NULL;
-}
-#endif
+		scbptr = ahc_inb(ahc, WAITING_SCBH);
+		ahc_outb(ahc, SCBPTR, scbptr);
+		scb_index = ahc_inb(ahc, SCB_TAG);
 
-/*
- * Called when we have an active connection to a target on the bus,
- * this function finds the nearest syncrate to the input period limited
- * by the capabilities of the bus connectivity of and sync settings for
- * the target.
- */
-struct ahc_syncrate *
-ahc_devlimited_syncrate(struct ahc_softc *ahc,
-			struct ahc_initiator_tinfo *tinfo,
-			u_int *period, u_int *ppr_options, role_t role) {
-	struct	ahc_transinfo *transinfo;
-	u_int	maxsync;
+		if (scb_index < ahc->scb_data->numscbs) {
+			scb = &ahc->scb_data->scbarray[scb_index];
+			if ((scb->flags & SCB_ACTIVE) == 0)
+				scb = NULL;
+		} else
+			scb = NULL;
 
-	if ((ahc->features & AHC_ULTRA2) != 0) {
-		if ((ahc_inb(ahc, SBLKCTL) & ENAB40) != 0
-		 && (ahc_inb(ahc, SSTAT2) & EXP_ACTIVE) == 0) {
-			maxsync = AHC_SYNCRATE_DT;
+		if (scb == NULL) {
+			printf("%s: ahc_intr - referenced scb not "
+			       "valid during SELTO scb(%d, %d)\n",
+			       ahc_name(ahc), scbptr, scb_index);
 		} else {
-			maxsync = AHC_SYNCRATE_ULTRA;
-			/* Can't do DT on an SE bus */
-			*ppr_options &= ~MSG_EXT_PPR_DT_REQ;
-		}
-	} else if ((ahc->features & AHC_ULTRA) != 0) {
-		maxsync = AHC_SYNCRATE_ULTRA;
-	} else {
-		maxsync = AHC_SYNCRATE_FAST;
-	}
-	/*
-	 * Never allow a value higher than our current goal
-	 * period otherwise we may allow a target initiated
-	 * negotiation to go above the limit as set by the
-	 * user.  In the case of an initiator initiated
-	 * sync negotiation, we limit based on the user
-	 * setting.  This allows the system to still accept
-	 * incoming negotiations even if target initiated
-	 * negotiation is not performed.
-	 */
-	if (role == ROLE_TARGET)
-		transinfo = &tinfo->user;
-	else 
-		transinfo = &tinfo->goal;
-	*ppr_options &= transinfo->ppr_options;
-	if (transinfo->period == 0) {
-		*period = 0;
-		*ppr_options = 0;
-		return (NULL);
-	}
-	*period = MAX(*period, transinfo->period);
-	return (ahc_find_syncrate(ahc, period, ppr_options, maxsync));
-}
+			u_int tag;
 
-/*
- * Look up the valid period to SCSIRATE conversion in our table.
- * Return the period and offset that should be sent to the target
- * if this was the beginning of an SDTR.
- */
-struct ahc_syncrate *
-ahc_find_syncrate(struct ahc_softc *ahc, u_int *period,
-		  u_int *ppr_options, u_int maxsync)
-{
-	struct ahc_syncrate *syncrate;
+			tag = SCB_LIST_NULL;
+			if ((scb->hscb->control & MSG_SIMPLE_Q_TAG) != 0)
+				tag = scb->hscb->tag;
 
-	if ((ahc->features & AHC_DT) == 0)
-		*ppr_options &= ~MSG_EXT_PPR_DT_REQ;
+			ahc_abort_scbs(ahc, SCB_TARGET(scb), SCB_CHANNEL(scb),
+				       SCB_LUN(scb), tag,
+				       ROLE_INITIATOR, XS_SELTIMEOUT);
+		}
+		/* Stop the selection */
+		ahc_outb(ahc, SCSISEQ, 0);
 
-	/* Skip all DT only entries if DT is not available */
-	if ((*ppr_options & MSG_EXT_PPR_DT_REQ) == 0
-	 && maxsync < AHC_SYNCRATE_ULTRA2)
-		maxsync = AHC_SYNCRATE_ULTRA2;
-	
-	for (syncrate = &ahc_syncrates[maxsync];
-	     syncrate->rate != NULL;
-	     syncrate++) {
+		/* No more pending messages */
+		ahc_clear_msg_state(ahc);
 
 		/*
-		 * The Ultra2 table doesn't go as low
-		 * as for the Fast/Ultra cards.
+		 * Although the driver does not care about the
+		 * 'Selection in Progress' status bit, the busy
+		 * LED does.  SELINGO is only cleared by a sucessful
+		 * selection, so we must manually clear it to ensure
+		 * the LED turns off just incase no future successful
+		 * selections occur (e.g. no devices on the bus).
 		 */
-		if ((ahc->features & AHC_ULTRA2) != 0
-		 && (syncrate->sxfr_u2 == 0))
-			break;
-
-		if (*period <= syncrate->period) {
-			/*
-			 * When responding to a target that requests
-			 * sync, the requested rate may fall between
-			 * two rates that we can output, but still be
-			 * a rate that we can receive.  Because of this,
-			 * we want to respond to the target with
-			 * the same rate that it sent to us even
-			 * if the period we use to send data to it
-			 * is lower.  Only lower the response period
-			 * if we must.
-			 */
-			if (syncrate == &ahc_syncrates[maxsync])
-				*period = syncrate->period;
-
-			/*
-			 * At some speeds, we only support
-			 * ST transfers.
-			 */
-		 	if ((syncrate->sxfr_u2 & ST_SXFR) != 0)
-				*ppr_options &= ~MSG_EXT_PPR_DT_REQ;
-			break;
-		}
-	}
-
-	if ((*period == 0)
-	 || (syncrate->rate == NULL)
-	 || ((ahc->features & AHC_ULTRA2) != 0
-	  && (syncrate->sxfr_u2 == 0))) {
-		/* Use asynchronous transfers. */
-		*period = 0;
-		syncrate = NULL;
-		*ppr_options &= ~MSG_EXT_PPR_DT_REQ;
-	}
-	return (syncrate);
-}
-
-/*
- * Convert from an entry in our syncrate table to the SCSI equivalent
- * sync "period" factor.
- */
-u_int
-ahc_find_period(struct ahc_softc *ahc, u_int scsirate, u_int maxsync)
-{
-	struct ahc_syncrate *syncrate;
-
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		scsirate &= SXFR_ULTRA2;
-	else
-		scsirate &= SXFR;
-
-	syncrate = &ahc_syncrates[maxsync];
-	while (syncrate->rate != NULL) {
-
-		if ((ahc->features & AHC_ULTRA2) != 0) {
-			if (syncrate->sxfr_u2 == 0)
-				break;
-			else if (scsirate == (syncrate->sxfr_u2 & SXFR_ULTRA2))
-				return (syncrate->period);
-		} else if (scsirate == (syncrate->sxfr & SXFR)) {
-				return (syncrate->period);
-		}
-		syncrate++;
-	}
-	return (0); /* async */
-}
-
-/*
- * Truncate the given synchronous offset to a value the
- * current adapter type and syncrate are capable of.
- */
-void
-ahc_validate_offset(struct ahc_softc *ahc,
-		    struct ahc_initiator_tinfo *tinfo,
-		    struct ahc_syncrate *syncrate,
-		    u_int *offset, int wide, role_t role)
-{
-	u_int maxoffset;
+		ahc_outb(ahc, CLRSINT0, CLRSELINGO);
 
-	/* Limit offset to what we can do */
-	if (syncrate == NULL) {
-		maxoffset = 0;
-	} else if ((ahc->features & AHC_ULTRA2) != 0) {
-		maxoffset = MAX_OFFSET_ULTRA2;
+		/* Clear interrupt state */
+		ahc_outb(ahc, CLRSINT1, CLRSELTIMEO|CLRBUSFREE|CLRSCSIPERR);
+		ahc_outb(ahc, CLRINT, CLRSCSIINT);
+		restart_sequencer(ahc);
 	} else {
-		if (wide)
-			maxoffset = MAX_OFFSET_16BIT;
-		else
-			maxoffset = MAX_OFFSET_8BIT;
-	}
-	*offset = MIN(*offset, maxoffset);
-	if (tinfo != NULL) {
-		if (role == ROLE_TARGET)
-			*offset = MIN(*offset, tinfo->user.offset);
-		else
-			*offset = MIN(*offset, tinfo->goal.offset);
-	}
-}
-
-/*
- * Truncate the given transfer width parameter to a value the
- * current adapter type is capable of.
- */
-void
-ahc_validate_width(struct ahc_softc *ahc, struct ahc_initiator_tinfo *tinfo,
-		   u_int *bus_width, role_t role)
-{
-	switch (*bus_width) {
-	default:
-		if (ahc->features & AHC_WIDE) {
-			/* Respond Wide */
-			*bus_width = MSG_EXT_WDTR_BUS_16_BIT;
-			break;
-		}
-		/* FALLTHROUGH */
-	case MSG_EXT_WDTR_BUS_8_BIT:
-		*bus_width = MSG_EXT_WDTR_BUS_8_BIT;
-		break;
-	}
-	if (tinfo != NULL) {
-		if (role == ROLE_TARGET)
-			*bus_width = MIN(tinfo->user.width, *bus_width);
-		else
-			*bus_width = MIN(tinfo->goal.width, *bus_width);
-	}
-}
-
-/*
- * Update the bitmask of targets for which the controller should
- * negotiate with at the next convenient oportunity.  This currently
- * means the next time we send the initial identify messages for
- * a new transaction.
- */
-int
-ahc_update_neg_request(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-		       struct ahc_tmode_tstate *tstate,
-		       struct ahc_initiator_tinfo *tinfo, int force)
-{
-	u_int auto_negotiate_orig;
-
-	auto_negotiate_orig = tstate->auto_negotiate;
-	if (tinfo->curr.period != tinfo->goal.period
-	 || tinfo->curr.width != tinfo->goal.width
-	 || tinfo->curr.offset != tinfo->goal.offset
-	 || tinfo->curr.ppr_options != tinfo->goal.ppr_options
-	 || (force
-	  && (tinfo->goal.period != 0
-	   || tinfo->goal.width != MSG_EXT_WDTR_BUS_8_BIT
-	   || tinfo->goal.ppr_options != 0)))
-		tstate->auto_negotiate |= devinfo->target_mask;
-	else
-		tstate->auto_negotiate &= ~devinfo->target_mask;
-
-	return (auto_negotiate_orig != tstate->auto_negotiate);
-}
-
-/*
- * Update the user/goal/curr tables of synchronous negotiation
- * parameters as well as, in the case of a current or active update,
- * any data structures on the host controller.  In the case of an
- * active update, the specified target is currently talking to us on
- * the bus, so the transfer parameter update must take effect
- * immediately.
- */
-void
-ahc_set_syncrate(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-		 struct ahc_syncrate *syncrate, u_int period,
-		 u_int offset, u_int ppr_options, u_int type, int paused)
-{
-	struct	ahc_initiator_tinfo *tinfo;
-	struct	ahc_tmode_tstate *tstate;
-	u_int	old_period;
-	u_int	old_offset;
-	u_int	old_ppr;
-	int	active;
-	int	update_needed;
-
-	active = (type & AHC_TRANS_ACTIVE) == AHC_TRANS_ACTIVE;
-	update_needed = 0;
-
-	if (syncrate == NULL) {
-		period = 0;
-		offset = 0;
-	}
-
-	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel, devinfo->our_scsiid,
-				    devinfo->target, &tstate);
-
-	if ((type & AHC_TRANS_USER) != 0) {
-		tinfo->user.period = period;
-		tinfo->user.offset = offset;
-		tinfo->user.ppr_options = ppr_options;
-	}
-
-	if ((type & AHC_TRANS_GOAL) != 0) {
-		tinfo->goal.period = period;
-		tinfo->goal.offset = offset;
-		tinfo->goal.ppr_options = ppr_options;
-	}
-
-	old_period = tinfo->curr.period;
-	old_offset = tinfo->curr.offset;
-	old_ppr	   = tinfo->curr.ppr_options;
-
-	if ((type & AHC_TRANS_CUR) != 0
-	 && (old_period != period
-	  || old_offset != offset
-	  || old_ppr != ppr_options)) {
-		u_int	scsirate;
-
-		update_needed++;
-		scsirate = tinfo->scsirate;
-		if ((ahc->features & AHC_ULTRA2) != 0) {
-
-			scsirate &= ~(SXFR_ULTRA2|SINGLE_EDGE|ENABLE_CRC);
-			if (syncrate != NULL) {
-				scsirate |= syncrate->sxfr_u2;
-				if ((ppr_options & MSG_EXT_PPR_DT_REQ) != 0)
-					scsirate |= ENABLE_CRC;
-				else
-					scsirate |= SINGLE_EDGE;
-			}
-		} else {
-
-			scsirate &= ~(SXFR|SOFS);
-			/*
-			 * Ensure Ultra mode is set properly for
-			 * this target.
-			 */
-			tstate->ultraenb &= ~devinfo->target_mask;
-			if (syncrate != NULL) {
-				if (syncrate->sxfr & ULTRA_SXFR) {
-					tstate->ultraenb |=
-						devinfo->target_mask;
-				}
-				scsirate |= syncrate->sxfr & SXFR;
-				scsirate |= offset & SOFS;
-			}
-			if (active) {
-				u_int sxfrctl0;
-
-				sxfrctl0 = ahc_inb(ahc, SXFRCTL0);
-				sxfrctl0 &= ~FAST20;
-				if (tstate->ultraenb & devinfo->target_mask)
-					sxfrctl0 |= FAST20;
-				ahc_outb(ahc, SXFRCTL0, sxfrctl0);
-			}
-		}
-		if (active) {
-			ahc_outb(ahc, SCSIRATE, scsirate);
-			if ((ahc->features & AHC_ULTRA2) != 0)
-				ahc_outb(ahc, SCSIOFFSET, offset);
-		}
-
-		tinfo->scsirate = scsirate;
-		tinfo->curr.period = period;
-		tinfo->curr.offset = offset;
-		tinfo->curr.ppr_options = ppr_options;
-
-		ahc_send_async(ahc, devinfo->channel, devinfo->target,
-			       CAM_LUN_WILDCARD, AC_TRANSFER_NEG, NULL);
-		if (1 /*bootverbose*/) {
-			if (offset != 0) {
-				printf("%s: target %d synchronous at %sMHz%s, "
-				       "offset = 0x%x\n", ahc_name(ahc),
-				       devinfo->target, syncrate->rate,
-				       (ppr_options & MSG_EXT_PPR_DT_REQ)
-				       ? " DT" : "", offset);
-			} else {
-				printf("%s: target %d using "
-				       "asynchronous transfers\n",
-				       ahc_name(ahc), devinfo->target);
-			}
-		}
+		sc_print_addr(scb->xs->sc_link);
+		printf("Unknown SCSIINT. Status = 0x%x\n", status);
+		ahc_outb(ahc, CLRSINT1, status);
+		ahc_outb(ahc, CLRINT, CLRSCSIINT);
+		unpause_sequencer(ahc);
 	}
-
-	update_needed += ahc_update_neg_request(ahc, devinfo, tstate,
-						tinfo, /*force*/FALSE);
-
-	if (update_needed)
-		ahc_update_pending_scbs(ahc);
 }
 
-/*
- * Update the user/goal/curr tables of wide negotiation
- * parameters as well as, in the case of a current or active update,
- * any data structures on the host controller.  In the case of an
- * active update, the specified target is currently talking to us on
- * the bus, so the transfer parameter update must take effect
- * immediately.
- */
-void
-ahc_set_width(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-	      u_int width, u_int type, int paused)
+STATIC void
+ahc_build_transfer_msg(ahc, devinfo)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
 {
+	/*
+	 * We need to initiate transfer negotiations.
+	 * If our current and goal settings are identical,
+	 * we want to renegotiate due to a check condition.
+	 */
 	struct	ahc_initiator_tinfo *tinfo;
-	struct	ahc_tmode_tstate *tstate;
-	u_int	oldwidth;
-	int	active;
-	int	update_needed;
+	struct	tmode_tstate *tstate;
+	int	dowide;
+	int	dosync;
 
-	active = (type & AHC_TRANS_ACTIVE) == AHC_TRANS_ACTIVE;
-	update_needed = 0;
-	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel, devinfo->our_scsiid,
+	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel,
+				    devinfo->our_scsiid,
 				    devinfo->target, &tstate);
+	dowide = tinfo->current.width != tinfo->goal.width;
+	dosync = tinfo->current.period != tinfo->goal.period;
 
-	if ((type & AHC_TRANS_USER) != 0)
-		tinfo->user.width = width;
-
-	if ((type & AHC_TRANS_GOAL) != 0)
-		tinfo->goal.width = width;
-
-	oldwidth = tinfo->curr.width;
-	if ((type & AHC_TRANS_CUR) != 0 && oldwidth != width) {
-		u_int	scsirate;
-
-		update_needed++;
-		scsirate =  tinfo->scsirate;
-		scsirate &= ~WIDEXFER;
-		if (width == MSG_EXT_WDTR_BUS_16_BIT)
-			scsirate |= WIDEXFER;
-
-		tinfo->scsirate = scsirate;
-
-		if (active)
-			ahc_outb(ahc, SCSIRATE, scsirate);
-
-		tinfo->curr.width = width;
-
-		ahc_send_async(ahc, devinfo->channel, devinfo->target,
-			       CAM_LUN_WILDCARD, AC_TRANSFER_NEG, NULL);
-		if (bootverbose) {
-			printf("%s: target %d using %dbit transfers\n",
-			       ahc_name(ahc), devinfo->target,
-			       8 * (0x01 << width));
-		}
-	}
-
-	update_needed += ahc_update_neg_request(ahc, devinfo, tstate,
-						tinfo, /*force*/FALSE);
-	if (update_needed)
-		ahc_update_pending_scbs(ahc);
-}
-
-/*
- * Update the current state of tagged queuing for a given target.
- */
-void
-ahc_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-	     ahc_queue_alg alg)
-{
- 	ahc_platform_set_tags(ahc, devinfo, alg);
- 	ahc_send_async(ahc, devinfo->channel, devinfo->target,
- 		       devinfo->lun, AC_TRANSFER_NEG, &alg);
-}
-
-/*
- * When the transfer settings for a connection change, update any
- * in-transit SCBs to contain the new data so the hardware will
- * be set correctly during future (re)selections.
- */
-static void
-ahc_update_pending_scbs(struct ahc_softc *ahc)
-{
-	struct	scb *pending_scb;
-	int	pending_scb_count;
-	int	i;
-	int	paused;
-	u_int	saved_scbptr;
-
-	/*
-	 * Traverse the pending SCB list and ensure that all of the
-	 * SCBs there have the proper settings.
-	 */
-	pending_scb_count = 0;
-	LIST_FOREACH(pending_scb, &ahc->pending_scbs, pending_links) {
-		struct ahc_devinfo devinfo;
-		struct hardware_scb *pending_hscb;
-		struct ahc_initiator_tinfo *tinfo;
-		struct ahc_tmode_tstate *tstate;
-
-		ahc_scb_devinfo(ahc, &devinfo, pending_scb);
-		tinfo = ahc_fetch_transinfo(ahc, devinfo.channel,
-					    devinfo.our_scsiid,
-					    devinfo.target, &tstate);
-		pending_hscb = pending_scb->hscb;
-		pending_hscb->control &= ~ULTRAENB;
-		if ((tstate->ultraenb & devinfo.target_mask) != 0)
-			pending_hscb->control |= ULTRAENB;
-		pending_hscb->scsirate = tinfo->scsirate;
-		pending_hscb->scsioffset = tinfo->curr.offset;
-		if ((tstate->auto_negotiate & devinfo.target_mask) == 0
-		 && (pending_scb->flags & SCB_AUTO_NEGOTIATE) != 0) {
-			pending_scb->flags &= ~SCB_AUTO_NEGOTIATE;
-			pending_hscb->control &= ~MK_MESSAGE;
-		}
-		ahc_sync_scb(ahc, pending_scb,
-			     BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
-		pending_scb_count++;
+	if (!dowide && !dosync) {
+		dowide = tinfo->goal.width != MSG_EXT_WDTR_BUS_8_BIT;
+		dosync = tinfo->goal.period != 0;
 	}
 
-	if (pending_scb_count == 0)
-		return;
+	if (dowide) {
+		ahc_construct_wdtr(ahc, tinfo->goal.width);
+	} else if (dosync) {
+		struct	ahc_syncrate *rate;
+		u_int	period;
+		u_int	offset;
 
-	if (ahc_is_paused(ahc)) {
-		paused = 1;
+		period = tinfo->goal.period;
+		rate = ahc_devlimited_syncrate(ahc, &period);
+		offset = tinfo->goal.offset;
+		ahc_validate_offset(ahc, rate, &offset,
+				    tinfo->current.width);
+		ahc_construct_sdtr(ahc, period, offset);
 	} else {
-		paused = 0;
-		ahc_pause(ahc);
-	}
-
-	saved_scbptr = ahc_inb(ahc, SCBPTR);
-	/* Ensure that the hscbs down on the card match the new information */
-	for (i = 0; i < ahc->scb_data->maxhscbs; i++) {
-		struct	hardware_scb *pending_hscb;
-		u_int	control;
-		u_int	scb_tag;
-
-		ahc_outb(ahc, SCBPTR, i);
-		scb_tag = ahc_inb(ahc, SCB_TAG);
-		pending_scb = ahc_lookup_scb(ahc, scb_tag);
-		if (pending_scb == NULL)
-			continue;
-
-		pending_hscb = pending_scb->hscb;
-		control = ahc_inb(ahc, SCB_CONTROL);
-		control &= ~(ULTRAENB|MK_MESSAGE);
-		control |= pending_hscb->control & (ULTRAENB|MK_MESSAGE);
-		ahc_outb(ahc, SCB_CONTROL, control);
-		ahc_outb(ahc, SCB_SCSIRATE, pending_hscb->scsirate);
-		ahc_outb(ahc, SCB_SCSIOFFSET, pending_hscb->scsioffset);
-	}
-	ahc_outb(ahc, SCBPTR, saved_scbptr);
-
-	if (paused == 0)
-		ahc_unpause(ahc);
-}
-
-/**************************** Pathing Information *****************************/
-static void
-ahc_fetch_devinfo(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
-{
-	u_int	saved_scsiid;
-	role_t	role;
-	int	our_id;
-
-	if (ahc_inb(ahc, SSTAT0) & TARGET)
-		role = ROLE_TARGET;
-	else
-		role = ROLE_INITIATOR;
-
-	if (role == ROLE_TARGET
-	 && (ahc->features & AHC_MULTI_TID) != 0
-	 && (ahc_inb(ahc, SEQ_FLAGS) & CMDPHASE_PENDING) != 0) {
-		/* We were selected, so pull our id from TARGIDIN */
-		our_id = ahc_inb(ahc, TARGIDIN) & OID;
-	} else if ((ahc->features & AHC_ULTRA2) != 0)
-		our_id = ahc_inb(ahc, SCSIID_ULTRA2) & OID;
-	else
-		our_id = ahc_inb(ahc, SCSIID) & OID;
-
-	saved_scsiid = ahc_inb(ahc, SAVED_SCSIID);
-	ahc_compile_devinfo(devinfo,
-			    our_id,
-			    SCSIID_TARGET(ahc, saved_scsiid),
-			    ahc_inb(ahc, SAVED_LUN),
-			    SCSIID_CHANNEL(ahc, saved_scsiid),
-			    role);
-}
-
-struct ahc_phase_table_entry*
-ahc_lookup_phase_entry(int phase)
-{
-	struct ahc_phase_table_entry *entry;
-	struct ahc_phase_table_entry *last_entry;
-
-	/*
-	 * num_phases doesn't include the default entry which
-	 * will be returned if the phase doesn't match.
-	 */
-	last_entry = &ahc_phase_table[num_phases];
-	for (entry = ahc_phase_table; entry < last_entry; entry++) {
-		if (phase == entry->phase)
-			break;
+		panic("ahc_intr: AWAITING_MSG for negotiation, "
+		      "but no negotiation needed\n");	
 	}
-	return (entry);
-}
-
-void
-ahc_compile_devinfo(struct ahc_devinfo *devinfo, u_int our_id, u_int target,
-		    u_int lun, char channel, role_t role)
-{
-	devinfo->our_scsiid = our_id;
-	devinfo->target = target;
-	devinfo->lun = lun;
-	devinfo->target_offset = target;
-	devinfo->channel = channel;
-	devinfo->role = role;
-	if (channel == 'B')
-		devinfo->target_offset += 8;
-	devinfo->target_mask = (0x01 << devinfo->target_offset);
-}
-
-static void
-ahc_scb_devinfo(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-		struct scb *scb)
-{
-	role_t	role;
-	int	our_id;
-
-	our_id = SCSIID_OUR_ID(scb->hscb->scsiid);
-	role = ROLE_INITIATOR;
-	if ((scb->hscb->control & TARGET_SCB) != 0)
-		role = ROLE_TARGET;
-	ahc_compile_devinfo(devinfo, our_id, SCB_GET_TARGET(ahc, scb),
-			    SCB_GET_LUN(scb), SCB_GET_CHANNEL(ahc, scb), role);
-}
-
-
-/************************ Message Phase Processing ****************************/
-static void
-ahc_assert_atn(struct ahc_softc *ahc)
-{
-	u_int scsisigo;
-
-	scsisigo = ATNO;
-	if ((ahc->features & AHC_DT) == 0)
-		scsisigo |= ahc_inb(ahc, SCSISIGI);
-	ahc_outb(ahc, SCSISIGO, scsisigo);
 }
 
-/*
- * When an initiator transaction with the MK_MESSAGE flag either reconnects
- * or enters the initial message out phase, we are interrupted.  Fill our
- * outgoing message buffer with the appropriate message and beging handing
- * the message phase(s) manually.
- */
-static void
-ahc_setup_initiator_msgout(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-			   struct scb *scb)
+STATIC void
+ahc_setup_initiator_msgout(ahc, devinfo, scb)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
+	struct scb *scb;
 {
-	/*
+	/*              
 	 * To facilitate adding multiple messages together,
 	 * each routine should increment the index and len
 	 * variables instead of setting them explicitly.
-	 */
+	 */             
 	ahc->msgout_index = 0;
 	ahc->msgout_len = 0;
 
@@ -2140,15 +2522,15 @@ ahc_setup_initiator_msgout(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 	 && ahc_inb(ahc, MSG_OUT) == MSG_IDENTIFYFLAG) {
 		u_int identify_msg;
 
-		identify_msg = MSG_IDENTIFYFLAG | SCB_GET_LUN(scb);
+		identify_msg = MSG_IDENTIFYFLAG | SCB_LUN(scb);
 		if ((scb->hscb->control & DISCENB) != 0)
 			identify_msg |= MSG_IDENTIFY_DISCFLAG;
 		ahc->msgout_buf[ahc->msgout_index++] = identify_msg;
 		ahc->msgout_len++;
 
 		if ((scb->hscb->control & TAG_ENB) != 0) {
-			ahc->msgout_buf[ahc->msgout_index++] =
-			    scb->hscb->control & (TAG_ENB|SCB_TAG_TYPE);
+			/* XXX fvdl FreeBSD has tag action passed down */
+			ahc->msgout_buf[ahc->msgout_index++] = MSG_SIMPLE_Q_TAG;
 			ahc->msgout_buf[ahc->msgout_index++] = scb->hscb->tag;
 			ahc->msgout_len += 2;
 		}
@@ -2157,40 +2539,22 @@ ahc_setup_initiator_msgout(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 	if (scb->flags & SCB_DEVICE_RESET) {
 		ahc->msgout_buf[ahc->msgout_index++] = MSG_BUS_DEV_RESET;
 		ahc->msgout_len++;
-		ahc_print_path(ahc, scb);
+		
+		sc_print_addr(scb->xs->sc_link);
 		printf("Bus Device Reset Message Sent\n");
-		/*
-		 * Clear our selection hardware in advance of
-		 * the busfree.  We may have an entry in the waiting
-		 * Q for this target, and we don't want to go about
-		 * selecting while we handle the busfree and blow it
-		 * away.
-		 */
-		ahc_outb(ahc, SCSISEQ, (ahc_inb(ahc, SCSISEQ) & ~ENSELO));
-	} else if ((scb->flags & SCB_ABORT) != 0) {
+	} else if (scb->flags & SCB_ABORT) {
 		if ((scb->hscb->control & TAG_ENB) != 0)
 			ahc->msgout_buf[ahc->msgout_index++] = MSG_ABORT_TAG;
 		else
 			ahc->msgout_buf[ahc->msgout_index++] = MSG_ABORT;
 		ahc->msgout_len++;
-		ahc_print_path(ahc, scb);
-		printf("Abort%s Message Sent\n",
-		       (scb->hscb->control & TAG_ENB) != 0 ? " Tag" : "");
-		/*
-		 * Clear our selection hardware in advance of
-		 * the busfree.  We may have an entry in the waiting
-		 * Q for this target, and we don't want to go about
-		 * selecting while we handle the busfree and blow it
-		 * away.
-		 */
-		ahc_outb(ahc, SCSISEQ, (ahc_inb(ahc, SCSISEQ) & ~ENSELO));
-	} else if ((scb->flags & (SCB_AUTO_NEGOTIATE|SCB_NEGOTIATE)) != 0) {
+		sc_print_addr(scb->xs->sc_link);
+		printf("Abort Message Sent\n");
+	} else if ((ahc->targ_msg_req & devinfo->target_mask) != 0) {
 		ahc_build_transfer_msg(ahc, devinfo);
 	} else {
 		printf("ahc_intr: AWAITING_MSG for an SCB that "
-		       "does not have a waiting message\n");
-		printf("SCSIID = %x, target_mask = %x\n", scb->hscb->scsiid,
-		       devinfo->target_mask);
+		       "does not have a waiting message");
 		panic("SCB = %d, SCB Control = %x, MSG_OUT = %x "
 		      "SCB flags = %x", scb->hscb->tag, scb->hscb->control,
 		      ahc_inb(ahc, MSG_OUT), scb->flags);
@@ -2201,186 +2565,153 @@ ahc_setup_initiator_msgout(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 	 * asked to send this message again.
 	 */
 	ahc_outb(ahc, SCB_CONTROL, ahc_inb(ahc, SCB_CONTROL) & ~MK_MESSAGE);
-	scb->hscb->control &= ~MK_MESSAGE;
 	ahc->msgout_index = 0;
 	ahc->msg_type = MSG_TYPE_INITIATOR_MSGOUT;
 }
 
-/*
- * Build an appropriate transfer negotiation message for the
- * currently active target.
- */
-static void
-ahc_build_transfer_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
+STATIC void
+ahc_setup_target_msgin(ahc, devinfo)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
 {
-	/*
-	 * We need to initiate transfer negotiations.
-	 * If our current and goal settings are identical,
-	 * we want to renegotiate due to a check condition.
-	 */
-	struct	ahc_initiator_tinfo *tinfo;
-	struct	ahc_tmode_tstate *tstate;
-	struct	ahc_syncrate *rate;
-	int	dowide;
-	int	dosync;
-	int	doppr;
-	int	use_ppr;
-	u_int	period;
-	u_int	ppr_options;
-	u_int	offset;
+	/*              
+	 * To facilitate adding multiple messages together,
+	 * each routine should increment the index and len
+	 * variables instead of setting them explicitly.
+	 */             
+	ahc->msgout_index = 0;
+	ahc->msgout_len = 0;
 
-	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel, devinfo->our_scsiid,
-				    devinfo->target, &tstate);
+	if ((ahc->targ_msg_req & devinfo->target_mask) != 0)
+		ahc_build_transfer_msg(ahc, devinfo);
+	else
+		panic("ahc_intr: AWAITING target message with no message");
+
+	ahc->msgout_index = 0;
+	ahc->msg_type = MSG_TYPE_TARGET_MSGIN;
+}
+
+STATIC int
+ahc_handle_msg_reject(ahc, devinfo)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
+{
 	/*
-	 * Filter our period based on the current connection.
-	 * If we can't perform DT transfers on this segment (not in LVD
-	 * mode for instance), then our decision to issue a PPR message
-	 * may change.
+	 * What we care about here is if we had an
+	 * outstanding SDTR or WDTR message for this
+	 * target.  If we did, this is a signal that
+	 * the target is refusing negotiation.
 	 */
-	period = tinfo->goal.period;
-	ppr_options = tinfo->goal.ppr_options;
-	/* Target initiated PPR is not allowed in the SCSI spec */
-	if (devinfo->role == ROLE_TARGET)
-		ppr_options = 0;
-	rate = ahc_devlimited_syncrate(ahc, tinfo, &period,
-				       &ppr_options, devinfo->role);
-	dowide = tinfo->curr.width != tinfo->goal.width;
-	dosync = tinfo->curr.period != period;
-	doppr = tinfo->curr.ppr_options != ppr_options;
-
-	if (!dowide && !dosync && !doppr) {
-		dowide = tinfo->goal.width != MSG_EXT_WDTR_BUS_8_BIT;
-		dosync = tinfo->goal.period != 0;
-		doppr = tinfo->goal.ppr_options != 0;
-	}
+	struct scb *scb;
+	u_int scb_index;
+	u_int last_msg;
+	int   response = 0;
 
-	if (!dowide && !dosync && !doppr) {
-		panic("ahc_intr: AWAITING_MSG for negotiation, "
-		      "but no negotiation needed\n");	
-	}
+	scb_index = ahc_inb(ahc, SCB_TAG);
+	scb = &ahc->scb_data->scbarray[scb_index];
 
-	use_ppr = (tinfo->curr.transport_version >= 3) || doppr;
-	/* Target initiated PPR is not allowed in the SCSI spec */
-	if (devinfo->role == ROLE_TARGET)
-		use_ppr = 0;
+	/* Might be necessary */
+	last_msg = ahc_inb(ahc, LAST_MSG);
 
-	/*
-	 * Both the PPR message and SDTR message require the
-	 * goal syncrate to be limited to what the target device
-	 * is capable of handling (based on whether an LVD->SE
-	 * expander is on the bus), so combine these two cases.
-	 * Regardless, guarantee that if we are using WDTR and SDTR
-	 * messages that WDTR comes first.
-	 */
-	if (use_ppr || (dosync && !dowide)) {
+	if (ahc_sent_msg(ahc, MSG_EXT_WDTR, /*full*/FALSE)) {
+		struct ahc_initiator_tinfo *tinfo;
+		struct tmode_tstate *tstate;
 
-		offset = tinfo->goal.offset;
-		ahc_validate_offset(ahc, tinfo, rate, &offset,
-				    use_ppr ? tinfo->goal.width
-					    : tinfo->curr.width,
-				    devinfo->role);
-		if (use_ppr) {
-			ahc_construct_ppr(ahc, devinfo, period, offset,
-					  tinfo->goal.width, ppr_options);
-		} else {
-			ahc_construct_sdtr(ahc, devinfo, period, offset);
+		/* note 8bit xfers */
+		if (bootverbose)
+			printf("%s:%c:%d: refuses WIDE negotiation.  Using "
+			       "8bit transfers\n", ahc_name(ahc),
+			       devinfo->channel, devinfo->target);
+		ahc_set_width(ahc, devinfo,
+			      MSG_EXT_WDTR_BUS_8_BIT,
+			      AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
+			      /*paused*/TRUE, /*done*/TRUE);
+		/*
+		 * No need to clear the sync rate.  If the target
+		 * did not accept the command, our syncrate is
+		 * unaffected.  If the target started the negotiation,
+		 * but rejected our response, we already cleared the
+		 * sync rate before sending our WDTR.
+		 */
+		tinfo = ahc_fetch_transinfo(ahc, devinfo->channel,
+					    devinfo->our_scsiid,
+					    devinfo->target, &tstate);
+		if (tinfo->goal.period) {
+			u_int period;
+
+			/* Start the sync negotiation */
+			period = tinfo->goal.period;
+			ahc_devlimited_syncrate(ahc, &period);
+			ahc->msgout_index = 0;
+			ahc->msgout_len = 0;
+			ahc_construct_sdtr(ahc, period, tinfo->goal.offset);
+			ahc->msgout_index = 0;
+			response = 1;
 		}
-	} else {
-		ahc_construct_wdtr(ahc, devinfo, tinfo->goal.width);
-	}
-}
+	} else if (ahc_sent_msg(ahc, MSG_EXT_SDTR, /*full*/FALSE)) {
+		/* note asynch xfers and clear flag */
+		ahc_set_syncrate(ahc, devinfo, /*syncrate*/NULL, /*period*/0,
+				 /*offset*/0,
+				 AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
+				 /*paused*/TRUE,
+				 /*done*/TRUE);
+		if (bootverbose)
+			printf("%s:%c:%d: refuses synchronous negotiation. "
+			       "Using asynchronous transfers\n",
+			       ahc_name(ahc),
+			       devinfo->channel, devinfo->target);
+	} else if ((scb->hscb->control & MSG_SIMPLE_Q_TAG) != 0) {
+		if (bootverbose)
+			printf("%s:%c:%d: refuses tagged commands.  Performing "
+			       "non-tagged I/O\n", ahc_name(ahc),
+			       devinfo->channel, devinfo->target);
+			
+		ahc_set_tags(ahc, devinfo, FALSE);
 
-/*
- * Build a synchronous negotiation message in our message
- * buffer based on the input parameters.
- */
-static void
-ahc_construct_sdtr(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-		   u_int period, u_int offset)
-{
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXTENDED;
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_SDTR_LEN;
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_SDTR;
-	ahc->msgout_buf[ahc->msgout_index++] = period;
-	ahc->msgout_buf[ahc->msgout_index++] = offset;
-	ahc->msgout_len += 5;
-	if (bootverbose) {
-		printf("(%s:%c:%d:%d): Sending SDTR period %x, offset %x\n",
-		       ahc_name(ahc), devinfo->channel, devinfo->target,
-		       devinfo->lun, period, offset);
-	}
-}
+		/*
+		 * Resend the identify for this CCB as the target
+		 * may believe that the selection is invalid otherwise.
+		 */
+		ahc_outb(ahc, SCB_CONTROL, ahc_inb(ahc, SCB_CONTROL)
+					  & ~MSG_SIMPLE_Q_TAG);
+	 	scb->hscb->control &= ~MSG_SIMPLE_Q_TAG;
+		ahc_outb(ahc, MSG_OUT, MSG_IDENTIFYFLAG);
+		ahc_outb(ahc, SCSISIGO, ahc_inb(ahc, SCSISIGO) | ATNO);
 
-/*
- * Build a wide negotiateion message in our message
- * buffer based on the input parameters.
- */
-static void
-ahc_construct_wdtr(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-		   u_int bus_width)
-{
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXTENDED;
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_WDTR_LEN;
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_WDTR;
-	ahc->msgout_buf[ahc->msgout_index++] = bus_width;
-	ahc->msgout_len += 4;
-	if (bootverbose) {
-		printf("(%s:%c:%d:%d): Sending WDTR %x\n",
+		/*
+		 * Requeue all tagged commands for this target
+		 * currently in our posession so they can be
+		 * converted to untagged commands.
+		 */
+		ahc_search_qinfifo(ahc, SCB_TARGET(scb), SCB_CHANNEL(scb),
+				   SCB_LUN(scb), /*tag*/SCB_LIST_NULL,
+				   ROLE_INITIATOR, SCB_REQUEUE,
+				   SEARCH_COMPLETE);
+	} else {
+		/*
+		 * Otherwise, we ignore it.
+		 */
+		printf("%s:%c:%d: Message reject for %x -- ignored\n",
 		       ahc_name(ahc), devinfo->channel, devinfo->target,
-		       devinfo->lun, bus_width);
-	}
-}
-
-/*
- * Build a parallel protocol request message in our message
- * buffer based on the input parameters.
- */
-static void
-ahc_construct_ppr(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-		  u_int period, u_int offset, u_int bus_width,
-		  u_int ppr_options)
-{
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXTENDED;
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_PPR_LEN;
-	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_PPR;
-	ahc->msgout_buf[ahc->msgout_index++] = period;
-	ahc->msgout_buf[ahc->msgout_index++] = 0;
-	ahc->msgout_buf[ahc->msgout_index++] = offset;
-	ahc->msgout_buf[ahc->msgout_index++] = bus_width;
-	ahc->msgout_buf[ahc->msgout_index++] = ppr_options;
-	ahc->msgout_len += 8;
-	if (bootverbose) {
-		printf("(%s:%c:%d:%d): Sending PPR bus_width %x, period %x, "
-		       "offset %x, ppr_options %x\n", ahc_name(ahc),
-		       devinfo->channel, devinfo->target, devinfo->lun,
-		       bus_width, period, offset, ppr_options);
+		       last_msg);
 	}
+	return (response);
 }
 
-/*
- * Clear any active message state.
- */
-static void
-ahc_clear_msg_state(struct ahc_softc *ahc)
+STATIC void
+ahc_clear_msg_state(ahc)
+	struct ahc_softc *ahc;
 {
 	ahc->msgout_len = 0;
 	ahc->msgin_index = 0;
 	ahc->msg_type = MSG_TYPE_NONE;
-	if ((ahc_inb(ahc, SCSISIGI) & ATNI) != 0) {
-		/*
-		 * The target didn't care to respond to our
-		 * message request, so clear ATN.
-		 */
-		ahc_outb(ahc, CLRSINT1, CLRATNO);
-	}
 	ahc_outb(ahc, MSG_OUT, MSG_NOOP);
 }
 
-/*
- * Manual message loop handler.
- */
-static void
-ahc_handle_message_phase(struct ahc_softc *ahc)
+STATIC void
+ahc_handle_message_phase(ahc, sc_link)
+	struct ahc_softc *ahc;
+	struct scsi_link *sc_link;
 { 
 	struct	ahc_devinfo devinfo;
 	u_int	bus_phase;
@@ -2399,7 +2730,7 @@ reswitch:
 		int msgdone;
 
 		if (ahc->msgout_len == 0)
-			panic("HOST_MSG_LOOP interrupt with no active message");
+			panic("REQINIT interrupt with no active message");
 
 		phasemis = bus_phase != P_MESGOUT;
 		if (phasemis) {
@@ -2435,7 +2766,7 @@ reswitch:
 			 * 0, and try again.
 			 */
 			ahc->msgout_index = 0;
-			ahc_assert_atn(ahc);
+			ahc_outb(ahc, SCSISIGO, ahc_inb(ahc, SCSISIGO) | ATNO);
 		}
 
 		lastbyte = ahc->msgout_index == (ahc->msgout_len - 1);
@@ -2475,7 +2806,7 @@ reswitch:
 		/* Pull the byte in without acking it */
 		ahc->msgin_buf[ahc->msgin_index] = ahc_inb(ahc, SCSIBUSL);
 
-		message_done = ahc_parse_msg(ahc, &devinfo);
+		message_done = ahc_parse_msg(ahc, sc_link, &devinfo);
 
 		if (message_done) {
 			/*
@@ -2490,7 +2821,8 @@ reswitch:
 			 * message out phase.
 			 */
 			if (ahc->msgout_len != 0)
-				ahc_assert_atn(ahc);
+				ahc_outb(ahc, SCSISIGO,
+					 ahc_inb(ahc, SCSISIGO) | ATNO);
 		} else 
 			ahc->msgin_index++;
 
@@ -2570,7 +2902,7 @@ reswitch:
 		 */
 		ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) & ~SPIOEN);
 		ahc->msgin_buf[ahc->msgin_index] = ahc_inb(ahc, SCSIDATL);
-		msgdone = ahc_parse_msg(ahc, &devinfo);
+		msgdone = ahc_parse_msg(ahc, sc_link, &devinfo);
 		if (msgdone == MSGLOOP_TERMINATED) {
 			/*
 			 * The message is *really* done in that it caused
@@ -2627,62 +2959,59 @@ reswitch:
 
 /*
  * See if we sent a particular extended message to the target.
- * If "full" is true, return true only if the target saw the full
- * message.  If "full" is false, return true if the target saw at
- * least the first byte of the message.
+ * If "full" is true, the target saw the full message.
+ * If "full" is false, the target saw at least the first
+ * byte of the message.
  */
-static int
-ahc_sent_msg(struct ahc_softc *ahc, ahc_msgtype type, u_int msgval, int full)
+STATIC int
+ahc_sent_msg(ahc, msgtype, full)
+	struct ahc_softc *ahc;
+	u_int msgtype;
+	int full;
 {
 	int found;
-	u_int index;
+	int index;
 
 	found = FALSE;
 	index = 0;
 
 	while (index < ahc->msgout_len) {
 		if (ahc->msgout_buf[index] == MSG_EXTENDED) {
-			u_int end_index;
 
-			end_index = index + 1 + ahc->msgout_buf[index + 1];
-			if (ahc->msgout_buf[index+2] == msgval
-			 && type == AHCMSG_EXT) {
+			/* Found a candidate */
+			if (ahc->msgout_buf[index+2] == msgtype) {
+				u_int end_index;
 
+				end_index = index + 1
+					  + ahc->msgout_buf[index + 1];
 				if (full) {
 					if (ahc->msgout_index > end_index)
 						found = TRUE;
 				} else if (ahc->msgout_index > index)
 					found = TRUE;
 			}
-			index = end_index;
-		} else if (ahc->msgout_buf[index] >= MSG_SIMPLE_TASK
+			break;
+		} else if (ahc->msgout_buf[index] >= MSG_SIMPLE_Q_TAG
 			&& ahc->msgout_buf[index] <= MSG_IGN_WIDE_RESIDUE) {
 
 			/* Skip tag type and tag id or residue param*/
 			index += 2;
 		} else {
 			/* Single byte message */
-			if (type == AHCMSG_1B
-			 && ahc->msgout_buf[index] == msgval
-			 && ahc->msgout_index > index)
-				found = TRUE;
 			index++;
 		}
-
-		if (found)
-			break;
 	}
 	return (found);
 }
 
-/*
- * Wait for a complete incoming message, parse it, and respond accordingly.
- */
-static int
-ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
+STATIC int
+ahc_parse_msg(ahc, sc_link, devinfo)
+	struct ahc_softc *ahc;
+	struct scsi_link *sc_link;
+	struct ahc_devinfo *devinfo;
 {
 	struct	ahc_initiator_tinfo *tinfo;
-	struct	ahc_tmode_tstate *tstate;
+	struct	tmode_tstate *tstate;
 	int	reject;
 	int	done;
 	int	response;
@@ -2713,6 +3042,19 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 	case MSG_NOOP:
 		done = MSGLOOP_MSGCOMPLETE;
 		break;
+	case MSG_IGN_WIDE_RESIDUE:
+	{
+		/* Wait for the whole message */
+		if (ahc->msgin_index >= 1) {
+			if (ahc->msgin_buf[1] != 1
+			 || tinfo->current.width == MSG_EXT_WDTR_BUS_8_BIT) {
+				reject = TRUE;
+				done = MSGLOOP_MSGCOMPLETE;
+			} else
+				ahc_handle_ign_wide_residue(ahc, devinfo);
+		}
+		break;
+	}
 	case MSG_EXTENDED:
 	{
 		/* Wait for enough of the message to begin validation */
@@ -2723,7 +3065,6 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 		{
 			struct	 ahc_syncrate *syncrate;
 			u_int	 period;
-			u_int	 ppr_options;
 			u_int	 offset;
 			u_int	 saved_offset;
 			
@@ -2743,35 +3084,21 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 				break;
 
 			period = ahc->msgin_buf[3];
-			ppr_options = 0;
 			saved_offset = offset = ahc->msgin_buf[4];
-			syncrate = ahc_devlimited_syncrate(ahc, tinfo, &period,
-							   &ppr_options,
-							   devinfo->role);
-			ahc_validate_offset(ahc, tinfo, syncrate, &offset,
-					    targ_scsirate & WIDEXFER,
-					    devinfo->role);
-			if (bootverbose) {
-				printf("(%s:%c:%d:%d): Received "
-				       "SDTR period %x, offset %x\n\t"
-				       "Filtered to period %x, offset %x\n",
-				       ahc_name(ahc), devinfo->channel,
-				       devinfo->target, devinfo->lun,
-				       ahc->msgin_buf[3], saved_offset,
-				       period, offset);
-			}
-			ahc_set_syncrate(ahc, devinfo, 
-					 syncrate, period,
-					 offset, ppr_options,
+			syncrate = ahc_devlimited_syncrate(ahc, &period);
+			ahc_validate_offset(ahc, syncrate, &offset,
+					    targ_scsirate & WIDEXFER);
+			ahc_set_syncrate(ahc, devinfo,
+					 syncrate, period, offset,
 					 AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
-					 /*paused*/TRUE);
+					 /*paused*/TRUE, /*done*/TRUE);
 
 			/*
 			 * See if we initiated Sync Negotiation
 			 * and didn't have to fall down to async
 			 * transfers.
 			 */
-			if (ahc_sent_msg(ahc, AHCMSG_EXT, MSG_EXT_SDTR, TRUE)) {
+			if (ahc_sent_msg(ahc, MSG_EXT_SDTR, /*full*/TRUE)) {
 				/* We started it */
 				if (saved_offset != offset) {
 					/* Went too low - force async */
@@ -2781,17 +3108,11 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 				/*
 				 * Send our own SDTR in reply
 				 */
-				if (bootverbose
-				 && devinfo->role == ROLE_INITIATOR) {
-					printf("(%s:%c:%d:%d): Target "
-					       "Initiated SDTR\n",
-					       ahc_name(ahc), devinfo->channel,
-					       devinfo->target, devinfo->lun);
-				}
+				if (bootverbose)
+					printf("Sending SDTR!\n");
 				ahc->msgout_index = 0;
 				ahc->msgout_len = 0;
-				ahc_construct_sdtr(ahc, devinfo,
-						   period, offset);
+				ahc_construct_sdtr(ahc, period, offset);
 				ahc->msgout_index = 0;
 				response = TRUE;
 			}
@@ -2800,9 +3121,8 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 		}
 		case MSG_EXT_WDTR:
 		{
-			u_int bus_width;
-			u_int saved_width;
-			u_int sending_reply;
+			u_int	bus_width;
+			u_int	sending_reply;
 
 			sending_reply = FALSE;
 			if (ahc->msgin_buf[1] != MSG_EXT_WDTR_LEN) {
@@ -2821,65 +3141,82 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 				break;
 
 			bus_width = ahc->msgin_buf[3];
-			saved_width = bus_width;
-			ahc_validate_width(ahc, tinfo, &bus_width,
-					   devinfo->role);
-			if (bootverbose) {
-				printf("(%s:%c:%d:%d): Received WDTR "
-				       "%x filtered to %x\n",
-				       ahc_name(ahc), devinfo->channel,
-				       devinfo->target, devinfo->lun,
-				       saved_width, bus_width);
-			}
-
-			if (ahc_sent_msg(ahc, AHCMSG_EXT, MSG_EXT_WDTR, TRUE)) {
+			if (ahc_sent_msg(ahc, MSG_EXT_WDTR, /*full*/TRUE)) {
 				/*
 				 * Don't send a WDTR back to the
 				 * target, since we asked first.
-				 * If the width went higher than our
-				 * request, reject it.
 				 */
-				if (saved_width > bus_width) {
+				switch (bus_width){
+				default:
+					/*
+					 * How can we do anything greater
+					 * than 16bit transfers on a 16bit
+					 * bus?
+					 */
 					reject = TRUE;
-					printf("(%s:%c:%d:%d): requested %dBit "
+					printf("%s: target %d requested %dBit "
 					       "transfers.  Rejecting...\n",
-					       ahc_name(ahc), devinfo->channel,
-					       devinfo->target, devinfo->lun,
+					       ahc_name(ahc), devinfo->target,
 					       8 * (0x01 << bus_width));
-					bus_width = 0;
+					/* FALLTHROUGH */
+				case MSG_EXT_WDTR_BUS_8_BIT:
+					bus_width = MSG_EXT_WDTR_BUS_8_BIT;
+					break;
+				case MSG_EXT_WDTR_BUS_16_BIT:
+					break;
 				}
 			} else {
 				/*
 				 * Send our own WDTR in reply
 				 */
-				if (bootverbose
-				 && devinfo->role == ROLE_INITIATOR) {
-					printf("(%s:%c:%d:%d): Target "
-					       "Initiated WDTR\n",
-					       ahc_name(ahc), devinfo->channel,
-					       devinfo->target, devinfo->lun);
+				if (bootverbose)
+					printf("Sending WDTR!\n");
+				switch (bus_width) {
+				default:
+					if (ahc->features & AHC_WIDE) {
+						/* Respond Wide */
+						bus_width =
+						    MSG_EXT_WDTR_BUS_16_BIT;
+						break;
+					}
+					/* FALLTHROUGH */
+				case MSG_EXT_WDTR_BUS_8_BIT:
+					bus_width = MSG_EXT_WDTR_BUS_8_BIT;
+					break;
 				}
 				ahc->msgout_index = 0;
 				ahc->msgout_len = 0;
-				ahc_construct_wdtr(ahc, devinfo, bus_width);
+				ahc_construct_wdtr(ahc, bus_width);
 				ahc->msgout_index = 0;
 				response = TRUE;
 				sending_reply = TRUE;
 			}
 			ahc_set_width(ahc, devinfo, bus_width,
 				      AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
-				      /*paused*/TRUE);
+				      /*paused*/TRUE, /*done*/TRUE);
+
 			/* After a wide message, we are async */
 			ahc_set_syncrate(ahc, devinfo,
 					 /*syncrate*/NULL, /*period*/0,
-					 /*offset*/0, /*ppr_options*/0,
-					 AHC_TRANS_ACTIVE, /*paused*/TRUE);
+					 /*offset*/0, AHC_TRANS_ACTIVE,
+					 /*paused*/TRUE, /*done*/FALSE);
 			if (sending_reply == FALSE && reject == FALSE) {
 
 				if (tinfo->goal.period) {
+					struct	ahc_syncrate *rate;
+					u_int	period;
+					u_int	offset;
+
+					/* Start the sync negotiation */
+					period = tinfo->goal.period;
+					rate = ahc_devlimited_syncrate(ahc,
+								       &period);
+					offset = tinfo->goal.offset;
+					ahc_validate_offset(ahc, rate, &offset,
+							  tinfo->current.width);
 					ahc->msgout_index = 0;
 					ahc->msgout_len = 0;
-					ahc_build_transfer_msg(ahc, devinfo);
+					ahc_construct_sdtr(ahc, period, offset);
 					ahc->msgout_index = 0;
 					response = TRUE;
 				}
@@ -2887,122 +3224,6 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 			done = MSGLOOP_MSGCOMPLETE;
 			break;
 		}
-		case MSG_EXT_PPR:
-		{
-			struct	ahc_syncrate *syncrate;
-			u_int	period;
-			u_int	offset;
-			u_int	bus_width;
-			u_int	ppr_options;
-			u_int	saved_width;
-			u_int	saved_offset;
-			u_int	saved_ppr_options;
-
-			if (ahc->msgin_buf[1] != MSG_EXT_PPR_LEN) {
-				reject = TRUE;
-				break;
-			}
-
-			/*
-			 * Wait until we have all args before validating
-			 * and acting on this message.
-			 *
-			 * Add one to MSG_EXT_PPR_LEN to account for
-			 * the extended message preamble.
-			 */
-			if (ahc->msgin_index < (MSG_EXT_PPR_LEN + 1))
-				break;
-
-			period = ahc->msgin_buf[3];
-			offset = ahc->msgin_buf[5];
-			bus_width = ahc->msgin_buf[6];
-			saved_width = bus_width;
-			ppr_options = ahc->msgin_buf[7];
-			/*
-			 * According to the spec, a DT only
-			 * period factor with no DT option
-			 * set implies async.
-			 */
-			if ((ppr_options & MSG_EXT_PPR_DT_REQ) == 0
-			 && period == 9)
-				offset = 0;
-			saved_ppr_options = ppr_options;
-			saved_offset = offset;
-
-			/*
-			 * Mask out any options we don't support
-			 * on any controller.  Transfer options are
-			 * only available if we are negotiating wide.
-			 */
-			ppr_options &= MSG_EXT_PPR_DT_REQ;
-			if (bus_width == 0)
-				ppr_options = 0;
-
-			ahc_validate_width(ahc, tinfo, &bus_width,
-					   devinfo->role);
-			syncrate = ahc_devlimited_syncrate(ahc, tinfo, &period,
-							   &ppr_options,
-							   devinfo->role);
-			ahc_validate_offset(ahc, tinfo, syncrate,
-					    &offset, bus_width,
-					    devinfo->role);
-
-			if (ahc_sent_msg(ahc, AHCMSG_EXT, MSG_EXT_PPR, TRUE)) {
-				/*
-				 * If we are unable to do any of the
-				 * requested options (we went too low),
-				 * then we'll have to reject the message.
-				 */
-				if (saved_width > bus_width
-				 || saved_offset != offset
-				 || saved_ppr_options != ppr_options) {
-					reject = TRUE;
-					period = 0;
-					offset = 0;
-					bus_width = 0;
-					ppr_options = 0;
-					syncrate = NULL;
-				}
-			} else {
-				if (devinfo->role != ROLE_TARGET)
-					printf("(%s:%c:%d:%d): Target "
-					       "Initiated PPR\n",
-					       ahc_name(ahc), devinfo->channel,
-					       devinfo->target, devinfo->lun);
-				else
-					printf("(%s:%c:%d:%d): Initiator "
-					       "Initiated PPR\n",
-					       ahc_name(ahc), devinfo->channel,
-					       devinfo->target, devinfo->lun);
-				ahc->msgout_index = 0;
-				ahc->msgout_len = 0;
-				ahc_construct_ppr(ahc, devinfo, period, offset,
-						  bus_width, ppr_options);
-				ahc->msgout_index = 0;
-				response = TRUE;
-			}
-			if (bootverbose) {
-				printf("(%s:%c:%d:%d): Received PPR width %x, "
-				       "period %x, offset %x,options %x\n"
-				       "\tFiltered to width %x, period %x, "
-				       "offset %x, options %x\n",
-				       ahc_name(ahc), devinfo->channel,
-				       devinfo->target, devinfo->lun,
-				       saved_width, ahc->msgin_buf[3],
-				       saved_offset, saved_ppr_options,
-				       bus_width, period, offset, ppr_options);
-			}
-			ahc_set_width(ahc, devinfo, bus_width,
-				      AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
-				      /*paused*/TRUE);
-			ahc_set_syncrate(ahc, devinfo,
-					 syncrate, period,
-					 offset, ppr_options,
-					 AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
-					 /*paused*/TRUE);
-			done = MSGLOOP_MSGCOMPLETE;
-			break;
-		}
 		default:
 			/* Unknown extended message.  Reject it. */
 			reject = TRUE;
@@ -3012,31 +3233,29 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 	}
 	case MSG_BUS_DEV_RESET:
 		ahc_handle_devreset(ahc, devinfo,
-				    CAM_BDR_SENT,
-				    "Bus Device Reset Received",
+				    XS_RESET, "Bus Device Reset Received",
 				    /*verbose_level*/0);
-		ahc_restart(ahc);
+		restart_sequencer(ahc);
 		done = MSGLOOP_TERMINATED;
 		break;
 	case MSG_ABORT_TAG:
 	case MSG_ABORT:
 	case MSG_CLEAR_QUEUE:
-#ifdef AHC_TARGET_MODE
 		/* Target mode messages */
 		if (devinfo->role != ROLE_TARGET) {
 			reject = TRUE;
 			break;
 		}
+#if AHC_TARGET_MODE
 		ahc_abort_scbs(ahc, devinfo->target, devinfo->channel,
 			       devinfo->lun,
-			       ahc->msgin_buf[0] == MSG_ABORT_TAG
-						  ? SCB_LIST_NULL
-						  : ahc_inb(ahc, INITIATOR_TAG),
-			       ROLE_TARGET, CAM_REQ_ABORTED);
+			       ahc->msgin_buf[0] == MSG_ABORT_TAG ? SCB_LIST_NULL
+			       : ahc_inb(ahc, INITIATOR_TAG),
+				ROLE_TARGET, XS_DRIVER_STUFFUP);
 
 		tstate = ahc->enabled_targets[devinfo->our_scsiid];
 		if (tstate != NULL) {
-			struct ahc_tmode_lstate* lstate;
+			struct tmode_lstate* lstate;
 
 			lstate = tstate->enabled_luns[devinfo->lun];
 			if (lstate != NULL) {
@@ -3048,8 +3267,10 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 			}
 		}
 		done = MSGLOOP_MSGCOMPLETE;
-		break;
+#else
+		panic("ahc: got target mode message");
 #endif
+		break;
 	case MSG_TERM_IO_PROC:
 	default:
 		reject = TRUE;
@@ -3074,174 +3295,18 @@ ahc_parse_msg(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 	return (done);
 }
 
-/*
- * Process a message reject message.
- */
-static int
-ahc_handle_msg_reject(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
-{
-	/*
-	 * What we care about here is if we had an
-	 * outstanding SDTR or WDTR message for this
-	 * target.  If we did, this is a signal that
-	 * the target is refusing negotiation.
-	 */
-	struct scb *scb;
-	struct ahc_initiator_tinfo *tinfo;
-	struct ahc_tmode_tstate *tstate;
-	u_int scb_index;
-	u_int last_msg;
-	int   response = 0;
-
-	scb_index = ahc_inb(ahc, SCB_TAG);
-	scb = ahc_lookup_scb(ahc, scb_index);
-	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel,
-				    devinfo->our_scsiid,
-				    devinfo->target, &tstate);
-	/* Might be necessary */
-	last_msg = ahc_inb(ahc, LAST_MSG);
-
-	if (ahc_sent_msg(ahc, AHCMSG_EXT, MSG_EXT_PPR, /*full*/FALSE)) {
-		/*
-		 * Target does not support the PPR message.
-		 * Attempt to negotiate SPI-2 style.
-		 */
-		if (bootverbose) {
-			printf("(%s:%c:%d:%d): PPR Rejected. "
-			       "Trying WDTR/SDTR\n",
-			       ahc_name(ahc), devinfo->channel,
-			       devinfo->target, devinfo->lun);
-		}
-		tinfo->goal.ppr_options = 0;
-		tinfo->curr.transport_version = 2;
-		tinfo->goal.transport_version = 2;
-		ahc->msgout_index = 0;
-		ahc->msgout_len = 0;
-		ahc_build_transfer_msg(ahc, devinfo);
-		ahc->msgout_index = 0;
-		response = 1;
-	} else if (ahc_sent_msg(ahc, AHCMSG_EXT, MSG_EXT_WDTR, /*full*/FALSE)) {
-
-		/* note 8bit xfers */
-		printf("(%s:%c:%d:%d): refuses WIDE negotiation.  Using "
-		       "8bit transfers\n", ahc_name(ahc),
-		       devinfo->channel, devinfo->target, devinfo->lun);
-		ahc_set_width(ahc, devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-			      AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
-			      /*paused*/TRUE);
-		/*
-		 * No need to clear the sync rate.  If the target
-		 * did not accept the command, our syncrate is
-		 * unaffected.  If the target started the negotiation,
-		 * but rejected our response, we already cleared the
-		 * sync rate before sending our WDTR.
-		 */
-		if (tinfo->goal.period) {
-
-			/* Start the sync negotiation */
-			ahc->msgout_index = 0;
-			ahc->msgout_len = 0;
-			ahc_build_transfer_msg(ahc, devinfo);
-			ahc->msgout_index = 0;
-			response = 1;
-		}
-	} else if (ahc_sent_msg(ahc, AHCMSG_EXT, MSG_EXT_SDTR, /*full*/FALSE)) {
-		/* note asynch xfers and clear flag */
-		ahc_set_syncrate(ahc, devinfo, /*syncrate*/NULL, /*period*/0,
-				 /*offset*/0, /*ppr_options*/0,
-				 AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
-				 /*paused*/TRUE);
-		printf("(%s:%c:%d:%d): refuses synchronous negotiation. "
-		       "Using asynchronous transfers\n",
-		       ahc_name(ahc), devinfo->channel,
-		       devinfo->target, devinfo->lun);
-	} else if ((scb->hscb->control & MSG_SIMPLE_TASK) != 0) {
-		int tag_type;
-		int mask;
-
-		tag_type = (scb->hscb->control & MSG_SIMPLE_TASK);
-
-		if (tag_type == MSG_SIMPLE_TASK) {
-			printf("(%s:%c:%d:%d): refuses tagged commands.  "
-			       "Performing non-tagged I/O\n", ahc_name(ahc),
-			       devinfo->channel, devinfo->target, devinfo->lun);
-			ahc_set_tags(ahc, devinfo, AHC_QUEUE_NONE);
-			mask = ~0x23;
-		} else {
-			printf("(%s:%c:%d:%d): refuses %s tagged commands.  "
-			       "Performing simple queue tagged I/O only\n",
-			       ahc_name(ahc), devinfo->channel, devinfo->target,
-			       devinfo->lun, tag_type == MSG_ORDERED_TASK
-			       ? "ordered" : "head of queue");
-			ahc_set_tags(ahc, devinfo, AHC_QUEUE_BASIC);
-			mask = ~0x03;
-		}
-
-		/*
-		 * Resend the identify for this CCB as the target
-		 * may believe that the selection is invalid otherwise.
-		 */
-		ahc_outb(ahc, SCB_CONTROL,
-			 ahc_inb(ahc, SCB_CONTROL) & mask);
-	 	scb->hscb->control &= mask;
-		ahc_set_transaction_tag(scb, /*enabled*/FALSE,
-					/*type*/MSG_SIMPLE_TASK);
-		ahc_outb(ahc, MSG_OUT, MSG_IDENTIFYFLAG);
-		ahc_assert_atn(ahc);
-
-		/*
-		 * This transaction is now at the head of
-		 * the untagged queue for this target.
-		 */
-		if ((ahc->flags & AHC_SCB_BTT) == 0) {
-			struct scb_tailq *untagged_q;
-
-			untagged_q =
-			    &(ahc->untagged_queues[devinfo->target_offset]);
-			TAILQ_INSERT_HEAD(untagged_q, scb, links.tqe);
-			scb->flags |= SCB_UNTAGGEDQ;
-		}
-		ahc_busy_tcl(ahc, BUILD_TCL(scb->hscb->scsiid, devinfo->lun),
-			     scb->hscb->tag);
-
-		/*
-		 * Requeue all tagged commands for this target
-		 * currently in our posession so they can be
-		 * converted to untagged commands.
-		 */
-		ahc_search_qinfifo(ahc, SCB_GET_TARGET(ahc, scb),
-				   SCB_GET_CHANNEL(ahc, scb),
-				   SCB_GET_LUN(scb), /*tag*/SCB_LIST_NULL,
-				   ROLE_INITIATOR, CAM_REQUEUE_REQ,
-				   SEARCH_COMPLETE);
-	} else {
-		/*
-		 * Otherwise, we ignore it.
-		 */
-		printf("%s:%c:%d: Message reject for %x -- ignored\n",
-		       ahc_name(ahc), devinfo->channel, devinfo->target,
-		       last_msg);
-	}
-	return (response);
-}
-
-/*
- * Process an ingnore wide residue message.
- */
-static void
-ahc_handle_ign_wide_residue(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
+STATIC void
+ahc_handle_ign_wide_residue(ahc, devinfo)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
 {
 	u_int scb_index;
 	struct scb *scb;
 
 	scb_index = ahc_inb(ahc, SCB_TAG);
-	scb = ahc_lookup_scb(ahc, scb_index);
-	/*
-	 * XXX Actually check data direction in the sequencer?
-	 * Perhaps add datadir to some spare bits in the hscb?
-	 */
+	scb = &ahc->scb_data->scbarray[scb_index];
 	if ((ahc_inb(ahc, SEQ_FLAGS) & DPHASE) == 0
-	 || ahc_get_transfer_dir(scb) != CAM_DIR_IN) {
+	 || !(scb->xs->flags & SCSI_DATA_IN)) {
 		/*
 		 * Ignore the message if we haven't
 		 * seen an appropriate data phase yet.
@@ -3254,10 +3319,10 @@ ahc_handle_ign_wide_residue(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 		 * nothing.  Otherwise, subtract a byte
 		 * and update the residual count accordingly.
 		 */
-		uint32_t sgptr;
+		u_int resid_sgcnt;
 
-		sgptr = ahc_inb(ahc, SCB_RESIDUAL_SGPTR);
-		if ((sgptr & SG_LIST_NULL) != 0
+		resid_sgcnt = ahc_inb(ahc, SCB_RESID_SGCNT);
+		if (resid_sgcnt == 0
 		 && ahc_inb(ahc, DATA_COUNT_ODD) == 1) {
 			/*
 			 * If the residual occurred on the last
@@ -3266,20 +3331,13 @@ ahc_handle_ign_wide_residue(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 			 * nothing.
 			 */
 		} else {
-			struct ahc_dma_seg *sg;
-			uint32_t data_cnt;
-			uint32_t data_addr;
-			uint32_t sglen;
-
-			/* Pull in the rest of the sgptr */
-			sgptr |= (ahc_inb(ahc, SCB_RESIDUAL_SGPTR + 3) << 24)
-			      | (ahc_inb(ahc, SCB_RESIDUAL_SGPTR + 2) << 16)
-			      | (ahc_inb(ahc, SCB_RESIDUAL_SGPTR + 1) << 8);
-			sgptr &= SG_PTR_MASK;
-			data_cnt = (ahc_inb(ahc, SCB_RESIDUAL_DATACNT+3) << 24)
-				 | (ahc_inb(ahc, SCB_RESIDUAL_DATACNT+2) << 16)
-				 | (ahc_inb(ahc, SCB_RESIDUAL_DATACNT+1) << 8)
-				 | (ahc_inb(ahc, SCB_RESIDUAL_DATACNT));
+			u_int data_cnt;
+			u_int data_addr;
+			u_int sg_index;
+
+			data_cnt = (ahc_inb(ahc, SCB_RESID_DCNT + 2) << 16)
+				 | (ahc_inb(ahc, SCB_RESID_DCNT + 1) << 8)
+				 | (ahc_inb(ahc, SCB_RESID_DCNT));
 
 			data_addr = (ahc_inb(ahc, SHADDR + 3) << 24)
 				  | (ahc_inb(ahc, SHADDR + 2) << 16)
@@ -3289,921 +3347,258 @@ ahc_handle_ign_wide_residue(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 			data_cnt += 1;
 			data_addr -= 1;
 
-			sg = ahc_sg_bus_to_virt(scb, sgptr);
-			/*
-			 * The residual sg ptr points to the next S/G
-			 * to load so we must go back one.
-			 */
-			sg--;
-			sglen = ahc_le32toh(sg->len) & AHC_SG_LEN_MASK;
-			if (sg != scb->sg_list
-			 && sglen < (data_cnt & AHC_SG_LEN_MASK)) {
+			sg_index = scb->sg_count - resid_sgcnt;
 
-				sg--;
-				sglen = ahc_le32toh(sg->len);
-				/*
-				 * Preserve High Address and SG_LIST bits
-				 * while setting the count to 1.
-				 */
-				data_cnt = 1 | (sglen & (~AHC_SG_LEN_MASK));
-				data_addr = ahc_le32toh(sg->addr)
-					  + (sglen & AHC_SG_LEN_MASK) - 1;
+			if (sg_index != 0
+			 && (le32toh(scb->sg_list[sg_index].len) < data_cnt)) {
+				u_int32_t sg_addr;
 
+				sg_index--;
+				data_cnt = 1;
+				data_addr = le32toh(scb->sg_list[sg_index].addr)
+					  + le32toh(scb->sg_list[sg_index].len)
+					  - 1;
+				
 				/*
-				 * Increment sg so it points to the
-				 * "next" sg.
+				 * The physical address base points to the
+				 * second entry as it is always used for
+				 * calculating the "next S/G pointer".
 				 */
-				sg++;
-				sgptr = ahc_sg_virt_to_bus(scb, sg);
-				ahc_outb(ahc, SCB_RESIDUAL_SGPTR + 3,
-					 sgptr >> 24);
-				ahc_outb(ahc, SCB_RESIDUAL_SGPTR + 2,
-					 sgptr >> 16);
-				ahc_outb(ahc, SCB_RESIDUAL_SGPTR + 1,
-					 sgptr >> 8);
-				ahc_outb(ahc, SCB_RESIDUAL_SGPTR, sgptr);
+				sg_addr = scb->sg_list_phys
+					+ (sg_index* sizeof(*scb->sg_list));
+				ahc_outb(ahc, SG_NEXT + 3, sg_addr >> 24);
+				ahc_outb(ahc, SG_NEXT + 2, sg_addr >> 16);
+				ahc_outb(ahc, SG_NEXT + 1, sg_addr >> 8);
+				ahc_outb(ahc, SG_NEXT, sg_addr);
 			}
 
-			ahc_outb(ahc, SCB_RESIDUAL_DATACNT + 3, data_cnt >> 24);
-			ahc_outb(ahc, SCB_RESIDUAL_DATACNT + 2, data_cnt >> 16);
-			ahc_outb(ahc, SCB_RESIDUAL_DATACNT + 1, data_cnt >> 8);
-			ahc_outb(ahc, SCB_RESIDUAL_DATACNT, data_cnt);
-		}
-	}
-}
-
-
-/*
- * Reinitialize the data pointers for the active transfer
- * based on its current residual.
- */
-static void
-ahc_reinitialize_dataptrs(struct ahc_softc *ahc)
-{
-	struct	 scb *scb;
-	struct	 ahc_dma_seg *sg;
-	u_int	 scb_index;
-	uint32_t sgptr;
-	uint32_t resid;
-	uint32_t dataptr;
+			ahc_outb(ahc, SCB_RESID_DCNT + 2, data_cnt >> 16);
+			ahc_outb(ahc, SCB_RESID_DCNT + 1, data_cnt >> 8);
+			ahc_outb(ahc, SCB_RESID_DCNT, data_cnt);
 
-	scb_index = ahc_inb(ahc, SCB_TAG);
-	scb = ahc_lookup_scb(ahc, scb_index);
-	sgptr = (ahc_inb(ahc, SCB_RESIDUAL_SGPTR + 3) << 24)
-	      | (ahc_inb(ahc, SCB_RESIDUAL_SGPTR + 2) << 16)
-	      | (ahc_inb(ahc, SCB_RESIDUAL_SGPTR + 1) << 8)
-	      |	ahc_inb(ahc, SCB_RESIDUAL_SGPTR);
-
-	sgptr &= SG_PTR_MASK;
-	sg = ahc_sg_bus_to_virt(scb, sgptr);
-
-	/* The residual sg_ptr always points to the next sg */
-	sg--;
-
-	resid = (ahc_inb(ahc, SCB_RESIDUAL_DATACNT + 2) << 16)
-	      | (ahc_inb(ahc, SCB_RESIDUAL_DATACNT + 1) << 8)
-	      | ahc_inb(ahc, SCB_RESIDUAL_DATACNT);
-
-	dataptr = ahc_le32toh(sg->addr)
-		+ (ahc_le32toh(sg->len) & AHC_SG_LEN_MASK)
-		- resid;
-	if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-		u_int dscommand1;
-
-		dscommand1 = ahc_inb(ahc, DSCOMMAND1);
-		ahc_outb(ahc, DSCOMMAND1, dscommand1 | HADDLDSEL0);
-		ahc_outb(ahc, HADDR,
-			 (ahc_le32toh(sg->len) >> 24) & SG_HIGH_ADDR_BITS);
-		ahc_outb(ahc, DSCOMMAND1, dscommand1);
-	}
-	ahc_outb(ahc, HADDR + 3, dataptr >> 24);
-	ahc_outb(ahc, HADDR + 2, dataptr >> 16);
-	ahc_outb(ahc, HADDR + 1, dataptr >> 8);
-	ahc_outb(ahc, HADDR, dataptr);
-	ahc_outb(ahc, HCNT + 2, resid >> 16);
-	ahc_outb(ahc, HCNT + 1, resid >> 8);
-	ahc_outb(ahc, HCNT, resid);
-	if ((ahc->features & AHC_ULTRA2) == 0) {
-		ahc_outb(ahc, STCNT + 2, resid >> 16);
-		ahc_outb(ahc, STCNT + 1, resid >> 8);
-		ahc_outb(ahc, STCNT, resid);
+			ahc_outb(ahc, SHADDR + 3, data_addr >> 24);
+			ahc_outb(ahc, SHADDR + 2, data_addr >> 16);
+			ahc_outb(ahc, SHADDR + 1, data_addr >> 8);
+			ahc_outb(ahc, SHADDR, data_addr);
+		}
 	}
 }
 
-/*
- * Handle the effects of issuing a bus device reset message.
- */
-static void
-ahc_handle_devreset(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-		    cam_status status, char *message, int verbose_level)
+STATIC void
+ahc_handle_devreset(ahc, devinfo, status, message, verbose_level)
+	struct ahc_softc *ahc;
+	struct ahc_devinfo *devinfo;
+	int status;
+	char *message;
+	int verbose_level;
 {
-#ifdef AHC_TARGET_MODE
-	struct ahc_tmode_tstate* tstate;
-	u_int lun;
-#endif
 	int found;
 
 	found = ahc_abort_scbs(ahc, devinfo->target, devinfo->channel,
-			       CAM_LUN_WILDCARD, SCB_LIST_NULL, devinfo->role,
+			       ALL_LUNS, SCB_LIST_NULL, devinfo->role,
 			       status);
-
-#ifdef AHC_TARGET_MODE
-	/*
-	 * Send an immediate notify ccb to all target mord peripheral
-	 * drivers affected by this action.
-	 */
-	tstate = ahc->enabled_targets[devinfo->our_scsiid];
-	if (tstate != NULL) {
-		for (lun = 0; lun < AHC_NUM_LUNS; lun++) {
-			struct ahc_tmode_lstate* lstate;
-
-			lstate = tstate->enabled_luns[lun];
-			if (lstate == NULL)
-				continue;
-
-			ahc_queue_lstate_event(ahc, lstate, devinfo->our_scsiid,
-					       MSG_BUS_DEV_RESET, /*arg*/0);
-			ahc_send_lstate_events(ahc, lstate);
-		}
-	}
-#endif
-
+	
 	/*
 	 * Go back to async/narrow transfers and renegotiate.
+	 * ahc_set_width and ahc_set_syncrate can cope with NULL
+	 * paths.
 	 */
 	ahc_set_width(ahc, devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-		      AHC_TRANS_CUR, /*paused*/TRUE);
+		      AHC_TRANS_CUR, /*paused*/TRUE, /*done*/FALSE);
 	ahc_set_syncrate(ahc, devinfo, /*syncrate*/NULL,
-			 /*period*/0, /*offset*/0, /*ppr_options*/0,
-			 AHC_TRANS_CUR, /*paused*/TRUE);
+			 /*period*/0, /*offset*/0, AHC_TRANS_CUR,
+			 /*paused*/TRUE, /*done*/FALSE);
 	
-	ahc_send_async(ahc, devinfo->channel, devinfo->target,
-		       CAM_LUN_WILDCARD, AC_SENT_BDR, NULL);
-
 	if (message != NULL
 	 && (verbose_level <= bootverbose))
 		printf("%s: %s on %c:%d. %d SCBs aborted\n", ahc_name(ahc),
 		       message, devinfo->channel, devinfo->target, found);
 }
 
-#ifdef AHC_TARGET_MODE
-static void
-ahc_setup_target_msgin(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
-		       struct scb *scb)
-{
-
-	/*              
-	 * To facilitate adding multiple messages together,
-	 * each routine should increment the index and len
-	 * variables instead of setting them explicitly.
-	 */             
-	ahc->msgout_index = 0;
-	ahc->msgout_len = 0;
-
-	if (scb != NULL && (scb->flags & SCB_AUTO_NEGOTIATE) != 0)
-		ahc_build_transfer_msg(ahc, devinfo);
-	else
-		panic("ahc_intr: AWAITING target message with no message");
-
-	ahc->msgout_index = 0;
-	ahc->msg_type = MSG_TYPE_TARGET_MSGIN;
-}
-#endif
-/**************************** Initialization **********************************/
 /*
- * Allocate a controller structure for a new device
- * and perform initial initializion.
+ * We have an scb which has been processed by the
+ * adaptor, now we look to see how the operation
+ * went.
  */
-struct ahc_softc *
-ahc_alloc(void *platform_arg, char *name)
+STATIC void
+ahc_done(ahc, scb)
+	struct ahc_softc *ahc;
+	struct scb *scb;
 {
-	struct  ahc_softc *ahc;
-	int	i;
+	struct scsi_xfer *xs = scb->xs;
+	struct scsi_link *sc_link = xs->sc_link;
+	int requeue = 0;
+	int target;
 
-#ifdef __OpenBSD__	/* OpenBSD provides softc! */
-	ahc = (struct ahc_softc *)platform_arg;
-#else 
-#ifndef	__FreeBSD__
-	ahc = malloc(sizeof(*ahc), M_DEVBUF, M_NOWAIT);
-	if (!ahc) {
-		printf("aic7xxx: cannot malloc softc!\n");
-		free(name, M_DEVBUF);
-		return NULL;
-	}
-#else
-	ahc = device_get_softc((device_t)platform_arg);
-#endif
-	memset(ahc, 0, sizeof(*ahc));
-#endif 
-	LIST_INIT(&ahc->pending_scbs);
-	/* We don't know our unit number until the OSM sets it */
-	ahc->name = name;
-	ahc->unit = -1;
-	ahc->description = NULL;
-	ahc->channel = 'A';
-	ahc->channel_b = 'B';
-	ahc->chip = AHC_NONE;
-	ahc->features = AHC_FENONE;
-	ahc->bugs = AHC_BUGNONE;
-	ahc->flags = AHC_FNONE;
-
-	for (i = 0; i < 16; i++)
-		TAILQ_INIT(&ahc->untagged_queues[i]);
-	if (ahc_platform_alloc(ahc, platform_arg) != 0) {
-		ahc_free(ahc);
-		ahc = NULL;
-	}
-	return (ahc);
-}
+	SC_DEBUG(xs->sc_link, SDEV_DB2, ("ahc_done\n"));
+	
+	LIST_REMOVE(scb, pend_links);
 
-int
-ahc_softc_init(struct ahc_softc *ahc)
-{
+	timeout_del(&scb->xs->stimeout);
 
-	/* The IRQMS bit is only valid on VL and EISA chips */
-	if ((ahc->chip & AHC_PCI) == 0)
-		ahc->unpause = ahc_inb(ahc, HCNTRL) & IRQMS;
-	else
-		ahc->unpause = 0;
-	ahc->pause = ahc->unpause | PAUSE; 
-	/* XXX The shared scb data stuff should be deprecated */
-	if (ahc->scb_data == NULL) {
-		ahc->scb_data = malloc(sizeof(*ahc->scb_data),
-				       M_DEVBUF, M_NOWAIT);
-		if (ahc->scb_data == NULL)
-			return (ENOMEM);
-		memset(ahc->scb_data, 0, sizeof(*ahc->scb_data));
+#ifdef AHC_DEBUG
+	if (ahc_debug & AHC_SHOWCMDS) {
+		sc_print_addr(sc_link);
+		printf("ahc_done opcode %d tag %x\n", xs->cmdstore.opcode,
+		    scb->hscb->tag);
+	}
+#endif
+	
+	target = sc_link->target;
+	
+	if (xs->datalen) {
+		int op;
+	
+		if ((xs->flags & SCSI_DATA_IN) != 0)
+			op = BUS_DMASYNC_POSTREAD;
+		else
+			op = BUS_DMASYNC_POSTWRITE;
+		bus_dmamap_sync(ahc->sc_dmat, scb->dmamap,
+		    0, scb->dmamap->dm_mapsize, op);
+		bus_dmamap_unload(ahc->sc_dmat, scb->dmamap);
 	}
 
-	return (0);
-}
-
-void
-ahc_softc_insert(struct ahc_softc *ahc)
-{
-	struct ahc_softc *list_ahc;
-
-#if AHC_PCI_CONFIG > 0
 	/*
-	 * Second Function PCI devices need to inherit some
-	 * settings from function 0.
+	 * Unbusy this target/channel/lun.
+	 * XXX if we are holding two commands per lun, 
+	 *     send the next command.
 	 */
-	if ((ahc->chip & AHC_BUS_MASK) == AHC_PCI
-	 && (ahc->features & AHC_MULTI_FUNC) != 0) {
-		TAILQ_FOREACH(list_ahc, &ahc_tailq, links) {
-			ahc_dev_softc_t list_pci;
-			ahc_dev_softc_t pci;
-
-			list_pci = list_ahc->dev_softc;
-			pci = ahc->dev_softc;
-			if (ahc_get_pci_slot(list_pci) == ahc_get_pci_slot(pci)
-			 && ahc_get_pci_bus(list_pci) == ahc_get_pci_bus(pci)) {
-				struct ahc_softc *master;
-				struct ahc_softc *slave;
-
-				if (ahc_get_pci_function(list_pci) == 0) {
-					master = list_ahc;
-					slave = ahc;
-				} else {
-					master = ahc;
-					slave = list_ahc;
-				}
-				slave->flags &= ~AHC_BIOS_ENABLED; 
-				slave->flags |=
-				    master->flags & AHC_BIOS_ENABLED;
-				slave->flags &= ~AHC_PRIMARY_CHANNEL; 
-				slave->flags |=
-				    master->flags & AHC_PRIMARY_CHANNEL;
-				break;
-			}
-		}
-	}
-#endif
+	if (!(scb->hscb->control & TAG_ENB))
+		ahc_index_busy_tcl(ahc, scb->hscb->tcl, /*unbusy*/TRUE);
 
 	/*
-	 * Insertion sort into our list of softcs.
+	 * If the recovery SCB completes, we have to be
+	 * out of our timeout.
 	 */
-	list_ahc = TAILQ_FIRST(&ahc_tailq);
-	while (list_ahc != NULL
-	    && ahc_softc_comp(list_ahc, ahc) <= 0)
-		list_ahc = TAILQ_NEXT(list_ahc, links);
-	if (list_ahc != NULL)
-		TAILQ_INSERT_BEFORE(list_ahc, ahc, links);
-	else
-		TAILQ_INSERT_TAIL(&ahc_tailq, ahc, links);
-	ahc->init_level++;
-}
+	if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
 
-void
-ahc_set_unit(struct ahc_softc *ahc, int unit)
-{
-	ahc->unit = unit;
-}
+		struct	scb *scbp;
 
-void
-ahc_set_name(struct ahc_softc *ahc, char *name)
-{
-	if (ahc->name != NULL)
-		free(ahc->name, M_DEVBUF);
-	ahc->name = name;
-}
-
-#ifndef __OpenBSD__
-void
-ahc_free(struct ahc_softc *ahc)
-{
-	int i;
-
-	ahc_fini_scbdata(ahc);
-	switch (ahc->init_level) {
-	default:
-	case 5:
-		ahc_shutdown(ahc);
-		TAILQ_REMOVE(&ahc_tailq, ahc, links);
-		/* FALLTHROUGH */
-	case 4:
-		ahc_dmamap_unload(ahc, ahc->shared_data_dmat,
-				  ahc->shared_data_dmamap);
-		/* FALLTHROUGH */
-	case 3:
-		ahc_dmamem_free(ahc, ahc->shared_data_dmat, ahc->qoutfifo,
-				ahc->shared_data_dmamap);
-		ahc_dmamap_destroy(ahc, ahc->shared_data_dmat,
-				   ahc->shared_data_dmamap);
-		/* FALLTHROUGH */
-	case 2:
-		ahc_dma_tag_destroy(ahc, ahc->shared_data_dmat);
-	case 1:
-#ifndef __linux__
-		ahc_dma_tag_destroy(ahc, ahc->buffer_dmat);
-#endif
-		break;
-	case 0:
-		break;
-	}
-
-#ifndef __linux__
-	ahc_dma_tag_destroy(ahc, ahc->parent_dmat);
-#endif
-	ahc_platform_free(ahc);
-	for (i = 0; i < AHC_NUM_TARGETS; i++) {
-		struct ahc_tmode_tstate *tstate;
-
-		tstate = ahc->enabled_targets[i];
-		if (tstate != NULL) {
-#if AHC_TARGET_MODE
-			int j;
-
-			for (j = 0; j < AHC_NUM_LUNS; j++) {
-				struct ahc_tmode_lstate *lstate;
-
-				lstate = tstate->enabled_luns[j];
-				if (lstate != NULL) {
-					xpt_free_path(lstate->path);
-					free(lstate, M_DEVBUF);
-				}
-			}
-#endif
-			free(tstate, M_DEVBUF);
+		/*
+		 * We were able to complete the command successfully,
+		 * so reinstate the timeouts for all other pending
+		 * commands.
+		 */
+		scbp = ahc->pending_scbs.lh_first;
+		while (scbp != NULL) {
+			struct scsi_xfer *txs = scbp->xs;
+
+			if (!(txs->flags & SCSI_POLL))
+				timeout_add(&scbp->xs->stimeout,
+				    (scbp->xs->timeout * hz)/1000);
+			scbp = LIST_NEXT(scbp, pend_links);
 		}
+
+		/*
+		 * Ensure that we didn't put a second instance of this
+		 * SCB into the QINFIFO.
+		 */
+		ahc_search_qinfifo(ahc, SCB_TARGET(scb), SCB_CHANNEL(scb),
+				   SCB_LUN(scb), scb->hscb->tag,
+				   ROLE_INITIATOR, /*status*/0,
+				   SEARCH_REMOVE);
+		if (xs->error != XS_NOERROR)
+			ahcsetccbstatus(xs, XS_TIMEOUT);
+		sc_print_addr(xs->sc_link);
+		printf("no longer in timeout, status = %x\n", xs->status);
+	}
+
+	if (xs->error != XS_NOERROR) {
+		/* Don't clobber any existing error state */
+	} else if ((scb->flags & SCB_SENSE) != 0) {
+		/*
+		 * We performed autosense retrieval.
+		 *
+		 * bzero the sense data before having
+		 * the drive fill it.  The SCSI spec mandates
+		 * that any untransfered data should be
+		 * assumed to be zero.  Complete the 'bounce'
+		 * of sense information through buffers accessible
+		 * via bus-space by copying it into the clients
+		 * csio.
+		 */
+		bzero(&xs->sense, sizeof(struct scsi_sense));
+		bcopy(&ahc->scb_data->sense[scb->hscb->tag],
+		      &xs->sense, le32toh(scb->sg_list->len));
+		xs->error = XS_SENSE;
 	}
-#if AHC_TARGET_MODE
-	if (ahc->black_hole != NULL) {
-		xpt_free_path(ahc->black_hole->path);
-		free(ahc->black_hole, M_DEVBUF);
+	if (scb->flags & SCB_FREEZE_QUEUE) {
+		ahc->devqueue_blocked[target]--;
+		scb->flags &= ~SCB_FREEZE_QUEUE;
 	}
-#endif
-	if (ahc->name != NULL)
-		free(ahc->name, M_DEVBUF);
-#ifndef __FreeBSD__
-	free(ahc, M_DEVBUF);
-#endif
-	return;
-}
-#endif /* __OpenBSD__ */
-
-void
-ahc_shutdown(void *arg)
-{
-	struct	ahc_softc *ahc;
-	int	i;
-
-	ahc = (struct ahc_softc *)arg;
-
-	/* This will reset most registers to 0, but not all */
-	ahc_reset(ahc);
-	ahc_outb(ahc, SCSISEQ, 0);
-	ahc_outb(ahc, SXFRCTL0, 0);
-	ahc_outb(ahc, DSPCISTATUS, 0);
-
-	for (i = TARG_SCSIRATE; i < HA_274_BIOSCTRL; i++)
-		ahc_outb(ahc, i, 0);
-}
-
-/*
- * Reset the controller and record some information about it
- * that is only availabel just after a reset.
- */
-int
-ahc_reset(struct ahc_softc *ahc)
-{
-	u_int	sblkctl;
-	u_int	sxfrctl1_a, sxfrctl1_b;
-	int	wait;
 	
-	/*
-	 * Preserve the value of the SXFRCTL1 register for all channels.
-	 * It contains settings that affect termination and we don't want
-	 * to disturb the integrity of the bus.
-	 */
-	ahc_pause(ahc);
-	sxfrctl1_b = 0;
-	if ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7770) {
-		u_int sblkctl;
+	requeue = scb->flags & SCB_REQUEUE;
+	ahcfreescb(ahc, scb);
 
+	if (requeue) {
 		/*
-		 * Save channel B's settings in case this chip
-		 * is setup for TWIN channel operation.
+		 * Re-insert at the front of the private queue to
+		 * preserve order.
 		 */
-		sblkctl = ahc_inb(ahc, SBLKCTL);
-		ahc_outb(ahc, SBLKCTL, sblkctl | SELBUSB);
-		sxfrctl1_b = ahc_inb(ahc, SXFRCTL1);
-		ahc_outb(ahc, SBLKCTL, sblkctl & ~SELBUSB);
-	}
-	sxfrctl1_a = ahc_inb(ahc, SXFRCTL1);
-
-	ahc_outb(ahc, HCNTRL, CHIPRST | ahc->pause);
+		int s;
 
-	/*
-	 * Ensure that the reset has finished
-	 */
-	wait = 1000;
-	do {
-		ahc_delay(1000);
-	} while (--wait && !(ahc_inb(ahc, HCNTRL) & CHIPRSTACK));
-
-	if (wait == 0) {
-		printf("%s: WARNING - Failed chip reset!  "
-		       "Trying to initialize anyway.\n", ahc_name(ahc));
-	}
-	ahc_outb(ahc, HCNTRL, ahc->pause);
-
-	/* Determine channel configuration */
-	sblkctl = ahc_inb(ahc, SBLKCTL) & (SELBUSB|SELWIDE);
-	/* No Twin Channel PCI cards */
-	if ((ahc->chip & AHC_PCI) != 0)
-		sblkctl &= ~SELBUSB;
-	switch (sblkctl) {
-	case 0:
-		/* Single Narrow Channel */
-		break;
-	case 2:
-		/* Wide Channel */
-		ahc->features |= AHC_WIDE;
-		break;
-	case 8:
-		/* Twin Channel */
-		ahc->features |= AHC_TWIN;
-		break;
-	default:
-		printf(" Unsupported adapter type.  Ignoring\n");
-		return(-1);
+		s = splbio();
+		/* TAILQ_INSERT_HEAD(&ahc->sc_q, xs, adapter_q); */
+		ahc_list_insert_head(ahc, xs);
+		splx(s);
+	} else {
+		xs->flags |= ITSDONE;
+		ahc_check_tags(ahc, xs);
+		scsi_done(xs);
 	}
 
 	/*
-	 * Reload sxfrctl1.
+	 * If there are entries in the software queue, try to
+	 * run the first one.  We should be more or less guaranteed
+	 * to succeed, since we just freed an SCB.
 	 *
-	 * We must always initialize STPWEN to 1 before we
-	 * restore the saved values.  STPWEN is initialized
-	 * to a tri-state condition which can only be cleared
-	 * by turning it on.
+	 * NOTE: ahc_scsi_cmd() relies on our calling it with
+	 * the first entry in the queue.
 	 */
-	if ((ahc->features & AHC_TWIN) != 0) {
-		u_int sblkctl;
-
-		sblkctl = ahc_inb(ahc, SBLKCTL);
-		ahc_outb(ahc, SBLKCTL, sblkctl | SELBUSB);
-		ahc_outb(ahc, SXFRCTL1, sxfrctl1_b);
-		ahc_outb(ahc, SBLKCTL, sblkctl & ~SELBUSB);
-	}
-	ahc_outb(ahc, SXFRCTL1, sxfrctl1_a);
-
-#ifdef AHC_DUMP_SEQ
-	if (ahc->init_level == 0)
-		ahc_dumpseq(ahc);
-#endif
-
-	return (0);
+	if ((xs = ahc->sc_xxxq.lh_first) != NULL)
+		(void) ahc_scsi_cmd(xs);
 }
 
 /*
  * Determine the number of SCBs available on the controller
  */
 int
-ahc_probe_scbs(struct ahc_softc *ahc) {
+ahc_probe_scbs(ahc)
+	struct ahc_softc *ahc;
+{
 	int i;
 
 	for (i = 0; i < AHC_SCB_MAX; i++) {
-
 		ahc_outb(ahc, SCBPTR, i);
-		ahc_outb(ahc, SCB_BASE, i);
-		if (ahc_inb(ahc, SCB_BASE) != i)
+		ahc_outb(ahc, SCB_CONTROL, i);
+		if (ahc_inb(ahc, SCB_CONTROL) != i)
 			break;
 		ahc_outb(ahc, SCBPTR, 0);
-		if (ahc_inb(ahc, SCB_BASE) != 0)
+		if (ahc_inb(ahc, SCB_CONTROL) != 0)
 			break;
 	}
+	
 	return (i);
 }
 
-#ifndef __OpenBSD__
-static void
-ahc_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) 
-{
-	bus_addr_t *baddr;
-
-	baddr = (bus_addr_t *)arg;
-	*baddr = segs->ds_addr;
-}
-#endif 
-
-#ifndef __OpenBSD__
-static void
-#else
-void
-#endif 
-ahc_build_free_scb_list(struct ahc_softc *ahc)
-{
-	int i;
-
-	for (i = 0; i < ahc->scb_data->maxhscbs; i++) {
-		ahc_outb(ahc, SCBPTR, i);
-
-		/* Clear the control byte. */
-		ahc_outb(ahc, SCB_CONTROL, 0);
-
-		/* Set the next pointer */
-		if ((ahc->flags & AHC_PAGESCBS) != 0)
-			ahc_outb(ahc, SCB_NEXT, i+1);
-		else 
-			ahc_outb(ahc, SCB_NEXT, SCB_LIST_NULL);
-
-		/* Make the tag number invalid */
-		ahc_outb(ahc, SCB_TAG, SCB_LIST_NULL);
-	}
-
-	/* Make sure that the last SCB terminates the free list */
-	ahc_outb(ahc, SCBPTR, i-1);
-	ahc_outb(ahc, SCB_NEXT, SCB_LIST_NULL);
-
-	/* Ensure we clear the 0 SCB's control byte. */
-	ahc_outb(ahc, SCBPTR, 0);
-	ahc_outb(ahc, SCB_CONTROL, 0);
-}
-
-#ifndef __OpenBSD__
-static int
-ahc_init_scbdata(struct ahc_softc *ahc)
-{
-	struct scb_data *scb_data;
-
-	scb_data = ahc->scb_data;
-	SLIST_INIT(&scb_data->free_scbs);
-	SLIST_INIT(&scb_data->sg_maps);
-
-	/* Allocate SCB resources */
-	scb_data->scbarray =
-	    (struct scb *)malloc(sizeof(struct scb) * AHC_SCB_MAX,
-				 M_DEVBUF, M_NOWAIT);
-	if (scb_data->scbarray == NULL)
-		return (ENOMEM);
-	memset(scb_data->scbarray, 0, sizeof(struct scb) * AHC_SCB_MAX);
-
-	/* Determine the number of hardware SCBs and initialize them */
-
-	scb_data->maxhscbs = ahc_probe_scbs(ahc);
-	if ((ahc->flags & AHC_PAGESCBS) != 0) {
-		/* SCB 0 heads the free list */
-		ahc_outb(ahc, FREE_SCBH, 0);
-	} else {
-		ahc_outb(ahc, FREE_SCBH, SCB_LIST_NULL);
-	}
-
-	if (ahc->scb_data->maxhscbs == 0) {
-		printf("%s: No SCB space found\n", ahc_name(ahc));
-		return (ENXIO);
-	}
-
-	ahc_build_free_scb_list(ahc);
-
-	/*
-	 * Create our DMA tags.  These tags define the kinds of device
-	 * accessible memory allocations and memory mappings we will
-	 * need to perform during normal operation.
-	 *
-	 * Unless we need to further restrict the allocation, we rely
-	 * on the restrictions of the parent dmat, hence the common
-	 * use of MAXADDR and MAXSIZE.
-	 */
-
-	/* DMA tag for our hardware scb structures */
-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
-			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
-			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       AHC_SCB_MAX * sizeof(struct hardware_scb),
-			       /*nsegments*/1,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/0, &scb_data->hscb_dmat) != 0) {
-		goto error_exit;
-	}
-
-	scb_data->init_level++;
-
-	/* Allocation for our hscbs */
-	if (ahc_dmamem_alloc(ahc, scb_data->hscb_dmat,
-			     (void **)&scb_data->hscbs,
-			     BUS_DMA_NOWAIT, &scb_data->hscb_dmamap) != 0) {
-		goto error_exit;
-	}
-
-	scb_data->init_level++;
-
-	/* And permanently map them */
-	ahc_dmamap_load(ahc, scb_data->hscb_dmat, scb_data->hscb_dmamap,
-			scb_data->hscbs,
-			AHC_SCB_MAX * sizeof(struct hardware_scb),
-			ahc_dmamap_cb, &scb_data->hscb_busaddr, /*flags*/0);
-
-	scb_data->init_level++;
-
-	/* DMA tag for our sense buffers */
-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
-			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
-			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       AHC_SCB_MAX * sizeof(struct scsi_sense_data),
-			       /*nsegments*/1,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/0, &scb_data->sense_dmat) != 0) {
-		goto error_exit;
-	}
-
-	scb_data->init_level++;
-
-	/* Allocate them */
-	if (ahc_dmamem_alloc(ahc, scb_data->sense_dmat,
-			     (void **)&scb_data->sense,
-			     BUS_DMA_NOWAIT, &scb_data->sense_dmamap) != 0) {
-		goto error_exit;
-	}
-
-	scb_data->init_level++;
-
-	/* And permanently map them */
-	ahc_dmamap_load(ahc, scb_data->sense_dmat, scb_data->sense_dmamap,
-			scb_data->sense,
-			AHC_SCB_MAX * sizeof(struct scsi_sense_data),
-			ahc_dmamap_cb, &scb_data->sense_busaddr, /*flags*/0);
-
-	scb_data->init_level++;
-
-	/* DMA tag for our S/G structures.  We allocate in page sized chunks */
-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
-			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
-			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       PAGE_SIZE, /*nsegments*/1,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/0, &scb_data->sg_dmat) != 0) {
-		goto error_exit;
-	}
-
-	scb_data->init_level++;
-
-	/* Perform initial CCB allocation */
-	memset(scb_data->hscbs, 0, AHC_SCB_MAX * sizeof(struct hardware_scb));
-	ahc_alloc_scbs(ahc);
-
-	if (scb_data->numscbs == 0) {
-		printf("%s: ahc_init_scbdata - "
-		       "Unable to allocate initial scbs\n",
-		       ahc_name(ahc));
-		goto error_exit;
-	}
-
-	/*
-	 * Tell the sequencer which SCB will be the next one it receives.
-	 */
-	ahc->next_queued_scb = ahc_get_scb(ahc);
-	ahc_outb(ahc, NEXT_QUEUED_SCB, ahc->next_queued_scb->hscb->tag);
-
-	/*
-	 * Note that we were successfull
-	 */
-	return (0); 
-
-error_exit:
-
-	return (ENOMEM);
-}
-
-static void
-ahc_fini_scbdata(struct ahc_softc *ahc)
-{
-	struct scb_data *scb_data;
-
-	scb_data = ahc->scb_data;
-	if (scb_data == NULL)
-		return;
-
-	switch (scb_data->init_level) {
-	default:
-	case 7:
-	{
-		struct sg_map_node *sg_map;
-
-		while ((sg_map = SLIST_FIRST(&scb_data->sg_maps))!= NULL) {
-			SLIST_REMOVE_HEAD(&scb_data->sg_maps, links);
-			ahc_dmamap_unload(ahc, scb_data->sg_dmat,
-					  sg_map->sg_dmamap);
-			ahc_dmamem_free(ahc, scb_data->sg_dmat,
-					sg_map->sg_vaddr,
-					sg_map->sg_dmamap);
-			free(sg_map, M_DEVBUF);
-		}
-		ahc_dma_tag_destroy(ahc, scb_data->sg_dmat);
-	}
-	case 6:
-		ahc_dmamap_unload(ahc, scb_data->sense_dmat,
-				  scb_data->sense_dmamap);
-	case 5:
-		ahc_dmamem_free(ahc, scb_data->sense_dmat, scb_data->sense,
-				scb_data->sense_dmamap);
-		ahc_dmamap_destroy(ahc, scb_data->sense_dmat,
-				   scb_data->sense_dmamap);
-	case 4:
-		ahc_dma_tag_destroy(ahc, scb_data->sense_dmat);
-	case 3:
-		ahc_dmamap_unload(ahc, scb_data->hscb_dmat,
-				  scb_data->hscb_dmamap);
-	case 2:
-		ahc_dmamem_free(ahc, scb_data->hscb_dmat, scb_data->hscbs,
-				scb_data->hscb_dmamap);
-		ahc_dmamap_destroy(ahc, scb_data->hscb_dmat,
-				   scb_data->hscb_dmamap);
-	case 1:
-		ahc_dma_tag_destroy(ahc, scb_data->hscb_dmat);
-		break;
-	case 0:
-		break;
-	}
-	if (scb_data->scbarray != NULL)
-		free(scb_data->scbarray, M_DEVBUF);
-}
-
-void
-ahc_alloc_scbs(struct ahc_softc *ahc)
-{
-	struct scb_data *scb_data;
-	struct scb *next_scb;
-	struct sg_map_node *sg_map;
-	bus_addr_t physaddr;
-	struct ahc_dma_seg *segs;
-	int newcount;
-	int i;
-
-	scb_data = ahc->scb_data;
-	if (scb_data->numscbs >= AHC_SCB_MAX)
-		/* Can't allocate any more */
-		return;
-
-	next_scb = &scb_data->scbarray[scb_data->numscbs];
-
-	sg_map = malloc(sizeof(*sg_map), M_DEVBUF, M_NOWAIT);
-
-	if (sg_map == NULL)
-		return;
-
-	/* Allocate S/G space for the next batch of SCBS */
-	if (ahc_dmamem_alloc(ahc, scb_data->sg_dmat,
-			     (void **)&sg_map->sg_vaddr,
-			     BUS_DMA_NOWAIT, &sg_map->sg_dmamap) != 0) {
-		free(sg_map, M_DEVBUF);
-		return;
-	}
-
-	SLIST_INSERT_HEAD(&scb_data->sg_maps, sg_map, links);
-
-	ahc_dmamap_load(ahc, scb_data->sg_dmat, sg_map->sg_dmamap,
-			sg_map->sg_vaddr, PAGE_SIZE, ahc_dmamap_cb,
-			&sg_map->sg_physaddr, /*flags*/0);
-
-	segs = sg_map->sg_vaddr;
-	physaddr = sg_map->sg_physaddr;
-
-	newcount = (PAGE_SIZE / (AHC_NSEG * sizeof(struct ahc_dma_seg)));
-	for (i = 0; scb_data->numscbs < AHC_SCB_MAX && i < newcount; i++) {
-		struct scb_platform_data *pdata;
-#ifndef __linux__
-		int error;
-#endif
-		pdata = (struct scb_platform_data *)malloc(sizeof(*pdata),
-							   M_DEVBUF, M_NOWAIT);
-		if (pdata == NULL)
-			break;
-		next_scb->platform_data = pdata;
-		next_scb->sg_map = sg_map;
-		next_scb->sg_list = segs;
-		/*
-		 * The sequencer always starts with the second entry.
-		 * The first entry is embedded in the scb.
-		 */
-		next_scb->sg_list_phys = physaddr + sizeof(struct ahc_dma_seg);
-		next_scb->ahc_softc = ahc;
-		next_scb->flags = SCB_FREE;
-#ifndef __linux__
-		error = ahc_dmamap_create(ahc, ahc->buffer_dmat, /*flags*/0,
-					  &next_scb->dmamap);
-		if (error != 0)
-			break;
-#endif
-		next_scb->hscb = &scb_data->hscbs[scb_data->numscbs];
-		next_scb->hscb->tag = ahc->scb_data->numscbs;
-		SLIST_INSERT_HEAD(&ahc->scb_data->free_scbs,
-				  next_scb, links.sle);
-		segs += AHC_NSEG;
-		physaddr += (AHC_NSEG * sizeof(struct ahc_dma_seg));
-		next_scb++;
-		ahc->scb_data->numscbs++;
-	}
-}
-#endif /* __OpenBSD__ */
-
-void
-ahc_controller_info(struct ahc_softc *ahc, char *buf)
-{
-	int len;
-
-	len = sprintf(buf, "%s: ", ahc_chip_names[ahc->chip & AHC_CHIPID_MASK]);
-	buf += len;
-	if ((ahc->features & AHC_TWIN) != 0)
- 		len = sprintf(buf, "Twin Channel, A SCSI Id=%d, "
-			      "B SCSI Id=%d, primary %c, ",
-			      ahc->our_id, ahc->our_id_b,
-			      (ahc->flags & AHC_PRIMARY_CHANNEL) + 'A');
-	else {
-		const char *speed;
-		const char *type;
-
-		speed = "";
-		if ((ahc->features & AHC_ULTRA) != 0) {
-			speed = "Ultra ";
-		} else if ((ahc->features & AHC_DT) != 0) {
-			speed = "Ultra160 ";
-		} else if ((ahc->features & AHC_ULTRA2) != 0) {
-			speed = "Ultra2 ";
-		}
-		if ((ahc->features & AHC_WIDE) != 0) {
-			type = "Wide";
-		} else {
-			type = "Single";
-		}
-		len = sprintf(buf, "%s%s Channel %c, SCSI Id=%d, ",
-			      speed, type, ahc->channel, ahc->our_id);
-	}
-	buf += len;
-
-	if ((ahc->flags & AHC_PAGESCBS) != 0)
-		sprintf(buf, "%d/%d SCBs",
-			ahc->scb_data->maxhscbs, AHC_SCB_MAX);
-	else
-		sprintf(buf, "%d SCBs", ahc->scb_data->maxhscbs);
-}
-
 /*
  * Start the board, ready for normal operation
  */
 int
-ahc_init(struct ahc_softc *ahc)
+ahc_init(ahc)
+	struct ahc_softc *ahc;
 {
-	int	 max_targ;
-	int	 i;
-	int	 term;
-	u_int	 scsi_conf;
-	u_int	 scsiseq_template;
-	u_int	 ultraenb;
-	u_int	 discenable;
-	u_int	 tagenable;
-	size_t	 driver_data_size;
-	uint32_t physaddr;
-
-#ifdef AHC_DEBUG_SEQUENCER
-	ahc->flags |= AHC_SEQUENCER_DEBUG;
-#endif
+	int	  max_targ = 15;
+	int	  i;
+	int	  term;
+	u_int	  scsi_conf;
+	u_int	  scsiseq_template;
+	u_int	  ultraenb;
+	u_int	  discenable;
+	u_int	  tagenable;
+	size_t	  driver_data_size;
+	u_int32_t physaddr;
+	struct scb_data *scb_data = NULL;
 
 #ifdef AHC_PRINT_SRAM
 	printf("Scratch Ram:");
@@ -4223,7 +3618,16 @@ ahc_init(struct ahc_softc *ahc)
 	}
 	printf ("\n");
 #endif
-	max_targ = 15;
+
+	if (ahc->scb_data == NULL) {
+		scb_data = malloc(sizeof (struct scb_data), M_DEVBUF, M_NOWAIT);
+		if (scb_data == NULL) {
+			printf("%s: cannot malloc scb_data!\n", ahc_name(ahc));
+			return (ENOMEM);
+		}
+		bzero(scb_data, sizeof(struct scb_data));
+		ahc->scb_data = scb_data;
+	}
 	/*
 	 * Assume we have a board at this stage and it has been reset.
 	 */
@@ -4233,131 +3637,82 @@ ahc_init(struct ahc_softc *ahc)
 	/*
 	 * Default to allowing initiator operations.
 	 */
-	ahc->flags |= AHC_INITIATORROLE;
-
-	/*
-	 * Only allow target mode features if this unit has them enabled.
-	 */
-	if ((AHC_TMODE_ENABLE & (0x1 << ahc->unit)) == 0)
-		ahc->features &= ~AHC_TARGETMODE;
-
-#if !defined(__linux__) && !defined(__OpenBSD__)
-	/* DMA tag for mapping buffers into device visible space. */
-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
-			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
-			       /*lowaddr*/BUS_SPACE_MAXADDR,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       /*maxsize*/MAXBSIZE, /*nsegments*/AHC_NSEG,
-			       /*maxsegsz*/AHC_MAXTRANSFER_SIZE,
-			       /*flags*/BUS_DMA_ALLOCNOW,
-			       &ahc->buffer_dmat) != 0) {
-		return (ENOMEM);
-	}
-#endif
-
-	ahc->init_level++;
-
+	ahc->flags |= AHC_INITIATORMODE;
+	
 	/*
 	 * DMA tag for our command fifos and other data in system memory
 	 * the card's sequencer must be able to access.  For initiator
-	 * roles, we need to allocate space for the the qinfifo and qoutfifo.
-	 * The qinfifo and qoutfifo are composed of 256 1 byte elements. 
-	 * When providing for the target mode role, we must additionally
-	 * provide space for the incoming target command fifo and an extra
-	 * byte to deal with a dma bug in some chip versions.
+	 * roles, we need to allocate space for the qinfifo, qoutfifo,
+	 * and untagged_scb arrays each of which are composed of 256
+	 * 1 byte elements.  When providing for the target mode role,
+	 * we additionally must provide space for the incoming target
+	 * command fifo.
 	 */
-	driver_data_size = 2 * 256 * sizeof(uint8_t);
-#ifdef __OpenBSD__
-	if (ahc_createdmamem(ahc, ahc->shared_data_dmat, driver_data_size, 
+	driver_data_size = 3 * 256 * sizeof(u_int8_t);
+
+	if (ahc_createdmamem(ahc, driver_data_size, 
 	    &ahc->shared_data_dmamap, (caddr_t *)&ahc->qoutfifo,
 	    &ahc->shared_data_busaddr, &ahc->shared_data_seg,
 	    &ahc->shared_data_nseg, "shared data") < 0)
 		return (ENOMEM);
 
 	ahc->init_level++;
-#else
-
-	if ((ahc->features & AHC_TARGETMODE) != 0)
-		driver_data_size += AHC_TMODE_CMDS * sizeof(struct target_cmd)
-				 + /*DMA WideOdd Bug Buffer*/1;
-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
-			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
-			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       driver_data_size,
-			       /*nsegments*/1,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/0, &ahc->shared_data_dmat) != 0) {
-		return (ENOMEM);
-	}
-
-	ahc->init_level++;
 
-	/* Allocation of driver data */
-	if (ahc_dmamem_alloc(ahc, ahc->shared_data_dmat,
-			     (void **)&ahc->qoutfifo,
-			     BUS_DMA_NOWAIT, &ahc->shared_data_dmamap) != 0) {
-		return (ENOMEM);
-	}
-
-	ahc->init_level++;
+	/* Allocate SCB data now that sc_dmat is initialized */
+	if (ahc->scb_data->maxhscbs == 0)
+		if (ahcinitscbdata(ahc) != 0)
+			return (ENOMEM);
 
-	/* And permanently map it in */
-	ahc_dmamap_load(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
-			ahc->qoutfifo, driver_data_size, ahc_dmamap_cb,
-			&ahc->shared_data_busaddr, /*flags*/0);
-	if ((ahc->features & AHC_TARGETMODE) != 0) {
-		ahc->targetcmds = (struct target_cmd *)ahc->qoutfifo;
-		ahc->qoutfifo = (uint8_t *)&ahc->targetcmds[AHC_TMODE_CMDS];
-		ahc->dma_bug_buf = ahc->shared_data_busaddr
-				 + driver_data_size - 1;
-		/* All target command blocks start out invalid. */
-		for (i = 0; i < AHC_TMODE_CMDS; i++)
-			ahc->targetcmds[i].cmd_valid = 0;
-		ahc_sync_tqinfifo(ahc, BUS_DMASYNC_PREREAD);
-		ahc->tqinfifonext = 1;
-		ahc_outb(ahc, KERNEL_TQINPOS, ahc->tqinfifonext - 1);
-		ahc_outb(ahc, TQINPOS, ahc->tqinfifonext);
-		ahc->qoutfifo = (uint8_t *)&ahc->targetcmds[256];
-	}
-#endif 
 	ahc->qinfifo = &ahc->qoutfifo[256];
+	ahc->untagged_scbs = &ahc->qinfifo[256];
+	/* There are no untagged SCBs active yet. */
+	for (i = 0; i < 256; i++)
+		ahc->untagged_scbs[i] = SCB_LIST_NULL;
 
-	ahc->init_level++;
-
-	/* Allocate SCB data now that buffer_dmat is initialized */
-	if (ahc->scb_data->maxhscbs == 0)
-		if (ahc_init_scbdata(ahc) != 0)
-			return (ENOMEM);
+	/* All of our queues are empty */
+	for (i = 0; i < 256; i++)
+		ahc->qoutfifo[i] = SCB_LIST_NULL;
 
+	bus_dmamap_sync(ahc->sc_dmat, ahc->shared_data_dmamap,
+		 0, driver_data_size, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+	
 	/*
 	 * Allocate a tstate to house information for our
 	 * initiator presence on the bus as well as the user
 	 * data for any target mode initiator.
 	 */
 	if (ahc_alloc_tstate(ahc, ahc->our_id, 'A') == NULL) {
-		printf("%s: unable to allocate ahc_tmode_tstate.  "
+		printf("%s: unable to allocate tmode_tstate.  "
 		       "Failing attach\n", ahc_name(ahc));
-		return (ENOMEM);
+		return (-1);
 	}
 
 	if ((ahc->features & AHC_TWIN) != 0) {
 		if (ahc_alloc_tstate(ahc, ahc->our_id_b, 'B') == NULL) {
-			printf("%s: unable to allocate ahc_tmode_tstate.  "
+			printf("%s: unable to allocate tmode_tstate.  "
 			       "Failing attach\n", ahc_name(ahc));
-			return (ENOMEM);
+			return (-1);
 		}
+ 		printf("Twin Channel, A SCSI Id=%d, B SCSI Id=%d, primary %c, ",
+		       ahc->our_id, ahc->our_id_b,
+		       ahc->flags & AHC_CHANNEL_B_PRIMARY? 'B': 'A');
+	} else {
+		if ((ahc->features & AHC_WIDE) != 0) {
+			printf("Wide ");
+		} else {
+			printf("Single ");
+		}
+		printf("Channel %c, SCSI Id=%d, ", ahc->channel, ahc->our_id);
 	}
 
 	ahc_outb(ahc, SEQ_FLAGS, 0);
-	ahc_outb(ahc, SEQ_FLAGS2, 0);
 
 	if (ahc->scb_data->maxhscbs < AHC_SCB_MAX) {
 		ahc->flags |= AHC_PAGESCBS;
+		printf("%d/%d SCBs\n", ahc->scb_data->maxhscbs, AHC_SCB_MAX);
 	} else {
 		ahc->flags &= ~AHC_PAGESCBS;
+		printf("%d SCBs\n", ahc->scb_data->maxhscbs);
 	}
 
 #ifdef AHC_DEBUG
@@ -4365,38 +3720,37 @@ ahc_init(struct ahc_softc *ahc)
 		printf("%s: hardware scb %d bytes; kernel scb %d bytes; "
 		       "ahc_dma %d bytes\n",
 			ahc_name(ahc),
-			sizeof(struct hardware_scb),
+		        sizeof(struct hardware_scb),
 			sizeof(struct scb),
 			sizeof(struct ahc_dma_seg));
 	}
 #endif /* AHC_DEBUG */
 
-	/* Set the SCSI Id, SXFRCTL0, SXFRCTL1, and SIMODE1, for both channels*/
+	/* Set the SCSI Id,SXFRCTL0,SXFRCTL1, and SIMODE1, for both channels*/
 	if (ahc->features & AHC_TWIN) {
 
 		/*
 		 * The device is gated to channel B after a chip reset,
 		 * so set those values first
 		 */
-		ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) | SELBUSB);
 		term = (ahc->flags & AHC_TERM_ENB_B) != 0 ? STPWEN : 0;
-		ahc_outb(ahc, SCSIID, ahc->our_id_b);
+		if ((ahc->features & AHC_ULTRA2) != 0)
+			ahc_outb(ahc, SCSIID_ULTRA2, ahc->our_id_b);
+		else
+			ahc_outb(ahc, SCSIID, ahc->our_id_b);
 		scsi_conf = ahc_inb(ahc, SCSICONF + 1);
 		ahc_outb(ahc, SXFRCTL1, (scsi_conf & (ENSPCHK|STIMESEL))
-					|term|ahc->seltime_b|ENSTIMER|ACTNEGEN);
-		if ((ahc->features & AHC_ULTRA2) != 0)
-			ahc_outb(ahc, SIMODE0, ahc_inb(ahc, SIMODE0)|ENIOERR);
+					|term|ENSTIMER|ACTNEGEN);
 		ahc_outb(ahc, SIMODE1, ENSELTIMO|ENSCSIRST|ENSCSIPERR);
 		ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN);
 
 		if ((scsi_conf & RESET_SCSI) != 0
-		 && (ahc->flags & AHC_INITIATORROLE) != 0)
+		 && (ahc->flags & AHC_INITIATORMODE) != 0)
 			ahc->flags |= AHC_RESET_BUS_B;
 
 		/* Select Channel A */
 		ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) & ~SELBUSB);
 	}
-	
 	term = (ahc->flags & AHC_TERM_ENB_A) != 0 ? STPWEN : 0;
 	if ((ahc->features & AHC_ULTRA2) != 0)
 		ahc_outb(ahc, SCSIID_ULTRA2, ahc->our_id);
@@ -4404,15 +3758,13 @@ ahc_init(struct ahc_softc *ahc)
 		ahc_outb(ahc, SCSIID, ahc->our_id);
 	scsi_conf = ahc_inb(ahc, SCSICONF);
 	ahc_outb(ahc, SXFRCTL1, (scsi_conf & (ENSPCHK|STIMESEL))
-				|term|ahc->seltime
+				|term
 				|ENSTIMER|ACTNEGEN);
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		ahc_outb(ahc, SIMODE0, ahc_inb(ahc, SIMODE0)|ENIOERR);
 	ahc_outb(ahc, SIMODE1, ENSELTIMO|ENSCSIRST|ENSCSIPERR);
 	ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN);
 
 	if ((scsi_conf & RESET_SCSI) != 0
-	 && (ahc->flags & AHC_INITIATORROLE) != 0)
+	 && (ahc->flags & AHC_INITIATORMODE) != 0)
 		ahc->flags |= AHC_RESET_BUS_A;
 
 	/*
@@ -4444,7 +3796,7 @@ ahc_init(struct ahc_softc *ahc)
 
 	for (i = 0; i <= max_targ; i++) {
 		struct ahc_initiator_tinfo *tinfo;
-		struct ahc_tmode_tstate *tstate;
+		struct tmode_tstate *tstate;
 		u_int our_id;
 		u_int target_id;
 		char channel;
@@ -4460,7 +3812,7 @@ ahc_init(struct ahc_softc *ahc)
 		tinfo = ahc_fetch_transinfo(ahc, channel, our_id,
 					    target_id, &tstate);
 		/* Default to async narrow across the board */
-		memset(tinfo, 0, sizeof(*tinfo));
+		bzero(tinfo, sizeof(*tinfo));
 		if (ahc->flags & AHC_USEDEFAULTS) {
 			if ((ahc->features & AHC_WIDE) != 0)
 				tinfo->user.width = MSG_EXT_WDTR_BUS_16_BIT;
@@ -4473,7 +3825,7 @@ ahc_init(struct ahc_softc *ahc)
 			tinfo->user.offset = ~0;
 		} else {
 			u_int scsirate;
-			uint16_t mask;
+			u_int16_t mask;
 
 			/* Take the settings leftover in scratch RAM. */
 			scsirate = ahc_inb(ahc, TARG_SCSIRATE + i);
@@ -4494,9 +3846,6 @@ ahc_init(struct ahc_softc *ahc)
 					offset = MAX_OFFSET_ULTRA2;
 				} else
 					offset = ahc_inb(ahc, TARG_OFFSET + i);
-				if ((scsirate & ~WIDEXFER) == 0 && offset != 0)
-					/* Set to the lowest sync rate, 5MHz */
-					scsirate |= 0x1c;
 				maxsync = AHC_SYNCRATE_ULTRA2;
 				if ((ahc->features & AHC_DT) != 0)
 					maxsync = AHC_SYNCRATE_DT;
@@ -4506,17 +3855,7 @@ ahc_init(struct ahc_softc *ahc)
 					tinfo->user.period = 0;
 				else
 					tinfo->user.offset = ~0;
-				if ((scsirate & SXFR_ULTRA2) <= 8/*10MHz*/
-				 && (ahc->features & AHC_DT) != 0)
-					tinfo->user.ppr_options =
-					    MSG_EXT_PPR_DT_REQ;
 			} else if ((scsirate & SOFS) != 0) {
-				if ((scsirate & SXFR) == 0x40
-				 && (ultraenb & mask) != 0) {
-					/* Treat 10MHz as a non-ultra speed */
-					scsirate &= ~SXFR;
-				 	ultraenb &= ~mask;
-				}
 				tinfo->user.period = 
 				    ahc_find_period(ahc, scsirate,
 						    (ultraenb & mask)
@@ -4525,55 +3864,19 @@ ahc_init(struct ahc_softc *ahc)
 				if (tinfo->user.period != 0)
 					tinfo->user.offset = ~0;
 			}
-			if (tinfo->user.period == 0)
-				tinfo->user.offset = 0;
 			if ((scsirate & WIDEXFER) != 0
 			 && (ahc->features & AHC_WIDE) != 0)
 				tinfo->user.width = MSG_EXT_WDTR_BUS_16_BIT;
-			tinfo->user.protocol_version = 4;
-			if ((ahc->features & AHC_DT) != 0)
-				tinfo->user.transport_version = 3;
-			else
-				tinfo->user.transport_version = 2;
-			tinfo->goal.protocol_version = 2;
-			tinfo->goal.transport_version = 2;
-			tinfo->curr.protocol_version = 2;
-			tinfo->curr.transport_version = 2;
 		}
+		tinfo->goal = tinfo->user; /* force negotiation */
 		tstate->ultraenb = ultraenb;
+		tstate->discenable = discenable;
+		tstate->tagenable = 0; /* Wait until the XPT says its okay */
+		tstate->tagdisable = 0;
 	}
 	ahc->user_discenable = discenable;
 	ahc->user_tagenable = tagenable;
 
-	/* There are no untagged SCBs active yet. */
-	for (i = 0; i < 16; i++) {
-		ahc_unbusy_tcl(ahc, BUILD_TCL(i << 4, 0));
-		if ((ahc->flags & AHC_SCB_BTT) != 0) {
-			int lun;
-
-			/*
-			 * The SCB based BTT allows an entry per
-			 * target and lun pair.
-			 */
-			for (lun = 1; lun < AHC_NUM_LUNS; lun++)
-				ahc_unbusy_tcl(ahc, BUILD_TCL(i << 4, lun));
-		}
-	}
-
-	/* All of our queues are empty */
-	for (i = 0; i < 256; i++)
-		ahc->qoutfifo[i] = SCB_LIST_NULL;
-	
-	ahc_sync_qoutfifo(ahc, BUS_DMASYNC_PREREAD);
-
-	for (i = 0; i < 256; i++)
-		ahc->qinfifo[i] = SCB_LIST_NULL;
-
-	if ((ahc->features & AHC_MULTI_TID) != 0) {
-		ahc_outb(ahc, TARGID, 0);
-		ahc_outb(ahc, TARGID + 1, 0);
-	}
-	
 	/*
 	 * Tell the sequencer where it can find our arrays in memory.
 	 */
@@ -4584,10 +3887,17 @@ ahc_init(struct ahc_softc *ahc)
 	ahc_outb(ahc, HSCB_ADDR + 3, (physaddr >> 24) & 0xFF);
 
 	physaddr = ahc->shared_data_busaddr;
-	ahc_outb(ahc, SHARED_DATA_ADDR, physaddr & 0xFF);
-	ahc_outb(ahc, SHARED_DATA_ADDR + 1, (physaddr >> 8) & 0xFF);
-	ahc_outb(ahc, SHARED_DATA_ADDR + 2, (physaddr >> 16) & 0xFF);
-	ahc_outb(ahc, SHARED_DATA_ADDR + 3, (physaddr >> 24) & 0xFF);
+	ahc_outb(ahc, SCBID_ADDR, physaddr & 0xFF);
+	ahc_outb(ahc, SCBID_ADDR + 1, (physaddr >> 8) & 0xFF);
+	ahc_outb(ahc, SCBID_ADDR + 2, (physaddr >> 16) & 0xFF);
+	ahc_outb(ahc, SCBID_ADDR + 3, (physaddr >> 24) & 0xFF);
+
+	/* Target mode incomding command fifo */
+	physaddr += 3 * 256 * sizeof(u_int8_t);
+	ahc_outb(ahc, TMODE_CMDADDR, physaddr & 0xFF);
+	ahc_outb(ahc, TMODE_CMDADDR + 1, (physaddr >> 8) & 0xFF);
+	ahc_outb(ahc, TMODE_CMDADDR + 2, (physaddr >> 16) & 0xFF);
+	ahc_outb(ahc, TMODE_CMDADDR + 3, (physaddr >> 24) & 0xFF);
 
 	/*
 	 * Initialize the group code to command length table.
@@ -4608,6 +3918,16 @@ ahc_init(struct ahc_softc *ahc)
 	ahc_outb(ahc, QINPOS, 0);
 	ahc_outb(ahc, QOUTPOS, 0);
 
+#ifdef AHC_DEBUG
+	if (ahc_debug & AHC_SHOWMISC)
+		printf("DISCENABLE == 0x%x\nULTRAENB == 0x%x\n",
+		    discenable, ultraenb);
+#endif
+
+	/* Don't have any special messages to send to targets */
+	ahc_outb(ahc, TARGET_MSG_REQUEST, 0);
+	ahc_outb(ahc, TARGET_MSG_REQUEST + 1, 0);
+
 	/*
 	 * Use the built in queue management registers
 	 * if they are available.
@@ -4619,6 +3939,7 @@ ahc_init(struct ahc_softc *ahc)
 		ahc_outb(ahc, HNSCB_QOFF, 0);
 	}
 
+
 	/* We don't have any waiting selections */
 	ahc_outb(ahc, WAITING_SCBH, SCB_LIST_NULL);
 
@@ -4630,720 +3951,1343 @@ ahc_init(struct ahc_softc *ahc)
 
 	/*
 	 * Setup the allowed SCSI Sequences based on operational mode.
-	 * If we are a target, we'll enalbe select in operations once
+	 * If we are a target, we'll enable select in operations once
 	 * we've had a lun enabled.
 	 */
 	scsiseq_template = ENSELO|ENAUTOATNO|ENAUTOATNP;
-	if ((ahc->flags & AHC_INITIATORROLE) != 0)
+	if ((ahc->flags & AHC_INITIATORMODE) != 0)
 		scsiseq_template |= ENRSELI;
 	ahc_outb(ahc, SCSISEQ_TEMPLATE, scsiseq_template);
 
 	/*
 	 * Load the Sequencer program and Enable the adapter
 	 * in "fast" mode.
-	 */
+         */
 	if (bootverbose)
 		printf("%s: Downloading Sequencer Program...",
 		       ahc_name(ahc));
 
 	ahc_loadseq(ahc);
 
-	if ((ahc->features & AHC_ULTRA2) != 0) {
-		int wait;
+	/* We have to wait until after any system dumps... */
+	shutdownhook_establish(ahc_shutdown, ahc);
+	return (0);
+}
 
-		/*
-		 * Wait for up to 500ms for our transceivers
-		 * to settle.  If the adapter does not have
-		 * a cable attached, the tranceivers may
-		 * never settle, so don't complain if we
-		 * fail here.
-		 */
-		ahc_pause(ahc);
-		for (wait = 5000;
-		     (ahc_inb(ahc, SBLKCTL) & (ENAB40|ENAB20)) == 0 && wait;
-		     wait--)
-			ahc_delay(100);
-		ahc_unpause(ahc);
+/*
+ * Routines to manage a scsi_xfer into the software queue.  
+ * We overload xs->free_list to to ensure we don't run into a queue 
+ * resource shortage, and keep a pointer to the last entry around 
+ * to make insertion O(C).
+ */
+STATIC INLINE void
+ahc_list_insert_before(ahc, xs, next_xs)
+	struct ahc_softc *ahc;
+	struct scsi_xfer *xs;
+	struct scsi_xfer *next_xs;
+{
+	LIST_INSERT_BEFORE(xs, next_xs, free_list); 
+
+}
+
+STATIC INLINE void
+ahc_list_insert_head(ahc, xs)
+	struct ahc_softc *ahc;
+	struct scsi_xfer *xs;
+{
+	if (ahc->sc_xxxq.lh_first == NULL)
+		ahc->sc_xxxqlast = xs;
+	LIST_INSERT_HEAD(&ahc->sc_xxxq, xs, free_list);
+	return;
+}
+
+STATIC INLINE void
+ahc_list_insert_tail(ahc, xs)
+	struct ahc_softc *ahc;
+	struct scsi_xfer *xs;
+{
+	if (ahc->sc_xxxq.lh_first == NULL){
+		ahc->sc_xxxqlast = xs;
+		LIST_INSERT_HEAD(&ahc->sc_xxxq, xs, free_list);
+		return;
 	}
-	return (0);
+	LIST_INSERT_AFTER(ahc->sc_xxxqlast, xs, free_list);
+	ahc->sc_xxxqlast = xs;
 }
 
-void
-ahc_intr_enable(struct ahc_softc *ahc, int enable)
+STATIC INLINE void
+ahc_list_remove(ahc, xs)
+	struct ahc_softc *ahc;
+	struct scsi_xfer *xs;
 {
-	u_int hcntrl;
-
-	hcntrl = ahc_inb(ahc, HCNTRL);
-	hcntrl &= ~INTEN;
-	ahc->pause &= ~INTEN;
-	ahc->unpause &= ~INTEN;
-	if (enable) {
-		hcntrl |= INTEN;
-		ahc->pause |= INTEN;
-		ahc->unpause |= INTEN;
-	}
-	ahc_outb(ahc, HCNTRL, hcntrl);
+	struct scsi_xfer *lxs;
+	if (xs == ahc->sc_xxxqlast) {
+		lxs = ahc->sc_xxxq.lh_first;
+		while (lxs != NULL) {
+			if (LIST_NEXT(lxs, free_list) == ahc->sc_xxxqlast) {
+                                ahc->sc_xxxqlast = lxs;
+				break;
+			}
+			lxs = LIST_NEXT(xs, free_list);
+		}
+	}
+	
+	LIST_REMOVE(xs, free_list);
+	if (ahc->sc_xxxq.lh_first == NULL)
+		ahc->sc_xxxqlast = NULL;
+}
+
+STATIC INLINE struct scsi_xfer *
+ahc_list_next(ahc, xs)
+	struct ahc_softc *ahc;
+	struct scsi_xfer *xs;
+{
+	return(LIST_NEXT(xs, free_list));
 }
 
 /*
- * Ensure that the card is paused in a location
- * outside of all critical sections and that all
- * pending work is completed prior to returning.
- * This routine should only be called from outside
- * an interrupt context.
+ * Pick the first xs for a non-blocked target.
  */
-void
-ahc_pause_and_flushwork(struct ahc_softc *ahc)
+STATIC INLINE struct scsi_xfer *
+ahc_first_xs(struct ahc_softc *ahc)
 {
-	int intstat;
-	int maxloops;
+	int target;
+	struct scsi_xfer *xs = ahc->sc_xxxq.lh_first;
 
-	maxloops = 1000;
-	ahc->flags |= AHC_ALL_INTERRUPTS;
-	intstat = 0;
-	do {
-		ahc_intr(ahc);
-		ahc_pause(ahc);
-		ahc_clear_critical_section(ahc);
-		if (intstat == 0xFF && (ahc->features & AHC_REMOVABLE) != 0)
+	if (ahc->queue_blocked)
+        	return NULL;
+
+	while (xs != NULL) {
+		target = xs->sc_link->target;
+		if (ahc->devqueue_blocked[target] == 0 &&
+		    ahc_index_busy_tcl(ahc, XS_TCL(ahc, xs), FALSE) ==
+			SCB_LIST_NULL)
 			break;
-		maxloops--;
-	} while (((intstat = ahc_inb(ahc, INTSTAT)) & INT_PEND) && --maxloops);
-	if (maxloops == 0) {
-		printf("Infinite interrupt loop, INTSTAT = %x",
-		      ahc_inb(ahc, INTSTAT));
-	}
-	ahc_platform_flushwork(ahc);
-	ahc->flags &= ~AHC_ALL_INTERRUPTS;
+		xs = LIST_NEXT(xs, free_list);
+	}
+
+	return xs;
 }
 
-int
-ahc_suspend(struct ahc_softc *ahc)
+STATIC int32_t
+ahc_scsi_cmd(xs)
+	struct scsi_xfer *xs;
 {
-	uint8_t *ptr;
-	int	 i;
+	struct scsi_xfer *first_xs, *next_xs = NULL;
+	struct ahc_softc *ahc;
+	struct scb *scb;
+	struct hardware_scb *hscb;	
+	struct ahc_initiator_tinfo *tinfo;
+	struct tmode_tstate *tstate;
+	u_int target_id;
+	u_int our_id;
+	char channel;
+	int s, tcl;
+	u_int16_t mask;
+	int dontqueue = 0, fromqueue = 0;
 
-	ahc_pause_and_flushwork(ahc);
+	SC_DEBUG(xs->sc_link, SDEV_DB3, ("ahc_scsi_cmd\n"));
+	ahc = (struct ahc_softc *)xs->sc_link->adapter_softc;
 
-	if (LIST_FIRST(&ahc->pending_scbs) != NULL)
-		return (EBUSY);
+	/* must protect the queue */
+	s = splbio();
 
-#if AHC_TARGET_MODE
-	/*
-	 * XXX What about ATIOs that have not yet been serviced?
-	 * Perhaps we should just refuse to be suspended if we
-	 * are acting in a target role.
-	 */
-	if (ahc->pending_device != NULL)
-		return (EBUSY);
-#endif
+	if (xs == ahc->sc_xxxq.lh_first) {
+		/*
+		 * Called from ahc_done. Calling with the first entry in
+		 * the queue is really just a way of seeing where we're
+		 * called from. Now, find the first eligible SCB to send,
+		 * e.g. one which will be accepted immediately.
+		 */
 
-	/* Save volatile registers */
-	if ((ahc->features & AHC_TWIN) != 0) {
-		ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) | SELBUSB);
-		ahc->suspend_state.channel[1].scsiseq = ahc_inb(ahc, SCSISEQ);
-		ahc->suspend_state.channel[1].sxfrctl0 = ahc_inb(ahc, SXFRCTL0);
-		ahc->suspend_state.channel[1].sxfrctl1 = ahc_inb(ahc, SXFRCTL1);
-		ahc->suspend_state.channel[1].simode0 = ahc_inb(ahc, SIMODE0);
-		ahc->suspend_state.channel[1].simode1 = ahc_inb(ahc, SIMODE1);
-		ahc->suspend_state.channel[1].seltimer = ahc_inb(ahc, SELTIMER);
-		ahc->suspend_state.channel[1].seqctl = ahc_inb(ahc, SEQCTL);
-		ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) & ~SELBUSB);
+		if (ahc->queue_blocked) {
+			splx(s);
+			return (TRY_AGAIN_LATER);
+		}
+
+		xs = ahc_first_xs(ahc);
+		if (xs == NULL) {
+			splx(s);
+			return (TRY_AGAIN_LATER);
+		}
+
+		next_xs = ahc_list_next(ahc, xs);
+		ahc_list_remove(ahc, xs);
+		fromqueue = 1;
+		goto get_scb;
 	}
-	ahc->suspend_state.channel[0].scsiseq = ahc_inb(ahc, SCSISEQ);
-	ahc->suspend_state.channel[0].sxfrctl0 = ahc_inb(ahc, SXFRCTL0);
-	ahc->suspend_state.channel[0].sxfrctl1 = ahc_inb(ahc, SXFRCTL1);
-	ahc->suspend_state.channel[0].simode0 = ahc_inb(ahc, SIMODE0);
-	ahc->suspend_state.channel[0].simode1 = ahc_inb(ahc, SIMODE1);
-	ahc->suspend_state.channel[0].seltimer = ahc_inb(ahc, SELTIMER);
-	ahc->suspend_state.channel[0].seqctl = ahc_inb(ahc, SEQCTL);
 
-	if ((ahc->chip & AHC_PCI) != 0) {
-		ahc->suspend_state.dscommand0 = ahc_inb(ahc, DSCOMMAND0);
-		ahc->suspend_state.dspcistatus = ahc_inb(ahc, DSPCISTATUS);
+	/* determine safety of software queueing */
+	dontqueue = xs->flags & SCSI_POLL;
+	
+	/*
+	 * If no new requests are accepted, just insert into the
+	 * private queue to wait for our turn.
+	 */
+	tcl = XS_TCL(ahc, xs);
+
+	if (ahc->queue_blocked ||
+	    ahc->devqueue_blocked[xs->sc_link->target] ||
+	    (!ahc_istagged_device(ahc, xs, 0) &&
+	     ahc_index_busy_tcl(ahc, tcl, FALSE) != SCB_LIST_NULL)) {
+		if (dontqueue) {
+			splx(s);
+			xs->error = XS_DRIVER_STUFFUP;
+			return TRY_AGAIN_LATER;
+		}
+		ahc_list_insert_tail(ahc, xs);
+		splx(s);
+		return SUCCESSFULLY_QUEUED;
 	}
 
-	if ((ahc->features & AHC_DT) != 0) {
-		u_int sfunct;
+	first_xs = ahc_first_xs(ahc);
+
+	/* determine safety of software queueing */
+	dontqueue = xs->flags & SCSI_POLL;
+
+	/*
+	 * Handle situations where there's already entries in the
+	 * queue.
+	 */
+	if (first_xs != NULL) {
+		/*
+		 * If we can't queue, we have to abort, since
+		 * we have to preserve order.
+		 */
+		if (dontqueue) {
+			splx(s);
+			xs->error = XS_DRIVER_STUFFUP;
+			return (TRY_AGAIN_LATER);
+		}
+
+		/*
+		 * Swap with the first queue entry.
+		 */
+		ahc_list_insert_tail(ahc, xs);
+		xs = first_xs;
+		next_xs = ahc_list_next(ahc, xs);
+		ahc_list_remove(ahc, xs);
+		fromqueue = 1;
 
-		sfunct = ahc_inb(ahc, SFUNCT) & ~ALT_MODE;
-		ahc_outb(ahc, SFUNCT, sfunct | ALT_MODE);
-		ahc->suspend_state.optionmode = ahc_inb(ahc, OPTIONMODE);
-		ahc_outb(ahc, SFUNCT, sfunct);
-		ahc->suspend_state.crccontrol1 = ahc_inb(ahc, CRCCONTROL1);
 	}
 
-	if ((ahc->features & AHC_MULTI_FUNC) != 0)
-		ahc->suspend_state.scbbaddr = ahc_inb(ahc, SCBBADDR);
+get_scb:
 
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		ahc->suspend_state.dff_thrsh = ahc_inb(ahc, DFF_THRSH);
+	target_id = xs->sc_link->target;
+	our_id = SIM_SCSI_ID(ahc, xs->sc_link);
 
-	ptr = ahc->suspend_state.scratch_ram;
-	for (i = 0; i < 64; i++)
-		*ptr++ = ahc_inb(ahc, SRAM_BASE + i);
+	/*
+	 * get an scb to use.
+	 */
+	if ((scb = ahcgetscb(ahc)) == NULL) {
 
-	if ((ahc->features & AHC_MORE_SRAM) != 0) {
-		for (i = 0; i < 16; i++)
-			*ptr++ = ahc_inb(ahc, TARG_OFFSET + i);
+		if (dontqueue) {
+			splx(s);
+			xs->error = XS_DRIVER_STUFFUP;
+			return (TRY_AGAIN_LATER);
+		}
+
+		/*
+		 * If we were pulled off the queue, put ourselves
+		 * back to where we came from, otherwise tack ourselves
+		 * onto the end.
+		 */
+		if (fromqueue && next_xs != NULL)
+			ahc_list_insert_before(ahc, xs, next_xs);
+		else
+			ahc_list_insert_tail(ahc, xs);
+
+		splx(s);
+		return (SUCCESSFULLY_QUEUED);
 	}
 
-	ptr = ahc->suspend_state.btt;
-	if ((ahc->flags & AHC_SCB_BTT) != 0) {
-		for (i = 0;i < AHC_NUM_TARGETS; i++) {
-			int j;
+	tcl = XS_TCL(ahc, xs);
 
-			for (j = 0;j < AHC_NUM_LUNS; j++) {
-				u_int tcl;
+#ifdef DIAGNOSTIC
+	if (!ahc_istagged_device(ahc, xs, 0) &&
+	    ahc_index_busy_tcl(ahc, tcl, FALSE) != SCB_LIST_NULL)
+		panic("ahc: queuing for busy target");
+#endif
+	
+	scb->xs = xs;
+	hscb = scb->hscb;
+	hscb->tcl = tcl;
+	timeout_set(&xs->stimeout, ahc_timeout, scb);
 
-				tcl = BUILD_TCL(i << 4, j);
-				*ptr = ahc_index_busy_tcl(ahc, tcl);
-			}
+	if (ahc_istagged_device(ahc, xs, 0))
+		scb->hscb->control |= MSG_SIMPLE_Q_TAG;
+	else
+		ahc_busy_tcl(ahc, scb);
+
+	splx(s);
+ 
+	channel = SIM_CHANNEL(ahc, xs->sc_link);
+	if (ahc->inited_channels[channel - 'A'] == 0) {
+		if ((channel == 'A' && (ahc->flags & AHC_RESET_BUS_A)) ||
+		    (channel == 'B' && (ahc->flags & AHC_RESET_BUS_B))) {
+			s = splbio();
+			ahc_reset_channel(ahc, channel, TRUE);
+			splx(s);
 		}
+		ahc->inited_channels[channel - 'A'] = 1;
 	}
-	ahc_shutdown(ahc);
-	return (0);
+
+	/*
+	 * Put all the arguments for the xfer in the scb
+	 */
+
+	mask = SCB_TARGET_MASK(scb);
+	tinfo = ahc_fetch_transinfo(ahc, SIM_CHANNEL(ahc, xs->sc_link), our_id,
+				    target_id, &tstate);
+	if (ahc->inited_targets[target_id] == 0) {
+		struct ahc_devinfo devinfo;
+
+		s = splbio();
+		ahc_compile_devinfo(&devinfo, our_id, target_id,
+		    xs->sc_link->lun, SIM_CHANNEL(ahc, xs->sc_link),
+		    ROLE_INITIATOR);
+		ahc_update_target_msg_request(ahc, &devinfo, tinfo, TRUE,
+		    FALSE);
+		ahc->inited_targets[target_id] = 1;
+		splx(s);
+	}
+
+	hscb->scsirate = tinfo->scsirate;
+	hscb->scsioffset = tinfo->current.offset;
+	if ((tstate->ultraenb & mask) != 0)
+		hscb->control |= ULTRAENB;
+		
+	if ((tstate->discenable & mask) != 0)
+		hscb->control |= DISCENB;
+
+	if (xs->flags & SCSI_RESET) {
+		hscb->cmdpointer = NULL;
+		scb->flags |= SCB_DEVICE_RESET;
+		hscb->control |= MK_MESSAGE;
+		return ahc_execute_scb(scb, NULL, 0);
+	}
+
+	return ahc_setup_data(ahc, xs, scb);
 }
 
-int
-ahc_resume(struct ahc_softc *ahc)
+STATIC int
+ahc_execute_scb(arg, dm_segs, nsegments)
+	void *arg;
+	bus_dma_segment_t *dm_segs;
+	int nsegments;
 {
-	uint8_t *ptr;
-	int	 i;
+	struct	 scb *scb;
+	struct scsi_xfer *xs;
+	struct	 ahc_softc *ahc;
+	int	 s;
 
-	ahc_reset(ahc);
+	scb = (struct scb *)arg;
+	xs = scb->xs;
+	ahc = (struct ahc_softc *)xs->sc_link->adapter_softc;
 
-	ahc_build_free_scb_list(ahc);
 
-	/* Restore volatile registers */
-	if ((ahc->features & AHC_TWIN) != 0) {
-		ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) | SELBUSB);
-		ahc_outb(ahc, SCSIID, ahc->our_id);
-		ahc_outb(ahc, SCSISEQ, ahc->suspend_state.channel[1].scsiseq);
-		ahc_outb(ahc, SXFRCTL0, ahc->suspend_state.channel[1].sxfrctl0);
-		ahc_outb(ahc, SXFRCTL1, ahc->suspend_state.channel[1].sxfrctl1);
-		ahc_outb(ahc, SIMODE0, ahc->suspend_state.channel[1].simode0);
-		ahc_outb(ahc, SIMODE1, ahc->suspend_state.channel[1].simode1);
-		ahc_outb(ahc, SELTIMER, ahc->suspend_state.channel[1].seltimer);
-		ahc_outb(ahc, SEQCTL, ahc->suspend_state.channel[1].seqctl);
-		ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) & ~SELBUSB);
-	}
-	ahc_outb(ahc, SCSISEQ, ahc->suspend_state.channel[0].scsiseq);
-	ahc_outb(ahc, SXFRCTL0, ahc->suspend_state.channel[0].sxfrctl0);
-	ahc_outb(ahc, SXFRCTL1, ahc->suspend_state.channel[0].sxfrctl1);
-	ahc_outb(ahc, SIMODE0, ahc->suspend_state.channel[0].simode0);
-	ahc_outb(ahc, SIMODE1, ahc->suspend_state.channel[0].simode1);
-	ahc_outb(ahc, SELTIMER, ahc->suspend_state.channel[0].seltimer);
-	ahc_outb(ahc, SEQCTL, ahc->suspend_state.channel[0].seqctl);
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		ahc_outb(ahc, SCSIID_ULTRA2, ahc->our_id);
-	else
-		ahc_outb(ahc, SCSIID, ahc->our_id);
+	if (nsegments != 0) {
+		struct ahc_dma_seg *sg;
+		bus_dma_segment_t *end_seg;
+		int op;
 
-	if ((ahc->chip & AHC_PCI) != 0) {
-		ahc_outb(ahc, DSCOMMAND0, ahc->suspend_state.dscommand0);
-		ahc_outb(ahc, DSPCISTATUS, ahc->suspend_state.dspcistatus);
-	}
+		end_seg = dm_segs + nsegments;
 
-	if ((ahc->features & AHC_DT) != 0) {
-		u_int sfunct;
+		/* Copy the first SG into the data pointer area */
+		scb->hscb->data = dm_segs->ds_addr;
+		scb->hscb->datalen = dm_segs->ds_len;
 
-		sfunct = ahc_inb(ahc, SFUNCT) & ~ALT_MODE;
-		ahc_outb(ahc, SFUNCT, sfunct | ALT_MODE);
-		ahc_outb(ahc, OPTIONMODE, ahc->suspend_state.optionmode);
-		ahc_outb(ahc, SFUNCT, sfunct);
-		ahc_outb(ahc, CRCCONTROL1, ahc->suspend_state.crccontrol1);
+		/* Copy the segments into our SG list */
+		sg = scb->sg_list;
+		while (dm_segs < end_seg) {
+			sg->addr = dm_segs->ds_addr;
+			sg->len = dm_segs->ds_len;
+			ahc_swap_sg(sg);
+			sg++;
+			dm_segs++;
+		}
+
+		/* Note where to find the SG entries in bus space */
+		scb->hscb->SG_pointer = scb->sg_list_phys;
+		if ((scb->xs->flags & SCSI_DATA_IN) != 0)
+			op = BUS_DMASYNC_PREREAD;
+		else
+			op = BUS_DMASYNC_PREWRITE;
+		bus_dmamap_sync(ahc->sc_dmat, scb->dmamap,
+		    0, scb->dmamap->dm_mapsize, op);
+	} else {
+		scb->hscb->SG_pointer = 0;
+		scb->hscb->data = 0;
+		scb->hscb->datalen = 0;
 	}
+	
+	scb->sg_count = scb->hscb->SG_count = nsegments;
 
-	if ((ahc->features & AHC_MULTI_FUNC) != 0)
-		ahc_outb(ahc, SCBBADDR, ahc->suspend_state.scbbaddr);
+	s = splbio();
 
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		ahc_outb(ahc, DFF_THRSH, ahc->suspend_state.dff_thrsh);
+	/*
+	 * Last time we need to check if this SCB needs to
+	 * be aborted.
+	 */
+	if (xs->flags & ITSDONE) {
+		if (!ahc_istagged_device(ahc, xs, 0))
+			ahc_index_busy_tcl(ahc, scb->hscb->tcl, TRUE);
+		if (nsegments != 0)
+			bus_dmamap_unload(ahc->sc_dmat, scb->dmamap);
+		ahcfreescb(ahc, scb);
+		splx(s);
+		return (COMPLETE);
+	}
+
+#ifdef DIAGNOSTIC
+	if (scb->sg_count > 255)
+		panic("ahc bad sg_count");
+#endif
 
-	ptr = ahc->suspend_state.scratch_ram;
-	for (i = 0; i < 64; i++)
-		ahc_outb(ahc, SRAM_BASE + i, *ptr++);
+	ahc_swap_hscb(scb->hscb);
+		
+	LIST_INSERT_HEAD(&ahc->pending_scbs, scb, pend_links);
 
-	if ((ahc->features & AHC_MORE_SRAM) != 0) {
-		for (i = 0; i < 16; i++)
-			ahc_outb(ahc, TARG_OFFSET + i, *ptr++);
-	}
+	scb->flags |= SCB_ACTIVE;
 
-	ptr = ahc->suspend_state.btt;
-	if ((ahc->flags & AHC_SCB_BTT) != 0) {
-		for (i = 0;i < AHC_NUM_TARGETS; i++) {
-			int j;
+	if (!(xs->flags & SCSI_POLL))
+		timeout_add(&xs->stimeout, (xs->timeout * hz) / 1000);
 
-			for (j = 0;j < AHC_NUM_LUNS; j++) {
-				u_int tcl;
+	if ((scb->flags & SCB_TARGET_IMMEDIATE) != 0) {
+#if 0
+		printf("Continueing Immediate Command %d:%d\n",
+		       xs->sc_link->target,
+		       xs->sc_link->lun);
+#endif
+		pause_sequencer(ahc);
+		if ((ahc->flags & AHC_PAGESCBS) == 0)
+			ahc_outb(ahc, SCBPTR, scb->hscb->tag);
+		ahc_outb(ahc, SCB_TAG, scb->hscb->tag);
+		ahc_outb(ahc, RETURN_1, CONT_MSG_LOOP);
+		unpause_sequencer(ahc);
+	} else {
 
-				tcl = BUILD_TCL(i << 4, j);
-				ahc_busy_tcl(ahc, tcl, *ptr);
-			}
+		ahc->qinfifo[ahc->qinfifonext++] = scb->hscb->tag;
+
+		bus_dmamap_sync(ahc->sc_dmat, ahc->shared_data_dmamap, 
+		    QINFIFO_OFFSET * 256, 256, BUS_DMASYNC_PREWRITE);
+		
+		if ((ahc->features & AHC_QUEUE_REGS) != 0) {
+			ahc_outb(ahc, HNSCB_QOFF, ahc->qinfifonext);
+		} else {
+			pause_sequencer(ahc);
+			ahc_outb(ahc, KERNEL_QINPOS, ahc->qinfifonext);
+			unpause_sequencer(ahc);
 		}
 	}
-	return (0);
+
+#ifdef AHC_DEBUG
+	if (ahc_debug & AHC_SHOWCMDS) {
+		sc_print_addr(xs->sc_link);
+		printf("opcode %d tag %x len %d flags %x control %x fpos %u"
+		    " rate %x\n",
+		    xs->cmdstore.opcode, scb->hscb->tag, scb->hscb->datalen,
+		    scb->flags, scb->hscb->control, ahc->qinfifonext,
+		    scb->hscb->scsirate);
+	}
+#endif
+
+	if (!(xs->flags & SCSI_POLL)) {
+		splx(s);
+		return (SUCCESSFULLY_QUEUED);
+	}
+	/*
+	 * If we can't use interrupts, poll for completion
+	 */
+	SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_poll\n"));
+	do {
+		if (ahc_poll(ahc, xs->timeout)) {
+			if (!(xs->flags & SCSI_SILENT))
+				printf("cmd fail\n");
+			ahc_timeout(scb);
+			break;
+		}
+	} while (!(xs->flags & ITSDONE));
+	splx(s);
+	return (COMPLETE);
 }
 
-/************************** Busy Target Table *********************************/
-/*
- * Return the untagged transaction id for a given target/channel lun.
- * Optionally, clear the entry.
- */
-u_int
-ahc_index_busy_tcl(struct ahc_softc *ahc, u_int tcl)
+STATIC int
+ahc_poll(ahc, wait)
+	struct   ahc_softc *ahc;
+	int   wait;	/* in msec */
 {
-	u_int scbid;
-	u_int target_offset;
+	while (--wait) {
+		DELAY(1000);
+		if (ahc_inb(ahc, INTSTAT) & INT_PEND)
+			break;
+	}
 
-	if ((ahc->flags & AHC_SCB_BTT) != 0) {
-		u_int saved_scbptr;
+	if (wait == 0) {
+		printf("%s: board is not responding\n", ahc_name(ahc));
+		return (EIO);
+	}
 		
-		saved_scbptr = ahc_inb(ahc, SCBPTR);
-		ahc_outb(ahc, SCBPTR, TCL_LUN(tcl));
-		scbid = ahc_inb(ahc, SCB_64_BTT + TCL_TARGET_OFFSET(tcl));
-		ahc_outb(ahc, SCBPTR, saved_scbptr);
+	ahc_intr((void *)ahc);
+	return (0);
+}
+
+STATIC int
+ahc_setup_data(ahc, xs, scb)
+	struct ahc_softc *ahc;
+	struct scsi_xfer *xs;
+	struct scb *scb;
+{
+	struct hardware_scb *hscb;
+	
+	hscb = scb->hscb;
+	xs->resid = xs->status = 0;
+	
+	hscb->cmdlen = xs->cmdlen;
+	bcopy(xs->cmd, hscb->cmdstore, xs->cmdlen);
+	hscb->cmdpointer = hscb->cmdstore_busaddr;
+
+	/* Only use S/G if there is a transfer */
+	if (xs->datalen) {
+		int error;
+
+		error = bus_dmamap_load(ahc->sc_dmat,
+			    scb->dmamap, xs->data,
+			    xs->datalen, NULL,
+			    (xs->flags & SCSI_NOSLEEP) ?
+			    BUS_DMA_NOWAIT : BUS_DMA_WAITOK);
+		if (error) {
+			if (!ahc_istagged_device(ahc, xs, 0))
+				ahc_index_busy_tcl(ahc, hscb->tcl, TRUE);
+			return (TRY_AGAIN_LATER);	/* XXX fvdl */
+		}
+		error = ahc_execute_scb(scb,
+		    scb->dmamap->dm_segs,
+		    scb->dmamap->dm_nsegs);
+		return error;
 	} else {
-		target_offset = TCL_TARGET_OFFSET(tcl);
-		scbid = ahc_inb(ahc, BUSY_TARGETS + target_offset);
+		return ahc_execute_scb(scb, NULL, 0);
 	}
+}
 
-	return (scbid);
+STATIC void
+ahc_freeze_devq(ahc, sc_link)
+	struct ahc_softc *ahc;
+	struct scsi_link *sc_link;
+{
+	int	target;
+	char	channel;
+	int	lun;
+
+	target = sc_link->target;
+	lun = sc_link->lun;
+	channel = SIM_CHANNEL(ahc, sc_link);
+	
+	ahc_search_qinfifo(ahc, target, channel, lun,
+			   /*tag*/SCB_LIST_NULL, ROLE_UNKNOWN,
+			   SCB_REQUEUE, SEARCH_COMPLETE);
 }
 
-void
-ahc_unbusy_tcl(struct ahc_softc *ahc, u_int tcl)
+STATIC void
+ahcallocscbs(ahc)
+	struct ahc_softc *ahc;
 {
-	u_int target_offset;
+	struct scb_data *scb_data;
+	struct scb *next_scb;
+	struct sg_map_node *sg_map;
+	bus_addr_t physaddr;
+	struct ahc_dma_seg *segs;
+	int newcount;
+	int i;
+	int dma_flags = 0;
+
+	scb_data = ahc->scb_data;
+	if (scb_data->numscbs >= AHC_SCB_MAX)
+		/* Can't allocate any more */
+		return;
+
+	next_scb = &scb_data->scbarray[scb_data->numscbs];
+
+	sg_map = malloc(sizeof(*sg_map), M_DEVBUF, M_NOWAIT);
+
+	if (sg_map == NULL)
+		return;
+	bzero(sg_map, sizeof(struct sg_map_node));
+	
+	if (ahc_createdmamem(ahc, PAGE_SIZE, &sg_map->sg_dmamap,
+	    (caddr_t *)&sg_map->sg_vaddr, &sg_map->sg_physaddr,
+	    &sg_map->sg_dmasegs, &sg_map->sg_nseg, "SG space") < 0) {
+		free(sg_map, M_DEVBUF);
+		return;
+	}
+	
+	SLIST_INSERT_HEAD(&scb_data->sg_maps, sg_map, links);
+
+	segs = sg_map->sg_vaddr;
+	physaddr = sg_map->sg_physaddr;
+
+	newcount = (PAGE_SIZE / (AHC_NSEG * sizeof(struct ahc_dma_seg)));
+
+	for (i = 0; scb_data->numscbs < AHC_SCB_MAX && i < newcount; i++) {
+		int error;
 
-	if ((ahc->flags & AHC_SCB_BTT) != 0) {
-		u_int saved_scbptr;
+		next_scb->sg_list = segs;
+		/*
+		 * The sequencer always starts with the second entry.
+		 * The first entry is embedded in the scb.
+		 */
+		next_scb->sg_list_phys = physaddr + sizeof(struct ahc_dma_seg);
+		next_scb->flags = SCB_FREE;
 		
-		saved_scbptr = ahc_inb(ahc, SCBPTR);
-		ahc_outb(ahc, SCBPTR, TCL_LUN(tcl));
-		ahc_outb(ahc, SCB_64_BTT+TCL_TARGET_OFFSET(tcl), SCB_LIST_NULL);
-		ahc_outb(ahc, SCBPTR, saved_scbptr);
-	} else {
-		target_offset = TCL_TARGET_OFFSET(tcl);
-		ahc_outb(ahc, BUSY_TARGETS + target_offset, SCB_LIST_NULL);
+		/* set up AHA-284x right. */
+		dma_flags = ((ahc->chip & AHC_VL) !=0) ? 
+			BUS_DMA_NOWAIT|ISABUS_DMA_32BIT :
+			BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW;
+		
+		error = bus_dmamap_create(ahc->sc_dmat,
+				 AHC_MAXTRANSFER_SIZE, AHC_NSEG, MAXBSIZE, 0,
+				 dma_flags, &next_scb->dmamap);
+		if (error !=0) 
+			break;
+
+		next_scb->hscb = &scb_data->hscbs[scb_data->numscbs];
+		next_scb->hscb->tag = ahc->scb_data->numscbs;
+		next_scb->hscb->cmdstore_busaddr = 
+		    ahc_hscb_busaddr(ahc, next_scb->hscb->tag)
+		  + offsetof(struct hardware_scb, cmdstore);
+		next_scb->hscb->cmdstore_busaddr =
+		    htole32(next_scb->hscb->cmdstore_busaddr);
+		SLIST_INSERT_HEAD(&ahc->scb_data->free_scbs, next_scb, links);
+		segs += AHC_NSEG;
+		physaddr += (AHC_NSEG * sizeof(struct ahc_dma_seg));
+		next_scb++;
+		ahc->scb_data->numscbs++;
 	}
 }
 
-void
-ahc_busy_tcl(struct ahc_softc *ahc, u_int tcl, u_int scbid)
+#ifdef AHC_DUMP_SEQ
+STATIC void
+ahc_dumpseq(ahc)
+	struct ahc_softc* ahc;
 {
-	u_int target_offset;
+	int i;
+	int max_prog;
 
-	if ((ahc->flags & AHC_SCB_BTT) != 0) {
-		u_int saved_scbptr;
-		
-		saved_scbptr = ahc_inb(ahc, SCBPTR);
-		ahc_outb(ahc, SCBPTR, TCL_LUN(tcl));
-		ahc_outb(ahc, SCB_64_BTT + TCL_TARGET_OFFSET(tcl), scbid);
-		ahc_outb(ahc, SCBPTR, saved_scbptr);
-	} else {
-		target_offset = TCL_TARGET_OFFSET(tcl);
-		ahc_outb(ahc, BUSY_TARGETS + target_offset, scbid);
+	if ((ahc->chip & AHC_BUS_MASK) < AHC_PCI)
+		max_prog = 448;
+	else if ((ahc->features & AHC_ULTRA2) != 0)
+		max_prog = 768;
+	else
+		max_prog = 512;
+
+	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS|FASTMODE|LOADRAM);
+	ahc_outb(ahc, SEQADDR0, 0);
+	ahc_outb(ahc, SEQADDR1, 0);
+	for (i = 0; i < max_prog; i++) {
+		u_int8_t ins_bytes[4];
+
+		ahc_insb(ahc, SEQRAM, ins_bytes, 4);
+		printf("0x%08x\n", ins_bytes[0] << 24
+				 | ins_bytes[1] << 16
+				 | ins_bytes[2] << 8
+				 | ins_bytes[3]);
 	}
 }
+#endif
 
-/************************** SCB and SCB queue management **********************/
-int
-ahc_match_scb(struct ahc_softc *ahc, struct scb *scb, int target,
-	      char channel, int lun, u_int tag, role_t role)
+STATIC void
+ahc_loadseq(ahc)
+	struct ahc_softc* ahc;
 {
-	int targ = SCB_GET_TARGET(ahc, scb);
-	char chan = SCB_GET_CHANNEL(ahc, scb);
-	int slun = SCB_GET_LUN(scb);
-	int match;
+	struct patch *cur_patch;
+	int i;
+	int downloaded;
+	int skip_addr;
+	u_int8_t download_consts[4];
 
-	match = ((chan == channel) || (channel == ALL_CHANNELS));
-	if (match != 0)
-		match = ((targ == target) || (target == CAM_TARGET_WILDCARD));
-	if (match != 0)
-		match = ((lun == slun) || (lun == CAM_LUN_WILDCARD));
-	if (match != 0) {
-#if AHC_TARGET_MODE
-		int group;
-
-		group = XPT_FC_GROUP(scb->io_ctx->ccb_h.func_code);
-		if (role == ROLE_INITIATOR) {
-			match = (group != XPT_FC_GROUP_TMODE)
-			      && ((tag == scb->hscb->tag)
-			       || (tag == SCB_LIST_NULL));
-		} else if (role == ROLE_TARGET) {
-			match = (group == XPT_FC_GROUP_TMODE)
-			      && ((tag == scb->io_ctx->csio.tag_id)
-			       || (tag == SCB_LIST_NULL));
+	/* Setup downloadable constant table */
+#if 0
+	/* No downloaded constants are currently defined. */
+	download_consts[TMODE_NUMCMDS] = ahc->num_targetcmds;
+#endif
+
+	cur_patch = patches;
+	downloaded = 0;
+	skip_addr = 0;
+	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS|FASTMODE|LOADRAM);
+	ahc_outb(ahc, SEQADDR0, 0);
+	ahc_outb(ahc, SEQADDR1, 0);
+
+	for (i = 0; i < sizeof(seqprog)/4; i++) {
+		if (ahc_check_patch(ahc, &cur_patch, i, &skip_addr) == 0) {
+			/*
+			 * Don't download this instruction as it
+			 * is in a patch that was removed.
+			 */
+                        continue;
 		}
-#else /* !AHC_TARGET_MODE */
-		match = ((tag == scb->hscb->tag) || (tag == SCB_LIST_NULL));
-#endif /* AHC_TARGET_MODE */
+		ahc_download_instr(ahc, i, download_consts);
+		downloaded++;
 	}
+	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS|FASTMODE);
+	restart_sequencer(ahc);
 
-	return match;
+	if (bootverbose)
+		printf(" %d instructions downloaded\n", downloaded);
 }
 
-void
-ahc_freeze_devq(struct ahc_softc *ahc, struct scb *scb)
+STATIC int
+ahc_check_patch(ahc, start_patch, start_instr,skip_addr)
+	struct ahc_softc *ahc;
+	struct patch **start_patch;
+	int start_instr;
+	int *skip_addr;
 {
-	int	target;
-	char	channel;
-	int	lun;
+	struct	patch *cur_patch;
+	struct	patch *last_patch;
+	int	num_patches;
 
-	target = SCB_GET_TARGET(ahc, scb);
-	lun = SCB_GET_LUN(scb);
-	channel = SCB_GET_CHANNEL(ahc, scb);
-	
-	ahc_search_qinfifo(ahc, target, channel, lun,
-			   /*tag*/SCB_LIST_NULL, ROLE_UNKNOWN,
-			   CAM_REQUEUE_REQ, SEARCH_COMPLETE);
+	num_patches = sizeof(patches)/sizeof(struct patch);
+	last_patch = &patches[num_patches];
+	cur_patch = *start_patch;
+
+	while (cur_patch < last_patch && start_instr == cur_patch->begin) {
+
+		if (cur_patch->patch_func(ahc) == 0) {
+
+			/* Start rejecting code */
+			*skip_addr = start_instr + cur_patch->skip_instr;
+			cur_patch += cur_patch->skip_patch;
+		} else {
+			/* Accepted this patch.  Advance to the next
+			 * one and wait for our intruction pointer to
+			 * hit this point.
+			 */
+			cur_patch++;
+		}
+	}
+
+	*start_patch = cur_patch;
+	if (start_instr < *skip_addr)
+		/* Still skipping */
+		return (0);
 
-	ahc_platform_freeze_devq(ahc, scb);
+	return (1);
 }
 
-void
-ahc_qinfifo_requeue_tail(struct ahc_softc *ahc, struct scb *scb)
+STATIC void
+ahc_download_instr(ahc, instrptr, dconsts)
+	struct ahc_softc *ahc;
+	int instrptr;
+	u_int8_t *dconsts;
 {
-	struct scb *prev_scb;
+	union	ins_formats instr;
+	struct	ins_format1 *fmt1_ins;
+	struct	ins_format3 *fmt3_ins;
+	u_int	opcode;
 
-	prev_scb = NULL;
-	if (ahc_qinfifo_count(ahc) != 0) {
-		u_int prev_tag;
-		uint8_t prev_pos;
+	/* Structure copy */
+	instr = *(union ins_formats*)&seqprog[instrptr * 4];
 
-		prev_pos = ahc->qinfifonext - 1;
-		prev_tag = ahc->qinfifo[prev_pos];
-		prev_scb = ahc_lookup_scb(ahc, prev_tag);
-	}
-	ahc_qinfifo_requeue(ahc, prev_scb, scb);
-	if ((ahc->features & AHC_QUEUE_REGS) != 0) {
-		ahc_outb(ahc, HNSCB_QOFF, ahc->qinfifonext);
-	} else {
-		ahc_outb(ahc, KERNEL_QINPOS, ahc->qinfifonext);
+	instr.integer = le32toh(instr.integer);
+
+	fmt1_ins = &instr.format1;
+	fmt3_ins = NULL;
+
+	/* Pull the opcode */
+	opcode = instr.format1.opcode;
+	switch (opcode) {
+	case AIC_OP_JMP:
+	case AIC_OP_JC:
+	case AIC_OP_JNC:
+	case AIC_OP_CALL:
+	case AIC_OP_JNE:
+	case AIC_OP_JNZ:
+	case AIC_OP_JE:
+	case AIC_OP_JZ:
+	{
+		struct patch *cur_patch;
+		int address_offset;
+		u_int address;
+		int skip_addr;
+		int i;
+
+		fmt3_ins = &instr.format3;
+		address_offset = 0;
+		address = fmt3_ins->address;
+		cur_patch = patches;
+		skip_addr = 0;
+
+		for (i = 0; i < address;) {
+
+			ahc_check_patch(ahc, &cur_patch, i, &skip_addr);
+
+			if (skip_addr > i) {
+				int end_addr;
+
+				end_addr = MIN(address, skip_addr);
+				address_offset += end_addr - i;
+				i = skip_addr;
+			} else {
+				i++;
+			}
+		}
+		address -= address_offset;
+		fmt3_ins->address = address;
+		/* FALLTHROUGH */
 	}
-}
+	case AIC_OP_OR:
+	case AIC_OP_AND:
+	case AIC_OP_XOR:
+	case AIC_OP_ADD:
+	case AIC_OP_ADC:
+	case AIC_OP_BMOV:
+		if (fmt1_ins->parity != 0) {
+			fmt1_ins->immediate = dconsts[fmt1_ins->immediate];
+		}
+		fmt1_ins->parity = 0;
+		/* FALLTHROUGH */
+	case AIC_OP_ROL:
+		if ((ahc->features & AHC_ULTRA2) != 0) {
+			int i, count;
 
-static void
-ahc_qinfifo_requeue(struct ahc_softc *ahc, struct scb *prev_scb,
-		    struct scb *scb)
-{
-	if (prev_scb == NULL) {
-		ahc_outb(ahc, NEXT_QUEUED_SCB, scb->hscb->tag);
-	} else {
-		prev_scb->hscb->next = scb->hscb->tag;
-		ahc_sync_scb(ahc, prev_scb, 
-			     BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+			/* Calculate odd parity for the instruction */
+			for (i = 0, count = 0; i < 31; i++) {
+				u_int32_t mask;
+
+				mask = 0x01 << i;
+				if ((instr.integer & mask) != 0)
+					count++;
+			}
+			if ((count & 0x01) == 0)
+				instr.format1.parity = 1;
+		} else {
+			/* Compress the instruction for older sequencers */
+			if (fmt3_ins != NULL) {
+				instr.integer =
+					fmt3_ins->immediate
+				      | (fmt3_ins->source << 8)
+				      | (fmt3_ins->address << 16)
+				      |	(fmt3_ins->opcode << 25);
+			} else {
+				instr.integer =
+					fmt1_ins->immediate
+				      | (fmt1_ins->source << 8)
+				      | (fmt1_ins->destination << 16)
+				      |	(fmt1_ins->ret << 24)
+				      |	(fmt1_ins->opcode << 25);
+			}
+		}
+		instr.integer = htole32(instr.integer);
+		ahc_outsb(ahc, SEQRAM, instr.bytes, 4);
+		break;
+	default:
+		panic("Unknown opcode encountered in seq program");
+		break;
 	}
-	ahc->qinfifo[ahc->qinfifonext++] = scb->hscb->tag;
-	scb->hscb->next = ahc->next_queued_scb->hscb->tag;
-	ahc_sync_scb(ahc, scb, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
 }
 
-static int
-ahc_qinfifo_count(struct ahc_softc *ahc)
+STATIC void
+ahc_set_recoveryscb(ahc, scb)
+	struct ahc_softc *ahc;
+	struct scb *scb;
 {
-	u_int8_t qinpos;
-	u_int8_t diff;
 
-	if ((ahc->features & AHC_QUEUE_REGS) != 0) {
-		qinpos = ahc_inb(ahc, SNSCB_QOFF);
-		ahc_outb(ahc, SNSCB_QOFF, qinpos);
-	} else
-		qinpos = ahc_inb(ahc, QINPOS);
-	diff = ahc->qinfifonext - qinpos;
-	return (diff);
+	if ((scb->flags & SCB_RECOVERY_SCB) == 0) {
+		struct scb *scbp;
+
+		scb->flags |= SCB_RECOVERY_SCB;
+
+		/*
+		 * Take all queued, but not sent SCBs out of the equation.
+		 * Also ensure that no new CCBs are queued to us while we
+		 * try to fix this problem.
+		 */
+		ahc->queue_blocked = 1;
+
+		/*
+		 * Go through all of our pending SCBs and remove
+		 * any scheduled timeouts for them.  We will reschedule
+		 * them after we've successfully fixed this problem.
+		 */
+		scbp = ahc->pending_scbs.lh_first;
+		while (scbp != NULL) {
+			timeout_del(&scbp->xs->stimeout);
+			scbp = scbp->pend_links.le_next;
+		}
+	}
 }
 
-int
-ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel,
-		   int lun, u_int tag, role_t role, uint32_t status,
-		   ahc_search_action action)
+STATIC void
+ahc_timeout(void *arg)
 {
 	struct	scb *scb;
-	struct	scb *prev_scb;
-	uint8_t qinstart;
-	uint8_t qinpos;
-	uint8_t qintail;
-	uint8_t next, prev;
-	uint8_t curscbptr;
-	int	found;
-	int	maxtarget;
+	struct	ahc_softc *ahc;
+	int	s, found;
+	u_int	last_phase;
+	int	target;
+	int	lun;
 	int	i;
-	int	have_qregs;
+	char	channel;
 
-	qintail = ahc->qinfifonext;
-	have_qregs = (ahc->features & AHC_QUEUE_REGS) != 0;
-	if (have_qregs) {
-		qinstart = ahc_inb(ahc, SNSCB_QOFF);
-		ahc_outb(ahc, SNSCB_QOFF, qinstart);
-	} else
-		qinstart = ahc_inb(ahc, QINPOS);
-	qinpos = qinstart;
-	next = ahc_inb(ahc, NEXT_QUEUED_SCB);
-	found = 0;
-	prev_scb = NULL;
-	
-	if (action == SEARCH_COMPLETE) {
+	scb = (struct scb *)arg; 
+	ahc = (struct ahc_softc *)scb->xs->sc_link->adapter_softc;
+
+	s = splbio();
+
+	/*
+	 * Ensure that the card doesn't do anything
+	 * behind our back.  Also make sure that we
+	 * didn't "just" miss an interrupt that would
+	 * affect this timeout.
+	 */
+	do {
+		ahc_intr(ahc);
+		pause_sequencer(ahc);
+	} while (ahc_inb(ahc, INTSTAT) & INT_PEND);
+
+	if ((scb->flags & SCB_ACTIVE) == 0) {
+		/* Previous timeout took care of me already */
+		printf("Timedout SCB handled by another timeout\n");
+		unpause_sequencer(ahc);
+		splx(s);
+		return;
+	}
+
+	target = SCB_TARGET(scb);
+	channel = SCB_CHANNEL(scb);
+	lun = SCB_LUN(scb);
+
+	sc_print_addr(scb->xs->sc_link);
+	printf("SCB 0x%x - timed out ", scb->hscb->tag);
+	/*
+	 * Take a snapshot of the bus state and print out
+	 * some information so we can track down driver bugs.
+	 */
+	last_phase = ahc_inb(ahc, LASTPHASE);
+
+	for (i = 0; i < num_phases; i++) {
+		if (last_phase == phase_table[i].phase)
+			break;
+	}
+	printf("%s", phase_table[i].phasemsg);
+  
+	printf(", SEQADDR == 0x%x\n",
+	       ahc_inb(ahc, SEQADDR0) | (ahc_inb(ahc, SEQADDR1) << 8));
+#if 0
+	printf("SSTAT1 == 0x%x\n", ahc_inb(ahc, SSTAT1));
+	printf("SSTAT3 == 0x%x\n", ahc_inb(ahc, SSTAT3));
+	printf("SCSIPHASE == 0x%x\n", ahc_inb(ahc, SCSIPHASE));
+	printf("SCSIRATE == 0x%x\n", ahc_inb(ahc, SCSIRATE));
+	printf("SCSIOFFSET == 0x%x\n", ahc_inb(ahc, SCSIOFFSET));
+	printf("SEQ_FLAGS == 0x%x\n", ahc_inb(ahc, SEQ_FLAGS));
+	printf("SCB_DATAPTR == 0x%x\n", ahc_inb(ahc, SCB_DATAPTR)
+				      | ahc_inb(ahc, SCB_DATAPTR + 1) << 8
+				      | ahc_inb(ahc, SCB_DATAPTR + 2) << 16
+				      | ahc_inb(ahc, SCB_DATAPTR + 3) << 24);
+	printf("SCB_DATACNT == 0x%x\n", ahc_inb(ahc, SCB_DATACNT)
+				      | ahc_inb(ahc, SCB_DATACNT + 1) << 8
+				      | ahc_inb(ahc, SCB_DATACNT + 2) << 16);
+	printf("SCB_SGCOUNT == 0x%x\n", ahc_inb(ahc, SCB_SGCOUNT));
+	printf("CCSCBCTL == 0x%x\n", ahc_inb(ahc, CCSCBCTL));
+	printf("CCSCBCNT == 0x%x\n", ahc_inb(ahc, CCSCBCNT));
+	printf("DFCNTRL == 0x%x\n", ahc_inb(ahc, DFCNTRL));
+	printf("DFSTATUS == 0x%x\n", ahc_inb(ahc, DFSTATUS));
+	printf("CCHCNT == 0x%x\n", ahc_inb(ahc, CCHCNT));
+	if (scb->sg_count > 0) {
+		for (i = 0; i < scb->sg_count; i++) {
+			printf("sg[%d] - Addr 0x%x : Length %d\n",
+			       i,
+			       le32toh(scb->sg_list[i].addr),
+			       le32toh(scb->sg_list[i].len));
+		}
+	}
+#endif
+	if (scb->flags & (SCB_DEVICE_RESET|SCB_ABORT)) {
 		/*
-		 * Don't attempt to run any queued untagged transactions
-		 * until we are done with the abort process.
+		 * Been down this road before.
+		 * Do a full bus reset.
 		 */
-		ahc_freeze_untagged_queues(ahc);
+bus_reset:
+		ahcsetccbstatus(scb->xs, XS_TIMEOUT);
+		found = ahc_reset_channel(ahc, channel, /*Initiate Reset*/TRUE);
+		printf("%s: Issued Channel %c Bus Reset. "
+		       "%d SCBs aborted\n", ahc_name(ahc), channel, found);
+	} else {
+		/*
+		 * If we are a target, transition to bus free and report
+		 * the timeout.
+		 * 
+		 * The target/initiator that is holding up the bus may not
+		 * be the same as the one that triggered this timeout
+		 * (different commands have different timeout lengths).
+		 * If the bus is idle and we are actiing as the initiator
+		 * for this request, queue a BDR message to the timed out
+		 * target.  Otherwise, if the timed out transaction is
+		 * active:
+		 *   Initiator transaction:
+		 *	Stuff the message buffer with a BDR message and assert
+		 *	ATN in the hopes that the target will let go of the bus
+		 *	and go to the mesgout phase.  If this fails, we'll
+		 *	get another timeout 2 seconds later which will attempt
+		 *	a bus reset.
+		 *
+		 *   Target transaction:
+		 *	Transition to BUS FREE and report the error.
+		 *	It's good to be the target!
+		 */
+		u_int active_scb_index;
+
+		active_scb_index = ahc_inb(ahc, SCB_TAG);
+
+		if (last_phase != P_BUSFREE 
+		  && (active_scb_index < ahc->scb_data->numscbs)) {
+			struct scb *active_scb;
+
+			/*
+			 * If the active SCB is not from our device,
+			 * assume that another device is hogging the bus
+			 * and wait for it's timeout to expire before
+			 * taking additional action.
+			 */ 
+			active_scb = &ahc->scb_data->scbarray[active_scb_index];
+			if (active_scb->hscb->tcl != scb->hscb->tcl) {
+				u_int	newtimeout;
+
+				sc_print_addr(scb->xs->sc_link);
+				printf("Other SCB Timeout%s",
+			 	       (scb->flags & SCB_OTHERTCL_TIMEOUT) != 0
+				       ? " again\n" : "\n");
+				scb->flags |= SCB_OTHERTCL_TIMEOUT;
+				newtimeout = MAX(active_scb->xs->timeout,
+						 scb->xs->timeout);
+				timeout_add(&scb->xs->stimeout,
+				    (newtimeout * hz) / 1000);
+				splx(s);
+				return;
+			} 
+
+			/* It's us */
+			if ((scb->hscb->control & TARGET_SCB) != 0) {
+
+				/*
+				 * Send back any queued up transactions
+				 * and properly record the error condition.
+				 */
+				ahc_freeze_devq(ahc, scb->xs->sc_link);
+				ahcsetccbstatus(scb->xs, XS_TIMEOUT);
+				ahc_freeze_ccb(scb);
+				ahc_done(ahc, scb);
+
+				/* Will clear us from the bus */
+				restart_sequencer(ahc);
+				splx(s);
+				return;
+			} 
+
+			ahc_set_recoveryscb(ahc, active_scb);
+			ahc_outb(ahc, MSG_OUT, MSG_BUS_DEV_RESET);
+			ahc_outb(ahc, SCSISIGO, last_phase|ATNO);
+			sc_print_addr(active_scb->xs->sc_link);
+			printf("BDR message in message buffer\n");
+			active_scb->flags |=  SCB_DEVICE_RESET;
+			timeout_add(&active_scb->xs->stimeout, 2 * hz);
+			unpause_sequencer(ahc);
+		} else {
+			int	 disconnected;
+
+			/* XXX Shouldn't panic.  Just punt instead */
+			if ((scb->hscb->control & TARGET_SCB) != 0)
+				panic("Timed-out target SCB but bus idle");
+
+			if (last_phase != P_BUSFREE
+			 && (ahc_inb(ahc, SSTAT0) & TARGET) != 0) {
+				/* XXX What happened to the SCB? */
+				/* Hung target selection.  Goto busfree */
+				printf("%s: Hung target selection\n",
+				       ahc_name(ahc));
+				restart_sequencer(ahc);
+				splx(s);
+				return;
+			}
+
+			if (ahc_search_qinfifo(ahc, target, channel, lun,
+					       scb->hscb->tag, ROLE_INITIATOR,
+					       /*status*/0, SEARCH_COUNT) > 0) {
+				disconnected = FALSE;
+			} else {
+				disconnected = TRUE;
+			}
+
+			if (disconnected) {
+				u_int active_scb;
+
+				ahc_set_recoveryscb(ahc, scb);
+				/*
+				 * Simply set the MK_MESSAGE control bit.
+				 */
+				scb->hscb->control |= MK_MESSAGE;
+				scb->flags |= SCB_QUEUED_MSG
+					   |  SCB_DEVICE_RESET;
+
+				/*
+				 * Mark the cached copy of this SCB in the
+				 * disconnected list too, so that a reconnect
+				 * at this point causes a BDR or abort.
+				 */
+				active_scb = ahc_inb(ahc, SCBPTR);
+				if (ahc_search_disc_list(ahc, target,
+							 channel, lun,
+							 scb->hscb->tag,
+							 /*stop_on_first*/TRUE,
+							 /*remove*/FALSE,
+							 /*save_state*/FALSE)) {
+					u_int scb_control;
+
+					scb_control = ahc_inb(ahc, SCB_CONTROL);
+					scb_control |= MK_MESSAGE;
+					ahc_outb(ahc, SCB_CONTROL, scb_control);
+				}
+				ahc_outb(ahc, SCBPTR, active_scb);
+				ahc_index_busy_tcl(ahc, scb->hscb->tcl,
+						   /*unbusy*/TRUE);
+
+				/*
+				 * Actually re-queue this SCB in case we can
+				 * select the device before it reconnects.
+				 * Clear out any entries in the QINFIFO first
+				 * so we are the next SCB for this target
+				 * to run.
+				 */
+				ahc_search_qinfifo(ahc, SCB_TARGET(scb),
+						   channel, SCB_LUN(scb),
+						   SCB_LIST_NULL,
+						   ROLE_INITIATOR,
+						   SCB_REQUEUE,
+						   SEARCH_COMPLETE);
+				sc_print_addr(scb->xs->sc_link);
+				printf("Queuing a BDR SCB\n");
+				ahc->qinfifo[ahc->qinfifonext++] =
+				    scb->hscb->tag;
+
+				bus_dmamap_sync(ahc->sc_dmat,
+				    ahc->shared_data_dmamap,
+				    QINFIFO_OFFSET * 256, 256,
+				    BUS_DMASYNC_PREWRITE);
+
+				if ((ahc->features & AHC_QUEUE_REGS) != 0) {
+					ahc_outb(ahc, HNSCB_QOFF,
+						 ahc->qinfifonext);
+				} else {
+					ahc_outb(ahc, KERNEL_QINPOS,
+						 ahc->qinfifonext);
+				}
+				timeout_add(&scb->xs->stimeout, 2 * hz);
+				unpause_sequencer(ahc);
+			} else {
+				/* Go "immediatly" to the bus reset */
+				/* This shouldn't happen */
+				ahc_set_recoveryscb(ahc, scb);
+				sc_print_addr(scb->xs->sc_link);
+				printf("SCB %d: Immediate reset.  "
+					"Flags = 0x%x\n", scb->hscb->tag,
+					scb->flags);
+				goto bus_reset;
+			}
+		}
 	}
+	splx(s);
+}
+
+STATIC int
+ahc_search_qinfifo(ahc, target, channel, lun, tag, role, status, action)
+	struct ahc_softc *ahc;
+	int target;
+	char channel;
+	int lun;
+	u_int tag;
+	role_t role;
+	u_int32_t status;
+	ahc_search_action action;
+{
+	struct	 scb *scbp;
+	u_int8_t qinpos;
+	u_int8_t qintail;
+	int	 found;
+
+	qinpos = ahc_inb(ahc, QINPOS);
+	qintail = ahc->qinfifonext;
+	found = 0;
 
 	/*
 	 * Start with an empty queue.  Entries that are not chosen
 	 * for removal will be re-added to the queue as we go.
 	 */
 	ahc->qinfifonext = qinpos;
-	ahc_outb(ahc, NEXT_QUEUED_SCB, ahc->next_queued_scb->hscb->tag);
+	bus_dmamap_sync(ahc->sc_dmat, ahc->shared_data_dmamap, 
+	    QINFIFO_OFFSET * 256, 256, BUS_DMASYNC_POSTREAD);
 
 	while (qinpos != qintail) {
-		scb = ahc_lookup_scb(ahc, ahc->qinfifo[qinpos]);
-		if (scb == NULL) {
-			printf("qinpos = %d, SCB index = %d\n",
-				qinpos, ahc->qinfifo[qinpos]);
-			panic("Loop 1\n");
-		}
-
-		if (ahc_match_scb(ahc, scb, target, channel, lun, tag, role)) {
+		scbp = &ahc->scb_data->scbarray[ahc->qinfifo[qinpos]];
+		if (ahc_match_scb(scbp, target, channel, lun, tag, role)) {
 			/*
-			 * We found an scb that needs to be acted on.
+			 * We found an scb that needs to be removed.
 			 */
-			found++;
 			switch (action) {
 			case SEARCH_COMPLETE:
-			{
-				cam_status ostat;
-				cam_status cstat;
-
-				ostat = ahc_get_transaction_status(scb);
-				if (ostat == CAM_REQ_INPROG)
-					ahc_set_transaction_status(scb,
-								   status);
-				cstat = ahc_get_transaction_status(scb);
-				if (cstat != CAM_REQ_CMP)
-					ahc_freeze_scb(scb);
-				if ((scb->flags & SCB_ACTIVE) == 0)
-					printf("Inactive SCB in qinfifo\n");
-				ahc_done(ahc, scb);
-				/* FALLTHROUGH */
-			}
-			case SEARCH_REMOVE:
+				if (!(scbp->xs->flags & ITSDONE)) {
+					scbp->flags |= status;
+					scbp->xs->error = XS_NOERROR;
+				}
+				ahc_freeze_ccb(scbp);
+				ahc_done(ahc, scbp);
 				break;
 			case SEARCH_COUNT:
-				ahc_qinfifo_requeue(ahc, prev_scb, scb);
-				prev_scb = scb;
+				ahc->qinfifo[ahc->qinfifonext++] =
+				    scbp->hscb->tag;
+				break;
+			case SEARCH_REMOVE:
 				break;
 			}
+			found++;
 		} else {
-			ahc_qinfifo_requeue(ahc, prev_scb, scb);
-			prev_scb = scb;
+			ahc->qinfifo[ahc->qinfifonext++] = scbp->hscb->tag;
 		}
 		qinpos++;
 	}
-
+	bus_dmamap_sync(ahc->sc_dmat, ahc->shared_data_dmamap, 
+	    QINFIFO_OFFSET * 256, 256, BUS_DMASYNC_PREWRITE);
+	
 	if ((ahc->features & AHC_QUEUE_REGS) != 0) {
 		ahc_outb(ahc, HNSCB_QOFF, ahc->qinfifonext);
 	} else {
 		ahc_outb(ahc, KERNEL_QINPOS, ahc->qinfifonext);
 	}
 
-	if (action != SEARCH_COUNT
-	 && (found != 0)
-	 && (qinstart != ahc->qinfifonext)) {
-		/*
-		 * The sequencer may be in the process of dmaing
-		 * down the SCB at the beginning of the queue.
-		 * This could be problematic if either the first,
-		 * or the second SCB is removed from the queue
-		 * (the first SCB includes a pointer to the "next"
-		 * SCB to dma). If we have removed any entries, swap
-		 * the first element in the queue with the next HSCB
-		 * so the sequencer will notice that NEXT_QUEUED_SCB
-		 * has changed during its dma attempt and will retry
-		 * the DMA.
-		 */
-		scb = ahc_lookup_scb(ahc, ahc->qinfifo[qinstart]);
+	return (found);
+}
 
-		if (scb == NULL) {
-			printf("found = %d, qinstart = %d, qinfifionext = %d\n",
-				found, qinstart, ahc->qinfifonext);
-			panic("First/Second Qinfifo fixup\n");
-		}
-		/*
-		 * ahc_swap_with_next_hscb forces our next pointer to
-		 * point to the reserved SCB for future commands.  Save
-		 * and restore our original next pointer to maintain
-		 * queue integrity.
-		 */
-		next = scb->hscb->next;
-		ahc->scb_data->scbindex[scb->hscb->tag] = NULL;
-		ahc_swap_with_next_hscb(ahc, scb);
-		scb->hscb->next = next;
-		ahc->qinfifo[qinstart] = scb->hscb->tag;
+/*
+ * Abort all SCBs that match the given description (target/channel/lun/tag),
+ * setting their status to the passed in status if the status has not already
+ * been modified from CAM_REQ_INPROG.  This routine assumes that the sequencer
+ * is paused before it is called.
+ */
+STATIC int
+ahc_abort_scbs(ahc, target, channel, lun, tag, role, status)
+	struct ahc_softc *ahc;
+	int target;
+	char channel;
+	int lun;
+	u_int tag;
+	role_t role;
+	u_int32_t status;
+{
+	struct	scb *scbp;
+	u_int	active_scb;
+	int	i;
+	int	found;
 
-		/* Tell the card about the new head of the qinfifo. */
-		ahc_outb(ahc, NEXT_QUEUED_SCB, scb->hscb->tag);
+	/* restore this when we're done */
+	active_scb = ahc_inb(ahc, SCBPTR);
 
-		/* Fixup the tail "next" pointer. */
-		qintail = ahc->qinfifonext - 1;
-		scb = ahc_lookup_scb(ahc, ahc->qinfifo[qintail]);
-		scb->hscb->next = ahc->next_queued_scb->hscb->tag;
-	}
+	found = ahc_search_qinfifo(ahc, target, channel, lun, SCB_LIST_NULL,
+				   role, SCB_REQUEUE, SEARCH_COMPLETE);
 
 	/*
 	 * Search waiting for selection list.
 	 */
-	curscbptr = ahc_inb(ahc, SCBPTR);
-	next = ahc_inb(ahc, WAITING_SCBH);  /* Start at head of list. */
-	prev = SCB_LIST_NULL;
+	{
+		u_int8_t next, prev;
+                /* Start at head of list. */
+		next = ahc_inb(ahc, WAITING_SCBH);
+		prev = SCB_LIST_NULL;
 
-	while (next != SCB_LIST_NULL) {
-		uint8_t scb_index;
+		while (next != SCB_LIST_NULL) {
+			u_int8_t scb_index;
 
-		ahc_outb(ahc, SCBPTR, next);
-		scb_index = ahc_inb(ahc, SCB_TAG);
-		if (scb_index >= ahc->scb_data->numscbs) {
-			printf("Waiting List inconsistency. "
-			       "SCB index == %d, yet numscbs == %d.",
-			       scb_index, ahc->scb_data->numscbs);
-			ahc_dump_card_state(ahc);
-			panic("for safety");
-		}
-		scb = ahc_lookup_scb(ahc, scb_index);
-		if (scb == NULL) {
-			printf("scb_index = %d, next = %d\n",
-				scb_index, next);
-			panic("Waiting List traversal\n");
-		}
-		if (ahc_match_scb(ahc, scb, target, channel,
-				  lun, SCB_LIST_NULL, role)) {
-			/*
-			 * We found an scb that needs to be acted on.
-			 */
-			found++;
-			switch (action) {
-			case SEARCH_COMPLETE:
-			{
-				cam_status ostat;
-				cam_status cstat;
-
-				ostat = ahc_get_transaction_status(scb);
-				if (ostat == CAM_REQ_INPROG)
-					ahc_set_transaction_status(scb,
-								   status);
-				cstat = ahc_get_transaction_status(scb);
-				if (cstat != CAM_REQ_CMP)
-					ahc_freeze_scb(scb);
-				if ((scb->flags & SCB_ACTIVE) == 0)
-					printf("Inactive SCB in Waiting List\n");
-				ahc_done(ahc, scb);
-				/* FALLTHROUGH */
+			ahc_outb(ahc, SCBPTR, next);
+			scb_index = ahc_inb(ahc, SCB_TAG);
+			if (scb_index >= ahc->scb_data->numscbs) {
+				panic("Waiting List inconsistency. "
+				      "SCB index == %d, yet numscbs == %d.",
+				      scb_index, ahc->scb_data->numscbs);
 			}
-			case SEARCH_REMOVE:
-				next = ahc_rem_wscb(ahc, next, prev);
-				break;
-			case SEARCH_COUNT:
+			scbp = &ahc->scb_data->scbarray[scb_index];
+			if (ahc_match_scb(scbp, target, channel,
+					  lun, SCB_LIST_NULL, role)) {
+
+				next = ahc_abort_wscb(ahc, next, prev);
+			} else {
+				
 				prev = next;
 				next = ahc_inb(ahc, SCB_NEXT);
-				break;
 			}
-		} else {
-			
-			prev = next;
-			next = ahc_inb(ahc, SCB_NEXT);
 		}
 	}
-	ahc_outb(ahc, SCBPTR, curscbptr);
-
 	/*
-	 * And lastly, the untagged holding queues.
+	 * Go through the disconnected list and remove any entries we
+	 * have queued for completion, 0'ing their control byte too.
+	 * We save the active SCB and restore it ourselves, so there
+	 * is no reason for this search to restore it too.
 	 */
-	i = 0;
-	if ((ahc->flags & AHC_SCB_BTT) == 0) {
+	ahc_search_disc_list(ahc, target, channel, lun, tag,
+			     /*stop_on_first*/FALSE, /*remove*/TRUE,
+			     /*save_state*/FALSE);
 
-		maxtarget = 16;
-		if (target != CAM_TARGET_WILDCARD) {
+	/*
+	 * Go through the hardware SCB array looking for commands that
+	 * were active but not on any list.
+	 */
+	for(i = 0; i < ahc->scb_data->maxhscbs; i++) {
+		u_int scbid;
 
-			i = target;
-			if (channel == 'B')
-				i += 8;
-			maxtarget = i + 1;
-		}
-	} else {
-		maxtarget = 0;
+		ahc_outb(ahc, SCBPTR, i);
+		scbid = ahc_inb(ahc, SCB_TAG);
+		scbp = &ahc->scb_data->scbarray[scbid];
+		if (scbid < ahc->scb_data->numscbs && 
+			 ahc_match_scb(scbp, target, channel, lun, tag, role))
+				ahc_add_curscb_to_free_list(ahc);
 	}
 
-	for (; i < maxtarget; i++) {
-		struct scb_tailq *untagged_q;
-		struct scb *next_scb;
-
-		untagged_q = &(ahc->untagged_queues[i]);
-		next_scb = TAILQ_FIRST(untagged_q);
-		while (next_scb != NULL) {
-
-			scb = next_scb;
-			next_scb = TAILQ_NEXT(scb, links.tqe);
-
-			/*
-			 * The head of the list may be the currently
-			 * active untagged command for a device.
-			 * We're only searching for commands that
-			 * have not been started.  A transaction
-			 * marked active but still in the qinfifo
-			 * is removed by the qinfifo scanning code
-			 * above.
-			 */
-			if ((scb->flags & SCB_ACTIVE) != 0)
-				continue;
+	/*
+	 * Go through the pending CCB list and look for
+	 * commands for this target that are still active.
+	 * These are other tagged commands that were
+	 * disconnected when the reset occurred.
+	 */
+	{
+		struct scb *scb;
 
-			if (ahc_match_scb(ahc, scb, target, channel,
-					  lun, SCB_LIST_NULL, role)) {
-				/*
-				 * We found an scb that needs to be acted on.
-				 */
+		scb = ahc->pending_scbs.lh_first;
+		while (scb != NULL) {
+			scbp = scb;
+			scb = scb->pend_links.le_next;
+			if (ahc_match_scb(scbp, target, channel,
+					  lun, tag, role)) {
+				if (!(scbp->xs->flags & ITSDONE))
+					ahcsetccbstatus(scbp->xs, status);
+				ahc_freeze_ccb(scbp);
+				ahc_done(ahc, scbp);
 				found++;
-				switch (action) {
-				case SEARCH_COMPLETE:
-				{
-					cam_status ostat;
-					cam_status cstat;
-
-					ostat = ahc_get_transaction_status(scb);
-					if (ostat == CAM_REQ_INPROG)
-						ahc_set_transaction_status(scb,
-								   status);
-					cstat = ahc_get_transaction_status(scb);
-					if (cstat != CAM_REQ_CMP)
-						ahc_freeze_scb(scb);
-					if ((scb->flags & SCB_ACTIVE) == 0)
-						printf("Inactive SCB in untaggedQ\n");
-					ahc_done(ahc, scb);
-					break;
-				}
-				case SEARCH_REMOVE:
-					TAILQ_REMOVE(untagged_q, scb,
-						     links.tqe);
-					break;
-				case SEARCH_COUNT:
-					break;
-				}
 			}
 		}
 	}
-
-	if (action == SEARCH_COMPLETE)
-		ahc_release_untagged_queues(ahc);
-	return (found);
+	ahc_outb(ahc, SCBPTR, active_scb);
+	return found;
 }
 
-int
-ahc_search_disc_list(struct ahc_softc *ahc, int target, char channel,
-		     int lun, u_int tag, int stop_on_first, int remove,
-		     int save_state)
+STATIC int
+ahc_search_disc_list(ahc, target, channel, lun, tag, stop_on_first, 
+		     remove, save_state)
+	struct ahc_softc *ahc;
+	int target;
+	char channel;
+	int lun;
+	u_int tag;
+	int stop_on_first;
+	int remove;
+	int save_state;
 {
 	struct	scb *scbp;
 	u_int	next;
@@ -5356,8 +5300,8 @@ ahc_search_disc_list(struct ahc_softc *ahc, int target, char channel,
 	prev = SCB_LIST_NULL;
 
 	if (save_state) {
-		/* restore this when we're done */
-		active_scb = ahc_inb(ahc, SCBPTR);
+	/* restore this when we're done */
+	active_scb = ahc_inb(ahc, SCBPTR);
 	} else
 		/* Silence compiler */
 		active_scb = SCB_LIST_NULL;
@@ -5368,20 +5312,12 @@ ahc_search_disc_list(struct ahc_softc *ahc, int target, char channel,
 		ahc_outb(ahc, SCBPTR, next);
 		scb_index = ahc_inb(ahc, SCB_TAG);
 		if (scb_index >= ahc->scb_data->numscbs) {
-			printf("Disconnected List inconsistency. "
-			       "SCB index == %d, yet numscbs == %d.",
-			       scb_index, ahc->scb_data->numscbs);
-			ahc_dump_card_state(ahc);
-			panic("for safety");
-		}
-
-		if (next == prev) {
-			panic("Disconnected List Loop. "
-			      "cur SCBPTR == %x, prev SCBPTR == %x.",
-			      next, prev);
+			panic("Disconnected List inconsistency. "
+			      "SCB index == %d, yet numscbs == %d.",
+			      scb_index, ahc->scb_data->numscbs);
 		}
-		scbp = ahc_lookup_scb(ahc, scb_index);
-		if (ahc_match_scb(ahc, scbp, target, channel, lun,
+		scbp = &ahc->scb_data->scbarray[scb_index];
+		if (ahc_match_scb(scbp, target, channel, lun,
 				  tag, ROLE_INITIATOR)) {
 			count++;
 			if (remove) {
@@ -5399,16 +5335,15 @@ ahc_search_disc_list(struct ahc_softc *ahc, int target, char channel,
 		}
 	}
 	if (save_state)
-		ahc_outb(ahc, SCBPTR, active_scb);
+	ahc_outb(ahc, SCBPTR, active_scb);
 	return (count);
 }
 
-/*
- * Remove an SCB from the on chip list of disconnected transactions.
- * This is empty/unused if we are not performing SCB paging.
- */
-static u_int
-ahc_rem_scb_from_disc_list(struct ahc_softc *ahc, u_int prev, u_int scbptr)
+STATIC u_int
+ahc_rem_scb_from_disc_list(ahc, prev, scbptr)
+	struct ahc_softc *ahc;
+	u_int prev;
+	u_int scbptr;
 {
 	u_int next;
 
@@ -5428,32 +5363,26 @@ ahc_rem_scb_from_disc_list(struct ahc_softc *ahc, u_int prev, u_int scbptr)
 	return (next);
 }
 
-/*
- * Add the SCB as selected by SCBPTR onto the on chip list of
- * free hardware SCBs.  This list is empty/unused if we are not
- * performing SCB paging.
- */
-static void
-ahc_add_curscb_to_free_list(struct ahc_softc *ahc)
+STATIC void
+ahc_add_curscb_to_free_list(ahc)
+	struct ahc_softc *ahc;
 {
-	/*
-	 * Invalidate the tag so that our abort
-	 * routines don't think it's active.
-	 */
+	/* Invalidate the tag so that ahc_find_scb doesn't think it's active */
 	ahc_outb(ahc, SCB_TAG, SCB_LIST_NULL);
 
-	if ((ahc->flags & AHC_PAGESCBS) != 0) {
-		ahc_outb(ahc, SCB_NEXT, ahc_inb(ahc, FREE_SCBH));
-		ahc_outb(ahc, FREE_SCBH, ahc_inb(ahc, SCBPTR));
-	}
+	ahc_outb(ahc, SCB_NEXT, ahc_inb(ahc, FREE_SCBH));
+	ahc_outb(ahc, FREE_SCBH, ahc_inb(ahc, SCBPTR));
 }
 
 /*
  * Manipulate the waiting for selection list and return the
  * scb that follows the one that we remove.
  */
-static u_int
-ahc_rem_wscb(struct ahc_softc *ahc, u_int scbpos, u_int prev)
+STATIC u_int
+ahc_abort_wscb(ahc, scbpos, prev)
+	struct ahc_softc *ahc;
+	u_int scbpos;
+        u_int prev;
 {       
 	u_int curscb, next;
 
@@ -5496,137 +5425,28 @@ ahc_rem_wscb(struct ahc_softc *ahc, u_int scbpos, u_int prev)
 	return next;
 }
 
-/******************************** Error Handling ******************************/
-/*
- * Abort all SCBs that match the given description (target/channel/lun/tag),
- * setting their status to the passed in status if the status has not already
- * been modified from CAM_REQ_INPROG.  This routine assumes that the sequencer
- * is paused before it is called.
- */
-int
-ahc_abort_scbs(struct ahc_softc *ahc, int target, char channel,
-	       int lun, u_int tag, role_t role, uint32_t status)
+STATIC void
+ahc_clear_intstat(ahc)
+	struct ahc_softc *ahc;
 {
-	struct	scb *scbp;
-	struct	scb *scbp_next;
-	u_int	active_scb;
-	int	i, j;
-	int	maxtarget;
-	int	minlun;
-	int	maxlun;
-
-	int	found;
-
-	/*
-	 * Don't attempt to run any queued untagged transactions
-	 * until we are done with the abort process.
-	 */
-	ahc_freeze_untagged_queues(ahc);
-
-	/* restore this when we're done */
-	active_scb = ahc_inb(ahc, SCBPTR);
-
-	found = ahc_search_qinfifo(ahc, target, channel, lun, SCB_LIST_NULL,
-				   role, CAM_REQUEUE_REQ, SEARCH_COMPLETE);
-
-	/*
-	 * Clean out the busy target table for any untagged commands.
-	 */
-	i = 0;
-	maxtarget = 16;
-	if (target != CAM_TARGET_WILDCARD) {
-		i = target;
-		if (channel == 'B')
-			i += 8;
-		maxtarget = i + 1;
-	}
-
-	if (lun == CAM_LUN_WILDCARD) {
-
-		/*
-		 * Unless we are using an SCB based
-		 * busy targets table, there is only
-		 * one table entry for all luns of
-		 * a target.
-		 */
-		minlun = 0;
-		maxlun = 1;
-		if ((ahc->flags & AHC_SCB_BTT) != 0)
-			maxlun = AHC_NUM_LUNS;
-	} else {
-		minlun = lun;
-		maxlun = lun + 1;
-	}
-
-	for (;i < maxtarget; i++) {
-		for (j = minlun;j < maxlun; j++)
-			ahc_unbusy_tcl(ahc, BUILD_TCL(i << 4, j));
-	}
-
-	/*
-	 * Go through the disconnected list and remove any entries we
-	 * have queued for completion, 0'ing their control byte too.
-	 * We save the active SCB and restore it ourselves, so there
-	 * is no reason for this search to restore it too.
-	 */
-	ahc_search_disc_list(ahc, target, channel, lun, tag,
-			     /*stop_on_first*/FALSE, /*remove*/TRUE,
-			     /*save_state*/FALSE);
-
-	/*
-	 * Go through the hardware SCB array looking for commands that
-	 * were active but not on any list.
-	 */
-	for (i = 0; i < ahc->scb_data->maxhscbs; i++) {
-		u_int scbid;
-
-		ahc_outb(ahc, SCBPTR, i);
-		scbid = ahc_inb(ahc, SCB_TAG);
-		scbp = ahc_lookup_scb(ahc, scbid);
-		if (scbp != NULL
-		 && ahc_match_scb(ahc, scbp, target, channel, lun, tag, role))
-			ahc_add_curscb_to_free_list(ahc);
-	}
-
-	/*
-	 * Go through the pending CCB list and look for
-	 * commands for this target that are still active.
-	 * These are other tagged commands that were
-	 * disconnected when the reset occurred.
-	 */
-	scbp_next = LIST_FIRST(&ahc->pending_scbs);
-	while (scbp_next != NULL) {
-		scbp = scbp_next;
-		scbp_next = LIST_NEXT(scbp, pending_links);
-		if (ahc_match_scb(ahc, scbp, target, channel, lun, tag, role)) {
-			cam_status ostat;
-
-			ostat = ahc_get_transaction_status(scbp);
-			if (ostat == CAM_REQ_INPROG)
-				ahc_set_transaction_status(scbp, status);
-			if (ahc_get_transaction_status(scbp) != CAM_REQ_CMP)
-				ahc_freeze_scb(scbp);
-			if ((scbp->flags & SCB_ACTIVE) == 0)
-				printf("Inactive SCB on pending list\n");
-			ahc_done(ahc, scbp);
-			found++;
-		}
-	}
-	ahc_outb(ahc, SCBPTR, active_scb);
-	ahc_platform_abort_scbs(ahc, target, channel, lun, tag, role, status);
-	ahc_release_untagged_queues(ahc);
-	return found;
+	/* Clear any interrupt conditions this may have caused */
+	ahc_outb(ahc, CLRSINT0, CLRSELDO|CLRSELDI|CLRSELINGO);
+	ahc_outb(ahc, CLRSINT1, CLRSELTIMEO|CLRATNO|CLRSCSIRSTI
+				|CLRBUSFREE|CLRSCSIPERR|CLRPHASECHG|
+				CLRREQINIT);
+	ahc_outb(ahc, CLRINT, CLRSCSIINT);
 }
 
-static void
-ahc_reset_current_bus(struct ahc_softc *ahc)
+STATIC void
+ahc_reset_current_bus(ahc)
+	struct ahc_softc *ahc;
 {
-	uint8_t scsiseq;
+	u_int8_t scsiseq;
 
 	ahc_outb(ahc, SIMODE1, ahc_inb(ahc, SIMODE1) & ~ENSCSIRST);
 	scsiseq = ahc_inb(ahc, SCSISEQ);
 	ahc_outb(ahc, SCSISEQ, scsiseq | SCSIRSTO);
-	ahc_delay(AHC_BUSRESET_DELAY);
+	DELAY(AHC_BUSRESET_DELAY);
 	/* Turn off the bus reset */
 	ahc_outb(ahc, SCSISEQ, scsiseq & ~SCSIRSTO);
 
@@ -5636,29 +5456,22 @@ ahc_reset_current_bus(struct ahc_softc *ahc)
 	ahc_outb(ahc, SIMODE1, ahc_inb(ahc, SIMODE1) | ENSCSIRST);
 }
 
-int
-ahc_reset_channel(struct ahc_softc *ahc, char channel, int initiate_reset)
+STATIC int
+ahc_reset_channel(ahc, channel, initiate_reset)
+	struct ahc_softc *ahc;
+	char channel;
+	int initiate_reset;
 {
-	struct	ahc_devinfo devinfo;
 	u_int	initiator, target, max_scsiid;
 	u_int	sblkctl;
-	u_int	scsiseq;
-	u_int	simode1;
+	u_int	our_id;
 	int	found;
 	int	restart_needed;
 	char	cur_channel;
 
 	ahc->pending_device = NULL;
 
-	ahc_compile_devinfo(&devinfo,
-			    CAM_TARGET_WILDCARD,
-			    CAM_TARGET_WILDCARD,
-			    CAM_LUN_WILDCARD,
-			    channel, ROLE_UNKNOWN);
-	ahc_pause(ahc);
-
-	/* Make sure the sequencer is in a safe location. */
-	ahc_clear_critical_section(ahc);
+	pause_sequencer(ahc);
 
 	/*
 	 * Run our command complete fifos to ensure that we perform
@@ -5666,11 +5479,6 @@ ahc_reset_channel(struct ahc_softc *ahc, char channel, int initiate_reset)
 	 * before the reset occurred.
 	 */
 	ahc_run_qoutfifo(ahc);
-#if AHC_TARGET_MODE
-	if ((ahc->flags & AHC_TARGETROLE) != 0) {
-		ahc_run_tqinfifo(ahc, /*paused*/TRUE);
-	}
-#endif
 
 	/*
 	 * Reset the bus if we are initiating this reset
@@ -5680,48 +5488,40 @@ ahc_reset_channel(struct ahc_softc *ahc, char channel, int initiate_reset)
 	if ((ahc->features & AHC_TWIN) != 0
 	 && ((sblkctl & SELBUSB) != 0))
 	    cur_channel = 'B';
-	scsiseq = ahc_inb(ahc, SCSISEQ_TEMPLATE);
 	if (cur_channel != channel) {
 		/* Case 1: Command for another bus is active
 		 * Stealthily reset the other bus without
 		 * upsetting the current bus.
 		 */
 		ahc_outb(ahc, SBLKCTL, sblkctl ^ SELBUSB);
-		simode1 = ahc_inb(ahc, SIMODE1) & ~(ENBUSFREE|ENSCSIRST);
-		ahc_outb(ahc, SIMODE1, simode1);
+		ahc_outb(ahc, SIMODE1, ahc_inb(ahc, SIMODE1) & ~ENBUSFREE);
+		ahc_outb(ahc, SCSISEQ,
+			 ahc_inb(ahc, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP));
 		if (initiate_reset)
 			ahc_reset_current_bus(ahc);
 		ahc_clear_intstat(ahc);
-#if AHC_TARGET_MODE
-		/*
-		 * Bus resets clear ENSELI, so we cannot
-		 * defer re-enabling bus reset interrupts
-		 * if we are in target mode.
-		 */
-		if ((ahc->flags & AHC_TARGETROLE) != 0)
-			ahc_outb(ahc, SIMODE1, simode1 | ENSCSIRST);
-#endif
-		ahc_outb(ahc, SCSISEQ, scsiseq & (ENSELI|ENRSELI|ENAUTOATNP));
 		ahc_outb(ahc, SBLKCTL, sblkctl);
 		restart_needed = FALSE;
 	} else {
 		/* Case 2: A command from this bus is active or we're idle */
 		ahc_clear_msg_state(ahc);
-		simode1 = ahc_inb(ahc, SIMODE1) & ~(ENBUSFREE|ENSCSIRST);
-		ahc_outb(ahc, SIMODE1, simode1);
+		ahc_outb(ahc, SIMODE1, ahc_inb(ahc, SIMODE1) & ~ENBUSFREE);
+		ahc_outb(ahc, SCSISEQ,
+			 ahc_inb(ahc, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP));
 		if (initiate_reset)
 			ahc_reset_current_bus(ahc);
 		ahc_clear_intstat(ahc);
-#if AHC_TARGET_MODE
+
 		/*
-		 * Bus resets clear ENSELI, so we cannot
-		 * defer re-enabling bus reset interrupts
-		 * if we are in target mode.
+		 * Since we are going to restart the sequencer, avoid
+		 * a race in the sequencer that could cause corruption
+		 * of our Q pointers by starting over from index 0.
 		 */
-		if ((ahc->flags & AHC_TARGETROLE) != 0)
-			ahc_outb(ahc, SIMODE1, simode1 | ENSCSIRST);
-#endif
-		ahc_outb(ahc, SCSISEQ, scsiseq & (ENSELI|ENRSELI|ENAUTOATNP));
+		ahc->qoutfifonext = 0;
+		if ((ahc->features & AHC_QUEUE_REGS) != 0)
+			ahc_outb(ahc, SDSCB_QOFF, 0);
+		else
+			ahc_outb(ahc, QOUTPOS, 0);
 		restart_needed = TRUE;
 	}
 
@@ -5729,41 +5529,17 @@ ahc_reset_channel(struct ahc_softc *ahc, char channel, int initiate_reset)
 	 * Clean up all the state information for the
 	 * pending transactions on this bus.
 	 */
-	found = ahc_abort_scbs(ahc, CAM_TARGET_WILDCARD, channel,
-			       CAM_LUN_WILDCARD, SCB_LIST_NULL,
-			       ROLE_UNKNOWN, CAM_SCSI_BUS_RESET);
-
-	max_scsiid = (ahc->features & AHC_WIDE) ? 15 : 7;
-
-#ifdef AHC_TARGET_MODE
-	/*
-	 * Send an immediate notify ccb to all target more peripheral
-	 * drivers affected by this action.
-	 */
-	for (target = 0; target <= max_scsiid; target++) {
-		struct ahc_tmode_tstate* tstate;
-		u_int lun;
-
-		tstate = ahc->enabled_targets[target];
-		if (tstate == NULL)
-			continue;
-		for (lun = 0; lun < AHC_NUM_LUNS; lun++) {
-			struct ahc_tmode_lstate* lstate;
-
-			lstate = tstate->enabled_luns[lun];
-			if (lstate == NULL)
-				continue;
-
-			ahc_queue_lstate_event(ahc, lstate, CAM_TARGET_WILDCARD,
-					       EVENT_TYPE_BUS_RESET, /*arg*/0);
-			ahc_send_lstate_events(ahc, lstate);
-		}
+	found = ahc_abort_scbs(ahc, ALL_TARGETS, channel,
+			       ALL_LUNS, SCB_LIST_NULL,
+			       ROLE_UNKNOWN, XS_RESET);
+	if (channel == 'B') {
+		our_id = ahc->our_id_b;
+	} else {
+		our_id = ahc->our_id;
 	}
-#endif
-	/* Notify the XPT that a bus reset occurred */
-	ahc_send_async(ahc, devinfo.channel, CAM_TARGET_WILDCARD,
-		       CAM_LUN_WILDCARD, AC_BUS_RESET, NULL);
 
+	max_scsiid = (ahc->features & AHC_WIDE) ? 15 : 7;
+	
 	/*
 	 * Revert to async/narrow transfers until we renegotiate.
 	 */
@@ -5775,1194 +5551,362 @@ ahc_reset_channel(struct ahc_softc *ahc, char channel, int initiate_reset)
 			struct ahc_devinfo devinfo;
 
 			ahc_compile_devinfo(&devinfo, target, initiator,
-					    CAM_LUN_WILDCARD,
+					    ALL_LUNS,
 					    channel, ROLE_UNKNOWN);
-			ahc_set_width(ahc, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-				      AHC_TRANS_CUR, /*paused*/TRUE);
-			ahc_set_syncrate(ahc, &devinfo, /*syncrate*/NULL,
-					 /*period*/0, /*offset*/0,
-					 /*ppr_options*/0, AHC_TRANS_CUR,
-					 /*paused*/TRUE);
+			ahc_set_width(ahc, &devinfo,
+				      MSG_EXT_WDTR_BUS_8_BIT,
+				      AHC_TRANS_CUR,
+				      /*paused*/TRUE,
+				      /*done*/FALSE);
+			ahc_set_syncrate(ahc, &devinfo,
+					 /*syncrate*/NULL, /*period*/0,
+					 /*offset*/0, AHC_TRANS_CUR,
+					 /*paused*/TRUE,
+					 /*done*/FALSE);
 		}
 	}
 
 	if (restart_needed)
-		ahc_restart(ahc);
+		restart_sequencer(ahc);
 	else
-		ahc_unpause(ahc);
+		unpause_sequencer(ahc);
 	return found;
 }
 
-
-/***************************** Residual Processing ****************************/
-/*
- * Calculate the residual for a just completed SCB.
- */
-void
-ahc_calc_residual(struct scb *scb)
+STATIC int
+ahc_match_scb(scb, target, channel, lun, role, tag)
+	struct scb *scb;
+	int target;
+	char channel;
+	int lun;
+	role_t role;
+	u_int tag;
 {
-	struct hardware_scb *hscb;
-	struct status_pkt *spkt;
-	uint32_t sgptr;
-	uint32_t resid_sgptr;
-	uint32_t resid;
+	int targ = SCB_TARGET(scb);
+	char chan = SCB_CHANNEL(scb);
+	int slun = SCB_LUN(scb);
+	int match;
 
-	/*
-	 * 5 cases.
-	 * 1) No residual.
-	 *    SG_RESID_VALID clear in sgptr.
-	 * 2) Transferless command
-	 * 3) Never performed any transfers.
-	 *    sgptr has SG_FULL_RESID set.
-	 * 4) No residual but target did not
-	 *    save data pointers after the
-	 *    last transfer, so sgptr was
-	 *    never updated.
-	 * 5) We have a partial residual.
-	 *    Use residual_sgptr to determine
-	 *    where we are.
-	 */
+	match = ((chan == channel) || (channel == ALL_CHANNELS));
+	if (match != 0)
+		match = ((targ == target) || (target == ALL_TARGETS));
+	if (match != 0)
+		match = ((lun == slun) || (lun == ALL_LUNS));
+	return match;
+}
 
-	hscb = scb->hscb;
-	sgptr = ahc_le32toh(hscb->sgptr);
-	if ((sgptr & SG_RESID_VALID) == 0)
-		/* Case 1 */
-		return;
-	sgptr &= ~SG_RESID_VALID;
+STATIC void
+ahc_construct_sdtr(ahc, period, offset)
+	struct ahc_softc *ahc;
+	u_int period;
+	u_int offset;
+{
+	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXTENDED;
+	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_SDTR_LEN;
+	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_SDTR;
+	ahc->msgout_buf[ahc->msgout_index++] = period;
+	ahc->msgout_buf[ahc->msgout_index++] = offset;
+	ahc->msgout_len += 5;
+}
 
-	if ((sgptr & SG_LIST_NULL) != 0)
-		/* Case 2 */
-		return;
+STATIC void
+ahc_construct_wdtr(ahc, bus_width)
+	struct ahc_softc *ahc;
+	u_int bus_width;
+{
+	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXTENDED;
+	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_WDTR_LEN;
+	ahc->msgout_buf[ahc->msgout_index++] = MSG_EXT_WDTR;
+	ahc->msgout_buf[ahc->msgout_index++] = bus_width;
+	ahc->msgout_len += 4;
+}
 
-	spkt = &hscb->shared_data.status;
-	resid_sgptr = ahc_le32toh(spkt->residual_sg_ptr);
-	if ((sgptr & SG_FULL_RESID) != 0) {
-		/* Case 3 */
-		resid = ahc_get_transfer_length(scb);
-	} else if ((resid_sgptr & SG_LIST_NULL) != 0) {
-		/* Case 4 */
-		return;
-	} else if ((resid_sgptr & ~SG_PTR_MASK) != 0) {
-		panic("Bogus resid sgptr value 0x%x\n", resid_sgptr);
-	} else {
-		struct ahc_dma_seg *sg;
+STATIC void
+ahc_calc_residual(scb)
+	struct scb *scb;
+{
+	struct	hardware_scb *hscb;
+
+	hscb = scb->hscb;
 
+	/*
+	 * If the disconnected flag is still set, this is bogus
+	 * residual information left over from a sequencer
+	 * pagin/pageout, so ignore this case.
+	 */
+	if ((scb->hscb->control & DISCONNECTED) == 0) {
+		u_int32_t resid;
+		int	  resid_sgs;
+		int	  sg;
+		
 		/*
 		 * Remainder of the SG where the transfer
-		 * stopped.  
+		 * stopped.
 		 */
-		resid = ahc_le32toh(spkt->residual_datacnt) & AHC_SG_LEN_MASK;
-		sg = ahc_sg_bus_to_virt(scb, resid_sgptr & SG_PTR_MASK);
-
-		/* The residual sg_ptr always points to the next sg */
-		sg--;
+		resid = (hscb->residual_data_count[2] << 16)
+		      |	(hscb->residual_data_count[1] <<8)
+		      |	(hscb->residual_data_count[0]);
 
 		/*
 		 * Add up the contents of all residual
 		 * SG segments that are after the SG where
 		 * the transfer stopped.
 		 */
-		while ((ahc_le32toh(sg->len) & AHC_DMA_LAST_SEG) == 0) {
+		resid_sgs = scb->hscb->residual_SG_count - 1/*current*/;
+		sg = scb->sg_count - resid_sgs;
+		while (resid_sgs > 0) {
+
+			resid += le32toh(scb->sg_list[sg].len);
 			sg++;
-			resid += ahc_le32toh(sg->len) & AHC_SG_LEN_MASK;
+			resid_sgs--;
 		}
+		scb->xs->resid = resid;
 	}
-	if ((scb->flags & SCB_SENSE) == 0)
-		ahc_set_residual(scb, resid);
-	else
-		ahc_set_sense_residual(scb, resid);
+
+	/*
+	 * Clean out the residual information in this SCB for its
+	 * next consumer.
+	 */
+	hscb->residual_SG_count = 0;
 
 #ifdef AHC_DEBUG
 	if (ahc_debug & AHC_SHOWMISC) {
-		ahc_print_path(scb->ahc_softc, scb);
-		printf("Handled Residual of %d bytes\n", resid);
+		sc_print_addr(scb->xs->sc_link);
+		printf("Handled Residual of %ld bytes\n" ,scb->xs->resid);
 	}
 #endif
 }
 
-/******************************* Target Mode **********************************/
-#ifdef AHC_TARGET_MODE
-/*
- * Add a target mode event to this lun's queue
- */
-static void
-ahc_queue_lstate_event(struct ahc_softc *ahc, struct ahc_tmode_lstate *lstate,
-		       u_int initiator_id, u_int event_type, u_int event_arg)
+STATIC void
+ahc_update_pending_syncrates(ahc)
+	struct ahc_softc *ahc;
 {
-	struct ahc_tmode_event *event;
-	int pending;
-
-	xpt_freeze_devq(lstate->path, /*count*/1);
-	if (lstate->event_w_idx >= lstate->event_r_idx)
-		pending = lstate->event_w_idx - lstate->event_r_idx;
-	else
-		pending = AHC_TMODE_EVENT_BUFFER_SIZE + 1
-			- (lstate->event_r_idx - lstate->event_w_idx);
-
-	if (event_type == EVENT_TYPE_BUS_RESET
-	 || event_type == MSG_BUS_DEV_RESET) {
-		/*
-		 * Any earlier events are irrelevant, so reset our buffer.
-		 * This has the effect of allowing us to deal with reset
-		 * floods (an external device holding down the reset line)
-		 * without losing the event that is really interesting.
-		 */
-		lstate->event_r_idx = 0;
-		lstate->event_w_idx = 0;
-		xpt_release_devq(lstate->path, pending, /*runqueue*/FALSE);
-	}
-
-	if (pending == AHC_TMODE_EVENT_BUFFER_SIZE) {
-		xpt_print_path(lstate->path);
-		printf("immediate event %x:%x lost\n",
-		       lstate->event_buffer[lstate->event_r_idx].event_type,
-		       lstate->event_buffer[lstate->event_r_idx].event_arg);
-		lstate->event_r_idx++;
-		if (lstate->event_r_idx == AHC_TMODE_EVENT_BUFFER_SIZE)
-			lstate->event_r_idx = 0;
-		xpt_release_devq(lstate->path, /*count*/1, /*runqueue*/FALSE);
-	}
-
-	event = &lstate->event_buffer[lstate->event_w_idx];
-	event->initiator_id = initiator_id;
-	event->event_type = event_type;
-	event->event_arg = event_arg;
-	lstate->event_w_idx++;
-	if (lstate->event_w_idx == AHC_TMODE_EVENT_BUFFER_SIZE)
-		lstate->event_w_idx = 0;
-}
-
-/*
- * Send any target mode events queued up waiting
- * for immediate notify resources.
- */
-void
-ahc_send_lstate_events(struct ahc_softc *ahc, struct ahc_tmode_lstate *lstate)
-{
-	struct ccb_hdr *ccbh;
-	struct ccb_immed_notify *inot;
-
-	while (lstate->event_r_idx != lstate->event_w_idx
-	    && (ccbh = SLIST_FIRST(&lstate->immed_notifies)) != NULL) {
-		struct ahc_tmode_event *event;
-
-		event = &lstate->event_buffer[lstate->event_r_idx];
-		SLIST_REMOVE_HEAD(&lstate->immed_notifies, sim_links.sle);
-		inot = (struct ccb_immed_notify *)ccbh;
-		switch (event->event_type) {
-		case EVENT_TYPE_BUS_RESET:
-			ccbh->status = CAM_SCSI_BUS_RESET|CAM_DEV_QFRZN;
-			break;
-		default:
-			ccbh->status = CAM_MESSAGE_RECV|CAM_DEV_QFRZN;
-			inot->message_args[0] = event->event_type;
-			inot->message_args[1] = event->event_arg;
-			break;
-		}
-		inot->initiator_id = event->initiator_id;
-		inot->sense_len = 0;
-		xpt_done((union ccb *)inot);
-		lstate->event_r_idx++;
-		if (lstate->event_r_idx == AHC_TMODE_EVENT_BUFFER_SIZE)
-			lstate->event_r_idx = 0;
-	}
-}
-#endif
-
-/******************** Sequencer Program Patching/Download *********************/
-
-#ifdef AHC_DUMP_SEQ
-void
-ahc_dumpseq(struct ahc_softc* ahc)
-{
-	int i;
-	int max_prog;
-
-	if ((ahc->chip & AHC_BUS_MASK) < AHC_PCI)
-		max_prog = 448;
-	else if ((ahc->features & AHC_ULTRA2) != 0)
-		max_prog = 768;
-	else
-		max_prog = 512;
-
-	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS|FASTMODE|LOADRAM);
-	ahc_outb(ahc, SEQADDR0, 0);
-	ahc_outb(ahc, SEQADDR1, 0);
-	for (i = 0; i < max_prog; i++) {
-		uint8_t ins_bytes[4];
-
-		ahc_insb(ahc, SEQRAM, ins_bytes, 4);
-		printf("0x%08x\n", ins_bytes[0] << 24
-				 | ins_bytes[1] << 16
-				 | ins_bytes[2] << 8
-				 | ins_bytes[3]);
-	}
-}
-#endif
-
-static void
-ahc_loadseq(struct ahc_softc *ahc)
-{
-	struct	cs cs_table[num_critical_sections];
-	u_int	begin_set[num_critical_sections];
-	u_int	end_set[num_critical_sections];
-	struct	patch *cur_patch;
-	u_int	cs_count;
-	u_int	cur_cs;
-	u_int	i;
-	int	downloaded;
-	u_int	skip_addr;
-	u_int	sg_prefetch_cnt;
-	uint8_t	download_consts[7];
+	struct	scb *scb;
+	int	pending_scb_count;
+	int	i;
+	u_int	saved_scbptr;
 
 	/*
-	 * Start out with 0 critical sections
-	 * that apply to this firmware load.
+	 * Traverse the pending SCB list and ensure that all of the
+	 * SCBs there have the proper settings.
 	 */
-	cs_count = 0;
-	cur_cs = 0;
-	memset(begin_set, 0, sizeof(begin_set));
-	memset(end_set, 0, sizeof(end_set));
+	scb = LIST_FIRST(&ahc->pending_scbs);
+	pending_scb_count = 0;
+	while (scb != NULL) {
+		struct ahc_devinfo devinfo;
+		struct scsi_xfer *xs;
+		struct scb *pending_scb;
+		struct hardware_scb *pending_hscb;
+		struct ahc_initiator_tinfo *tinfo;
+		struct tmode_tstate *tstate;
+		u_int  our_id, remote_id;
+		
+		xs = scb->xs;
+		pending_scb = scb;
+		pending_hscb = pending_scb->hscb;
+		our_id = SCB_IS_SCSIBUS_B(pending_scb)
+		       ? ahc->our_id_b : ahc->our_id;
+		remote_id = xs->sc_link->target;
+		ahc_compile_devinfo(&devinfo, our_id, remote_id,
+				    SCB_LUN(pending_scb),
+				    SCB_CHANNEL(pending_scb),
+				    ROLE_UNKNOWN);
+		tinfo = ahc_fetch_transinfo(ahc, devinfo.channel,
+					    our_id, remote_id, &tstate);
+		pending_hscb->control &= ~ULTRAENB;
+		if ((tstate->ultraenb & devinfo.target_mask) != 0)
+			pending_hscb->control |= ULTRAENB;
+		pending_hscb->scsirate = tinfo->scsirate;
+		pending_hscb->scsioffset = tinfo->current.offset;
+		pending_scb_count++;
+		scb = LIST_NEXT(scb, pend_links);
+	}
 
-	/* Setup downloadable constant table */
-	download_consts[QOUTFIFO_OFFSET] = 0;
-	if (ahc->targetcmds != NULL)
-		download_consts[QOUTFIFO_OFFSET] += 32;
-	download_consts[QINFIFO_OFFSET] = download_consts[QOUTFIFO_OFFSET] + 1;
-	download_consts[CACHESIZE_MASK] = ahc->pci_cachesize - 1;
-	download_consts[INVERTED_CACHESIZE_MASK] = ~(ahc->pci_cachesize - 1);
-	sg_prefetch_cnt = ahc->pci_cachesize;
-	if (sg_prefetch_cnt < (2 * sizeof(struct ahc_dma_seg)))
-		sg_prefetch_cnt = 2 * sizeof(struct ahc_dma_seg);
-	download_consts[SG_PREFETCH_CNT] = sg_prefetch_cnt;
-	download_consts[SG_PREFETCH_ALIGN_MASK] = ~(sg_prefetch_cnt - 1);
-	download_consts[SG_PREFETCH_ADDR_MASK] = (sg_prefetch_cnt - 1);
+	if (pending_scb_count == 0)
+		return;
 
-	cur_patch = patches;
-	downloaded = 0;
-	skip_addr = 0;
-	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS|FASTMODE|LOADRAM);
-	ahc_outb(ahc, SEQADDR0, 0);
-	ahc_outb(ahc, SEQADDR1, 0);
+	saved_scbptr = ahc_inb(ahc, SCBPTR);
+	/* Ensure that the hscbs down on the card match the new information */
+	for (i = 0; i < ahc->scb_data->maxhscbs; i++) {
+		u_int scb_tag;
 
-	for (i = 0; i < sizeof(seqprog)/4; i++) {
-		if (ahc_check_patch(ahc, &cur_patch, i, &skip_addr) == 0) {
-			/*
-			 * Don't download this instruction as it
-			 * is in a patch that was removed.
-			 */
-			continue;
-		}
-		/*
-		 * Move through the CS table until we find a CS
-		 * that might apply to this instruction.
-		 */
-		for (; cur_cs < num_critical_sections; cur_cs++) {
-			if (critical_sections[cur_cs].end <= i) {
-				if (begin_set[cs_count] == TRUE
-				 && end_set[cs_count] == FALSE) {
-					cs_table[cs_count].end = downloaded;
-				 	end_set[cs_count] = TRUE;
-					cs_count++;
-				}
+		ahc_outb(ahc, SCBPTR, i);
+		scb_tag = ahc_inb(ahc, SCB_TAG);
+		if (scb_tag != SCB_LIST_NULL) {
+			struct	ahc_devinfo devinfo;
+			struct	scb *pending_scb;
+			struct scsi_xfer *xs;
+			struct	hardware_scb *pending_hscb;
+			struct	ahc_initiator_tinfo *tinfo;
+			struct	tmode_tstate *tstate;
+			u_int	our_id, remote_id;
+			u_int	control;
+
+			pending_scb = &ahc->scb_data->scbarray[scb_tag];
+			if (pending_scb->flags == SCB_FREE)
 				continue;
-			}
-			if (critical_sections[cur_cs].begin <= i
-			 && begin_set[cs_count] == FALSE) {
-				cs_table[cs_count].begin = downloaded;
-				begin_set[cs_count] = TRUE;
-			}
-			break;
+			pending_hscb = pending_scb->hscb;
+			xs = pending_scb->xs;
+			our_id = SCB_IS_SCSIBUS_B(pending_scb)
+			       ? ahc->our_id_b : ahc->our_id;
+			remote_id = xs->sc_link->target;
+			ahc_compile_devinfo(&devinfo, our_id, remote_id,
+					    SCB_LUN(pending_scb),
+					    SCB_CHANNEL(pending_scb),
+					    ROLE_UNKNOWN);
+			tinfo = ahc_fetch_transinfo(ahc, devinfo.channel,
+						    our_id, remote_id, &tstate);
+			control = ahc_inb(ahc, SCB_CONTROL);
+			control &= ~ULTRAENB;
+			if ((tstate->ultraenb & devinfo.target_mask) != 0)
+				control |= ULTRAENB;
+			ahc_outb(ahc, SCB_CONTROL, control);
+			ahc_outb(ahc, SCB_SCSIRATE, tinfo->scsirate);
+			ahc_outb(ahc, SCB_SCSIOFFSET, tinfo->current.offset);
 		}
-		ahc_download_instr(ahc, i, download_consts);
-		downloaded++;
 	}
-
-	ahc->num_critical_sections = cs_count;
-	if (cs_count != 0) {
-
-		cs_count *= sizeof(struct cs);
-		ahc->critical_sections = malloc(cs_count, M_DEVBUF, M_NOWAIT);
-		if (ahc->critical_sections == NULL)
-			panic("ahc_loadseq: Could not malloc");
-		memcpy(ahc->critical_sections, cs_table, cs_count);
-	}
-	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS|FASTMODE);
-	ahc_restart(ahc);
-
-	if (bootverbose)
-		printf(" %d instructions downloaded\n", downloaded);
+	ahc_outb(ahc, SCBPTR, saved_scbptr);
 }
 
-static int
-ahc_check_patch(struct ahc_softc *ahc, struct patch **start_patch,
-		u_int start_instr, u_int *skip_addr)
+STATIC void
+ahc_shutdown(void *arg)
 {
-	struct	patch *cur_patch;
-	struct	patch *last_patch;
-	u_int	num_patches;
-
-	num_patches = sizeof(patches)/sizeof(struct patch);
-	last_patch = &patches[num_patches];
-	cur_patch = *start_patch;
-
-	while (cur_patch < last_patch && start_instr == cur_patch->begin) {
-
-		if (cur_patch->patch_func(ahc) == 0) {
-
-			/* Start rejecting code */
-			*skip_addr = start_instr + cur_patch->skip_instr;
-			cur_patch += cur_patch->skip_patch;
-		} else {
-			/* Accepted this patch.  Advance to the next
-			 * one and wait for our intruction pointer to
-			 * hit this point.
-			 */
-			cur_patch++;
-		}
-	}
+	struct	ahc_softc *ahc;
+	int	i;
+	u_int	sxfrctl1_a, sxfrctl1_b;
 
-	*start_patch = cur_patch;
-	if (start_instr < *skip_addr)
-		/* Still skipping */
-		return (0);
+	ahc = (struct ahc_softc *)arg;
 
-	return (1);
-}
-
-static void
-ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts)
-{
-	union	ins_formats instr;
-	struct	ins_format1 *fmt1_ins;
-	struct	ins_format3 *fmt3_ins;
-	u_int	opcode;
+	pause_sequencer(ahc);
 
 	/*
-	 * The firmware is always compiled into a little endian format.
+	 * Preserve the value of the SXFRCTL1 register for all channels.
+	 * It contains settings that affect termination and we don't want
+	 * to disturb the integrity of the bus during shutdown in case
+	 * we are in a multi-initiator setup.
 	 */
-	instr.integer = ahc_le32toh(*(uint32_t*)&seqprog[instrptr * 4]);
-
-	fmt1_ins = &instr.format1;
-	fmt3_ins = NULL;
-
-	/* Pull the opcode */
-	opcode = instr.format1.opcode;
-	switch (opcode) {
-	case AIC_OP_JMP:
-	case AIC_OP_JC:
-	case AIC_OP_JNC:
-	case AIC_OP_CALL:
-	case AIC_OP_JNE:
-	case AIC_OP_JNZ:
-	case AIC_OP_JE:
-	case AIC_OP_JZ:
-	{
-		struct patch *cur_patch;
-		int address_offset;
-		u_int address;
-		u_int skip_addr;
-		u_int i;
-
-		fmt3_ins = &instr.format3;
-		address_offset = 0;
-		address = fmt3_ins->address;
-		cur_patch = patches;
-		skip_addr = 0;
-
-		for (i = 0; i < address;) {
-
-			ahc_check_patch(ahc, &cur_patch, i, &skip_addr);
-
-			if (skip_addr > i) {
-				int end_addr;
-
-				end_addr = MIN(address, skip_addr);
-				address_offset += end_addr - i;
-				i = skip_addr;
-			} else {
-				i++;
-			}
-		}
-		address -= address_offset;
-		fmt3_ins->address = address;
-		/* FALLTHROUGH */
-	}
-	case AIC_OP_OR:
-	case AIC_OP_AND:
-	case AIC_OP_XOR:
-	case AIC_OP_ADD:
-	case AIC_OP_ADC:
-	case AIC_OP_BMOV:
-		if (fmt1_ins->parity != 0) {
-			fmt1_ins->immediate = dconsts[fmt1_ins->immediate];
-		}
-		fmt1_ins->parity = 0;
-		if ((ahc->features & AHC_CMD_CHAN) == 0
-		 && opcode == AIC_OP_BMOV) {
-			/*
-			 * Block move was added at the same time
-			 * as the command channel.  Verify that
-			 * this is only a move of a single element
-			 * and convert the BMOV to a MOV
-			 * (AND with an immediate of FF).
-			 */
-			if (fmt1_ins->immediate != 1)
-				panic("%s: BMOV not supported\n",
-				      ahc_name(ahc));
-			fmt1_ins->opcode = AIC_OP_AND;
-			fmt1_ins->immediate = 0xff;
-		}
-		/* FALLTHROUGH */
-	case AIC_OP_ROL:
-		if ((ahc->features & AHC_ULTRA2) != 0) {
-			int i, count;
-
-			/* Calculate odd parity for the instruction */
-			for (i = 0, count = 0; i < 31; i++) {
-				uint32_t mask;
+	sxfrctl1_b = 0;
+	if ((ahc->features & AHC_TWIN) != 0) {
+		u_int sblkctl;
 
-				mask = 0x01 << i;
-				if ((instr.integer & mask) != 0)
-					count++;
-			}
-			if ((count & 0x01) == 0)
-				instr.format1.parity = 1;
-		} else {
-			/* Compress the instruction for older sequencers */
-			if (fmt3_ins != NULL) {
-				instr.integer =
-					fmt3_ins->immediate
-				      | (fmt3_ins->source << 8)
-				      | (fmt3_ins->address << 16)
-				      |	(fmt3_ins->opcode << 25);
-			} else {
-				instr.integer =
-					fmt1_ins->immediate
-				      | (fmt1_ins->source << 8)
-				      | (fmt1_ins->destination << 16)
-				      |	(fmt1_ins->ret << 24)
-				      |	(fmt1_ins->opcode << 25);
-			}
-		}
-		/* The sequencer is a little endian cpu */
-		instr.integer = ahc_htole32(instr.integer);
-		ahc_outsb(ahc, SEQRAM, instr.bytes, 4);
-		break;
-	default:
-		panic("Unknown opcode encountered in seq program");
-		break;
+		sblkctl = ahc_inb(ahc, SBLKCTL);
+		ahc_outb(ahc, SBLKCTL, sblkctl | SELBUSB);
+		sxfrctl1_b = ahc_inb(ahc, SXFRCTL1);
+		ahc_outb(ahc, SBLKCTL, sblkctl & ~SELBUSB);
 	}
-}
-
-void
-ahc_dump_card_state(struct ahc_softc *ahc)
-{
-	struct scb *scb;
-	struct scb_tailq *untagged_q;
-	int target;
-	int maxtarget;
-	int i;
-	uint8_t last_phase;
-	uint8_t qinpos;
-	uint8_t qintail;
-	uint8_t qoutpos;
-	uint8_t scb_index;
-	uint8_t saved_scbptr;
 
-	saved_scbptr = ahc_inb(ahc, SCBPTR);
-
-	last_phase = ahc_inb(ahc, LASTPHASE);
-	printf("%s: Dumping Card State %s, at SEQADDR 0x%x\n",
-	       ahc_name(ahc), ahc_lookup_phase_entry(last_phase)->phasemsg,
-	       ahc_inb(ahc, SEQADDR0) | (ahc_inb(ahc, SEQADDR1) << 8));
-	printf("ACCUM = 0x%x, SINDEX = 0x%x, DINDEX = 0x%x, ARG_2 = 0x%x\n",
-	       ahc_inb(ahc, ACCUM), ahc_inb(ahc, SINDEX), ahc_inb(ahc, DINDEX),
-	       ahc_inb(ahc, ARG_2));
-	printf("HCNT = 0x%x\n", ahc_inb(ahc, HCNT));
-	printf("SCSISEQ = 0x%x, SBLKCTL = 0x%x\n",
-	       ahc_inb(ahc, SCSISEQ), ahc_inb(ahc, SBLKCTL));
-	printf(" DFCNTRL = 0x%x, DFSTATUS = 0x%x\n",
-	       ahc_inb(ahc, DFCNTRL), ahc_inb(ahc, DFSTATUS));
-	printf("LASTPHASE = 0x%x, SCSISIGI = 0x%x, SXFRCTL0 = 0x%x\n",
-	       last_phase, ahc_inb(ahc, SCSISIGI), ahc_inb(ahc, SXFRCTL0));
-	printf("SSTAT0 = 0x%x, SSTAT1 = 0x%x\n",
-	       ahc_inb(ahc, SSTAT0), ahc_inb(ahc, SSTAT1));
-	if ((ahc->features & AHC_DT) != 0)
-		printf("SCSIPHASE = 0x%x\n", ahc_inb(ahc, SCSIPHASE));
-	printf("STACK == 0x%x, 0x%x, 0x%x, 0x%x\n",
-		ahc_inb(ahc, STACK) | (ahc_inb(ahc, STACK) << 8),
-		ahc_inb(ahc, STACK) | (ahc_inb(ahc, STACK) << 8),
-		ahc_inb(ahc, STACK) | (ahc_inb(ahc, STACK) << 8),
-		ahc_inb(ahc, STACK) | (ahc_inb(ahc, STACK) << 8));
-	printf("SCB count = %d\n", ahc->scb_data->numscbs);
-	printf("Kernel NEXTQSCB = %d\n", ahc->next_queued_scb->hscb->tag);
-	printf("Card NEXTQSCB = %d\n", ahc_inb(ahc, NEXT_QUEUED_SCB));
-	/* QINFIFO */
-	printf("QINFIFO entries: ");
-	if ((ahc->features & AHC_QUEUE_REGS) != 0) {
-		qinpos = ahc_inb(ahc, SNSCB_QOFF);
-		ahc_outb(ahc, SNSCB_QOFF, qinpos);
-	} else
-		qinpos = ahc_inb(ahc, QINPOS);
-	qintail = ahc->qinfifonext;
-	while (qinpos != qintail) {
-		printf("%d ", ahc->qinfifo[qinpos]);
-		qinpos++;
-	}
-	printf("\n");
+	sxfrctl1_a = ahc_inb(ahc, SXFRCTL1);
 
-	printf("Waiting Queue entries: ");
-	scb_index = ahc_inb(ahc, WAITING_SCBH);
-	i = 0;
-	while (scb_index != SCB_LIST_NULL && i++ < 256) {
-		ahc_outb(ahc, SCBPTR, scb_index);
-		printf("%d:%d ", scb_index, ahc_inb(ahc, SCB_TAG));
-		scb_index = ahc_inb(ahc, SCB_NEXT);
-	}
-	printf("\n");
+	/* This will reset most registers to 0, but not all */
+	ahc_reset(ahc);
 
-	printf("Disconnected Queue entries: ");
-	scb_index = ahc_inb(ahc, DISCONNECTED_SCBH);
-	i = 0;
-	while (scb_index != SCB_LIST_NULL && i++ < 256) {
-		ahc_outb(ahc, SCBPTR, scb_index);
-		printf("%d:%d ", scb_index, ahc_inb(ahc, SCB_TAG));
-		scb_index = ahc_inb(ahc, SCB_NEXT);
-	}
-	printf("\n");
-		
-	ahc_sync_qoutfifo(ahc, BUS_DMASYNC_POSTREAD);
-	printf("QOUTFIFO entries: ");
-	qoutpos = ahc->qoutfifonext;
-	i = 0;
-	while (ahc->qoutfifo[qoutpos] != SCB_LIST_NULL && i++ < 256) {
-		printf("%d ", ahc->qoutfifo[qoutpos]);
-		qoutpos++;
-	}
-	printf("\n");
-
-	printf("Sequencer Free SCB List: ");
-	scb_index = ahc_inb(ahc, FREE_SCBH);
-	i = 0;
-	while (scb_index != SCB_LIST_NULL && i++ < 256) {
-		ahc_outb(ahc, SCBPTR, scb_index);
-		printf("%d ", scb_index);
-		scb_index = ahc_inb(ahc, SCB_NEXT);
-	}
-	printf("\n");
-
-	printf("Pending list: ");
-	i = 0;
-	LIST_FOREACH(scb, &ahc->pending_scbs, pending_links) {
-		if (i++ > 256)
-			break;
-		if (scb != LIST_FIRST(&ahc->pending_scbs))
-			printf(", ");
-		printf("%d", scb->hscb->tag);
-		if ((ahc->flags & AHC_PAGESCBS) == 0) {
-			ahc_outb(ahc, SCBPTR, scb->hscb->tag);
-			printf("(0x%x, 0x%x)", ahc_inb(ahc, SCB_CONTROL),
-			       ahc_inb(ahc, SCB_TAG));
-		}
-	}
-	printf("\n");
+	if ((ahc->features & AHC_TWIN) != 0) {
+		u_int sblkctl;
 
-	printf("Kernel Free SCB list: ");
-	i = 0;
-	SLIST_FOREACH(scb, &ahc->scb_data->free_scbs, links.sle) {
-		if (i++ > 256)
-			break;
-		printf("%d ", scb->hscb->tag);
+		sblkctl = ahc_inb(ahc, SBLKCTL);
+		ahc_outb(ahc, SBLKCTL, sblkctl | SELBUSB);
+		ahc_outb(ahc, SXFRCTL1, sxfrctl1_b);
+		ahc_outb(ahc, SBLKCTL, sblkctl & ~SELBUSB);
 	}
-	printf("\n");
+	ahc_outb(ahc, SXFRCTL1, sxfrctl1_a);
 
-	maxtarget = (ahc->features & (AHC_WIDE|AHC_TWIN)) ? 15 : 7;
-	for (target = 0; target <= maxtarget; target++) {
-		untagged_q = &ahc->untagged_queues[target];
-		if (TAILQ_FIRST(untagged_q) == NULL)
-			continue;
-		printf("Untagged Q(%d): ", target);
-		i = 0;
-		TAILQ_FOREACH(scb, untagged_q, links.tqe) {
-			if (i++ > 256)
-				break;
-			printf("%d ", scb->hscb->tag);
-		}
-		printf("\n");
-	}
+	ahc_outb(ahc, SCSISEQ, 0);
+	ahc_outb(ahc, SXFRCTL0, 0);
+	ahc_outb(ahc, DSPCISTATUS, 0);
 
-	ahc_platform_dump_card_state(ahc);
-	ahc_outb(ahc, SCBPTR, saved_scbptr);
+	for (i = TARG_SCSIRATE; i < HA_274_BIOSCTRL; i++)
+		ahc_outb(ahc, i, 0);
 }
 
-/************************* Target Mode ****************************************/
-#ifdef AHC_TARGET_MODE
-cam_status
-ahc_find_tmode_devs(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb,
-		    struct ahc_tmode_tstate **tstate,
-		    struct ahc_tmode_lstate **lstate,
-		    int notfound_failure)
+STATIC void
+ahc_check_tags(ahc, xs)
+struct ahc_softc *ahc;
+struct scsi_xfer *xs;
 {
+	struct scsi_inquiry_data *inq;
+	struct ahc_devinfo devinfo;
+	struct tmode_tstate *tstate;
+	int target_id, our_id;
+	char channel;
 
-	if ((ahc->features & AHC_TARGETMODE) == 0)
-		return (CAM_REQ_INVALID);
-
-	/*
-	 * Handle the 'black hole' device that sucks up
-	 * requests to unattached luns on enabled targets.
-	 */
-	if (ccb->ccb_h.target_id == CAM_TARGET_WILDCARD
-	 && ccb->ccb_h.target_lun == CAM_LUN_WILDCARD) {
-		*tstate = NULL;
-		*lstate = ahc->black_hole;
-	} else {
-		u_int max_id;
-
-		max_id = (ahc->features & AHC_WIDE) ? 15 : 7;
-		if (ccb->ccb_h.target_id > max_id)
-			return (CAM_TID_INVALID);
-
-		if (ccb->ccb_h.target_lun >= AHC_NUM_LUNS)
-			return (CAM_LUN_INVALID);
-
-		*tstate = ahc->enabled_targets[ccb->ccb_h.target_id];
-		*lstate = NULL;
-		if (*tstate != NULL)
-			*lstate =
-			    (*tstate)->enabled_luns[ccb->ccb_h.target_lun];
-	}
-
-	if (notfound_failure != 0 && *lstate == NULL)
-		return (CAM_PATH_INVALID);
-
-	return (CAM_REQ_CMP);
-}
+	if (xs->cmd->opcode != INQUIRY || xs->error != XS_NOERROR)
+		return;
 
-void
-ahc_handle_en_lun(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb)
-{
-	struct	   ahc_tmode_tstate *tstate;
-	struct	   ahc_tmode_lstate *lstate;
-	struct	   ccb_en_lun *cel;
-	cam_status status;
-	u_int	   target;
-	u_int	   lun;
-	u_int	   target_mask;
-	u_long	   s;
-	char	   channel;
-
-	status = ahc_find_tmode_devs(ahc, sim, ccb, &tstate, &lstate,
-				     /*notfound_failure*/FALSE);
-
-	if (status != CAM_REQ_CMP) {
-		ccb->ccb_h.status = status;
+	if (xs->sc_link->quirks & SDEV_NOTAGS)
 		return;
-	}
 
-	if ((ahc->features & AHC_MULTIROLE) != 0) {
-		u_int	   our_id;
+	target_id = xs->sc_link->target;
+	our_id = SIM_SCSI_ID(ahc, xs->sc_link);
+	channel = SIM_CHANNEL(ahc, xs->sc_link);
 
-		if (cam_sim_bus(sim) == 0)
-			our_id = ahc->our_id;
-		else
-			our_id = ahc->our_id_b;
-
-		if (ccb->ccb_h.target_id != our_id) {
-			if ((ahc->features & AHC_MULTI_TID) != 0
-		   	 && (ahc->flags & AHC_INITIATORROLE) != 0) {
-				/*
-				 * Only allow additional targets if
-				 * the initiator role is disabled.
-				 * The hardware cannot handle a re-select-in
-				 * on the initiator id during a re-select-out
-				 * on a different target id.
-				 */
-				status = CAM_TID_INVALID;
-			} else if ((ahc->flags & AHC_INITIATORROLE) != 0
-				|| ahc->enabled_luns > 0) {
-				/*
-				 * Only allow our target id to change
-				 * if the initiator role is not configured
-				 * and there are no enabled luns which
-				 * are attached to the currently registered
-				 * scsi id.
-				 */
-				status = CAM_TID_INVALID;
-			}
-		}
-	}
+	(void)ahc_fetch_transinfo(ahc, channel, our_id, target_id, &tstate);
+	ahc_compile_devinfo(&devinfo, our_id, target_id,
+	    xs->sc_link->lun, channel, ROLE_INITIATOR);
 
-	if (status != CAM_REQ_CMP) {
-		ccb->ccb_h.status = status;
+	if (tstate->tagdisable & devinfo.target_mask)
 		return;
-	}
 
 	/*
-	 * We now have an id that is valid.
-	 * If we aren't in target mode, switch modes.
+	 * Sneak a look at the results of the SCSI Inquiry
+	 * command and see if we can do Tagged queing.  This
+	 * should really be done by the higher level drivers.
 	 */
-	if ((ahc->flags & AHC_TARGETROLE) == 0
-	 && ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) {
-		u_long	s;
-
-		printf("Configuring Target Mode\n");
-		ahc_lock(ahc, &s);
-		if (LIST_FIRST(&ahc->pending_scbs) != NULL) {
-			ccb->ccb_h.status = CAM_BUSY;
-			ahc_unlock(ahc, &s);
-			return;
-		}
-		ahc->flags |= AHC_TARGETROLE;
-		if ((ahc->features & AHC_MULTIROLE) == 0)
-			ahc->flags &= ~AHC_INITIATORROLE;
-		ahc_pause(ahc);
-		ahc_loadseq(ahc);
-		ahc_unlock(ahc, &s);
-	}
-	cel = &ccb->cel;
-	target = ccb->ccb_h.target_id;
-	lun = ccb->ccb_h.target_lun;
-	channel = SIM_CHANNEL(ahc, sim);
-	target_mask = 0x01 << target;
-	if (channel == 'B')
-		target_mask <<= 8;
-
-	if (cel->enable != 0) {
-		u_int scsiseq;
-
-		/* Are we already enabled?? */
-		if (lstate != NULL) {
-			xpt_print_path(ccb->ccb_h.path);
-			printf("Lun already enabled\n");
-			ccb->ccb_h.status = CAM_LUN_ALRDY_ENA;
-			return;
-		}
-
-		if (cel->grp6_len != 0
-		 || cel->grp7_len != 0) {
-			/*
-			 * Don't (yet?) support vendor
-			 * specific commands.
-			 */
-			ccb->ccb_h.status = CAM_REQ_INVALID;
-			printf("Non-zero Group Codes\n");
-			return;
-		}
-
-		/*
-		 * Seems to be okay.
-		 * Setup our data structures.
-		 */
-		if (target != CAM_TARGET_WILDCARD && tstate == NULL) {
-			tstate = ahc_alloc_tstate(ahc, target, channel);
-			if (tstate == NULL) {
-				xpt_print_path(ccb->ccb_h.path);
-				printf("Couldn't allocate tstate\n");
-				ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
-				return;
-			}
-		}
-		lstate = malloc(sizeof(*lstate), M_DEVBUF, M_NOWAIT);
-		if (lstate == NULL) {
-			xpt_print_path(ccb->ccb_h.path);
-			printf("Couldn't allocate lstate\n");
-			ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
-			return;
-		}
-		memset(lstate, 0, sizeof(*lstate));
-		status = xpt_create_path(&lstate->path, /*periph*/NULL,
-					 xpt_path_path_id(ccb->ccb_h.path),
-					 xpt_path_target_id(ccb->ccb_h.path),
-					 xpt_path_lun_id(ccb->ccb_h.path));
-		if (status != CAM_REQ_CMP) {
-			free(lstate, M_DEVBUF);
-			xpt_print_path(ccb->ccb_h.path);
-			printf("Couldn't allocate path\n");
-			ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
-			return;
-		}
-		SLIST_INIT(&lstate->accept_tios);
-		SLIST_INIT(&lstate->immed_notifies);
-		ahc_lock(ahc, &s);
-		ahc_pause(ahc);
-		if (target != CAM_TARGET_WILDCARD) {
-			tstate->enabled_luns[lun] = lstate;
-			ahc->enabled_luns++;
-
-			if ((ahc->features & AHC_MULTI_TID) != 0) {
-				u_int targid_mask;
-
-				targid_mask = ahc_inb(ahc, TARGID)
-					    | (ahc_inb(ahc, TARGID + 1) << 8);
-
-				targid_mask |= target_mask;
-				ahc_outb(ahc, TARGID, targid_mask);
-				ahc_outb(ahc, TARGID+1, (targid_mask >> 8));
-				
-				ahc_update_scsiid(ahc, targid_mask);
-			} else {
-				u_int our_id;
-				char  channel;
-
-				channel = SIM_CHANNEL(ahc, sim);
-				our_id = SIM_SCSI_ID(ahc, sim);
-
-				/*
-				 * This can only happen if selections
-				 * are not enabled
-				 */
-				if (target != our_id) {
-					u_int sblkctl;
-					char  cur_channel;
-					int   swap;
-
-					sblkctl = ahc_inb(ahc, SBLKCTL);
-					cur_channel = (sblkctl & SELBUSB)
-						    ? 'B' : 'A';
-					if ((ahc->features & AHC_TWIN) == 0)
-						cur_channel = 'A';
-					swap = cur_channel != channel;
-					if (channel == 'A')
-						ahc->our_id = target;
-					else
-						ahc->our_id_b = target;
-
-					if (swap)
-						ahc_outb(ahc, SBLKCTL,
-							 sblkctl ^ SELBUSB);
-
-					ahc_outb(ahc, SCSIID, target);
-
-					if (swap)
-						ahc_outb(ahc, SBLKCTL, sblkctl);
-				}
-			}
-		} else
-			ahc->black_hole = lstate;
-		/* Allow select-in operations */
-		if (ahc->black_hole != NULL && ahc->enabled_luns > 0) {
-			scsiseq = ahc_inb(ahc, SCSISEQ_TEMPLATE);
-			scsiseq |= ENSELI;
-			ahc_outb(ahc, SCSISEQ_TEMPLATE, scsiseq);
-			scsiseq = ahc_inb(ahc, SCSISEQ);
-			scsiseq |= ENSELI;
-			ahc_outb(ahc, SCSISEQ, scsiseq);
-		}
-		ahc_unpause(ahc);
-		ahc_unlock(ahc, &s);
-		ccb->ccb_h.status = CAM_REQ_CMP;
-		xpt_print_path(ccb->ccb_h.path);
-		printf("Lun now enabled for target mode\n");
-	} else {
-		struct scb *scb;
-		int i, empty;
-
-		if (lstate == NULL) {
-			ccb->ccb_h.status = CAM_LUN_INVALID;
-			return;
-		}
-
-		ahc_lock(ahc, &s);
-		
-		ccb->ccb_h.status = CAM_REQ_CMP;
-		LIST_FOREACH(scb, &ahc->pending_scbs, pending_links) {
-			struct ccb_hdr *ccbh;
-
-			ccbh = &scb->io_ctx->ccb_h;
-			if (ccbh->func_code == XPT_CONT_TARGET_IO
-			 && !xpt_path_comp(ccbh->path, ccb->ccb_h.path)){
-				printf("CTIO pending\n");
-				ccb->ccb_h.status = CAM_REQ_INVALID;
-				ahc_unlock(ahc, &s);
-				return;
-			}
-		}
-
-		if (SLIST_FIRST(&lstate->accept_tios) != NULL) {
-			printf("ATIOs pending\n");
-			ccb->ccb_h.status = CAM_REQ_INVALID;
-		}
-
-		if (SLIST_FIRST(&lstate->immed_notifies) != NULL) {
-			printf("INOTs pending\n");
-			ccb->ccb_h.status = CAM_REQ_INVALID;
-		}
-
-		if (ccb->ccb_h.status != CAM_REQ_CMP) {
-			ahc_unlock(ahc, &s);
-			return;
-		}
-
-		xpt_print_path(ccb->ccb_h.path);
-		printf("Target mode disabled\n");
-		xpt_free_path(lstate->path);
-		free(lstate, M_DEVBUF);
-
-		ahc_pause(ahc);
-		/* Can we clean up the target too? */
-		if (target != CAM_TARGET_WILDCARD) {
-			tstate->enabled_luns[lun] = NULL;
-			ahc->enabled_luns--;
-			for (empty = 1, i = 0; i < 8; i++)
-				if (tstate->enabled_luns[i] != NULL) {
-					empty = 0;
-					break;
-				}
+	inq = (struct scsi_inquiry_data *)xs->data;
+	if ((inq->flags & SID_CmdQue) && !(ahc_istagged_device(ahc, xs, 1))) {
+#ifdef AHC_DEBUG 
+		printf("%s: target %d using tagged queuing\n",
+			ahc_name(ahc), xs->sc_link->target);
+#endif 
+		ahc_set_tags(ahc, &devinfo, TRUE);
 
-			if (empty) {
-				ahc_free_tstate(ahc, target, channel,
-						/*force*/FALSE);
-				if (ahc->features & AHC_MULTI_TID) {
-					u_int targid_mask;
-
-					targid_mask = ahc_inb(ahc, TARGID)
-						    | (ahc_inb(ahc, TARGID + 1)
-						       << 8);
-
-					targid_mask &= ~target_mask;
-					ahc_outb(ahc, TARGID, targid_mask);
-					ahc_outb(ahc, TARGID+1,
-					 	 (targid_mask >> 8));
-					ahc_update_scsiid(ahc, targid_mask);
-				}
-			}
+		if (ahc->scb_data->maxhscbs >= 16 ||
+		    (ahc->flags & AHC_PAGESCBS)) {
+			/* Default to 16 tags */
+			xs->sc_link->openings += 14;
 		} else {
-
-			ahc->black_hole = NULL;
-
 			/*
-			 * We can't allow selections without
-			 * our black hole device.
+			 * Default to 4 tags on whimpy
+			 * cards that don't have much SCB
+			 * space and can't page.  This prevents
+			 * a single device from hogging all
+			 * slots.  We should really have a better
+			 * way of providing fairness.
 			 */
-			empty = TRUE;
-		}
-		if (ahc->enabled_luns == 0) {
-			/* Disallow select-in */
-			u_int scsiseq;
-
-			scsiseq = ahc_inb(ahc, SCSISEQ_TEMPLATE);
-			scsiseq &= ~ENSELI;
-			ahc_outb(ahc, SCSISEQ_TEMPLATE, scsiseq);
-			scsiseq = ahc_inb(ahc, SCSISEQ);
-			scsiseq &= ~ENSELI;
-			ahc_outb(ahc, SCSISEQ, scsiseq);
-
-			if ((ahc->features & AHC_MULTIROLE) == 0) {
-				printf("Configuring Initiator Mode\n");
-				ahc->flags &= ~AHC_TARGETROLE;
-				ahc->flags |= AHC_INITIATORROLE;
-				ahc_pause(ahc);
-				ahc_loadseq(ahc);
-			}
-		}
-		ahc_unpause(ahc);
-		ahc_unlock(ahc, &s);
-	}
-}
-
-static void
-ahc_update_scsiid(struct ahc_softc *ahc, u_int targid_mask)
-{
-	u_int scsiid_mask;
-	u_int scsiid;
-
-	if ((ahc->features & AHC_MULTI_TID) == 0)
-		panic("ahc_update_scsiid called on non-multitid unit\n");
-
-	/*
-	 * Since we will rely on the the TARGID mask
-	 * for selection enables, ensure that OID
-	 * in SCSIID is not set to some other ID
-	 * that we don't want to allow selections on.
-	 */
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		scsiid = ahc_inb(ahc, SCSIID_ULTRA2);
-	else
-		scsiid = ahc_inb(ahc, SCSIID);
-	scsiid_mask = 0x1 << (scsiid & OID);
-	if ((targid_mask & scsiid_mask) == 0) {
-		u_int our_id;
-
-		/* ffs counts from 1 */
-		our_id = ffs(targid_mask);
-		if (our_id == 0)
-			our_id = ahc->our_id;
-		else
-			our_id--;
-		scsiid &= TID;
-		scsiid |= our_id;
-	}
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		ahc_outb(ahc, SCSIID_ULTRA2, scsiid);
-	else
-		ahc_outb(ahc, SCSIID, scsiid);
-}
-
-void
-ahc_run_tqinfifo(struct ahc_softc *ahc, int paused)
-{
-	struct target_cmd *cmd;
-
-	/*
-	 * If the card supports auto-access pause,
-	 * we can access the card directly regardless
-	 * of whether it is paused or not.
-	 */
-	if ((ahc->features & AHC_AUTOPAUSE) != 0)
-		paused = TRUE;
-
-	ahc_sync_tqinfifo(ahc, BUS_DMASYNC_POSTREAD);
-	while ((cmd = &ahc->targetcmds[ahc->tqinfifonext])->cmd_valid != 0) {
-
-		/*
-		 * Only advance through the queue if we
-		 * have the resources to process the command.
-		 */
-		if (ahc_handle_target_cmd(ahc, cmd) != 0)
-			break;
-
-		cmd->cmd_valid = 0;
-		ahc_dmamap_sync(ahc, ahc->shared_data_dmat,
-				ahc->shared_data_dmamap,
-				ahc_targetcmd_offset(ahc, ahc->tqinfifonext),
-				sizeof(struct target_cmd),
-				BUS_DMASYNC_PREREAD);
-		ahc->tqinfifonext++;
-
-		/*
-		 * Lazily update our position in the target mode incoming
-		 * command queue as seen by the sequencer.
-		 */
-		if ((ahc->tqinfifonext & (HOST_TQINPOS - 1)) == 1) {
-			if ((ahc->features & AHC_HS_MAILBOX) != 0) {
-				u_int hs_mailbox;
-
-				hs_mailbox = ahc_inb(ahc, HS_MAILBOX);
-				hs_mailbox &= ~HOST_TQINPOS;
-				hs_mailbox |= ahc->tqinfifonext & HOST_TQINPOS;
-				ahc_outb(ahc, HS_MAILBOX, hs_mailbox);
-			} else {
-				if (!paused)
-					ahc_pause(ahc);	
-				ahc_outb(ahc, KERNEL_TQINPOS,
-					 ahc->tqinfifonext & HOST_TQINPOS);
-				if (!paused)
-					ahc_unpause(ahc);
-			}
+			xs->sc_link->openings += 2;
 		}
 	}
 }
 
-static int
-ahc_handle_target_cmd(struct ahc_softc *ahc, struct target_cmd *cmd)
+STATIC int
+ahc_istagged_device(ahc, xs, nocmdcheck)
+struct ahc_softc *ahc;
+struct scsi_xfer *xs;
+int nocmdcheck;
 {
-	struct	  ahc_tmode_tstate *tstate;
-	struct	  ahc_tmode_lstate *lstate;
-	struct	  ccb_accept_tio *atio;
-	uint8_t *byte;
-	int	  initiator;
-	int	  target;
-	int	  lun;
-
-	initiator = SCSIID_TARGET(ahc, cmd->scsiid);
-	target = SCSIID_OUR_ID(cmd->scsiid);
-	lun    = (cmd->identify & MSG_IDENTIFY_LUNMASK);
-
-	byte = cmd->bytes;
-	tstate = ahc->enabled_targets[target];
-	lstate = NULL;
-	if (tstate != NULL)
-		lstate = tstate->enabled_luns[lun];
-
-	/*
-	 * Commands for disabled luns go to the black hole driver.
-	 */
-	if (lstate == NULL)
-		lstate = ahc->black_hole;
-
-	atio = (struct ccb_accept_tio*)SLIST_FIRST(&lstate->accept_tios);
-	if (atio == NULL) {
-		ahc->flags |= AHC_TQINFIFO_BLOCKED;
-		/*
-		 * Wait for more ATIOs from the peripheral driver for this lun.
-		 */
-		return (1);
-	} else
-		ahc->flags &= ~AHC_TQINFIFO_BLOCKED;
-#if 0
-	printf("Incoming command from %d for %d:%d%s\n",
-	       initiator, target, lun,
-	       lstate == ahc->black_hole ? "(Black Holed)" : "");
-#endif
-	SLIST_REMOVE_HEAD(&lstate->accept_tios, sim_links.sle);
+	char channel;
+	u_int our_id, target;
+	struct tmode_tstate *tstate;
+	struct ahc_devinfo devinfo;
 
-	if (lstate == ahc->black_hole) {
-		/* Fill in the wildcards */
-		atio->ccb_h.target_id = target;
-		atio->ccb_h.target_lun = lun;
-	}
+	if (xs->sc_link->quirks & SDEV_NOTAGS)
+		return 0;
 
 	/*
-	 * Package it up and send it off to
-	 * whomever has this lun enabled.
+	 * XXX never do these commands with tags. Should really be
+	 * in a higher layer.
 	 */
-	atio->sense_len = 0;
-	atio->init_id = initiator;
-	if (byte[0] != 0xFF) {
-		/* Tag was included */
-		atio->tag_action = *byte++;
-		atio->tag_id = *byte++;
-		atio->ccb_h.flags = CAM_TAG_ACTION_VALID;
-	} else {
-		atio->ccb_h.flags = 0;
-	}
-	byte++;
+	if (!nocmdcheck && (xs->cmd->opcode == INQUIRY ||
+	     xs->cmd->opcode == TEST_UNIT_READY ||
+	     xs->cmd->opcode == REQUEST_SENSE))
+		return 0;
 
-	/* Okay.  Now determine the cdb size based on the command code */
-	switch (*byte >> CMD_GROUP_CODE_SHIFT) {
-	case 0:
-		atio->cdb_len = 6;
-		break;
-	case 1:
-	case 2:
-		atio->cdb_len = 10;
-		break;
-	case 4:
-		atio->cdb_len = 16;
-		break;
-	case 5:
-		atio->cdb_len = 12;
-		break;
-	case 3:
-	default:
-		/* Only copy the opcode. */
-		atio->cdb_len = 1;
-		printf("Reserved or VU command code type encountered\n");
-		break;
-	}
-	
-	memcpy(atio->cdb_io.cdb_bytes, byte, atio->cdb_len);
+	channel = SIM_CHANNEL(ahc, xs->sc_link);
+	our_id = SIM_SCSI_ID(ahc, xs->sc_link);
+	target = xs->sc_link->target;
+	(void)ahc_fetch_transinfo(ahc, channel, our_id, target, &tstate);
 
-	atio->ccb_h.status |= CAM_CDB_RECVD;
+	ahc_compile_devinfo(&devinfo, our_id, target,
+	    xs->sc_link->lun, channel, ROLE_INITIATOR);
 
-	if ((cmd->identify & MSG_IDENTIFY_DISCFLAG) == 0) {
-		/*
-		 * We weren't allowed to disconnect.
-		 * We're hanging on the bus until a
-		 * continue target I/O comes in response
-		 * to this accept tio.
-		 */
-#if 0
-		printf("Received Immediate Command %d:%d:%d - %p\n",
-		       initiator, target, lun, ahc->pending_device);
-#endif
-		ahc->pending_device = lstate;
-		ahc_freeze_ccb((union ccb *)atio);
-		atio->ccb_h.flags |= CAM_DIS_DISCONNECT;
-	}
-	xpt_done((union ccb*)atio);
-	return (0);
+	return (tstate->tagenable & devinfo.target_mask);
 }
-
-#endif
diff --git a/sys/dev/ic/aic7xxx_inline.h b/sys/dev/ic/aic7xxx_inline.h
deleted file mode 100644
index 5fecbc8fef6..00000000000
--- a/sys/dev/ic/aic7xxx_inline.h
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * Inline routines shareable across OS platforms.
- *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: aic7xxx_inline.h,v 1.1 2002/02/16 04:36:33 smurph Exp $
- *
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_inline.h,v 1.17 2001/07/18 21:39:47 gibbs Exp $
- */
-
-#ifndef _AIC7XXX_INLINE_H_
-#define _AIC7XXX_INLINE_H_
-
-/************************* Sequencer Execution Control ************************/
-static __inline void ahc_pause_bug_fix(struct ahc_softc *ahc);
-static __inline int  ahc_is_paused(struct ahc_softc *ahc);
-static __inline void ahc_pause(struct ahc_softc *ahc);
-static __inline void ahc_unpause(struct ahc_softc *ahc);
-
-/*
- * Work around any chip bugs related to halting sequencer execution.
- * On Ultra2 controllers, we must clear the CIOBUS stretch signal by
- * reading a register that will set this signal and deassert it.
- * Without this workaround, if the chip is paused, by an interrupt or
- * manual pause while accessing scb ram, accesses to certain registers
- * will hang the system (infinite pci retries).
- */
-static __inline void
-ahc_pause_bug_fix(struct ahc_softc *ahc)
-{
-	if ((ahc->features & AHC_ULTRA2) != 0)
-		(void)ahc_inb(ahc, CCSCBCTL);
-}
-
-/*
- * Determine whether the sequencer has halted code execution.
- * Returns non-zero status if the sequencer is stopped.
- */
-static __inline int
-ahc_is_paused(struct ahc_softc *ahc)
-{
-	return ((ahc_inb(ahc, HCNTRL) & PAUSE) != 0);
-}
-
-/*
- * Request that the sequencer stop and wait, indefinitely, for it
- * to stop.  The sequencer will only acknowledge that it is paused
- * once it has reached an instruction boundary and PAUSEDIS is
- * cleared in the SEQCTL register.  The sequencer may use PAUSEDIS
- * for critical sections.
- */
-static __inline void
-ahc_pause(struct ahc_softc *ahc)
-{
-	ahc_outb(ahc, HCNTRL, ahc->pause);
-
-	/*
-	 * Since the sequencer can disable pausing in a critical section, we
-	 * must loop until it actually stops.
-	 */
-	while (ahc_is_paused(ahc) == 0)
-		;
-
-	ahc_pause_bug_fix(ahc);
-}
-
-/*
- * Allow the sequencer to continue program execution.
- * We check here to ensure that no additional interrupt
- * sources that would cause the sequencer to halt have been
- * asserted.  If, for example, a SCSI bus reset is detected
- * while we are fielding a different, pausing, interrupt type,
- * we don't want to release the sequencer before going back
- * into our interrupt handler and dealing with this new
- * condition.
- */
-static __inline void
-ahc_unpause(struct ahc_softc *ahc)
-{
-	if ((ahc_inb(ahc, INTSTAT) & (SCSIINT | SEQINT | BRKADRINT)) == 0)
-		ahc_outb(ahc, HCNTRL, ahc->unpause);
-}
-
-/*********************** Untagged Transaction Routines ************************/
-static __inline void	ahc_freeze_untagged_queues(struct ahc_softc *ahc);
-static __inline void	ahc_release_untagged_queues(struct ahc_softc *ahc);
-
-/*
- * Block our completion routine from starting the next untagged
- * transaction for this target or target lun.
- */
-static __inline void
-ahc_freeze_untagged_queues(struct ahc_softc *ahc)
-{
-	if ((ahc->flags & AHC_SCB_BTT) == 0)
-		ahc->untagged_queue_lock++;
-}
-
-/*
- * Allow the next untagged transaction for this target or target lun
- * to be executed.  We use a counting semaphore to allow the lock
- * to be acquired recursively.  Once the count drops to zero, the
- * transaction queues will be run.
- */
-static __inline void
-ahc_release_untagged_queues(struct ahc_softc *ahc)
-{
-	if ((ahc->flags & AHC_SCB_BTT) == 0) {
-		ahc->untagged_queue_lock--;
-		if (ahc->untagged_queue_lock == 0)
-			ahc_run_untagged_queues(ahc);
-	}
-}
-
-/************************** Memory mapping routines ***************************/
-static __inline struct ahc_dma_seg *
-			ahc_sg_bus_to_virt(struct scb *scb,
-					   uint32_t sg_busaddr);
-static __inline uint32_t
-			ahc_sg_virt_to_bus(struct scb *scb,
-					   struct ahc_dma_seg *sg);
-static __inline uint32_t
-			ahc_hscb_busaddr(struct ahc_softc *ahc, u_int index);
-static __inline void	ahc_sync_scb(struct ahc_softc *ahc,
-				     struct scb *scb, int op);
-static __inline void	ahc_sync_sglist(struct ahc_softc *ahc,
-					struct scb *scb, int op);
-static __inline uint32_t
-			ahc_targetcmd_offset(struct ahc_softc *ahc,
-					     u_int index);
-
-static __inline struct ahc_dma_seg *
-ahc_sg_bus_to_virt(struct scb *scb, uint32_t sg_busaddr)
-{
-	int sg_index;
-
-	sg_index = (sg_busaddr - scb->sg_list_phys)/sizeof(struct ahc_dma_seg);
-	/* sg_list_phys points to entry 1, not 0 */
-	sg_index++;
-
-	return (&scb->sg_list[sg_index]);
-}
-
-static __inline uint32_t
-ahc_sg_virt_to_bus(struct scb *scb, struct ahc_dma_seg *sg)
-{
-	int sg_index;
-
-	/* sg_list_phys points to entry 1, not 0 */
-	sg_index = sg - &scb->sg_list[1];
-
-	return (scb->sg_list_phys + (sg_index * sizeof(*scb->sg_list)));
-}
-
-static __inline uint32_t
-ahc_hscb_busaddr(struct ahc_softc *ahc, u_int index)
-{
-	return (ahc->scb_data->hscb_busaddr
-		+ (sizeof(struct hardware_scb) * index));
-}
-
-static __inline void
-ahc_sync_scb(struct ahc_softc *ahc, struct scb *scb, int op)
-{
-	ahc_dmamap_sync(ahc, ahc->scb_data->hscb_dmat,
-			ahc->scb_data->hscb_dmamap,
-			/*offset*/(scb->hscb - ahc->scb_data->hscbs) * sizeof(*scb->hscb),
-			/*len*/sizeof(*scb->hscb), op);
-}
-
-static __inline void
-ahc_sync_sglist(struct ahc_softc *ahc, struct scb *scb, int op)
-{
-	if (scb->sg_count == 0)
-		return;
-
-	ahc_dmamap_sync(ahc, ahc->scb_data->sg_dmat, scb->sg_map->sg_dmamap,
-			/*offset*/(scb->sg_list - scb->sg_map->sg_vaddr)
-				* sizeof(struct ahc_dma_seg),
-			/*len*/sizeof(struct ahc_dma_seg) * scb->sg_count, op);
-}
-
-static __inline uint32_t
-ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index)
-{
-	return (((uint8_t *)&ahc->targetcmds[index]) - ahc->qoutfifo);
-}
-
-/******************************** Debugging ***********************************/
-static __inline char *ahc_name(struct ahc_softc *ahc);
-
-static __inline char *
-ahc_name(struct ahc_softc *ahc)
-{
-	return (ahc->name);
-}
-
-/*********************** Miscelaneous Support Functions ***********************/
-
-static __inline void	ahc_update_residual(struct scb *scb);
-static __inline struct ahc_initiator_tinfo *
-			ahc_fetch_transinfo(struct ahc_softc *ahc,
-					    char channel, u_int our_id,
-					    u_int remote_id,
-					    struct ahc_tmode_tstate **tstate);
-static __inline struct scb*
-			ahc_get_scb(struct ahc_softc *ahc);
-static __inline void	ahc_free_scb(struct ahc_softc *ahc, struct scb *scb);
-static __inline void	ahc_swap_with_next_hscb(struct ahc_softc *ahc,
-						struct scb *scb);
-static __inline void	ahc_queue_scb(struct ahc_softc *ahc, struct scb *scb);
-static __inline struct scsi_sense_data *
-			ahc_get_sense_buf(struct ahc_softc *ahc,
-					  struct scb *scb);
-static __inline uint32_t
-			ahc_get_sense_bufaddr(struct ahc_softc *ahc,
-					      struct scb *scb);
-
-/*
- * Determine whether the sequencer reported a residual
- * for this SCB/transaction.
- */
-static __inline void
-ahc_update_residual(struct scb *scb)
-{
-	uint32_t sgptr;
-
-	sgptr = ahc_le32toh(scb->hscb->sgptr);
-	if ((sgptr & SG_RESID_VALID) != 0)
-		ahc_calc_residual(scb);
-}
-
-/*
- * Return pointers to the transfer negotiation information
- * for the specified our_id/remote_id pair.
- */
-static __inline struct ahc_initiator_tinfo *
-ahc_fetch_transinfo(struct ahc_softc *ahc, char channel, u_int our_id,
-		    u_int remote_id, struct ahc_tmode_tstate **tstate)
-{
-	/*
-	 * Transfer data structures are stored from the perspective
-	 * of the target role.  Since the parameters for a connection
-	 * in the initiator role to a given target are the same as
-	 * when the roles are reversed, we pretend we are the target.
-	 */
-	if (channel == 'B')
-		our_id += 8;
-	*tstate = ahc->enabled_targets[our_id];
-	return (&(*tstate)->transinfo[remote_id]);
-}
-
-/*
- * Get a free scb. If there are none, see if we can allocate a new SCB.
- */
-static __inline struct scb *
-ahc_get_scb(struct ahc_softc *ahc)
-{
-	struct scb *scb;
-
-	if ((scb = SLIST_FIRST(&ahc->scb_data->free_scbs)) == NULL) {
-		ahc_alloc_scbs(ahc);
-		scb = SLIST_FIRST(&ahc->scb_data->free_scbs);
-		if (scb == NULL)
-			return (NULL);
-	}
-	SLIST_REMOVE_HEAD(&ahc->scb_data->free_scbs, links.sle);
-	return (scb);
-}
-
-/*
- * Return an SCB resource to the free list.
- */
-static __inline void
-ahc_free_scb(struct ahc_softc *ahc, struct scb *scb)
-{       
-	struct hardware_scb *hscb;
-
-	hscb = scb->hscb;
-	/* Clean up for the next user */
-	ahc->scb_data->scbindex[hscb->tag] = NULL;
-	scb->flags = SCB_FREE;
-	hscb->control = 0;
-
-	SLIST_INSERT_HEAD(&ahc->scb_data->free_scbs, scb, links.sle);
-
-	/* Notify the OSM that a resource is now available. */
-	ahc_platform_scb_free(ahc, scb);
-}
-
-static __inline struct scb *
-ahc_lookup_scb(struct ahc_softc *ahc, u_int tag)
-{
-	struct scb* scb;
-
-	scb = ahc->scb_data->scbindex[tag];
-	if (scb != NULL)
-		ahc_sync_scb(ahc, scb,
-			     BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
-	return (scb);
-}
-
-static __inline void
-ahc_swap_with_next_hscb(struct ahc_softc *ahc, struct scb *scb)
-{
-	struct hardware_scb *q_hscb;
-	u_int  saved_tag;
-
-	/*
-	 * Our queuing method is a bit tricky.  The card
-	 * knows in advance which HSCB to download, and we
-	 * can't disappoint it.  To achieve this, the next
-	 * SCB to download is saved off in ahc->next_queued_scb.
-	 * When we are called to queue "an arbitrary scb",
-	 * we copy the contents of the incoming HSCB to the one
-	 * the sequencer knows about, swap HSCB pointers and
-	 * finally assign the SCB to the tag indexed location
-	 * in the scb_array.  This makes sure that we can still
-	 * locate the correct SCB by SCB_TAG.
-	 */
-	q_hscb = ahc->next_queued_scb->hscb;
-	saved_tag = q_hscb->tag;
-	memcpy(q_hscb, scb->hscb, sizeof(*scb->hscb));
-	if ((scb->flags & SCB_CDB32_PTR) != 0) {
-		q_hscb->shared_data.cdb_ptr =
-		    ahc_hscb_busaddr(ahc, q_hscb->tag)
-		  + offsetof(struct hardware_scb, cdb32);	
-	}
-	q_hscb->tag = saved_tag;
-	q_hscb->next = scb->hscb->tag;
-
-	/* Now swap HSCB pointers. */
-	ahc->next_queued_scb->hscb = scb->hscb;
-	scb->hscb = q_hscb;
-
-	/* Now define the mapping from tag to SCB in the scbindex */
-	ahc->scb_data->scbindex[scb->hscb->tag] = scb;
-}
-
-/*
- * Tell the sequencer about a new transaction to execute.
- */
-static __inline void
-ahc_queue_scb(struct ahc_softc *ahc, struct scb *scb)
-{
-	ahc_swap_with_next_hscb(ahc, scb);
-
-	if (scb->hscb->tag == SCB_LIST_NULL
-	 || scb->hscb->next == SCB_LIST_NULL)
-		panic("Attempt to queue invalid SCB tag %x:%x\n",
-		      scb->hscb->tag, scb->hscb->next);
-
-	/*
-	 * Keep a history of SCBs we've downloaded in the qinfifo.
-	 */
-	ahc->qinfifo[ahc->qinfifonext++] = scb->hscb->tag;
-
-	/*
-	 * Make sure our data is consistant from the
-	 * perspective of the adapter.
-	 */
-	ahc_sync_scb(ahc, scb, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
-
-	/* Tell the adapter about the newly queued SCB */
-	if ((ahc->features & AHC_QUEUE_REGS) != 0) {
-		ahc_outb(ahc, HNSCB_QOFF, ahc->qinfifonext);
-	} else {
-		if ((ahc->features & AHC_AUTOPAUSE) == 0)
-			ahc_pause(ahc);
-		ahc_outb(ahc, KERNEL_QINPOS, ahc->qinfifonext);
-		if ((ahc->features & AHC_AUTOPAUSE) == 0)
-			ahc_unpause(ahc);
-	}
-}
-
-static __inline struct scsi_sense_data *
-ahc_get_sense_buf(struct ahc_softc *ahc, struct scb *scb)
-{
-	int offset;
-
-	offset = scb - ahc->scb_data->scbarray;
-	return (&ahc->scb_data->sense[offset]);
-}
-
-static __inline uint32_t
-ahc_get_sense_bufaddr(struct ahc_softc *ahc, struct scb *scb)
-{
-	int offset;
-
-	offset = scb - ahc->scb_data->scbarray;
-	return (ahc->scb_data->sense_busaddr
-	      + (offset * sizeof(struct scsi_sense_data)));
-}
-
-/************************** Interrupt Processing ******************************/
-static __inline void	ahc_sync_qoutfifo(struct ahc_softc *ahc, int op);
-static __inline void	ahc_sync_tqinfifo(struct ahc_softc *ahc, int op);
-static __inline u_int	ahc_check_cmdcmpltqueues(struct ahc_softc *ahc);
-static __inline void	ahc_intr(struct ahc_softc *ahc);
-
-static __inline void
-ahc_sync_qoutfifo(struct ahc_softc *ahc, int op)
-{
-	ahc_dmamap_sync(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
-			/*offset*/0, /*len*/256, op);
-}
-
-static __inline void
-ahc_sync_tqinfifo(struct ahc_softc *ahc, int op)
-{
-#ifdef AHC_TARGET_MODE
-	if ((ahc->flags & AHC_TARGETROLE) != 0) {
-		ahc_dmamap_sync(ahc, ahc->shared_data_dmat,
-				ahc->shared_data_dmamap,
-				ahc_targetcmd_offset(ahc, 0),
-				sizeof(struct target_cmd) * AHC_TMODE_CMDS,
-				op);
-	}
-#endif
-}
-
-/*
- * See if the firmware has posted any completed commands
- * into our in-core command complete fifos.
- */
-#define AHC_RUN_QOUTFIFO 0x1
-#define AHC_RUN_TQINFIFO 0x2
-static __inline u_int
-ahc_check_cmdcmpltqueues(struct ahc_softc *ahc)
-{
-	u_int retval;
-
-	retval = 0;
-	ahc_dmamap_sync(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
-			/*offset*/ahc->qoutfifonext, /*len*/1,
-			BUS_DMASYNC_POSTREAD);
-	if (ahc->qoutfifo[ahc->qoutfifonext] != SCB_LIST_NULL)
-		retval |= AHC_RUN_QOUTFIFO;
-#ifdef AHC_TARGET_MODE
-	if ((ahc->flags & AHC_TARGETROLE) != 0) {
-		ahc_dmamap_sync(ahc, ahc->shared_data_dmat,
-				ahc->shared_data_dmamap,
-				ahc_targetcmd_offset(ahc, ahc->tqinfifofnext),
-				/*len*/sizeof(struct target_cmd),
-				BUS_DMASYNC_POSTREAD);
-		if (ahc->targetcmds[ahc->tqinfifonext].cmd_valid != 0)
-			retval |= AHC_RUN_TQINFIFO;
-	}
-#endif
-	return (retval);
-}
-
-/*
- * Catch an interrupt from the adapter
- */
-static __inline void
-ahc_intr(struct ahc_softc *ahc)
-{
-	u_int	intstat;
-	u_int 	queuestat;
-
-	/*
-	 * Instead of directly reading the interrupt status register,
-	 * infer the cause of the interrupt by checking our in-core
-	 * completion queues.  This avoids a costly PCI bus read in
-	 * most cases.
-	 */
-	if ((ahc->flags & (AHC_ALL_INTERRUPTS|AHC_EDGE_INTERRUPT)) == 0
-	 && (queuestat = ahc_check_cmdcmpltqueues(ahc)) != 0)
-		intstat = CMDCMPLT;
-	else {
-		intstat = ahc_inb(ahc, INTSTAT);
-		queuestat = AHC_RUN_QOUTFIFO;
-#ifdef AHC_TARGET_MODE
-		if ((ahc->flags & AHC_TARGETROLE) != 0)
-			queuestat |= AHC_RUN_TQINFIFO;
-#endif
-	}
-
-	if (intstat & CMDCMPLT) {
-		ahc_outb(ahc, CLRINT, CLRCMDINT);
-
-		/*
-		 * Ensure that the chip sees that we've cleared
-		 * this interrupt before we walk the output fifo.
-		 * Otherwise, we may, due to posted bus writes,
-		 * clear the interrupt after we finish the scan,
-		 * and after the sequencer has added new entries
-		 * and asserted the interrupt again.
-		 */
-		ahc_flush_device_writes(ahc);
-#ifdef AHC_TARGET_MODE
-		if ((queuestat & AHC_RUN_QOUTFIFO) != 0)
-#endif
-			ahc_run_qoutfifo(ahc);
-#ifdef AHC_TARGET_MODE
-		if ((queuestat & AHC_RUN_TQINFIFO) != 0)
-			ahc_run_tqinfifo(ahc, /*paused*/FALSE);
-#endif
-	}
-
-	if (intstat == 0xFF && (ahc->features & AHC_REMOVABLE) != 0)
-		/* Hot eject */
-		return;
-
-	if ((intstat & INT_PEND) == 0) {
-#if AHC_PCI_CONFIG > 0
-		if (ahc->unsolicited_ints > 500) {
-			ahc->unsolicited_ints = 0;
-			if ((ahc->chip & AHC_PCI) != 0
-			 && (ahc_inb(ahc, ERROR) & PCIERRSTAT) != 0)
-				ahc->bus_intr(ahc);
-		}
-#endif
-		ahc->unsolicited_ints++;
-		return;
-	}
-	ahc->unsolicited_ints = 0;
-
-	if (intstat & BRKADRINT) {
-		ahc_handle_brkadrint(ahc);
-		/* Fatal error, no more interrupts to handle. */
-		return;
-	}
-
-	if ((intstat & (SEQINT|SCSIINT)) != 0)
-		ahc_pause_bug_fix(ahc);
-
-	if ((intstat & SEQINT) != 0)
-		ahc_handle_seqint(ahc, intstat);
-
-	if ((intstat & SCSIINT) != 0)
-		ahc_handle_scsiint(ahc, intstat);
-}
-
-#endif  /* _AIC7XXX_INLINE_H_ */
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c
deleted file mode 100644
index 2afe6e21edf..00000000000
--- a/sys/dev/ic/aic7xxx_openbsd.c
+++ /dev/null
@@ -1,1732 +0,0 @@
-/*
- * Bus independent OpenBSD shim for the aic7xxx based adaptec SCSI controllers
- *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
- * Copyright (c) 2001-2002 Steve Murphree, Jr.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: aic7xxx_openbsd.c,v 1.3 2002/03/14 01:26:54 millert Exp $
- *
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_freebsd.c,v 1.26 2001/07/18 21:39:47 gibbs Exp $
- * $OpenBSD: aic7xxx_openbsd.c,v 1.3 2002/03/14 01:26:54 millert Exp $
- */
-
-#include <dev/ic/aic7xxx_openbsd.h>
-#include <dev/ic/aic7xxx_inline.h>
-
-struct cfdriver ahc_cd = {
-	NULL, "ahc", DV_DULL
-};
-
-int32_t		ahc_action(struct scsi_xfer *xs);
-static void	ahc_minphys(struct buf *bp);
-
-static struct scsi_adapter ahc_switch =
-{
-	ahc_action,
-	ahc_minphys,
-	0,
-	0,
-};
-
-/* the below structure is so we have a default dev struct for our link struct */
-static struct scsi_device ahc_dev =
-{
-	NULL, /* Use default error handler */
-	NULL, /* have a queue, served by this */
-	NULL, /* have no async handler */
-	NULL, /* Use default 'done' routine */
-};
-
-#ifndef AHC_TMODE_ENABLE
-#define AHC_TMODE_ENABLE 0
-#endif
-
-#define ccb_scb_ptr spriv_ptr0
-
-#ifdef AHC_DEBUG
-int     ahc_debug = AHC_DEBUG;
-#endif
-
-#if UNUSED
-static void	ahc_dump_targcmd(struct target_cmd *cmd);
-#endif
-void		ahc_build_free_scb_list(struct ahc_softc *ahc);
-int		ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs,
-				     int nsegments);
-int		ahc_poll(struct ahc_softc *ahc, int wait);
-void		ahc_timeout(void *);
-int		ahc_setup_data(struct ahc_softc *ahc,
-				    struct scsi_xfer *xs,
-				    struct scb *scb);
-void		ahc_set_recoveryscb(struct ahc_softc *ahc,
-					 struct scb *scb);
-int		ahc_init_scbdata(struct ahc_softc *ahc);
-void		ahc_fini_scbdata(struct ahc_softc *ahc);
-
-int		ahc_istagged_device(struct ahc_softc *ahc,
-					 struct scsi_xfer *xs,
-					 int nocmdcheck);
-void		ahc_check_tags(struct ahc_softc *ahc,
-				    struct scsi_xfer *xs);
-
-/*
- * Routines to manage busy targets.  The old driver didn't need to
- * pause the sequencer because no device registers were accessed.  Now
- * busy targets are controlled via the device registers and thus, we
- * have to pause the sequencer for chips that don't have the
- * auto-pause feature.  XXX smurph
- */
-static __inline u_int	ahc_pause_index_busy_tcl(struct ahc_softc *ahc, 
-						      u_int tcl);
-static __inline void	ahc_pause_unbusy_tcl(struct ahc_softc *ahc,
-						  u_int tcl);
-static __inline void	ahc_pause_busy_tcl(struct ahc_softc *ahc,
-						u_int tcl, u_int busyid);
-
-static __inline u_int
-ahc_pause_index_busy_tcl(ahc, tcl)
-	struct ahc_softc *ahc;
-	u_int tcl;
-{
-	u_int retval; 
-	if (ahc->features & AHC_AUTOPAUSE) {
-		retval = ahc_index_busy_tcl(ahc, tcl);
-	} else {
-		ahc_pause(ahc);
-		retval = ahc_index_busy_tcl(ahc, tcl);
-		ahc_unpause(ahc);
-	}
-	return retval;
-}
-
-static __inline void
-ahc_pause_unbusy_tcl(ahc, tcl)
-	struct ahc_softc *ahc;
-	u_int tcl;
-{
-	if (ahc->features & AHC_AUTOPAUSE) {
-		ahc_unbusy_tcl(ahc, tcl);
-	} else {
-		ahc_pause(ahc);
-		ahc_unbusy_tcl(ahc, tcl);
-		ahc_unpause(ahc);
-	}
-}
-					     
-static __inline void
-ahc_pause_busy_tcl(ahc, tcl, busyid)
-	struct ahc_softc *ahc;
-	u_int tcl;
-	u_int busyid;
-{
-	if (ahc->features & AHC_AUTOPAUSE) {
-		ahc_busy_tcl(ahc, tcl, busyid);
-	} else {
-		ahc_pause(ahc);
-		ahc_busy_tcl(ahc, tcl, busyid);
-		ahc_unpause(ahc);
-	}
-}
-
-/* Special routine to force negotiation for OpenBSD */
-void 
-ahc_force_neg(ahc)
-	struct ahc_softc *ahc;
-{
-	int num_targets = AHC_NUM_TARGETS;
-	int i;
-	
-	if ((ahc->features & (AHC_WIDE|AHC_TWIN)) == 0)
-		num_targets = 8;
-
-	for (i = 0; i < num_targets; i++) {
-		struct ahc_initiator_tinfo *tinfo;
-		struct ahc_tmode_tstate *tstate;
-		u_int our_id;
-		u_int target_id;
-		char channel;
-
-		channel = 'A';
-		our_id = ahc->our_id;
-		target_id = i;
-		if (i > 7 && (ahc->features & AHC_TWIN) != 0) {
-			channel = 'B';
-			our_id = ahc->our_id_b;
-			target_id = i % 8;
-		}
-		tinfo = ahc_fetch_transinfo(ahc, channel, our_id,
-					    target_id, &tstate);
-		tinfo->goal = tinfo->user; /* force negotiation */
-		tstate->discenable = ahc->user_discenable;
-	}
-}
-
-int
-ahc_createdmamem(ahc, dmat, size, mapp, vaddr, baddr, seg, nseg, what)
-	struct ahc_softc *ahc;
-	bus_dma_tag_t dmat;
-	int size;
-	bus_dmamap_t *mapp;
-	caddr_t *vaddr;
-	bus_addr_t *baddr;
-	bus_dma_segment_t *seg;
-	int *nseg;
-	const char *what;
-{
-	int error, level = 0;
-	int dma_flags = BUS_DMA_NOWAIT;
-	const char *myname = ahc_name(ahc);
-
-	dmat = ahc->parent_dmat;
-	
-	if ((ahc->chip & AHC_VL) !=0)
-		dma_flags |= ISABUS_DMA_32BIT;
-	
-	if ((error = bus_dmamem_alloc(dmat, size, NBPG, 0,
-			seg, 1, nseg, BUS_DMA_NOWAIT)) != 0) {
-		printf("%s: failed to allocate DMA mem for %s, error = %d\n",
-			myname, what, error);
-		goto out;
-	}
-	level++;
-
-	if ((error = bus_dmamem_map(dmat, seg, *nseg, size, vaddr,
-			BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) {
-		printf("%s: failed to map DMA mem for %s, error = %d\n",
-			myname, what, error);
-		goto out;
-	}
-	level++;
-
-	if ((error = bus_dmamap_create(dmat, size, 1, size, 0,
-			dma_flags, mapp)) != 0) {
-		printf("%s: failed to create DMA map for %s, error = %d\n",
-			myname, what, error);
-		goto out;
-        }
-	level++;
-
-	if ((error = bus_dmamap_load(dmat, *mapp, *vaddr, size, NULL,
-			BUS_DMA_NOWAIT)) != 0) {
-		printf("%s: failed to load DMA map for %s, error = %d\n",
-			myname, what, error);
-		goto out;
-        }
-
-	*baddr = (*mapp)->dm_segs[0].ds_addr;
-	return 0;
-out:
-	switch (level) {
-	case 3:
-		bus_dmamap_destroy(dmat, *mapp);
-		/* FALLTHROUGH */
-	case 2:
-		bus_dmamem_unmap(dmat, *vaddr, size);
-		/* FALLTHROUGH */
-	case 1:
-		bus_dmamem_free(dmat, seg, *nseg);
-		break;
-	default:
-		break;
-	}
-
-	return error;
-}
-
-void
-ahc_freedmamem(tag, size, map, vaddr, seg, nseg)
-	bus_dma_tag_t tag;
-	int size;
-	bus_dmamap_t map;
-	caddr_t vaddr;
-	bus_dma_segment_t *seg;
-	int nseg;
-{
-	bus_dmamap_unload(tag, map);
-	bus_dmamap_destroy(tag, map);
-	bus_dmamem_unmap(tag, vaddr, size);
-	bus_dmamem_free(tag, seg, nseg);
-}
-
-void
-ahc_alloc_scbs(ahc)
-	struct ahc_softc *ahc;
-{
-	struct scb_data *scb_data;
-	struct scb *next_scb;
-	struct sg_map_node *sg_map;
-	bus_addr_t physaddr;
-	struct ahc_dma_seg *segs;
-	int newcount;
-	int i;
-	int dma_flags = 0;
-
-	scb_data = ahc->scb_data;
-	if (scb_data->numscbs >= AHC_SCB_MAX)
-		/* Can't allocate any more */
-		return;
-
-	next_scb = &scb_data->scbarray[scb_data->numscbs];
-
-	sg_map = malloc(sizeof(*sg_map), M_DEVBUF, M_NOWAIT);
-
-	if (sg_map == NULL)
-		return;
-	
-	if (ahc_createdmamem(ahc, scb_data->sg_dmat, PAGE_SIZE, 
-			     &sg_map->sg_dmamap, (caddr_t *)&sg_map->sg_vaddr,
-			     &sg_map->sg_physaddr, &sg_map->sg_dmasegs, 
-			     &sg_map->sg_nseg, "SG space") < 0) {
-		free(sg_map, M_DEVBUF);
-		return;
-	}
-
-	SLIST_INSERT_HEAD(&scb_data->sg_maps, sg_map, links);
-
-	segs = sg_map->sg_vaddr;
-	physaddr = sg_map->sg_physaddr;
-
-	newcount = (PAGE_SIZE / (AHC_NSEG * sizeof(struct ahc_dma_seg)));
-	for (i = 0; scb_data->numscbs < AHC_SCB_MAX && i < newcount; i++) {
-		struct scb_platform_data *pdata;
-		int error;
-		
-		pdata = (struct scb_platform_data *)malloc(sizeof(*pdata),
-							   M_DEVBUF, M_NOWAIT);
-		if (pdata == NULL)
-			break;
-		bzero(pdata, sizeof(*pdata));
-		next_scb->platform_data = pdata;
-		next_scb->sg_map = sg_map;
-		next_scb->sg_list = segs;
-		/*
-		 * The sequencer always starts with the second entry.
-		 * The first entry is embedded in the scb.
-		 */
-		next_scb->sg_list_phys = physaddr + sizeof(struct ahc_dma_seg);
-		next_scb->ahc_softc = ahc;
-		next_scb->flags = SCB_FREE;
-		
-		/* set up AHA-284x correctly. */
-		dma_flags = ((ahc->chip & AHC_VL) !=0) ? 
-			BUS_DMA_NOWAIT|ISABUS_DMA_32BIT :
-			BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW;
-		
-		ahc->buffer_dmat = ahc->parent_dmat;
-		error = bus_dmamap_create(ahc->buffer_dmat,
-					  AHC_MAXTRANSFER_SIZE, AHC_NSEG,
-					  MAXBSIZE, 0, dma_flags, 
-					  &next_scb->dmamap);
-		if (error !=0) 
-			break;
-		
-		next_scb->hscb = &scb_data->hscbs[scb_data->numscbs];
-		next_scb->hscb->tag = ahc->scb_data->numscbs;
-		SLIST_INSERT_HEAD(&ahc->scb_data->free_scbs,
-				  next_scb, links.sle);
-		segs += AHC_NSEG;
-		physaddr += (AHC_NSEG * sizeof(struct ahc_dma_seg));
-		next_scb++;
-		ahc->scb_data->numscbs++;
-	}
-}
-
-int
-ahc_init_scbdata(ahc)
-	struct ahc_softc *ahc;
-{
-	struct scb_data *scb_data;
-
-	scb_data = ahc->scb_data;
-        scb_data->init_level = 0;
-	SLIST_INIT(&scb_data->free_scbs);
-	SLIST_INIT(&scb_data->sg_maps);
-
-	/* Allocate SCB resources */
-	scb_data->scbarray =
-	    (struct scb *)malloc(sizeof(struct scb) * AHC_SCB_MAX,
-				 M_DEVBUF, M_NOWAIT);
-	if (scb_data->scbarray == NULL)
-		return (ENOMEM);
-	memset(scb_data->scbarray, 0, sizeof(struct scb) * AHC_SCB_MAX);
-
-	/* set dma tags */
-	scb_data->hscb_dmat = ahc->parent_dmat;
-	scb_data->sense_dmat = ahc->parent_dmat;
-        scb_data->sg_dmat = ahc->parent_dmat;
-	
-	/* Determine the number of hardware SCBs and initialize them */
-	scb_data->maxhscbs = ahc_probe_scbs(ahc);
-	if ((ahc->flags & AHC_PAGESCBS) != 0) {
-		/* SCB 0 heads the free list */
-		ahc_outb(ahc, FREE_SCBH, 0);
-	} else {
-		ahc_outb(ahc, FREE_SCBH, SCB_LIST_NULL);
-	}
-
-	if (ahc->scb_data->maxhscbs == 0) {
-		printf("%s: No SCB space found\n", ahc_name(ahc));
-		return (ENXIO);
-	}
-
-	ahc_build_free_scb_list(ahc);
-
-	/*
-	 * Create our DMA mappings.  These tags define the kinds of device
-	 * accessible memory allocations and memory mappings we will
-	 * need to perform during normal operation.
-	 *
-	 * Unless we need to further restrict the allocation, we rely
-	 * on the restrictions of the parent dmat, hence the common
-	 * use of MAXADDR and MAXSIZE.
-	 */
-	if (ahc_createdmamem(ahc, scb_data->hscb_dmat,
-	    AHC_SCB_MAX * sizeof(struct hardware_scb), 
-	    &scb_data->hscb_dmamap, (caddr_t *)&scb_data->hscbs, 
-	    &scb_data->hscb_busaddr, &scb_data->hscb_seg,
-	    &scb_data->hscb_nseg, "hardware SCB structures") < 0)
-		goto error_exit;
-	
-	scb_data->init_level++;
-
-	/* DMA for our sense buffers */
-	if (ahc_createdmamem(ahc, scb_data->sense_dmat,
-	    AHC_SCB_MAX * sizeof(struct scsi_sense_data),
-	    &scb_data->sense_dmamap, (caddr_t *)&scb_data->sense,
-	    &scb_data->sense_busaddr, &scb_data->sense_seg,
-	    &scb_data->sense_nseg, "sense buffers") < 0)
-		goto error_exit;
-
-	scb_data->init_level++;
-	
-	/* Perform initial CCB allocation */
-	memset(scb_data->hscbs, 0, AHC_SCB_MAX * sizeof(struct hardware_scb));
-	ahc_alloc_scbs(ahc);
-
-	if (scb_data->numscbs == 0) {
-		printf("%s: ahc_init_scbdata - "
-		       "Unable to allocate initial scbs\n",
-		       ahc_name(ahc));
-		goto error_exit;
-	}
-	scb_data->init_level++;
-
-	/*
-	 * Tell the sequencer which SCB will be the next one it receives.
-	 */
-	ahc->next_queued_scb = ahc_get_scb(ahc);
-	ahc_outb(ahc, NEXT_QUEUED_SCB, ahc->next_queued_scb->hscb->tag);
-
-	/*
-	 * Note that we were successfull
-	 */
-	return (0); 
-
-error_exit:
-
-	return (ENOMEM);
-}
-
-void
-ahc_fini_scbdata(ahc)
-	struct ahc_softc *ahc;
-{
-	struct scb_data *scb_data;
-
-	scb_data = ahc->scb_data;
-
-	switch (scb_data->init_level) {
-	default:
-	case 3:
-	{
-		struct sg_map_node *sg_map;
-
-		while ((sg_map = SLIST_FIRST(&scb_data->sg_maps))!= NULL) {
-			SLIST_REMOVE_HEAD(&scb_data->sg_maps, links);
-			ahc_freedmamem(ahc->parent_dmat, PAGE_SIZE,
-				       sg_map->sg_dmamap,
-				       (caddr_t)sg_map->sg_vaddr,
-				       &sg_map->sg_dmasegs, sg_map->sg_nseg);
-			free(sg_map, M_DEVBUF);
-		}
-	}
-	/*FALLTHROUGH*/
-	case 2:
-		ahc_freedmamem(ahc->parent_dmat,
-			       AHC_SCB_MAX * sizeof(struct scsi_sense_data),
-			       scb_data->sense_dmamap, (caddr_t)scb_data->sense,
-			       &scb_data->sense_seg, scb_data->sense_nseg);
-	/*FALLTHROUGH*/
-	case 1:
-		ahc_freedmamem(ahc->parent_dmat,
-			       AHC_SCB_MAX * sizeof(struct hardware_scb), 
-			       scb_data->hscb_dmamap, (caddr_t)scb_data->hscbs,
-			       &scb_data->hscb_seg, scb_data->hscb_nseg);
-	/*FALLTHROUGH*/
-	}
-	if (scb_data->scbarray != NULL)
-		free(scb_data->scbarray, M_DEVBUF);
-}
-
-void
-ahc_free(ahc)
-	struct ahc_softc *ahc;
-{
-	ahc_fini_scbdata(ahc);
-	if (ahc->init_level != 0)
-		ahc_freedmamem(ahc->parent_dmat, ahc->shared_data_size,
-		    ahc->shared_data_dmamap, ahc->qoutfifo,
-		    &ahc->shared_data_seg, ahc->shared_data_nseg);
-
-	if (ahc->scb_data != NULL)
-		free(ahc->scb_data, M_DEVBUF);
-	return;
-}
-
-/*
- * Attach all the sub-devices we can find
- */
-int
-ahc_attach(ahc)
-	struct ahc_softc *ahc;
-{
-	char   ahc_info[256];
-	int s;
-	ahc_lock(ahc, &s);
-	
-	ahc_controller_info(ahc, ahc_info);
-	printf("%s: %s\n", ahc_name(ahc), ahc_info);
-	/*
-	 * Initialize the software queue.
-	 */
-	LIST_INIT(&ahc->platform_data->sc_xxxq);
-
-#ifdef AHC_BROKEN_CACHE
-	if (cpu_class == CPUCLASS_386)	/* doesn't have "wbinvd" instruction */
-		ahc_broken_cache = 0;
-#endif
-	/*
-	 * fill in the prototype scsi_links.
-	 */
-	ahc->platform_data->sc_link.adapter_target = ahc->our_id;
-	if (ahc->features & AHC_WIDE)
-		ahc->platform_data->sc_link.adapter_buswidth = 16;
-	ahc->platform_data->sc_link.adapter_softc = ahc;
-	ahc->platform_data->sc_link.adapter = &ahc_switch;
-	ahc->platform_data->sc_link.openings = 2;
-	ahc->platform_data->sc_link.device = &ahc_dev;
-	ahc->platform_data->sc_link.flags = SCSIDEBUG_LEVEL;
-	
-	if (ahc->features & AHC_TWIN) {
-		/* Configure the second scsi bus */
-		ahc->platform_data->sc_link_b = ahc->platform_data->sc_link;
-		ahc->platform_data->sc_link_b.adapter_target = ahc->our_id_b;
-		if (ahc->features & AHC_WIDE)
-			ahc->platform_data->sc_link.adapter_buswidth = 16;
-		ahc->platform_data->sc_link_b.adapter_softc = ahc;
-		ahc->platform_data->sc_link_b.adapter = &ahc_switch;
-		ahc->platform_data->sc_link_b.openings = 2;
-		ahc->platform_data->sc_link_b.device = &ahc_dev;
-		ahc->platform_data->sc_link_b.flags = SCSIDEBUG_LEVEL;
-	}
-
-	/*
-	 * ask the adapter what subunits are present
-	 */
-	if (ahc->platform_data->channel_b_primary == FALSE) {
-		/* make SCSI_IS_SCSIBUS_B() == false, while probing channel A */
-		ahc->platform_data->sc_link_b.scsibus = 0xff;
-		config_found((void *)ahc, &ahc->platform_data->sc_link, scsiprint);
-		if (ahc->features & AHC_TWIN)
-			config_found((void *)ahc, &ahc->platform_data->sc_link_b, scsiprint);
-	} else {
-		/*
-		 * if implementation of SCSI_IS_SCSIBUS_B() is changed to use
-		 * ahc->sc_link.scsibus, then "ahc->sc_link.scsibus = 0xff;"
-		 * is needed, here.
-		 */
-		if (ahc->features & AHC_TWIN)
-			config_found((void *)ahc, &ahc->platform_data->sc_link_b, scsiprint);
-		config_found((void *)ahc, &ahc->platform_data->sc_link, scsiprint);
-	}
-	ahc_unlock(ahc, &s);
-	return 1;
-}
-
-/*
- * Catch an interrupt from the adapter
- */
-int
-ahc_platform_intr(arg)
-	void *arg;
-{
-	struct	ahc_softc *ahc;
-	u_int	intstat;
-
-	/*
-	 * Any interrupts to process?
-	 */
-	ahc = (struct ahc_softc *)arg; 
-	
-	intstat = ahc_inb(ahc, INTSTAT);
-	
-	if ((intstat & INT_PEND) == 0) {
-		if (ahc->platform_data->pci_intr_func && 
-		    (int)ahc->platform_data->pci_intr_func(ahc)) {
-#ifdef AHC_DEBUG
-			printf("%s: bus intr: CCHADDR %x HADDR %x SEQADDR %x\n",
-			    ahc_name(ahc),
-			    ahc_inb(ahc, CCHADDR) |
-			    (ahc_inb(ahc, CCHADDR+1) << 8)
-			    | (ahc_inb(ahc, CCHADDR+2) << 16)
-			    | (ahc_inb(ahc, CCHADDR+3) << 24),
-			    ahc_inb(ahc, HADDR) | (ahc_inb(ahc, HADDR+1) << 8)
-			    | (ahc_inb(ahc, HADDR+2) << 16)
-			    | (ahc_inb(ahc, HADDR+3) << 24),
-			    ahc_inb(ahc, SEQADDR0) |
-			    (ahc_inb(ahc, SEQADDR1) << 8));
-#endif
-			return 1;
-		}
-		return 0;
-	}
-
-	ahc_intr(ahc);
-	return 1; 
-}
-
-/*
- * We have an scb which has been processed by the
- * adaptor, now we look to see how the operation
- * went.
- */
-void
-ahc_done(ahc, scb)
-	struct ahc_softc *ahc;
-	struct scb *scb;
-{
-	struct scsi_xfer *xs = scb->io_ctx;
-	struct scsi_link *sc_link = xs->sc_link;
-	int requeue = 0;
-	int target;
-	int lun;
-
-	SC_DEBUG(xs->sc_link, SDEV_DB2, ("ahc_done\n"));
-	
-	LIST_REMOVE(scb, pending_links);
-	if ((scb->flags & SCB_UNTAGGEDQ) != 0) {
-		struct scb_tailq *untagged_q;
-		int target_offset;
-
-		target_offset = SCB_GET_TARGET_OFFSET(ahc, scb);
-		untagged_q = &ahc->untagged_queues[target_offset];
-		TAILQ_REMOVE(untagged_q, scb, links.tqe);
-		scb->flags &= ~SCB_UNTAGGEDQ;
-		ahc_run_untagged_queue(ahc, untagged_q);
-	}
-	
-	timeout_del(&xs->stimeout);
-
-#ifdef AHC_DEBUG
-	if ((ahc_debug & AHC_SHOWCMDS)) {
-		ahc_print_path(ahc, scb);
-		printf("ahc_done: opcode 0x%x tag %x flags %x status %d error %d\n", 
-		       xs->cmdstore.opcode, scb->hscb->tag, 
-		       scb->flags, xs->status, xs->error);
-	}
-#endif
-	
-	target = sc_link->target;
-	lun = sc_link->lun;
-
-	if (xs->datalen) {
-		int op;
-	
-		if ((xs->flags & SCSI_DATA_IN) != 0)
-			op = BUS_DMASYNC_POSTREAD;
-		else
-			op = BUS_DMASYNC_POSTWRITE;
-		ahc->buffer_dmat = ahc->parent_dmat;
-		bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap,
-		    0, scb->dmamap->dm_mapsize, op);
-		
-		bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap);
-	}
-
-	/*
-	 * Unbusy this target/channel/lun.
-	 * XXX if we are holding two commands per lun, 
-	 *     send the next command.
-	 */
-	if (!(scb->hscb->control & TAG_ENB)){
-		ahc_pause_unbusy_tcl(ahc, XS_TCL(xs));
-	}
-
-	/*
-	 * If the recovery SCB completes, we have to be
-	 * out of our timeout.
-	 */
-	if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
-		struct	scb *list_scb;
-
-		/*
-		 * We were able to complete the command successfully,
-		 * so reinstate the timeouts for all other pending
-		 * commands.
-		 */
-		LIST_FOREACH(list_scb, &ahc->pending_scbs, pending_links) {
-			struct scsi_xfer *txs = list_scb->io_ctx;
-			if (!(txs->flags & SCSI_POLL))
-				timeout_add(&list_scb->io_ctx->stimeout,
-				    (list_scb->io_ctx->timeout * hz)/1000);
-		}
-
-		if (xs->error != XS_NOERROR)
-			ahc_set_transaction_status(scb, CAM_CMD_TIMEOUT);
-		ahc_print_path(ahc, scb);
-		printf("no longer in timeout, status = %x\n", xs->status);
-	}
-
-	if (xs->error != XS_NOERROR) {
-		/* Don't clobber any existing error state */
-	} else if ((scb->flags & SCB_SENSE) != 0) {
-		/*
-		 * We performed autosense retrieval.
-		 *
-		 * Zero the sense data before having
-		 * the drive fill it.  The SCSI spec mandates
-		 * that any untransfered data should be
-		 * assumed to be zero.  Complete the 'bounce'
-		 * of sense information through buffers accessible
-		 * via bus-space by copying it into the clients
-		 * csio.
-		 */
-		memset(&xs->sense, 0, sizeof(struct scsi_sense_data));
-		memcpy(&xs->sense, ahc_get_sense_buf(ahc, scb),
-		       ahc_le32toh((scb->sg_list->len & AHC_SG_LEN_MASK)));
-		xs->error = XS_SENSE;
-	}
-	
-	if (scb->platform_data->flags & SCB_FREEZE_QUEUE) {
-		/* keep negs from happening */
-		if (ahc->platform_data->devqueue_blocked[target] > 0) {
-			ahc->platform_data->devqueue_blocked[target]--;
-		}
-		scb->platform_data->flags &= ~SCB_FREEZE_QUEUE;
-	}
-	
-	requeue = scb->platform_data->flags & SCB_REQUEUE;
-	ahc_free_scb(ahc, scb);
-
-	if (requeue) {
-		/*
-		 * Re-insert at the front of the private queue to
-		 * preserve order.
-		 */
-		int s;
-		ahc_lock(ahc, &s);
-		ahc_list_insert_head(ahc, xs);
-		ahc_unlock(ahc, &s);
-	} else {
-		if ((xs->sc_link->lun == 0) &&
-		    (xs->flags & SCSI_POLL) &&
-		    (xs->error == XS_NOERROR))
-			ahc_check_tags(ahc, xs);
-		xs->flags |= ITSDONE;
-		scsi_done(xs);
-	}
-
-	/*
-	 * If there are entries in the software queue, try to
-	 * run the first one.  We should be more or less guaranteed
-	 * to succeed, since we just freed an SCB.
-	 *
-	 * NOTE: ahc_action() relies on our calling it with
-	 * the first entry in the queue.
-	 */
-	if ((xs = ahc->platform_data->sc_xxxq.lh_first) != NULL)
-		(void) ahc_action(xs);
-}
-
-static void
-ahc_minphys(bp)
-	struct buf *bp;
-{
-	/*
-	 * Even though the card can transfer up to 16megs per command
-	 * we are limited by the number of segments in the dma segment
-	 * list that we can hold.  The worst case is that all pages are
-	 * discontinuous physically, hense the "page per segment" limit
-	 * enforced here.
-	 */
-	if (bp->b_bcount > ((AHC_NSEG - 1) * PAGE_SIZE)) {
-		bp->b_bcount = ((AHC_NSEG - 1) * PAGE_SIZE);
-	}
-	minphys(bp);
-}
-
-int32_t
-ahc_action(xs)
-	struct scsi_xfer *xs;
-{
-	struct scsi_xfer *first_xs, *next_xs = NULL;
-	struct ahc_softc *ahc;
-	struct scb *scb;
-	struct hardware_scb *hscb;	
-	struct ahc_initiator_tinfo *tinfo;
-	struct ahc_tmode_tstate *tstate;
-	u_int target_id;
-	u_int our_id;
-	char channel;
-	int s, tcl;
-	u_int16_t mask;
-	int dontqueue = 0, fromqueue = 0;
-
-	SC_DEBUG(xs->sc_link, SDEV_DB3, ("ahc_action\n"));
-	ahc = (struct ahc_softc *)xs->sc_link->adapter_softc;
-
-	/* must protect the queue */
-	ahc_lock(ahc, &s);
-
-	if (xs == ahc->platform_data->sc_xxxq.lh_first) {
-		/*
-		 * Called from ahc_done. Calling with the first entry in
-		 * the queue is really just a way of seeing where we're
-		 * called from. Now, find the first eligible SCB to send,
-		 * e.g. one which will be accepted immediately.
-		 */
-		if (ahc->platform_data->queue_blocked) {
-			ahc_unlock(ahc, &s);
-			return (TRY_AGAIN_LATER);
-		}
-
-		xs = ahc_first_xs(ahc);
-		if (xs == NULL) {
-			ahc_unlock(ahc, &s);
-			return (TRY_AGAIN_LATER);
-		}
-
-		next_xs = ahc_list_next(ahc, xs);
-		ahc_list_remove(ahc, xs);
-		fromqueue = 1;
-		goto get_scb;
-	}
-
-	/* determine safety of software queueing */
-	dontqueue = xs->flags & SCSI_POLL;
-	
-	/*
-	 * If no new requests are accepted, just insert into the
-	 * private queue to wait for our turn.
-	 */
-	tcl = XS_TCL(xs);
-	
-	if (ahc->platform_data->queue_blocked ||
-	    ahc->platform_data->devqueue_blocked[xs->sc_link->target] ||
-	    (!ahc_istagged_device(ahc, xs, 0) &&
-	     ahc_pause_index_busy_tcl(ahc, tcl) != SCB_LIST_NULL)) {
-		if (dontqueue) {
-			ahc_unlock(ahc, &s);
-			xs->error = XS_DRIVER_STUFFUP;
-			return TRY_AGAIN_LATER;
-		}
-		ahc_list_insert_tail(ahc, xs);
-		ahc_unlock(ahc, &s);
-		return SUCCESSFULLY_QUEUED;
-	}
-
-	first_xs = ahc_first_xs(ahc);
-
-	/* determine safety of software queueing */
-	dontqueue = xs->flags & SCSI_POLL;
-
-	/*
-	 * Handle situations where there's already entries in the
-	 * queue.
-	 */
-	if (first_xs != NULL) {
-		/*
-		 * If we can't queue, we have to abort, since
-		 * we have to preserve order.
-		 */
-		if (dontqueue) {
-			ahc_unlock(ahc, &s);
-			xs->error = XS_DRIVER_STUFFUP;
-			return (TRY_AGAIN_LATER);
-		}
-
-		/*
-		 * Swap with the first queue entry.
-		 */
-		ahc_list_insert_tail(ahc, xs);
-		xs = first_xs;
-		next_xs = ahc_list_next(ahc, xs);
-		ahc_list_remove(ahc, xs);
-		fromqueue = 1;
-	}
-
-get_scb:
-
-	target_id = xs->sc_link->target;
-	our_id = SCSI_SCSI_ID(ahc, xs->sc_link);
-
-	/*
-	 * get an scb to use.
-	 */
-	if ((scb = ahc_get_scb(ahc)) == NULL) {
-		if (dontqueue) {
-			ahc_unlock(ahc, &s);
-			xs->error = XS_DRIVER_STUFFUP;
-			return (TRY_AGAIN_LATER);
-		}
-
-		/*
-		 * If we were pulled off the queue, put ourselves
-		 * back to where we came from, otherwise tack ourselves
-		 * onto the end.
-		 */
-		if (fromqueue && next_xs != NULL)
-			ahc_list_insert_before(ahc, xs, next_xs);
-		else
-			ahc_list_insert_tail(ahc, xs);
-
-		ahc_unlock(ahc, &s);
-		return (SUCCESSFULLY_QUEUED);
-	}
-
-	tcl = XS_TCL(xs);
-
-#ifdef DIAGNOSTIC
-	if (!ahc_istagged_device(ahc, xs, 0) &&
-	    ahc_pause_index_busy_tcl(ahc, tcl) != SCB_LIST_NULL)
-		panic("ahc: queuing for busy target");
-#endif
-	
-	scb->io_ctx = xs;
-	hscb = scb->hscb;
-	
-	hscb->control = 0;
-	
-	timeout_set(&xs->stimeout, ahc_timeout, scb);
-
-	if (ahc_istagged_device(ahc, xs, 0)){
-		hscb->control |= TAG_ENB;
-	} else {
-		ahc_pause_busy_tcl(ahc, tcl, scb->hscb->tag);
-	}
-
-	ahc_unlock(ahc, &s);
- 
-	channel = SCSI_CHANNEL(ahc, xs->sc_link);
-	if (ahc->platform_data->inited_channels[channel - 'A'] == 0) {
-		if ((channel == 'A' && (ahc->flags & AHC_RESET_BUS_A)) ||
-		    (channel == 'B' && (ahc->flags & AHC_RESET_BUS_B))) {
-			ahc_lock(ahc, &s);
-			ahc_reset_channel(ahc, channel, TRUE);
-			ahc_unlock(ahc, &s);
-		}
-		ahc->platform_data->inited_channels[channel - 'A'] = 1;
-	}
-
-	/*
-	 * Put all the arguments for the xfer in the scb
-	 */
-	hscb->scsiid = BUILD_SCSIID(ahc, xs->sc_link, target_id, our_id);
-	hscb->lun = XS_LUN(xs);
-	
-	mask = SCB_GET_TARGET_MASK(ahc, scb);
-	tinfo = ahc_fetch_transinfo(ahc, SCSI_CHANNEL(ahc, xs->sc_link), our_id,
-				    target_id, &tstate);
-	
-	if (ahc->platform_data->inited_targets[target_id] == 0) {
-		struct ahc_devinfo devinfo;
-
-		ahc_lock(ahc, &s);
-		ahc_compile_devinfo(&devinfo, our_id, target_id,
-		    XS_LUN(xs), SCSI_CHANNEL(ahc, xs->sc_link),
-		    ROLE_INITIATOR);
-		ahc_update_neg_request(ahc, &devinfo, tstate, tinfo,
-				       /*force*/TRUE);
-		ahc->platform_data->inited_targets[target_id] = 1;
-		ahc_unlock(ahc, &s);
-	}
-
-	hscb->scsirate = tinfo->scsirate;
-	hscb->scsioffset = tinfo->curr.offset;
-	if ((tstate->ultraenb & mask) != 0)
-		hscb->control |= ULTRAENB;
-		
-	if ((tstate->discenable & mask) != 0)
-		hscb->control |= DISCENB;
-
-	if ((tstate->auto_negotiate & mask) != 0) {
-		scb->flags |= SCB_AUTO_NEGOTIATE;
-		hscb->control |= MK_MESSAGE;
-	}
-
-	if (xs->flags & SCSI_RESET) {
-		scb->flags |= SCB_DEVICE_RESET;
-		hscb->control |= MK_MESSAGE;
-		return ahc_execute_scb(scb, NULL, 0);
-	}
-
-	return ahc_setup_data(ahc, xs, scb);
-}
-
-int
-ahc_execute_scb(arg, dm_segs, nsegments)
-	void *arg;
-	bus_dma_segment_t *dm_segs;
-	int nsegments;
-{
-	struct	scb *scb;
-	struct	scsi_xfer *xs;
-	struct	ahc_softc *ahc;
-	struct	ahc_initiator_tinfo *tinfo;
-	struct	ahc_tmode_tstate *tstate;
-	u_int	mask;
-	int	s;
-
-	scb = (struct scb *)arg;
-	xs = scb->io_ctx;
-	ahc = (struct ahc_softc *)xs->sc_link->adapter_softc;
-	
-	if (nsegments != 0) {
-		struct	  ahc_dma_seg *sg;
-		bus_dma_segment_t *end_seg;
-		int op;
-
-		end_seg = dm_segs + nsegments;
-
-		/* Copy the segments into our SG list */
-		sg = scb->sg_list;
-		while (dm_segs < end_seg) {
-			uint32_t len;
-
-			sg->addr = ahc_htole32(dm_segs->ds_addr);
-			len = dm_segs->ds_len
-			    | ((dm_segs->ds_addr >> 8) & 0x7F000000);
-			sg->len = ahc_htole32(len);
-			sg++;
-			dm_segs++;
-		}
-		
-		/*
-		 * Note where to find the SG entries in bus space.
-		 * We also set the full residual flag which the 
-		 * sequencer will clear as soon as a data transfer
-		 * occurs.
-		 */
-		scb->hscb->sgptr = ahc_htole32(scb->sg_list_phys|SG_FULL_RESID);
-		
-		if ((xs->flags & SCSI_DATA_IN) != 0)
-			op = BUS_DMASYNC_PREREAD;
-		else
-			op = BUS_DMASYNC_PREWRITE;
-
-		ahc->buffer_dmat = ahc->parent_dmat;
-		bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap,
-				0, scb->dmamap->dm_mapsize, op);
-		
-		sg--;
-		sg->len |= ahc_htole32(AHC_DMA_LAST_SEG);
-
-		/* Copy the first SG into the "current" data pointer area */
-		scb->hscb->dataptr = scb->sg_list->addr;
-		scb->hscb->datacnt = scb->sg_list->len;
-	} else {
-		scb->hscb->sgptr = SG_LIST_NULL;
-		scb->hscb->dataptr = 0;
-		scb->hscb->datacnt = 0;
-	}
-	
-	scb->sg_count = nsegments;
-
-	ahc_lock(ahc, &s);
-
-	/*
-	 * Last time we need to check if this SCB needs to
-	 * be aborted.
-	 */
-	if (xs->flags & ITSDONE) {
-
-		if (!ahc_istagged_device(ahc, xs, 0)){
-			ahc_pause_unbusy_tcl(ahc, XS_TCL(xs));
-		}
-			
-		if (nsegments != 0)
-			bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap);
-		
-		ahc_free_scb(ahc, scb);
-		ahc_unlock(ahc, &s);
-		return (COMPLETE);
-	}
-
-#ifdef DIAGNOSTIC
-	if (scb->sg_count > 255)
-		panic("ahc bad sg_count");
-#endif
-
-	/* Fixup byte order */
-	scb->hscb->dataptr = ahc_htole32(scb->hscb->dataptr); 
-	scb->hscb->datacnt = ahc_htole32(scb->hscb->datacnt);
-	scb->hscb->sgptr = ahc_htole32(scb->hscb->sgptr);
-	
-	tinfo = ahc_fetch_transinfo(ahc, SCSIID_CHANNEL(ahc, scb->hscb->scsiid),
-				    SCSIID_OUR_ID(scb->hscb->scsiid),
-				    SCSIID_TARGET(ahc, scb->hscb->scsiid),
-				    &tstate);
-
-	mask = SCB_GET_TARGET_MASK(ahc, scb);
-	scb->hscb->scsirate = tinfo->scsirate;
-	scb->hscb->scsioffset = tinfo->curr.offset;
-	if ((tstate->ultraenb & mask) != 0)
-		scb->hscb->control |= ULTRAENB;
-
-	if ((tstate->discenable & mask) != 0)
-		scb->hscb->control |= DISCENB;
-
-	if ((tstate->auto_negotiate & mask) != 0) {
-		scb->flags |= SCB_AUTO_NEGOTIATE;
-		scb->hscb->control |= MK_MESSAGE;
-	}
-	
-	LIST_INSERT_HEAD(&ahc->pending_scbs, scb, pending_links);
-
-	/*
-	 * We only allow one untagged transaction
-	 * per target in the initiator role unless
-	 * we are storing a full busy target *lun*
-	 * table in SCB space.
-	 *
-	 * This really should not be of any 
-	 * concern, as we take care to avoid this
-	 * in ahc_done().  XXX smurph
-	 */
-	if ((scb->hscb->control & (TARGET_SCB|TAG_ENB)) == 0
-	 && (ahc->flags & AHC_SCB_BTT) == 0) {
-		struct scb_tailq *untagged_q;
-		int target_offset;
-
-		target_offset = SCB_GET_TARGET_OFFSET(ahc, scb);
-		untagged_q = &(ahc->untagged_queues[target_offset]);
-		TAILQ_INSERT_TAIL(untagged_q, scb, links.tqe);
-		scb->flags |= SCB_UNTAGGEDQ;
-		if (TAILQ_FIRST(untagged_q) != scb) {
-			ahc_unlock(ahc, &s);
-			return (COMPLETE);
-		}
-	}
-	
-	scb->flags |= SCB_ACTIVE;
-
-	if (!(xs->flags & SCSI_POLL))
-		timeout_add(&xs->stimeout, (xs->timeout * hz) / 1000);
-
-	if ((scb->flags & SCB_TARGET_IMMEDIATE) != 0) {
-		/* Define a mapping from our tag to the SCB. */
-		ahc->scb_data->scbindex[scb->hscb->tag] = scb;
-		ahc_pause(ahc);
-		if ((ahc->flags & AHC_PAGESCBS) == 0)
-			ahc_outb(ahc, SCBPTR, scb->hscb->tag);
-		ahc_outb(ahc, SCB_TAG, scb->hscb->tag);
-		ahc_outb(ahc, RETURN_1, CONT_MSG_LOOP);
-		ahc_unpause(ahc);
-	} else {
-		ahc_queue_scb(ahc, scb);
-	}
-
-#ifdef AHC_DEBUG
-	if ((ahc_debug & AHC_SHOWCMDS)) {
-		ahc_print_path(ahc, scb);
-		printf("opcode 0x%x tag %x len %d flags %x "
-		       "control %x fpos %u rate %x\n",
-		       xs->cmdstore.opcode, scb->hscb->tag, 
-		       scb->hscb->cdb_len, scb->flags, 
-		       scb->hscb->control, ahc->qinfifonext,
-		       scb->hscb->scsirate);
-	}
-#endif
-
-	if (!(xs->flags & SCSI_POLL)) {
-		ahc_unlock(ahc, &s);
-		return (SUCCESSFULLY_QUEUED);
-	}
-	
-	/*
-	 * If we can't use interrupts, poll for completion
-	 */
-	SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_poll\n"));
-	do {
-		if (ahc_poll(ahc, xs->timeout)) {
-			if (!(xs->flags & SCSI_SILENT))
-				printf("cmd fail\n");
-			ahc_timeout(scb);
-			break;
-		}
-	} while (!(xs->flags & ITSDONE));
-	ahc_unlock(ahc, &s);
-	return (COMPLETE);
-}
-
-int
-ahc_poll(ahc, wait)
-	struct	ahc_softc *ahc;
-	int	wait;	/* in msec */
-{
-	while (--wait) {
-		if (ahc->platform_data->pci_intr_func) 
-		    (void)ahc->platform_data->pci_intr_func(ahc);
-		DELAY(1000);
-		if (ahc_inb(ahc, INTSTAT) & INT_PEND)
-			break;
-	}
-
-	if (wait == 0) {
-		printf("%s: board is not responding\n", ahc_name(ahc));
-		return (EIO);
-	}
-	
-	ahc_intr((void *)ahc);
-	
-	return (0);
-}
-
-int
-ahc_setup_data(ahc, xs, scb)
-	struct ahc_softc *ahc;
-	struct scsi_xfer *xs;
-	struct scb *scb;
-{
-	struct hardware_scb *hscb;
-	
-	hscb = scb->hscb;
-	xs->resid = xs->status = 0;
-	xs->error = XS_NOERROR;
-	
-	hscb->cdb_len = xs->cmdlen;
-
-	if (hscb->cdb_len > 12) {
-		memcpy(hscb->cdb32, xs->cmd,
-		       hscb->cdb_len);
-		scb->flags |= SCB_CDB32_PTR;
-	} else {
-		memcpy(hscb->shared_data.cdb,
-		       xs->cmd,
-		       hscb->cdb_len);
-	}
-
-	/* Only use S/G if there is a transfer */
-	if (xs->datalen) {
-		int error;
-
-		error = bus_dmamap_load(ahc->buffer_dmat,
-					scb->dmamap, xs->data,
-					xs->datalen, NULL,
-					(xs->flags & SCSI_NOSLEEP) ?
-					BUS_DMA_NOWAIT : BUS_DMA_WAITOK);
-		if (error) {
-			if (!ahc_istagged_device(ahc, xs, 0)){
-				ahc_pause_unbusy_tcl(ahc, XS_TCL(xs));
-			}
-			return (TRY_AGAIN_LATER);	/* XXX fvdl */
-		}
-		error = ahc_execute_scb(scb,
-					scb->dmamap->dm_segs,
-					scb->dmamap->dm_nsegs);
-		return error;
-	} else {
-		return ahc_execute_scb(scb, NULL, 0);
-	}
-}
-
-void
-ahc_set_recoveryscb(ahc, scb)
-	struct ahc_softc *ahc;
-	struct scb *scb;
-{
-
-	if ((scb->flags & SCB_RECOVERY_SCB) == 0) {
-		struct scb *list_scb;
-
-		scb->flags |= SCB_RECOVERY_SCB;
-
-		/*
-		 * Take all queued, but not sent SCBs out of the equation.
-		 * Also ensure that no new CCBs are queued to us while we
-		 * try to fix this problem.
-		 */
-		ahc->platform_data->queue_blocked = 1;
-
-		/*
-		 * Go through all of our pending SCBs and remove
-		 * any scheduled timeouts for them.  We will reschedule
-		 * them after we've successfully fixed this problem.
-		 */
-		LIST_FOREACH(list_scb, &ahc->pending_scbs, pending_links) {
-			timeout_del(&list_scb->io_ctx->stimeout);
-		}
-	}
-}
-
-void
-ahc_timeout(arg)
-	void *arg;
-{
-	struct	scb *scb;
-	struct	ahc_softc *ahc;
-	int	s, found;
-	u_int	last_phase;
-	int	target;
-	int	lun;
-	int	i;
-	char	channel;
-
-	scb = (struct scb *)arg; 
-	ahc = (struct ahc_softc *)scb->io_ctx->sc_link->adapter_softc;
-
-	ahc_lock(ahc, &s);
-
-	/*
-	 * Ensure that the card doesn't do anything
-	 * behind our back.  Also make sure that we
-	 * didn't "just" miss an interrupt that would
-	 * affect this timeout.
-	 */
-	ahc_pause_and_flushwork(ahc);
-
-	if ((scb->flags & SCB_ACTIVE) == 0) {
-		/* Previous timeout took care of me already */
-		printf("%s: Timedout SCB already complete. "
-		       "Interrupts may not be functioning.\n", ahc_name(ahc));
-		ahc_unpause(ahc);
-		ahc_unlock(ahc, &s);
-		return;
-	}
-	
-	target = SCB_GET_TARGET(ahc, scb);
-	channel = SCB_GET_CHANNEL(ahc, scb);
-	lun = SCB_GET_LUN(scb);
-
-	ahc_print_path(ahc, scb);
-	printf("SCB 0x%x - timed out\n", scb->hscb->tag);
-	
-	/*
-	 * Take a snapshot of the bus state and print out
-	 * some information so we can track down driver bugs.
-	 */
-	ahc_dump_card_state(ahc);
-	last_phase = ahc_inb(ahc, LASTPHASE);
-	
-	if (scb->sg_count > 0) {
-		for (i = 0; i < scb->sg_count; i++) {
-			printf("sg[%d] - Addr 0x%x : Length %d\n",
-			       i,
-			       scb->sg_list[i].addr,
-			       scb->sg_list[i].len & AHC_SG_LEN_MASK);
-		}
-	}
-	
-	if (scb->flags & (SCB_DEVICE_RESET|SCB_ABORT)) {
-		/*
-		 * Been down this road before.
-		 * Do a full bus reset.
-		 */
-bus_reset:
-		ahc_set_transaction_status(scb, CAM_CMD_TIMEOUT);
-		found = ahc_reset_channel(ahc, channel, /*Initiate Reset*/TRUE);
-		printf("%s: Issued Channel %c Bus Reset. "
-		       "%d SCBs aborted\n", ahc_name(ahc), channel, found);
-	} else {
-		/*
-		 * If we are a target, transition to bus free and report
-		 * the timeout.
-		 * 
-		 * The target/initiator that is holding up the bus may not
-		 * be the same as the one that triggered this timeout
-		 * (different commands have different timeout lengths).
-		 * If the bus is idle and we are actiing as the initiator
-		 * for this request, queue a BDR message to the timed out
-		 * target.  Otherwise, if the timed out transaction is
-		 * active:
-		 *   Initiator transaction:
-		 *	Stuff the message buffer with a BDR message and assert
-		 *	ATN in the hopes that the target will let go of the bus
-		 *	and go to the mesgout phase.  If this fails, we'll
-		 *	get another timeout 2 seconds later which will attempt
-		 *	a bus reset.
-		 *
-		 *   Target transaction:
-		 *	Transition to BUS FREE and report the error.
-		 *	It's good to be the target!
-		 */
-		u_int active_scb_index;
-		u_int saved_scbptr;
-
-		saved_scbptr = ahc_inb(ahc, SCBPTR);
-		active_scb_index = ahc_inb(ahc, SCB_TAG);
-		
-		if (last_phase != P_BUSFREE 
-		  && (ahc_inb(ahc, SEQ_FLAGS) & IDENTIFY_SEEN) != 0
-		  && (active_scb_index < ahc->scb_data->numscbs)) {
-			struct scb *active_scb;
-
-			/*
-			 * If the active SCB is not from our device,
-			 * assume that another device is hogging the bus
-			 * and wait for it's timeout to expire before
-			 * taking additional action.
-			 */ 
-			active_scb = ahc_lookup_scb(ahc, active_scb_index);
-			if (active_scb != scb) {
-				u_int	newtimeout;
-
-				ahc_print_path(ahc, active_scb);
-				printf("Other SCB Timeout%s",
-			 	       (scb->flags & SCB_OTHERTCL_TIMEOUT) != 0
-				       ? " again\n" : "\n");
-				scb->flags |= SCB_OTHERTCL_TIMEOUT;
-				newtimeout = MAX(active_scb->io_ctx->timeout,
-						 scb->io_ctx->timeout);
-				timeout_add(&scb->io_ctx->stimeout,
-				    (newtimeout * hz) / 1000);
-				ahc_unpause(ahc);
-				ahc_unlock(ahc, &s);
-				return;
-			} 
-			
-			/* It's us */
-			if ((scb->hscb->control & TARGET_SCB) != 0) {
-
-				/*
-				 * Send back any queued up transactions
-				 * and properly record the error condition.
-				 */
-				ahc_freeze_devq(ahc, scb);
-				ahc_set_transaction_status(scb,
-							   CAM_CMD_TIMEOUT);
-				ahc_freeze_scb(scb);
-				ahc_done(ahc, scb);
-
-				/* Will clear us from the bus */
-				ahc_restart(ahc);
-				ahc_unlock(ahc, &s);
-				return;
-			} 
-
-			ahc_set_recoveryscb(ahc, active_scb);
-			ahc_outb(ahc, MSG_OUT, MSG_BUS_DEV_RESET);
-			ahc_outb(ahc, SCSISIGO, last_phase|ATNO);
-			ahc_print_path(ahc, active_scb);
-			printf("BDR message in message buffer\n");
-			active_scb->flags |=  SCB_DEVICE_RESET;
-			timeout_add(&active_scb->io_ctx->stimeout, 2 * hz);
-			ahc_unpause(ahc);
-		} else {
-			int	 disconnected;
-
-			/* XXX Shouldn't panic.  Just punt instead */
-			if ((scb->hscb->control & TARGET_SCB) != 0)
-				panic("Timed-out target SCB but bus idle");
-
-			if (last_phase != P_BUSFREE
-			 && (ahc_inb(ahc, SSTAT0) & TARGET) != 0) {
-				/* XXX What happened to the SCB? */
-				/* Hung target selection.  Goto busfree */
-				printf("%s: Hung target selection\n",
-				       ahc_name(ahc));
-				ahc_restart(ahc);
-				ahc_unlock(ahc, &s);
-				return;
-			}
-			if (ahc_search_qinfifo(ahc, target, channel, lun,
-					       scb->hscb->tag, ROLE_INITIATOR,
-					       /*status*/0, SEARCH_COUNT) > 0) {
-				disconnected = FALSE;
-			} else {
-				disconnected = TRUE;
-			}
-			
-			if (disconnected) {
-
-				ahc_set_recoveryscb(ahc, scb);
-				/*
-				 * Actually re-queue this SCB in an attempt
-				 * to select the device before it reconnects.
-				 * In either case (selection or reselection),
-				 * we will now issue a target reset to the
-				 * timed-out device.
-				 *
-				 * Set the MK_MESSAGE control bit indicating
-				 * that we desire to send a message.  We
-				 * also set the disconnected flag since
-				 * in the paging case there is no guarantee
-				 * that our SCB control byte matches the
-				 * version on the card.  We don't want the
-				 * sequencer to abort the command thinking
-				 * an unsolicited reselection occurred.
-				 */
-				scb->hscb->control |= MK_MESSAGE|DISCONNECTED;
-				scb->flags |= /*SCB_QUEUED_MSG | */
-					SCB_DEVICE_RESET;
-				
-				/*
-				 * Remove any cached copy of this SCB in the
-				 * disconnected list in preparation for the
-				 * queuing of our abort SCB.  We use the
-				 * same element in the SCB, SCB_NEXT, for
-				 * both the qinfifo and the disconnected list.
-				 */
-				ahc_search_disc_list(ahc, target, channel,
-						     lun, scb->hscb->tag,
-						     /*stop_on_first*/TRUE,
-						     /*remove*/TRUE,
-						     /*save_state*/FALSE);
-
-				/*
-				 * In the non-paging case, the sequencer will
-				 * never re-reference the in-core SCB.
-				 * To make sure we are notified during
-				 * reslection, set the MK_MESSAGE flag in
-				 * the card's copy of the SCB.
-				 */
-				if ((ahc->flags & AHC_PAGESCBS) == 0) {
-					ahc_outb(ahc, SCBPTR, scb->hscb->tag);
-					ahc_outb(ahc, SCB_CONTROL,
-						 ahc_inb(ahc, SCB_CONTROL)
-						| MK_MESSAGE);
-				}
-				/*
-				 * Clear out any entries in the QINFIFO first
-				 * so we are the next SCB for this target
-				 * to run.
-				 */
-				ahc_search_qinfifo(ahc,
-						   SCB_GET_TARGET(ahc, scb),
-						   channel, SCB_GET_LUN(scb),
-						   SCB_LIST_NULL,
-						   ROLE_INITIATOR,
-						   CAM_REQUEUE_REQ,
-						   SEARCH_COMPLETE);
-				ahc_print_path(ahc, scb);
-				printf("Queuing a BDR SCB\n");
-				ahc_qinfifo_requeue_tail(ahc, scb);
-				ahc_outb(ahc, SCBPTR, saved_scbptr);
-				timeout_add(&scb->io_ctx->stimeout, 2 * hz);
-				ahc_unpause(ahc);
-			} else {
-				/* Go "immediatly" to the bus reset */
-				/* This shouldn't happen */
-				ahc_set_recoveryscb(ahc, scb);
-				ahc_print_path(ahc, scb);
-				printf("SCB %d: Immediate reset.  "
-					"Flags = 0x%x\n", scb->hscb->tag,
-					scb->flags);
-				goto bus_reset;
-			}
-		}
-	}
-	ahc_unlock(ahc, &s);
-}
-
-void
-ahc_send_async(ahc, channel, target, lun, code, opt_arg)
-	struct ahc_softc *ahc;
-	char channel;
-	u_int target, lun, code;
-        void *opt_arg;
-{
-	/* Nothing to do here for OpenBSD */
-}
-
-void
-ahc_platform_set_tags(ahc, devinfo, alg)
-	struct ahc_softc *ahc;
-	struct ahc_devinfo *devinfo;
-	ahc_queue_alg alg;
-{
-	struct ahc_initiator_tinfo *tinfo;
-	struct ahc_tmode_tstate *tstate;
-
-	tinfo = ahc_fetch_transinfo(ahc, devinfo->channel,
-				    devinfo->our_scsiid,
-				    devinfo->target,
-				    &tstate);
-
-	switch (alg) {
-	case AHC_QUEUE_BASIC:
-	case AHC_QUEUE_TAGGED:
-		tstate->tagenable |= devinfo->target_mask;
-		break;
-	case AHC_QUEUE_NONE:
-		tstate->tagenable &= ~devinfo->target_mask;
-		break;
-	}
-}
-
-int
-ahc_platform_alloc(ahc, platform_arg)
-	struct ahc_softc *ahc;
-	void *platform_arg;
-{
-	ahc->platform_data = malloc(sizeof(struct ahc_platform_data), M_DEVBUF,
-	    M_NOWAIT);
-	if (ahc->platform_data == NULL)
-		return (ENOMEM);
-	bzero(ahc->platform_data, sizeof(struct ahc_platform_data));
-	
-	/* Just do some initialization... */
-	ahc->scb_data = NULL;
-        ahc->platform_data->ih = NULL;
-	ahc->platform_data->pci_intr_func = NULL;
-	ahc->platform_data->channel_b_primary = FALSE;
-
-	return (0);
-}
-
-void
-ahc_platform_free(ahc)
-	struct ahc_softc *ahc;
-{
-	free(ahc->platform_data, M_DEVBUF);
-}
-
-int
-ahc_softc_comp(lahc, rahc)
-	struct ahc_softc *lahc;
-	struct ahc_softc *rahc;
-{
-	/* We don't sort softcs under OpenBSD so report equal always */
-	return (0);
-}
-
-void
-ahc_check_tags(ahc, xs)
-	struct ahc_softc *ahc;
-	struct scsi_xfer *xs;
-{
-	struct ahc_devinfo devinfo;
-
-	if (xs->sc_link->quirks & SDEV_NOTAGS)
-		return;
-
-	if (ahc_istagged_device(ahc, xs, 1))
-		return;
-
-	ahc_compile_devinfo(&devinfo,
-	    SCSI_SCSI_ID(ahc, xs->sc_link),
-	    XS_SCSI_ID(xs),
-	    XS_LUN(xs),
-	    SCSI_CHANNEL(ahc, xs->sc_link),
-	    ROLE_INITIATOR);
-
-	ahc_set_tags(ahc, &devinfo, AHC_QUEUE_TAGGED);
-
-	printf("%s: target %d using tagged queuing\n",
-	    ahc_name(ahc), XS_SCSI_ID(xs));
-
-	if (ahc->scb_data->maxhscbs >= 16 ||
-	    (ahc->flags & AHC_PAGESCBS)) {
-		/* Default to 16 tags */
-		xs->sc_link->openings += 14;
-	} else {
-		/*	
-		 * Default to 4 tags on whimpy
-		 * cards that don't have much SCB
-		 * space and can't page.  This prevents
-		 * a single device from hogging all
-		 * slots.  We should really have a better
-		 * way of providing fairness.
-		 */
-		xs->sc_link->openings += 2;
-	}
-}
-
-int
-ahc_istagged_device(ahc, xs, nocmdcheck)
-	struct ahc_softc *ahc;
-	struct scsi_xfer *xs;
-	int nocmdcheck;
-{
-	char channel;
-	u_int our_id, target;
-	struct ahc_tmode_tstate *tstate;
-	struct ahc_devinfo devinfo;
-
-	if (xs->sc_link->quirks & SDEV_NOTAGS)
-		return 0;
-
-	/*
-	 * XXX never do these commands with tags. Should really be
-	 * in a higher layer.
-	 */
-	if (!nocmdcheck && (xs->cmd->opcode == INQUIRY ||
-	     xs->cmd->opcode == TEST_UNIT_READY ||
-	     xs->cmd->opcode == REQUEST_SENSE))
-		return 0;
-
-	channel = SCSI_CHANNEL(ahc, xs->sc_link);
-	our_id = SCSI_SCSI_ID(ahc, xs->sc_link);
-	target = XS_SCSI_ID(xs);
-	(void)ahc_fetch_transinfo(ahc, channel, our_id, target, &tstate);
-
-	ahc_compile_devinfo(&devinfo, our_id, target, XS_LUN(xs),
-			    channel, ROLE_INITIATOR);
-
-	return (tstate->tagenable & devinfo.target_mask);
-}
-
-#if UNUSED
-static void
-ahc_dump_targcmd(cmd)
-	struct target_cmd *cmd;
-{
-	uint8_t *byte;
-	uint8_t *last_byte;
-	int i;
-
-	byte = &cmd->initiator_channel;
-	/* Debugging info for received commands */
-	last_byte = &cmd[1].initiator_channel;
-
-	i = 0;
-	while (byte < last_byte) {
-		if (i == 0)
-			printf("\t");
-		printf("%#x", *byte++);
-		i++;
-		if (i == 8) {
-			printf("\n");
-			i = 0;
-		} else {
-			printf(", ");
-		}
-	}
-}
-#endif
-
diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h
deleted file mode 100644
index f93431b9393..00000000000
--- a/sys/dev/ic/aic7xxx_openbsd.h
+++ /dev/null
@@ -1,837 +0,0 @@
-/*
- * OpenBSD platform specific driver option settings, data structures,
- * function declarations and includes. 
- *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
- * Copyright (c) 2001-2002 Steve Murphree, Jr.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. The name of the author(s) may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: aic7xxx_openbsd.h,v 1.3 2002/03/14 01:26:54 millert Exp $
- *
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_freebsd.h,v 1.12 2001/07/18 21:39:47 gibbs Exp $
- * $OpenBSD: aic7xxx_openbsd.h,v 1.3 2002/03/14 01:26:54 millert Exp $
- */
-
-#ifndef _AIC7XXX_OPENBSD_H_
-#define _AIC7XXX_OPENBSD_H_
-
-#include "pci.h"		/* for config options */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/pci/pcivar.h>
-
-#include <sys/malloc.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/queue.h>
-
-#include <scsi/scsi_all.h>
-#include <scsi/scsi_message.h>
-#include <scsi/scsi_debug.h>
-#include <scsi/scsiconf.h>
-
-#include <uvm/uvm_extern.h>
-
-#define AHC_SHOWSENSE	0x01
-#define AHC_SHOWMISC	0x02
-#define AHC_SHOWCMDS	0x04
-
-#if NPCI > 0 
-#define AHC_PCI_CONFIG 1
-#endif 
-
-#if 0
-#define AHC_DEBUG	AHC_SHOWSENSE | AHC_SHOWMISC | AHC_SHOWCMDS
-extern int ahc_debug;
-#endif 
-
-#ifdef DEBUG
-#define bootverbose	1
-#else 
-#define bootverbose	0
-#endif 
-/****************************** Platform Macros *******************************/
-
-#define	SCSI_IS_SCSIBUS_B(ahc, sc_link)	\
-	((sc_link)->scsibus == (ahc)->platform_data->sc_link_b.scsibus)
-#define	SCSI_SCSI_ID(ahc, sc_link)	\
-	(SCSI_IS_SCSIBUS_B(ahc, sc_link) ? ahc->our_id_b : ahc->our_id)
-#define	SCSI_CHANNEL(ahc, sc_link)	\
-	(SCSI_IS_SCSIBUS_B(ahc, sc_link) ? 'B' : 'A')
-#define BUILD_SCSIID(ahc, sc_link, target_id, our_id) \
-        ((((target_id) << TID_SHIFT) & TID) | (our_id) \
-        | (SCSI_IS_SCSIBUS_B(ahc, sc_link) ? TWIN_CHNLB : 0))
-#define XS_SCSI_ID(xs) \
-	((xs)->sc_link->target)
-#define XS_LUN(xs) \
-	((xs)->sc_link->lun)
-#define XS_TCL(xs) \
-	BUILD_TCL(XS_SCSI_ID(xs), XS_LUN(xs))
-
-#ifndef offsetof
-#define offsetof(type, member)  ((size_t)(&((type *)0)->member))
-#endif
-
-/* COMPAT CAM to XS stuff */
-#define CAM_DIR_IN		SCSI_DATA_IN
-#define AC_TRANSFER_NEG		0
-#define AC_SENT_BDR		0
-#define AC_BUS_RESET		0
-#define CAM_BUS_WILDCARD	((int)~0)
-#define CAM_TARGET_WILDCARD	((int)~0)
-#define CAM_LUN_WILDCARD	((int)~0)
-
-/* SPI-3 definitions */
-#ifndef MSG_SIMPLE_TASK
-#define MSG_SIMPLE_TASK		MSG_SIMPLE_Q_TAG
-#endif
-#ifndef MSG_ORDERED_TASK
-#define MSG_ORDERED_TASK	MSG_ORDERED_Q_TAG
-#endif 
-
-/*  FreeBSD to OpenBSD message defs */
-#define MSG_EXT_PPR_QAS_REQ	MSG_EXT_PPR_PROT_QAS
-#define MSG_EXT_PPR_DT_REQ	MSG_EXT_PPR_PROT_DT	
-#define MSG_EXT_PPR_IU_REQ      MSG_EXT_PPR_PROT_IUS
-
-/*  FreeBSD bus_space defines */
-#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF
-#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
-#define BUS_SPACE_MAXSIZE       (64 * 1024) /* Maximum supported size */
-#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF
-#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF
-#define BUS_SPACE_MAXADDR       0xFFFFFFFF
-
-/* CAM  Status field values (From FreeBSD cam.h 1.10 */
-typedef enum {
-	CAM_REQ_INPROG,		/* CCB request is in progress */
-	CAM_REQ_CMP,		/* CCB request completed without error */
-	CAM_REQ_ABORTED,	/* CCB request aborted by the host */
-	CAM_UA_ABORT,		/* Unable to abort CCB request */
-	CAM_REQ_CMP_ERR,	/* CCB request completed with an error */
-	CAM_BUSY,		/* CAM subsystem is busy */
-	CAM_REQ_INVALID,	/* CCB request was invalid */
-	CAM_PATH_INVALID,	/* Supplied Path ID is invalid */
-	CAM_DEV_NOT_THERE,	/* SCSI Device Not Installed/there */
-	CAM_UA_TERMIO,		/* Unable to terminate I/O CCB request */
-	CAM_SEL_TIMEOUT,	/* Target Selection Timeout */
-	CAM_CMD_TIMEOUT,	/* Command timeout */
-	CAM_SCSI_STATUS_ERROR,	/* SCSI error, look at error code in CCB */
-	CAM_MSG_REJECT_REC,	/* Message Reject Received */
-	CAM_SCSI_BUS_RESET,	/* SCSI Bus Reset Sent/Received */
-	CAM_UNCOR_PARITY,	/* Uncorrectable parity error occurred */
-	CAM_AUTOSENSE_FAIL = 0x10,/* Autosense: request sense cmd fail */
-	CAM_NO_HBA,		/* No HBA Detected error */
-	CAM_DATA_RUN_ERR,	/* Data Overrun error */
-	CAM_UNEXP_BUSFREE,	/* Unexpected Bus Free */
-	CAM_SEQUENCE_FAIL,	/* Target Bus Phase Sequence Failure */
-	CAM_CCB_LEN_ERR,	/* CCB length supplied is inadequate */
-	CAM_PROVIDE_FAIL,	/* Unable to provide requested capability */
-	CAM_BDR_SENT,		/* A SCSI BDR msg was sent to target */
-	CAM_REQ_TERMIO,		/* CCB request terminated by the host */
-	CAM_UNREC_HBA_ERROR,	/* Unrecoverable Host Bus Adapter Error */
-	CAM_REQ_TOO_BIG,	/* The request was too large for this host */
-	CAM_REQUEUE_REQ,	/*
-				 * This request should be requeued to preserve
-				 * transaction ordering.  This typically occurs
-				 * when the SIM recognizes an error that should
-				 * freeze the queue and must place additional
-				 * requests for the target at the sim level
-				 * back into the XPT queue.
-				 */
-	CAM_IDE = 0x33,		/* Initiator Detected Error */
-	CAM_RESRC_UNAVAIL,	/* Resource Unavailable */
-	CAM_UNACKED_EVENT,	/* Unacknowledged Event by Host */
-	CAM_MESSAGE_RECV,	/* Message Received in Host Target Mode */
-	CAM_INVALID_CDB,	/* Invalid CDB received in Host Target Mode */
-	CAM_LUN_INVALID,	/* Lun supplied is invalid */
-	CAM_TID_INVALID,	/* Target ID supplied is invalid */
-	CAM_FUNC_NOTAVAIL,	/* The requested function is not available */
-	CAM_NO_NEXUS,		/* Nexus is not established */
-	CAM_IID_INVALID,	/* The initiator ID is invalid */
-	CAM_CDB_RECVD,		/* The SCSI CDB has been received */
-	CAM_LUN_ALRDY_ENA,	/* The LUN is already enabled for target mode */
-	CAM_SCSI_BUSY,		/* SCSI Bus Busy */
-
-	CAM_DEV_QFRZN = 0x40,	/* The DEV queue is frozen w/this err */
-
-	/* Autosense data valid for target */
-	CAM_AUTOSNS_VALID = 0x80,
-	CAM_RELEASE_SIMQ = 0x100,/* SIM ready to take more commands */
-	CAM_SIM_QUEUED   = 0x200,/* SIM has this command in it's queue */
-
-	CAM_STATUS_MASK = 0x3F,	/* Mask bits for just the status # */
-
-	/* Target Specific Adjunct Status */
-	CAM_SENT_SENSE = 0x40000000	/* sent sense with status */
-} cam_status;
-
-/*  FreeBSD to OpenBSD status defs */
-#define SCSI_STATUS_CHECK_COND	SCSI_CHECK
-#define SCSI_STATUS_CMD_TERMINATED	SCSI_TERMINATED
-#define SCSI_STATUS_OK		SCSI_OK
-#define SCSI_REV_2		SC_SCSI_2
-
-/************************* Forward Declarations *******************************/
-typedef struct pci_attach_args * ahc_dev_softc_t;
-typedef struct scsi_xfer * ahc_io_ctx_t;
-
-/***************************** Bus Space/DMA **********************************/
-
-/* XXX Need to update Bus DMA for partial map syncs */
-#define ahc_dmamap_sync(ahc, dma_tag, dmamap, offset, len, op)	\
-	bus_dmamap_sync(dma_tag, dmamap, offset, len, op)
-
-/************************ Tunable Driver Parameters  **************************/
-/*
- * The number of dma segments supported.  The sequencer can handle any number
- * of physically contiguous S/G entrys.  To reduce the driver's memory
- * consumption, we limit the number supported to be sufficient to handle
- * the largest mapping supported by the kernel, MAXPHYS.  Assuming the
- * transfer is as fragmented as possible and unaligned, this turns out to
- * be the number of paged sized transfers in MAXPHYS plus an extra element
- * to handle any unaligned residual.  The sequencer fetches SG elements
- * in cacheline sized chucks, so make the number per-transaction an even
- * multiple of 16 which should align us on even the largest of cacheline
- * boundaries. 
- */
-#define AHC_NSEG (roundup(btoc(MAXPHYS) + 1, 16))
-
-/* This driver does NOT supports target mode */
-#ifdef AHC_TARGET_MODE
-#undef AHC_TARGET_MODE
-#endif 
-
-/***************************** Core Includes **********************************/
-#include <dev/ic/aic7xxx.h>
-
-/************************** Softc/SCB Platform Data ***************************/
-struct ahc_platform_data {
-	bus_dma_segment_t	pshared_data_seg;
-	int			pshared_data_nseg;
-	int			pshared_data_size;
-#define shared_data_seg		platform_data->pshared_data_seg
-#define shared_data_nseg	platform_data->pshared_data_nseg
-#define shared_data_size	platform_data->pshared_data_size
-	/*
-	 * Hooks into the XPT.
-	 */
-	struct	scsi_link	sc_link;
-        /* Second bus for Twin channel cards */
-	struct	scsi_link 	sc_link_b;
-	
-	void			*ih;
-	int			channel_b_primary;
-	
-	/* for pci error interrupts  */
-	int(*pci_intr_func)(struct ahc_softc *);
-	
-	/* queue management */
-	int			queue_blocked;
-	u_int16_t		devqueue_blocked[AHC_NUM_TARGETS];
-	LIST_HEAD(, scsi_xfer) sc_xxxq;	/* XXX software request queue */
-	struct scsi_xfer *sc_xxxqlast;	/* last entry in queue */
-	
-	u_int8_t		inited_targets[AHC_NUM_TARGETS];
-	u_int8_t		inited_channels[2];
-};
-
-typedef enum {
-	SCB_FREEZE_QUEUE	= 0x0001,
-	SCB_REQUEUE		= 0x0002
-} scb_pflag;
-
-struct scb_platform_data {
-	scb_pflag	flags;
-};
-
-/*
- * Some ISA devices (e.g. on a VLB) can perform 32-bit DMA.  This
- * flag is passed to bus_dmamap_create() to indicate that fact.
- */
-#ifndef ISABUS_DMA_32BIT
-#define ISABUS_DMA_32BIT	BUS_DMA_BUS1
-#endif 
-
-/********************************* Byte Order *********************************/
-#define ahc_htobe16(x) htobe16(x)
-#define ahc_htobe32(x) htobe32(x)
-#define ahc_htobe64(x) htobe64(x)
-#define ahc_htole16(x) htole16(x)
-#define ahc_htole32(x) htole32(x)
-#define ahc_htole64(x) htole64(x)
-                       
-#define ahc_be16toh(x) betoh16(x)
-#define ahc_be32toh(x) betoh32(x)
-#define ahc_be64toh(x) betoh64(x)
-#define ahc_le16toh(x) letoh16(x)
-#define ahc_le32toh(x) letoh32(x)
-#define ahc_le64toh(x) letoh64(x)
-
-/*************************** Device Access ************************************/
-#define ahc_inb(ahc, port)				\
-	bus_space_read_1((ahc)->tag, (ahc)->bsh, port)
-
-#define ahc_outb(ahc, port, value)			\
-	bus_space_write_1((ahc)->tag, (ahc)->bsh, port, value)
-
-#define ahc_outsb(ahc, port, valp, count)		\
-	bus_space_write_multi_1((ahc)->tag, (ahc)->bsh, port, valp, count)
-
-#define ahc_insb(ahc, port, valp, count)		\
-	bus_space_read_multi_1((ahc)->tag, (ahc)->bsh, port, valp, count)
-
-static __inline void ahc_flush_device_writes(struct ahc_softc *);
-
-static __inline void
-ahc_flush_device_writes(ahc)
-	struct ahc_softc *ahc;
-{
-	/* XXX Is this sufficient for all architectures??? */
-	ahc_inb(ahc, INTSTAT);
-}
-
-/**************************** Locking Primitives ******************************/
-/* Lock protecting internal data structures */
-static __inline void ahc_lockinit(struct ahc_softc *);
-static __inline void ahc_lock(struct ahc_softc *, int *flags);
-static __inline void ahc_unlock(struct ahc_softc *, int *flags);
-
-/* Lock held during command compeletion to the upper layer */
-static __inline void ahc_done_lockinit(struct ahc_softc *);
-static __inline void ahc_done_lock(struct ahc_softc *, int *flags);
-static __inline void ahc_done_unlock(struct ahc_softc *, int *flags);
-
-static __inline void
-ahc_lockinit(ahc)
-	struct ahc_softc *ahc;
-{
-	/* Nothing to do here for OpenBSD */
-}
-
-static __inline void
-ahc_lock(ahc, flags)
-	struct ahc_softc *ahc;
-	int *flags;
-{
-	*flags = splbio();
-}
-
-static __inline void
-ahc_unlock(ahc, flags)
-	struct ahc_softc *ahc;
-	int *flags;
-{
-	splx(*flags);
-}
-
-/* Lock held during command compeletion to the upper layer */
-static __inline void
-ahc_done_lockinit(ahc)
-	struct ahc_softc *ahc;
-{
-	/* Nothing to do here for OpenBSD */
-}
-
-static __inline void
-ahc_done_lock(ahc, flags)
-	struct ahc_softc *ahc;
-	int *flags;
-{
-	/* Nothing to do here for OpenBSD */
-}
-
-static __inline void
-ahc_done_unlock(ahc, flags)
-	struct ahc_softc *ahc;
-	int *flags;
-{
-	/* Nothing to do here for OpenBSD */
-}
-
-/****************************** OS Primitives *********************************/
-#define ahc_delay delay
-
-/************************** Transaction Operations ****************************/
-static __inline void ahc_set_transaction_status(struct scb *, uint32_t);
-static __inline void ahc_set_scsi_status(struct scb *, uint32_t);
-static __inline uint32_t ahc_get_transaction_status(struct scb *);
-static __inline uint32_t ahc_get_scsi_status(struct scb *);
-static __inline void ahc_set_transaction_tag(struct scb *, int, u_int);
-static __inline u_long ahc_get_transfer_length(struct scb *);
-static __inline int ahc_get_transfer_dir(struct scb *);
-static __inline void ahc_set_residual(struct scb *, u_long);
-static __inline void ahc_set_sense_residual(struct scb *, u_long);
-static __inline u_long ahc_get_residual(struct scb *);
-static __inline int ahc_perform_autosense(struct scb *);
-static __inline uint32_t ahc_get_sense_bufsize(struct ahc_softc*, struct scb*);
-static __inline void ahc_freeze_scb(struct scb *scb);
-static __inline void ahc_platform_freeze_devq(struct ahc_softc *, struct scb *);
-static __inline int  ahc_platform_abort_scbs(struct ahc_softc *ahc, int target,
-						  char channel, int lun, u_int tag,
-						  role_t role, uint32_t status);
-static __inline void ahc_platform_scb_free(struct ahc_softc *ahc,
-						struct scb *scb);
-
-/* 
- * This is a hack to keep from modifying the main
- * driver code as much as possible.  This function
- * does CAM to SCSI api stuff.
- */
-static __inline
-void ahc_set_transaction_status(scb, status)
-	struct scb *scb;
-	uint32_t status;
-{
-	/* don't wipe the error */
-	if (scb->io_ctx->error == XS_NOERROR){
-		switch (status) {
-		case CAM_CMD_TIMEOUT:
-			status = XS_TIMEOUT;
-			break;
-		case CAM_BDR_SENT:
-		case CAM_SCSI_BUS_RESET:
-			status = XS_RESET;
-			break;
-		case CAM_UNEXP_BUSFREE:
-		case CAM_REQ_TOO_BIG:
-		case CAM_REQ_ABORTED:
-		case CAM_AUTOSENSE_FAIL:
-		case CAM_NO_HBA:
-			status = XS_DRIVER_STUFFUP;
-			break;
-		case CAM_SEL_TIMEOUT:
-			status = XS_SELTIMEOUT;
-			break;
-		case CAM_REQUEUE_REQ:
-			scb->platform_data->flags |= SCB_REQUEUE;
-			scb->io_ctx->error = XS_NOERROR;
-			break;
-		case CAM_SCSI_STATUS_ERROR:
-		default:
-			status = scb->io_ctx->error;
-			break;
-		}
-	} else {
-		status = scb->io_ctx->error;
-	}
-	scb->io_ctx->error = status;
-}
-
-static __inline
-void ahc_set_scsi_status(scb, status)
-	struct scb *scb;
-	uint32_t status;
-{
-	scb->io_ctx->status = status;
-}
-
-/* 
- * This is a hack to keep from modifying the main
- * driver code as much as possible.
- * This function ONLY needs to return weather 
- * a scsi_xfer is in progress or not. XXX smurph
- */
-static __inline
-uint32_t ahc_get_transaction_status(scb)
-	struct scb *scb;
-{
-	return (scb->io_ctx->flags & ITSDONE ? CAM_REQ_CMP : CAM_REQ_INPROG);
-}
-
-static __inline
-uint32_t ahc_get_scsi_status(scb)
-	struct scb *scb;
-{
-	return (scb->io_ctx->status);
-}
-
-static __inline
-void ahc_set_transaction_tag(scb, enabled, type)
-	struct scb *scb;
-	int enabled;
-	u_int type;
-{
-	struct scsi_xfer *xs = scb->io_ctx;
-	switch (type) {
-	case MSG_SIMPLE_TASK:
-		if (enabled)
-			xs->sc_link->quirks &= ~SDEV_NOTAGS;
-		else
-			xs->sc_link->quirks |= SDEV_NOTAGS;
-		break;
-	}
-}
-
-static __inline
-u_long ahc_get_transfer_length(scb)
-	struct scb *scb;
-{
-	return (scb->io_ctx->datalen);
-}
-
-static __inline
-int ahc_get_transfer_dir(scb)
-	struct scb *scb;
-{
-	return (scb->io_ctx->flags & (SCSI_DATA_IN | SCSI_DATA_OUT));
-}
-
-static __inline
-void ahc_set_residual(scb, resid)
-	struct scb *scb;
-	u_long resid;
-{
-	scb->io_ctx->resid = resid;
-}
-
-static __inline
-void ahc_set_sense_residual(scb, resid)
-	struct scb *scb;
-	u_long resid;
-{
-	scb->io_ctx->resid = resid;
-}
-
-static __inline
-u_long ahc_get_residual(scb)
-	struct scb *scb;
-{
-	return (scb->io_ctx->resid);
-}
-
-static __inline
-int ahc_perform_autosense(scb)
-	struct scb *scb;
-{
-	/* Return true for OpenBSD */
-	return (1);
-}
-
-static __inline uint32_t
-ahc_get_sense_bufsize(ahc, scb)
-	struct ahc_softc *ahc;
-	struct scb *scb;
-{
-	return (sizeof(struct scsi_sense_data));
-}
-
-static __inline void
-ahc_freeze_scb(scb)
-	struct scb *scb;
-{
-	struct scsi_xfer *xs = scb->io_ctx;
-	struct ahc_softc *ahc = (struct ahc_softc *)xs->sc_link->adapter_softc;
-	int target;
-
-	target = xs->sc_link->target;
-	if (!(scb->platform_data->flags & SCB_FREEZE_QUEUE)) {
-		ahc->platform_data->devqueue_blocked[target]++;
-		scb->platform_data->flags |= SCB_FREEZE_QUEUE;
-	}
-}
-
-static __inline void
-ahc_platform_freeze_devq(ahc, scb)
-	struct ahc_softc *ahc;
-	struct scb *scb;
-{
-	/* Nothing to do here for OpenBSD */
-}
-
-static __inline int
-ahc_platform_abort_scbs(ahc, target, channel, lun, tag, role, status)
-	struct ahc_softc *ahc;
-	int target, lun;
-	char channel;
-	u_int tag;
-	role_t role;
-	uint32_t status;
-{
-	/* Nothing to do here for OpenBSD */
-	return (0);
-}
-
-static __inline void
-ahc_platform_scb_free(ahc, scb)
-	struct ahc_softc *ahc;
-	struct scb *scb;
-{
-	int s;
-
-	ahc_lock(ahc, &s);
-	
-	if ((ahc->flags & AHC_RESOURCE_SHORTAGE) != 0 ||
-	    (scb->flags & SCB_RECOVERY_SCB) != 0) {
-		ahc->flags &= ~AHC_RESOURCE_SHORTAGE;
-		ahc->platform_data->queue_blocked = 0;
-	}
-	
-	timeout_del(&scb->io_ctx->stimeout);
-	
-	ahc_unlock(ahc, &s);
-}
-
-/********************************** PCI ***************************************/
-#ifdef AHC_PCI_CONFIG
-int			 ahc_pci_map_registers(struct ahc_softc *ahc);
-int			 ahc_pci_map_int(struct ahc_softc *ahc);
-
-typedef enum
-{
-	AHC_POWER_STATE_D0,
-	AHC_POWER_STATE_D1,
-	AHC_POWER_STATE_D2,
-	AHC_POWER_STATE_D3
-} ahc_power_state;
-
-void			ahc_power_state_change(struct ahc_softc *ahc,
-						    ahc_power_state new_state);
-
-static __inline uint32_t ahc_pci_read_config(ahc_dev_softc_t pci,
-						  int reg, int width);
-static __inline void	ahc_pci_write_config(ahc_dev_softc_t pci,
-						  int reg, uint32_t value,
-						  int width);
-static __inline u_int	ahc_get_pci_function(ahc_dev_softc_t);
-static __inline u_int	ahc_get_pci_slot(ahc_dev_softc_t);
-static __inline u_int	ahc_get_pci_bus(ahc_dev_softc_t);
-
-
-static __inline uint32_t
-ahc_pci_read_config(pa, reg, width)
-	ahc_dev_softc_t pa;
-	int reg, width;
-{
-	return (pci_conf_read(pa->pa_pc, pa->pa_tag, reg));
-}
-
-static __inline void
-ahc_pci_write_config(pa, reg, value, width)
-	ahc_dev_softc_t pa;
-	uint32_t value;
-	int reg, width;
-{
-	pci_conf_write(pa->pa_pc, pa->pa_tag, reg, value);
-}
-
-static __inline u_int
-ahc_get_pci_function(pa)
-	ahc_dev_softc_t pa;
-{
-	return (pa->pa_function);
-}
-
-static __inline u_int
-ahc_get_pci_slot(pa)
-	ahc_dev_softc_t pa;
-{
-	return (pa->pa_device);
-}
-
-static __inline u_int
-ahc_get_pci_bus(pa)
-	ahc_dev_softc_t pa;
-{
-	return (pa->pa_bus);
-}
-#endif
-
-/******************************** VL/EISA *************************************/
-int aic7770_map_registers(struct ahc_softc *ahc);
-int aic7770_map_int(struct ahc_softc *ahc, int irq);
-
-/********************************* Debug **************************************/
-static __inline void	ahc_print_path(struct ahc_softc *, struct scb *);
-static __inline void	ahc_platform_dump_card_state(struct ahc_softc *ahc);
-
-static __inline void
-ahc_print_path(ahc, scb)
-	struct ahc_softc *ahc;
-	struct scb *scb;
-{
-	sc_print_addr(scb->io_ctx->sc_link);
-}
-
-static __inline void
-ahc_platform_dump_card_state(ahc)
-	struct ahc_softc *ahc;
-{
-	/* Nothing to do here for OpenBSD */
-}
-/**************************** Transfer Settings *******************************/
-void	  ahc_notify_xfer_settings_change(struct ahc_softc *,
-					       struct ahc_devinfo *);
-void	  ahc_platform_set_tags(struct ahc_softc *, struct ahc_devinfo *,
-				     ahc_queue_alg);
-
-/************************* Initialization/Teardown ****************************/
-int	  ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg);
-void	  ahc_platform_free(struct ahc_softc *ahc);
-int	  ahc_attach(struct ahc_softc *);
-int	  ahc_softc_comp(struct ahc_softc *lahc, struct ahc_softc *rahc);
-
-/****************************** Interrupts ************************************/
-int			ahc_platform_intr(void *);
-static __inline void	ahc_platform_flushwork(struct ahc_softc *ahc);
-
-static __inline void
-ahc_platform_flushwork(ahc)
-	struct ahc_softc *ahc;
-{
-	/* Nothing to do here for OpenBSD */
-}
-
-/************************ Misc Function Declarations **************************/
-void	ahc_done(struct ahc_softc *ahc, struct scb *scb);
-void	ahc_send_async(struct ahc_softc *, char /*channel*/,
-			    u_int /*target*/, u_int /*lun*/, u_int, void *arg);
-
-int	ahc_createdmamem(struct ahc_softc *ahc, bus_dma_tag_t dmat,
-			      int size, bus_dmamap_t *mapp, caddr_t *vaddr,
-			      bus_addr_t *baddr, bus_dma_segment_t *segs,
-			      int *nseg, const char *what);
-void	ahc_freedmamem(bus_dma_tag_t tag, int size,
-			    bus_dmamap_t map, caddr_t vaddr,
-			    bus_dma_segment_t *seg, int nseg);
-void	ahc_force_neg(struct ahc_softc *ahc);
-
-/*
- * Routines to manage a scsi_xfer into the software queue.  
- * We overload xs->free_list to to ensure we don't run into a queue 
- * resource shortage, and keep a pointer to the last entry around 
- * to make insertion O(C).
- */
-static __inline	void   ahc_list_insert_before(struct ahc_softc *ahc,
-						   struct scsi_xfer *xs,
-						   struct scsi_xfer *next_xs);
-static __inline	void   ahc_list_insert_head(struct ahc_softc *ahc,
-						 struct scsi_xfer *xs);
-static __inline	void   ahc_list_insert_tail(struct ahc_softc *ahc,
-						 struct scsi_xfer *xs);
-static __inline	void   ahc_list_remove(struct ahc_softc *ahc,
-					    struct scsi_xfer *xs);
-static __inline	struct scsi_xfer *ahc_list_next(struct ahc_softc *ahc,
-						     struct scsi_xfer *xs);
-static __inline	struct scsi_xfer *ahc_first_xs(struct ahc_softc *);
-
-static __inline void
-ahc_list_insert_before(ahc, xs, next_xs)
-	struct ahc_softc *ahc;
-	struct scsi_xfer *xs;
-	struct scsi_xfer *next_xs;
-{
-	LIST_INSERT_BEFORE(xs, next_xs, free_list); 
-
-}
-
-static __inline void
-ahc_list_insert_head(ahc, xs)
-	struct ahc_softc *ahc;
-	struct scsi_xfer *xs;
-{
-	if (ahc->platform_data->sc_xxxq.lh_first == NULL)
-		ahc->platform_data->sc_xxxqlast = xs;
-	LIST_INSERT_HEAD(&ahc->platform_data->sc_xxxq, xs, free_list);
-	return;
-}
-
-static __inline void
-ahc_list_insert_tail(ahc, xs)
-	struct ahc_softc *ahc;
-	struct scsi_xfer *xs;
-{
-	if (ahc->platform_data->sc_xxxq.lh_first == NULL){
-		ahc->platform_data->sc_xxxqlast = xs;
-		LIST_INSERT_HEAD(&ahc->platform_data->sc_xxxq, xs, free_list);
-		return;
-	}
-	LIST_INSERT_AFTER(ahc->platform_data->sc_xxxqlast, xs, free_list);
-	ahc->platform_data->sc_xxxqlast = xs;
-}
-
-static __inline void
-ahc_list_remove(ahc, xs)
-	struct ahc_softc *ahc;
-	struct scsi_xfer *xs;
-{
-	struct scsi_xfer *lxs;
-	if (xs == ahc->platform_data->sc_xxxqlast) {
-		lxs = ahc->platform_data->sc_xxxq.lh_first;
-		while (lxs != NULL) {
-			if (LIST_NEXT(lxs, free_list) == ahc->platform_data->sc_xxxqlast) {
-                                ahc->platform_data->sc_xxxqlast = lxs;
-				break;
-			}
-			lxs = LIST_NEXT(xs, free_list);
-		}
-	}
-	
-	LIST_REMOVE(xs, free_list);
-	if (ahc->platform_data->sc_xxxq.lh_first == NULL)
-		ahc->platform_data->sc_xxxqlast = NULL;
-}
-
-static __inline struct scsi_xfer *
-ahc_list_next(ahc, xs)
-	struct ahc_softc *ahc;
-	struct scsi_xfer *xs;
-{
-	return(LIST_NEXT(xs, free_list));
-}
-
-/*
- * Pick the first xs for a non-blocked target.
- */
-static __inline struct scsi_xfer *
-ahc_first_xs(ahc)
-	struct ahc_softc *ahc;
-{
-	int target;
-	struct scsi_xfer *xs = ahc->platform_data->sc_xxxq.lh_first;
-
-	if (ahc->platform_data->queue_blocked)
-        	return NULL;
-
-	while (xs != NULL) {
-		target = xs->sc_link->target;
-		if (ahc->platform_data->devqueue_blocked[target] == 0 &&
-		    ahc_index_busy_tcl(ahc, XS_TCL(xs)) == SCB_LIST_NULL)
-			break;
-		xs = LIST_NEXT(xs, free_list);
-	}
-
-	return xs;
-}
-#endif  /* _AIC7XXX_OPENBSD_H_ */
-
diff --git a/sys/dev/ic/aic7xxxreg.h b/sys/dev/ic/aic7xxxreg.h
index c02d3aac96f..36ae18f9d06 100644
--- a/sys/dev/ic/aic7xxxreg.h
+++ b/sys/dev/ic/aic7xxxreg.h
@@ -1,10 +1,5 @@
-/* $OpenBSD: aic7xxxreg.h,v 1.8 2002/02/16 04:36:33 smurph Exp $ */
 /*
- * DO NOT EDIT - This file is automatically generated
- *               from the following source files:
- *
- * $Id: aic7xxxreg.h,v 1.8 2002/02/16 04:36:33 smurph Exp $
- * $Id: aic7xxxreg.h,v 1.8 2002/02/16 04:36:33 smurph Exp $
+ * DO NOT EDIT - This file is automatically generated.
  */
 
 #define	SCSISEQ         		0x00
@@ -28,15 +23,6 @@
 #define		ACTNEGEN        	0x02
 #define		STPWEN          	0x01
 
-#define	SCSISIGI        		0x03
-#define		P_DATAIN_DT     	0x60
-#define		P_DATAOUT_DT    	0x20
-#define		ATNI            	0x10
-#define		SELI            	0x08
-#define		BSYI            	0x04
-#define		REQI            	0x02
-#define		ACKI            	0x01
-
 #define	SCSISIGO        		0x03
 #define		CDO             	0x80
 #define		IOO             	0x40
@@ -47,13 +33,20 @@
 #define		REQO            	0x02
 #define		ACKO            	0x01
 
+#define	SCSISIGI        		0x03
+#define		ATNI            	0x10
+#define		SELI            	0x08
+#define		BSYI            	0x04
+#define		REQI            	0x02
+#define		ACKI            	0x01
+
 #define	SCSIRATE        		0x04
 #define		WIDEXFER        	0x80
 #define		SXFR            	0x70
 #define		ENABLE_CRC      	0x40
 #define		SINGLE_EDGE     	0x10
-#define		SXFR_ULTRA2     	0x0f
 #define		SOFS            	0x0f
+#define		SXFR_ULTRA2     	0x0f
 
 #define	SCSIID          		0x05
 #define	SCSIOFFSET      		0x05
@@ -63,6 +56,8 @@
 
 #define	SCSIDATH        		0x07
 
+#define	STCNT           		0x08
+
 #define	OPTIONMODE      		0x08
 #define		AUTORATEEN      	0x80
 #define		AUTOACKEN       	0x40
@@ -74,15 +69,12 @@
 #define		AUTO_MSGOUT_DE  	0x02
 #define		DIS_MSGIN_DUALEDGE	0x01
 
-#define	STCNT           		0x08
-
 #define	TARGCRCCNT      		0x0a
 
 #define	CLRSINT0        		0x0b
 #define		CLRSELDO        	0x40
 #define		CLRSELDI        	0x20
 #define		CLRSELINGO      	0x10
-#define		CLRIOERR        	0x08
 #define		CLRSWRAP        	0x08
 #define		CLRSPIORDY      	0x02
 
@@ -118,19 +110,15 @@
 
 #define	SSTAT2          		0x0d
 #define		OVERRUN         	0x80
-#define		SHVALID         	0x40
 #define		SFCNT           	0x1f
 #define		EXP_ACTIVE      	0x10
-#define		CRCVALERR       	0x08
-#define		CRCENDERR       	0x04
-#define		CRCREQERR       	0x02
-#define		DUAL_EDGE_ERR   	0x01
 
 #define	SSTAT3          		0x0e
 #define		SCSICNT         	0xf0
 #define		OFFCNT          	0x0f
 
 #define	SCSIID_ULTRA2   		0x0f
+#define		OID             	0x0f
 
 #define	SIMODE0         		0x10
 #define		ENSELDO         	0x40
@@ -196,12 +184,12 @@
 #define		BRDDAT5         	0x20
 #define		BRDDAT4         	0x10
 #define		BRDSTB          	0x10
-#define		BRDDAT3         	0x08
 #define		BRDCS           	0x08
+#define		BRDDAT3         	0x08
 #define		BRDDAT2         	0x04
 #define		BRDRW           	0x04
-#define		BRDCTL1         	0x02
 #define		BRDRW_ULTRA2    	0x02
+#define		BRDCTL1         	0x02
 #define		BRDCTL0         	0x01
 #define		BRDSTB_ULTRA2   	0x01
 
@@ -220,44 +208,36 @@
 #define		DIAGLEDON       	0x40
 #define		AUTOFLUSHDIS    	0x20
 #define		ENAB40          	0x08
-#define		SELBUSB         	0x08
 #define		ENAB20          	0x04
 #define		SELWIDE         	0x02
 #define		XCVR            	0x01
 
 #define	SRAM_BASE       		0x20
 
-#define	BUSY_TARGETS    		0x20
 #define	TARG_SCSIRATE   		0x20
+#define	CMDSIZE_TABLE   		0x20
 
 #define	ULTRA_ENB       		0x30
-#define	CMDSIZE_TABLE   		0x30
 
 #define	DISC_DSB        		0x32
 
-#define	CMDSIZE_TABLE_TAIL		0x34
-
-#define	MWI_RESIDUAL    		0x38
+#define	MSG_OUT         		0x34
 
-#define	NEXT_QUEUED_SCB 		0x39
-
-#define	MSG_OUT         		0x3a
-
-#define	DMAPARAMS       		0x3b
+#define	DMAPARAMS       		0x35
 #define		PRELOADEN       	0x80
 #define		WIDEODD         	0x40
 #define		SCSIEN          	0x20
 #define		SDMAENACK       	0x10
 #define		SDMAEN          	0x10
-#define		HDMAENACK       	0x08
 #define		HDMAEN          	0x08
+#define		HDMAENACK       	0x08
 #define		DIRECTION       	0x04
 #define		FIFOFLUSH       	0x02
 #define		FIFORESET       	0x01
 
-#define	SEQ_FLAGS       		0x3c
+#define	SEQ_FLAGS       		0x36
 #define		IDENTIFY_SEEN   	0x80
-#define		TARGET_CMD_IS_TAGGED	0x40
+#define		SCBPTR_VALID    	0x40
 #define		DPHASE          	0x20
 #define		TARG_CMD_PENDING	0x10
 #define		CMDPHASE_PENDING	0x08
@@ -265,13 +245,15 @@
 #define		SPHASE_PENDING  	0x02
 #define		NO_DISCONNECT   	0x01
 
-#define	SAVED_SCSIID    		0x3d
+#define	SAVED_TCL       		0x37
 
-#define	SAVED_LUN       		0x3e
+#define	SG_COUNT        		0x38
 
-#define	LASTPHASE       		0x3f
-#define		PHASE_MASK      	0xe0
+#define	SG_NEXT         		0x39
+
+#define	LASTPHASE       		0x3d
 #define		P_MESGIN        	0xe0
+#define		PHASE_MASK      	0xe0
 #define		P_STATUS        	0xc0
 #define		P_MESGOUT       	0xa0
 #define		P_COMMAND       	0x80
@@ -282,30 +264,30 @@
 #define		P_BUSFREE       	0x01
 #define		P_DATAOUT       	0x00
 
-#define	WAITING_SCBH    		0x40
+#define	WAITING_SCBH    		0x3e
 
-#define	DISCONNECTED_SCBH		0x41
+#define	DISCONNECTED_SCBH		0x3f
 
-#define	FREE_SCBH       		0x42
+#define	FREE_SCBH       		0x40
 
-#define	COMPLETE_SCBH   		0x43
+#define	HSCB_ADDR       		0x41
 
-#define	HSCB_ADDR       		0x44
+#define	SCBID_ADDR      		0x45
 
-#define	SHARED_DATA_ADDR		0x48
+#define	TMODE_CMDADDR   		0x49
 
-#define	KERNEL_QINPOS   		0x4c
+#define	KERNEL_QINPOS   		0x4d
 
-#define	QINPOS          		0x4d
+#define	QINPOS          		0x4e
 
-#define	QOUTPOS         		0x4e
+#define	QOUTPOS         		0x4f
 
-#define	KERNEL_TQINPOS  		0x4f
+#define	KERNEL_TQINPOS  		0x50
 
-#define	TQINPOS         		0x50
+#define	TQINPOS         		0x51
 
-#define	ARG_1           		0x51
-#define	RETURN_1        		0x51
+#define	ARG_1           		0x52
+#define	RETURN_1        		0x52
 #define		SEND_MSG        	0x80
 #define		SEND_SENSE      	0x40
 #define		SEND_REJ        	0x20
@@ -314,12 +296,16 @@
 #define		CONT_MSG_LOOP   	0x04
 #define		CONT_TARG_SESSION	0x02
 
-#define	ARG_2           		0x52
-#define	RETURN_2        		0x52
+#define	ARG_2           		0x53
+#define	RETURN_2        		0x53
+
+#define	LAST_MSG        		0x54
+
+#define	PREFETCH_CNT    		0x55
 
-#define	LAST_MSG        		0x53
+#define	TARGET_MSG_REQUEST		0x56
 
-#define	SCSISEQ_TEMPLATE		0x54
+#define	SCSISEQ_TEMPLATE		0x58
 #define		ENSELO          	0x40
 #define		ENSELI          	0x20
 #define		ENRSELI         	0x10
@@ -327,12 +313,7 @@
 #define		ENAUTOATNI      	0x04
 #define		ENAUTOATNP      	0x02
 
-#define	DATA_COUNT_ODD  		0x55
-
-#define	INITIATOR_TAG   		0x56
-
-#define	SEQ_FLAGS2      		0x57
-#define		SCB_DMA         	0x01
+#define	DATA_COUNT_ODD  		0x59
 
 #define	SCSICONF        		0x5a
 #define		TERM_ENB        	0x80
@@ -341,9 +322,7 @@
 #define		HWSCSIID        	0x0f
 #define		HSCSIID         	0x07
 
-#define	INTDEF          		0x5c
-#define		EDGE_TRIG       	0x80
-#define		VECTOR          	0x0f
+#define	INITIATOR_TAG   		0x5a
 
 #define	HOSTCONF        		0x5d
 
@@ -377,10 +356,10 @@
 
 #define	ALLONES         		0x69
 
-#define	NONE            		0x6a
-
 #define	ALLZEROS        		0x6a
 
+#define	NONE            		0x6a
+
 #define	FLAGS           		0x6b
 #define		ZERO            	0x02
 #define		CARRY           	0x01
@@ -413,14 +392,8 @@
 #define		BOFF            	0xf0
 #define		BON             	0x0f
 
-#define	DSCOMMAND1      		0x85
-#define		DSLATT          	0xfc
-#define		HADDLDSEL1      	0x02
-#define		HADDLDSEL0      	0x01
-
 #define	BUSSPD          		0x86
 #define		DFTHRSH         	0xc0
-#define		DFTHRSH_75      	0x80
 #define		STBOFF          	0x38
 #define		STBON           	0x07
 
@@ -439,8 +412,8 @@
 #define		IRQMS           	0x08
 #define		PAUSE           	0x04
 #define		INTEN           	0x02
-#define		CHIPRSTACK      	0x01
 #define		CHIPRST         	0x01
+#define		CHIPRSTACK      	0x01
 
 #define	HADDR           		0x88
 
@@ -450,17 +423,15 @@
 
 #define	INTSTAT         		0x91
 #define		SEQINT_MASK     	0xf1
-#define		OUT_OF_RANGE    	0xe1
-#define		NO_FREE_SCB     	0xd1
-#define		SCB_MISMATCH    	0xc1
-#define		MISSED_BUSFREE  	0xb1
-#define		MKMSG_FAILED    	0xa1
-#define		DATA_OVERRUN    	0x91
-#define		PERR_DETECTED   	0x81
+#define		DATA_OVERRUN    	0xf1
+#define		MSGIN_PHASEMIS  	0xe1
+#define		TRACEPOINT      	0xd1
+#define		PERR_DETECTED   	0xb1
+#define		HOST_MSG_LOOP   	0xa1
+#define		TRACE_POINT     	0x91
+#define		RESIDUAL        	0x81
 #define		BAD_STATUS      	0x71
-#define		HOST_MSG_LOOP   	0x61
-#define		PDATA_REINIT    	0x51
-#define		IGN_WIDE_RES    	0x41
+#define		UPDATE_TMSG_REQ 	0x61
 #define		NO_MATCH        	0x31
 #define		NO_IDENT        	0x21
 #define		SEND_REJECT     	0x11
@@ -468,8 +439,15 @@
 #define		BRKADRINT       	0x08
 #define		SCSIINT         	0x04
 #define		CMDCMPLT        	0x02
-#define		SEQINT          	0x01
 #define		BAD_PHASE       	0x01
+#define		SEQINT          	0x01
+
+#define	CLRINT          		0x92
+#define		CLRPARERR       	0x10
+#define		CLRBRKADRINT    	0x08
+#define		CLRSCSIINT      	0x04
+#define		CLRCMDINT       	0x02
+#define		CLRSEQINT       	0x01
 
 #define	ERROR           		0x92
 #define		CIOPARERR       	0x80
@@ -481,19 +459,11 @@
 #define		ILLSADDR        	0x02
 #define		ILLHADDR        	0x01
 
-#define	CLRINT          		0x92
-#define		CLRPARERR       	0x10
-#define		CLRBRKADRINT    	0x08
-#define		CLRSCSIINT      	0x04
-#define		CLRCMDINT       	0x02
-#define		CLRSEQINT       	0x01
-
 #define	DFCNTRL         		0x93
 
 #define	DFSTATUS        		0x94
 #define		PRELOAD_AVAIL   	0x80
-#define		DFCACHETH       	0x40
-#define		FIFOQWDEMP      	0x20
+#define		DWORDEMP        	0x20
 #define		MREQPEND        	0x10
 #define		HDONE           	0x08
 #define		DFTHRESH        	0x04
@@ -531,79 +501,75 @@
 #define		COMMAND_PHASE   	0x10
 #define		MSG_IN_PHASE    	0x08
 #define		MSG_OUT_PHASE   	0x04
-#define		DATA_PHASE_MASK 	0x03
 #define		DATA_IN_PHASE   	0x02
 #define		DATA_OUT_PHASE  	0x01
 
 #define	SFUNCT          		0x9f
 #define		ALT_MODE        	0x80
 
-#define	SCB_CDB_PTR     		0xa0
-#define	SCB_TARGET_INFO 		0xa0
-#define	SCB_RESIDUAL_DATACNT		0xa0
-#define	SCB_CDB_STORE   		0xa0
+#define	SCB_CONTROL     		0xa0
+#define		TARGET_SCB      	0x80
+#define		DISCENB         	0x40
+#define		TAG_ENB         	0x20
+#define		MK_MESSAGE      	0x10
+#define		ULTRAENB        	0x08
+#define		DISCONNECTED    	0x04
+#define		SCB_TAG_TYPE    	0x03
 
 #define	SCB_BASE        		0xa0
 
-#define	SCB_RESIDUAL_SGPTR		0xa4
+#define	SCB_TCL         		0xa1
+#define		TID             	0xf0
+#define		SELBUSB         	0x08
+#define		LID             	0x07
+
+#define	SCB_TARGET_STATUS		0xa2
 
-#define	SCB_SCSI_STATUS 		0xa8
+#define	SCB_SGCOUNT     		0xa3
 
-#define	SCB_CDB_STORE_PAD		0xa9
+#define	SCB_SGPTR       		0xa4
+
+#define	SCB_RESID_SGCNT 		0xa8
+
+#define	SCB_RESID_DCNT  		0xa9
 
 #define	SCB_DATAPTR     		0xac
 
 #define	SCB_DATACNT     		0xb0
-#define		SG_LAST_SEG     	0x80
-#define		SG_HIGH_ADDR_BITS	0x7f
-
-#define	SCB_SGPTR       		0xb4
-#define		SG_RESID_VALID  	0x04
-#define		SG_FULL_RESID   	0x02
-#define		SG_LIST_NULL    	0x01
 
-#define	SCB_CONTROL     		0xb8
-#define		TARGET_SCB      	0x80
-#define		DISCENB         	0x40
-#define		TAG_ENB         	0x20
-#define		MK_MESSAGE      	0x10
-#define		ULTRAENB        	0x08
-#define		DISCONNECTED    	0x04
-#define		SCB_TAG_TYPE    	0x03
+#define	SCB_CMDPTR      		0xb4
+#define	SCB_TARGET_PHASES		0xb4
+#define		TARGET_DATA_IN  	0x01
 
-#define	SCB_SCSIID      		0xb9
-#define		TID             	0xf0
-#define		TWIN_CHNLB      	0x80
-#define		TWIN_TID        	0x70
-#define		OID             	0x0f
+#define	SCB_CMDLEN      		0xb8
+#define	SCB_INITIATOR_TAG		0xb8
 
-#define	SCB_LUN         		0xba
-#define		LID             	0xff
+#define	SCB_TAG         		0xb9
 
-#define	SCB_TAG         		0xbb
+#define	SCB_NEXT        		0xba
 
-#define	SCB_CDB_LEN     		0xbc
+#define	SCB_SCSIRATE    		0xbb
 
-#define	SCB_SCSIRATE    		0xbd
+#define	SCB_SCSIOFFSET  		0xbc
 
-#define	SCB_SCSIOFFSET  		0xbe
+#define	SCB_SPARE       		0xbd
 
-#define	SCB_NEXT        		0xbf
+#define	SCB_CMDSTORE    		0xc0
 
 #define	SEECTL_2840     		0xc0
 #define		CS_2840         	0x04
 #define		CK_2840         	0x02
 #define		DO_2840         	0x01
 
-#define	SCB_64_SPARE    		0xc0
-
 #define	STATUS_2840     		0xc1
 #define		EEPROM_TF       	0x80
 #define		BIOS_SEL        	0x60
 #define		ADSEL           	0x1e
 #define		DI_2840         	0x01
 
-#define	SCB_64_BTT      		0xd0
+#define	SCB_CMDSTORE_BUSADDR		0xd0
+
+#define	SCB_64BYTE_SPARE		0xd4
 
 #define	CCHADDR         		0xe0
 
@@ -616,7 +582,7 @@
 #define	CCSGCTL         		0xeb
 #define		CCSGDONE        	0x80
 #define		CCSGEN          	0x08
-#define		SG_FETCH_NEEDED 	0x02
+#define		FLAG            	0x02
 #define		CCSGRESET       	0x01
 
 #define	CCSCBRAM        		0xec
@@ -670,48 +636,36 @@
 #define		RD_DFTHRSH_MIN  	0x00
 #define		WR_DFTHRSH_MIN  	0x00
 
-#define	SG_CACHE_SHADOW 		0xfc
-#define		SG_ADDR_MASK    	0xf8
-#define		ODD_SEG         	0x04
+#define	SG_CACHEPTR     		0xfc
+#define		SG_USER_DATA    	0xfc
 #define		LAST_SEG        	0x02
 #define		LAST_SEG_DONE   	0x01
 
-#define	SG_CACHE_PRE    		0xfc
-
 
-#define	HOST_MSG	0xff
-#define	BUS_32_BIT	0x02
 #define	CMD_GROUP_CODE_SHIFT	0x05
 #define	BUS_8_BIT	0x00
+#define	QOUTFIFO_OFFSET	0x00
 #define	CCSGRAM_MAXSEGS	0x10
-#define	TARGET_DATA_IN	0x01
+#define	SCB_64BYTE_SIZE	0x30
 #define	STATUS_QUEUE_FULL	0x28
 #define	STATUS_BUSY	0x08
+#define	TQINFIFO_UPDATE_CNT	0x20
+#define	TCL_TARGET_SHIFT	0x04
 #define	MAX_OFFSET_8BIT	0x0f
 #define	BUS_16_BIT	0x01
-#define	TID_SHIFT	0x04
-#define	SCB_DOWNLOAD_SIZE_64	0x30
-#define	SCB_UPLOAD_SIZE	0x20
+#define	QINFIFO_OFFSET	0x01
+#define	SCB_32BYTE_SIZE	0x1c
 #define	HOST_MAILBOX_SHIFT	0x04
-#define	SCB_INITIATOR_TAG	0x03
-#define	SCB_TARGET_STATUS	0x02
-#define	SCB_TARGET_DATA_DIR	0x01
-#define	SCB_TARGET_PHASES	0x00
 #define	MAX_OFFSET_ULTRA2	0x7f
 #define	MAX_OFFSET_16BIT	0x08
+#define	UNTAGGEDSCB_OFFSET	0x02
 #define	TARGET_CMD_CMPLT	0xfe
 #define	SCB_LIST_NULL	0xff
 #define	SG_SIZEOF	0x08
-#define	SCB_DOWNLOAD_SIZE	0x20
 #define	SEQ_MAILBOX_SHIFT	0x00
+#define	HOST_MSG	0xff
+#define	BUS_32_BIT	0x02
 #define	CCSGADDR_MAX	0x80
 
 
 /* Downloaded Constant Definitions */
-#define	SG_PREFETCH_ADDR_MASK	0x06
-#define	SG_PREFETCH_ALIGN_MASK	0x05
-#define	QOUTFIFO_OFFSET	0x00
-#define	SG_PREFETCH_CNT	0x04
-#define	INVERTED_CACHESIZE_MASK	0x03
-#define	CACHESIZE_MASK	0x02
-#define	QINFIFO_OFFSET	0x01
diff --git a/sys/dev/ic/aic7xxx_93cx6.c b/sys/dev/ic/smc93cx6.c
index 788ef4c5fa1..564a4237007 100644
--- a/sys/dev/ic/aic7xxx_93cx6.c
+++ b/sys/dev/ic/smc93cx6.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: smc93cx6.c,v 1.9 2002/03/19 02:49:20 millert Exp $	*/
+/* $FreeBSD: sys/dev/aic7xxx/93cx6.c,v 1.5 2000/01/07 23:08:17 gibbs Exp $ */
 /*
  * Interface for the 93C66/56/46/26/06 serial eeprom parts.
  *
@@ -8,29 +10,15 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: aic7xxx_93cx6.c,v 1.1 2002/02/16 04:36:33 smurph Exp $
- *
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.c,v 1.15 2001/07/18 21:39:47 gibbs Exp $
+ *    notice immediately at the beginning of the file, without modification,
+ *    this list of conditions, and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Absolutely no warranty of function or purpose is made by the author
+ *    Daniel M. Eischen.
+ * 4. Modifications may be freely made to this file if the above conditions
+ *    are met.
  */
 
 /*
@@ -41,7 +29,7 @@
  *     -------------------------------------------------------------------
  *     READ        1    10   A5 - A0             Reads data stored in memory,
  *                                               starting at specified address
- *     EWEN        1    00   11XXXX              Write enable must precede
+ *     EWEN        1    00   11XXXX              Write enable must preceed
  *                                               all programming modes
  *     ERASE       1    11   A5 - A0             Erase register A5A4A3A2A1A0
  *     WRITE       1    01   A5 - A0   D15 - D0  Writes register
@@ -67,26 +55,26 @@
  *
  */
 
-/* $OpenBSD: aic7xxx_93cx6.c,v 1.1 2002/02/16 04:36:33 smurph Exp $ */
-
-#ifdef __OpenBSD__
-#include <dev/ic/aic7xxx_openbsd.h>
-#include <dev/ic/aic7xxx_inline.h>
-#include <dev/ic/aic7xxx_93cx6.h>
-#endif 
+#include <sys/param.h>
+#include <sys/systm.h>
+#if !(defined(__NetBSD__) || defined(__OpenBSD__))
+#include <machine/bus_memio.h>
+#include <machine/bus_pio.h>
+#endif
+#include <machine/bus.h>
+#if !(defined(__NetBSD__) || defined(__OpenBSD__))
+#include <dev/aic7xxx/93cx6.h>
+#else
+#include <dev/ic/smc93cx6var.h>
+#endif
 
-#ifdef __FreeBSD__
-#include <dev/aic7xxx/aic7xxx_freebsd.h>
-#include <dev/aic7xxx/aic7xxx_inline.h>
-#include <dev/aic7xxx/aic7xxx_93cx6.h>
-#endif 
 /*
  * Right now, we only have to read the SEEPROM.  But we make it easier to
  * add other 93Cx6 functions.
  */
 static struct seeprom_cmd {
-  	uint8_t len;
- 	uint8_t bits[3];
+  	unsigned char len;
+ 	unsigned char bits[3];
 } seeprom_read = {3, {1, 1, 0}};
 
 /*
@@ -105,14 +93,14 @@ static struct seeprom_cmd {
 int
 read_seeprom(sd, buf, start_addr, count)
 	struct seeprom_descriptor *sd;
-	uint16_t *buf;
-	u_int start_addr;
-	u_int count;
+	u_int16_t *buf;
+	bus_size_t start_addr;
+	bus_size_t count;
 {
 	int i = 0;
 	u_int k = 0;
-	uint16_t v;
-	uint8_t temp;
+	u_int16_t v;
+	u_int8_t temp;
 
 	/*
 	 * Read the requested registers of the seeprom.  The loop
@@ -190,25 +178,3 @@ read_seeprom(sd, buf, start_addr, count)
 #endif
 	return (1);
 }
-
-int
-verify_cksum(struct seeprom_config *sc)
-{
-	int i;
-	int maxaddr;
-	uint32_t checksum;
-	uint16_t *scarray;
-
-	maxaddr = (sizeof(*sc)/2) - 1;
-	checksum = 0;
-	scarray = (uint16_t *)sc;
-
-	for (i = 0; i < maxaddr; i++)
-		checksum = checksum + scarray[i];
-	if (checksum == 0
-	 || (checksum & 0xFFFF) != sc->checksum) {
-		return (0);
-	} else {
-		return(1);
-	}
-}
diff --git a/sys/dev/ic/aic7xxx_93cx6.h b/sys/dev/ic/smc93cx6var.h
index ead55d7bd04..564c39a1bca 100644
--- a/sys/dev/ic/aic7xxx_93cx6.h
+++ b/sys/dev/ic/smc93cx6var.h
@@ -1,9 +1,11 @@
+/*	$OpenBSD: smc93cx6var.h,v 1.8 2002/03/19 02:49:20 millert Exp $	*/
+/* $FreeBSD: sys/dev/aic7xxx/93cx6.h,v 1.3 1999/12/29 04:35:33 peter Exp $ */
 /*
- * Interface to the 93C46/56 serial EEPROM that is used to store BIOS
+ * Interface to the 93C46 serial EEPROM that is used to store BIOS
  * settings for the aic7xxx based adaptec SCSI controllers.  It can
  * also be used for 93C26 and 93C06 serial EEPROMS.
  *
- * Copyright (c) 1994, 1995, 2000 Justin T. Gibbs.
+ * Copyright (c) 1994, 1995 Justin T. Gibbs.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11,12 +13,16 @@
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
+ *    without modification, immediately at the beginning of the file.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
+ * Where this Software is combined with software released under the terms of 
+ * the GNU Public License ("GPL") and the terms of the GPL would require the 
+ * combined work to also be released under the terms of the GPL, the terms
+ * and conditions of this License will apply in addition to those of the
+ * GPL with the exception of any terms or conditions of this License that
+ * conflict with, or are expressly prohibited by, the GPL.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -29,13 +35,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id: aic7xxx_93cx6.h,v 1.1 2002/02/16 04:36:33 smurph Exp $
- *
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.h,v 1.9 2000/12/20 01:11:37 gibbs Exp $
  */
-#ifndef _AIC7XXX_93CX6_H_
-#define _AIC7XXX_93CX6_H_
+
+#include <sys/param.h>
+#if !(defined(__NetBSD__) || defined(__OpenBSD__))
+#include <sys/systm.h>
+#endif
+
+#ifdef _KERNEL
 
 typedef enum {
 	C46 = 6,
@@ -43,17 +50,18 @@ typedef enum {
 } seeprom_chip_t;
 
 struct seeprom_descriptor {
-	struct ahc_softc *sd_ahc;
-	u_int sd_control_offset;
-	u_int sd_status_offset;
-	u_int sd_dataout_offset;
+	bus_space_tag_t sd_tag;             
+	bus_space_handle_t sd_bsh;
+	bus_size_t sd_control_offset;
+	bus_size_t sd_status_offset;
+	bus_size_t sd_dataout_offset;
 	seeprom_chip_t sd_chip;
-	uint16_t sd_MS;
-	uint16_t sd_RDY;
-	uint16_t sd_CS;
-	uint16_t sd_CK;
-	uint16_t sd_DO;
-	uint16_t sd_DI;
+	u_int16_t sd_MS;
+	u_int16_t sd_RDY;
+	u_int16_t sd_CS;
+	u_int16_t sd_CK;
+	u_int16_t sd_DO;
+	u_int16_t sd_DI;
 };
 
 /*
@@ -73,20 +81,15 @@ struct seeprom_descriptor {
  */
 
 #define	SEEPROM_INB(sd) \
-	ahc_inb(sd->sd_ahc, sd->sd_control_offset)
-#define	SEEPROM_OUTB(sd, value)					\
-do {								\
-	ahc_outb(sd->sd_ahc, sd->sd_control_offset, value);	\
-	ahc_flush_device_writes(sd->sd_ahc);			\
-} while(0)
-
+	bus_space_read_1(sd->sd_tag, sd->sd_bsh, sd->sd_control_offset)
+#define	SEEPROM_OUTB(sd, value) \
+	bus_space_write_1(sd->sd_tag, sd->sd_bsh, sd->sd_control_offset, value)
 #define	SEEPROM_STATUS_INB(sd) \
-	ahc_inb(sd->sd_ahc, sd->sd_status_offset)
+	bus_space_read_1(sd->sd_tag, sd->sd_bsh, sd->sd_status_offset)
 #define	SEEPROM_DATA_INB(sd) \
-	ahc_inb(sd->sd_ahc, sd->sd_dataout_offset)
+	bus_space_read_1(sd->sd_tag, sd->sd_bsh, sd->sd_dataout_offset)
 
-int read_seeprom(struct seeprom_descriptor *sd, uint16_t *buf,
-		 u_int start_addr, u_int count);
-int verify_cksum(struct seeprom_config *sc);
+int read_seeprom(struct seeprom_descriptor *sd, u_int16_t *buf,
+		 bus_size_t start_addr, bus_size_t count);
 
-#endif /* _AIC7XXX_93CX6_H_ */
+#endif /* _KERNEL */
diff --git a/sys/dev/microcode/aic7xxx/Makefile b/sys/dev/microcode/aic7xxx/Makefile
index d4d4e11f005..a1a27c7d888 100644
--- a/sys/dev/microcode/aic7xxx/Makefile
+++ b/sys/dev/microcode/aic7xxx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/02/16 04:36:33 smurph Exp $
+# $OpenBSD: Makefile,v 1.3 2002/03/19 02:49:20 millert Exp $
 # $FreeBSD: src/sys/dev/aic7xxx/Makefile,v 1.6 1999/08/28 00:41:22 peter Exp $
 
 PROG=	aicasm
@@ -27,11 +27,11 @@ NOMAN=	noman
 CFLAGS+= -DDEBUG -g
 YFLAGS+= -t
 LFLAGS+= -d
-SEQFLAGS= -l seq.lst
+MFLAGS= -l seq.lst
 .endif
 
 microcode aic7xxxreg.h aic7xxx_seq.h: aic7xxx.seq aic7xxx.reg
-	${OBJDIR}./aicasm -I/sys ${SEQFLAGS} -r tempreg.h -o tempseq.h ${.CURDIR}/aic7xxx.seq
+	./aicasm -I/sys ${MFLAGS} -r tempreg.h -o tempseq.h ${.CURDIR}/aic7xxx.seq
 	grep OpenBSD: ${.CURDIR}/aic7xxx.seq | cat - tempseq.h > aic7xxx_seq.h
 	grep OpenBSD: ${.CURDIR}/aic7xxx.reg | cat - tempreg.h > aic7xxxreg.h
 	mv aic7xxx_seq.h /sys/dev/microcode/aic7xxx/
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.reg b/sys/dev/microcode/aic7xxx/aic7xxx.reg
index 6be74e809ba..bb52bdba889 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.reg
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.reg
@@ -1,8 +1,9 @@
-/* $OpenBSD: aic7xxx.reg,v 1.3 2002/02/16 04:36:33 smurph Exp $ */
+/*	$NetBSD$	*/
+
 /*
  * Aic7xxx register and scratch ram definitions.
  *
- * Copyright (c) 1994-2001 Justin Gibbs.
+ * Copyright (c) 1994-2000 Justin Gibbs.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,7 +16,7 @@
  *    derived from this software without specific prior written permission.
  *
  * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
+ * the GNU Public License ("GPL").
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -29,11 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.reg,v 1.39 2001/07/18 21:39:47 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.reg,v 1.20 2000/02/09 21:24:59 gibbs Exp $
  */
 
-VERSION = "$Id: aic7xxx.reg,v 1.3 2002/02/16 04:36:33 smurph Exp $"
-
 /*
  * This file is processed by the aic7xxx_asm utility for use in assembling
  * firmware for the aic7xxx family of SCSI host adapters as well as to generate
@@ -113,8 +112,6 @@ register SCSISIGI {
 	mask	PHASE_MASK	CDI|IOI|MSGI
 	mask	P_DATAOUT	0x00
 	mask	P_DATAIN	IOI
-        mask    P_DATAOUT_DT    P_DATAOUT|MSGI
-        mask    P_DATAIN_DT     P_DATAIN|MSGI
 	mask	P_COMMAND	CDI
 	mask	P_MESGOUT	CDI|MSGI
 	mask	P_STATUS	CDI|IOI
@@ -177,8 +174,6 @@ register SCSIID	{
 	address			0x005
 	access_mode RW
 	mask	TID		0xf0		/* Target ID mask */
-        mask    TWIN_TID        0x70
-        bit     TWIN_CHNLB      0x80
 	mask	OID		0x0f		/* Our ID mask */
 	/*
 	 * SCSI Maximum Offset (p. 4-61 aic7890/91 Data Book)
@@ -251,7 +246,6 @@ register CLRSINT0 {
 	bit	CLRSELDI	0x20
 	bit	CLRSELINGO	0x10
 	bit	CLRSWRAP	0x08
-        bit     CLRIOERR        0x08    /* Ultra2 Only */
 	bit	CLRSPIORDY	0x02
 }
 
@@ -313,12 +307,7 @@ register SSTAT2 {
 	address			0x00d
 	access_mode RO
 	bit	OVERRUN		0x80
-        bit     SHVALID         0x40    /* Shaddow Layer non-zero */
 	bit	EXP_ACTIVE	0x10	/* SCSI Expander Active */
-        bit     CRCVALERR       0x08    /* CRC doesn't match (U3 only) */
-        bit     CRCENDERR       0x04    /* No terminal CRC packet (U3 only) */
-        bit     CRCREQERR       0x02    /* Illegal CRC packet req (U3 only) */
-        bit     DUAL_EDGE_ERR   0x01    /* Incorrect data phase (U3 only) */
 	mask	SFCNT		0x1f
 }
 
@@ -384,12 +373,12 @@ register SIMODE1 {
  */
 register SCSIBUSL {
 	address			0x012
-        access_mode RW
+	access_mode RO
 }
 
 register SCSIBUSH {
 	address			0x013
-        access_mode RW
+	access_mode RO
 }
 
 /*
@@ -684,16 +673,8 @@ register DSCOMMAND0 {
 	bit	CIOPARCKEN	0x01	/* Internal bus parity error enable */
 }
 
-register DSCOMMAND1 {
-        address                 0x085
-        access_mode RW
-        mask    DSLATT          0xfc    /* PCI latency timer (non-ultra2) */
-        bit     HADDLDSEL1      0x02    /* Host Address Load Select Bits */
-        bit     HADDLDSEL0      0x01
-}
-
 /*
- * Bus On/Off Time (p. 3-44) aic7770 only
+ * Bus On/Off Time (p. 3-44)
  */
 register BUSTIME {
 	address			0x085
@@ -712,7 +693,6 @@ register BUSSPD {
 	mask	STBOFF		0x38
 	mask	STBON		0x07
 	mask	DFTHRSH_100	0xc0
-        mask    DFTHRSH_75      0x80
 }
 
 /* aic7850/55/60/70/80/95 only */
@@ -768,7 +748,7 @@ register HCNT {
 
 /*
  * SCB Pointer (p. 3-49)
- * Gate one of the SCBs into the SCBARRAY window.
+ * Gate one of the four SCBs into the SCBARRAY window.
  */
 register SCBPTR {
 	address			0x090
@@ -790,15 +770,11 @@ register INTSTAT {
 	mask	SEND_REJECT	0x10|SEQINT	/* sending a message reject */
 	mask	NO_IDENT	0x20|SEQINT	/* no IDENTIFY after reconnect*/
 	mask	NO_MATCH	0x30|SEQINT	/* no cmd match for reconnect */
-        mask    IGN_WIDE_RES    0x40|SEQINT     /* Complex IGN Wide Res Msg */
-        mask    PDATA_REINIT    0x50|SEQINT     /*
-                                                 * Returned to data phase
-                                                 * that requires data
-                                                 * transfer pointers to be
-                                                 * recalculated from the
-                                                 * transfer residual.
-                                                 */
-        mask    HOST_MSG_LOOP   0x60|SEQINT     /*
+	mask	UPDATE_TMSG_REQ	0x60|SEQINT	/* Update TMSG_REQ values */
+	mask	BAD_STATUS	0x70|SEQINT	/* Bad status from target */
+	mask	RESIDUAL	0x80|SEQINT	/* Residual byte count != 0 */
+	mask	TRACE_POINT	0x90|SEQINT
+	mask	HOST_MSG_LOOP	0xa0|SEQINT	/*
 						 * The bus is ready for the
 						 * host to perform another
 						 * message transaction.  This
@@ -807,37 +783,22 @@ register INTSTAT {
 						 * that require a kernel based
 						 * message state engine.
 						 */
-        mask    BAD_STATUS      0x70|SEQINT     /* Bad status from target */
-        mask    PERR_DETECTED   0x80|SEQINT     /*
+	mask	PERR_DETECTED	0xb0|SEQINT	/*
 						 * Either the phase_lock
 						 * or inb_next routine has
 						 * noticed a parity error.
 						 */
-        mask    DATA_OVERRUN    0x90|SEQINT     /*
+	mask	TRACEPOINT	0xd0|SEQINT
+	mask	MSGIN_PHASEMIS	0xe0|SEQINT	/*
+						 * Target changed phase on us
+						 * when we were expecting
+						 * another msgin byte.
+						 */
+	mask	DATA_OVERRUN	0xf0|SEQINT	/*
 						 * Target attempted to write
 						 * beyond the bounds of its
 						 * command.
-                                                 */
-        mask    MKMSG_FAILED    0xa0|SEQINT     /*
-                                                 * Target completed command
-                                                 * without honoring our ATN
-                                                 * request to issue a message. 
 						 */
-        mask    MISSED_BUSFREE  0xb0|SEQINT     /*
-                                                 * The sequencer never saw
-                                                 * the bus go free after
-                                                 * either a command complete
-                                                 * or disconnect message.
-                                                 */
-        mask    SCB_MISMATCH    0xc0|SEQINT     /*
-                                                 * Downloaded SCB's tag does
-                                                 * not match the entry we
-                                                 * intended to download.
-                                                 */
-        mask    NO_FREE_SCB     0xd0|SEQINT     /*
-                                                 * get_free_or_disc_scb failed.
-                                                 */
-        mask    OUT_OF_RANGE    0xe0|SEQINT
 
 	mask	SEQINT_MASK	0xf0|SEQINT	/* SEQINT Status Codes */
 	mask	INT_PEND  (BRKADRINT|SEQINT|SCSIINT|CMDCMPLT)
@@ -893,8 +854,7 @@ register DFSTATUS {
 	address			0x094
 	access_mode RO
 	bit	PRELOAD_AVAIL	0x80
-        bit     DFCACHETH       0x40
-        bit     FIFOQWDEMP      0x20
+	bit	DWORDEMP	0x20
 	bit	MREQPEND	0x10
 	bit	HDONE		0x08
 	bit	DFTHRESH	0x04
@@ -986,7 +946,6 @@ register SCSIPHASE {
 	bit	MSG_OUT_PHASE	0x04
 	bit	DATA_IN_PHASE	0x02
 	bit	DATA_OUT_PHASE	0x01
-        mask    DATA_PHASE_MASK 0x03
 }
 
 /*
@@ -1003,19 +962,35 @@ register SFUNCT {
  */
 scb {
 	address			0x0a0
-        SCB_CDB_PTR {
-                size    4
-                alias   SCB_RESIDUAL_DATACNT
-                alias   SCB_CDB_STORE
-                alias   SCB_TARGET_INFO
+	SCB_CONTROL {
+		size	1
+		bit	TARGET_SCB	0x80
+		bit	DISCENB         0x40
+		bit	TAG_ENB		0x20
+		bit	MK_MESSAGE      0x10
+		bit	ULTRAENB	0x08
+		bit	DISCONNECTED	0x04
+		mask	SCB_TAG_TYPE	0x03
+	}
+	SCB_TCL {
+		size	1
+		bit	SELBUSB		0x08
+		mask	TID		0xf0
+		mask	LID		0x07
 	}
-        SCB_RESIDUAL_SGPTR {
+	SCB_TARGET_STATUS {
+		size	1
+	}
+	SCB_SGCOUNT {
+		size	1
+	}
+	SCB_SGPTR {
 		size	4
 	}
-        SCB_SCSI_STATUS {
+	SCB_RESID_SGCNT {
 		size	1
 	}
-        SCB_CDB_STORE_PAD {
+	SCB_RESID_DCNT	{
 		size	3
 	}
 	SCB_DATAPTR {
@@ -1023,44 +998,24 @@ scb {
 	}
 	SCB_DATACNT {
 		/*
-                 * The last byte is really the high address bits for
-                 * the data address.
+		 * Really only 3 bytes, but padded to make
+		 * the kernel's job easier.
 		 */
 		size	4
-                bit     SG_LAST_SEG             0x80    /* In the fourth byte */
-                mask    SG_HIGH_ADDR_BITS       0x7F    /* In the fourth byte */
 	}
-        SCB_SGPTR {
+	SCB_CMDPTR {
+		alias	SCB_TARGET_PHASES
+		bit	TARGET_DATA_IN	0x1	/* In the second byte */
 		size	4
-                bit     SG_RESID_VALID  0x04    /* In the first byte */
-                bit     SG_FULL_RESID   0x02    /* In the first byte */
-                bit     SG_LIST_NULL    0x01    /* In the first byte */
-        }
-        SCB_CONTROL {
-                size    1
-                bit     TARGET_SCB                      0x80
-                bit     DISCENB                         0x40
-                bit     TAG_ENB                         0x20
-                bit     MK_MESSAGE                      0x10
-                bit     ULTRAENB                        0x08
-                bit     DISCONNECTED                    0x04
-                mask    SCB_TAG_TYPE                    0x03
 	}
-        SCB_SCSIID {
-                size    1
-                bit     TWIN_CHNLB                      0x80
-                mask    TWIN_TID                        0x70
-                mask    TID                             0xf0
-                mask    OID                             0x0f
-        }
-        SCB_LUN {
-                mask    LID                             0xff
+	SCB_CMDLEN {
+		alias	SCB_INITIATOR_TAG
 		size	1
 	}
 	SCB_TAG {
 		size	1
 	}
-        SCB_CDB_LEN {
+	SCB_NEXT {
 		size	1
 	}
 	SCB_SCSIRATE {
@@ -1069,20 +1024,22 @@ scb {
 	SCB_SCSIOFFSET {
 		size	1
 	}
-        SCB_NEXT {
-                size    1
+	SCB_SPARE	{
+		size	3
 	}
-        SCB_64_SPARE {
+	SCB_CMDSTORE	{
 		size	16
 	}
-        SCB_64_BTT {
-                size    16
+	SCB_CMDSTORE_BUSADDR {
+		size	4
+	}
+	SCB_64BYTE_SPARE {
+		size	12
 	}
 }
 
-const   SCB_UPLOAD_SIZE         32
-const   SCB_DOWNLOAD_SIZE       32
-const   SCB_DOWNLOAD_SIZE_64    48
+const	SCB_32BYTE_SIZE	28
+const	SCB_64BYTE_SIZE	48
 
 const	SG_SIZEOF	0x08		/* sizeof(struct ahc_dma) */
 
@@ -1128,7 +1085,7 @@ register CCSGCTL {
 	address			0x0EB
 	bit	CCSGDONE	0x80
 	bit	CCSGEN		0x08
-        bit     SG_FETCH_NEEDED 0x02    /* Bit used for software state */
+	bit	FLAG		0x02
 	bit	CCSGRESET	0x01
 }
 
@@ -1209,23 +1166,14 @@ register DFF_THRSH {
 	mask	WR_DFTHRSH_MAX	0x70
 }
 
-register SG_CACHE_PRE {
-        access_mode WO
+register SG_CACHEPTR {
+	access_mode RW
 	address			0x0fc
-        mask    SG_ADDR_MASK    0xf8
-        bit     ODD_SEG         0x04
+	mask	SG_USER_DATA	0xfc
 	bit	LAST_SEG	0x02
 	bit	LAST_SEG_DONE	0x01
 }
 
-register SG_CACHE_SHADOW {
-        access_mode RO
-        address                 0x0fc
-        mask    SG_ADDR_MASK    0xf8
-        bit     ODD_SEG         0x04
-        bit     LAST_SEG        0x02
-        bit     LAST_SEG_DONE   0x01
-}
 /* ---------------------- Scratch RAM Offsets ------------------------- */
 /* These offsets are either to values that are initialized by the board's
  * BIOS or are specified by the sequencer code.
@@ -1247,45 +1195,21 @@ scratch_ram {
 	/*
 	 * 1 byte per target starting at this address for configuration values
 	 */
-        BUSY_TARGETS {
-                alias           TARG_SCSIRATE
+	TARG_SCSIRATE {
+		alias		CMDSIZE_TABLE
 		size		16
 	}
 	/*
-         * Bit vector of targets that have ULTRA enabled as set by
-         * the BIOS.  The Sequencer relies on a per-SCB field to
-         * control whether to enable Ultra transfers or not.  During
-         * initialization, we read this field and reuse it for 2
-         * entries in the busy target table.
+	 * Bit vector of targets that have ULTRA enabled.
 	 */
 	ULTRA_ENB {
-                alias           CMDSIZE_TABLE
 		size		2
 	}
 	/*
-         * Bit vector of targets that have disconnection disabled as set by
-         * the BIOS.  The Sequencer relies in a per-SCB field to control the
-         * disconnect priveldge.  During initialization, we read this field
-         * and reuse it for 2 entries in the busy target table.
+	 * Bit vector of targets that have disconnection disabled.
 	 */
 	DISC_DSB {
 		size		2
-        }
-        CMDSIZE_TABLE_TAIL {
-                size            4
-        }
-        /*
-         * Partial transfer past cacheline end to be
-         * transferred using an extra S/G.
-         */
-        MWI_RESIDUAL {
-                size            1
-        }
-        /*
-         * SCBID of the next SCB to be started by the controller.
-         */
-        NEXT_QUEUED_SCB {
-                size            1
 	}
 	/*
 	 * Single byte buffer used to designate the type or message
@@ -1311,7 +1235,7 @@ scratch_ram {
 	SEQ_FLAGS {
 		size		1
 		bit	IDENTIFY_SEEN		0x80
-                bit     TARGET_CMD_IS_TAGGED    0x40
+		bit	SCBPTR_VALID		0x40
 		bit	DPHASE			0x20
 		/* Target flags */
 		bit	TARG_CMD_PENDING	0x10
@@ -1325,12 +1249,17 @@ scratch_ram {
 	 * target/channel/lun of a
 	 * reconnecting target
 	 */
-        SAVED_SCSIID {
+	SAVED_TCL {
 		size		1
 	}
-        SAVED_LUN {
+	/* Working value of the number of SG segments left */
+	SG_COUNT {
 		size		1
 	}
+	/* Working value of SG pointer */
+	SG_NEXT	{
+		size		4
+	}
 	/*
 	 * The last bus phase as seen by the sequencer. 
 	 */
@@ -1371,25 +1300,23 @@ scratch_ram {
 		size		1
 	}
 	/*
-         * head of list of SCBs that have
-         * completed but have not been
-         * put into the qoutfifo.
+	 * Address of the hardware scb array in the host.
 	 */
-        COMPLETE_SCBH {
-                size            1
+	HSCB_ADDR {
+		size		4
 	}
 	/*
-         * Address of the hardware scb array in the host.
+	 * Address of the 256 byte array storing the SCBID of outstanding
+	 * untagged SCBs indexed by TCL.
 	 */
-        HSCB_ADDR {
+	SCBID_ADDR {
 		size		4
 	}
 	/*
-         * Base address of our shared data with the kernel driver in host
-         * memory.  This includes the qoutfifo and target mode
-         * incoming command queue.
+	 * Address of the array of command descriptors used to store
+	 * information about incoming selections.
 	 */
-        SHARED_DATA_ADDR {
+	TMODE_CMDADDR {
 		size		4
 	}
 	KERNEL_QINPOS {
@@ -1436,6 +1363,23 @@ scratch_ram {
 	}
 
 	/*
+	 * Number of times we have filled the CCSGRAM with prefetched
+	 * SG elements.
+	 */
+	PREFETCH_CNT {
+		size		1
+	}
+
+	/*
+	 * Interrupt kernel for a message to this target on
+	 * the next transaction.  This is usually used for
+	 * negotiation requests.
+	 */
+	TARGET_MSG_REQUEST {
+		size		2
+	}
+
+	/*
 	 * Sequences the kernel driver has okayed for us.  This allows
 	 * the driver to do things like prevent initiator or target
 	 * operations.
@@ -1465,10 +1409,6 @@ scratch_ram {
 		size		1
 	}
 
-        SEQ_FLAGS2 {
-                size            1
-                bit     SCB_DMA         0x01
-        }
 	/*
 	 * These are reserved registers in the card's scratch ram.  Some of
 	 * the values are specified in the AHA2742 technical reference manual
@@ -1482,12 +1422,6 @@ scratch_ram {
 		bit	ENSPCHK		0x20
 		mask	HSCSIID		0x07	/* our SCSI ID */
 		mask	HWSCSIID	0x0f	/* our SCSI ID if Wide Bus */
-        }
-        INTDEF {
-                address         0x05c
-                size            1
-                bit     EDGE_TRIG       0x80
-                mask    VECTOR          0x0f
 	}
 	HOSTCONF {
 		address		0x05d
@@ -1509,13 +1443,17 @@ scratch_ram {
 	}
 }
 
-const TID_SHIFT         4
 const SCB_LIST_NULL	0xff
 const TARGET_CMD_CMPLT	0xfe
 
 const CCSGADDR_MAX	0x80
 const CCSGRAM_MAXSEGS	16
 
+/* Offsets into the SCBID array where different data is stored */
+const QOUTFIFO_OFFSET		0
+const QINFIFO_OFFSET		1
+const UNTAGGEDSCB_OFFSET	2
+
 /* WDTR Message values */
 const BUS_8_BIT			0x00
 const BUS_16_BIT		0x01
@@ -1530,22 +1468,20 @@ const HOST_MSG			0xff
 /* Target mode command processing constants */
 const CMD_GROUP_CODE_SHIFT	0x05
 
+const TCL_TARGET_SHIFT		4
+/* The update interval must be a power of 2 */
+const TQINFIFO_UPDATE_CNT	32
+
 const STATUS_BUSY		0x08
 const STATUS_QUEUE_FULL		0x28
-const SCB_TARGET_PHASES         0
-const SCB_TARGET_DATA_DIR       1
-const SCB_TARGET_STATUS         2
-const SCB_INITIATOR_TAG         3
-const TARGET_DATA_IN            1
 
 /*
  * Downloaded (kernel inserted) constants
  */
-/* Offsets into the SCBID array where different data is stored */
-const QOUTFIFO_OFFSET download
-const QINFIFO_OFFSET download
-const CACHESIZE_MASK download
-const INVERTED_CACHESIZE_MASK download
-const SG_PREFETCH_CNT download
-const SG_PREFETCH_ALIGN_MASK download
-const SG_PREFETCH_ADDR_MASK download
+
+/*
+ * Number of command descriptors in the command descriptor array.
+ * No longer used, but left here as an example for how downloaded
+ * constantants can be defined.
+const TMODE_NUMCMDS	download
+ */
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.seq b/sys/dev/microcode/aic7xxx/aic7xxx.seq
index 8f753eb1902..152194f9815 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.seq
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.seq
@@ -1,8 +1,7 @@
-/* $OpenBSD: aic7xxx.seq,v 1.9 2002/02/16 04:36:33 smurph Exp $ */
 /*
  * Adaptec 274x/284x/294x device driver firmware for Linux and FreeBSD.
  *
- * Copyright (c) 1994-2001 Justin Gibbs.
+ * Copyright (c) 1994-2000 Justin Gibbs.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,7 +14,7 @@
  *    derived from this software without specific prior written permission.
  *
  * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
+ * the GNU Public License ("GPL").
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -29,13 +28,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.119 2001/08/05 22:20:12 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.93 2000/01/07 23:08:20 gibbs Exp $
  */
 
-VERSION = "$Id: aic7xxx.seq,v 1.9 2002/02/16 04:36:33 smurph Exp $"
-
 #include <dev/microcode/aic7xxx/aic7xxx.reg>
 #include <scsi/scsi_message.h>
+/*
+#include <cam/scsi/scsi_message.h>
+*/
 
 /*
  * A few words on the waiting SCB list:
@@ -55,122 +55,172 @@ VERSION = "$Id: aic7xxx.seq,v 1.9 2002/02/16 04:36:33 smurph Exp $"
  * automatically consume the entries.
  */
 
-bus_free_sel:
-        /*
-         * Turn off the selection hardware.  We need to reset the
-         * selection request in order to perform a new selection.
-         */
-        and     SCSISEQ, TEMODE|ENSELI|ENRSELI|ENAUTOATNP, SCSISEQ;
-        and     SIMODE1, ~ENBUSFREE;
+reset:
+	clr	SCSISIGO;		/* De-assert BSY */
+	mvi	MSG_OUT, MSG_NOOP;	/* No message to send */
+	and	SXFRCTL1, ~BITBUCKET;
+	/* Always allow reselection */
+	and	SCSISEQ, ENSELI|ENRSELI|ENAUTOATNP, SCSISEQ_TEMPLATE;
+	if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		/* Ensure that no DMA operations are in progress */
+		clr	CCSGCTL;
+		clr	CCSCBCTL;
+	}
+
 poll_for_work:
 	call	clear_target_state;
 	and	SXFRCTL0, ~SPIOEN;
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                clr     SCSIBUSL;
-        }
-        test    SCSISEQ, ENSELO jnz poll_for_selection;
-        if ((ahc->features & AHC_TWIN) != 0) {
-                xor     SBLKCTL,SELBUSB;        /* Toggle to the other bus */
-                test    SCSISEQ, ENSELO         jnz poll_for_selection;
+	if ((ahc->features & AHC_QUEUE_REGS) == 0) {
+		mov	A, QINPOS;
 	}
-        cmp     WAITING_SCBH,SCB_LIST_NULL jne start_waiting;
 poll_for_work_loop:
+	if ((ahc->features & AHC_QUEUE_REGS) == 0) {
+		and	SEQCTL, ~PAUSEDIS;
+	}
+	test	SSTAT0, SELDO|SELDI	jnz selection;
+	test	SCSISEQ, ENSELO	jnz poll_for_work_loop;
 	if ((ahc->features & AHC_TWIN) != 0) {
+		/*
+		 * Twin channel devices cannot handle things like SELTO
+		 * interrupts on the "background" channel.  So, if we
+		 * are selecting, keep polling the current channel util
+		 * either a selection or reselection occurs.
+		 */
 		xor	SBLKCTL,SELBUSB;	/* Toggle to the other bus */
-        }
-        test    SSTAT0, SELDO|SELDI     jnz selection;
+		test	SSTAT0, SELDO|SELDI	jnz selection;
+		test	SCSISEQ, ENSELO	jnz poll_for_work;
+		xor	SBLKCTL,SELBUSB;	/* Toggle back */
+	}
+	cmp	WAITING_SCBH,SCB_LIST_NULL jne start_waiting;
 test_queue:
 	/* Has the driver posted any work for us? */
-BEGIN_CRITICAL
 	if ((ahc->features & AHC_QUEUE_REGS) != 0) {
 		test	QOFF_CTLSTA, SCB_AVAIL jz poll_for_work_loop;
+		mov	NONE, SNSCB_QOFF;
+		inc	QINPOS;
 	} else {
-                mov     A, QINPOS;
+		or	SEQCTL, PAUSEDIS;
 		cmp	KERNEL_QINPOS, A je poll_for_work_loop;
+		inc	QINPOS;
+		and	SEQCTL, ~PAUSEDIS;
 	}
-        mov     ARG_1, NEXT_QUEUED_SCB;
 
-        /*
-         * We have at least one queued SCB now and we don't have any 
-         * SCBs in the list of SCBs awaiting selection.  Allocate a
-         * card SCB for the host's SCB and get to work on it.
-         */
+/*
+ * We have at least one queued SCB now and we don't have any 
+ * SCBs in the list of SCBs awaiting selection.  If we have
+ * any SCBs available for use, pull the tag from the QINFIFO
+ * and get to work on it.
+ */
 	if ((ahc->flags & AHC_PAGESCBS) != 0) {
 		mov	ALLZEROS	call	get_free_or_disc_scb;
-        } else {
+	}
+
+dequeue_scb:
+	add	A, -1, QINPOS;
+	mvi	QINFIFO_OFFSET call fetch_byte;
+
+	if ((ahc->flags & AHC_PAGESCBS) == 0) {
 		/* In the non-paging case, the SCBID == hardware SCB index */
-                mov     SCBPTR, ARG_1;
+		mov	SCBPTR, RETURN_2;
 	}
-        or      SEQ_FLAGS2, SCB_DMA;
-END_CRITICAL
 dma_queued_scb:
-        /*
-         * DMA the SCB from host ram into the current SCB location.
-         */
+/*
+ * DMA the SCB from host ram into the current SCB location.
+ */
 	mvi	DMAPARAMS, HDMAEN|DIRECTION|FIFORESET;
-        mov     ARG_1   call dma_scb;
-        /*
-         * Check one last time to see if this SCB was canceled
-         * before we completed the DMA operation.  If it was,
-         * the QINFIFO next pointer will not match our saved
-         * value.
-         */
-        mov     A, ARG_1;
-BEGIN_CRITICAL
-        cmp     NEXT_QUEUED_SCB, A jne abort_qinscb;
-        if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                cmp     SCB_TAG, A je . + 2;
-                mvi     SCB_MISMATCH call set_seqint;
+	mov	RETURN_2	 call dma_scb;
+
+/*
+ * Preset the residual fields in case we never go through a data phase.
+ * This isn't done by the host so we can avoid a DMA to clear these
+ * fields for the normal case of I/O that completes without underrun
+ * or overrun conditions.
+ */
+	if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		bmov	SCB_RESID_DCNT, SCB_DATACNT, 3;
+	} else {
+		mov	SCB_RESID_DCNT[0],SCB_DATACNT[0];
+		mov	SCB_RESID_DCNT[1],SCB_DATACNT[1];
+		mov	SCB_RESID_DCNT[2],SCB_DATACNT[2];
 	}
-        mov     NEXT_QUEUED_SCB, SCB_NEXT;
+	mov	SCB_RESID_SGCNT, SCB_SGCOUNT;
+
+start_scb:
+	/*
+	 * Place us on the waiting list in case our selection
+	 * doesn't win during bus arbitration.
+	 */
 	mov	SCB_NEXT,WAITING_SCBH;
 	mov	WAITING_SCBH, SCBPTR;
-        if ((ahc->features & AHC_QUEUE_REGS) != 0) {
-                mov     NONE, SNSCB_QOFF;
-        } else {
-                inc     QINPOS;
-        }
-        and     SEQ_FLAGS2, ~SCB_DMA;
-END_CRITICAL
 start_waiting:
 	/*
-         * Start the first entry on the waiting SCB list.
+	 * Pull the first entry off of the waiting SCB list.
 	 */
 	mov	SCBPTR, WAITING_SCBH;
 	call	start_selection;
+	jmp	poll_for_work;
+
+start_selection:
+	if ((ahc->features & AHC_TWIN) != 0) {
+		and	SINDEX,~SELBUSB,SBLKCTL;/* Clear channel select bit */
+		and	A,SELBUSB,SCB_TCL;	/* Get new channel bit */
+		or	SINDEX,A;
+		mov	SBLKCTL,SINDEX;		/* select channel */
+	}
+initialize_scsiid:
+	mov	SINDEX, SCSISEQ_TEMPLATE;
+	if ((ahc->flags & AHC_TARGETMODE) != 0) {
+		test	SCB_CONTROL, TARGET_SCB jz . + 4;
+		if ((ahc->features & AHC_ULTRA2) != 0) {
+			mov	SCSIID_ULTRA2, SCB_CMDPTR[2];
+		} else {
+			mov	SCSIID, SCB_CMDPTR[2];
+		}
+		or	SINDEX, TEMODE;
+		jmp	initialize_scsiid_fini;
+	}
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		and	A, TID, SCB_TCL;	/* Get target ID */
+		and	SCSIID_ULTRA2, OID;	/* Clear old target */
+		or	SCSIID_ULTRA2, A;
+	} else {
+		and	A, TID, SCB_TCL;	/* Get target ID */
+		and	SCSIID, OID;		/* Clear old target */
+		or	SCSIID, A;
+	}
+initialize_scsiid_fini:
+	mov	SCSISEQ, SINDEX ret;
 
-poll_for_selection:
-        /*
-         * Twin channel devices cannot handle things like SELTO
-         * interrupts on the "background" channel.  So, while
-         * selecting, keep polling the current channel until
-         * either a selection or reselection occurs.
-         */
-        test    SSTAT0, SELDO|SELDI     jz poll_for_selection;
+/*
+ * Initialize transfer settings and clear the SCSI channel.
+ * SINDEX should contain any additional bit's the client wants
+ * set in SXFRCTL0.  We also assume that the current SCB is
+ * a valid SCB for the target we wish to talk to.
+ */
+initialize_channel:
+	or	SXFRCTL0, CLRSTCNT|CLRCHN, SINDEX;
+set_transfer_settings:
+	if ((ahc->features & AHC_ULTRA) != 0) {
+		test	SCB_CONTROL, ULTRAENB jz . + 2;
+		or	SXFRCTL0, FAST20;
+	} 
+/*
+ * Initialize SCSIRATE with the appropriate value for this target.
+ */
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		bmov	SCSIRATE, SCB_SCSIRATE, 2 ret;
+	} else {
+		mov	SCSIRATE, SCB_SCSIRATE ret;
+	}
 
 selection:
-        /*
-         * We aren't expecting a bus free, so interrupt
-         * the kernel driver if it happens.
-         */
-        mvi     CLRSINT1,CLRBUSFREE;
-        if ((ahc->features & AHC_DT) == 0) {
-                or      SIMODE1, ENBUSFREE;
-        }
-
-        /*
-         * Guard against a bus free after (re)selection
-         * but prior to enabling the busfree interrupt.  SELDI
-         * and SELDO will be cleared in that case.
-         */
-        test    SSTAT0, SELDI|SELDO     jz bus_free_sel;
 	test	SSTAT0,SELDO	jnz select_out;
+	mvi	CLRSINT0, CLRSELDI;
 select_in:
-        if ((ahc->flags & AHC_TARGETROLE) != 0) {
-                if ((ahc->flags & AHC_INITIATORROLE) != 0) {
+	if ((ahc->flags & AHC_TARGETMODE) != 0) {
+		if ((ahc->flags & AHC_INITIATORMODE) != 0) {
 			test	SSTAT0, TARGET	jz initiator_reselect;
 		}
-                mvi     CLRSINT0, CLRSELDI;
 
 		/*
 		 * We've just been selected.  Assert BSY and
@@ -178,6 +228,7 @@ select_in:
 		 * from the target.
 		 */
 		mvi	SCSISIGO, P_MESGOUT|BSYO;
+		mvi	CLRSINT1, CLRBUSFREE;
 
 		/*
 		 * Setup the DMA for sending the identify and
@@ -188,40 +239,47 @@ select_in:
 		mov     A, TQINPOS;
 		if ((ahc->features & AHC_CMD_CHAN) != 0) {
 			mvi	DINDEX, CCHADDR;
-                        mvi     SHARED_DATA_ADDR call set_32byte_addr;
+			mvi	TMODE_CMDADDR call set_32byte_addr;
 			mvi	CCSCBCTL, CCSCBRESET;
 		} else {
 			mvi	DINDEX, HADDR;
-                        mvi     SHARED_DATA_ADDR call set_32byte_addr;
+			mvi	TMODE_CMDADDR call set_32byte_addr;
 			mvi	DFCNTRL, FIFORESET;
 		}
 
 		/* Initiator that selected us */
-                and     SAVED_SCSIID, SELID_MASK, SELID;
+		and	SAVED_TCL, SELID_MASK, SELID;
+		if ((ahc->features & AHC_CMD_CHAN) != 0) {
+			mov	CCSCBRAM, SAVED_TCL;
+		} else {
+			mov	DFDAT, SAVED_TCL;
+		}
+
 		/* The Target ID we were selected at */
-                if ((ahc->features & AHC_MULTI_TID) != 0) {
-                        and     A, OID, TARGIDIN;
-                } else if ((ahc->features & AHC_ULTRA2) != 0) {
-                        and     A, OID, SCSIID_ULTRA2;
-                } else {
-                        and     A, OID, SCSIID;
-                }
-                or      SAVED_SCSIID, A;
-                if ((ahc->features & AHC_TWIN) != 0) {
-                        test    SBLKCTL, SELBUSB jz . + 2;
-                        or      SAVED_SCSIID, TWIN_CHNLB;
-                }
-                if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                        mov     CCSCBRAM, SAVED_SCSIID;
+		if ((ahc->features & AHC_CMD_CHAN) != 0) {
+			if ((ahc->features & AHC_MULTI_TID) != 0) {
+				and	CCSCBRAM, OID, TARGIDIN;
+			} else if ((ahc->features & AHC_ULTRA2) != 0) {
+				and	CCSCBRAM, OID, SCSIID_ULTRA2;
+			} else {
+				and	CCSCBRAM, OID, SCSIID;
+			}
 		} else {
-                        mov     DFDAT, SAVED_SCSIID;
-                }
+			if ((ahc->features & AHC_MULTI_TID) != 0) {
+				and	DFDAT, OID, TARGIDIN;
+			} else if ((ahc->features & AHC_ULTRA2) != 0) {
+				and	DFDAT, OID, SCSIID_ULTRA2;
+			} else {
+				and	DFDAT, OID, SCSIID;
+			}
+		}
+
+		/* No tag yet */
+		mvi	INITIATOR_TAG, SCB_LIST_NULL;
 
 		/*
 		 * If ATN isn't asserted, the target isn't interested
 		 * in talking to us.  Go directly to bus free.
-                 * XXX SCSI-1 may require us to assume lun 0 if
-                 * ATN is false.
 		 */
 		test	SCSISIGI, ATNI	jz	target_busfree;
 
@@ -236,6 +294,7 @@ select_in:
 		 * Our first message must be one of IDENTIFY, ABORT, or
 		 * BUS_DEVICE_RESET.
 		 */
+		/* XXX May need to be more lax here for older initiators... */
 		test	DINDEX, MSG_IDENTIFYFLAG jz host_target_message_loop;
 		/* Store for host */
 		if ((ahc->features & AHC_CMD_CHAN) != 0) {
@@ -285,10 +344,6 @@ select_in:
 			mov	DFDAT, DINDEX;
 		}
 		mov	INITIATOR_TAG, DINDEX;
-                or      SEQ_FLAGS, TARGET_CMD_IS_TAGGED;
-                test    SCSISIGI, ATNI  jz . + 2;
-                /* Initiator still wants to give us messages */
-                call    target_inb;
 		jmp	ident_messages_done;
 
 		/*
@@ -296,7 +351,8 @@ select_in:
 		 * run it's own target mode message state engine.
 		 */
 host_target_message_loop:
-                mvi     HOST_MSG_LOOP call set_seqint;
+		mvi	INTSTAT, HOST_MSG_LOOP;
+		nop;
 		cmp	RETURN_1, EXIT_MSG_LOOP	je target_ITloop;
 		test	SSTAT0, SPIORDY jz .;
 		jmp	host_target_message_loop;
@@ -306,11 +362,11 @@ ident_messages_done:
 		if ((ahc->features & AHC_HS_MAILBOX) != 0) {
 			and	A, HOST_TQINPOS, HS_MAILBOX;
 		} else {
-                        mov     A, KERNEL_TQINPOS;
+		mov	A, KERNEL_TQINPOS;
 		}
 		cmp	TQINPOS, A jne tqinfifo_has_space;
 		mvi	P_STATUS|BSYO call change_phase;
-                test    SEQ_FLAGS, TARGET_CMD_IS_TAGGED jz . + 3;
+		cmp	INITIATOR_TAG, SCB_LIST_NULL je . + 3;
 		mvi	STATUS_QUEUE_FULL call target_outb;
 		jmp	target_busfree_wait;
 		mvi	STATUS_BUSY call target_outb;
@@ -323,110 +379,48 @@ tqinfifo_has_space:
 			mvi	DFDAT, SCB_LIST_NULL;
 		}
 		or	SEQ_FLAGS, TARG_CMD_PENDING|IDENTIFY_SEEN;
-                test    SCSISIGI, ATNI  jnz target_mesgout_pending;
+		test	SCSISIGI, ATNI	jnz target_mesgout_pending_msg;
 		jmp	target_ITloop;
-        }
-
-if ((ahc->flags & AHC_INITIATORROLE) != 0) {
-/*
- * Reselection has been initiated by a target. Make a note that we've been
- * reselected, but haven't seen an IDENTIFY message from the target yet.
- */
-initiator_reselect:
-        /* XXX test for and handle ONE BIT condition */
-        or      SXFRCTL0, SPIOEN|CLRSTCNT|CLRCHN;
-        and     SAVED_SCSIID, SELID_MASK, SELID;
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                and     A, OID, SCSIID_ULTRA2;
-        } else {
-                and     A, OID, SCSIID;
-        }
-        or      SAVED_SCSIID, A;
-        if ((ahc->features & AHC_TWIN) != 0) {
-                test    SBLKCTL, SELBUSB        jz . + 2;
-                or      SAVED_SCSIID, TWIN_CHNLB;
-        }
-        mvi     CLRSINT0, CLRSELDI;
-        jmp     ITloop;
-}
-
-abort_qinscb:
-        call    add_scb_to_free_list;
-        jmp     poll_for_work_loop;
-
-start_selection:
-        /*
-         * If bus reset interrupts have been disabled (from a previous
-         * reset), re-enable them now.  Resets are only of interest
-         * when we have outstanding transactions, so we can safely
-         * defer re-enabling the interrupt until, as an initiator,
-         * we start sending out transactions again.
-         */
-        test    SIMODE1, ENSCSIRST      jnz . + 3;
-        mvi     CLRSINT1, CLRSCSIRSTI;
-        or      SIMODE1, ENSCSIRST;
-        if ((ahc->features & AHC_TWIN) != 0) {
-                and     SINDEX,~SELBUSB,SBLKCTL;/* Clear channel select bit */
-                test    SCB_SCSIID, TWIN_CHNLB jz . + 2;
-                or      SINDEX, SELBUSB;
-                mov     SBLKCTL,SINDEX;         /* select channel */
-        }
-initialize_scsiid:
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                mov     SCSIID_ULTRA2, SCB_SCSIID;
-        } else if ((ahc->features & AHC_TWIN) != 0) {
-                and     SCSIID, TWIN_TID|OID, SCB_SCSIID;
-        } else {
-                mov     SCSIID, SCB_SCSIID;
-        }
-        if ((ahc->flags & AHC_TARGETROLE) != 0) {
-                mov     SINDEX, SCSISEQ_TEMPLATE;
-                test    SCB_CONTROL, TARGET_SCB jz . + 2;
-                or      SINDEX, TEMODE;
-                mov     SCSISEQ, SINDEX ret;
-        } else {
-                mov     SCSISEQ, SCSISEQ_TEMPLATE ret;
-        }
-
-/*
- * Initialize transfer settings and clear the SCSI channel.
- * SINDEX should contain any additional bit's the client wants
- * set in SXFRCTL0.  We also assume that the current SCB is
- * a valid SCB for the target we wish to talk to.
- */
-initialize_channel:
-        or      SXFRCTL0, SPIOEN|CLRSTCNT|CLRCHN;
-set_transfer_settings:
-        if ((ahc->features & AHC_ULTRA) != 0) {
-                test    SCB_CONTROL, ULTRAENB jz . + 2;
-                or      SXFRCTL0, FAST20;
-        } 
-        /*
-         * Initialize SCSIRATE with the appropriate value for this target.
-         */
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                bmov    SCSIRATE, SCB_SCSIRATE, 2 ret;
-        } else {
-                mov     SCSIRATE, SCB_SCSIRATE ret;
-        }
-
-if ((ahc->flags & AHC_TARGETROLE) != 0) {
+		
 /*
  * We carefully toggle SPIOEN to allow us to return the 
  * message byte we receive so it can be checked prior to
  * driving REQ on the bus for the next byte.
  */
 target_inb:
-        /*
-         * Drive REQ on the bus by enabling SCSI PIO.
-         */
-        or      SXFRCTL0, SPIOEN;
-        /* Wait for the byte */
-        test    SSTAT0, SPIORDY jz .;
-        /* Prevent our read from triggering another REQ */
-        and     SXFRCTL0, ~SPIOEN;
-        /* Save latched contents */
-        mov     DINDEX, SCSIDATL ret;
+		/*
+		 * Drive REQ on the bus by enabling SCSI PIO.
+		 */
+		or	SXFRCTL0, SPIOEN;
+		/* Wait for the byte */
+		test	SSTAT0, SPIORDY jz .;
+		/* Prevent our read from triggering another REQ */
+		and	SXFRCTL0, ~SPIOEN;
+		/* Save latched contents */
+		mov	DINDEX, SCSIDATL ret;
+	}
+
+if ((ahc->flags & AHC_INITIATORMODE) != 0) {
+/*
+ * Reselection has been initiated by a target. Make a note that we've been
+ * reselected, but haven't seen an IDENTIFY message from the target yet.
+ */
+initiator_reselect:
+	/* XXX test for and handle ONE BIT condition */
+	and	SAVED_TCL, SELID_MASK, SELID;
+	if ((ahc->features & AHC_TWIN) != 0) {
+		test	SBLKCTL, SELBUSB	jz . + 2;
+		or	SAVED_TCL, SELBUSB;
+	}
+	or	SXFRCTL0, SPIOEN|CLRSTCNT|CLRCHN;
+	mvi	CLRSINT1,CLRBUSFREE;
+	or	SIMODE1, ENBUSFREE;		/*
+						 * We aren't expecting a
+						 * bus free, so interrupt
+						 * the kernel driver if it
+						 * happens.
+						 */
+	jmp	ITloop;
 }
 
 /*
@@ -438,13 +432,12 @@ target_inb:
 select_out:
 	/* Turn off the selection hardware */
 	and	SCSISEQ, TEMODE|ENSELI|ENRSELI|ENAUTOATNP, SCSISEQ;
+/*and	SCSISEQ, ENSELI|ENRSELI|ENAUTOATNP,SCSISEQ_TEMPLATE;*/
 	mvi	CLRSINT0, CLRSELDO;
 	mov	SCBPTR, WAITING_SCBH;
 	mov	WAITING_SCBH,SCB_NEXT;
-        mov     SAVED_SCSIID, SCB_SCSIID;
-        mov     SAVED_LUN, SCB_LUN;
-        call    initialize_channel;
-        if ((ahc->flags & AHC_TARGETROLE) != 0) {
+	mov	SAVED_TCL, SCB_TCL;
+	if ((ahc->flags & AHC_TARGETMODE) != 0) {
 		test	SSTAT0, TARGET	jz initiator_select;
 
 		/*
@@ -453,11 +446,13 @@ select_out:
 		 * sending our identify messages.
 		 */
 		mvi	P_MESGIN|BSYO call change_phase;
+		mvi	CLRSINT1,CLRBUSFREE;
 
 		/*
 		 * Start out with a simple identify message.
 		 */
-                or      SCB_LUN, MSG_IDENTIFYFLAG call target_outb;
+		and	A, LID, SCB_TCL;
+		or	A, MSG_IDENTIFYFLAG call target_outb;
 
 		/*
 		 * If we are the result of a tagged command, send
@@ -465,17 +460,16 @@ select_out:
 		 */
 		test	SCB_CONTROL, TAG_ENB	jz . + 3;
 		mvi	MSG_SIMPLE_Q_TAG call target_outb;
-                mov     SCB_TARGET_INFO[SCB_INITIATOR_TAG] call target_outb;
+		mov	SCB_INITIATOR_TAG call target_outb;
+		mov	INITIATOR_TAG, SCB_INITIATOR_TAG;
 target_synccmd:
 		/*
 		 * Now determine what phases the host wants us
 		 * to go through.
 		 */
-                mov     SEQ_FLAGS, SCB_TARGET_INFO[SCB_TARGET_PHASES];
+		mov	SEQ_FLAGS, SCB_TARGET_PHASES;
 		
-                test    SCB_CONTROL, MK_MESSAGE jz target_ITloop;
-                mvi     P_MESGIN|BSYO call change_phase;
-                jmp     host_target_message_loop;
+
 target_ITloop:
 		/*
 		 * Start honoring ATN signals now that
@@ -491,22 +485,21 @@ target_ITloop:
 		 * on the state of NO_DISCONNECT.
 		 */
 		test	SEQ_FLAGS, NO_DISCONNECT jz target_disconnect; 
-                mov     RETURN_1, ALLZEROS;
-                call    complete_target_cmd;
-                cmp     RETURN_1, CONT_MSG_LOOP jne .;
 		if ((ahc->flags & AHC_PAGESCBS) != 0) {
 			mov	ALLZEROS	call	get_free_or_disc_scb;
 		}
+		mov	RETURN_1, ALLZEROS;
+		call	complete_target_cmd;
+		cmp	RETURN_1, CONT_MSG_LOOP jne .;
 		mvi	DMAPARAMS, HDMAEN|DIRECTION|FIFORESET;
 		mov	SCB_TAG	 call dma_scb;
 		jmp	target_synccmd;
 
 target_mesgout:
 		mvi	SCSISIGO, P_MESGOUT|BSYO;
-target_mesgout_continue:
 		call	target_inb;
-target_mesgout_pending:
 		/* Local Processing goes here... */
+target_mesgout_pending_msg:
 		jmp	host_target_message_loop;
 		
 target_disconnect:
@@ -516,13 +509,9 @@ target_disconnect:
 		mvi	MSG_DISCONNECT call target_outb;
 
 target_busfree_wait:
-                /* Wait for preceding I/O session to complete. */
+		/* Wait for preceeding I/O session to complete. */
 		test	SCSISIGI, ACKI jnz .;
 target_busfree:
-                and     SIMODE1, ~ENBUSFREE;
-                if ((ahc->features & AHC_ULTRA2) != 0) {
-                        clr     SCSIBUSL;
-                }
 		clr	SCSISIGO;
 		mvi	LASTPHASE, P_BUSFREE;
 		call	complete_target_cmd;
@@ -548,12 +537,12 @@ target_cmdphase:
 		 * the first byte.
 		 */
 		shr	A, CMD_GROUP_CODE_SHIFT;
-                add     SINDEX, CMDSIZE_TABLE, A;
+		add	SINDEX, TARG_SCSIRATE, A;
 		mov	A, SINDIR;
 
 		test	A, 0xFF jz command_phase_done;
-                or      SXFRCTL0, SPIOEN;
 command_loop:
+		or	SXFRCTL0, SPIOEN;
 		test	SSTAT0, SPIORDY jz .;
 		cmp	A, 1 jne . + 2;
 		and	SXFRCTL0, ~SPIOEN;	/* Last Byte */
@@ -571,21 +560,22 @@ command_phase_done:
 
 target_dphase:
 		/*
-                 * Data phases on the bus are from the
-                 * perspective of the initiator.  The dma
-                 * code looks at LASTPHASE to determine the
-                 * data direction of the DMA.  Toggle it for
-                 * target transfers.
+		 * Data direction flags are from the
+		 * perspective of the initiator.
 		 */
-                xor     LASTPHASE, IOI, SCB_TARGET_INFO[SCB_TARGET_DATA_DIR];
-                or      SCB_TARGET_INFO[SCB_TARGET_DATA_DIR], BSYO
-                        call change_phase;
+		test	SCB_TARGET_PHASES[1], TARGET_DATA_IN jz . + 4;
+		mvi	LASTPHASE, P_DATAOUT;
+		mvi	P_DATAIN|BSYO call change_phase;
+		jmp	. + 3;
+		mvi	LASTPHASE, P_DATAIN;
+		mvi	P_DATAOUT|BSYO call change_phase;
+		mov	ALLZEROS call initialize_channel;
 		jmp	p_data;
 
 target_sphase:
 		mvi	P_STATUS|BSYO call change_phase;
 		mvi	LASTPHASE, P_STATUS;
-                mov     SCB_TARGET_INFO[SCB_TARGET_STATUS] call target_outb;
+		mov	SCB_TARGET_STATUS call target_outb;
 		/* XXX Watch for ATN or parity errors??? */
 		mvi	SCSISIGO, P_MESGIN|BSYO;
 		/* MSG_CMDCMPLT is 0, but we can't do an immediate of 0 */
@@ -608,7 +598,9 @@ complete_target_cmd:
 			or	DFCNTRL, FIFORESET;
 			mvi	DFWADDR, 3; /* Third 64bit word or byte 24 */
 			mov	DFDAT, ALLONES;
-                        mvi     28      call set_hcnt;
+			mvi	HCNT[0], 28;
+			clr	HCNT[1];
+			clr	HCNT[2];
 			or	DFCNTRL, HDMAEN|FIFOFLUSH;
 			call	dma_finish;
 		}
@@ -616,8 +608,17 @@ complete_target_cmd:
 		mvi	INTSTAT,CMDCMPLT ret;
 	}
 
-if ((ahc->flags & AHC_INITIATORROLE) != 0) {
+if ((ahc->flags & AHC_INITIATORMODE) != 0) {
 initiator_select:
+	mvi	SPIOEN call	initialize_channel;
+
+	/*
+	 * We aren't expecting a bus free, so interrupt
+	 * the kernel driver if it happens.
+	 */
+	mvi	CLRSINT1,CLRBUSFREE;
+	or	SIMODE1, ENBUSFREE;
+
 	/*
 	 * As soon as we get a successful selection, the target
 	 * should go into the message out phase since we have ATN
@@ -631,7 +632,6 @@ initiator_select:
 	 * target to assert REQ before checking MSG, C/D and I/O for
 	 * the bus phase.
 	 */
-mesgin_phasemis:
 ITloop:
 	call	phase_lock;
 
@@ -643,19 +643,16 @@ ITloop:
 	cmp	A,P_STATUS	je p_status;
 	cmp	A,P_MESGIN	je p_mesgin;
 
-        mvi     BAD_PHASE call set_seqint;
+	mvi	INTSTAT,BAD_PHASE;
 	jmp	ITloop;			/* Try reading the bus again. */
 
 await_busfree:
 	and	SIMODE1, ~ENBUSFREE;
 	mov	NONE, SCSIDATL;		/* Ack the last byte */
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                clr     SCSIBUSL;       /* Prevent bit leakage durint SELTO */
-        }
 	and	SXFRCTL0, ~SPIOEN;
 	test	SSTAT1,REQINIT|BUSFREE	jz .;
 	test	SSTAT1, BUSFREE jnz poll_for_work;
-        mvi     MISSED_BUSFREE call set_seqint;
+	mvi	INTSTAT, BAD_PHASE;
 }
 	
 clear_target_state:
@@ -665,7 +662,6 @@ clear_target_state:
 	 * clear DFCNTRL too.
 	 */
 	clr	DFCNTRL;
-        or      SXFRCTL0, CLRSTCNT|CLRCHN;
 
 	/*
 	 * We don't know the target we will connect to,
@@ -676,129 +672,35 @@ clear_target_state:
 		bmov	SCSIRATE, ALLZEROS, 2;
 	} else {
 		clr	SCSIRATE;
-                if ((ahc->features & AHC_ULTRA) != 0) {
-                        and     SXFRCTL0, ~(FAST20);
-                }
+		and	SXFRCTL0, ~(FAST20);
 	}
 	mvi	LASTPHASE, P_BUSFREE;
 	/* clear target specific flags */
 	clr	SEQ_FLAGS ret;
 
-sg_advance:
-        clr     A;                      /* add sizeof(struct scatter) */
-        add     SCB_RESIDUAL_SGPTR[0],SG_SIZEOF;
-        adc     SCB_RESIDUAL_SGPTR[1],A;
-        adc     SCB_RESIDUAL_SGPTR[2],A;
-        adc     SCB_RESIDUAL_SGPTR[3],A ret;
-
-if ((ahc->features & AHC_CMD_CHAN) != 0) {
-disable_ccsgen:
-        test    CCSGCTL, CCSGEN jz return;
-        test    CCSGCTL, CCSGDONE jz .;
-disable_ccsgen_fetch_done:
-        clr     CCSGCTL;
-        test    CCSGCTL, CCSGEN jnz .;
-        ret;
-idle_loop:
-        /*
-         * Do we need any more segments for this transfer?
-         */
-        test    SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jnz return;
-
-        /* Did we just finish fetching segs? */
-        cmp     CCSGCTL, CCSGEN|CCSGDONE je idle_sgfetch_complete;
-
-        /* Are we actively fetching segments? */
-        test    CCSGCTL, CCSGEN jnz return;
-
-        /*
-         * Do we have any prefetch left???
-         */
-        cmp     CCSGADDR, SG_PREFETCH_CNT jne idle_sg_avail;
-
-        /*
-         * Need to fetch segments, but we can only do that
-         * if the command channel is completely idle.  Make
-         * sure we don't have an SCB prefetch going on.
-         */
-        test    CCSCBCTL, CCSCBEN jnz return;
-
-        /*
-         * We fetch a "cacheline aligned" and sized amount of data
-         * so we don't end up referencing a non-existant page.
-         * Cacheline aligned is in quotes because the kernel will
-         * set the prefetch amount to a reasonable level if the
-         * cacheline size is unknown.
-         */
-        mvi     CCHCNT, SG_PREFETCH_CNT;
-        and     CCHADDR[0], SG_PREFETCH_ALIGN_MASK, SCB_RESIDUAL_SGPTR;
-        bmov    CCHADDR[1], SCB_RESIDUAL_SGPTR[1], 3;
-        mvi     CCSGCTL, CCSGEN|CCSGRESET ret;
-idle_sgfetch_complete:
-        call    disable_ccsgen_fetch_done;
-        and     CCSGADDR, SG_PREFETCH_ADDR_MASK, SCB_RESIDUAL_SGPTR;
-idle_sg_avail:
-	if ((ahc->features & AHC_ULTRA2) != 0) {
-                /* Does the hardware have space for another SG entry? */
-                test    DFSTATUS, PRELOAD_AVAIL jz return;
-                bmov    HADDR, CCSGRAM, 7;
-                test    HCNT[0], 0x1 jz . + 2;
-                xor     DATA_COUNT_ODD, 0x1;
-                bmov    SCB_RESIDUAL_DATACNT[3], CCSGRAM, 1;
-                if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-                        mov     SCB_RESIDUAL_DATACNT[3] call set_hhaddr;
-                }
-                call    sg_advance;
-                mov     SINDEX, SCB_RESIDUAL_SGPTR[0];
-                test    DATA_COUNT_ODD, 0x1 jz . + 2;
-                or      SINDEX, ODD_SEG;
-                test    SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jz . + 2;
-                or      SINDEX, LAST_SEG;
-                mov     SG_CACHE_PRE, SINDEX;
-                /* Load the segment */
-                or      DFCNTRL, PRELOADEN;
-        }
-        ret;
-}
-
-if ((ahc->bugs & AHC_PCI_MWI_BUG) != 0 && ahc->pci_cachesize != 0) {
 /*
- * Calculate the trailing portion of this S/G segment that cannot
- * be transferred using memory write and invalidate PCI transactions.  
- * XXX Can we optimize this for PCI writes only???
+ * If we re-enter the data phase after going through another phase, the
+ * STCNT may have been cleared, so restore it from the residual field.
  */
-calc_mwi_residual:
-        /*
-         * If the ending address is on a cacheline boundary,
-         * there is no need for an extra segment.
-         */
-        mov     A, HCNT[0];
-        add     A, A, HADDR[0];
-        and     A, CACHESIZE_MASK;
-        test    A, 0xFF jz return;
-
-        /*
-         * If the transfer is less than a cachline,
-         * there is no need for an extra segment.
-         */
-        test    HCNT[1], 0xFF   jnz calc_mwi_residual_final;
-        test    HCNT[2], 0xFF   jnz calc_mwi_residual_final;
-        add     NONE, INVERTED_CACHESIZE_MASK, HCNT[0];
-        jnc     return;
-
-calc_mwi_residual_final:
-        mov     MWI_RESIDUAL, A;
-        not     A;
-        inc     A;
-        add     HCNT[0], A;
-        adc     HCNT[1], -1;
-        adc     HCNT[2], -1 ret;
-}
+data_phase_reinit:
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		/*
+		 * The preload circuitry requires us to
+		 * reload the address too, so pull it from
+		 * the shaddow address.
+		 */
+		bmov	HADDR, SHADDR, 4;
+		bmov	HCNT, SCB_RESID_DCNT, 3;
+	} else if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		bmov	STCNT, SCB_RESID_DCNT, 3;
+	} else {
+		mvi	DINDEX, STCNT;
+		mvi	SCB_RESID_DCNT	call bcopy_3;
+	}
+	and	DATA_COUNT_ODD, 0x1, SCB_RESID_DCNT[0];
+	jmp	data_phase_loop;
 
 p_data:
-        test    SEQ_FLAGS,IDENTIFY_SEEN jnz p_data_okay;
-        mvi     NO_IDENT jmp set_seqint;
-p_data_okay:
 	if ((ahc->features & AHC_ULTRA2) != 0) {
 		mvi	DMAPARAMS, PRELOADEN|SCSIEN|HDMAEN;
 	} else {
@@ -806,515 +708,213 @@ p_data_okay:
 	}
 	test	LASTPHASE, IOI jnz . + 2;
 	or	DMAPARAMS, DIRECTION;
+	call	assert;			/*
+					 * Ensure entering a data
+					 * phase is okay - seen identify, etc.
+					 */
 	if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                /* We don't have any valid S/G elements */
-                mvi     CCSGADDR, SG_PREFETCH_CNT;
+		mvi	CCSGADDR, CCSGADDR_MAX;
 	}
-        test    SEQ_FLAGS, DPHASE       jz data_phase_initialize;
-
-        /*
-         * If we re-enter the data phase after going through another
-         * phase, our transfer location has almost certainly been
-         * corrupted by the interveining, non-data, transfers.  Ask
-         * the host driver to fix us up based on the transfer residual.
-         */
-        mvi     PDATA_REINIT    call set_seqint;
-        jmp     data_phase_loop;
-
-data_phase_initialize:
-        /* We have seen a data phase for the first time */
+	test	SEQ_FLAGS, DPHASE	jnz data_phase_reinit;
+
+	/* We have seen a data phase */
 	or	SEQ_FLAGS, DPHASE;
 
 	/*
 	 * Initialize the DMA address and counter from the SCB.
-         * Also set SCB_RESIDUAL_SGPTR, including the LAST_SEG
-         * flag in the highest byte of the data count.  We cannot
-         * modify the saved values in the SCB until we see a save
-         * data pointers message.
+	 * Also set SG_COUNT and SG_NEXT in memory since we cannot
+	 * modify the values in the SCB itself until we see a
+	 * save data pointers message.
 	 */
-        if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-                /* The lowest address byte must be loaded last. */
-                mov     SCB_DATACNT[3] call set_hhaddr;
-        }
 	if ((ahc->features & AHC_CMD_CHAN) != 0) {
 		bmov	HADDR, SCB_DATAPTR, 7;
-                bmov    SCB_RESIDUAL_DATACNT[3], SCB_DATACNT[3], 5;
 	} else {
 		mvi	DINDEX, HADDR;
 		mvi	SCB_DATAPTR	call bcopy_7;
-                mvi     DINDEX, SCB_RESIDUAL_DATACNT + 3;
-                mvi     SCB_DATACNT + 3 call bcopy_5;
 	}
-        if ((ahc->bugs & AHC_PCI_MWI_BUG) != 0 && ahc->pci_cachesize != 0) {
-                call    calc_mwi_residual;
-        }
-        and     SCB_RESIDUAL_SGPTR[0], ~SG_FULL_RESID;
-        and     DATA_COUNT_ODD, 0x1, HCNT[0];
+	and	DATA_COUNT_ODD, 0x1, SCB_DATACNT[0];
 
 	if ((ahc->features & AHC_ULTRA2) == 0) {
 		if ((ahc->features & AHC_CMD_CHAN) != 0) {
 			bmov	STCNT, HCNT, 3;
 		} else {
 			call	set_stcnt_from_hcnt;
-                }
+		}
+	}
+
+	if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		bmov	SG_COUNT, SCB_SGCOUNT, 5;
+	} else {
+		mvi	DINDEX, SG_COUNT;
+		mvi	SCB_SGCOUNT	call bcopy_5;
 	}
 
 data_phase_loop:
-        /* Guard against overruns */
-        test    SCB_RESIDUAL_SGPTR[0], SG_LIST_NULL jz data_phase_inbounds;
-
-        /*
-         * Turn on `Bit Bucket' mode, wait until the target takes
-         * us to another phase, and then notify the host.
-         */
-        and     DMAPARAMS, DIRECTION;
-        mov     DFCNTRL, DMAPARAMS;
+/* Guard against overruns */
+	test	SG_COUNT, 0xff jnz data_phase_inbounds;
+/*
+ * Turn on 'Bit Bucket' mode, set the transfer count to
+ * 16meg and let the target run until it changes phase.
+ * When the transfer completes, notify the host that we
+ * had an overrun.
+ */
 	or	SXFRCTL1,BITBUCKET;
-        if ((ahc->features & AHC_DT) == 0) {
-                test    SSTAT1,PHASEMIS jz .;
+	and	DMAPARAMS, ~(HDMAEN|SDMAEN);
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		bmov	HCNT, ALLONES, 3;
+	} else if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		bmov	STCNT, ALLONES, 3;
 	} else {
-                test    SCSIPHASE, DATA_PHASE_MASK jnz .;
+		mvi	STCNT[0], 0xFF;
+		mvi	STCNT[1], 0xFF;
+		mvi	STCNT[2], 0xFF;
 	}
-        and     SXFRCTL1, ~BITBUCKET;
-        mvi     DATA_OVERRUN call set_seqint;
-        jmp     ITloop;
-
 data_phase_inbounds:
+/* If we are the last SG block, tell the hardware. */
+	cmp	SG_COUNT,0x01 jne data_phase_wideodd;
 	if ((ahc->features & AHC_ULTRA2) != 0) {
-                mov     SINDEX, SCB_RESIDUAL_SGPTR[0];
-                test    SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jz . + 2;
-                or      SINDEX, LAST_SEG;
-                test    DATA_COUNT_ODD, 0x1 jz . + 2;
-                or      SINDEX, ODD_SEG;
-                mov     SG_CACHE_PRE, SINDEX;
-                mov     DFCNTRL, DMAPARAMS;
-ultra2_dma_loop:
-                call    idle_loop;
-                /*
-                 * The transfer is complete if either the last segment
-                 * completes or the target changes phase.
-                 */
-                test    SG_CACHE_SHADOW, LAST_SEG_DONE jnz ultra2_dmafinish;
-                if ((ahc->features & AHC_DT) == 0) {
-                        if ((ahc->flags & AHC_TARGETROLE) != 0) {
-                                 /*
-                                  * As a target, we control the phases,
-                                  * so ignore PHASEMIS.
-                                  */
-                                test    SSTAT0, TARGET jnz ultra2_dma_loop;
-                        }
-                        if ((ahc->flags & AHC_INITIATORROLE) != 0) {
-                                test    SSTAT1,PHASEMIS jz ultra2_dma_loop;
-                        }
-                } else {
-                        test    DFCNTRL, SCSIEN jnz ultra2_dma_loop;
-                }
-
-ultra2_dmafinish:
-                /*
-                 * The transfer has terminated either due to a phase
-                 * change, and/or the completion of the last segment.
-                 * We have two goals here.  Do as much other work
-                 * as possible while the data fifo drains on a read
-                 * and respond as quickly as possible to the standard
-                 * messages (save data pointers/disconnect and command
-                 * complete) that usually follow a data phase.
-                 */
-                if ((ahc->bugs & AHC_AUTOFLUSH_BUG) != 0) {
-                        /*
-                         * On chips with broken auto-flush, start
-                         * the flushing process now.  We'll poke
-                         * the chip from time to time to keep the
-                         * flush process going as we complete the
-                         * data phase.
-                         */
-                        or      DFCNTRL, FIFOFLUSH;
-                }
-                /*
-                 * We assume that, even though data may still be
-                 * transferring to the host, that the SCSI side of
-                 * the DMA engine is now in a static state.  This
-                 * allows us to update our notion of where we are
-                 * in this transfer.
-                 *
-                 * If, by chance, we stopped before being able
-                 * to fetch additional segments for this transfer,
-                 * yet the last S/G was completely exhausted,
-                 * call our idle loop until it is able to load
-                 * another segment.  This will allow us to immediately
-                 * pickup on the next segment on the next data phase.
-                 *
-                 * If we happened to stop on the last segment, then
-                 * our residual information is still correct from
-                 * the idle loop and there is no need to perform
-                 * any fixups.
-                 */
-ultra2_ensure_sg:
-                test    SG_CACHE_SHADOW, LAST_SEG jz ultra2_shvalid;
-                /* Record if we've consumed all S/G entries */
-                test    SSTAT2, SHVALID jnz residuals_correct;
-                or      SCB_RESIDUAL_SGPTR[0], SG_LIST_NULL;
-                jmp     residuals_correct;
-
-ultra2_shvalid:
-                test    SSTAT2, SHVALID jnz sgptr_fixup;
-                call    idle_loop;
-                jmp     ultra2_ensure_sg;
-
-sgptr_fixup:
-                /*
-                 * Fixup the residual next S/G pointer.  The S/G preload
-                 * feature of the chip allows us to load two elements
-                 * in addition to the currently active element.  We
-                 * store the bottom byte of the next S/G pointer in
-                 * the SG_CACEPTR register so we can restore the
-                 * correct value when the DMA completes.  If the next
-                 * sg ptr value has advanced to the point where higher
-                 * bytes in the address have been affected, fix them
-                 * too.
-                 */
-                test    SG_CACHE_SHADOW, 0x80 jz sgptr_fixup_done;
-                test    SCB_RESIDUAL_SGPTR[0], 0x80 jnz sgptr_fixup_done;
-                add     SCB_RESIDUAL_SGPTR[1], -1;
-                adc     SCB_RESIDUAL_SGPTR[2], -1; 
-                adc     SCB_RESIDUAL_SGPTR[3], -1;
-sgptr_fixup_done:
-                and     SCB_RESIDUAL_SGPTR[0], SG_ADDR_MASK, SG_CACHE_SHADOW;
-                clr     DATA_COUNT_ODD;
-                test    SG_CACHE_SHADOW, ODD_SEG jz . + 2;
-                or      DATA_COUNT_ODD, 0x1;
-                clr     SCB_RESIDUAL_DATACNT[3]; /* We are not the last seg */
-residuals_correct:
-                /*
-                 * Go ahead and shut down the DMA engine now.
-                 * In the future, we'll want to handle end of
-                 * transfer messages prior to doing this, but this
-                 * requires similar restructuring for pre-ULTRA2
-                 * controllers.
-                 */
-                test    DMAPARAMS, DIRECTION jnz ultra2_fifoempty;
-ultra2_fifoflush:
-                if ((ahc->features & AHC_DT) == 0) {
-                        if ((ahc->bugs & AHC_AUTOFLUSH_BUG) != 0) {
-                                /*
-                                 * On Rev A of the aic7890, the autoflush
-                                 * feature doesn't function correctly.
-                                 * Perform an explicit manual flush.  During
-                                 * a manual flush, the FIFOEMP bit becomes
-                                 * true every time the PCI FIFO empties
-                                 * regardless of the state of the SCSI FIFO.
-                                 * It can take up to 4 clock cycles for the
-                                 * SCSI FIFO to get data into the PCI FIFO
-                                 * and for FIFOEMP to de-assert.  Here we
-                                 * guard against this condition by making
-                                 * sure the FIFOEMP bit stays on for 5 full
-                                 * clock cycles.
-                                 */
-                                or      DFCNTRL, FIFOFLUSH;
-                                test    DFSTATUS, FIFOEMP jz ultra2_fifoflush;
-                                test    DFSTATUS, FIFOEMP jz ultra2_fifoflush;
-                                test    DFSTATUS, FIFOEMP jz ultra2_fifoflush;
-                                test    DFSTATUS, FIFOEMP jz ultra2_fifoflush;
-                        }
-                        test    DFSTATUS, FIFOEMP jz ultra2_fifoflush;
-                } else {
-                        /*
-                         * We enable the auto-ack feature on DT capable
-                         * controllers.  This means that the controller may
-                         * have already transferred some overrun bytes into
-                         * the data FIFO and acked them on the bus.  The only
-                         * way to detect this situation is to wait for
-                         * LAST_SEG_DONE to come true on a completed transfer
-                         * and then test to see if the data FIFO is non-empty.
-                         */
-                        test    SCB_RESIDUAL_SGPTR[0], SG_LIST_NULL jz . + 4;
-                        test    SG_CACHE_SHADOW, LAST_SEG_DONE jz .;
-                        test    DFSTATUS, FIFOEMP jnz ultra2_fifoempty;
-                        /* Overrun */
-                        jmp     data_phase_loop;
-                        test    DFSTATUS, FIFOEMP jz .;
-                }
-ultra2_fifoempty:
-                /* Don't clobber an inprogress host data transfer */
-                test    DFSTATUS, MREQPEND      jnz ultra2_fifoempty;
-ultra2_dmahalt:
-                and     DFCNTRL, ~(SCSIEN|HDMAEN);
-                test    DFCNTRL, SCSIEN|HDMAEN jnz .;
-                if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-                        /*
-                         * Keep HHADDR cleared for future, 32bit addressed
-                         * only, DMA operations.
-                         *
-                         * Due to bayonette style S/G handling, our residual
-                         * data must be "fixed up" once the transfer is halted.
-                         * Here we fixup the HSHADDR stored in the high byte
-                         * of the residual data cnt.  By postponing the fixup,
-                         * we can batch the clearing of HADDR with the fixup.
-                         * If we halted on the last segment, the residual is
-                         * already correct.   If we are not on the last
-                         * segment, copy the high address directly from HSHADDR.
-                         * We don't need to worry about maintaining the
-                         * SG_LAST_SEG flag as it will always be false in the
-                         * case where an update is required.
-                         */
-                        or      DSCOMMAND1, HADDLDSEL0;
-                        test    SG_CACHE_SHADOW, LAST_SEG jnz . + 2;
-                        mov     SCB_RESIDUAL_DATACNT[3], SHADDR;
-                        clr     HADDR;
-                        and     DSCOMMAND1, ~HADDLDSEL0;
-                }
+		or	SG_CACHEPTR, LAST_SEG;
 	} else {
-                /* If we are the last SG block, tell the hardware. */
-                if ((ahc->bugs & AHC_PCI_MWI_BUG) != 0
-                  && ahc->pci_cachesize != 0) {
-                        test    MWI_RESIDUAL, 0xFF jnz dma_mid_sg;
-                }
-                test    SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jz dma_mid_sg;
-                if ((ahc->flags & AHC_TARGETROLE) != 0) {
-                        test    SSTAT0, TARGET jz dma_last_sg;
-                        if ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0) {
-                                test    DMAPARAMS, DIRECTION jz dma_mid_sg;
-                        }
+		if ((ahc->flags & AHC_TARGETMODE) != 0) {
+			test	SSTAT0, TARGET jz . + 2;
+			test	DMAPARAMS, DIRECTION jz data_phase_wideodd;
 		}
-dma_last_sg:
 		and	DMAPARAMS, ~WIDEODD;
-dma_mid_sg:
-                /* Start DMA data transfer. */
+	}
+data_phase_wideodd:
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		mov	SINDEX, ALLONES;
 		mov	DFCNTRL, DMAPARAMS;
-dma_loop:
-                if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                        call    idle_loop;
-                }
-                test    SSTAT0,DMADONE  jnz dma_dmadone;
-                test    SSTAT1,PHASEMIS jz dma_loop;    /* ie. underrun */
-dma_phasemis:
-                /*
-                 * We will be "done" DMAing when the transfer count goes to
-                 * zero, or the target changes the phase (in light of this,
-                 * it makes sense that the DMA circuitry doesn't ACK when
-                 * PHASEMIS is active).  If we are doing a SCSI->Host transfer,
-                 * the data FIFO should be flushed auto-magically on STCNT=0
-                 * or a phase change, so just wait for FIFO empty status.
-                 */
-dma_checkfifo:
-                test    DFCNTRL,DIRECTION       jnz dma_fifoempty;
-dma_fifoflush:
-                test    DFSTATUS,FIFOEMP        jz dma_fifoflush;
-dma_fifoempty:
-                /* Don't clobber an inprogress host data transfer */
-                test    DFSTATUS, MREQPEND      jnz dma_fifoempty;
-
-                /*
-                 * Now shut off the DMA and make sure that the DMA
-                 * hardware has actually stopped.  Touching the DMA
-                 * counters, etc. while a DMA is active will result
-                 * in an ILLSADDR exception.
-                 */
-dma_dmadone:
-                and     DFCNTRL, ~(SCSIEN|SDMAEN|HDMAEN);
-dma_halt:
-                /*
-                 * Some revisions of the aic78XX have a problem where, if the
-                 * data fifo is full, but the PCI input latch is not empty, 
-                 * HDMAEN cannot be cleared.  The fix used here is to drain
-                 * the prefetched but unused data from the data fifo until
-                 * there is space for the input latch to drain.
-                 */
-                if ((ahc->bugs & AHC_PCI_2_1_RETRY_BUG) != 0) {
-                        mov     NONE, DFDAT;
-                }
-                test    DFCNTRL, (SCSIEN|SDMAEN|HDMAEN) jnz dma_halt;
-
-                /* See if we have completed this last segment */
-                test    STCNT[0], 0xff  jnz data_phase_finish;
-                test    STCNT[1], 0xff  jnz data_phase_finish;
-                test    STCNT[2], 0xff  jnz data_phase_finish;
-
-                /*
-                 * Advance the scatter-gather pointers if needed 
-                 */
-                if ((ahc->bugs & AHC_PCI_MWI_BUG) != 0
-                  && ahc->pci_cachesize != 0) {
-                        test    MWI_RESIDUAL, 0xFF jz no_mwi_resid;
-                        /*
-                         * Reload HADDR from SHADDR and setup the
-                         * count to be the size of our residual.
-                         */
-                        if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                                bmov    HADDR, SHADDR, 4;
-                                mov     HCNT, MWI_RESIDUAL;
-                                bmov    HCNT[1], ALLZEROS, 2;
-                        } else {
-                                mvi     DINDEX, HADDR;
-                                mvi     SHADDR call bcopy_4;
-                                mov     MWI_RESIDUAL call set_hcnt;
-                        }
-                        clr     MWI_RESIDUAL;
-                        jmp     sg_load_done;
-no_mwi_resid:
-                }
-                test    SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jz sg_load;
-                or      SCB_RESIDUAL_SGPTR[0], SG_LIST_NULL;
-                jmp     data_phase_finish;
+		test	SSTAT0, SDONE jnz .;/* Wait for preload to complete */
+data_phase_dma_loop:
+		test	SSTAT0,	SDONE jnz data_phase_dma_done;
+		test	SSTAT1,PHASEMIS	jz data_phase_dma_loop;	/* ie. underrun */
+	} else {
+		mov	DMAPARAMS  call dma;
+	}
+
+data_phase_dma_done:
+/* Go tell the host about any overruns */
+	test	SXFRCTL1,BITBUCKET jnz data_phase_overrun;
+
+/* See if we completed this segment */
+	test	STCNT[0], 0xff	jnz data_phase_finish;
+	test	STCNT[1], 0xff	jnz data_phase_finish;
+	test	STCNT[2], 0xff	jnz data_phase_finish;
+
+/*
+ * Advance the scatter-gather pointers if needed 
+ */
+sg_advance:
+	dec	SG_COUNT;	/* one less segment to go */
+
+	test	SG_COUNT, 0xff	jz data_phase_finish; /* Are we done? */
+/*
+ * Load a struct scatter and set up the data address and length.
+ * If the working value of the SG count is nonzero, then
+ * we need to load a new set of values.
+ *
+ * This, like all DMA's, assumes little-endian host data storage.
+ */
 sg_load:
+	if ((ahc->features & AHC_CMD_CHAN) != 0) {
 		/*
-                 * Load the next SG element's data address and length
-                 * into the DMA engine.  If we don't have hardware
-                 * to perform a prefetch, we'll have to fetch the
-                 * segment from host memory first.
+		 * Do we have any prefetch left???
 		 */
-                if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                        /* Wait for the idle loop to complete */
-                        test    CCSGCTL, CCSGEN jz . + 3;
-                        call    idle_loop;
-                        test    CCSGCTL, CCSGEN jnz . - 1;
-                        bmov    HADDR, CCSGRAM, 7;
-                        /*
-                         * Workaround for flaky external SCB RAM
-                         * on certain aic7895 setups.  It seems
-                         * unable to handle direct transfers from
-                         * S/G ram to certain SCB locations.
-                         */
-                        mov     SINDEX, CCSGRAM;
-                        mov     SCB_RESIDUAL_DATACNT[3], SINDEX;
-                } else {
-                        if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-                                mov     ALLZEROS call set_hhaddr;
-                        }
-                        mvi     DINDEX, HADDR;
-                        mvi     SCB_RESIDUAL_SGPTR      call bcopy_4;
-
-                        mvi     SG_SIZEOF       call set_hcnt;
-
-                        or      DFCNTRL, HDMAEN|DIRECTION|FIFORESET;
-
-                        call    dma_finish;
-
-                        mvi     DINDEX, HADDR;
-                        call    dfdat_in_7;
-                        mov     SCB_RESIDUAL_DATACNT[3], DFDAT;
-                }
-
-                if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-                        mov     SCB_RESIDUAL_DATACNT[3] call set_hhaddr;
-
-                        /*
-                         * The lowest address byte must be loaded
-                         * last as it triggers the computation of
-                         * some items in the PCI block.  The ULTRA2
-                         * chips do this on PRELOAD.
-                         */
-                        mov     HADDR, HADDR;
-                }
-                if ((ahc->bugs & AHC_PCI_MWI_BUG) != 0
-                  && ahc->pci_cachesize != 0) {
-                        call calc_mwi_residual;
-                }
-
-                /* Point to the new next sg in memory */
-                call    sg_advance;
-
-sg_load_done:
+		cmp	CCSGADDR, CCSGADDR_MAX jne prefetched_segs_avail;
+
+		/*
+		 * Fetch MIN(CCSGADDR_MAX, (SG_COUNT * 8)) bytes.
+		 */
+		add	A, -(CCSGRAM_MAXSEGS + 1), SG_COUNT;
+		mvi	A, CCSGADDR_MAX;
+		jc	. + 2;
+		shl	A, 3, SG_COUNT;
+		mov	CCHCNT, A;
+		bmov	CCHADDR, SG_NEXT, 4;
+		mvi	CCSGCTL, CCSGEN|CCSGRESET;
+		test	CCSGCTL, CCSGDONE jz .;
+		and	CCSGCTL, ~CCSGEN;
+		test	CCSGCTL, CCSGEN jnz .;
+		mvi	CCSGCTL, CCSGRESET;
+prefetched_segs_avail:
+		bmov 	HADDR, CCSGRAM, 8;
+	} else {
+		mvi	DINDEX, HADDR;
+		mvi	SG_NEXT	call bcopy_4;
+
+		mvi	HCNT[0],SG_SIZEOF;
+		clr	HCNT[1];
+		clr	HCNT[2];
+
+		or	DFCNTRL, HDMAEN|DIRECTION|FIFORESET;
+
+		call	dma_finish;
+
+		/*
+		 * Copy data from FIFO into SCB data pointer and data count.
+		 * This assumes that the SG segments are of the form:
+		 * struct ahc_dma_seg {
+		 *	u_int32_t	addr;	four bytes, little-endian order
+		 *	u_int32_t	len;	four bytes, little endian order
+		 * };
+		 */
+		mvi	HADDR	call dfdat_in_7;
+	}
+
+	/* Track odd'ness */
+	test	HCNT[0], 0x1 jz . + 2;
+	xor	DATA_COUNT_ODD, 0x1;
+
+	if ((ahc->features & AHC_ULTRA2) == 0) {
+		/* Load STCNT as well.  It is a mirror of HCNT */
 		if ((ahc->features & AHC_CMD_CHAN) != 0) {
 			bmov	STCNT, HCNT, 3;
 		} else {
 			call	set_stcnt_from_hcnt;
 		}
-                /* Track odd'ness */
-                test    HCNT[0], 0x1 jz . + 2;
-                xor     DATA_COUNT_ODD, 0x1;
-
-                if ((ahc->flags & AHC_TARGETROLE) != 0) {
-                        test    SSTAT0, TARGET jnz data_phase_loop;
-                }
 	}
-data_phase_finish:
-        /*
-         * If the target has left us in data phase, loop through
-         * the dma code again.  In the case of ULTRA2 adapters,
-         * we should only loop if there is a data overrun.  For
-         * all other adapters, we'll loop after each S/G element
-         * is loaded as well as if there is an overrun.
-         */
-        if ((ahc->flags & AHC_TARGETROLE) != 0) {
-                test    SSTAT0, TARGET jnz data_phase_done;
-        }
-        if ((ahc->flags & AHC_INITIATORROLE) != 0) {
-                test    SSTAT1, REQINIT jz .;
-                if ((ahc->features & AHC_DT) == 0) {
-                        test    SSTAT1,PHASEMIS jz data_phase_loop;
-                } else {
-                        test    SCSIPHASE, DATA_PHASE_MASK jnz data_phase_loop;
-                }
-        }
-
-data_phase_done:
-        /*
-         * After a DMA finishes, save the SG and STCNT residuals back into
-         * the SCB.  We use STCNT instead of HCNT, since it's a reflection
-         * of how many bytes were transferred on the SCSI (as opposed to the
-         * host) bus.
-         */
-        if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                /* Kill off any pending prefetch */
-                call    disable_ccsgen;
+
+/* Advance the SG pointer */
+	clr	A;			/* add sizeof(struct scatter) */
+	add	SG_NEXT[0],SG_SIZEOF;
+	adc	SG_NEXT[1],A;
+
+	if ((ahc->flags & AHC_TARGETMODE) != 0) {
+		test	SSTAT0, TARGET jnz data_phase_loop;
 	}
+	test	SSTAT1, REQINIT jz .;
+	test	SSTAT1,PHASEMIS	jz data_phase_loop;
 
-        if ((ahc->features & AHC_ULTRA2) == 0) {
-                /*
-                 * Clear the high address byte so that all other DMA
-                 * operations, which use 32bit addressing, can assume
-                 * HHADDR is 0.
-                 */
-                if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-                        mov     ALLZEROS call set_hhaddr;
-                }
+	/* Ensure the last seg is visable at the shaddow layer */
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		mov	DFCNTRL, DMAPARAMS;
+		test	SSTAT0, SDONE jnz .;/* Wait for preload to complete */
 	}
 
-        /*
-         * Update our residual information before the information is
-         * lost by some other type of SCSI I/O (e.g. PIO).  If we have
-         * transferred all data, no update is needed.
-         *
-         */
-        test    SCB_RESIDUAL_SGPTR, SG_LIST_NULL jnz residual_update_done;
-        if ((ahc->bugs & AHC_PCI_MWI_BUG) != 0
-          && ahc->pci_cachesize != 0) {
-                if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                        test    MWI_RESIDUAL, 0xFF jz bmov_resid;
-                }
-                mov     A, MWI_RESIDUAL;
-                add     SCB_RESIDUAL_DATACNT[0], A, STCNT[0];
-                clr     A;
-                adc     SCB_RESIDUAL_DATACNT[1], A, STCNT[1];
-                adc     SCB_RESIDUAL_DATACNT[2], A, STCNT[2];
-                clr     MWI_RESIDUAL;
-                if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                        jmp     . + 2;
-bmov_resid:
-                        bmov    SCB_RESIDUAL_DATACNT, STCNT, 3;
-                }
-        } else if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                bmov    SCB_RESIDUAL_DATACNT, STCNT, 3;
+data_phase_finish:
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		call	ultra2_dmafinish;
+	}
+/*
+ * After a DMA finishes, save the SG and STCNT residuals back into the SCB
+ * We use STCNT instead of HCNT, since it's a reflection of how many bytes 
+ * were transferred on the SCSI (as opposed to the host) bus.
+ */
+	if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		bmov	SCB_RESID_DCNT, STCNT, 3;
 	} else {
-                mov     SCB_RESIDUAL_DATACNT[0], STCNT[0];
-                mov     SCB_RESIDUAL_DATACNT[1], STCNT[1];
-                mov     SCB_RESIDUAL_DATACNT[2], STCNT[2];
+		mov	SCB_RESID_DCNT[0],STCNT[0];
+		mov	SCB_RESID_DCNT[1],STCNT[1];
+		mov	SCB_RESID_DCNT[2],STCNT[2];
 	}
-residual_update_done:
-        /*
-         * Since we've been through a data phase, the SCB_RESID* fields
-         * are now initialized.  Clear the full residual flag.
-         */
-        and     SCB_SGPTR[0], ~SG_FULL_RESID;
+	mov	SCB_RESID_SGCNT, SG_COUNT;
 
 	if ((ahc->features & AHC_ULTRA2) != 0) {
-                /* Clear the channel in case we return to data phase later */
-                or      SXFRCTL0, CLRSTCNT|CLRCHN;
 		or	SXFRCTL0, CLRSTCNT|CLRCHN;
 	}
 
-        if ((ahc->flags & AHC_TARGETROLE) != 0) {
+	if ((ahc->flags & AHC_TARGETMODE) != 0) {
 		test	SEQ_FLAGS, DPHASE_PENDING jz ITloop;
 		and	SEQ_FLAGS, ~DPHASE_PENDING;
 		/*
@@ -1324,104 +924,112 @@ residual_update_done:
 		test	DFCNTRL, DIRECTION jz target_ITloop;
 		test	SSTAT1, REQINIT	jnz .;
 		jmp	target_ITloop;
-        } else {
-                jmp     ITloop;
+	}
+	jmp	ITloop;
+
+data_phase_overrun:
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		call	ultra2_dmafinish;
+		or	SXFRCTL0, CLRSTCNT|CLRCHN;
+	}
+/*
+ * Turn off BITBUCKET mode and notify the host
+ */
+	and	SXFRCTL1, ~BITBUCKET;
+	mvi	INTSTAT,DATA_OVERRUN;
+	jmp	ITloop;
+
+ultra2_dmafinish:
+	if ((ahc->features & AHC_ULTRA2) != 0) {
+		test	DFCNTRL, DIRECTION jnz ultra2_dmafifoempty;
+		and	DFCNTRL, ~SCSIEN;
+		test	DFCNTRL, SCSIEN jnz .;
+ultra2_dmafifoflush:
+		or	DFCNTRL, FIFOFLUSH;
+		/*
+		 * The FIFOEMP status bit on the Ultra2 class
+		 * of controllers seems to be a bit flaky.
+		 * It appears that if the FIFO is full and the
+		 * transfer ends with some data in the REQ/ACK
+		 * FIFO, FIFOEMP will fall temporarily
+		 * as the data is transferred to the PCI bus.
+		 * This glitch lasts for fewer than 5 clock cycles,
+		 * so we work around the problem by ensuring the
+		 * status bit stays false through a full glitch
+		 * window.
+		 */
+		test	DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
+		test	DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
+		test	DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
+		test	DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
+		test	DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
+
+ultra2_dmafifoempty:
+		/* Don't clobber an inprogress host data transfer */
+		test	DFSTATUS, MREQPEND	jnz ultra2_dmafifoempty;
+
+ultra2_dmahalt:
+		and     DFCNTRL, ~(SCSIEN|HDMAEN);
+		test	DFCNTRL, HDMAEN jnz .;
+		ret;
 	}
 
-if ((ahc->flags & AHC_INITIATORROLE) != 0) {
+if ((ahc->flags & AHC_INITIATORMODE) != 0) {
 /*
  * Command phase.  Set up the DMA registers and let 'er rip.
  */
 p_command:
-        test    SEQ_FLAGS,IDENTIFY_SEEN jnz p_command_okay;
-        mvi     NO_IDENT jmp set_seqint;
-p_command_okay:
-
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                bmov    HCNT[0], SCB_CDB_LEN,  1;
-                bmov    HCNT[1], ALLZEROS, 2;
-                mvi     SG_CACHE_PRE, LAST_SEG;
-        } else if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                bmov    STCNT[0], SCB_CDB_LEN, 1;
-                bmov    STCNT[1], ALLZEROS, 2;
-        } else {
-                mov     STCNT[0], SCB_CDB_LEN;
-                clr     STCNT[1];
-                clr     STCNT[2];
-        }
-        add     NONE, -13, SCB_CDB_LEN;
-        mvi     SCB_CDB_STORE jnc p_command_embedded;
-p_command_from_host:
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                bmov    HADDR[0], SCB_CDB_PTR, 4;
-                mvi     DFCNTRL, (PRELOADEN|SCSIEN|HDMAEN|DIRECTION);
-        } else {
-                if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                        bmov    HADDR[0], SCB_CDB_PTR, 4;
-                        bmov    HCNT, STCNT, 3;
-                } else {
-                        mvi     DINDEX, HADDR;
-                        mvi     SCB_CDB_PTR call bcopy_4;
-                        mov     SCB_CDB_LEN call set_hcnt;
-                }
-                mvi     DFCNTRL, (SCSIEN|SDMAEN|HDMAEN|DIRECTION|FIFORESET);
-        }
-        jmp     p_command_loop;
-p_command_embedded:
-        /*
-         * The data fifo seems to require 4 byte aligned
-         * transfers from the sequencer.  Force this to
-         * be the case by clearing HADDR[0] even though
-         * we aren't going to touch host memeory.
-         */
-        clr     HADDR[0];
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                mvi     DFCNTRL, (PRELOADEN|SCSIEN|DIRECTION);
-                bmov    DFDAT, SCB_CDB_STORE, 12; 
-        } else if ((ahc->features & AHC_CMD_CHAN) != 0) {
-                if ((ahc->flags & AHC_SCB_BTT) != 0) {
-                        /*
-                         * On the 7895 the data FIFO will
-                         * get corrupted if you try to dump
-                         * data from external SCB memory into
-                         * the FIFO while it is enabled.  So,
-                         * fill the fifo and then enable SCSI
-                         * transfers.
-                         */
-                        mvi     DFCNTRL, (DIRECTION|FIFORESET);
+	call	assert;
+
+	if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		mov	HCNT[0], SCB_CMDLEN;
+		bmov	HCNT[1], ALLZEROS, 2;
+		if ((ahc->features & AHC_ULTRA2) == 0) {
+			bmov	STCNT, HCNT, 3;
+		}
+		add	NONE, -17, SCB_CMDLEN;
+		jc	dma_cmd_data;
+		/*
+		 * The data fifo seems to require 4 byte alligned
+		 * transfers from the sequencer.  Force this to
+		 * be the case by clearing HADDR[0] even though
+		 * we aren't going to touch host memeory.
+		 */
+		bmov	HADDR[0], ALLZEROS, 1;
+		if ((ahc->features & AHC_ULTRA2) != 0) {
+			mvi	DFCNTRL, (PRELOADEN|SCSIEN|DIRECTION);
 		} else {
 			mvi	DFCNTRL, (SCSIEN|SDMAEN|DIRECTION|FIFORESET);
 		}
-                bmov    DFDAT, SCB_CDB_STORE, 12; 
-                if ((ahc->flags & AHC_SCB_BTT) != 0) {
-                        mvi     DFCNTRL, (SCSIEN|SDMAEN|DIRECTION|FIFOFLUSH);
-                } else {
-                        or      DFCNTRL, FIFOFLUSH;
+		bmov   DFDAT, SCB_CMDSTORE, 16; 
+		jmp	cmd_loop;
+dma_cmd_data:
+		bmov	HADDR, SCB_CMDPTR, 4;
+	} else {
+		mvi	DINDEX, HADDR;
+		mvi	SCB_CMDPTR	call bcopy_5;
+		clr	HCNT[1];
+		clr	HCNT[2];
+	}
+
+	if ((ahc->features & AHC_ULTRA2) == 0) {
+		if ((ahc->features & AHC_CMD_CHAN) == 0) {
+			call	set_stcnt_from_hcnt;
 		}
+		mvi	DFCNTRL, (SCSIEN|SDMAEN|HDMAEN|DIRECTION|FIFORESET);
 	} else {
-                mvi     DFCNTRL, (SCSIEN|SDMAEN|DIRECTION|FIFORESET);
-                call    copy_to_fifo_6;
-                call    copy_to_fifo_6;
-                or      DFCNTRL, FIFOFLUSH;
+		mvi	DFCNTRL, (PRELOADEN|SCSIEN|HDMAEN|DIRECTION);
 	}
-p_command_loop:
-        if ((ahc->features & AHC_DT) == 0) {
-                test    SSTAT0, SDONE jnz . + 2;
-                test    SSTAT1, PHASEMIS jz p_command_loop;
-                /*
-                 * Wait for our ACK to go-away on it's own
-                 * instead of being killed by SCSIEN getting cleared.
-                 */
-                test    SCSISIGI, ACKI jnz .;
-        } else {
-                test    DFCNTRL, SCSIEN jnz p_command_loop;
-        }
+cmd_loop:
+	test	SSTAT0, SDONE jnz . + 2;
+	test    SSTAT1, PHASEMIS jz cmd_loop;
+	/*
+	 * Wait for our ACK to go-away on it's own
+	 * instead of being killed by SCSIEN getting cleared.
+	 */
+	test	SCSISIGI, ACKI jnz .;
 	and	DFCNTRL, ~(SCSIEN|SDMAEN|HDMAEN);
 	test	DFCNTRL, (SCSIEN|SDMAEN|HDMAEN) jnz .;
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                /* Drop any residual from the S/G Preload queue */
-                or      SXFRCTL0, CLRSTCNT;
-        }
 	jmp	ITloop;
 
 /*
@@ -1429,10 +1037,9 @@ p_command_loop:
  * and store it into the SCB.
  */
 p_status:
-        test    SEQ_FLAGS,IDENTIFY_SEEN jnz p_status_okay;
-        mvi     NO_IDENT jmp set_seqint;
-p_status_okay:
-        mov     SCB_SCSI_STATUS, SCSIDATL;
+	call	assert;
+
+	mov	SCB_TARGET_STATUS, SCSIDATL;
 	jmp	ITloop;
 
 /*
@@ -1460,20 +1067,41 @@ p_status_okay:
  * reason.
  */
 p_mesgout_retry:
-        /* Turn on ATN for the retry */
-        if ((ahc->features & AHC_DT) == 0) {
-                or      SCSISIGO, ATNO, LASTPHASE;
-        } else {
-                mvi     SCSISIGO, ATNO;
-        }
+	or	SCSISIGO,ATNO,LASTPHASE;/* turn on ATN for the retry */
 p_mesgout:
 	mov	SINDEX, MSG_OUT;
 	cmp	SINDEX, MSG_IDENTIFYFLAG jne p_mesgout_from_host;
 	test	SCB_CONTROL,MK_MESSAGE	jnz host_message_loop;
+	mov	FUNCTION1, SCB_TCL;
+	mov	A, FUNCTION1;
+	if ((ahc->features & AHC_HS_MAILBOX) != 0) {
+		/*
+		 * Work around a pausing bug in at least the aic7890.
+		 * If the host needs to update the TARGET_MSG_REQUEST
+		 * bit field, it will set the HS_MAILBOX to 1.  In
+		 * response, we pause with a specific interrupt code
+		 * asking for the mask to be updated before we continue.
+		 * Ugh.
+		 */
+		test	HS_MAILBOX, 0xF0	jz . + 2;
+		mvi	INTSTAT, UPDATE_TMSG_REQ;
+		nop;
+	}
+	mov	SINDEX, TARGET_MSG_REQUEST[0];
+	if ((ahc->features & AHC_TWIN) != 0) {
+		/* Second Channel uses high byte bits */
+		test	SCB_TCL, SELBUSB	jz . + 2;
+		mov	SINDEX, TARGET_MSG_REQUEST[1];
+	} else if ((ahc->features & AHC_WIDE) != 0) {
+		test	SCB_TCL, 0x80		jz . + 2; /* target > 7 */
+		mov	SINDEX, TARGET_MSG_REQUEST[1];
+	}
+	test	SINDEX, A	jnz host_message_loop;
 p_mesgout_identify:
-        or      SINDEX, MSG_IDENTIFYFLAG|DISCENB, SCB_LUN;
-        test    SCB_CONTROL, DISCENB jnz . + 2;
-        and     SINDEX, ~DISCENB;
+	and	SINDEX,LID,SCB_TCL;	/* lun */
+	and	A,DISCENB,SCB_CONTROL;	/* mask off disconnect privledge */
+	or	SINDEX,A;		/* or in disconnect privledge */
+	or	SINDEX,MSG_IDENTIFYFLAG;
 /*
  * Send a tag message if TAG_ENB is set in the SCB control block.
  * Use SCB_TAG (the position in the kernel's SCB array) as the tag value.
@@ -1523,7 +1151,6 @@ p_mesgin:
 	cmp	A,MSG_SAVEDATAPOINTER	je mesgin_sdptrs;
 	cmp	ALLZEROS,A		je mesgin_complete;
 	cmp	A,MSG_RESTOREPOINTERS	je mesgin_rdptrs;
-        cmp     A,MSG_IGN_WIDE_RESIDUE  je mesgin_ign_wide_residue;
 	cmp	A,MSG_NOOP		je mesgin_done;
 
 /*
@@ -1536,78 +1163,70 @@ p_mesgin:
  * shouldn't hurt, but why do it twice...
  */
 host_message_loop:
-        mvi     HOST_MSG_LOOP call set_seqint;
+	mvi	INTSTAT, HOST_MSG_LOOP;
 	call	phase_lock;
 	cmp	RETURN_1, EXIT_MSG_LOOP	je ITloop + 1;
 	jmp	host_message_loop;
 
-mesgin_ign_wide_residue:
-if ((ahc->features & AHC_WIDE) != 0) {
-        test    SCSIRATE, WIDEXFER jz mesgin_reject;
-        /* Pull the residue byte */
-        mvi     ARG_1   call inb_next;
-        cmp     ARG_1, 0x01 jne mesgin_reject;
-        test    SCB_RESIDUAL_SGPTR[0], SG_LIST_NULL jz . + 2;
-        test    DATA_COUNT_ODD, 0x1     jz mesgin_done;
-        mvi     IGN_WIDE_RES call set_seqint;
-        jmp     mesgin_done;
-}
-
-mesgin_reject:
-        mvi     MSG_MESSAGE_REJECT      call mk_mesg;
 mesgin_done:
 	mov	NONE,SCSIDATL;		/*dummy read from latch to ACK*/
 	jmp	ITloop;
 
+
 mesgin_complete:
 /*
- * We received a "command complete" message.  Put the SCB_TAG into the QOUTFIFO,
+ * We got a "command complete" message, so put the SCB_TAG into the QOUTFIFO,
  * and trigger a completion interrupt.  Before doing so, check to see if there
  * is a residual or the status byte is something other than STATUS_GOOD (0).
  * In either of these conditions, we upload the SCB back to the host so it can
  * process this information.  In the case of a non zero status byte, we 
  * additionally interrupt the kernel driver synchronously, allowing it to
  * decide if sense should be retrieved.  If the kernel driver wishes to request
- * sense, it will fill the kernel SCB with a request sense command, requeue
- * it to the QINFIFO and tell us not to post to the QOUTFIFO by setting 
- * RETURN_1 to SEND_SENSE.
- */
-
-/*
- * If ATN is raised, we still want to give the target a message.
- * Perhaps there was a parity error on this last message byte.
- * Either way, the target should take us to message out phase
- * and then attempt to complete the command again.  We should use a
- * critical section here to guard against a timeout triggering
- * for this command and setting ATN while we are still processing
- * the completion.
-        test    SCSISIGI, ATNI jnz mesgin_done;
- */
-
-/*
- * See if we attempted to deliver a message but the target ingnored us.
+ * sense, it will fill the kernel SCB with a request sense command and set
+ * RETURN_1 to SEND_SENSE.  If RETURN_1 is set to SEND_SENSE we redownload
+ * the SCB, and process it as the next command by adding it to the waiting list.
+ * If the kernel driver does not wish to request sense, it need only clear
+ * RETURN_1, and the command is allowed to complete normally.  We don't bother
+ * to post to the QOUTFIFO in the error cases since it would require extra
+ * work in the kernel driver to ensure that the entry was removed before the
+ * command complete code tried processing it.
  */
-        test    SCB_CONTROL, MK_MESSAGE jz . + 2;
-        mvi     MKMSG_FAILED call set_seqint;
 
 /*
- * Check for residuals
+ * First check for residuals
  */
-        test    SCB_SGPTR, SG_LIST_NULL jnz check_status;/* No xfer */
-        test    SCB_SGPTR, SG_FULL_RESID jnz upload_scb;/* Never xfered */
-        test    SCB_RESIDUAL_SGPTR, SG_LIST_NULL jz upload_scb;
-check_status:
-        test    SCB_SCSI_STATUS,0xff    jz complete;    /* Good Status? */
+	test	SCB_RESID_SGCNT,0xff	jnz upload_scb;
+	test	SCB_TARGET_STATUS,0xff	jz complete;	/* Good Status? */
 upload_scb:
-        or      SCB_SGPTR, SG_RESID_VALID;
 	mvi	DMAPARAMS, FIFORESET;
 	mov	SCB_TAG		call dma_scb;
-        test    SCB_SCSI_STATUS, 0xff   jz complete;    /* Just a residual? */
-        mvi     BAD_STATUS call set_seqint;             /* let driver know */
+check_status:
+	test	SCB_TARGET_STATUS,0xff	jz complete;	/* Just a residual? */
+	mvi	INTSTAT,BAD_STATUS;			/* let driver know */
+	nop;
 	cmp	RETURN_1, SEND_SENSE	jne complete;
-        call    add_scb_to_free_list;
+	/* This SCB becomes the next to execute as it will retrieve sense */
+	mvi	DMAPARAMS, HDMAEN|DIRECTION|FIFORESET;
+	mov	SCB_TAG		call dma_scb;
+add_to_waiting_list:
+	mov	SCB_NEXT,WAITING_SCBH;
+	mov	WAITING_SCBH, SCBPTR;
+	/*
+	 * Prepare our selection hardware before the busfree so we have a
+	 * high probability of winning arbitration.
+	 */
+	call	start_selection;
 	jmp	await_busfree;
+
 complete:
+	/* If we are untagged, clear our address up in host ram */
+	test	SCB_CONTROL, TAG_ENB jnz complete_queue;
+	mov	A, SAVED_TCL;
+	/* fvdl - let ahc_intr clear this to avoid race conditions */
+	/* mvi	UNTAGGEDSCB_OFFSET call post_byte_setup; */
+	/* mvi	SCB_LIST_NULL call post_byte; */
+
+complete_queue:
 	mov	SCB_TAG call complete_post;
 	jmp	await_busfree;
 }
@@ -1628,32 +1247,14 @@ complete_post:
 	}
 	mvi	INTSTAT,CMDCMPLT ret;
 
-if ((ahc->flags & AHC_INITIATORROLE) != 0) {
+if ((ahc->flags & AHC_INITIATORMODE) != 0) {
 /*
  * Is it a disconnect message?  Set a flag in the SCB to remind us
- * and await the bus going free.  If this is an untagged transaction
- * store the SCB id for it in our untagged target table for lookup on
- * a reselction.
+ * and await the bus going free.
  */
 mesgin_disconnect:
-        /*
-         * If ATN is raised, we still want to give the target a message.
-         * Perhaps there was a parity error on this last message byte
-         * or we want to abort this command.  Either way, the target
-         * should take us to message out phase and then attempt to
-         * disconnect again.
-         * XXX - Wait for more testing.
-        test    SCSISIGI, ATNI jnz mesgin_done;
-         */
-
 	or	SCB_CONTROL,DISCONNECTED;
-        if ((ahc->flags & AHC_PAGESCBS) != 0) {
-                call    add_scb_to_disc_list;
-        }
-        test    SCB_CONTROL, TAG_ENB jnz await_busfree;
-        mov     ARG_1, SCB_TAG;
-        mov     SAVED_LUN, SCB_LUN;
-        mov     SCB_SCSIID      call set_busy_target;
+	call	add_scb_to_disc_list;
 	jmp	await_busfree;
 
 /*
@@ -1662,52 +1263,29 @@ mesgin_disconnect:
  * only if we've actually been into a data phase to change them.  This
  * protects against bogus data in scratch ram and the residual counts
  * since they are only initialized when we go into data_in or data_out.
- * Ack the message as soon as possible.  For chips without S/G pipelining,
- * we can only ack the message after SHADDR has been saved.  On these
- * chips, SHADDR increments with every bus transaction, even PIO.
  */
 mesgin_sdptrs:
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                mov     NONE,SCSIDATL;          /*dummy read from latch to ACK*/
-                test    SEQ_FLAGS, DPHASE       jz ITloop;
-        } else {
-                test    SEQ_FLAGS, DPHASE       jz mesgin_done;
-        }
+	test	SEQ_FLAGS, DPHASE	jz mesgin_done;
 
 	/*
-         * If we are asked to save our position at the end of the
-         * transfer, just mark us at the end rather than perform a
-         * full save.
-         */
-        test    SCB_RESIDUAL_SGPTR[0], SG_LIST_NULL jz mesgin_sdptrs_full;
-        or      SCB_SGPTR, SG_LIST_NULL;
-        if ((ahc->features & AHC_ULTRA2) != 0) {
-                jmp     ITloop;
-        } else {
-                jmp     mesgin_done;
-        }
-
-mesgin_sdptrs_full:
-
-        /*
-         * The SCB_SGPTR becomes the next one we'll download,
-         * and the SCB_DATAPTR becomes the current SHADDR.
+	 * The SCB SGPTR becomes the next one we'll download,
+	 * and the SCB DATAPTR becomes the current SHADDR.
 	 * Use the residual number since STCNT is corrupted by
 	 * any message transfer.
 	 */
 	if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		bmov	SCB_SGCOUNT, SG_COUNT, 5;
 		bmov	SCB_DATAPTR, SHADDR, 4;
-                if ((ahc->features & AHC_ULTRA2) == 0) {
-                        mov     NONE,SCSIDATL;  /*dummy read from latch to ACK*/
-                }
-                bmov    SCB_DATACNT, SCB_RESIDUAL_DATACNT, 8;
+		bmov	SCB_DATACNT, SCB_RESID_DCNT, 3;
 	} else {
+		mvi	DINDEX, SCB_SGCOUNT;
+		mvi	SG_COUNT call bcopy_5;
+	
 		mvi	DINDEX, SCB_DATAPTR;
-                mvi     SHADDR call bcopy_4;
-                mov     NONE,SCSIDATL;  /*dummy read from latch to ACK*/
-                mvi     SCB_RESIDUAL_DATACNT call bcopy_8;
+		mvi	SHADDR		call bcopy_4;
+		mvi	SCB_RESID_DCNT	call bcopy_3;
 	}
-        jmp     ITloop;
+	jmp	mesgin_done;
 
 /*
  * Restore pointers message?  Data pointers are recopied from the
@@ -1724,172 +1302,87 @@ mesgin_rdptrs:
 	jmp	mesgin_done;
 
 /*
- * Index into our Busy Target table.  SINDEX and DINDEX are modified
- * upon return.  SCBPTR may be modified by this action.
- */
-set_busy_target:
-        shr     DINDEX, 4, SINDEX;
-        if ((ahc->flags & AHC_SCB_BTT) != 0) {
-                mov     SCBPTR, SAVED_LUN;
-                add     DINDEX, SCB_64_BTT;
-        } else {
-                add     DINDEX, BUSY_TARGETS;
-        }
-        mov     DINDIR, ARG_1 ret;
-
-/*
  * Identify message?  For a reconnecting target, this tells us the lun
  * that the reconnection is for - find the correct SCB and switch to it,
  * clearing the "disconnected" bit so we don't "find" it by accident later.
  */
 mesgin_identify:
-        /*
-         * Determine whether a target is using tagged or non-tagged
-         * transactions by first looking at the transaction stored in
-         * the busy target array.  If there is no untagged transaction
-         * for this target or the transaction is for a different lun, then
-         * this must be an untagged transaction.
-         */
-        shr     SINDEX, 4, SAVED_SCSIID;
-        and     SAVED_LUN, MSG_IDENTIFY_LUNMASK, A;
-        if ((ahc->flags & AHC_SCB_BTT) != 0) {
-                add     SINDEX, SCB_64_BTT;
-                mov     SCBPTR, SAVED_LUN;
-                if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                        add     NONE, -SCB_64_BTT, SINDEX;
-                        jc      . + 2;
-                        mvi     INTSTAT, OUT_OF_RANGE;
-                        nop;
-                        add     NONE, -(SCB_64_BTT + 16), SINDEX;
-                        jnc     . + 2;
-                        mvi     INTSTAT, OUT_OF_RANGE;
-                        nop;
-                }
+	if ((ahc->features & AHC_WIDE) != 0) {
+		and	A,0x0f;		/* lun in lower four bits */
 	} else {
-                add     SINDEX, BUSY_TARGETS;
-                if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                        add     NONE, -BUSY_TARGETS, SINDEX;
-                        jc      . + 2;
-                        mvi     INTSTAT, OUT_OF_RANGE;
-                        nop;
-                        add     NONE, -(BUSY_TARGETS + 16), SINDEX;
-                        jnc     . + 2;
-                        mvi     INTSTAT, OUT_OF_RANGE;
-                        nop;
-                }
+		and	A,0x07;		/* lun in lower three bits */
 	}
-        mov     ARG_1, SINDIR;
+	or      SAVED_TCL,A;		/* SAVED_TCL should be complete now */
+
+	mvi	ARG_2, SCB_LIST_NULL;	/* SCBID of prev SCB in disc List */
+	call	get_untagged_SCBID;
 	cmp	ARG_1, SCB_LIST_NULL	je snoop_tag;
 	if ((ahc->flags & AHC_PAGESCBS) != 0) {
-                mov     ARG_1 call findSCB;
-        } else {
-                mov     SCBPTR, ARG_1;
+		test	SEQ_FLAGS, SCBPTR_VALID	jz use_retrieveSCB;
 	}
-        if ((ahc->flags & AHC_SCB_BTT) != 0) {
-                jmp setup_SCB_id_lun_okay;
-        } else {
-                /*
-                 * We only allow one untagged command per-target
-                 * at a time.  So, if the lun doesn't match, look
-                 * for a tag message.
-                 */
-                mov     A, SCB_LUN;
-                cmp     SAVED_LUN, A    je setup_SCB_id_lun_okay;
-                if ((ahc->flags & AHC_PAGESCBS) != 0) {
-                        /*
-                         * findSCB removes the SCB from the
-                         * disconnected list, so we must replace
-                         * it there should this SCB be for another
-                         * lun.
-                         */
-                        call    cleanup_scb;
-                }
-        }
-
+	/*
+	 * If the SCB was found in the disconnected list (as is
+	 * always the case in non-paging scenarios), SCBPTR is already
+	 * set to the correct SCB.  So, simply setup the SCB and get
+	 * on with things.
+	 */
+	call	rem_scb_from_disc_list;
+	jmp	setup_SCB;
 /*
  * Here we "snoop" the bus looking for a SIMPLE QUEUE TAG message.
  * If we get one, we use the tag returned to find the proper
- * SCB.  With SCB paging, we must search for non-tagged
- * transactions since the SCB may exist in any slot.  If we're not
- * using SCB paging, we can use the tag as the direct index to the
- * SCB.
+ * SCB.  With SCB paging, this requires using search for both tagged
+ * and non-tagged transactions since the SCB may exist in any slot.
+ * If we're not using SCB paging, we can use the tag as the direct
+ * index to the SCB.
  */
 snoop_tag:
-        if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                or      SEQ_FLAGS, 0x80;
-        }
 	mov	NONE,SCSIDATL;		/* ACK Identify MSG */
+snoop_tag_loop:
 	call	phase_lock;
-        if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                or      SEQ_FLAGS, 0x1;
-        }
 	cmp	LASTPHASE, P_MESGIN	jne not_found;
-        if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                or      SEQ_FLAGS, 0x2;
-        }
 	cmp	SCSIBUSL,MSG_SIMPLE_Q_TAG jne not_found;
 get_tag:
-        if ((ahc->flags & AHC_PAGESCBS) != 0) {
-                mvi     ARG_1   call inb_next;  /* tag value */
-                mov     ARG_1   call findSCB;
-        } else {
-                mvi     ARG_1   call inb_next;  /* tag value */
-                mov     SCBPTR, ARG_1;
-        }
+	mvi	ARG_1	call inb_next;	/* tag value */
 
-/*
- * Ensure that the SCB the tag points to is for
- * an SCB transaction to the reconnecting target.
- */
+	/*
+	 * Ensure that the SCB the tag points to is for
+	 * an SCB transaction to the reconnecting target.
+	 */
+use_retrieveSCB:
+	call	retrieveSCB;
 setup_SCB:
-        if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                or      SEQ_FLAGS, 0x4;
-        }
-        mov     A, SCB_SCSIID;
-        cmp     SAVED_SCSIID, A jne not_found_cleanup_scb;
-        if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                or      SEQ_FLAGS, 0x8;
-        }
-setup_SCB_id_okay:
-        mov     A, SCB_LUN;
-        cmp     SAVED_LUN, A    jne not_found_cleanup_scb;
-setup_SCB_id_lun_okay:
-        if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
-                or      SEQ_FLAGS, 0x10;
-        }
+	mov	A, SAVED_TCL;
+	cmp	SCB_TCL, A	jne not_found_cleanup_scb;
 	test	SCB_CONTROL,DISCONNECTED jz not_found_cleanup_scb;
 	and	SCB_CONTROL,~DISCONNECTED;
-        test    SCB_CONTROL, TAG_ENB    jnz setup_SCB_tagged;
-        if ((ahc->flags & AHC_SCB_BTT) != 0) {
-                mov     A, SCBPTR;
-        }
-        mvi     ARG_1, SCB_LIST_NULL;
-        mov     SAVED_SCSIID    call    set_busy_target;
-        if ((ahc->flags & AHC_SCB_BTT) != 0) {
-                mov     SCBPTR, A;
-        }
-setup_SCB_tagged:
-        mvi     SEQ_FLAGS,IDENTIFY_SEEN;        /* make note of IDENTIFY */
+	or	SEQ_FLAGS,IDENTIFY_SEEN;	/* make note of IDENTIFY */
 	call	set_transfer_settings;
 	/* See if the host wants to send a message upon reconnection */
 	test	SCB_CONTROL, MK_MESSAGE jz mesgin_done;
+	and	SCB_CONTROL, ~MK_MESSAGE;
 	mvi	HOST_MSG	call mk_mesg;
 	jmp	mesgin_done;
 
 not_found_cleanup_scb:
-        if ((ahc->flags & AHC_PAGESCBS) != 0) {
-                call    cleanup_scb;
-        }
+	test	SCB_CONTROL, DISCONNECTED jz . + 3;
+	call	add_scb_to_disc_list;
+	jmp	not_found;
+	call	add_scb_to_free_list;
 not_found:
-        mvi     NO_MATCH call set_seqint;
+	mvi	INTSTAT, NO_MATCH;
 	jmp	mesgin_done;
 
+/*
+ * [ ADD MORE MESSAGE HANDLING HERE ]
+ */
+
+/*
+ * Locking the driver out, build a one-byte message passed in SINDEX
+ * if there is no active message already.  SINDEX is returned intact.
+ */
 mk_mesg:
-        if ((ahc->features & AHC_DT) == 0) {
-                or      SCSISIGO, ATNO, LASTPHASE;
-        } else {
-                mvi     SCSISIGO, ATNO;
-        }
+	or	SCSISIGO,ATNO,LASTPHASE;/* turn on ATNO */
 	mov	MSG_OUT,SINDEX ret;
 
 /*
@@ -1908,7 +1401,7 @@ mk_mesg:
  * use the same calling convention as inb.
  */
 inb_next_wait_perr:
-        mvi     PERR_DETECTED call set_seqint;
+	mvi	INTSTAT, PERR_DETECTED;
 	jmp	inb_next_wait;
 inb_next:
 	mov	NONE,SCSIDATL;		/*dummy read from latch to ACK*/
@@ -1930,7 +1423,7 @@ inb_last:
 	mov	NONE,SCSIDATL ret;		/*dummy read from latch to ACK*/
 }
 
-if ((ahc->flags & AHC_TARGETROLE) != 0) {
+if ((ahc->flags & AHC_TARGETMODE) != 0) {
 /*
  * Change to a new phase.  If we are changing the state of the I/O signal,
  * from out to in, wait an additional data release delay before continuing.
@@ -1947,7 +1440,7 @@ change_phase:
 	/*
 	 * If the data direction has changed, from
 	 * out (initiator driving) to in (target driving),
-         * we must wait at least a data release delay plus
+	 * we must waitat least a data release delay plus
 	 * the normal bus settle delay. [SCSI III SPI 10.11.0]
 	 */
 	cmp 	DINDEX, A je change_phase_wait;
@@ -1970,62 +1463,197 @@ target_outb:
 	and	SXFRCTL0, ~SPIOEN ret;
 }
 	
+mesgin_phasemis:
 /*
- * Locate a disconnected SCB by SCBID.  Upon return, SCBPTR and SINDEX will
- * be set to the position of the SCB.  If the SCB cannot be found locally,
- * it will be paged in from host memory.  RETURN_2 stores the address of the
- * preceding SCB in the disconnected list which can be used to speed up
- * removal of the found SCB from the disconnected list.
+ * We expected to receive another byte, but the target changed phase
+ */
+	mvi	INTSTAT, MSGIN_PHASEMIS;
+	jmp	ITloop;
+
+/*
+ * DMA data transfer.  HADDR and HCNT must be loaded first, and
+ * SINDEX should contain the value to load DFCNTRL with - 0x3d for
+ * host->scsi, or 0x39 for scsi->host.  The SCSI channel is cleared
+ * during initialization.
+ */
+dma:
+	mov	DFCNTRL,SINDEX;
+dma_loop:
+	test	SSTAT0,DMADONE	jnz dma_dmadone;
+	test	SSTAT1,PHASEMIS	jz dma_loop;	/* ie. underrun */
+dma_phasemis:
+
+/*
+ * We will be "done" DMAing when the transfer count goes to zero, or
+ * the target changes the phase (in light of this, it makes sense that
+ * the DMA circuitry doesn't ACK when PHASEMIS is active).  If we are
+ * doing a SCSI->Host transfer, the data FIFO should be flushed auto-
+ * magically on STCNT=0 or a phase change, so just wait for FIFO empty
+ * status.
+ */
+dma_checkfifo:
+	test	DFCNTRL,DIRECTION	jnz dma_fifoempty;
+dma_fifoflush:
+	test	DFSTATUS,FIFOEMP	jz dma_fifoflush;
+
+dma_fifoempty:
+	/* Don't clobber an inprogress host data transfer */
+	test	DFSTATUS, MREQPEND	jnz dma_fifoempty;
+/*
+ * Now shut the DMA enables off and make sure that the DMA enables are 
+ * actually off first lest we get an ILLSADDR.
+ */
+dma_dmadone:
+	and	DFCNTRL, ~(SCSIEN|SDMAEN|HDMAEN);
+dma_halt:
+	/*
+	 * Some revisions of the aic7880 have a problem where, if the
+	 * data fifo is full, but the PCI input latch is not empty, 
+	 * HDMAEN cannot be cleared.  The fix used here is to attempt
+	 * to drain the data fifo until there is space for the input
+	 * latch to drain and HDMAEN de-asserts.
+	 */
+	if ((ahc->features & AHC_ULTRA2) == 0) {
+		mov	NONE, DFDAT;
+	}
+	test	DFCNTRL, (SCSIEN|SDMAEN|HDMAEN) jnz dma_halt;
+return:
+	ret;
+
+/*
+ * Assert that if we've been reselected, then we've seen an IDENTIFY
+ * message.
+ */
+assert:
+	test	SEQ_FLAGS,IDENTIFY_SEEN	jnz return;	/* seen IDENTIFY? */
+
+	mvi	INTSTAT,NO_IDENT 	ret;	/* no - tell the kernel */
+
+/*
+ * Locate a disconnected SCB either by SAVED_TCL (ARG_1 is SCB_LIST_NULL)
+ * or by the SCBID ARG_1.  The search begins at the SCB index passed in
+ * via SINDEX which is an SCB that must be on the disconnected list.  If
+ * the SCB cannot be found, SINDEX will be SCB_LIST_NULL, otherwise, SCBPTR
+ * is set to the proper SCB.
  */
-if ((ahc->flags & AHC_PAGESCBS) != 0) {
-BEGIN_CRITICAL
 findSCB:
-        mov     A, SINDEX;                      /* Tag passed in SINDEX */
-        cmp     DISCONNECTED_SCBH, SCB_LIST_NULL je findSCB_notFound;
-        mov     SCBPTR, DISCONNECTED_SCBH;      /* Initialize SCBPTR */
-        mvi     ARG_2, SCB_LIST_NULL;           /* Head of list */
-        jmp     findSCB_loop;
+	mov	SCBPTR,SINDEX;			/* Initialize SCBPTR */
+	cmp	ARG_1, SCB_LIST_NULL	jne findSCB_by_SCBID;
+	mov	A, SAVED_TCL;
+	mvi	SCB_TCL	jmp findSCB_loop;	/* &SCB_TCL -> SINDEX */
+findSCB_by_SCBID:
+	mov	A, ARG_1;			/* Tag passed in ARG_1 */
+	mvi	SCB_TAG	jmp findSCB_loop;	/* &SCB_TAG -> SINDEX */
 findSCB_next:
-        cmp     SCB_NEXT, SCB_LIST_NULL je findSCB_notFound;
 	mov	ARG_2, SCBPTR;
+	cmp	SCB_NEXT, SCB_LIST_NULL je notFound;
 	mov	SCBPTR,SCB_NEXT;
+	dec	SINDEX;		/* Last comparison moved us too far */
 findSCB_loop:
-        cmp     SCB_TAG, A      jne findSCB_next;
+	cmp	SINDIR, A	jne findSCB_next;
+	mov	SINDEX, SCBPTR 	ret;
+notFound:
+	mvi	SINDEX, SCB_LIST_NULL	ret;
+
+/*
+ * Retrieve an SCB by SCBID first searching the disconnected list falling
+ * back to DMA'ing the SCB down from the host.  This routine assumes that
+ * ARG_1 is the SCBID of interrest and that SINDEX is the position in the
+ * disconnected list to start the search from.  If SINDEX is SCB_LIST_NULL,
+ * we go directly to the host for the SCB.
+ */
+retrieveSCB:
+	test	SEQ_FLAGS, SCBPTR_VALID	jz retrieve_from_host;
+	mov	SCBPTR	call findSCB;	/* Continue the search */
+	cmp	SINDEX, SCB_LIST_NULL	je retrieve_from_host;
+
+/*
+ * This routine expects SINDEX to contain the index of the SCB to be
+ * removed, SCBPTR to be pointing to that SCB, and ARG_2 to be the
+ * SCBID of the SCB just previous to this one in the list or SCB_LIST_NULL
+ * if it is at the head.
+ */
 rem_scb_from_disc_list:
+/* Remove this SCB from the disconnection list */
 	cmp	ARG_2, SCB_LIST_NULL	je rHead;
 	mov	DINDEX, SCB_NEXT;
-        mov     SINDEX, SCBPTR;
 	mov	SCBPTR, ARG_2;
 	mov	SCB_NEXT, DINDEX;
 	mov	SCBPTR, SINDEX ret;
 rHead:
 	mov	DISCONNECTED_SCBH,SCB_NEXT ret;
-END_CRITICAL
-findSCB_notFound:
-        /*
-         * We didn't find it.  Page in the SCB.
-         */
-        mov     ARG_1, A; /* Save tag */
-        mov     ALLZEROS call get_free_or_disc_scb;
+
+retrieve_from_host:
+/*
+ * We didn't find it.  Pull an SCB and DMA down the one we want.
+ * We should never get here in the non-paging case.
+ */
+	mov	ALLZEROS	call	get_free_or_disc_scb;
 	mvi	DMAPARAMS, HDMAEN|DIRECTION|FIFORESET;
+	/* Jump instead of call as we want to return anyway */
 	mov	ARG_1	jmp dma_scb;
-}
+
+/*
+ * Determine whether a target is using tagged or non-tagged transactions
+ * by first looking for a matching transaction based on the TCL and if
+ * that fails, looking up this device in the host's untagged SCB array.
+ * The TCL to search for is assumed to be in SAVED_TCL.  The value is
+ * returned in ARG_1 (SCB_LIST_NULL for tagged, SCBID for non-tagged).
+ * The SCBPTR_VALID bit is set in SEQ_FLAGS if we found the information
+ * in an SCB instead of having to go to the host.
+ */
+get_untagged_SCBID:
+	cmp	DISCONNECTED_SCBH, SCB_LIST_NULL je get_SCBID_from_host;
+	mvi	ARG_1, SCB_LIST_NULL;
+	mov	DISCONNECTED_SCBH call findSCB;
+	cmp	SINDEX, SCB_LIST_NULL	je get_SCBID_from_host;
+	or	SEQ_FLAGS, SCBPTR_VALID;/* Was in disconnected list */
+	test	SCB_CONTROL, TAG_ENB	jnz . + 2;
+	mov	ARG_1, SCB_TAG	ret;
+	mvi	ARG_1, SCB_LIST_NULL ret;
+
+/*
+ * Fetch a byte from host memory given an index of (A + (256 * SINDEX))
+ * and a base address of SCBID_ADDR.  The byte is returned in RETURN_2.
+ */
+fetch_byte:
+	mov	ARG_2, SINDEX;
+	if ((ahc->features & AHC_CMD_CHAN) != 0) {
+		mvi	DINDEX, CCHADDR;
+		mvi	SCBID_ADDR call set_1byte_addr;
+		mvi	CCHCNT, 1;
+		mvi	CCSGCTL, CCSGEN|CCSGRESET;
+		test	CCSGCTL, CCSGDONE jz .;
+		mvi	CCSGCTL, CCSGRESET;
+		bmov	RETURN_2, CCSGRAM, 1 ret;
+	} else {
+		mvi	DINDEX, HADDR;
+		mvi	SCBID_ADDR call set_1byte_addr;
+		mvi	HCNT[0], 1;
+		clr	HCNT[1];
+		clr	HCNT[2];
+		mvi	DFCNTRL, HDMAEN|DIRECTION|FIFORESET;
+		call	dma_finish;
+		mov	RETURN_2, DFDAT ret;
+	}
 
 /*
  * Prepare the hardware to post a byte to host memory given an
- * index of (A + (256 * SINDEX)) and a base address of SHARED_DATA_ADDR.
+ * index of (A + (256 * SINDEX)) and a base address of SCBID_ADDR.
  */
 post_byte_setup:
 	mov	ARG_2, SINDEX;
 	if ((ahc->features & AHC_CMD_CHAN) != 0) {
 		mvi	DINDEX, CCHADDR;
-                mvi     SHARED_DATA_ADDR call   set_1byte_addr;
+		mvi	SCBID_ADDR call	set_1byte_addr;
 		mvi	CCHCNT, 1;
 		mvi	CCSCBCTL, CCSCBRESET ret;
 	} else {
 		mvi	DINDEX, HADDR;
-                mvi     SHARED_DATA_ADDR call   set_1byte_addr;
-                mvi     1       call set_hcnt;
+		mvi	SCBID_ADDR call	set_1byte_addr;
+		mvi	HCNT[0], 1;
+		clr	HCNT[1];
+		clr	HCNT[2];
 		mvi	DFCNTRL, FIFORESET ret;
 	}
 
@@ -2041,8 +1669,13 @@ post_byte:
 		jmp	dma_finish;
 	}
 
+get_SCBID_from_host:
+	mov	A, SAVED_TCL;
+	mvi	UNTAGGEDSCB_OFFSET call fetch_byte;
+	mov	RETURN_1,  RETURN_2 ret;
+
 phase_lock_perr:
-        mvi     PERR_DETECTED call set_seqint;
+	mvi	INTSTAT, PERR_DETECTED;
 phase_lock:     
 	/*
 	 * If there is a parity error, wait for the kernel to
@@ -2052,25 +1685,15 @@ phase_lock:
 	test	SSTAT1, REQINIT jz phase_lock;
 	test	SSTAT1, SCSIPERR jnz phase_lock_perr;
 phase_lock_latch_phase:
-        if ((ahc->features & AHC_DT) == 0) {
-                and     SCSISIGO, PHASE_MASK, SCSISIGI;
-        }
+	and	SCSISIGO, PHASE_MASK, SCSISIGI;
 	and	LASTPHASE, PHASE_MASK, SCSISIGI ret;
 
 if ((ahc->features & AHC_CMD_CHAN) == 0) {
-set_hcnt:
-        mov     HCNT[0], SINDEX;
-clear_hcnt:
-        clr     HCNT[1];
-        clr     HCNT[2] ret;
-
 set_stcnt_from_hcnt:
 	mov	STCNT[0], HCNT[0];
 	mov	STCNT[1], HCNT[1];
 	mov	STCNT[2], HCNT[2] ret;
 
-bcopy_8:
-        mov     DINDIR, SINDIR;
 bcopy_7:
 	mov	DINDIR, SINDIR;
 	mov	DINDIR, SINDIR;
@@ -2084,7 +1707,7 @@ bcopy_3:
 	mov	DINDIR, SINDIR ret;
 }
 
-if ((ahc->flags & AHC_TARGETROLE) != 0) {
+if ((ahc->flags & AHC_TARGETMODE) != 0) {
 /*
  * Setup addr assuming that A is an index into
  * an array of 32byte objects, SINDEX contains
@@ -2110,7 +1733,7 @@ set_64byte_addr:
 	shl	A, 6;
 
 /*
- * Setup addr assuming that A + (ARG_2 * 256) is an
+ * Setup addr assuming that A + (ARG_1 * 256) is an
  * index into an array of 1byte objects, SINDEX contains
  * the base address of that array, and DINDEX contains
  * the base address of the location to store the computed
@@ -2135,27 +1758,17 @@ dma_scb:
 		mvi	HSCB_ADDR call set_64byte_addr;
 		mov	CCSCBPTR, SCBPTR;
 		test	DMAPARAMS, DIRECTION jz dma_scb_tohost;
-                if ((ahc->flags & AHC_SCB_BTT) != 0) {
-                        mvi     CCHCNT, SCB_DOWNLOAD_SIZE_64;
-                } else {
-                        mvi     CCHCNT, SCB_DOWNLOAD_SIZE;
-                }
+		mvi	CCHCNT, SCB_64BYTE_SIZE;
 		mvi	CCSCBCTL, CCARREN|CCSCBEN|CCSCBDIR|CCSCBRESET;
 		cmp	CCSCBCTL, CCSCBDONE|ARRDONE|CCARREN|CCSCBEN|CCSCBDIR jne .;
 		jmp	dma_scb_finish;
 dma_scb_tohost:
-                mvi     CCHCNT, SCB_UPLOAD_SIZE;
-                if ((ahc->features & AHC_ULTRA2) == 0) {
+		mvi	CCHCNT, SCB_32BYTE_SIZE;
+		if ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7895) {
 			mvi	CCSCBCTL, CCSCBRESET;
-                        bmov    CCSCBRAM, SCB_BASE, SCB_UPLOAD_SIZE;
+			bmov	CCSCBRAM, SCB_CONTROL, SCB_32BYTE_SIZE;
 			or	CCSCBCTL, CCSCBEN|CCSCBRESET;
 			test	CCSCBCTL, CCSCBDONE jz .;
-                } else if ((ahc->bugs & AHC_SCBCHAN_UPLOAD_BUG) != 0) {
-                        mvi     CCSCBCTL, CCARREN|CCSCBRESET;
-                        cmp     CCSCBCTL, ARRDONE|CCARREN jne .;
-                        mvi     CCHCNT, SCB_UPLOAD_SIZE;
-                        mvi     CCSCBCTL, CCSCBEN|CCSCBRESET;
-                        cmp     CCSCBCTL, CCSCBDONE|CCSCBEN jne .;
 		} else {
 			mvi	CCSCBCTL, CCARREN|CCSCBEN|CCSCBRESET;
 			cmp	CCSCBCTL, CCSCBDONE|ARRDONE|CCARREN|CCSCBEN jne .;
@@ -2167,97 +1780,45 @@ dma_scb_finish:
 	} else {
 		mvi	DINDEX, HADDR;
 		mvi	HSCB_ADDR call set_64byte_addr;
-                mvi     SCB_DOWNLOAD_SIZE call set_hcnt;
+		mvi	HCNT[0], SCB_32BYTE_SIZE;
+		clr	HCNT[1];
+		clr	HCNT[2];
 		mov	DFCNTRL, DMAPARAMS;
 		test	DMAPARAMS, DIRECTION	jnz dma_scb_fromhost;
 		/* Fill it with the SCB data */
 copy_scb_tofifo:
-                mvi     SINDEX, SCB_BASE;
-                add     A, SCB_DOWNLOAD_SIZE, SINDEX;
+		mvi	SINDEX, SCB_CONTROL;
+		add	A, SCB_32BYTE_SIZE, SINDEX;
 copy_scb_tofifo_loop:
-                call    copy_to_fifo_8;
+		mov	DFDAT,SINDIR;
+		mov	DFDAT,SINDIR;
+		mov	DFDAT,SINDIR;
+		mov	DFDAT,SINDIR;
+		mov	DFDAT,SINDIR;
+		mov	DFDAT,SINDIR;
+		mov	DFDAT,SINDIR;
 		cmp	SINDEX, A jne copy_scb_tofifo_loop;
 		or	DFCNTRL, HDMAEN|FIFOFLUSH;
-                jmp     dma_finish;
 dma_scb_fromhost:
-                mvi     DINDEX, SCB_BASE;
-                if ((ahc->bugs & AHC_PCI_2_1_RETRY_BUG) != 0) {
-                        /*
-                         * The PCI module will only issue a PCI
-                         * retry if the data FIFO is empty.  If the
-                         * host disconnects in the middle of a
-                         * transfer, we must empty the fifo of all
-                         * available data to force the chip to
-                         * continue the transfer.  This does not
-                         * happen for SCSI transfers as the SCSI module
-                         * will drain the FIFO as data is made available.
-                         * When the hang occurs, we know that a multiple
-                         * of 8 bytes are in the FIFO because the PCI
-                         * module has an 8 byte input latch that only
-                         * dumps to the FIFO when HCNT == 0 or the
-                         * latch is full.
-                         */
-                        clr     A;
-                        /* Wait for at least 8 bytes of data to arrive. */
-dma_scb_hang_fifo:
-                        test    DFSTATUS, FIFOQWDEMP jnz dma_scb_hang_fifo;
-dma_scb_hang_wait:
-                        test    DFSTATUS, MREQPEND jnz dma_scb_hang_wait;
-                        test    DFSTATUS, HDONE jnz dma_scb_hang_dma_done;
-                        test    DFSTATUS, HDONE jnz dma_scb_hang_dma_done;
-                        test    DFSTATUS, HDONE jnz dma_scb_hang_dma_done;
-                        /*
-                         * The PCI module no longer intends to perform
-                         * a PCI transaction.  Drain the fifo.
-                         */
-dma_scb_hang_dma_drain_fifo:
-                        not     A, HCNT;
-                        add     A, SCB_DOWNLOAD_SIZE+SCB_BASE+1;
-                        and     A, ~0x7;
-                        mov     DINDIR,DFDAT;
-                        cmp     DINDEX, A jne . - 1;
-                        cmp     DINDEX, SCB_DOWNLOAD_SIZE+SCB_BASE
-                                je      dma_finish_nowait;
-                        /* Restore A as the lines left to transfer. */
-                        add     A, -SCB_BASE, DINDEX;
-                        shr     A, 3;
-                        jmp     dma_scb_hang_fifo;
-dma_scb_hang_dma_done:
-                        and     DFCNTRL, ~HDMAEN;
-                        test    DFCNTRL, HDMAEN jnz .;
-                        add     SEQADDR0, A;
-                } else {
-                        call    dma_finish;
-                }
+		call	dma_finish;
 		/* If we were putting the SCB, we are done */
-                call    dfdat_in_8;
-                call    dfdat_in_8;
-                call    dfdat_in_8;
-dfdat_in_8:
-                mov     DINDIR,DFDAT;
+		test	DMAPARAMS, DIRECTION	jz	return;
+		mvi	SCB_CONTROL  call dfdat_in_7;
+		call	dfdat_in_7_continued;
+		call	dfdat_in_7_continued;
+		jmp	dfdat_in_7_continued;
 dfdat_in_7:
+		mov     DINDEX,SINDEX;
+dfdat_in_7_continued:
 		mov	DINDIR,DFDAT;
 		mov	DINDIR,DFDAT;
 		mov	DINDIR,DFDAT;
 		mov	DINDIR,DFDAT;
 		mov	DINDIR,DFDAT;
-dfdat_in_2:
 		mov	DINDIR,DFDAT;
 		mov	DINDIR,DFDAT ret;
 	}
 
-copy_to_fifo_8:
-        mov     DFDAT,SINDIR;
-        mov     DFDAT,SINDIR;
-copy_to_fifo_6:
-        mov     DFDAT,SINDIR;
-copy_to_fifo_5:
-        mov     DFDAT,SINDIR;
-copy_to_fifo_4:
-        mov     DFDAT,SINDIR;
-        mov     DFDAT,SINDIR;
-        mov     DFDAT,SINDIR;
-        mov     DFDAT,SINDIR ret;
 
 /*
  * Wait for DMA from host memory to data FIFO to complete, then disable
@@ -2265,59 +1826,37 @@ copy_to_fifo_4:
  */
 dma_finish:
 	test	DFSTATUS,HDONE	jz dma_finish;
-dma_finish_nowait:
 	/* Turn off DMA */
 	and	DFCNTRL, ~HDMAEN;
 	test	DFCNTRL, HDMAEN jnz .;
 	ret;
 
-/*
- * Restore an SCB that failed to match an incoming reselection
- * to the correct/safe state.  If the SCB is for a disconnected
- * transaction, it must be returned to the disconnected list.
- * If it is not in the disconnected state, it must be free.
- */
-cleanup_scb:
-        if ((ahc->flags & AHC_PAGESCBS) != 0) {
-                test    SCB_CONTROL,DISCONNECTED jnz add_scb_to_disc_list;
-        }
 add_scb_to_free_list:
 	if ((ahc->flags & AHC_PAGESCBS) != 0) {
-BEGIN_CRITICAL
 		mov	SCB_NEXT, FREE_SCBH;
 		mvi	SCB_TAG, SCB_LIST_NULL;
 		mov	FREE_SCBH, SCBPTR ret;
-END_CRITICAL
 	} else {
 		mvi	SCB_TAG, SCB_LIST_NULL ret;
 	}
 
-if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-set_hhaddr:
-        or      DSCOMMAND1, HADDLDSEL0;
-        and     HADDR, SG_HIGH_ADDR_BITS, SINDEX;
-        and     DSCOMMAND1, ~HADDLDSEL0 ret;
-}
-
 if ((ahc->flags & AHC_PAGESCBS) != 0) {
 get_free_or_disc_scb:
-BEGIN_CRITICAL
 	cmp	FREE_SCBH, SCB_LIST_NULL jne dequeue_free_scb;
 	cmp	DISCONNECTED_SCBH, SCB_LIST_NULL jne dequeue_disc_scb;
 return_error:
-        mvi     NO_FREE_SCB call set_seqint;
 	mvi	SINDEX, SCB_LIST_NULL	ret;
 dequeue_disc_scb:
 	mov	SCBPTR, DISCONNECTED_SCBH;
-        mov     DISCONNECTED_SCBH, SCB_NEXT;
-END_CRITICAL
+dma_up_scb:
 	mvi	DMAPARAMS, FIFORESET;
-        mov     SCB_TAG jmp dma_scb;
-BEGIN_CRITICAL
+	mov	SCB_TAG		call dma_scb;
+unlink_disc_scb:
+	mov	DISCONNECTED_SCBH, SCB_NEXT ret;
 dequeue_free_scb:
 	mov	SCBPTR, FREE_SCBH;
 	mov	FREE_SCBH, SCB_NEXT ret;
-END_CRITICAL
+}
 
 add_scb_to_disc_list:
 /*
@@ -2325,13 +1864,5 @@ add_scb_to_disc_list:
  * candidates for paging out an SCB if one is needed for a new command.
  * Modifying the disconnected list is a critical(pause dissabled) section.
  */
-BEGIN_CRITICAL
 	mov	SCB_NEXT, DISCONNECTED_SCBH;
 	mov	DISCONNECTED_SCBH, SCBPTR ret;
-END_CRITICAL
-}
-set_seqint:
-        mov     INTSTAT, SINDEX;
-        nop;
-return:
-        ret;
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
index 50b56b71bd9..9a1bde59aff 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
@@ -1,942 +1,738 @@
-/* $OpenBSD: aic7xxx_seq.h,v 1.5 2002/03/14 01:26:57 millert Exp $ */
 /*
- * DO NOT EDIT - This file is automatically generated
- *               from the following source files:
- *
- * $Id: aic7xxx_seq.h,v 1.5 2002/03/14 01:26:57 millert Exp $
- * $Id: aic7xxx_seq.h,v 1.5 2002/03/14 01:26:57 millert Exp $
+ * DO NOT EDIT - This file is automatically generated.
  */
 static u_int8_t seqprog[] = {
-	0xb2, 0x00, 0x00, 0x08,
-	0xf7, 0x11, 0x22, 0x08,
-	0x00, 0x65, 0xde, 0x59,
+	0xff, 0x6a, 0x06, 0x08,
+	0x08, 0x6a, 0x68, 0x00,
+	0x7f, 0x02, 0x04, 0x08,
+	0x32, 0x58, 0x00, 0x08,
+	0xff, 0x6a, 0xd6, 0x09,
+	0xff, 0x6a, 0xdc, 0x09,
+	0x00, 0x65, 0xec, 0x59,
 	0xf7, 0x01, 0x02, 0x08,
-	0xff, 0x6a, 0x24, 0x08,
-	0x40, 0x00, 0x40, 0x68,
+	0xff, 0x4e, 0xc8, 0x08,
+	0xbf, 0x60, 0xc0, 0x08,
+	0x60, 0x0b, 0x7c, 0x68,
+	0x40, 0x00, 0x12, 0x68,
 	0x08, 0x1f, 0x3e, 0x10,
-	0x40, 0x00, 0x40, 0x68,
-	0xff, 0x40, 0x3c, 0x60,
+	0x60, 0x0b, 0x7c, 0x68,
+	0x40, 0x00, 0x0c, 0x68,
 	0x08, 0x1f, 0x3e, 0x10,
-	0x60, 0x0b, 0x42, 0x68,
+	0xff, 0x3e, 0x4a, 0x60,
 	0x40, 0xfa, 0x12, 0x78,
-	0x01, 0x4d, 0xc8, 0x30,
-	0x00, 0x4c, 0x12, 0x70,
-	0x01, 0x39, 0xa2, 0x30,
-	0x00, 0x6a, 0xa6, 0x5e,
-	0x01, 0x51, 0x20, 0x31,
-	0x01, 0x57, 0xae, 0x00,
-	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0x51, 0xf8, 0x5d,
-	0x01, 0x51, 0xc8, 0x30,
-	0x00, 0x39, 0xd8, 0x60,
-	0x00, 0xbb, 0x30, 0x70,
-	0xc1, 0x6a, 0xbe, 0x5e,
-	0x01, 0xbf, 0x72, 0x30,
-	0x01, 0x40, 0x7e, 0x31,
-	0x01, 0x90, 0x80, 0x30,
-	0x01, 0xf6, 0xd4, 0x30,
-	0x01, 0x4d, 0x9a, 0x18,
-	0xfe, 0x57, 0xae, 0x08,
-	0x01, 0x40, 0x20, 0x31,
-	0x00, 0x65, 0xdc, 0x58,
-	0x60, 0x0b, 0x40, 0x78,
-	0x08, 0x6a, 0x18, 0x00,
-	0x08, 0x11, 0x22, 0x00,
-	0x60, 0x0b, 0x00, 0x78,
-	0x40, 0x0b, 0x0c, 0x69,
-	0x80, 0x0b, 0xc6, 0x78,
+	0xff, 0xf6, 0xd4, 0x08,
+	0x01, 0x4e, 0x9c, 0x18,
+	0x40, 0x60, 0xc0, 0x00,
+	0x00, 0x4d, 0x12, 0x70,
+	0x01, 0x4e, 0x9c, 0x18,
+	0xbf, 0x60, 0xc0, 0x08,
+	0x00, 0x6a, 0x90, 0x5d,
+	0xff, 0x4e, 0xc8, 0x18,
+	0x01, 0x6a, 0x9c, 0x5c,
+	0xff, 0x53, 0x20, 0x09,
+	0x0d, 0x6a, 0x6a, 0x00,
+	0x00, 0x53, 0x1a, 0x5d,
+	0x03, 0xb0, 0x52, 0x31,
+	0xff, 0xb0, 0x52, 0x09,
+	0xff, 0xb1, 0x54, 0x09,
+	0xff, 0xb2, 0x56, 0x09,
+	0xff, 0xa3, 0x50, 0x09,
+	0xff, 0x3e, 0x74, 0x09,
+	0xff, 0x90, 0x7c, 0x08,
+	0xff, 0x3e, 0x20, 0x09,
+	0x00, 0x65, 0x50, 0x58,
+	0x00, 0x65, 0x0c, 0x40,
+	0xf7, 0x1f, 0xca, 0x08,
+	0x08, 0xa1, 0xc8, 0x08,
+	0x00, 0x65, 0xca, 0x00,
+	0xff, 0x65, 0x3e, 0x08,
+	0xff, 0x58, 0xca, 0x08,
+	0x80, 0xa0, 0x62, 0x78,
+	0xff, 0xb6, 0x1e, 0x08,
+	0xff, 0xb6, 0x0a, 0x08,
+	0x80, 0x65, 0xca, 0x00,
+	0x00, 0x65, 0x70, 0x40,
+	0xf0, 0xa1, 0xc8, 0x08,
+	0x0f, 0x0f, 0x1e, 0x08,
+	0x00, 0x0f, 0x1e, 0x00,
+	0xf0, 0xa1, 0xc8, 0x08,
+	0x0f, 0x05, 0x0a, 0x08,
+	0x00, 0x05, 0x0a, 0x00,
+	0xff, 0x65, 0x00, 0x0c,
+	0x12, 0x65, 0x02, 0x00,
+	0x08, 0xa0, 0x78, 0x78,
+	0x20, 0x01, 0x02, 0x00,
+	0x02, 0xbb, 0x08, 0x34,
+	0xff, 0xbb, 0x08, 0x0c,
+	0x40, 0x0b, 0x10, 0x69,
 	0x20, 0x6a, 0x16, 0x00,
+	0x80, 0x0b, 0x02, 0x79,
 	0xa4, 0x6a, 0x06, 0x00,
-	0x08, 0x3c, 0x78, 0x00,
-	0x01, 0x50, 0xc8, 0x30,
+	0x08, 0x6a, 0x18, 0x00,
+	0x08, 0x36, 0x6c, 0x00,
+	0xff, 0x51, 0xc8, 0x08,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0xe2, 0x5d,
+	0x49, 0x6a, 0x04, 0x5d,
 	0x01, 0x6a, 0xdc, 0x01,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0xe2, 0x5d,
+	0x49, 0x6a, 0x04, 0x5d,
 	0x01, 0x6a, 0x26, 0x01,
-	0xf0, 0x19, 0x7a, 0x08,
-	0x0f, 0x18, 0xc8, 0x08,
-	0x0f, 0x0f, 0xc8, 0x08,
-	0x0f, 0x05, 0xc8, 0x08,
-	0x00, 0x3d, 0x7a, 0x00,
-	0x08, 0x1f, 0x6e, 0x78,
-	0x80, 0x3d, 0x7a, 0x00,
-	0x01, 0x3d, 0xd8, 0x31,
-	0x01, 0x3d, 0x32, 0x31,
+	0xf0, 0x19, 0x6e, 0x08,
+	0xff, 0x37, 0xd8, 0x09,
+	0xff, 0x37, 0x32, 0x09,
+	0x0f, 0x18, 0xd8, 0x09,
+	0x0f, 0x0f, 0xd8, 0x09,
+	0x0f, 0x05, 0xd8, 0x09,
+	0x0f, 0x18, 0x32, 0x09,
+	0x0f, 0x0f, 0x32, 0x09,
+	0x0f, 0x05, 0x32, 0x09,
+	0xff, 0x6a, 0xb4, 0x00,
 	0x10, 0x03, 0x56, 0x79,
-	0x00, 0x65, 0x04, 0x59,
-	0x80, 0x66, 0xa2, 0x78,
-	0x01, 0x66, 0xd8, 0x31,
-	0x01, 0x66, 0x32, 0x31,
-	0x40, 0x66, 0x80, 0x68,
-	0x01, 0x3c, 0x78, 0x00,
-	0x10, 0x03, 0xaa, 0x78,
-	0x00, 0x65, 0x04, 0x59,
+	0x00, 0x65, 0xfa, 0x58,
+	0x80, 0x66, 0xd4, 0x78,
+	0xff, 0x66, 0xd8, 0x09,
+	0xff, 0x66, 0x32, 0x09,
+	0x40, 0x66, 0xb8, 0x68,
+	0x01, 0x36, 0x6c, 0x00,
+	0x10, 0x03, 0xde, 0x78,
+	0x00, 0x65, 0xfa, 0x58,
 	0xe0, 0x66, 0xc8, 0x18,
-	0x00, 0x65, 0xaa, 0x50,
+	0x00, 0x65, 0xde, 0x50,
 	0xdd, 0x66, 0xc8, 0x18,
-	0x00, 0x65, 0xaa, 0x48,
-	0x01, 0x66, 0xd8, 0x31,
-	0x01, 0x66, 0x32, 0x31,
+	0x00, 0x65, 0xde, 0x48,
+	0xff, 0x66, 0xd8, 0x09,
+	0xff, 0x66, 0x32, 0x09,
 	0x10, 0x03, 0x56, 0x79,
-	0x00, 0x65, 0x04, 0x59,
-	0x01, 0x66, 0xd8, 0x31,
-	0x01, 0x66, 0x32, 0x31,
-	0x01, 0x66, 0xac, 0x30,
-	0x40, 0x3c, 0x78, 0x00,
-	0x10, 0x03, 0xa0, 0x78,
-	0x00, 0x65, 0x04, 0x59,
-	0x00, 0x65, 0xaa, 0x40,
-	0x61, 0x6a, 0xbe, 0x5e,
-	0x08, 0x51, 0x2e, 0x71,
-	0x02, 0x0b, 0xa6, 0x78,
-	0x00, 0x65, 0xa2, 0x40,
+	0x00, 0x65, 0xfa, 0x58,
+	0xff, 0x66, 0xd8, 0x09,
+	0xff, 0x66, 0x32, 0x09,
+	0xff, 0x66, 0xb4, 0x08,
+	0x00, 0x65, 0xde, 0x40,
+	0xa1, 0x6a, 0x22, 0x01,
+	0xff, 0x6a, 0xd4, 0x08,
+	0x08, 0x52, 0x2e, 0x71,
+	0x02, 0x0b, 0xda, 0x78,
+	0x00, 0x65, 0xd4, 0x40,
 	0x80, 0x86, 0xc8, 0x08,
-	0x01, 0x4f, 0xc8, 0x30,
-	0x00, 0x50, 0xbc, 0x60,
-	0xc4, 0x6a, 0x54, 0x5d,
-	0x40, 0x3c, 0xb8, 0x78,
-	0x28, 0x6a, 0x6a, 0x5d,
+	0xff, 0x50, 0xc8, 0x08,
+	0x00, 0x51, 0xf0, 0x60,
+	0xc4, 0x6a, 0x1e, 0x5c,
+	0xff, 0x5a, 0xec, 0x70,
+	0x28, 0x6a, 0x34, 0x5c,
 	0x00, 0x65, 0x54, 0x41,
-	0x08, 0x6a, 0x6a, 0x5d,
+	0x08, 0x6a, 0x34, 0x5c,
 	0x00, 0x65, 0x54, 0x41,
 	0xff, 0x6a, 0xd8, 0x01,
 	0xff, 0x6a, 0x32, 0x01,
-	0x90, 0x3c, 0x78, 0x00,
+	0x90, 0x36, 0x6c, 0x00,
 	0x10, 0x03, 0x4a, 0x69,
 	0x00, 0x65, 0x2e, 0x41,
-	0x1a, 0x01, 0x02, 0x00,
-	0xf0, 0x19, 0x7a, 0x08,
-	0x0f, 0x0f, 0xc8, 0x08,
-	0x0f, 0x05, 0xc8, 0x08,
-	0x00, 0x3d, 0x7a, 0x00,
-	0x08, 0x1f, 0xd4, 0x78,
-	0x80, 0x3d, 0x7a, 0x00,
-	0x20, 0x6a, 0x16, 0x00,
-	0x00, 0x65, 0xbe, 0x41,
-	0x00, 0x65, 0x98, 0x5e,
-	0x00, 0x65, 0x12, 0x40,
-	0x20, 0x11, 0xe2, 0x68,
-	0x20, 0x6a, 0x18, 0x00,
-	0x20, 0x11, 0x22, 0x00,
-	0xf7, 0x1f, 0xca, 0x08,
-	0x80, 0xb9, 0xe8, 0x78,
-	0x08, 0x65, 0xca, 0x00,
-	0x01, 0x65, 0x3e, 0x30,
-	0x01, 0xb9, 0x1e, 0x30,
-	0x7f, 0xb9, 0x0a, 0x08,
-	0x01, 0xb9, 0x0a, 0x30,
-	0x01, 0x54, 0xca, 0x30,
-	0x80, 0xb8, 0xf6, 0x78,
-	0x80, 0x65, 0xca, 0x00,
-	0x01, 0x65, 0x00, 0x34,
-	0x01, 0x54, 0x00, 0x34,
-	0x1a, 0x01, 0x02, 0x00,
-	0x08, 0xb8, 0x00, 0x79,
-	0x20, 0x01, 0x02, 0x00,
-	0x02, 0xbd, 0x08, 0x34,
-	0x01, 0xbd, 0x08, 0x34,
 	0x08, 0x01, 0x02, 0x00,
-	0x02, 0x0b, 0x06, 0x79,
+	0x02, 0x0b, 0xfc, 0x78,
 	0xf7, 0x01, 0x02, 0x08,
-	0x01, 0x06, 0xcc, 0x34,
+	0xff, 0x06, 0xcc, 0x0c,
+	0xf0, 0x19, 0x6e, 0x08,
+	0x08, 0x1f, 0x08, 0x79,
+	0x08, 0x37, 0x6e, 0x00,
+	0x1a, 0x01, 0x02, 0x00,
+	0x08, 0x6a, 0x18, 0x00,
+	0x08, 0x11, 0x22, 0x00,
+	0x00, 0x65, 0xce, 0x41,
 	0xb2, 0x00, 0x00, 0x08,
 	0x40, 0x6a, 0x16, 0x00,
-	0x01, 0x40, 0x20, 0x31,
-	0x01, 0xbf, 0x80, 0x30,
-	0x01, 0xb9, 0x7a, 0x30,
-	0x01, 0xba, 0x7c, 0x30,
-	0x00, 0x65, 0xfa, 0x58,
-	0x80, 0x0b, 0xba, 0x79,
-	0xe4, 0x6a, 0x54, 0x5d,
-	0x80, 0xba, 0x6a, 0x5d,
-	0x20, 0xb8, 0x26, 0x79,
-	0x20, 0x6a, 0x6a, 0x5d,
-	0x00, 0xa3, 0x6a, 0x5d,
-	0x01, 0xa0, 0x78, 0x30,
-	0x10, 0xb8, 0x2e, 0x79,
-	0xe4, 0x6a, 0x54, 0x5d,
-	0x00, 0x65, 0xa2, 0x40,
+	0xff, 0x3e, 0x20, 0x09,
+	0xff, 0xba, 0x7c, 0x08,
+	0xff, 0xa1, 0x6e, 0x08,
+	0x80, 0x0b, 0xc4, 0x79,
+	0xe4, 0x6a, 0x1e, 0x5c,
+	0x08, 0x6a, 0x18, 0x00,
+	0x07, 0xa1, 0xc8, 0x08,
+	0x80, 0x64, 0x34, 0x5c,
+	0x20, 0xa0, 0x2a, 0x79,
+	0x20, 0x6a, 0x34, 0x5c,
+	0x00, 0xb8, 0x34, 0x5c,
+	0xff, 0xb8, 0xb4, 0x08,
+	0xff, 0xb4, 0x6c, 0x08,
 	0x10, 0x03, 0x46, 0x69,
-	0x08, 0x3c, 0x62, 0x69,
-	0x04, 0x3c, 0x88, 0x69,
-	0x02, 0x3c, 0x8e, 0x69,
-	0x01, 0x3c, 0x4c, 0x79,
-	0x01, 0x6a, 0xa2, 0x30,
-	0x00, 0x65, 0x9a, 0x59,
-	0x04, 0x51, 0x3c, 0x61,
-	0x00, 0x6a, 0xa6, 0x5e,
-	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0xbb, 0xf8, 0x5d,
-	0x00, 0x65, 0x26, 0x41,
+	0x08, 0x36, 0x5e, 0x69,
+	0x04, 0x36, 0x84, 0x69,
+	0x02, 0x36, 0x94, 0x69,
+	0x01, 0x36, 0x4c, 0x79,
+	0x00, 0x6a, 0x90, 0x5d,
+	0xff, 0x6a, 0xa4, 0x08,
+	0x00, 0x65, 0xa0, 0x59,
+	0x04, 0x52, 0x3e, 0x61,
+	0x0d, 0x6a, 0x6a, 0x00,
+	0x00, 0xb9, 0x1a, 0x5d,
+	0x00, 0x65, 0x2c, 0x41,
 	0xa4, 0x6a, 0x06, 0x00,
-	0x00, 0x65, 0x04, 0x59,
-	0x00, 0x65, 0xa2, 0x40,
-	0xe4, 0x6a, 0x54, 0x5d,
-	0x20, 0x3c, 0x52, 0x79,
-	0x02, 0x6a, 0x6a, 0x5d,
-	0x04, 0x6a, 0x6a, 0x5d,
+	0x00, 0x65, 0xfa, 0x58,
+	0x00, 0x65, 0xd4, 0x40,
+	0xe4, 0x6a, 0x1e, 0x5c,
+	0x20, 0x36, 0x52, 0x79,
+	0x02, 0x6a, 0x34, 0x5c,
+	0x04, 0x6a, 0x34, 0x5c,
 	0x01, 0x03, 0x54, 0x69,
-	0xf7, 0x11, 0x22, 0x08,
-	0xff, 0x6a, 0x24, 0x08,
 	0xff, 0x6a, 0x06, 0x08,
-	0x01, 0x6a, 0x7e, 0x00,
-	0x00, 0x65, 0x9a, 0x59,
-	0x00, 0x65, 0x04, 0x40,
-	0x84, 0x6a, 0x54, 0x5d,
-	0x00, 0x65, 0x04, 0x59,
-	0x01, 0x66, 0xc8, 0x30,
-	0x01, 0x64, 0xd8, 0x31,
-	0x01, 0x64, 0x32, 0x31,
+	0x01, 0x6a, 0x7a, 0x00,
+	0x00, 0x65, 0xa0, 0x59,
+	0x00, 0x65, 0x0c, 0x40,
+	0x84, 0x6a, 0x1e, 0x5c,
+	0x00, 0x65, 0xfa, 0x58,
+	0xff, 0x66, 0xc8, 0x08,
+	0xff, 0x64, 0xd8, 0x09,
+	0xff, 0x64, 0x32, 0x09,
 	0x5b, 0x64, 0xc8, 0x28,
-	0x30, 0x64, 0xca, 0x18,
-	0x01, 0x6c, 0xc8, 0x30,
-	0xff, 0x64, 0x84, 0x79,
+	0x20, 0x64, 0xca, 0x18,
+	0xff, 0x6c, 0xc8, 0x08,
+	0xff, 0x64, 0x80, 0x79,
 	0x08, 0x01, 0x02, 0x00,
-	0x02, 0x0b, 0x76, 0x79,
-	0x01, 0x64, 0x7c, 0x61,
+	0x02, 0x0b, 0x72, 0x79,
+	0x01, 0x64, 0x78, 0x61,
 	0xf7, 0x01, 0x02, 0x08,
-	0x01, 0x06, 0xd8, 0x31,
-	0x01, 0x06, 0x32, 0x31,
+	0xff, 0x06, 0xd8, 0x09,
+	0xff, 0x06, 0x32, 0x09,
 	0xff, 0x64, 0xc8, 0x18,
-	0xff, 0x64, 0x76, 0x69,
-	0xf7, 0x3c, 0x78, 0x08,
+	0xff, 0x64, 0x70, 0x69,
+	0xf7, 0x36, 0x6c, 0x08,
 	0x00, 0x65, 0x2e, 0x41,
-	0x40, 0xa1, 0x7e, 0x10,
-	0x04, 0xa1, 0x54, 0x5d,
-	0x00, 0x65, 0x50, 0x42,
-	0xc4, 0x6a, 0x54, 0x5d,
-	0xc0, 0x6a, 0x7e, 0x00,
-	0x00, 0xa2, 0x6a, 0x5d,
+	0x01, 0xb5, 0x8c, 0x79,
+	0x00, 0x6a, 0x7a, 0x00,
+	0x44, 0x6a, 0x1e, 0x5c,
+	0x00, 0x65, 0x90, 0x41,
+	0x40, 0x6a, 0x7a, 0x00,
+	0x04, 0x6a, 0x1e, 0x5c,
+	0x00, 0x6a, 0x72, 0x58,
+	0x00, 0x65, 0x06, 0x42,
+	0xc4, 0x6a, 0x1e, 0x5c,
+	0xc0, 0x6a, 0x7a, 0x00,
+	0x00, 0xa2, 0x34, 0x5c,
 	0xe4, 0x6a, 0x06, 0x00,
-	0x00, 0x6a, 0x6a, 0x5d,
+	0x00, 0x6a, 0x34, 0x5c,
 	0x00, 0x65, 0x54, 0x41,
-	0x10, 0x3c, 0x9e, 0x69,
-	0x00, 0xbb, 0x74, 0x44,
+	0x10, 0x36, 0xa4, 0x69,
+	0x00, 0xb9, 0x9a, 0x43,
 	0x18, 0x6a, 0xda, 0x01,
-	0x01, 0x69, 0xd8, 0x31,
+	0xff, 0x69, 0xd8, 0x09,
 	0x1c, 0x6a, 0xd0, 0x01,
 	0x09, 0xee, 0xdc, 0x01,
-	0x80, 0xee, 0xa6, 0x79,
+	0x80, 0xee, 0xac, 0x79,
 	0xff, 0x6a, 0xdc, 0x09,
 	0x01, 0x93, 0x26, 0x01,
 	0x03, 0x6a, 0x2a, 0x01,
-	0x01, 0x69, 0x32, 0x31,
-	0x1c, 0x6a, 0xc6, 0x5d,
+	0xff, 0x69, 0x32, 0x09,
+	0x1c, 0x6a, 0x18, 0x01,
+	0xff, 0x6a, 0x1a, 0x09,
+	0xff, 0x6a, 0x1c, 0x09,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0x8e, 0x5e,
-	0x01, 0x50, 0xa0, 0x18,
+	0x00, 0x65, 0x80, 0x5d,
+	0x01, 0x51, 0xa2, 0x18,
 	0x02, 0x6a, 0x22, 0x05,
-	0x80, 0x6a, 0x74, 0x00,
-	0x80, 0x3c, 0x78, 0x00,
-	0x00, 0x65, 0xbe, 0x5d,
-	0x01, 0x3f, 0xc8, 0x30,
-	0xbf, 0x64, 0x50, 0x7a,
-	0x80, 0x64, 0x9a, 0x73,
-	0xa0, 0x64, 0xf8, 0x73,
-	0xc0, 0x64, 0xec, 0x73,
-	0xe0, 0x64, 0x28, 0x74,
-	0x01, 0x6a, 0xbe, 0x5e,
-	0x00, 0x65, 0xbe, 0x41,
+	0x08, 0x6a, 0x72, 0x58,
+	0x08, 0x6a, 0x18, 0x00,
+	0x08, 0x11, 0x22, 0x00,
+	0x80, 0x6a, 0x68, 0x00,
+	0x80, 0x36, 0x6c, 0x00,
+	0x00, 0x65, 0xe8, 0x5c,
+	0xff, 0x3d, 0xc8, 0x08,
+	0xbf, 0x64, 0x06, 0x7a,
+	0x80, 0x64, 0xda, 0x72,
+	0xa0, 0x64, 0x14, 0x73,
+	0xc0, 0x64, 0x0c, 0x73,
+	0xe0, 0x64, 0x5c, 0x73,
+	0x01, 0x6a, 0x22, 0x01,
+	0x00, 0x65, 0xce, 0x41,
 	0xf7, 0x11, 0x22, 0x08,
-	0x01, 0x06, 0xd4, 0x30,
-	0xff, 0x6a, 0x24, 0x08,
+	0xff, 0x06, 0xd4, 0x08,
 	0xf7, 0x01, 0x02, 0x08,
-	0x09, 0x0c, 0xd8, 0x79,
-	0x08, 0x0c, 0x04, 0x68,
-	0xb1, 0x6a, 0xbe, 0x5e,
+	0x09, 0x0c, 0xe6, 0x79,
+	0x08, 0x0c, 0x0c, 0x68,
+	0x01, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0x26, 0x09,
-	0x12, 0x01, 0x02, 0x00,
 	0x02, 0x6a, 0x08, 0x30,
 	0xff, 0x6a, 0x08, 0x08,
 	0xdf, 0x01, 0x02, 0x08,
-	0x01, 0x6a, 0x7e, 0x00,
-	0xff, 0x6a, 0x78, 0x0c,
-	0xff, 0x6a, 0xc8, 0x08,
-	0x08, 0xa4, 0x48, 0x19,
-	0x00, 0xa5, 0x4a, 0x21,
-	0x00, 0xa6, 0x4c, 0x21,
-	0x00, 0xa7, 0x4e, 0x25,
-	0x08, 0xeb, 0xc2, 0x7e,
-	0x80, 0xeb, 0xf8, 0x79,
-	0xff, 0x6a, 0xd6, 0x09,
-	0x08, 0xeb, 0xfc, 0x69,
-	0xff, 0x6a, 0xd4, 0x0c,
-	0x80, 0xa3, 0xc2, 0x6e,
-	0x88, 0xeb, 0x12, 0x72,
-	0x08, 0xeb, 0xc2, 0x6e,
-	0x04, 0xea, 0x16, 0xe2,
-	0x08, 0xee, 0xc2, 0x6e,
-	0x04, 0x6a, 0xd0, 0x81,
-	0x05, 0xa4, 0xc0, 0x89,
-	0x03, 0xa5, 0xc2, 0x31,
-	0x09, 0x6a, 0xd6, 0x05,
-	0x00, 0x65, 0xfa, 0x59,
-	0x06, 0xa4, 0xd4, 0x89,
-	0x80, 0x94, 0xc2, 0x7e,
-	0x07, 0xe9, 0x10, 0x31,
-	0x01, 0x8c, 0x1e, 0x7a,
-	0x01, 0x55, 0xaa, 0x10,
-	0x01, 0xe9, 0x46, 0x31,
-	0x00, 0xa3, 0xa0, 0x5e,
-	0x00, 0x65, 0xec, 0x59,
-	0x01, 0xa4, 0xca, 0x30,
-	0x01, 0x55, 0x2a, 0x7a,
-	0x04, 0x65, 0xca, 0x00,
-	0x80, 0xa3, 0x2e, 0x7a,
-	0x02, 0x65, 0xca, 0x00,
-	0x01, 0x65, 0xf8, 0x31,
-	0x80, 0x93, 0x26, 0x01,
-	0xff, 0x6a, 0xd4, 0x0c,
-	0x01, 0x8c, 0xc8, 0x30,
-	0x00, 0x88, 0xc8, 0x18,
-	0x02, 0x64, 0xc8, 0x88,
-	0xff, 0x64, 0xc2, 0x7e,
-	0xff, 0x8d, 0x44, 0x6a,
-	0xff, 0x8e, 0x44, 0x6a,
-	0x03, 0x8c, 0xd4, 0x98,
-	0x00, 0x65, 0xc2, 0x56,
-	0x01, 0x64, 0x70, 0x30,
-	0xff, 0x64, 0xc8, 0x10,
-	0x01, 0x64, 0xc8, 0x18,
-	0x00, 0x8c, 0x18, 0x19,
-	0xff, 0x8d, 0x1a, 0x21,
-	0xff, 0x8e, 0x1c, 0x25,
-	0x80, 0x3c, 0x54, 0x6a,
-	0x21, 0x6a, 0xbe, 0x46,
-	0xa8, 0x6a, 0x76, 0x00,
-	0x79, 0x6a, 0x76, 0x00,
-	0x40, 0x3f, 0x5c, 0x6a,
-	0x04, 0x3b, 0x76, 0x00,
-	0x04, 0x6a, 0xd4, 0x81,
-	0x20, 0x3c, 0x64, 0x7a,
-	0x51, 0x6a, 0xbe, 0x5e,
-	0x00, 0x65, 0x7e, 0x42,
-	0x20, 0x3c, 0x78, 0x00,
-	0x00, 0xb3, 0xa0, 0x5e,
+	0x01, 0x6a, 0x7a, 0x00,
+	0xff, 0x6a, 0x6c, 0x0c,
+	0x04, 0x14, 0x10, 0x31,
+	0x03, 0xa9, 0x18, 0x31,
+	0x03, 0xa9, 0x10, 0x30,
+	0x08, 0x6a, 0xcc, 0x00,
+	0xa9, 0x6a, 0xfe, 0x5c,
+	0x01, 0xa9, 0xb2, 0x08,
+	0x00, 0x65, 0x28, 0x42,
+	0xa8, 0x6a, 0x6a, 0x00,
+	0x79, 0x6a, 0x6a, 0x00,
+	0x40, 0x3d, 0x0e, 0x6a,
+	0x04, 0x35, 0x6a, 0x00,
+	0x00, 0x65, 0x56, 0x5c,
+	0x80, 0x6a, 0xd4, 0x01,
+	0x20, 0x36, 0xf8, 0x69,
+	0x20, 0x36, 0x6c, 0x00,
 	0x07, 0xac, 0x10, 0x31,
-	0x05, 0xb3, 0x46, 0x31,
 	0x88, 0x6a, 0xcc, 0x00,
-	0xac, 0x6a, 0xd4, 0x5d,
-	0xa3, 0x6a, 0xcc, 0x00,
-	0xb3, 0x6a, 0xd8, 0x5d,
-	0x00, 0x65, 0x34, 0x5a,
-	0xfd, 0xa4, 0x48, 0x09,
-	0x01, 0x8c, 0xaa, 0x08,
+	0xac, 0x6a, 0xf6, 0x5c,
+	0x01, 0xb0, 0xb2, 0x08,
 	0x03, 0x8c, 0x10, 0x30,
-	0x00, 0x65, 0xcc, 0x5d,
-	0x01, 0xa4, 0x90, 0x7a,
-	0x04, 0x3b, 0x76, 0x08,
-	0x01, 0x3b, 0x26, 0x31,
+	0x00, 0x65, 0xf0, 0x5c,
+	0x05, 0xa3, 0x70, 0x30,
+	0x38, 0x6a, 0xcc, 0x00,
+	0xa3, 0x6a, 0xfa, 0x5c,
+	0xff, 0x38, 0x38, 0x6a,
 	0x80, 0x02, 0x04, 0x00,
-	0x10, 0x0c, 0x86, 0x7a,
-	0x03, 0x9e, 0x88, 0x6a,
-	0x7f, 0x02, 0x04, 0x08,
-	0x91, 0x6a, 0xbe, 0x5e,
-	0x00, 0x65, 0xbe, 0x41,
-	0x01, 0xa4, 0xca, 0x30,
-	0x80, 0xa3, 0x96, 0x7a,
-	0x02, 0x65, 0xca, 0x00,
-	0x01, 0x55, 0x9a, 0x7a,
-	0x04, 0x65, 0xca, 0x00,
-	0x01, 0x65, 0xf8, 0x31,
-	0x01, 0x3b, 0x26, 0x31,
-	0x00, 0x65, 0x00, 0x5a,
-	0x01, 0xfc, 0xa8, 0x6a,
-	0x80, 0x0b, 0x9e, 0x6a,
-	0x10, 0x0c, 0x9e, 0x7a,
-	0x20, 0x93, 0x9e, 0x6a,
-	0x02, 0x93, 0x26, 0x01,
-	0x02, 0xfc, 0xb2, 0x7a,
-	0x40, 0x0d, 0xcc, 0x6a,
-	0x01, 0xa4, 0x48, 0x01,
-	0x00, 0x65, 0xcc, 0x42,
-	0x40, 0x0d, 0xb8, 0x6a,
-	0x00, 0x65, 0x00, 0x5a,
-	0x00, 0x65, 0xaa, 0x42,
-	0x80, 0xfc, 0xc2, 0x7a,
-	0x80, 0xa4, 0xc2, 0x6a,
-	0xff, 0xa5, 0x4a, 0x19,
-	0xff, 0xa6, 0x4c, 0x21,
-	0xff, 0xa7, 0x4e, 0x21,
-	0xf8, 0xfc, 0x48, 0x09,
-	0xff, 0x6a, 0xaa, 0x08,
-	0x04, 0xfc, 0xca, 0x7a,
-	0x01, 0x55, 0xaa, 0x00,
-	0xff, 0x6a, 0x46, 0x09,
-	0x04, 0x3b, 0xe4, 0x6a,
-	0x02, 0x93, 0x26, 0x01,
-	0x01, 0x94, 0xce, 0x7a,
-	0x01, 0x94, 0xce, 0x7a,
-	0x01, 0x94, 0xce, 0x7a,
-	0x01, 0x94, 0xce, 0x7a,
-	0x01, 0x94, 0xce, 0x7a,
-	0x01, 0xa4, 0xe2, 0x7a,
-	0x01, 0xfc, 0xdc, 0x7a,
-	0x01, 0x94, 0xe4, 0x6a,
-	0x00, 0x65, 0x7e, 0x42,
-	0x01, 0x94, 0xe2, 0x7a,
-	0x10, 0x94, 0xe4, 0x6a,
-	0xd7, 0x93, 0x26, 0x09,
-	0x28, 0x93, 0xe8, 0x6a,
-	0x01, 0x85, 0x0a, 0x01,
-	0x02, 0xfc, 0xf0, 0x6a,
-	0x01, 0x14, 0x46, 0x31,
-	0xff, 0x6a, 0x10, 0x09,
-	0xfe, 0x85, 0x0a, 0x09,
-	0xff, 0x38, 0xfe, 0x6a,
-	0x80, 0xa3, 0xfe, 0x7a,
-	0x80, 0x0b, 0xfc, 0x7a,
-	0x04, 0x3b, 0xfe, 0x7a,
-	0xbf, 0x3b, 0x76, 0x08,
-	0x01, 0x3b, 0x26, 0x31,
-	0x00, 0x65, 0x00, 0x5a,
-	0x01, 0x0b, 0x0c, 0x6b,
-	0x10, 0x0c, 0x00, 0x7b,
-	0x04, 0x93, 0x0a, 0x6b,
-	0x01, 0x94, 0x08, 0x7b,
-	0x10, 0x94, 0x0a, 0x6b,
-	0xc7, 0x93, 0x26, 0x09,
-	0x01, 0x99, 0xd4, 0x30,
-	0x38, 0x93, 0x0e, 0x6b,
-	0xff, 0x08, 0x60, 0x6b,
-	0xff, 0x09, 0x60, 0x6b,
-	0xff, 0x0a, 0x60, 0x6b,
-	0xff, 0x38, 0x2a, 0x7b,
-	0x04, 0x14, 0x10, 0x31,
-	0x01, 0x38, 0x18, 0x31,
-	0x02, 0x6a, 0x1a, 0x31,
+	0xe7, 0x35, 0x6a, 0x08,
+	0x03, 0x69, 0x18, 0x31,
+	0x03, 0x69, 0x10, 0x30,
+	0xff, 0x6a, 0x10, 0x00,
+	0xff, 0x6a, 0x12, 0x00,
+	0xff, 0x6a, 0x14, 0x00,
+	0x01, 0x38, 0x42, 0x62,
+	0x02, 0xfc, 0xf8, 0x01,
+	0x80, 0x0b, 0x40, 0x7a,
+	0x04, 0x35, 0x42, 0x7a,
+	0xbf, 0x35, 0x6a, 0x08,
+	0xff, 0x69, 0xca, 0x08,
+	0xff, 0x35, 0x26, 0x09,
+	0x04, 0x0b, 0x46, 0x6a,
+	0x04, 0x0b, 0x4e, 0x6a,
+	0x10, 0x0c, 0x48, 0x7a,
+	0x00, 0x35, 0x42, 0x5c,
+	0x80, 0x02, 0xb6, 0x6a,
+	0xff, 0x08, 0x9c, 0x6a,
+	0xff, 0x09, 0x9c, 0x6a,
+	0xff, 0x0a, 0x9c, 0x6a,
+	0xff, 0x38, 0x70, 0x18,
+	0xff, 0x38, 0x9c, 0x7a,
+	0x80, 0xea, 0x72, 0x62,
+	0xef, 0x38, 0xc8, 0x18,
+	0x80, 0x6a, 0xc8, 0x00,
+	0x00, 0x65, 0x64, 0x4a,
+	0x33, 0x38, 0xc8, 0x28,
+	0xff, 0x64, 0xd0, 0x09,
+	0x04, 0x39, 0xc0, 0x31,
+	0x09, 0x6a, 0xd6, 0x01,
+	0x80, 0xeb, 0x6a, 0x7a,
+	0xf7, 0xeb, 0xd6, 0x09,
+	0x08, 0xeb, 0x6e, 0x6a,
+	0x01, 0x6a, 0xd6, 0x01,
+	0x08, 0xe9, 0x10, 0x31,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x14, 0x6a, 0xda, 0x5d,
-	0x00, 0x38, 0xc6, 0x5d,
-	0xff, 0x6a, 0x70, 0x08,
-	0x00, 0x65, 0x56, 0x43,
-	0x80, 0xa3, 0x30, 0x7b,
-	0x01, 0xa4, 0x48, 0x01,
-	0x00, 0x65, 0x60, 0x43,
-	0x08, 0xeb, 0x36, 0x7b,
-	0x00, 0x65, 0x00, 0x5a,
-	0x08, 0xeb, 0x32, 0x6b,
-	0x07, 0xe9, 0x10, 0x31,
-	0x01, 0xe9, 0xca, 0x30,
-	0x01, 0x65, 0x46, 0x31,
-	0x00, 0x6a, 0xa0, 0x5e,
-	0x88, 0x6a, 0xcc, 0x00,
-	0xa4, 0x6a, 0xda, 0x5d,
-	0x08, 0x6a, 0xc6, 0x5d,
+	0x39, 0x6a, 0xfc, 0x5c,
+	0x08, 0x6a, 0x18, 0x01,
+	0xff, 0x6a, 0x1a, 0x09,
+	0xff, 0x6a, 0x1c, 0x09,
 	0x0d, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0x8e, 0x5e,
-	0x88, 0x6a, 0xcc, 0x00,
-	0x00, 0x65, 0x70, 0x5e,
-	0x01, 0x99, 0x46, 0x31,
-	0x00, 0xa3, 0xa0, 0x5e,
-	0x01, 0x88, 0x10, 0x31,
-	0x00, 0x65, 0x34, 0x5a,
-	0x00, 0x65, 0xec, 0x59,
+	0x00, 0x65, 0x80, 0x5d,
+	0x88, 0x6a, 0x70, 0x5d,
+	0x01, 0x8c, 0x88, 0x7a,
+	0x01, 0x59, 0xb2, 0x10,
 	0x03, 0x8c, 0x10, 0x30,
-	0x00, 0x65, 0xcc, 0x5d,
-	0x01, 0x8c, 0x5e, 0x7b,
-	0x01, 0x55, 0xaa, 0x10,
-	0x80, 0x0b, 0x7e, 0x6a,
-	0x80, 0x0b, 0x68, 0x6b,
-	0x01, 0x0c, 0x62, 0x7b,
-	0x10, 0x0c, 0x7e, 0x7a,
-	0x03, 0x9e, 0x7e, 0x6a,
-	0x00, 0x65, 0xf6, 0x59,
-	0x00, 0x6a, 0xa0, 0x5e,
-	0x01, 0xa4, 0x88, 0x6b,
-	0xff, 0x38, 0x7e, 0x7b,
-	0x01, 0x38, 0xc8, 0x30,
-	0x00, 0x08, 0x40, 0x19,
+	0x00, 0x65, 0xf0, 0x5c,
 	0xff, 0x6a, 0xc8, 0x08,
-	0x00, 0x09, 0x42, 0x21,
-	0x00, 0x0a, 0x44, 0x21,
-	0xff, 0x6a, 0x70, 0x08,
-	0x00, 0x65, 0x80, 0x43,
-	0x03, 0x08, 0x40, 0x31,
-	0x03, 0x08, 0x40, 0x31,
-	0x01, 0x08, 0x40, 0x31,
-	0x01, 0x09, 0x42, 0x31,
-	0x01, 0x0a, 0x44, 0x31,
-	0xfd, 0xb4, 0x68, 0x09,
-	0x12, 0x01, 0x02, 0x00,
+	0x08, 0x39, 0x72, 0x18,
+	0x00, 0x3a, 0x74, 0x20,
+	0x80, 0x0b, 0x28, 0x6a,
+	0x01, 0x0c, 0x94, 0x7a,
+	0x10, 0x0c, 0x28, 0x7a,
+	0xff, 0x35, 0x26, 0x09,
+	0x04, 0x0b, 0x9a, 0x6a,
+	0x00, 0x65, 0xc0, 0x5a,
+	0x03, 0x08, 0x52, 0x31,
+	0xff, 0x08, 0x52, 0x09,
+	0xff, 0x09, 0x54, 0x09,
+	0xff, 0x0a, 0x56, 0x09,
+	0xff, 0x38, 0x50, 0x09,
 	0x12, 0x01, 0x02, 0x00,
-	0x04, 0x3c, 0xbe, 0x79,
-	0xfb, 0x3c, 0x78, 0x08,
+	0x04, 0x36, 0xce, 0x79,
+	0xfb, 0x36, 0x6c, 0x08,
 	0x04, 0x93, 0x2e, 0x79,
-	0x01, 0x0c, 0x94, 0x6b,
+	0x01, 0x0c, 0xb0, 0x6a,
 	0x00, 0x65, 0x2e, 0x41,
-	0x00, 0x65, 0xbe, 0x41,
-	0x80, 0x3c, 0x9e, 0x6b,
-	0x21, 0x6a, 0xbe, 0x46,
-	0x01, 0xbc, 0x18, 0x31,
+	0x00, 0x65, 0xce, 0x41,
+	0x00, 0x65, 0xc0, 0x5a,
+	0x12, 0x01, 0x02, 0x00,
+	0x7f, 0x02, 0x04, 0x08,
+	0xf1, 0x6a, 0x22, 0x01,
+	0x00, 0x65, 0xce, 0x41,
+	0x04, 0x93, 0xd2, 0x6a,
+	0xdf, 0x93, 0x26, 0x09,
+	0x20, 0x93, 0xc4, 0x6a,
+	0x02, 0x93, 0x26, 0x01,
+	0x01, 0x94, 0xc6, 0x7a,
+	0x01, 0x94, 0xc6, 0x7a,
+	0x01, 0x94, 0xc6, 0x7a,
+	0x01, 0x94, 0xc6, 0x7a,
+	0x01, 0x94, 0xc6, 0x7a,
+	0x10, 0x94, 0xd2, 0x6a,
+	0xd7, 0x93, 0x26, 0x09,
+	0x08, 0x93, 0xd6, 0x6a,
+	0xff, 0x6a, 0xd4, 0x0c,
+	0x00, 0x65, 0x56, 0x5c,
+	0xff, 0xb8, 0x18, 0x09,
 	0x02, 0x6a, 0x1a, 0x31,
-	0x02, 0x6a, 0xf8, 0x01,
-	0x01, 0xbc, 0x10, 0x30,
-	0x02, 0x6a, 0x12, 0x30,
-	0x01, 0xbc, 0x10, 0x30,
-	0xff, 0x6a, 0x12, 0x08,
-	0xff, 0x6a, 0x14, 0x08,
-	0xf3, 0xbc, 0xd4, 0x18,
-	0xa0, 0x6a, 0xc4, 0x53,
-	0x04, 0xa0, 0x10, 0x31,
-	0xac, 0x6a, 0x26, 0x01,
-	0x04, 0xa0, 0x10, 0x31,
-	0x03, 0x08, 0x18, 0x31,
-	0x88, 0x6a, 0xcc, 0x00,
-	0xa0, 0x6a, 0xda, 0x5d,
-	0x00, 0xbc, 0xc6, 0x5d,
-	0x3d, 0x6a, 0x26, 0x01,
-	0x00, 0x65, 0xdc, 0x43,
-	0xff, 0x6a, 0x10, 0x09,
+	0x03, 0x8c, 0x10, 0x30,
+	0xef, 0xb8, 0xd4, 0x18,
+	0x00, 0x65, 0xf0, 0x4a,
+	0x01, 0x6a, 0x10, 0x31,
 	0xa4, 0x6a, 0x26, 0x01,
-	0x0c, 0xa0, 0x32, 0x31,
-	0x05, 0x6a, 0x26, 0x01,
-	0x35, 0x6a, 0x26, 0x01,
-	0x0c, 0xa0, 0x32, 0x31,
-	0x36, 0x6a, 0x26, 0x01,
-	0x02, 0x93, 0x26, 0x01,
 	0x35, 0x6a, 0x26, 0x01,
-	0x00, 0x65, 0x82, 0x5e,
-	0x00, 0x65, 0x82, 0x5e,
-	0x02, 0x93, 0x26, 0x01,
-	0x04, 0x0b, 0xe0, 0x6b,
-	0x10, 0x0c, 0xdc, 0x7b,
-	0x01, 0x03, 0xe0, 0x6b,
-	0x20, 0x93, 0xdc, 0x6b,
+	0x10, 0xc0, 0x32, 0x31,
+	0x00, 0x65, 0x00, 0x43,
+	0x04, 0xb4, 0x10, 0x31,
+	0x88, 0x6a, 0xcc, 0x00,
+	0xb4, 0x6a, 0xfa, 0x5c,
+	0xff, 0x6a, 0x1a, 0x09,
+	0xff, 0x6a, 0x1c, 0x09,
+	0x00, 0x65, 0xf0, 0x5c,
+	0x3d, 0x6a, 0x26, 0x01,
+	0xac, 0x6a, 0x26, 0x01,
+	0x04, 0x0b, 0x04, 0x6b,
+	0x10, 0x0c, 0x00, 0x7b,
+	0x01, 0x03, 0x04, 0x6b,
 	0xc7, 0x93, 0x26, 0x09,
-	0x38, 0x93, 0xe6, 0x6b,
-	0x10, 0x01, 0x02, 0x00,
-	0x00, 0x65, 0xbe, 0x41,
-	0x80, 0x3c, 0xf0, 0x6b,
-	0x21, 0x6a, 0xbe, 0x46,
-	0x01, 0x06, 0x50, 0x31,
-	0x00, 0x65, 0xbe, 0x41,
-	0x10, 0x3f, 0x06, 0x00,
-	0x10, 0x6a, 0x06, 0x00,
-	0x01, 0x3a, 0xca, 0x30,
-	0x80, 0x65, 0x14, 0x64,
-	0x10, 0xb8, 0x38, 0x6c,
-	0xc0, 0xba, 0xca, 0x00,
-	0x40, 0xb8, 0x04, 0x6c,
-	0xbf, 0x65, 0xca, 0x08,
-	0x20, 0xb8, 0x18, 0x7c,
-	0x01, 0x65, 0x0c, 0x30,
-	0x00, 0x65, 0xbe, 0x5d,
-	0xa0, 0x3f, 0x20, 0x64,
-	0x23, 0xb8, 0x0c, 0x08,
-	0x00, 0x65, 0xbe, 0x5d,
-	0xa0, 0x3f, 0x20, 0x64,
-	0x00, 0xbb, 0x18, 0x44,
-	0xff, 0x65, 0x18, 0x64,
-	0x00, 0x65, 0x38, 0x44,
+	0x38, 0x93, 0x08, 0x6b,
+	0x00, 0x65, 0xce, 0x41,
+	0x00, 0x65, 0x56, 0x5c,
+	0xff, 0x06, 0x44, 0x09,
+	0x00, 0x65, 0xce, 0x41,
+	0x10, 0x3d, 0x06, 0x00,
+	0xff, 0x34, 0xca, 0x08,
+	0x80, 0x65, 0x48, 0x63,
+	0x10, 0xa0, 0x6a, 0x6b,
+	0xff, 0xa1, 0xdc, 0x08,
+	0xff, 0x6e, 0xc8, 0x08,
+	0xf0, 0x86, 0x22, 0x7b,
+	0x61, 0x6a, 0x22, 0x01,
+	0xff, 0x6a, 0xd4, 0x08,
+	0xff, 0x56, 0xca, 0x08,
+	0x08, 0xa1, 0x2a, 0x7b,
+	0xff, 0x57, 0xca, 0x08,
+	0x80, 0xa1, 0x2e, 0x7b,
+	0xff, 0x57, 0xca, 0x08,
+	0x00, 0x65, 0x6a, 0x6b,
+	0x07, 0xa1, 0xca, 0x08,
+	0x40, 0xa0, 0xc8, 0x08,
+	0x00, 0x65, 0xca, 0x00,
+	0x80, 0x65, 0xca, 0x00,
+	0x20, 0xa0, 0x4c, 0x7b,
+	0xff, 0x65, 0x0c, 0x08,
+	0x00, 0x65, 0xe8, 0x5c,
+	0xa0, 0x3d, 0x54, 0x63,
+	0x23, 0xa0, 0x0c, 0x08,
+	0x00, 0x65, 0xe8, 0x5c,
+	0xa0, 0x3d, 0x54, 0x63,
+	0x00, 0xb9, 0x4c, 0x43,
+	0xff, 0x65, 0x4c, 0x63,
+	0x00, 0x65, 0x6a, 0x43,
 	0x40, 0x6a, 0x18, 0x00,
-	0x01, 0x65, 0x0c, 0x30,
-	0x00, 0x65, 0xbe, 0x5d,
-	0xa0, 0x3f, 0xf4, 0x73,
+	0xff, 0x65, 0x0c, 0x08,
+	0x00, 0x65, 0xe8, 0x5c,
+	0xa0, 0x3d, 0x12, 0x73,
 	0x40, 0x6a, 0x18, 0x00,
-	0x01, 0x3a, 0xa6, 0x30,
-	0x08, 0x6a, 0x74, 0x00,
-	0x00, 0x65, 0xbe, 0x41,
-	0x64, 0x6a, 0x4e, 0x5d,
-	0x80, 0x64, 0xbe, 0x6c,
-	0x04, 0x64, 0x84, 0x74,
-	0x02, 0x64, 0x92, 0x74,
-	0x00, 0x6a, 0x54, 0x74,
-	0x03, 0x64, 0xb0, 0x74,
-	0x23, 0x64, 0x40, 0x74,
-	0x08, 0x64, 0x50, 0x74,
-	0x61, 0x6a, 0xbe, 0x5e,
-	0x00, 0x65, 0xbe, 0x5d,
-	0x08, 0x51, 0xc0, 0x71,
-	0x00, 0x65, 0x38, 0x44,
-	0x80, 0x04, 0x4e, 0x7c,
-	0x51, 0x6a, 0x44, 0x5d,
-	0x01, 0x51, 0x4e, 0x64,
-	0x01, 0xa4, 0x4a, 0x7c,
-	0x01, 0x55, 0x50, 0x7c,
-	0x41, 0x6a, 0xbe, 0x5e,
-	0x00, 0x65, 0x50, 0x44,
-	0x07, 0x6a, 0x3a, 0x5d,
-	0x01, 0x06, 0xd4, 0x30,
-	0x00, 0x65, 0xbe, 0x41,
-	0x10, 0xb8, 0x58, 0x7c,
-	0xa1, 0x6a, 0xbe, 0x5e,
-	0x01, 0xb4, 0x5e, 0x6c,
-	0x02, 0xb4, 0x60, 0x6c,
-	0x01, 0xa4, 0x60, 0x7c,
-	0xff, 0xa8, 0x70, 0x7c,
-	0x04, 0xb4, 0x68, 0x01,
-	0x01, 0x6a, 0x76, 0x00,
-	0x00, 0xbb, 0xf8, 0x5d,
-	0xff, 0xa8, 0x70, 0x7c,
-	0x71, 0x6a, 0xbe, 0x5e,
-	0x40, 0x51, 0x70, 0x64,
-	0x00, 0x65, 0x98, 0x5e,
-	0x00, 0x65, 0xd0, 0x41,
-	0x00, 0xbb, 0x74, 0x5c,
-	0x00, 0x65, 0xd0, 0x41,
-	0x00, 0x65, 0x98, 0x5e,
-	0x01, 0x65, 0xa2, 0x30,
-	0x01, 0xf8, 0xc8, 0x30,
-	0x01, 0x4e, 0xc8, 0x30,
-	0x00, 0x6a, 0x9c, 0xdd,
-	0x00, 0x51, 0xae, 0x5d,
-	0x01, 0x4e, 0x9c, 0x18,
+	0xff, 0x34, 0xa8, 0x08,
+	0x08, 0x6a, 0x68, 0x00,
+	0x00, 0x65, 0xce, 0x41,
+	0x64, 0x6a, 0x18, 0x5c,
+	0x80, 0x64, 0xc8, 0x6b,
+	0x04, 0x64, 0xaa, 0x73,
+	0x02, 0x64, 0xb0, 0x73,
+	0x00, 0x6a, 0x76, 0x73,
+	0x03, 0x64, 0xc4, 0x73,
+	0x08, 0x64, 0x72, 0x73,
+	0xa1, 0x6a, 0x22, 0x01,
+	0x00, 0x65, 0xe8, 0x5c,
+	0x08, 0x52, 0xd0, 0x71,
+	0x00, 0x65, 0x6a, 0x43,
+	0xff, 0x06, 0xd4, 0x08,
+	0x00, 0x65, 0xce, 0x41,
+	0xff, 0xa8, 0x7a, 0x6b,
+	0xff, 0xa2, 0x92, 0x7b,
+	0x01, 0x6a, 0x6a, 0x00,
+	0x00, 0xb9, 0x1a, 0x5d,
+	0xff, 0xa2, 0x92, 0x7b,
+	0x71, 0x6a, 0x22, 0x01,
+	0xff, 0x6a, 0xd4, 0x08,
+	0x40, 0x52, 0x92, 0x63,
+	0x0d, 0x6a, 0x6a, 0x00,
+	0x00, 0xb9, 0x1a, 0x5d,
+	0xff, 0x3e, 0x74, 0x09,
+	0xff, 0x90, 0x7c, 0x08,
+	0x00, 0x65, 0x50, 0x58,
+	0x00, 0x65, 0xe0, 0x41,
+	0x20, 0xa0, 0x96, 0x6b,
+	0xff, 0x37, 0xc8, 0x08,
+	0x00, 0xb9, 0x9a, 0x5b,
+	0x00, 0x65, 0xe0, 0x41,
+	0x00, 0x65, 0x88, 0x5d,
+	0xff, 0x65, 0xa4, 0x08,
+	0xff, 0xf8, 0xc8, 0x08,
+	0xff, 0x4f, 0xc8, 0x08,
+	0x00, 0x6a, 0xbc, 0x5c,
+	0x00, 0x52, 0xd2, 0x5c,
+	0x01, 0x4f, 0x9e, 0x18,
 	0x02, 0x6a, 0x22, 0x05,
-	0x04, 0xb8, 0x70, 0x01,
-	0x00, 0x65, 0xba, 0x5e,
-	0x20, 0xb8, 0xd0, 0x69,
-	0x01, 0xbb, 0xa2, 0x30,
-	0x01, 0xba, 0x7c, 0x30,
-	0x00, 0xb9, 0xb4, 0x5c,
-	0x00, 0x65, 0xd0, 0x41,
-	0x01, 0x06, 0xd4, 0x30,
-	0x20, 0x3c, 0xbe, 0x79,
-	0x20, 0x3c, 0x50, 0x7c,
-	0x01, 0xa4, 0xa0, 0x7c,
-	0x01, 0xb4, 0x68, 0x01,
-	0x00, 0x65, 0xbe, 0x41,
-	0x00, 0x65, 0x50, 0x44,
+	0x04, 0xa0, 0x40, 0x01,
+	0x00, 0x65, 0xa2, 0x5d,
+	0x00, 0x65, 0xe0, 0x41,
+	0x20, 0x36, 0x72, 0x7b,
+	0x05, 0x38, 0x46, 0x31,
 	0x04, 0x14, 0x58, 0x31,
-	0x01, 0x06, 0xd4, 0x30,
-	0x08, 0xa0, 0x60, 0x31,
+	0x03, 0xa9, 0x60, 0x31,
+	0xa3, 0x6a, 0xcc, 0x00,
+	0x38, 0x6a, 0xfa, 0x5c,
 	0xac, 0x6a, 0xcc, 0x00,
-	0x14, 0x6a, 0xda, 0x5d,
-	0x01, 0x06, 0xd4, 0x30,
-	0xa0, 0x6a, 0xd2, 0x5d,
-	0x00, 0x65, 0xbe, 0x41,
-	0xdf, 0x3c, 0x78, 0x08,
-	0x00, 0x65, 0x50, 0x44,
-	0x4c, 0x65, 0xcc, 0x28,
-	0x01, 0x3e, 0x20, 0x31,
-	0xd0, 0x66, 0xcc, 0x18,
-	0x20, 0x66, 0xcc, 0x18,
-	0x01, 0x51, 0xda, 0x34,
-	0x4c, 0x3d, 0xca, 0x28,
-	0x1f, 0x64, 0x7c, 0x08,
-	0xd0, 0x65, 0xca, 0x18,
-	0x01, 0x3e, 0x20, 0x31,
-	0x30, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xcc, 0x4c,
-	0xe1, 0x6a, 0x22, 0x01,
-	0xff, 0x6a, 0xd4, 0x08,
-	0x20, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xd4, 0x54,
-	0xe1, 0x6a, 0x22, 0x01,
-	0xff, 0x6a, 0xd4, 0x08,
-	0x20, 0x65, 0xca, 0x18,
-	0xe0, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xde, 0x4c,
-	0xe1, 0x6a, 0x22, 0x01,
-	0xff, 0x6a, 0xd4, 0x08,
-	0xd0, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xe6, 0x54,
-	0xe1, 0x6a, 0x22, 0x01,
-	0xff, 0x6a, 0xd4, 0x08,
-	0x01, 0x6c, 0xa2, 0x30,
-	0xff, 0x51, 0xf8, 0x74,
-	0x00, 0x51, 0x74, 0x5d,
-	0x01, 0x51, 0x20, 0x31,
-	0x00, 0x65, 0x1a, 0x45,
-	0x01, 0xba, 0xc8, 0x30,
-	0x00, 0x3e, 0x1a, 0x75,
-	0x00, 0x65, 0x96, 0x5e,
-	0x80, 0x3c, 0x78, 0x00,
-	0x01, 0x06, 0xd4, 0x30,
-	0x00, 0x65, 0xbe, 0x5d,
-	0x01, 0x3c, 0x78, 0x00,
-	0xe0, 0x3f, 0x36, 0x65,
-	0x02, 0x3c, 0x78, 0x00,
-	0x20, 0x12, 0x36, 0x65,
-	0x51, 0x6a, 0x44, 0x5d,
-	0x00, 0x51, 0x74, 0x5d,
-	0x51, 0x6a, 0x44, 0x5d,
-	0x01, 0x51, 0x20, 0x31,
-	0x04, 0x3c, 0x78, 0x00,
-	0x01, 0xb9, 0xc8, 0x30,
-	0x00, 0x3d, 0x34, 0x65,
-	0x08, 0x3c, 0x78, 0x00,
-	0x01, 0xba, 0xc8, 0x30,
-	0x00, 0x3e, 0x34, 0x65,
-	0x10, 0x3c, 0x78, 0x00,
-	0x04, 0xb8, 0x34, 0x7d,
-	0xfb, 0xb8, 0x70, 0x09,
-	0x20, 0xb8, 0x2a, 0x6d,
-	0x01, 0x90, 0xc8, 0x30,
-	0xff, 0x6a, 0xa2, 0x00,
-	0x00, 0x3d, 0xb4, 0x5c,
-	0x01, 0x64, 0x20, 0x31,
-	0x80, 0x6a, 0x78, 0x00,
-	0x00, 0x65, 0xfc, 0x58,
-	0x10, 0xb8, 0x50, 0x7c,
-	0xff, 0x6a, 0x3a, 0x5d,
-	0x00, 0x65, 0x50, 0x44,
-	0x00, 0x65, 0x96, 0x5e,
-	0x31, 0x6a, 0xbe, 0x5e,
-	0x00, 0x65, 0x50, 0x44,
-	0x10, 0x3f, 0x06, 0x00,
-	0x10, 0x6a, 0x06, 0x00,
-	0x01, 0x65, 0x74, 0x34,
-	0x81, 0x6a, 0xbe, 0x5e,
-	0x00, 0x65, 0x46, 0x45,
-	0x01, 0x06, 0xd4, 0x30,
-	0x01, 0x0c, 0x46, 0x7d,
-	0x04, 0x0c, 0x40, 0x6d,
-	0xe0, 0x03, 0x7e, 0x08,
-	0xe0, 0x3f, 0xbe, 0x61,
-	0x01, 0x65, 0xcc, 0x30,
-	0x01, 0x12, 0xda, 0x34,
-	0x01, 0x06, 0xd4, 0x34,
-	0x01, 0x03, 0x54, 0x6d,
+	0x14, 0x6a, 0xfc, 0x5c,
+	0xa9, 0x6a, 0xfe, 0x5c,
+	0x00, 0x65, 0x72, 0x43,
+	0xdf, 0x36, 0x6c, 0x08,
+	0x00, 0x65, 0x72, 0x43,
+	0x0f, 0x64, 0xc8, 0x08,
+	0x07, 0x64, 0xc8, 0x08,
+	0x00, 0x37, 0x6e, 0x00,
+	0xff, 0x6a, 0xa6, 0x00,
+	0x00, 0x65, 0x8c, 0x5c,
+	0xff, 0x52, 0xda, 0x73,
+	0x40, 0x36, 0xe4, 0x7b,
+	0x00, 0x65, 0x7a, 0x5c,
+	0x00, 0x65, 0xe6, 0x43,
+	0xff, 0x06, 0xd4, 0x08,
+	0x00, 0x65, 0xe8, 0x5c,
+	0xe0, 0x3d, 0x02, 0x64,
+	0x20, 0x12, 0x02, 0x64,
+	0x52, 0x6a, 0x0e, 0x5c,
+	0x00, 0x65, 0x74, 0x5c,
+	0xff, 0x37, 0xc8, 0x08,
+	0x00, 0xa1, 0xfa, 0x63,
+	0x04, 0xa0, 0xfa, 0x7b,
+	0xfb, 0xa0, 0x40, 0x09,
+	0x80, 0x36, 0x6c, 0x00,
+	0x00, 0x65, 0x74, 0x58,
+	0x10, 0xa0, 0x72, 0x7b,
+	0xef, 0xa0, 0x40, 0x09,
+	0xff, 0x6a, 0x06, 0x5c,
+	0x00, 0x65, 0x72, 0x43,
+	0x04, 0xa0, 0x00, 0x7c,
+	0x00, 0x65, 0xa2, 0x5d,
+	0x00, 0x65, 0x02, 0x44,
+	0x00, 0x65, 0x88, 0x5d,
+	0x31, 0x6a, 0x22, 0x01,
+	0x00, 0x65, 0x72, 0x43,
+	0x10, 0x3d, 0x06, 0x00,
+	0xff, 0x65, 0x68, 0x0c,
+	0xb1, 0x6a, 0x22, 0x01,
+	0x00, 0x65, 0x10, 0x44,
+	0xff, 0x06, 0xd4, 0x08,
+	0x01, 0x0c, 0x10, 0x7c,
+	0x04, 0x0c, 0x0a, 0x6c,
+	0xe0, 0x03, 0x7a, 0x08,
+	0xe0, 0x3d, 0x3e, 0x64,
+	0xff, 0x65, 0xcc, 0x08,
+	0xff, 0x12, 0xda, 0x0c,
+	0xff, 0x06, 0xd4, 0x0c,
+	0x01, 0x03, 0x1e, 0x6c,
 	0x40, 0x03, 0xcc, 0x08,
-	0x01, 0x65, 0x06, 0x30,
+	0xff, 0x65, 0x06, 0x08,
 	0x40, 0x65, 0xc8, 0x08,
-	0x00, 0x66, 0x62, 0x75,
-	0x40, 0x65, 0x62, 0x7d,
-	0x00, 0x65, 0x62, 0x5d,
+	0x00, 0x66, 0x2c, 0x74,
+	0x40, 0x65, 0x2c, 0x7c,
+	0x00, 0x65, 0x2c, 0x5c,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x0c,
 	0x08, 0x01, 0x02, 0x00,
-	0x02, 0x0b, 0x6c, 0x7d,
-	0x01, 0x65, 0x0c, 0x30,
-	0x02, 0x0b, 0x70, 0x7d,
+	0x02, 0x0b, 0x36, 0x7c,
+	0xff, 0x65, 0x0c, 0x08,
+	0x02, 0x0b, 0x3a, 0x7c,
 	0xf7, 0x01, 0x02, 0x0c,
-	0x01, 0x65, 0xc8, 0x30,
-	0xff, 0x41, 0x94, 0x75,
-	0x01, 0x41, 0x20, 0x31,
+	0xe1, 0x6a, 0x22, 0x01,
+	0x00, 0x65, 0xce, 0x41,
+	0xff, 0x65, 0x26, 0x09,
+	0x01, 0x0b, 0x4e, 0x6c,
+	0x10, 0x0c, 0x44, 0x7c,
+	0x04, 0x93, 0x4c, 0x6c,
+	0x01, 0x94, 0x4a, 0x7c,
+	0x10, 0x94, 0x4c, 0x6c,
+	0xc7, 0x93, 0x26, 0x09,
+	0xff, 0x99, 0xd4, 0x08,
+	0x38, 0x93, 0x50, 0x6c,
+	0xff, 0x6a, 0xd4, 0x0c,
+	0x80, 0x36, 0x54, 0x6c,
+	0x21, 0x6a, 0x22, 0x05,
+	0xff, 0x65, 0x20, 0x09,
+	0xff, 0x52, 0x62, 0x64,
+	0xff, 0x37, 0xc8, 0x08,
+	0xa1, 0x6a, 0x6e, 0x44,
+	0xff, 0x52, 0xc8, 0x08,
+	0xb9, 0x6a, 0x6e, 0x44,
+	0xff, 0x90, 0xa6, 0x08,
+	0xff, 0xba, 0x72, 0x74,
+	0xff, 0xba, 0x20, 0x09,
+	0xff, 0x65, 0xca, 0x18,
+	0x00, 0x6c, 0x66, 0x64,
+	0xff, 0x90, 0xca, 0x0c,
+	0xff, 0x6a, 0xca, 0x04,
+	0x40, 0x36, 0x86, 0x7c,
+	0x00, 0x90, 0x5a, 0x5c,
+	0xff, 0x65, 0x86, 0x74,
+	0xff, 0x53, 0x84, 0x74,
+	0xff, 0xba, 0xcc, 0x08,
+	0xff, 0x53, 0x20, 0x09,
+	0xff, 0x66, 0x74, 0x09,
+	0xff, 0x65, 0x20, 0x0d,
+	0xff, 0xba, 0x7e, 0x0c,
+	0x00, 0x6a, 0x90, 0x5d,
+	0x0d, 0x6a, 0x6a, 0x00,
+	0x00, 0x52, 0x1a, 0x45,
+	0xff, 0x3f, 0xe0, 0x74,
 	0xff, 0x6a, 0xa4, 0x00,
-	0x00, 0x65, 0x84, 0x45,
-	0xff, 0xbf, 0x94, 0x75,
-	0x01, 0x90, 0xa4, 0x30,
-	0x01, 0xbf, 0x20, 0x31,
-	0x00, 0xbb, 0x7e, 0x65,
-	0xff, 0x52, 0x92, 0x75,
-	0x01, 0xbf, 0xcc, 0x30,
-	0x01, 0x90, 0xca, 0x30,
-	0x01, 0x52, 0x20, 0x31,
-	0x01, 0x66, 0x7e, 0x31,
-	0x01, 0x65, 0x20, 0x35,
-	0x01, 0xbf, 0x82, 0x34,
-	0x01, 0x64, 0xa2, 0x30,
-	0x00, 0x6a, 0xa6, 0x5e,
-	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0x51, 0xf8, 0x45,
-	0x01, 0x65, 0xa4, 0x30,
+	0x00, 0x3f, 0x5a, 0x5c,
+	0xff, 0x65, 0xe0, 0x74,
+	0x40, 0x36, 0x6c, 0x00,
+	0x20, 0xa0, 0x9a, 0x6c,
+	0xff, 0xb9, 0xa4, 0x0c,
+	0xff, 0x6a, 0xa4, 0x04,
+	0xff, 0x65, 0xa6, 0x08,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0xec, 0x5d,
+	0x45, 0x6a, 0x0e, 0x5d,
+	0x01, 0x6a, 0xd0, 0x01,
+	0x09, 0x6a, 0xd6, 0x01,
+	0x80, 0xeb, 0xa6, 0x7c,
+	0x01, 0x6a, 0xd6, 0x01,
+	0x01, 0xe9, 0xa6, 0x34,
+	0x88, 0x6a, 0xcc, 0x00,
+	0x45, 0x6a, 0x0e, 0x5d,
+	0x01, 0x6a, 0x18, 0x01,
+	0xff, 0x6a, 0x1a, 0x09,
+	0xff, 0x6a, 0x1c, 0x09,
+	0x0d, 0x6a, 0x26, 0x01,
+	0x00, 0x65, 0x80, 0x5d,
+	0xff, 0x99, 0xa6, 0x0c,
+	0xff, 0x65, 0xa6, 0x08,
+	0xe0, 0x6a, 0xcc, 0x00,
+	0x45, 0x6a, 0x0e, 0x5d,
 	0x01, 0x6a, 0xd0, 0x01,
 	0x01, 0x6a, 0xdc, 0x05,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0xec, 0x5d,
-	0x01, 0x6a, 0xc6, 0x5d,
+	0x45, 0x6a, 0x0e, 0x5d,
+	0x01, 0x6a, 0x18, 0x01,
+	0xff, 0x6a, 0x1a, 0x09,
+	0xff, 0x6a, 0x1c, 0x09,
 	0x01, 0x6a, 0x26, 0x05,
 	0x01, 0x65, 0xd8, 0x31,
 	0x09, 0xee, 0xdc, 0x01,
-	0x80, 0xee, 0xb2, 0x7d,
+	0x80, 0xee, 0xd6, 0x7c,
 	0xff, 0x6a, 0xdc, 0x0d,
-	0x01, 0x65, 0x32, 0x31,
+	0xff, 0x65, 0x32, 0x09,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0x8e, 0x46,
-	0x81, 0x6a, 0xbe, 0x5e,
-	0x01, 0x0c, 0xbe, 0x7d,
-	0x04, 0x0c, 0xbc, 0x6d,
+	0x00, 0x65, 0x80, 0x45,
+	0xff, 0x37, 0xc8, 0x08,
+	0x02, 0x6a, 0x9c, 0x5c,
+	0xff, 0x53, 0xa4, 0x0c,
+	0xb1, 0x6a, 0x22, 0x01,
+	0x01, 0x0c, 0xe8, 0x7c,
+	0x04, 0x0c, 0xe6, 0x6c,
 	0xe0, 0x03, 0x06, 0x08,
-	0xe0, 0x03, 0x7e, 0x0c,
-	0x01, 0x65, 0x18, 0x31,
-	0xff, 0x6a, 0x1a, 0x09,
-	0xff, 0x6a, 0x1c, 0x0d,
-	0x01, 0x8c, 0x10, 0x30,
-	0x01, 0x8d, 0x12, 0x30,
-	0x01, 0x8e, 0x14, 0x34,
-	0x01, 0x6c, 0xda, 0x30,
-	0x01, 0x6c, 0xda, 0x30,
-	0x01, 0x6c, 0xda, 0x30,
-	0x01, 0x6c, 0xda, 0x30,
-	0x01, 0x6c, 0xda, 0x30,
-	0x01, 0x6c, 0xda, 0x30,
-	0x01, 0x6c, 0xda, 0x30,
-	0x01, 0x6c, 0xda, 0x34,
-	0x3d, 0x64, 0xa4, 0x28,
+	0xe0, 0x03, 0x7a, 0x0c,
+	0xff, 0x8c, 0x10, 0x08,
+	0xff, 0x8d, 0x12, 0x08,
+	0xff, 0x8e, 0x14, 0x0c,
+	0xff, 0x6c, 0xda, 0x08,
+	0xff, 0x6c, 0xda, 0x08,
+	0xff, 0x6c, 0xda, 0x08,
+	0xff, 0x6c, 0xda, 0x08,
+	0xff, 0x6c, 0xda, 0x08,
+	0xff, 0x6c, 0xda, 0x08,
+	0xff, 0x6c, 0xda, 0x0c,
+	0x3d, 0x64, 0xa6, 0x28,
 	0x55, 0x64, 0xc8, 0x28,
-	0x00, 0x65, 0xec, 0x45,
-	0x2e, 0x64, 0xa4, 0x28,
+	0x00, 0x65, 0x0e, 0x45,
+	0x2e, 0x64, 0xa6, 0x28,
 	0x66, 0x64, 0xc8, 0x28,
 	0x00, 0x6c, 0xda, 0x18,
-	0x01, 0x52, 0xc8, 0x30,
+	0xff, 0x53, 0xc8, 0x08,
 	0x00, 0x6c, 0xda, 0x20,
 	0xff, 0x6a, 0xc8, 0x08,
 	0x00, 0x6c, 0xda, 0x20,
 	0x00, 0x6c, 0xda, 0x24,
-	0x01, 0x65, 0xc8, 0x30,
+	0xff, 0x65, 0xc8, 0x08,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x44, 0x6a, 0xe8, 0x5d,
-	0x01, 0x90, 0xe2, 0x31,
-	0x04, 0x3b, 0x0c, 0x7e,
+	0x41, 0x6a, 0x0a, 0x5d,
+	0xff, 0x90, 0xe2, 0x09,
+	0x04, 0x35, 0x2c, 0x7d,
 	0x30, 0x6a, 0xd0, 0x01,
-	0x20, 0x6a, 0xd0, 0x01,
 	0x1d, 0x6a, 0xdc, 0x01,
-	0xdc, 0xee, 0x08, 0x66,
-	0x00, 0x65, 0x24, 0x46,
-	0x20, 0x6a, 0xd0, 0x01,
+	0xdc, 0xee, 0x28, 0x65,
+	0x00, 0x65, 0x3a, 0x45,
+	0x1c, 0x6a, 0xd0, 0x01,
 	0x01, 0x6a, 0xdc, 0x01,
-	0x20, 0xa0, 0xd8, 0x31,
+	0x1c, 0xa0, 0xd8, 0x31,
 	0x09, 0xee, 0xdc, 0x01,
-	0x80, 0xee, 0x14, 0x7e,
-	0x11, 0x6a, 0xdc, 0x01,
-	0x50, 0xee, 0x18, 0x66,
-	0x20, 0x6a, 0xd0, 0x01,
-	0x09, 0x6a, 0xdc, 0x01,
-	0x88, 0xee, 0x1e, 0x66,
+	0x80, 0xee, 0x34, 0x7d,
 	0x19, 0x6a, 0xdc, 0x01,
-	0xd8, 0xee, 0x22, 0x66,
+	0xd8, 0xee, 0x38, 0x65,
 	0xff, 0x6a, 0xdc, 0x09,
-	0x18, 0xee, 0x26, 0x6e,
+	0x18, 0xee, 0x3c, 0x6d,
 	0xff, 0x6a, 0xd4, 0x0c,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x44, 0x6a, 0xe8, 0x5d,
-	0x20, 0x6a, 0xc6, 0x5d,
-	0x01, 0x3b, 0x26, 0x31,
-	0x04, 0x3b, 0x40, 0x6e,
+	0x41, 0x6a, 0x0a, 0x5d,
+	0x1c, 0x6a, 0x18, 0x01,
+	0xff, 0x6a, 0x1a, 0x09,
+	0xff, 0x6a, 0x1c, 0x09,
+	0xff, 0x35, 0x26, 0x09,
+	0x04, 0x35, 0x64, 0x6d,
 	0xa0, 0x6a, 0xca, 0x00,
-	0x20, 0x65, 0xc8, 0x18,
-	0x00, 0x65, 0x7e, 0x5e,
-	0x00, 0x65, 0x38, 0x66,
+	0x1c, 0x65, 0xc8, 0x18,
+	0xff, 0x6c, 0x32, 0x09,
+	0xff, 0x6c, 0x32, 0x09,
+	0xff, 0x6c, 0x32, 0x09,
+	0xff, 0x6c, 0x32, 0x09,
+	0xff, 0x6c, 0x32, 0x09,
+	0xff, 0x6c, 0x32, 0x09,
+	0xff, 0x6c, 0x32, 0x09,
+	0x00, 0x65, 0x52, 0x65,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0x8e, 0x46,
-	0xa0, 0x6a, 0xcc, 0x00,
-	0xff, 0x6a, 0xc8, 0x08,
-	0x20, 0x94, 0x44, 0x6e,
-	0x10, 0x94, 0x46, 0x6e,
-	0x08, 0x94, 0x60, 0x6e,
-	0x08, 0x94, 0x60, 0x6e,
-	0x08, 0x94, 0x60, 0x6e,
-	0xff, 0x8c, 0xc8, 0x10,
-	0xc1, 0x64, 0xc8, 0x18,
-	0xf8, 0x64, 0xc8, 0x08,
-	0x01, 0x99, 0xda, 0x30,
-	0x00, 0x66, 0x54, 0x66,
-	0xc0, 0x66, 0x90, 0x76,
-	0x60, 0x66, 0xc8, 0x18,
-	0x3d, 0x64, 0xc8, 0x28,
-	0x00, 0x65, 0x44, 0x46,
-	0xf7, 0x93, 0x26, 0x09,
-	0x08, 0x93, 0x62, 0x6e,
-	0x00, 0x62, 0xc4, 0x18,
-	0x00, 0x65, 0x8e, 0x5e,
-	0x00, 0x65, 0x6e, 0x5e,
-	0x00, 0x65, 0x6e, 0x5e,
-	0x00, 0x65, 0x6e, 0x5e,
-	0x01, 0x99, 0xda, 0x30,
-	0x01, 0x99, 0xda, 0x30,
-	0x01, 0x99, 0xda, 0x30,
-	0x01, 0x99, 0xda, 0x30,
-	0x01, 0x99, 0xda, 0x30,
-	0x01, 0x99, 0xda, 0x30,
-	0x01, 0x99, 0xda, 0x30,
-	0x01, 0x99, 0xda, 0x34,
-	0x01, 0x6c, 0x32, 0x31,
-	0x01, 0x6c, 0x32, 0x31,
-	0x01, 0x6c, 0x32, 0x31,
-	0x01, 0x6c, 0x32, 0x31,
-	0x01, 0x6c, 0x32, 0x31,
-	0x01, 0x6c, 0x32, 0x31,
-	0x01, 0x6c, 0x32, 0x31,
-	0x01, 0x6c, 0x32, 0x35,
-	0x08, 0x94, 0x8e, 0x7e,
+	0x00, 0x65, 0x80, 0x5d,
+	0x04, 0x35, 0x54, 0x7c,
+	0xa0, 0x6a, 0x70, 0x5d,
+	0x00, 0x65, 0x72, 0x5d,
+	0x00, 0x65, 0x72, 0x5d,
+	0x00, 0x65, 0x72, 0x45,
+	0xff, 0x65, 0xcc, 0x08,
+	0xff, 0x99, 0xda, 0x08,
+	0xff, 0x99, 0xda, 0x08,
+	0xff, 0x99, 0xda, 0x08,
+	0xff, 0x99, 0xda, 0x08,
+	0xff, 0x99, 0xda, 0x08,
+	0xff, 0x99, 0xda, 0x08,
+	0xff, 0x99, 0xda, 0x0c,
+	0x08, 0x94, 0x80, 0x7d,
 	0xf7, 0x93, 0x26, 0x09,
-	0x08, 0x93, 0x92, 0x6e,
+	0x08, 0x93, 0x84, 0x6d,
 	0xff, 0x6a, 0xd4, 0x0c,
-	0x04, 0xb8, 0xba, 0x6e,
-	0x01, 0x42, 0x7e, 0x31,
-	0xff, 0x6a, 0x76, 0x01,
-	0x01, 0x90, 0x84, 0x34,
-	0xff, 0x6a, 0x76, 0x05,
-	0x01, 0x85, 0x0a, 0x01,
-	0x7f, 0x65, 0x10, 0x09,
-	0xfe, 0x85, 0x0a, 0x0d,
-	0xff, 0x42, 0xb6, 0x66,
-	0xff, 0x41, 0xae, 0x66,
-	0xd1, 0x6a, 0xbe, 0x5e,
+	0xff, 0x40, 0x74, 0x09,
+	0xff, 0x6a, 0x72, 0x01,
+	0xff, 0x90, 0x80, 0x0c,
+	0xff, 0x6a, 0x72, 0x05,
+	0xff, 0x40, 0x9e, 0x65,
+	0xff, 0x3f, 0x96, 0x65,
 	0xff, 0x6a, 0xca, 0x04,
-	0x01, 0x41, 0x20, 0x31,
-	0x01, 0xbf, 0x82, 0x30,
-	0x01, 0x6a, 0x76, 0x00,
-	0x00, 0xbb, 0xf8, 0x45,
-	0x01, 0x42, 0x20, 0x31,
-	0x01, 0xbf, 0x84, 0x34,
-	0x01, 0x41, 0x7e, 0x31,
-	0x01, 0x90, 0x82, 0x34,
-	0x01, 0x65, 0x22, 0x31,
-	0xff, 0x6a, 0xd4, 0x08,
-	0xff, 0x6a, 0xd4, 0x0c
+	0xff, 0x3f, 0x20, 0x09,
+	0x01, 0x6a, 0x6a, 0x00,
+	0x00, 0xb9, 0x1a, 0x5d,
+	0xff, 0xba, 0x7e, 0x0c,
+	0xff, 0x40, 0x20, 0x09,
+	0xff, 0xba, 0x80, 0x0c,
+	0xff, 0x3f, 0x74, 0x09,
+	0xff, 0x90, 0x7e, 0x0c,
 };
 
-static int ahc_patch23_func(struct ahc_softc *ahc);
-
-static int
-ahc_patch23_func(struct ahc_softc *ahc)
-{
-	return ((ahc->bugs & AHC_SCBCHAN_UPLOAD_BUG) != 0);
-}
-
-static int ahc_patch22_func(struct ahc_softc *ahc);
-
-static int
-ahc_patch22_func(struct ahc_softc *ahc)
-{
-	return ((ahc->features & AHC_CMD_CHAN) == 0);
-}
-
-static int ahc_patch21_func(struct ahc_softc *ahc);
-
-static int
-ahc_patch21_func(struct ahc_softc *ahc)
-{
-	return ((ahc->features & AHC_QUEUE_REGS) == 0);
-}
-
-static int ahc_patch20_func(struct ahc_softc *ahc);
-
-static int
-ahc_patch20_func(struct ahc_softc *ahc)
-{
-	return ((ahc->features & AHC_WIDE) != 0);
-}
-
-static int ahc_patch19_func(struct ahc_softc *ahc);
-
-static int
-ahc_patch19_func(struct ahc_softc *ahc)
-{
-	return ((ahc->flags & AHC_SCB_BTT) != 0);
-}
-
-static int ahc_patch18_func(struct ahc_softc *ahc);
-
-static int
-ahc_patch18_func(struct ahc_softc *ahc)
-{
-	return ((ahc->bugs & AHC_PCI_2_1_RETRY_BUG) != 0);
-}
-
-static int ahc_patch17_func(struct ahc_softc *ahc);
-
-static int
-ahc_patch17_func(struct ahc_softc *ahc)
-{
-	return ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0);
-}
-
 static int ahc_patch16_func(struct ahc_softc *ahc);
 
 static int
 ahc_patch16_func(struct ahc_softc *ahc)
 {
-	return ((ahc->bugs & AHC_AUTOFLUSH_BUG) != 0);
+	return ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7895);
 }
 
 static int ahc_patch15_func(struct ahc_softc *ahc);
@@ -944,7 +740,7 @@ static int ahc_patch15_func(struct ahc_softc *ahc);
 static int
 ahc_patch15_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_ULTRA2) == 0);
+	return ((ahc->features & AHC_WIDE) != 0);
 }
 
 static int ahc_patch14_func(struct ahc_softc *ahc);
@@ -952,7 +748,7 @@ static int ahc_patch14_func(struct ahc_softc *ahc);
 static int
 ahc_patch14_func(struct ahc_softc *ahc)
 {
-	return ((ahc->bugs & AHC_PCI_MWI_BUG) != 0 && ahc->pci_cachesize != 0);
+	return ((ahc->features & AHC_CMD_CHAN) == 0);
 }
 
 static int ahc_patch13_func(struct ahc_softc *ahc);
@@ -960,7 +756,7 @@ static int ahc_patch13_func(struct ahc_softc *ahc);
 static int
 ahc_patch13_func(struct ahc_softc *ahc)
 {
-	return ((ahc->flags & AHC_39BIT_ADDRESSING) != 0);
+	return ((ahc->features & AHC_ULTRA2) == 0);
 }
 
 static int ahc_patch12_func(struct ahc_softc *ahc);
@@ -968,7 +764,7 @@ static int ahc_patch12_func(struct ahc_softc *ahc);
 static int
 ahc_patch12_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_ULTRA) != 0);
+	return ((ahc->features & AHC_HS_MAILBOX) != 0);
 }
 
 static int ahc_patch11_func(struct ahc_softc *ahc);
@@ -976,7 +772,7 @@ static int ahc_patch11_func(struct ahc_softc *ahc);
 static int
 ahc_patch11_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_HS_MAILBOX) != 0);
+	return ((ahc->features & AHC_MULTI_TID) != 0);
 }
 
 static int ahc_patch10_func(struct ahc_softc *ahc);
@@ -984,7 +780,7 @@ static int ahc_patch10_func(struct ahc_softc *ahc);
 static int
 ahc_patch10_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_MULTI_TID) != 0);
+	return ((ahc->flags & AHC_INITIATORMODE) != 0);
 }
 
 static int ahc_patch9_func(struct ahc_softc *ahc);
@@ -992,7 +788,7 @@ static int ahc_patch9_func(struct ahc_softc *ahc);
 static int
 ahc_patch9_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_CMD_CHAN) != 0);
+	return ((ahc->features & AHC_ULTRA) != 0);
 }
 
 static int ahc_patch8_func(struct ahc_softc *ahc);
@@ -1000,7 +796,7 @@ static int ahc_patch8_func(struct ahc_softc *ahc);
 static int
 ahc_patch8_func(struct ahc_softc *ahc)
 {
-	return ((ahc->flags & AHC_INITIATORROLE) != 0);
+	return ((ahc->features & AHC_ULTRA2) != 0);
 }
 
 static int ahc_patch7_func(struct ahc_softc *ahc);
@@ -1008,7 +804,7 @@ static int ahc_patch7_func(struct ahc_softc *ahc);
 static int
 ahc_patch7_func(struct ahc_softc *ahc)
 {
-	return ((ahc->flags & AHC_TARGETROLE) != 0);
+	return ((ahc->flags & AHC_TARGETMODE) != 0);
 }
 
 static int ahc_patch6_func(struct ahc_softc *ahc);
@@ -1016,7 +812,7 @@ static int ahc_patch6_func(struct ahc_softc *ahc);
 static int
 ahc_patch6_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_DT) == 0);
+	return ((ahc->flags & AHC_PAGESCBS) == 0);
 }
 
 static int ahc_patch5_func(struct ahc_softc *ahc);
@@ -1024,7 +820,7 @@ static int ahc_patch5_func(struct ahc_softc *ahc);
 static int
 ahc_patch5_func(struct ahc_softc *ahc)
 {
-	return ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0);
+	return ((ahc->flags & AHC_PAGESCBS) != 0);
 }
 
 static int ahc_patch4_func(struct ahc_softc *ahc);
@@ -1032,7 +828,7 @@ static int ahc_patch4_func(struct ahc_softc *ahc);
 static int
 ahc_patch4_func(struct ahc_softc *ahc)
 {
-	return ((ahc->flags & AHC_PAGESCBS) != 0);
+	return ((ahc->features & AHC_QUEUE_REGS) != 0);
 }
 
 static int ahc_patch3_func(struct ahc_softc *ahc);
@@ -1040,7 +836,7 @@ static int ahc_patch3_func(struct ahc_softc *ahc);
 static int
 ahc_patch3_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_QUEUE_REGS) != 0);
+	return ((ahc->features & AHC_TWIN) != 0);
 }
 
 static int ahc_patch2_func(struct ahc_softc *ahc);
@@ -1048,7 +844,7 @@ static int ahc_patch2_func(struct ahc_softc *ahc);
 static int
 ahc_patch2_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_TWIN) != 0);
+	return ((ahc->features & AHC_QUEUE_REGS) == 0);
 }
 
 static int ahc_patch1_func(struct ahc_softc *ahc);
@@ -1056,7 +852,7 @@ static int ahc_patch1_func(struct ahc_softc *ahc);
 static int
 ahc_patch1_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_ULTRA2) != 0);
+	return ((ahc->features & AHC_CMD_CHAN) != 0);
 }
 
 static int ahc_patch0_func(struct ahc_softc *ahc);
@@ -1067,228 +863,146 @@ ahc_patch0_func(struct ahc_softc *ahc)
 	return (0);
 }
 
-typedef int patch_func_t(struct ahc_softc *);
+typedef int patch_func_t __P((struct ahc_softc *));
 struct patch {
 	patch_func_t	*patch_func;
 	u_int32_t	begin	   :10,
 			skip_instr :10,
 			skip_patch :12;
 } patches[] = {
-	{ ahc_patch1_func, 4, 1, 1 },
-	{ ahc_patch2_func, 6, 2, 1 },
+	{ ahc_patch1_func, 4, 2, 1 },
+	{ ahc_patch2_func, 8, 1, 1 },
 	{ ahc_patch2_func, 9, 1, 1 },
-	{ ahc_patch3_func, 11, 1, 2 },
-	{ ahc_patch0_func, 12, 2, 1 },
-	{ ahc_patch4_func, 15, 1, 2 },
-	{ ahc_patch0_func, 16, 1, 1 },
-	{ ahc_patch5_func, 22, 2, 1 },
-	{ ahc_patch3_func, 27, 1, 2 },
-	{ ahc_patch0_func, 28, 1, 1 },
-	{ ahc_patch6_func, 34, 1, 1 },
-	{ ahc_patch7_func, 37, 62, 21 },
-	{ ahc_patch8_func, 37, 1, 1 },
-	{ ahc_patch9_func, 42, 3, 2 },
-	{ ahc_patch0_func, 45, 3, 1 },
-	{ ahc_patch10_func, 49, 1, 2 },
-	{ ahc_patch0_func, 50, 2, 3 },
-	{ ahc_patch1_func, 50, 1, 2 },
-	{ ahc_patch0_func, 51, 1, 1 },
-	{ ahc_patch2_func, 53, 2, 1 },
-	{ ahc_patch9_func, 55, 1, 2 },
-	{ ahc_patch0_func, 56, 1, 1 },
-	{ ahc_patch9_func, 60, 1, 2 },
+	{ ahc_patch3_func, 12, 4, 1 },
+	{ ahc_patch4_func, 17, 3, 2 },
+	{ ahc_patch0_func, 20, 4, 1 },
+	{ ahc_patch5_func, 24, 1, 1 },
+	{ ahc_patch6_func, 27, 1, 1 },
+	{ ahc_patch1_func, 30, 1, 2 },
+	{ ahc_patch0_func, 31, 3, 1 },
+	{ ahc_patch3_func, 40, 4, 1 },
+	{ ahc_patch7_func, 45, 5, 3 },
+	{ ahc_patch8_func, 46, 1, 2 },
+	{ ahc_patch0_func, 47, 1, 1 },
+	{ ahc_patch8_func, 50, 3, 2 },
+	{ ahc_patch0_func, 53, 3, 1 },
+	{ ahc_patch9_func, 58, 2, 1 },
+	{ ahc_patch8_func, 60, 1, 2 },
 	{ ahc_patch0_func, 61, 1, 1 },
-	{ ahc_patch9_func, 70, 1, 2 },
-	{ ahc_patch0_func, 71, 1, 1 },
-	{ ahc_patch9_func, 74, 1, 2 },
-	{ ahc_patch0_func, 75, 1, 1 },
-	{ ahc_patch11_func, 85, 1, 2 },
-	{ ahc_patch0_func, 86, 1, 1 },
-	{ ahc_patch9_func, 94, 1, 2 },
-	{ ahc_patch0_func, 95, 1, 1 },
-	{ ahc_patch8_func, 99, 9, 4 },
-	{ ahc_patch1_func, 101, 1, 2 },
-	{ ahc_patch0_func, 102, 1, 1 },
-	{ ahc_patch2_func, 104, 2, 1 },
-	{ ahc_patch2_func, 113, 4, 1 },
-	{ ahc_patch1_func, 117, 1, 2 },
-	{ ahc_patch0_func, 118, 2, 3 },
-	{ ahc_patch2_func, 118, 1, 2 },
-	{ ahc_patch0_func, 119, 1, 1 },
-	{ ahc_patch7_func, 120, 4, 2 },
-	{ ahc_patch0_func, 124, 1, 1 },
-	{ ahc_patch12_func, 126, 2, 1 },
-	{ ahc_patch1_func, 128, 1, 2 },
-	{ ahc_patch0_func, 129, 1, 1 },
-	{ ahc_patch7_func, 130, 4, 1 },
-	{ ahc_patch7_func, 141, 80, 9 },
-	{ ahc_patch4_func, 159, 1, 1 },
-	{ ahc_patch1_func, 172, 1, 1 },
-	{ ahc_patch9_func, 180, 1, 2 },
-	{ ahc_patch0_func, 181, 1, 1 },
-	{ ahc_patch9_func, 190, 1, 2 },
-	{ ahc_patch0_func, 191, 1, 1 },
-	{ ahc_patch9_func, 207, 6, 2 },
-	{ ahc_patch0_func, 213, 6, 1 },
-	{ ahc_patch8_func, 221, 18, 2 },
-	{ ahc_patch1_func, 234, 1, 1 },
-	{ ahc_patch1_func, 241, 1, 2 },
-	{ ahc_patch0_func, 242, 2, 2 },
-	{ ahc_patch12_func, 243, 1, 1 },
-	{ ahc_patch9_func, 251, 31, 3 },
-	{ ahc_patch1_func, 267, 14, 2 },
-	{ ahc_patch13_func, 272, 1, 1 },
-	{ ahc_patch14_func, 282, 14, 1 },
-	{ ahc_patch1_func, 298, 1, 2 },
-	{ ahc_patch0_func, 299, 1, 1 },
-	{ ahc_patch9_func, 302, 1, 1 },
-	{ ahc_patch13_func, 307, 1, 1 },
-	{ ahc_patch9_func, 308, 2, 2 },
-	{ ahc_patch0_func, 310, 4, 1 },
-	{ ahc_patch14_func, 314, 1, 1 },
-	{ ahc_patch15_func, 317, 2, 3 },
-	{ ahc_patch9_func, 317, 1, 2 },
-	{ ahc_patch0_func, 318, 1, 1 },
-	{ ahc_patch6_func, 323, 1, 2 },
-	{ ahc_patch0_func, 324, 1, 1 },
-	{ ahc_patch1_func, 328, 50, 11 },
-	{ ahc_patch6_func, 337, 2, 4 },
-	{ ahc_patch7_func, 337, 1, 1 },
-	{ ahc_patch8_func, 338, 1, 1 },
-	{ ahc_patch0_func, 339, 1, 1 },
-	{ ahc_patch16_func, 340, 1, 1 },
-	{ ahc_patch6_func, 359, 6, 3 },
-	{ ahc_patch16_func, 359, 5, 1 },
-	{ ahc_patch0_func, 365, 5, 1 },
-	{ ahc_patch13_func, 373, 5, 1 },
-	{ ahc_patch0_func, 378, 54, 17 },
-	{ ahc_patch14_func, 378, 1, 1 },
-	{ ahc_patch7_func, 380, 2, 2 },
-	{ ahc_patch17_func, 381, 1, 1 },
-	{ ahc_patch9_func, 384, 1, 1 },
-	{ ahc_patch18_func, 391, 1, 1 },
-	{ ahc_patch14_func, 396, 9, 3 },
-	{ ahc_patch9_func, 397, 3, 2 },
-	{ ahc_patch0_func, 400, 3, 1 },
-	{ ahc_patch9_func, 408, 6, 2 },
-	{ ahc_patch0_func, 414, 9, 2 },
-	{ ahc_patch13_func, 414, 1, 1 },
-	{ ahc_patch13_func, 423, 2, 1 },
-	{ ahc_patch14_func, 425, 1, 1 },
-	{ ahc_patch9_func, 427, 1, 2 },
-	{ ahc_patch0_func, 428, 1, 1 },
-	{ ahc_patch7_func, 431, 1, 1 },
-	{ ahc_patch7_func, 432, 1, 1 },
-	{ ahc_patch8_func, 433, 3, 3 },
-	{ ahc_patch6_func, 434, 1, 2 },
-	{ ahc_patch0_func, 435, 1, 1 },
-	{ ahc_patch9_func, 436, 1, 1 },
-	{ ahc_patch15_func, 437, 1, 2 },
-	{ ahc_patch13_func, 437, 1, 1 },
-	{ ahc_patch14_func, 439, 9, 4 },
-	{ ahc_patch9_func, 439, 1, 1 },
-	{ ahc_patch9_func, 446, 2, 1 },
-	{ ahc_patch0_func, 448, 4, 3 },
-	{ ahc_patch9_func, 448, 1, 2 },
-	{ ahc_patch0_func, 449, 3, 1 },
-	{ ahc_patch1_func, 453, 2, 1 },
-	{ ahc_patch7_func, 455, 5, 2 },
-	{ ahc_patch0_func, 460, 1, 1 },
-	{ ahc_patch8_func, 461, 109, 23 },
-	{ ahc_patch1_func, 463, 3, 2 },
-	{ ahc_patch0_func, 466, 5, 3 },
-	{ ahc_patch9_func, 466, 2, 2 },
-	{ ahc_patch0_func, 468, 3, 1 },
-	{ ahc_patch1_func, 473, 2, 2 },
-	{ ahc_patch0_func, 475, 6, 3 },
-	{ ahc_patch9_func, 475, 2, 2 },
-	{ ahc_patch0_func, 477, 3, 1 },
-	{ ahc_patch1_func, 483, 2, 2 },
-	{ ahc_patch0_func, 485, 9, 7 },
-	{ ahc_patch9_func, 485, 5, 6 },
-	{ ahc_patch19_func, 485, 1, 2 },
-	{ ahc_patch0_func, 486, 1, 1 },
-	{ ahc_patch19_func, 488, 1, 2 },
-	{ ahc_patch0_func, 489, 1, 1 },
-	{ ahc_patch0_func, 490, 4, 1 },
-	{ ahc_patch6_func, 494, 3, 2 },
-	{ ahc_patch0_func, 497, 1, 1 },
-	{ ahc_patch1_func, 500, 1, 1 },
-	{ ahc_patch6_func, 506, 1, 2 },
-	{ ahc_patch0_func, 507, 1, 1 },
-	{ ahc_patch20_func, 544, 7, 1 },
-	{ ahc_patch3_func, 572, 1, 2 },
-	{ ahc_patch0_func, 573, 1, 1 },
-	{ ahc_patch21_func, 576, 1, 1 },
-	{ ahc_patch8_func, 578, 104, 33 },
-	{ ahc_patch4_func, 579, 1, 1 },
-	{ ahc_patch1_func, 585, 2, 2 },
-	{ ahc_patch0_func, 587, 1, 1 },
-	{ ahc_patch1_func, 590, 1, 2 },
-	{ ahc_patch0_func, 591, 1, 1 },
-	{ ahc_patch9_func, 592, 3, 3 },
-	{ ahc_patch15_func, 593, 1, 1 },
-	{ ahc_patch0_func, 595, 4, 1 },
-	{ ahc_patch19_func, 603, 2, 2 },
-	{ ahc_patch0_func, 605, 1, 1 },
-	{ ahc_patch19_func, 609, 10, 3 },
-	{ ahc_patch5_func, 611, 8, 1 },
-	{ ahc_patch0_func, 619, 9, 2 },
-	{ ahc_patch5_func, 620, 8, 1 },
-	{ ahc_patch4_func, 630, 1, 2 },
-	{ ahc_patch0_func, 631, 1, 1 },
-	{ ahc_patch19_func, 632, 1, 2 },
-	{ ahc_patch0_func, 633, 3, 2 },
-	{ ahc_patch4_func, 635, 1, 1 },
-	{ ahc_patch5_func, 636, 1, 1 },
-	{ ahc_patch5_func, 639, 1, 1 },
-	{ ahc_patch5_func, 641, 1, 1 },
-	{ ahc_patch4_func, 643, 2, 2 },
-	{ ahc_patch0_func, 645, 2, 1 },
-	{ ahc_patch5_func, 647, 1, 1 },
-	{ ahc_patch5_func, 650, 1, 1 },
-	{ ahc_patch5_func, 653, 1, 1 },
-	{ ahc_patch19_func, 657, 1, 1 },
-	{ ahc_patch19_func, 660, 1, 1 },
-	{ ahc_patch4_func, 666, 1, 1 },
-	{ ahc_patch6_func, 669, 1, 2 },
-	{ ahc_patch0_func, 670, 1, 1 },
-	{ ahc_patch7_func, 682, 16, 1 },
-	{ ahc_patch4_func, 698, 20, 1 },
-	{ ahc_patch9_func, 719, 4, 2 },
-	{ ahc_patch0_func, 723, 4, 1 },
-	{ ahc_patch9_func, 727, 4, 2 },
-	{ ahc_patch0_func, 731, 3, 1 },
-	{ ahc_patch6_func, 737, 1, 1 },
-	{ ahc_patch22_func, 739, 14, 1 },
-	{ ahc_patch7_func, 753, 3, 1 },
-	{ ahc_patch9_func, 765, 24, 8 },
-	{ ahc_patch19_func, 769, 1, 2 },
-	{ ahc_patch0_func, 770, 1, 1 },
-	{ ahc_patch15_func, 775, 4, 2 },
-	{ ahc_patch0_func, 779, 7, 3 },
-	{ ahc_patch23_func, 779, 5, 2 },
-	{ ahc_patch0_func, 784, 2, 1 },
-	{ ahc_patch0_func, 789, 42, 3 },
-	{ ahc_patch18_func, 801, 18, 2 },
-	{ ahc_patch0_func, 819, 1, 1 },
-	{ ahc_patch4_func, 843, 1, 1 },
-	{ ahc_patch4_func, 844, 3, 2 },
-	{ ahc_patch0_func, 847, 1, 1 },
-	{ ahc_patch13_func, 848, 3, 1 },
-	{ ahc_patch4_func, 851, 12, 1 }
-};
-struct cs {
-        u_int16_t       begin;
-        u_int16_t       end;
-} critical_sections[] = {
-	{ 11, 18 },
-	{ 21, 30 },
-	{ 698, 714 },
-	{ 844, 847 },
-	{ 851, 857 },
-	{ 859, 861 },
-	{ 861, 863 }
+	{ ahc_patch7_func, 64, 65, 26 },
+	{ ahc_patch10_func, 64, 1, 1 },
+	{ ahc_patch1_func, 69, 3, 2 },
+	{ ahc_patch0_func, 72, 3, 1 },
+	{ ahc_patch1_func, 76, 1, 2 },
+	{ ahc_patch0_func, 77, 1, 1 },
+	{ ahc_patch1_func, 78, 3, 6 },
+	{ ahc_patch11_func, 78, 1, 2 },
+	{ ahc_patch0_func, 79, 2, 3 },
+	{ ahc_patch8_func, 79, 1, 2 },
+	{ ahc_patch0_func, 80, 1, 1 },
+	{ ahc_patch0_func, 81, 3, 5 },
+	{ ahc_patch11_func, 81, 1, 2 },
+	{ ahc_patch0_func, 82, 2, 3 },
+	{ ahc_patch8_func, 82, 1, 2 },
+	{ ahc_patch0_func, 83, 1, 1 },
+	{ ahc_patch1_func, 88, 1, 2 },
+	{ ahc_patch0_func, 89, 1, 1 },
+	{ ahc_patch1_func, 98, 1, 2 },
+	{ ahc_patch0_func, 99, 1, 1 },
+	{ ahc_patch1_func, 102, 1, 2 },
+	{ ahc_patch0_func, 103, 1, 1 },
+	{ ahc_patch12_func, 111, 1, 2 },
+	{ ahc_patch0_func, 112, 1, 1 },
+	{ ahc_patch1_func, 120, 1, 2 },
+	{ ahc_patch0_func, 121, 1, 1 },
+	{ ahc_patch10_func, 129, 7, 2 },
+	{ ahc_patch3_func, 130, 2, 1 },
+	{ ahc_patch7_func, 141, 85, 8 },
+	{ ahc_patch5_func, 156, 1, 1 },
+	{ ahc_patch1_func, 178, 1, 2 },
+	{ ahc_patch0_func, 179, 1, 1 },
+	{ ahc_patch1_func, 188, 1, 2 },
+	{ ahc_patch0_func, 189, 1, 1 },
+	{ ahc_patch1_func, 210, 6, 2 },
+	{ ahc_patch0_func, 216, 8, 1 },
+	{ ahc_patch10_func, 226, 20, 1 },
+	{ ahc_patch8_func, 247, 1, 2 },
+	{ ahc_patch0_func, 248, 2, 1 },
+	{ ahc_patch8_func, 252, 2, 2 },
+	{ ahc_patch0_func, 254, 3, 3 },
+	{ ahc_patch1_func, 254, 1, 2 },
+	{ ahc_patch0_func, 255, 2, 1 },
+	{ ahc_patch8_func, 259, 1, 2 },
+	{ ahc_patch0_func, 260, 1, 1 },
+	{ ahc_patch1_func, 264, 1, 1 },
+	{ ahc_patch1_func, 267, 1, 2 },
+	{ ahc_patch0_func, 268, 2, 1 },
+	{ ahc_patch13_func, 271, 2, 3 },
+	{ ahc_patch1_func, 271, 1, 2 },
+	{ ahc_patch0_func, 272, 1, 1 },
+	{ ahc_patch1_func, 273, 1, 2 },
+	{ ahc_patch0_func, 274, 2, 1 },
+	{ ahc_patch8_func, 279, 1, 2 },
+	{ ahc_patch0_func, 280, 4, 3 },
+	{ ahc_patch1_func, 280, 1, 2 },
+	{ ahc_patch0_func, 281, 3, 1 },
+	{ ahc_patch8_func, 285, 1, 2 },
+	{ ahc_patch0_func, 286, 3, 2 },
+	{ ahc_patch7_func, 286, 2, 1 },
+	{ ahc_patch8_func, 289, 5, 2 },
+	{ ahc_patch0_func, 294, 1, 1 },
+	{ ahc_patch1_func, 301, 13, 2 },
+	{ ahc_patch0_func, 314, 8, 1 },
+	{ ahc_patch13_func, 324, 2, 3 },
+	{ ahc_patch1_func, 324, 1, 2 },
+	{ ahc_patch0_func, 325, 1, 1 },
+	{ ahc_patch7_func, 329, 1, 1 },
+	{ ahc_patch8_func, 332, 2, 1 },
+	{ ahc_patch8_func, 334, 1, 1 },
+	{ ahc_patch1_func, 335, 1, 2 },
+	{ ahc_patch0_func, 336, 3, 1 },
+	{ ahc_patch8_func, 340, 1, 1 },
+	{ ahc_patch7_func, 341, 5, 1 },
+	{ ahc_patch8_func, 347, 2, 1 },
+	{ ahc_patch8_func, 352, 13, 1 },
+	{ ahc_patch10_func, 365, 96, 13 },
+	{ ahc_patch1_func, 366, 11, 5 },
+	{ ahc_patch13_func, 368, 1, 1 },
+	{ ahc_patch8_func, 372, 1, 2 },
+	{ ahc_patch0_func, 373, 1, 1 },
+	{ ahc_patch0_func, 377, 4, 1 },
+	{ ahc_patch13_func, 381, 2, 3 },
+	{ ahc_patch14_func, 381, 1, 1 },
+	{ ahc_patch0_func, 383, 1, 1 },
+	{ ahc_patch12_func, 399, 3, 1 },
+	{ ahc_patch3_func, 403, 2, 2 },
+	{ ahc_patch0_func, 405, 2, 2 },
+	{ ahc_patch15_func, 405, 2, 1 },
+	{ ahc_patch4_func, 463, 1, 2 },
+	{ ahc_patch0_func, 464, 1, 1 },
+	{ ahc_patch2_func, 467, 1, 1 },
+	{ ahc_patch10_func, 469, 58, 6 },
+	{ ahc_patch1_func, 473, 3, 2 },
+	{ ahc_patch0_func, 476, 5, 1 },
+	{ ahc_patch15_func, 484, 1, 2 },
+	{ ahc_patch0_func, 485, 1, 1 },
+	{ ahc_patch5_func, 490, 1, 1 },
+	{ ahc_patch7_func, 527, 16, 1 },
+	{ ahc_patch13_func, 552, 1, 1 },
+	{ ahc_patch1_func, 591, 7, 2 },
+	{ ahc_patch0_func, 598, 8, 1 },
+	{ ahc_patch1_func, 607, 4, 2 },
+	{ ahc_patch0_func, 611, 6, 1 },
+	{ ahc_patch1_func, 617, 4, 2 },
+	{ ahc_patch0_func, 621, 3, 1 },
+	{ ahc_patch14_func, 632, 10, 1 },
+	{ ahc_patch7_func, 642, 3, 1 },
+	{ ahc_patch1_func, 654, 18, 4 },
+	{ ahc_patch16_func, 663, 4, 2 },
+	{ ahc_patch0_func, 667, 2, 1 },
+	{ ahc_patch0_func, 672, 32, 1 },
+	{ ahc_patch5_func, 708, 3, 2 },
+	{ ahc_patch0_func, 711, 1, 1 },
+	{ ahc_patch5_func, 712, 9, 1 },
+
 };
-const int num_critical_sections = sizeof(critical_sections)
-                                 / sizeof(*critical_sections);
diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c
index 342421387db..402aaf11b9f 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.c
+++ b/sys/dev/microcode/aic7xxx/aicasm.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: aicasm.c,v 1.4 2002/03/14 01:26:57 millert Exp $ */
+/* $OpenBSD: aicasm.c,v 1.5 2002/03/19 02:49:20 millert Exp $ */
 /*
  * Aic7xxx SCSI host adapter firmware asssembler
  *
- * Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
+ * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,9 +14,6 @@
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,9 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aicasm.c,v 1.4 2002/03/14 01:26:57 millert Exp $
- *
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.32 2001/07/18 21:03:32 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm.c,v 1.23 1999/08/28 00:41:25 peter Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -45,7 +40,7 @@
 
 #include "aicasm.h"
 #include "aicasm_symbol.h"
-#include "aicasm_insformat.h"
+#include "sequencer.h"
 
 typedef struct patch {
 	TAILQ_ENTRY(patch) links;
@@ -77,7 +72,6 @@ char *listfilename;
 FILE *listfile;
 
 static TAILQ_HEAD(,instruction) seq_program;
-struct cs_tailq cs_tailq;
 struct scope_list scope_stack;
 symlist_t patch_functions;
 
@@ -86,7 +80,7 @@ extern int yy_flex_debug;
 extern int yydebug;
 #endif
 extern FILE *yyin;
-extern int yyparse(void);
+extern int yyparse __P((void));
 
 int
 main(argc, argv)
@@ -103,7 +97,6 @@ main(argc, argv)
 	TAILQ_INIT(&patches);
 	SLIST_INIT(&search_path);
 	TAILQ_INIT(&seq_program);
-        TAILQ_INIT(&cs_tailq);
 	SLIST_INIT(&scope_stack);
 
 	/* Set Sentinal scope node */
@@ -306,39 +299,28 @@ output_code(ofile)
 {
 	struct instruction *cur_instr;
 	patch_t *cur_patch;
-        critical_section_t *cs;
 	symbol_node_t *cur_node;
 	int instrcount;
 
 	instrcount = 0;
 	fprintf(ofile,
 "/*
- * DO NOT EDIT - This file is automatically generated
- *               from the following source files:
- *
-%s */\n", versions);
+ * DO NOT EDIT - This file is automatically generated.
+ */\n");
 
 	fprintf(ofile, "static u_int8_t seqprog[] = {\n");
 	for(cur_instr = seq_program.tqh_first;
 	    cur_instr != NULL;
 	    cur_instr = cur_instr->links.tqe_next) {
 
-                fprintf(ofile, "%s\t0x%02x, 0x%02x, 0x%02x, 0x%02x",
-                        cur_instr == seq_program.tqh_first ? "" : ",\n",
-#if BYTE_ORDER == LITTLE_ENDIAN
+		fprintf(ofile, "\t0x%02x, 0x%02x, 0x%02x, 0x%02x,\n",
 			cur_instr->format.bytes[0],
 			cur_instr->format.bytes[1],
 			cur_instr->format.bytes[2],
 			cur_instr->format.bytes[3]);
-#else
-                        cur_instr->format.bytes[3],
-                        cur_instr->format.bytes[2],
-                        cur_instr->format.bytes[1],
-                        cur_instr->format.bytes[0]);
-#endif
 		instrcount++;
 	}
-        fprintf(ofile, "\n};\n\n");
+	fprintf(ofile, "};\n\n");
 
 	/*
 	 *  Output patch information.  Patch functions first.
@@ -360,7 +342,7 @@ ahc_patch%d_func(struct ahc_softc *ahc)
 	}
 
 	fprintf(ofile,
-"typedef int patch_func_t(struct ahc_softc *);
+"typedef int patch_func_t __P((struct ahc_softc *));
 struct patch {
 	patch_func_t	*patch_func;
 	u_int32_t	begin	   :10,
@@ -370,35 +352,14 @@ struct patch {
 
 	for(cur_patch = TAILQ_FIRST(&patches);
 	    cur_patch != NULL;
-            cur_patch = TAILQ_NEXT(cur_patch,links)) {
-                fprintf(ofile, "%s\t{ ahc_patch%d_func, %d, %d, %d }",
-                        cur_patch == TAILQ_FIRST(&patches) ? "" : ",\n",
+	    cur_patch = TAILQ_NEXT(cur_patch,links)) {
+		fprintf(ofile, "\t{ ahc_patch%d_func, %d, %d, %d },\n",
 			cur_patch->patch_func, cur_patch->begin,
 			cur_patch->skip_instr, cur_patch->skip_patch);
-        }
-
-        fprintf(ofile, "\n};\n");
-
-        fprintf(ofile,
-"struct cs {
-        u_int16_t       begin;
-        u_int16_t       end;
-} critical_sections[] = {\n");
-
-        for(cs = TAILQ_FIRST(&cs_tailq);
-            cs != NULL;
-            cs = TAILQ_NEXT(cs, links)) {
-                fprintf(ofile, "%s\t{ %d, %d }",
-                        cs == TAILQ_FIRST(&cs_tailq) ? "" : ",\n",
-                        cs->begin_addr, cs->end_addr);
 	}
 
 	fprintf(ofile, "\n};\n");
 
-        fprintf(ofile,
-"const int num_critical_sections = sizeof(critical_sections)
-                                 / sizeof(*critical_sections);\n");
-
 	fprintf(stderr, "%s: %d instructions used\n", appname, instrcount);
 }
 
@@ -493,7 +454,6 @@ output_listing(FILE *listfile, char *ifilename)
 	    cur_func = SLIST_NEXT(cur_func, links))
 		func_count++;
 
-        func_values = NULL;
 	if (func_count != 0) {
 		func_values = (int *)malloc(func_count * sizeof(int));
 
@@ -558,17 +518,10 @@ output_listing(FILE *listfile, char *ifilename)
 				line++;
 		}
 		fprintf(listfile, "%03x %02x%02x%02x%02x", instrptr,
-#if BYTE_ORDER == LITTLE_ENDIAN
 			cur_instr->format.bytes[0],
 			cur_instr->format.bytes[1],
 			cur_instr->format.bytes[2],
 			cur_instr->format.bytes[3]);
-#else
-                        cur_instr->format.bytes[3],
-                        cur_instr->format.bytes[2],
-                        cur_instr->format.bytes[1],
-                        cur_instr->format.bytes[0]);
-#endif
 		fgets(buf, sizeof(buf), ifile);
 		fprintf(listfile, "\t%s", buf);
 		line++;
@@ -681,20 +634,6 @@ seq_alloc()
 	return new_instr;
 }
 
-critical_section_t *
-cs_alloc()
-{
-        critical_section_t *new_cs;
-
-        new_cs= (critical_section_t *)malloc(sizeof(critical_section_t));
-        if (new_cs == NULL)
-                stop("Unable to malloc critical_section object", EX_SOFTWARE);
-        memset(new_cs, 0, sizeof(*new_cs));
-        
-        TAILQ_INSERT_TAIL(&cs_tailq, new_cs, links);
-        return new_cs;
-}
-
 scope_t *
 scope_alloc()
 {
diff --git a/sys/dev/microcode/aic7xxx/aicasm.h b/sys/dev/microcode/aic7xxx/aicasm.h
index da57c52d723..88c33945424 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.h
+++ b/sys/dev/microcode/aic7xxx/aicasm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aicasm.h,v 1.2 2002/02/16 04:36:33 smurph Exp $ */
+/* $OpenBSD: aicasm.h,v 1.3 2002/03/19 02:49:20 millert Exp $ */
 /*
  * Assembler for the sequencer program downloaded to Aic7xxx SCSI host adapters
  *
@@ -14,9 +14,6 @@
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.13 2001/07/18 21:03:32 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm.h,v 1.6 1999/12/06 18:23:30 gibbs Exp $
  */
 
 #include <sys/queue.h>
@@ -57,18 +54,15 @@ typedef enum {
 SLIST_HEAD(path_list, path_entry);
 
 extern struct path_list search_path;
-extern struct cs_tailq cs_tailq;
 extern struct scope_list scope_stack;
 extern struct symlist patch_functions;
 extern int includes_search_curdir;		/* False if we've seen -I- */
 extern char *appname;
 extern int yylineno;
 extern char *yyfilename;
-extern char *versions;
 
 void stop(const char *errstring, int err_code);
 void include_file(char *file_name, include_type type);
 struct instruction *seq_alloc(void);
-struct critical_section *cs_alloc(void);
 struct scope *scope_alloc(void);
 void process_scope(struct scope *);
diff --git a/sys/dev/microcode/aic7xxx/aicasm_gram.y b/sys/dev/microcode/aic7xxx/aicasm_gram.y
index f363356d17a..38b0dbcb53e 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_gram.y
+++ b/sys/dev/microcode/aic7xxx/aicasm_gram.y
@@ -2,7 +2,7 @@
 /*
  * Parser for the Aic7xxx SCSI Host adapter sequencer assembler.
  *
- * Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
+ * Copyright (c) 1997-1998 Justin T. Gibbs.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,9 +14,6 @@
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y,v 1.15 2001/07/18 21:03:32 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_gram.y,v 1.8 1999/12/06 18:23:30 gibbs Exp $
  */
 
 #include <stdio.h>
@@ -42,11 +39,10 @@
 
 #include "aicasm.h"
 #include "aicasm_symbol.h"
-#include "aicasm_insformat.h"
+#include "sequencer.h"
 
 int yylineno;
 char *yyfilename;
-char *versions;
 static symbol_t *cur_symbol;
 static symtype cur_symtype;
 static symbol_t *accumulator;
@@ -57,27 +53,25 @@ static symbol_ref_t sindex;
 static int instruction_ptr;
 static int sram_or_scb_offset;
 static int download_constant_count;
-static int in_critical_section;
 
-static void process_bitmask(int mask_type, symbol_t *sym, int mask);
-static void initialize_symbol(symbol_t *symbol);
-static void process_register(symbol_t **p_symbol);
-static void format_1_instr(int opcode, symbol_ref_t *dest,
+static void process_bitmask __P((int mask_type, symbol_t *sym, int mask));
+static void initialize_symbol __P((symbol_t *symbol));
+static void process_register __P((symbol_t **p_symbol));
+static void format_1_instr __P((int opcode, symbol_ref_t *dest,
 				expression_t *immed, symbol_ref_t *src,
-				int ret);
-static void format_2_instr(int opcode, symbol_ref_t *dest,
+				int ret));
+static void format_2_instr __P((int opcode, symbol_ref_t *dest,
 				expression_t *places, symbol_ref_t *src,
-				int ret);
-static void format_3_instr(int opcode, symbol_ref_t *src,
-				expression_t *immed, symbol_ref_t *address);
-static void test_readable_symbol(symbol_t *symbol);
-static void test_writable_symbol(symbol_t *symbol);
-static void type_check(symbol_t *symbol, expression_t *expression,
-			    int and_op);
-static void make_expression(expression_t *immed, int value);
-static void add_conditional(symbol_t *symbol);
-static void add_version(const char *);
-static int  is_download_const(expression_t *immed);
+				int ret));
+static void format_3_instr __P((int opcode, symbol_ref_t *src,
+				expression_t *immed, symbol_ref_t *address));
+static void test_readable_symbol __P((symbol_t *symbol));
+static void test_writable_symbol __P((symbol_t *symbol));
+static void type_check __P((symbol_t *symbol, expression_t *expression,
+			    int and_op));
+static void make_expression __P((expression_t *immed, int value));
+static void add_conditional __P((symbol_t *symbol));
+static int  is_download_const __P((expression_t *immed));
 
 #define YYDEBUG 1
 #define SRAM_SYMNAME "SRAM_BASE"
@@ -112,21 +106,17 @@ static int  is_download_const(expression_t *immed);
 
 %token <value> T_MODE
 
-%token T_BEGIN_CS
-
-%token T_END_CS
-
 %token T_BIT
 
 %token T_MASK
 
 %token <value> T_NUMBER
 
-%token <str> T_PATH T_STRING
+%token <str> T_PATH
 
 %token <sym> T_CEXPR
 
-%token T_EOF T_INCLUDE T_VERSION
+%token T_EOF T_INCLUDE 
 
 %token <value> T_SHR T_SHL T_ROR T_ROL
 
@@ -140,7 +130,7 @@ static int  is_download_const(expression_t *immed);
 
 %token <value> T_STC T_CLC
 
-%token <value> T_CMP T_NOT T_XOR
+%token <value> T_CMP T_XOR
 
 %token <value> T_TEST T_AND
 
@@ -178,8 +168,6 @@ static int  is_download_const(expression_t *immed);
 program:
 	include
 |	program include
-|       version
-|       program version
 |	register
 |	program register
 |	constant
@@ -190,10 +178,6 @@ program:
 |	program scb
 |	label
 |	program label
-|       critical_section_start
-|       program critical_section_start
-|       critical_section_end
-|       program critical_section_end
 |	conditional
 |	program conditional
 |	code
@@ -202,18 +186,9 @@ program:
 
 include:
 	T_INCLUDE '<' T_PATH '>'
-        {
-                include_file($3, BRACKETED_INCLUDE);
-        }
+	{ include_file($3, BRACKETED_INCLUDE); }
 |	T_INCLUDE '"' T_PATH '"'
-        {
-                include_file($3, QUOTED_INCLUDE);
-        }
-;
-
-version:
-        T_VERSION '=' T_STRING
-        { add_version($3); }
+	{ include_file($3, QUOTED_INCLUDE); }
 ;
 
 register:
@@ -552,8 +527,6 @@ scb:
 			}
 			cur_symbol->type = SCBLOC;
 			initialize_symbol(cur_symbol);
-                        /* 64 bytes of SCB space */
-                        cur_symbol->info.rinfo->size = 64;
 		}
 		reg_address
 		{
@@ -578,21 +551,6 @@ reg_symbol:
 		$$.symbol = $1;
 		$$.offset = 0;
 	}
-|       T_SYMBOL '[' T_SYMBOL ']'
-        {
-                process_register(&$1);
-                if ($3->type != CONST) {
-                        stop("register offset must be a constant", EX_DATAERR);
-                        /* NOTREACHED */
-                }
-                if (($3->info.cinfo->value + 1) > $1->info.rinfo->size) {
-                        stop("Accessing offset beyond range of register",
-                             EX_DATAERR);
-                        /* NOTREACHED */
-                }
-                $$.symbol = $1;
-                $$.offset = $3->info.cinfo->value;
-        }
 |	T_SYMBOL '[' T_NUMBER ']'
 	{
 		process_register(&$1);
@@ -663,35 +621,6 @@ ret:
 	{ $$ = 1; }
 ;
 
-critical_section_start:
-        T_BEGIN_CS
-        {
-                critical_section_t *cs;
-
-                if (in_critical_section != FALSE) {
-                        stop("Critical Section within Critical Section",
-                             EX_DATAERR);
-                        /* NOTREACHED */
-                }
-                cs = cs_alloc();
-                cs->begin_addr = instruction_ptr;
-                in_critical_section = TRUE;
-        }
-
-critical_section_end:
-        T_END_CS
-        {
-                critical_section_t *cs;
-
-                if (in_critical_section == FALSE) {
-                        stop("Unballanced 'end_cs'", EX_DATAERR);
-                        /* NOTREACHED */
-                }
-                cs = TAILQ_LAST(&cs_tailq, cs_tailq);
-                cs->end_addr = instruction_ptr;
-                in_critical_section = FALSE;
-        }
-
 label:
 	T_SYMBOL ':'
 	{
@@ -803,6 +732,7 @@ conditional:
 	'}'
 	{
 		scope_t *scope_context;
+		scope_t *last_scope;
 
 		scope_context = SLIST_FIRST(&scope_stack);
 		if (scope_context->type == SCOPE_ROOT) {
@@ -908,8 +838,8 @@ code:
 	{
 		expression_t immed;
 
-                make_expression(&immed, 1);
-                format_1_instr(AIC_OP_BMOV, &$2, &immed, &$4, $5);
+		make_expression(&immed, 0xff);
+		format_1_instr(AIC_OP_AND, &$2, &immed, &$4, $5);
 	}
 ;
 
@@ -917,16 +847,6 @@ code:
 	T_MVI destination ',' immediate_or_a ret ';'
 	{
 		format_1_instr(AIC_OP_OR, &$2, &$4, &allzeros, $5);
-        }
-;
-
-code:
-        T_NOT destination opt_source ret ';'
-        {
-                expression_t immed;
-
-                make_expression(&immed, 0xff);
-                format_1_instr(AIC_OP_XOR, &$2, &immed, &$3, $4);
 	}
 ;
 
@@ -1471,27 +1391,6 @@ add_conditional(symbol)
 	symlist_add(&patch_functions, symbol, SYMLIST_INSERT_HEAD);
 }
 
-static void
-add_version(verstring)
-const char *verstring;
-{
-        const char prefix[] = " * ";
-        int newlen;
-        int oldlen;
-
-        newlen = strlen(verstring) + strlen(prefix);
-        oldlen = 0;
-        if (versions != NULL)
-                oldlen = strlen(versions);
-        versions = realloc(versions, newlen + oldlen + 2);
-        if (versions == NULL)
-                stop("Can't allocate version string", EX_SOFTWARE);
-        strcpy(&versions[oldlen], prefix);
-        strcpy(&versions[oldlen + strlen(prefix)], verstring);
-        versions[newlen + oldlen] = '\n';
-        versions[newlen + oldlen + 1] = '\0';
-}
-
 void
 yyerror(string)
 	const char *string;
diff --git a/sys/dev/microcode/aic7xxx/aicasm_scan.l b/sys/dev/microcode/aic7xxx/aicasm_scan.l
index c3098c3aae3..20cae61b096 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_scan.l
+++ b/sys/dev/microcode/aic7xxx/aicasm_scan.l
@@ -2,7 +2,7 @@
 /*
  * Lexical Analyzer for the Aic7xxx SCSI Host adapter sequencer assembler.
  *
- * Copyright (c) 1997, 1998 Justin T. Gibbs.
+ * Copyright (c) 1997-1998 Justin T. Gibbs.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,9 +14,6 @@
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm_scan.l,v 1.15 1999/12/06 18:23:30 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_scan.l,v 1.8 1999/12/06 18:23:30 gibbs Exp $
  */
 
 #include <sys/types.h>
@@ -48,11 +45,8 @@
 char string_buf[MAX_STR_CONST];
 char *string_buf_ptr;
 int  parren_count;
-int  quote_count;
 %}
 
-%option nounput
-
 PATH		[-/A-Za-z0-9_.]*[./][-/A-Za-z0-9_.]*
 WORD		[A-Za-z_][-A-Za-z_0-9]*
 SPACE		[ \t]+
@@ -60,7 +54,6 @@ SPACE		[ \t]+
 %x COMMENT
 %x CEXPR
 %x INCLUDE
-%x STRING
 
 %%
 \n			{ ++yylineno; }
@@ -92,41 +85,12 @@ if[ \t]*\(		{
 			}
 <CEXPR>\n		{ ++yylineno; }
 <CEXPR>[^()\n]+		{
-                                char *yptr;
-
-                                yptr = yytext;
-                                while (*yptr != '\0') {
-                                        /* Remove duplicate spaces */
-                                        if (*yptr == '\t')
-                                                *yptr = ' ';
-                                        if (*yptr == ' '
-                                         && string_buf_ptr != string_buf
-                                         && string_buf_ptr[-1] == ' ')
-                                                yptr++;
-                                        else 
-					*string_buf_ptr++ = *yptr++;
-                                }
-                        }
+				char *yptr = yytext;
 
-VERSION                 { return T_VERSION; }
-\"                      {
-                                string_buf_ptr = string_buf;
-                                BEGIN STRING;
+				while (*yptr != '\0')
+					*string_buf_ptr++ = *yptr++;
 			}
-<STRING>[^"]+           {
-                                char *yptr;
-
-                                yptr = yytext;
-                                while (*yptr)
-                                        *string_buf_ptr++ = *yptr++;
-                        }
-<STRING>\"              {
-                                /* All done */
-                                BEGIN INITIAL;
-                                *string_buf_ptr = '\0';
-                                yylval.str = string_buf;
-                                return T_STRING;
-                        }
+
 {SPACE}			;
 
 	/* Register/SCB/SRAM definition keywords */
@@ -144,8 +108,6 @@ RW|RO|WO		{
 					yylval.value = WO;
 				 return T_MODE;
 			}
-BEGIN_CRITICAL          { return T_BEGIN_CS; }
-END_CRITICAL            { return T_END_CS; }
 bit			{ return T_BIT; }
 mask			{ return T_MASK; }
 alias			{ return T_ALIAS; }
@@ -183,7 +145,6 @@ dec			{ return T_DEC; }
 stc			{ return T_STC;	}
 clc			{ return T_CLC; }
 cmp			{ return T_CMP;	}
-not                     { return T_NOT; }
 xor			{ return T_XOR;	}
 test			{ return T_TEST;}
 and			{ return T_AND;	}
@@ -193,7 +154,7 @@ nop			{ return T_NOP; }
 else			{ return T_ELSE; }
 
 	/* Allowed Symbols */
-[-+,:()~|&."{};<>[\]!=] { return yytext[0]; }
+[-+,:()~|&."{};<>[\]!]	{ return yytext[0]; }
 
 	/* Number processing */
 0[0-7]*			{
@@ -212,36 +173,17 @@ else			{ return T_ELSE; }
 			}
 
 	/* Include Files */
-#include{SPACE}         {
-                                BEGIN INCLUDE;
-                                quote_count = 0;
-                                return T_INCLUDE;
-                        }
-<INCLUDE>[<]            { return yytext[0]; }
-<INCLUDE>[>]            { BEGIN INITIAL; return yytext[0]; }
-<INCLUDE>[\"]           {
-                                if (quote_count != 0)
-                                        BEGIN INITIAL;
-                                quote_count++;
-                                return yytext[0];
-                        }
+#include		{ return T_INCLUDE; BEGIN INCLUDE;}
+<INCLUDE>[<>\"]		{ return yytext[0]; }
+<INCLUDE>{PATH}		{ yylval.str = strdup(yytext); return T_PATH; }
+<INCLUDE>;		{ BEGIN INITIAL; return yytext[0]; }
 <INCLUDE>.		{ stop("Invalid include line", EX_DATAERR); }
 
 	/* For parsing C include files with #define foo */
 #define			{ yylval.value = TRUE; return T_CONST; }
 	/* Throw away macros */
 #define[^\n]*[()]+[^\n]* ;
-<INITIAL,INCLUDE>{PATH} {
-                                char *yptr;
-
-                                yptr = yytext;
-                                string_buf_ptr = string_buf;
-                                while (*yptr)
-                                        *string_buf_ptr++ = *yptr++;
-                                yylval.str = string_buf;
-                                *string_buf_ptr = '\0';
-                                return T_PATH;
-                        }
+{PATH}			{ yylval.str = strdup(yytext); return T_PATH; }
 
 {WORD}			{ yylval.sym = symtable_get(yytext);  return T_SYMBOL; }
 
diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.c b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
index 5c2f5c47afd..2642bb17616 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aicasm_symbol.c,v 1.2 2002/02/16 04:36:33 smurph Exp $ */
+/* $OpenBSD: aicasm_symbol.c,v 1.3 2002/03/19 02:49:20 millert Exp $ */
 /*
  * Aic7xxx SCSI host adapter firmware asssembler symbol table implementation
  *
@@ -14,9 +14,6 @@
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,9 +26,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c,v 1.14 2001/07/18 21:03:32 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_symbol.c,v 1.8 1999/12/06 18:23:30 gibbs Exp $
  */
 
+
 #include <sys/types.h>
 
 #include <db.h>
@@ -396,11 +394,9 @@ symtable_dump(ofile)
 		/* Output what we have */
 		fprintf(ofile,
 "/*
- * DO NOT EDIT - This file is automatically generated
- *               from the following source files:
- *
-%s */\n", versions);
-                while (registers.slh_first != NULL) {
+ * DO NOT EDIT - This file is automatically generated.
+ */\n");
+		while (registers.slh_first != NULL) {
 			symbol_node_t *curnode;
 			u_int8_t value;
 			char *tab_str;
@@ -474,3 +470,4 @@ symtable_dump(ofile)
 		}
 	}
 }
+
diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.h b/sys/dev/microcode/aic7xxx/aicasm_symbol.h
index a0c305f960f..a145c784634 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_symbol.h
+++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aicasm_symbol.h,v 1.3 2002/03/14 01:26:57 millert Exp $ */
+/* $OpenBSD: aicasm_symbol.h,v 1.4 2002/03/19 02:49:20 millert Exp $ */
 /*
  * Aic7xxx SCSI host adapter firmware asssembler symbol table definitions
  *
@@ -14,9 +14,6 @@
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -29,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.12 2000/11/10 19:54:17 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_symbol.h,v 1.6 1999/12/06 18:23:31 gibbs Exp $
  */
 
 #include <sys/queue.h>
@@ -114,12 +111,6 @@ typedef struct symbol_node {
 	symbol_t *symbol;
 }symbol_node_t;
 
-typedef struct critical_section {
-        TAILQ_ENTRY(critical_section) links;
-        int begin_addr;
-        int end_addr;
-} critical_section_t;
-
 typedef enum {
 	SCOPE_ROOT,
 	SCOPE_IF,
@@ -144,30 +135,28 @@ typedef struct scope {
 	int func_num;
 } scope_t;
 
-TAILQ_HEAD(cs_tailq, critical_section);
 SLIST_HEAD(scope_list, scope);
 TAILQ_HEAD(scope_tailq, scope);
 
-void	symbol_delete(symbol_t *symbol);
+void	symbol_delete __P((symbol_t *symbol));
 
-void	symtable_open(void);
+void	symtable_open __P((void));
 
-void	symtable_close(void);
+void	symtable_close __P((void));
 
 symbol_t *
-	symtable_get(char *name);
+	symtable_get __P((char *name));
 
 symbol_node_t *
-	symlist_search(symlist_t *symlist, char *symname);
+	symlist_search __P((symlist_t *symlist, char *symname));
 
 void
-	symlist_add(symlist_t *symlist, symbol_t *symbol, int how);
+	symlist_add __P((symlist_t *symlist, symbol_t *symbol, int how));
 #define SYMLIST_INSERT_HEAD	0x00
 #define SYMLIST_SORT		0x01
 
-void	symlist_free(symlist_t *symlist);
-
-void	symlist_merge(symlist_t *symlist_dest, symlist_t *symlist_src1,
-			   symlist_t *symlist_src2);
-void	symtable_dump(FILE *ofile);
+void	symlist_free __P((symlist_t *symlist));
 
+void	symlist_merge __P((symlist_t *symlist_dest, symlist_t *symlist_src1,
+			   symlist_t *symlist_src2));
+void	symtable_dump __P((FILE *ofile));
diff --git a/sys/dev/microcode/aic7xxx/aicasm_insformat.h b/sys/dev/microcode/aic7xxx/sequencer.h
index d944973adeb..21ff5496c14 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_insformat.h
+++ b/sys/dev/microcode/aic7xxx/sequencer.h
@@ -1,8 +1,9 @@
+/* $OpenBSD: sequencer.h,v 1.3 2002/03/19 02:49:20 millert Exp $ */
 /*
  * Instruction formats for the sequencer program downloaded to
  * Aic7xxx SCSI host adapters
  *
- * Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
+ * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,7 +16,7 @@
  *    derived from this software without specific prior written permission.
  *
  * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
+ * the GNU Public License ("GPL").
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -29,75 +30,41 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aicasm_insformat.h,v 1.1 2002/02/16 04:36:33 smurph Exp $
- *
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_insformat.h,v 1.4 2000/11/10 19:54:17 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/sequencer.h,v 1.6 1999/12/06 18:23:31 gibbs Exp $
  */
 
-#if linux
-#include <endian.h>
-#else
-#include <machine/endian.h>
-#endif
-
 struct ins_format1 {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	uint32_t	immediate	: 8,
+	u_int32_t	immediate	: 8,
 			source		: 9,
 			destination	: 9,
 			ret		: 1,
 			opcode		: 4,
 			parity		: 1;
-#else
-	uint32_t	parity		: 1,
-			opcode		: 4,
-			ret		: 1,
-			destination	: 9,
-			source		: 9,
-			immediate	: 8;
-#endif
 };
 
 struct ins_format2 {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	uint32_t	shift_control	: 8,
+	u_int32_t	shift_control	: 8,
 			source		: 9,
 			destination	: 9,
 			ret		: 1,
 			opcode		: 4,
 			parity		: 1;
-#else
-	uint32_t	parity		: 1,
-			opcode		: 4,
-			ret		: 1,
-			destination	: 9,
-			source		: 9,
-			shift_control	: 8;
-#endif
 };
 
 struct ins_format3 {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	uint32_t	immediate	: 8,
+	u_int32_t	immediate	: 8,
 			source		: 9,
 			address		: 10,
 			opcode		: 4,
 			parity		: 1;
-#else
-	uint32_t	parity		: 1,
-			opcode		: 4,
-			address		: 10,
-			source		: 9,
-			immediate	: 8;
-#endif
 };
 
 union ins_formats {
 		struct ins_format1 format1;
 		struct ins_format2 format2;
 		struct ins_format3 format3;
-		uint8_t		   bytes[4];
-		uint32_t	   integer;
+		u_int8_t	   bytes[4];
+		u_int32_t	   integer;
 };
 struct instruction {
 	union	ins_formats format;
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index e9096c5125e..0e0660dace9 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_pci.c,v 1.29 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: ahc_pci.c,v 1.30 2002/03/19 02:49:20 millert Exp $	*/
 /*	$NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $	*/
 
 /*
@@ -53,9 +53,8 @@
 #define AHC_PCI_MEMADDR	(PCI_MAPREG_START + 4)	/* Mem I/O Address */
 
 #include <dev/ic/aic7xxxreg.h>
-#include <dev/ic/aic7xxx_openbsd.h>
-#include <dev/ic/aic7xxx_inline.h>
-#include <dev/ic/aic7xxx_93cx6.h>
+#include <dev/ic/aic7xxxvar.h>
+#include <dev/ic/smc93cx6var.h>
 
 /* 
  * XXX memory-mapped is busted on some i386 on-board chips.
@@ -89,73 +88,74 @@
 #define AHC_398X_SLOT_CHANNEL_B	8
 #define AHC_398X_SLOT_CHANNEL_C	12
 
-#define	EXROMBADR		0x30
-#define 	EXROMEN		0x00000001ul	/* External Rom Enable */
-
 #define	DEVCONFIG		0x40
-#define		SCBSIZE32	0x00010000ul	/* aic789X only */
-#define		REXTVALID	0x00001000ul	/* ultra cards only */
-#define		MPORTMODE	0x00000400ul	/* aic7870+ only */
-#define		RAMPSM		0x00000200ul	/* aic7870+ only */
-#define		VOLSENSE	0x00000100ul
-#define		PCI64BIT	0x00000080ul	/* 64Bit PCI bus (Ultra2 Only)*/
-#define		SCBRAMSEL	0x00000080ul
-#define		MRDCEN		0x00000040ul
-#define		EXTSCBTIME	0x00000020ul	/* aic7870 only */
-#define		EXTSCBPEN	0x00000010ul	/* aic7870 only */
-#define		BERREN		0x00000008ul
-#define		DACEN		0x00000004ul
-#define		STPWLEVEL	0x00000002ul
-#define		DIFACTNEGEN	0x00000001ul	/* aic7870 only */
+#define		SCBSIZE32	0x00010000UL	/* aic789X only */
+#define		MPORTMODE	0x00000400UL	/* aic7870 only */
+#define		RAMPSM		0x00000200UL	/* aic7870 only */
+#define		VOLSENSE	0x00000100UL
+#define		SCBRAMSEL	0x00000080UL
+#define		PCI64		0x00000080UL	/* aic7891 & aic7897 only */
+#define		MRDCEN		0x00000040UL
+#define		EXTSCBTIME	0x00000020UL	/* aic7870 only */
+#define		EXTSCBPEN	0x00000010UL	/* aic7870 & aic7890 only */
+#define		BERREN		0x00000008UL
+#define		DACEN		0x00000004UL
+#define		STPWLEVEL	0x00000002UL
+#define		DIFACTNEGEN	0x00000001UL	/* aic7870 only */
 
 #define	CSIZE_LATTIME		0x0c
 #define		CACHESIZE	0x0000003ful	/* only 5 bits */
 #define		LATTIME		0x0000ff00ul
 
-static int  ahc_ext_scbram_present(struct ahc_softc *ahc);
-static void ahc_scbram_config(struct ahc_softc *ahc, int enable,
-				   int pcheck, int fast, int large);
-static void ahc_probe_ext_scbram(struct ahc_softc *ahc);
-static void check_extport(struct ahc_softc *ahc, u_int *sxfrctl1);
-static void configure_termination(struct ahc_softc *ahc,
+int	    ahc_pci_intr __P((struct ahc_softc *ahc));
+static int  ahc_ext_scbram_present __P((struct ahc_softc *ahc));
+static void ahc_ext_scbram_config __P((struct ahc_softc *ahc, int enable,
+													int pcheck, int fast));
+static void ahc_probe_ext_scbram __P((struct ahc_softc *ahc));
+static void check_extport __P((struct ahc_softc *ahc, u_int *sxfrctl1));
+static void configure_termination __P((struct ahc_softc *ahc,
 				       struct seeprom_descriptor *sd,
 				       u_int adapter_control,
-				       u_int *sxfrctl1);
-static void ahc_new_term_detect(struct ahc_softc *ahc,
+				       u_int *sxfrctl1));
+static void ahc_new_term_detect __P((struct ahc_softc *ahc,
 				     int *enableSEC_low,
 				     int *enableSEC_high,
 				     int *enablePRI_low,
 				     int *enablePRI_high,
-				     int *eeprom_present);
-static void aic787X_cable_detect(struct ahc_softc *ahc,
+				     int *eeprom_present));
+static void aic787X_cable_detect __P((struct ahc_softc *ahc,
 				      int *internal50_present,
 				      int *internal68_present,
 				      int *externalcable_present,
-				      int *eeprom_present);
-static void aic785X_cable_detect(struct ahc_softc *ahc,
+				      int *eeprom_present));
+static void aic785X_cable_detect __P((struct ahc_softc *ahc,
 				      int *internal50_present,
 				      int *externalcable_present,
-				      int *eeprom_present);
-static void write_brdctl(struct ahc_softc *ahc, u_int8_t value);
-static u_int8_t read_brdctl(struct ahc_softc *ahc);
-
-int ahc_do_pci_config(struct ahc_softc *ahc);
+				      int *eeprom_present));
+static void write_brdctl __P((struct ahc_softc *ahc, u_int8_t value));
+static u_int8_t read_brdctl __P((struct ahc_softc *ahc));
 
-void load_seeprom(struct ahc_softc *ahc);
-static int acquire_seeprom(struct ahc_softc *ahc,
-				struct seeprom_descriptor *sd);
-static void release_seeprom(struct seeprom_descriptor *sd);
-int ahc_probe_scbs(struct ahc_softc *ahc);
+void load_seeprom __P((struct ahc_softc *ahc));
+static int acquire_seeprom __P((struct ahc_softc *ahc,
+				struct seeprom_descriptor *sd));
+static void release_seeprom __P((struct seeprom_descriptor *sd));
+int ahc_probe_scbs __P((struct ahc_softc *ahc));
 
 static u_char aic3940_count;
 
-int ahc_pci_probe(struct device *, void *, void *);
-void ahc_pci_attach(struct device *, struct device *, void *);
+int ahc_pci_probe __P((struct device *, void *, void *));
+void ahc_pci_attach __P((struct device *, struct device *, void *));
 
 struct cfattach ahc_pci_ca = {
 	sizeof(struct ahc_softc), ahc_pci_probe, ahc_pci_attach
 };
 
+struct ahc_pci_data {
+	pci_chipset_tag_t pc;
+	pcitag_t tag;
+	u_int function;
+};
+
 int
 ahc_pci_probe(parent, match, aux)
 struct device *parent;
@@ -219,73 +219,102 @@ void *aux;
 {
 	struct pci_attach_args *pa = aux;
 	struct ahc_softc *ahc = (void *)self;
-	pcireg_t devconfig;
-	pcireg_t command;
+	bus_space_tag_t  iot;
+	bus_space_handle_t ioh;
+	pci_intr_handle_t ih;
+	pcireg_t	   command;
+	const char *intrstr;
+	unsigned opri = 0;
+	ahc_chip ahc_c = AHC_PCI; /* we are a PCI controller */
+	ahc_flag ahc_flags = AHC_FNONE;
+	ahc_feature ahc_f = AHC_FENONE;
+	int	ioh_valid;
+
+	u_char ultra_enb = 0;
+	u_char our_id = 0;
+	u_char channel = 'A';
+	u_int    sxfrctl1;
+	u_int    scsiseq;
+	/* So we can access PCI configuration space after init */
+	struct ahc_pci_data *pd;
+
+	ahc->sc_dmat = pa->pa_dmat;
 	
-	/* setup the PCI stuff */
-	ahc->dev_softc = pa;
+	command = pci_conf_read(pa->pa_pc, pa->pa_tag,
+				PCI_COMMAND_STATUS_REG);
 
-	/* 
-	 * We really don't allocate our softc, but 
-	 * we need to do the initialization. And this 
-	 * also allocates the platform_data structure.
-	 */
-	ahc_alloc(ahc, NULL);
-	ahc_set_name(ahc, ahc->sc_dev.dv_xname);
-	ahc_set_unit(ahc, ahc->sc_dev.dv_unit);
-	
-	/* set dma tags */
-	ahc->parent_dmat = pa->pa_dmat;
-	ahc->buffer_dmat = pa->pa_dmat;
-        ahc->shared_data_dmat = pa->pa_dmat;
-	
-	/* card specific setup */
 	switch (PCI_VENDOR(pa->pa_id)) {
 	case PCI_VENDOR_ADP:
 		switch (PCI_PRODUCT(pa->pa_id)) {
 		case PCI_PRODUCT_ADP_7895:
-			ahc->channel = pa->pa_function == 1 ? 'B' : 'A';
-			/* The 'C' revision of the aic7895 
-			   has a few additional features */
-			if (PCI_REVISION(pa->pa_class) >= 4){
-				ahc->chip |= AHC_AIC7895C;
-			} else {
-				ahc->chip |= AHC_AIC7895;
+			{
+				pcireg_t devconfig;
+				channel = pa->pa_function == 1 ? 'B' : 'A';
+				ahc_c |= AHC_AIC7895;
+				/* The 'C' revision of the aic7895 
+				   has a few additional features */
+				if (PCI_REVISION(pa->pa_class) >= 4)
+					ahc_f = AHC_AIC7895C_FE;
+				else
+					ahc_f = AHC_AIC7895_FE;
+				ahc_flags |= AHC_NEWEEPROM_FMT;
+				devconfig = pci_conf_read(pa->pa_pc, 
+							  pa->pa_tag,
+							  DEVCONFIG);
+				devconfig &= ~SCBSIZE32;
+				pci_conf_write(pa->pa_pc, pa->pa_tag,
+					       DEVCONFIG, devconfig);
 			}
 			break;
-		case PCI_PRODUCT_ADP_3940U:
+	   case PCI_PRODUCT_ADP_3940U:
 		case PCI_PRODUCT_ADP_3940:
 			if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ADP_3940U) {
-				ahc->chip |= AHC_AIC7880;
+				ahc_c |= AHC_AIC7880;
+				ahc_f = AHC_AIC7880_FE;
 			} else {
-				ahc->chip |= AHC_AIC7870;
+				ahc_c |= AHC_AIC7870;
+				ahc_f = AHC_AIC7870_FE;
 			}
 			aic3940_count++;
 			if (!(aic3940_count & 0x01))
 				/* Even count implies second channel */
-				ahc->channel = 'B';
+				channel = 'B';
 			break;
 		case PCI_PRODUCT_ADP_2940UWPro:
-			ahc->flags |= AHC_INT50_SPEEDFLEX;
-			/* fall through */
-		case PCI_PRODUCT_ADP_AIC7880:
-		case PCI_PRODUCT_ADP_398XU:	/* XXX */
+			ahc_c |= AHC_AIC7880;
+			ahc_f = AHC_AIC7880_FE;
+			ahc_f |= AHC_INT50_SPEEDFLEX;
 		case PCI_PRODUCT_ADP_2944U:
 		case PCI_PRODUCT_ADP_2940U:
-			ahc->chip |= AHC_AIC7880;
+			ahc_c |= AHC_AIC7880;
+			ahc_f = AHC_AIC7880_FE;
 			break;
-		case PCI_PRODUCT_ADP_AIC7870:
 		case PCI_PRODUCT_ADP_2944:
 		case PCI_PRODUCT_ADP_2940:
-			ahc->chip |= AHC_AIC7870;
+			ahc_c |= AHC_AIC7870;
+			ahc_f = AHC_AIC7870_FE;
 			break;
-		case PCI_PRODUCT_ADP_AIC7860:
 		case PCI_PRODUCT_ADP_2940AU:
-			ahc->chip |= AHC_AIC7860;
+			ahc_c |= AHC_AIC7860;
+			ahc_f = AHC_AIC7860_FE;
+			break;
+		case PCI_PRODUCT_ADP_398XU:	/* XXX */
+		case PCI_PRODUCT_ADP_AIC7880:
+			ahc_c |= AHC_AIC7880;
+			ahc_f = AHC_AIC7880_FE;
+			break;
+		case PCI_PRODUCT_ADP_AIC7870:
+			ahc_c |= AHC_AIC7870;
+			ahc_f = AHC_AIC7870_FE;
+			break;
+		case PCI_PRODUCT_ADP_AIC7860:
+			ahc_c |= AHC_AIC7860;
+			ahc_f = AHC_AIC7860_FE;
 			break;
 		case PCI_PRODUCT_ADP_AIC7855:
 		case PCI_PRODUCT_ADP_AIC7850:
-			ahc->chip |= AHC_AIC7850;
+			ahc_c |= AHC_AIC7850;
+			ahc_f = AHC_AIC7850_FE;
 			break;
 		default:
 			/* TTT */
@@ -297,136 +326,47 @@ void *aux;
 		case PCI_PRODUCT_ADP2_AIC7890:
 		case PCI_PRODUCT_ADP2_2940U2:
 		case PCI_PRODUCT_ADP2_2930U2:
-			ahc->chip |= AHC_AIC7890;
+			ahc_c |= AHC_AIC7890;
+			ahc_f = AHC_AIC7890_FE;
+			ahc_flags |= AHC_NEWEEPROM_FMT;
 			break;
 		case PCI_PRODUCT_ADP2_AIC7892:
 		case PCI_PRODUCT_ADP2_29160:
 		case PCI_PRODUCT_ADP2_19160B:
-			ahc->chip |= AHC_AIC7892;
+			ahc_c |= AHC_AIC7892;
+			ahc_f = AHC_AIC7892_FE;
+			ahc_flags |= AHC_NEWEEPROM_FMT;
 			break;
 		case PCI_PRODUCT_ADP2_3950U2B:
 		case PCI_PRODUCT_ADP2_3950U2D:
 		case PCI_PRODUCT_ADP2_AIC7896:
-			ahc->chip |= AHC_AIC7896;
-			ahc->channel = pa->pa_function == 1 ? 'B' : 'A';
-			devconfig = ahc_pci_read_config(ahc->dev_softc, 
-						  DEVCONFIG, 4);
-			/* turn off 64 bit for now XXX smurph */
-			devconfig &= ~PCI64BIT;
-			ahc_pci_write_config(ahc->dev_softc, 
-				       DEVCONFIG, devconfig, 4);
+			{
+				pcireg_t devconfig;
+				channel = pa->pa_function == 1 ? 'B' : 'A';
+				ahc_c |= AHC_AIC7896;
+				ahc_f = AHC_AIC7896_FE;
+				ahc_flags |= AHC_NEWEEPROM_FMT;
+				devconfig = pci_conf_read(pa->pa_pc, 
+							  pa->pa_tag, 
+							  DEVCONFIG);
+				/* turn off 64 bit for now XXX smurph */
+				devconfig &= ~PCI64;
+				pci_conf_write(pa->pa_pc, pa->pa_tag, 
+					       DEVCONFIG, devconfig);
+			}
 			break;
 		case PCI_PRODUCT_ADP2_AIC7899:
 		case PCI_PRODUCT_ADP2_3960D:
-			ahc->chip |= AHC_AIC7899;
-			ahc->channel = pa->pa_function == 1 ? 'B' : 'A';
+			ahc_c |= AHC_AIC7899;
+			ahc_f = AHC_AIC7899_FE;
+			ahc_flags |= AHC_NEWEEPROM_FMT;
 			break;
 		default:
 			/* TTT */
 			break;
 		}
 	}
-	
-	/* chip specific setup */
-	switch(ahc->chip){
-	case AHC_AIC7850:
-	case AHC_AIC7855:
-	case AHC_AIC7859:
-		ahc->features = AHC_AIC7850_FE;
-		ahc->bugs |= AHC_TMODE_WIDEODD_BUG|AHC_CACHETHEN_BUG|AHC_PCI_MWI_BUG;
-		if (PCI_REVISION(pa->pa_class) >= 1)
-			ahc->bugs |= AHC_PCI_2_1_RETRY_BUG;
-		break;
-	case AHC_AIC7860:
-		ahc->features = AHC_AIC7860_FE;
-		ahc->bugs |= AHC_TMODE_WIDEODD_BUG|AHC_CACHETHEN_BUG|AHC_PCI_MWI_BUG;
-		if (PCI_REVISION(pa->pa_class) >= 1)
-			ahc->bugs |= AHC_PCI_2_1_RETRY_BUG;
-		break;
-	case AHC_AIC7870:
-		ahc->features = AHC_AIC7870_FE;
-		ahc->bugs |= AHC_TMODE_WIDEODD_BUG|AHC_CACHETHEN_BUG|AHC_PCI_MWI_BUG;
-		break;
-	case AHC_AIC7880:
-		ahc->features = AHC_AIC7880_FE;
-		ahc->bugs |= AHC_TMODE_WIDEODD_BUG;
-		if (PCI_REVISION(pa->pa_class) >= 1) {
-			ahc->bugs |= AHC_PCI_2_1_RETRY_BUG;
-		} else {
-			ahc->bugs |= AHC_CACHETHEN_BUG|AHC_PCI_MWI_BUG;
-		}
-		break;
-	case AHC_AIC7895:
-		ahc->features = AHC_AIC7895_FE;
-		ahc->flags |= AHC_NEWEEPROM_FMT;
-		/*
-		 * The BIOS disables the use of MWI transactions
-		 * since it does not have the MWI bug work around
-		 * we have.  Disabling MWI reduces performance, so
-		 * turn it on again.
-		 */
-		command = pci_conf_read(pa->pa_pc, pa->pa_tag,
-					PCI_COMMAND_STATUS_REG);
-		command |= PCI_COMMAND_INVALIDATE_ENABLE;
-		pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
-			       command);
-		ahc->bugs |= AHC_TMODE_WIDEODD_BUG|AHC_PCI_2_1_RETRY_BUG
-			  |  AHC_CACHETHEN_BUG | AHC_PCI_MWI_BUG;
-		break;		
-	case AHC_AIC7895C:
-		ahc->features = AHC_AIC7895C_FE;
-		ahc->flags |= AHC_NEWEEPROM_FMT;
-		ahc->bugs |= AHC_TMODE_WIDEODD_BUG|AHC_PCI_2_1_RETRY_BUG
-			  |  AHC_CACHETHEN_BUG;
-		break;
-	case AHC_AIC7890:
-		ahc->features = AHC_AIC7890_FE;
-		ahc->flags |= AHC_NEWEEPROM_FMT;
-		if (PCI_REVISION(pa->pa_class) == 0)
-			ahc->bugs |= AHC_AUTOFLUSH_BUG|AHC_CACHETHEN_BUG;
-		break;
-	case AHC_AIC7892:
-		ahc->features = AHC_AIC7892_FE;
-		ahc->flags |= AHC_NEWEEPROM_FMT;
-		ahc->bugs |= AHC_SCBCHAN_UPLOAD_BUG;
-		break;
-	case AHC_AIC7896:
-		ahc->features = AHC_AIC7896_FE;
-		ahc->flags |= AHC_NEWEEPROM_FMT;
-		ahc->bugs |= AHC_CACHETHEN_DIS_BUG;
-		break;
-	case AHC_AIC7899:
-		ahc->features = AHC_AIC7899_FE;
-		ahc->flags |= AHC_NEWEEPROM_FMT;
-		ahc->bugs |= AHC_SCBCHAN_UPLOAD_BUG;
-		break;
-	default:
-		break;
-	}
-
-	/* setup the PCI interrupt */
-	ahc->platform_data->pci_intr_func = ahc_pci_intr;
-	
-	if(ahc_do_pci_config(ahc)){
-		ahc_free(ahc);
-		return;
-	}
-	
-	ahc_attach(ahc);
-}
-
-int
-ahc_pci_map_registers(ahc)
-	struct ahc_softc *ahc;
-{
-	pcireg_t	command;
-	int		ioh_valid;
-	bus_space_tag_t  iot;
-	bus_space_handle_t ioh;
-	struct pci_attach_args *pa = ahc->dev_softc;
 
-	command = ahc_pci_read_config(ahc->dev_softc,
-				      PCI_COMMAND_STATUS_REG, 4);
 #ifdef AHC_ALLOW_MEMIO
 	/*
 	 * attempt to use memory mapping on hardware that supports it.
@@ -446,22 +386,6 @@ ahc_pci_map_registers(ahc)
 		default:
 			ioh_valid = 0;
 		}
-		if (ioh_valid) {
-			/*
-			 * Do a quick test to see if memory mapped
-			 * I/O is functioning correctly.
-			 */
-			if (ahc_inb(ahc, HCNTRL) == 0xFF) {
-				/* nope, use I/O mapping */
-                                ioh_valid = 0;
-			} else {
-				/* Using memory mapping, disable I/O mapping */
-                                command &= ~PCI_COMMAND_IO_ENABLE;
-				ahc_pci_write_config(ahc->dev_softc,
-						     PCI_COMMAND_STATUS_REG,
-						     command, 4);
-			}
-		}
 	}
 	
 	if (!ioh_valid) /* try to drop back to IO mapping */
@@ -469,205 +393,172 @@ ahc_pci_map_registers(ahc)
 	{
 		ioh_valid = (pci_mapreg_map(pa, AHC_PCI_IOADDR,
 		    PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, NULL, 0) == 0);
-		
-		/* Using I/O mapping, disable memory mapping */
-		command &= ~PCI_COMMAND_MEM_ENABLE;
-		ahc_pci_write_config(ahc->dev_softc,
-				     PCI_COMMAND_STATUS_REG,
-				     command, 4);
 	}
 
 	if (!ioh_valid) {
 		/* Game Over.  Insert coin... */
 		printf(": unable to map registers\n");
-		return (1);
+		return;
 	}
-	ahc->tag = iot;
-	ahc->bsh = ioh;
-	return (0);
-}
+	
+	/* Ensure busmastering is enabled */
+	command |= PCI_COMMAND_MASTER_ENABLE;
+	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, command);
 
-int
-ahc_do_pci_config(ahc)
-	struct ahc_softc *ahc;
-{
-	pcireg_t	 command;
-	u_int		 our_id = 0;
-	u_int		 sxfrctl1;
-	u_int		 scsiseq;
-	u_int		 dscommand0;
-	int		 error;
-	int		 opri;
-	uint8_t		 sblkctl;
-
-	error = ahc_pci_map_registers(ahc);
-	if (error != 0)
-		return (error);
-	/* 
-	 * Registers are mapped. Now it is safe to use 
-	 * the ahc_inb and ahc_outb macros. 
-	 */
-	ahc->chip |= AHC_PCI; /* we are a PCI controller */
-#if 0
-	ahc_power_state_change(ahc, AHC_POWER_STATE_D0);
-#endif 
+	pd = malloc(sizeof (struct ahc_pci_data), M_DEVBUF, M_NOWAIT);
+	if (pd == NULL) {
+		printf(": error allocating pci data\n");
+		return;
+	}
 
-	/*
-	 * If we need to support high memory, enable dual
-	 * address cycles.  This bit must be set to enable
-	 * high address bit generation even if we are on a
-	 * 64bit bus (PCI64BIT set in devconfig).
-	 */
-	if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
-		pcireg_t devconfig;
+	pd->pc = pa->pa_pc;
+	pd->tag = pa->pa_tag;
+	pd->function = pa->pa_function;
+
+	/* setup the PCI stuff */
+	ahc->pci_data = pd;
+	ahc->pci_intr_func = ahc_pci_intr;
 
-		if (bootverbose)
-			printf("%s: Enabling 39Bit Addressing\n",
-			       ahc_name(ahc));
-		devconfig = ahc_pci_read_config(ahc->dev_softc, DEVCONFIG, 4);
-		devconfig |= DACEN;
-		ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, devconfig, 4);
-	}
-	
-	/* Ensure busmastering is enabled */
-        command = ahc_pci_read_config(ahc->dev_softc, PCI_COMMAND_STATUS_REG, 4);
-	command |= PCI_COMMAND_MASTER_ENABLE; 
 
-	ahc_pci_write_config(ahc->dev_softc, PCI_COMMAND_STATUS_REG, command, 4);
-	
 	/* On all PCI adapters, we allow SCB paging */
-	ahc->flags |= AHC_PAGESCBS;
+	ahc_flags |= AHC_PAGESCBS;
 
-	error = ahc_softc_init(ahc);
-	if (error != 0)
-		return (error);
+	ahc_construct(ahc, pa->pa_iot, ioh, ahc_c, ahc_flags, ahc_f, channel);
+	/* Now we can use the ahc_inb and ahc_outb macros */
 
+	/* setup the PCI error interrupt handler */
+	ahc->pci_intr_func = &ahc_pci_intr;
+	
 	/* Remeber how the card was setup in case there is no SEEPROM */
-	if ((ahc_inb(ahc, HCNTRL) & POWRDN) == 0) {
-		ahc_pause(ahc);
-		if ((ahc->features & AHC_ULTRA2) != 0)
-			our_id = ahc_inb(ahc, SCSIID_ULTRA2) & OID;
-		else
-			our_id = ahc_inb(ahc, SCSIID) & OID;
-		sxfrctl1 = ahc_inb(ahc, SXFRCTL1) & STPWEN;
-		scsiseq = ahc_inb(ahc, SCSISEQ);
-	} else {
-		sxfrctl1 = STPWEN;
-		our_id = 7;
-		scsiseq = 0;
+	ahc_outb(ahc, HCNTRL, ahc->pause);
+	if ((ahc->features & AHC_ULTRA2) != 0)
+		our_id = ahc_inb(ahc, SCSIID_ULTRA2) & OID;
+	else
+		our_id = ahc_inb(ahc, SCSIID) & OID;
+	sxfrctl1 = ahc_inb(ahc, SXFRCTL1) & STPWEN;
+	scsiseq = ahc_inb(ahc, SCSISEQ);
+	
+	if (ahc_reset(ahc) != 0) {
+		/* Failed */
+		ahc_free(ahc);
+		return;
 	}
-
-	error = ahc_reset(ahc);
-	if (error != 0)
-		return (ENXIO);
-
+	
+	if (ahc->features & AHC_ULTRA)
+		ultra_enb = bus_space_read_1(pa->pa_iot, ioh, SXFRCTL0) &
+						FAST20;
+	
 	if ((ahc->features & AHC_DT) != 0) {
+		u_int optionmode;
 		u_int sfunct;
 
 		/* Perform ALT-Mode Setup */
 		sfunct = ahc_inb(ahc, SFUNCT) & ~ALT_MODE;
 		ahc_outb(ahc, SFUNCT, sfunct | ALT_MODE);
-		ahc_outb(ahc, OPTIONMODE,
-			 OPTIONMODE_DEFAULTS|AUTOACKEN|BUSFREEREV|EXPPHASEDIS);
+		optionmode = ahc_inb(ahc, OPTIONMODE);
+		if (bootverbose)
+			printf("%s: OptionMode = %x\n", ahc_name(ahc), optionmode);
+		ahc_outb(ahc, OPTIONMODE, OPTIONMODE_DEFAULTS);
+		/* Send CRC info in target mode every 4K */
+		ahc_outb(ahc, TARGCRCCNT, 0);
+		ahc_outb(ahc, TARGCRCCNT + 1, 0x10);
 		ahc_outb(ahc, SFUNCT, sfunct);
 
 		/* Normal mode setup */
 		ahc_outb(ahc, CRCCONTROL1, CRCVALCHKEN|CRCENDCHKEN|CRCREQCHKEN
-					  |TARGCRCENDEN);
+					|TARGCRCENDEN|TARGCRCCNTEN);
 	}
 
+	if (pci_intr_map(pa, &ih)) {
+		printf(": couldn't map interrupt\n");
+		ahc_free(ahc);
+		return;
+	}
+	intrstr = pci_intr_string(pa->pa_pc, ih);
+	ahc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ahc_intr, ahc,
+	    ahc->sc_dev.dv_xname);
+
+	if (ahc->sc_ih == NULL) {
+		printf(": couldn't establish interrupt");
+		if (intrstr != NULL)
+			printf(" at %s", intrstr);
+		printf("\n");
+		ahc_free(ahc);
+		return;
+	}
+	if (intrstr != NULL)
+		printf(": %s\n", intrstr);
+
 	/*
 	 * Protect ourself from spurrious interrupts during
 	 * intialization.
 	 */
 	opri = splbio();
-	
-	dscommand0 = ahc_inb(ahc, DSCOMMAND0);
-	dscommand0 |= MPARCKEN|CACHETHEN;
-	if ((ahc->features & AHC_ULTRA2) != 0) {
-
-		/*
-		 * DPARCKEN doesn't work correctly on
-		 * some MBs so don't use it.
-		 */
-		dscommand0 &= ~DPARCKEN;
-	}
 
 	/*
-	 * Handle chips that must have cache line
-	 * streaming (dis/en)abled.
+	 * Do aic7880/aic7870/aic7860/aic7850 specific initialization
 	 */
-	if ((ahc->bugs & AHC_CACHETHEN_DIS_BUG) != 0)
-		dscommand0 |= CACHETHEN;
-
-	if ((ahc->bugs & AHC_CACHETHEN_BUG) != 0)
-		dscommand0 &= ~CACHETHEN;
-
-	ahc_outb(ahc, DSCOMMAND0, dscommand0);
-	
-	ahc->pci_cachesize = ahc_pci_read_config(ahc->dev_softc,
-						 CSIZE_LATTIME, 4) & CACHESIZE;
-	ahc->pci_cachesize *= 4;
-
-	if ((ahc->bugs & AHC_PCI_2_1_RETRY_BUG) != 0
-	 && ahc->pci_cachesize == 4) {
-		u_int csl = ahc_pci_read_config(ahc->dev_softc,
-						CSIZE_LATTIME, 4);
-		csl &= ~CACHESIZE;
-		ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, csl, 4);
-		ahc->pci_cachesize = 0;
-	}
+	{
+		u_int8_t sblkctl;
+		u_int dscommand0;
 
-	/*
-	 * We cannot perform ULTRA speeds without the presense
-	 * of the external precision resistor.
-	 */
-	if ((ahc->features & AHC_ULTRA) != 0) {
-		uint32_t devconfig;
+		dscommand0 = ahc_inb(ahc, DSCOMMAND0);
+		dscommand0 |= MPARCKEN;
+		if ((ahc->features & AHC_ULTRA2) != 0) {
 
-		devconfig = ahc_pci_read_config(ahc->dev_softc, DEVCONFIG, 4);
-		if ((devconfig & REXTVALID) == 0)
-			ahc->features &= ~AHC_ULTRA;
-	}
+			/*
+			 * DPARCKEN doesn't work correctly on
+			 * some MBs so don't use it.
+			 */
+			dscommand0 &= ~(USCBSIZE32|DPARCKEN);
+			dscommand0 |= CACHETHEN;
+		}
 
-	/* See if we have a SEEPROM and perform auto-term */
-	check_extport(ahc, &sxfrctl1);
+		ahc_outb(ahc, DSCOMMAND0, dscommand0);
 
-	/*
-	 * Take the LED out of diagnostic mode
-	 */
-	sblkctl = ahc_inb(ahc, SBLKCTL);
-	ahc_outb(ahc, SBLKCTL, (sblkctl & ~(DIAGLEDEN|DIAGLEDON)));
+		/* See if we have an SEEPROM and perform auto-term */
+		check_extport(ahc, &sxfrctl1);
 
-	if ((ahc->features & AHC_ULTRA2) != 0) {
-		ahc_outb(ahc, DFF_THRSH, RD_DFTHRSH_MAX|WR_DFTHRSH_MAX);
-	} else {
-		ahc_outb(ahc, DSPCISTATUS, DFTHRSH_100);
-	}
+		/*
+		 * Take the LED out of diagnostic mode
+		 */
+		sblkctl = ahc_inb(ahc, SBLKCTL);
+		ahc_outb(ahc, SBLKCTL, (sblkctl & ~(DIAGLEDEN|DIAGLEDON)));
 
-	if (ahc->flags & AHC_USEDEFAULTS) {
 		/*
-		 * PCI Adapter default setup
-		 * Should only be used if the adapter does not have
-		 * a SEEPROM.
+		 * I don't know where this is set in the SEEPROM or by the
+		 * BIOS, so we default to 100% on Ultra or slower controllers
+		 * and 75% on ULTRA2 controllers.
 		 */
-		/* See if someone else set us up already */
-		if (scsiseq != 0) {
-			printf("%s: Using left over BIOS settings\n",
-				ahc_name(ahc));
-			ahc->flags &= ~AHC_USEDEFAULTS;
-			ahc->flags |= AHC_BIOS_ENABLED;
+		if ((ahc->features & AHC_ULTRA2) != 0) {
+			ahc_outb(ahc, DFF_THRSH, RD_DFTHRSH_75|WR_DFTHRSH_75);
 		} else {
+			ahc_outb(ahc, DSPCISTATUS, DFTHRSH_100);
+		}
+
+		if (ahc->flags & AHC_USEDEFAULTS) {
 			/*
-			 * Assume only one connector and always turn
-			 * on termination.
+			 * PCI Adapter default setup
+			 * Should only be used if the adapter does not have
+			 * an SEEPROM.
 			 */
- 			our_id = 0x07;
-			sxfrctl1 = STPWEN;
-		}
-		ahc_outb(ahc, SCSICONF, our_id|ENSPCHK|RESET_SCSI);
+			/* See if someone else set us up already */
+			if (scsiseq != 0) {
+				printf("%s: Using left over BIOS settings\n",
+						 ahc_name(ahc));
+				ahc->flags &= ~AHC_USEDEFAULTS;
+			} else {
+				/*
+				 * Assume only one connector and always turn
+				 * on termination.
+				 */
+				our_id = 0x07;
+				sxfrctl1 = STPWEN;
+			}
+			ahc_outb(ahc, SCSICONF, our_id|ENSPCHK|RESET_SCSI);
 
-		ahc->our_id = our_id;
+			ahc->our_id = our_id;
+		}
 	}
 
 	/*
@@ -677,6 +568,8 @@ ahc_do_pci_config(ahc)
 	 */
 	ahc_probe_ext_scbram(ahc);
 
+	printf("%s: ", ahc_name(ahc));
+
 	/*
 	 * Record our termination setting for the
 	 * generic initialization routine.
@@ -684,61 +577,14 @@ ahc_do_pci_config(ahc)
 	if ((sxfrctl1 & STPWEN) != 0)
 		ahc->flags |= AHC_TERM_ENB_A;
 
-	/* Core initialization */
-	error = ahc_init(ahc);
-	if (error != 0)
-		return (error);
-
-	/* Special func to force negotiation */
-	ahc_force_neg(ahc);
-
-	/*
-	 * Link this softc in with all other ahc instances.
-	 */
-	ahc_softc_insert(ahc);
-
-	/*
-	 * Allow interrupts now that we are completely setup.
-	 */
-	error = ahc_pci_map_int(ahc);
-	if (error != 0)
-		return (error);
-
-	ahc_intr_enable(ahc, TRUE);
+	if (ahc_init(ahc)) {
+		ahc_free(ahc);
+		splx(opri);
+		return; /* XXX PCI code should take return status */
+	}
 	splx(opri);
 
-	return (0);
-}
-
-int
-ahc_pci_map_int(ahc)
-	struct ahc_softc *ahc;
-{
-	const char *intrstr = NULL;
-	pci_intr_handle_t ih;
-	struct pci_attach_args *pa = ahc->dev_softc;
-	
-	if (pci_intr_map(pa, &ih)) {
-		printf(": couldn't map interrupt\n");
-		return 1;
-	}
-	intrstr = pci_intr_string(pa->pa_pc, ih);
-	
-	ahc->platform_data->ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO,
-						    ahc_platform_intr, ahc,
-						    ahc->sc_dev.dv_xname);
-	
-	if (ahc->platform_data->ih == NULL) {
-		printf(": couldn't establish interrupt");
-		if (intrstr != NULL)
-			printf(" at %s", intrstr);
-		printf("\n");
-		return 1;
-	}
-	
-	if (intrstr != NULL)
-		printf(": %s\n", intrstr);
-	return 0;
+	ahc_attach(ahc);
 }
 
 /*
@@ -746,25 +592,23 @@ ahc_pci_map_int(ahc)
  * "unshared" configuration.
  */
 static int
-ahc_ext_scbram_present(struct ahc_softc *ahc)
+ahc_ext_scbram_present(ahc)
+struct ahc_softc *ahc;
 {
-	u_int chip;
 	int ramps;
 	int single_user;
-	uint32_t devconfig;
-	
-	chip = ahc->chip & AHC_CHIPID_MASK;
-	
-	devconfig = ahc_pci_read_config(ahc->dev_softc, DEVCONFIG, 4);
+	pcireg_t devconfig;
+	struct ahc_pci_data *pd = ahc->pci_data;
 
+	devconfig = pci_conf_read(pd->pc, pd->tag, DEVCONFIG);
 	single_user = (devconfig & MPORTMODE) != 0;
 
 	if ((ahc->features & AHC_ULTRA2) != 0)
 		ramps = (ahc_inb(ahc, DSCOMMAND0) & RAMPS) != 0;
-	else if (chip >= AHC_AIC7870)
+	else if ((ahc->chip & AHC_CHIPID_MASK) >= AHC_AIC7870)
 		ramps = (devconfig & RAMPSM) != 0;
 	else
-		ramps = 0;
+		ramps	= 0;
 
 	if (ramps && single_user)
 		return (1);
@@ -775,24 +619,27 @@ ahc_ext_scbram_present(struct ahc_softc *ahc)
  * Enable external scbram.
  */
 static void
-ahc_scbram_config(ahc, enable, pcheck, fast, large)
-	struct ahc_softc *ahc;
-	int enable;
-	int pcheck;
-	int fast;
-	int large;
+ahc_ext_scbram_config(ahc, enable, pcheck, fast)
+struct ahc_softc *ahc;
+int enable;
+int pcheck;
+int fast;
 {
 	pcireg_t devconfig;
+	struct ahc_pci_data *pd = ahc->pci_data;
 
 	if (ahc->features & AHC_MULTI_FUNC) {
+		u_char channel; 
 		/*
 		 * Set the SCB Base addr (highest address bit)
 		 * depending on which channel we are.
 		 */
-		ahc_outb(ahc, SCBBADDR, ahc_get_pci_function(ahc->dev_softc));
+		channel = pd->function == 1 ? 1 : 0;
+		ahc_outb(ahc, SCBBADDR, channel);
 	}
 
-	devconfig = ahc_pci_read_config(ahc->dev_softc, DEVCONFIG, 4);
+	devconfig = pci_conf_read(pd->pc, pd->tag, DEVCONFIG);
+	
 	if ((ahc->features & AHC_ULTRA2) != 0) {
 		u_int dscommand0;
 
@@ -801,10 +648,6 @@ ahc_scbram_config(ahc, enable, pcheck, fast, large)
 			dscommand0 &= ~INTSCBRAMSEL;
 		else
 			dscommand0 |= INTSCBRAMSEL;
-		if (large)
-			dscommand0 &= ~USCBSIZE32;
-		else
-			dscommand0 |= USCBSIZE32;
 		ahc_outb(ahc, DSCOMMAND0, dscommand0);
 	} else {
 		if (fast)
@@ -815,17 +658,13 @@ ahc_scbram_config(ahc, enable, pcheck, fast, large)
 			devconfig &= ~SCBRAMSEL;
 		else
 			devconfig |= SCBRAMSEL;
-		if (large)
-			devconfig &= ~SCBSIZE32;
-		else
-			devconfig |= SCBSIZE32;
 	}
 	if (pcheck)
 		devconfig |= EXTSCBPEN;
 	else
 		devconfig &= ~EXTSCBPEN;
 
-	ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, devconfig, 4);
+	pci_conf_write(pd->pc, pd->tag, DEVCONFIG, devconfig);
 }
 
 /*
@@ -835,100 +674,61 @@ ahc_scbram_config(ahc, enable, pcheck, fast, large)
  */
 static void
 ahc_probe_ext_scbram(ahc)
-	struct ahc_softc *ahc;
+struct ahc_softc *ahc;
 {
 	int num_scbs;
 	int test_num_scbs;
 	int enable;
 	int pcheck;
 	int fast;
-	int large;
 
-	enable = FALSE;
-	pcheck = FALSE;
-	fast = FALSE;
-	large = FALSE;
-	num_scbs = 0;
-	
 	if (ahc_ext_scbram_present(ahc) == 0)
-		goto done;
+		return;
 
 	/*
 	 * Probe for the best parameters to use.
 	 */
-	ahc_scbram_config(ahc, /*enable*/TRUE, pcheck, fast, large);
+	enable = 0;
+	pcheck = 0;
+	fast = 0;
+	ahc_ext_scbram_config(ahc,	/*enable*/1, pcheck, fast);
 	num_scbs = ahc_probe_scbs(ahc);
 	if (num_scbs == 0) {
 		/* The SRAM wasn't really present. */
 		goto done;
 	}
-	enable = TRUE;
-
-	/*
-	 * Clear any outstanding parity error
-	 * and ensure that parity error reporting
-	 * is enabled.
-	 */
-	ahc_outb(ahc, SEQCTL, 0);
-	ahc_outb(ahc, CLRINT, CLRPARERR);
-	ahc_outb(ahc, CLRINT, CLRBRKADRINT);
+	enable = 1;
 
 	/* Now see if we can do parity */
-	ahc_scbram_config(ahc, enable, /*pcheck*/TRUE, fast, large);
+	ahc_ext_scbram_config(ahc, enable, /*pcheck*/1, fast);
 	num_scbs = ahc_probe_scbs(ahc);
 	if ((ahc_inb(ahc, INTSTAT) & BRKADRINT) == 0
-	 || (ahc_inb(ahc, ERROR) & MPARERR) == 0)
-		pcheck = TRUE;
+		 || (ahc_inb(ahc, ERROR) & MPARERR) == 0)
+		pcheck = 1;
 
 	/* Clear any resulting parity error */
 	ahc_outb(ahc, CLRINT, CLRPARERR);
 	ahc_outb(ahc, CLRINT, CLRBRKADRINT);
 
 	/* Now see if we can do fast timing */
-	ahc_scbram_config(ahc, enable, pcheck, /*fast*/TRUE, large);
+	ahc_ext_scbram_config(ahc, enable, pcheck, /*fast*/1);
 	test_num_scbs = ahc_probe_scbs(ahc);
 	if (test_num_scbs == num_scbs
-	 && ((ahc_inb(ahc, INTSTAT) & BRKADRINT) == 0
-	  || (ahc_inb(ahc, ERROR) & MPARERR) == 0))
-		fast = TRUE;
+		 && ((ahc_inb(ahc, INTSTAT) & BRKADRINT) == 0
+			  || (ahc_inb(ahc, ERROR) & MPARERR) == 0))
+		fast = 1;
 
-	/*
-	 * See if we can use large SCBs and still maintain
-	 * the same overall count of SCBs.
-	 */
-	if ((ahc->features & AHC_LARGE_SCBS) != 0) {
-		ahc_scbram_config(ahc, enable, pcheck, fast, /*large*/TRUE);
-		test_num_scbs = ahc_probe_scbs(ahc);
-		if (test_num_scbs >= num_scbs) {
-			large = TRUE;
-			num_scbs = test_num_scbs;
-	 		if (num_scbs >= 64) {
-				/*
-				 * We have enough space to move the
-				 * "busy targets table" into SCB space
-				 * and make it qualify all the way to the
-				 * lun level.
-				 */
-				ahc->flags |= AHC_SCB_BTT;
-			}
-		}
-	}
-done:
-	/*
-	 * Disable parity error reporting until we
-	 * can load instruction ram.
-	 */
-	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS);
-	/* Clear any latched parity error */
+	done:
+	/* Clear any resulting parity error */
 	ahc_outb(ahc, CLRINT, CLRPARERR);
 	ahc_outb(ahc, CLRINT, CLRBRKADRINT);
 	if (bootverbose && enable) {
-		printf("%s: External SRAM, %s access%s, %dbytes/SCB\n",
-		       ahc_name(ahc), fast ? "fast" : "slow", 
-		       pcheck ? ", parity checking enabled" : "",
-		       large ? 64 : 32);
+		printf("%s: External SRAM, %dns access%s\n",
+				 ahc_name(ahc), fast ? 10 : 20,
+				 pcheck ? ", parity checking enabled" : "");
+
 	}
-	ahc_scbram_config(ahc, enable, pcheck, fast, large);
+	ahc_ext_scbram_config(ahc, enable, pcheck, fast);
 }
 
 /*
@@ -937,20 +737,21 @@ done:
  */
 static void
 check_extport(ahc, sxfrctl1)
-	struct ahc_softc *ahc;
-	u_int *sxfrctl1;
+struct ahc_softc *ahc;
+u_int *sxfrctl1;
 {
-	struct	seeprom_descriptor sd;
-	struct	seeprom_config sc;
-	u_int	scsi_conf;
-	u_int	adapter_control;
-	int	have_seeprom;
-	int	have_autoterm;
-	
-	sd.sd_ahc = ahc;
-	sd.sd_control_offset = SEECTL;		
-	sd.sd_status_offset = SEECTL;		
-	sd.sd_dataout_offset = SEECTL;		
+	struct     seeprom_descriptor sd;
+	struct     seeprom_config sc;
+	u_int   scsi_conf;
+	u_int   adapter_control;
+	int     have_seeprom;
+	int     have_autoterm;
+
+	sd.sd_tag = ahc->sc_iot;
+	sd.sd_bsh = ahc->sc_ioh;
+	sd.sd_control_offset = SEECTL;      
+	sd.sd_status_offset = SEECTL;    
+	sd.sd_dataout_offset = SEECTL;      
 
 	/*
 	 * For some multi-channel devices, the c46 is simply too
@@ -973,60 +774,47 @@ check_extport(ahc, sxfrctl1)
 	have_seeprom = acquire_seeprom(ahc, &sd);
 	if (have_seeprom) {
 
-		if (bootverbose) 
+		if (bootverbose)
 			printf("%s: Reading SEEPROM...", ahc_name(ahc));
 
 		for (;;) {
-			u_int start_addr;
+			bus_size_t start_addr;
 
 			start_addr = 32 * (ahc->channel - 'A');
 
-			have_seeprom = read_seeprom(&sd, (uint16_t *)&sc,
-						    start_addr, sizeof(sc)/2);
-
-			if (have_seeprom)
-				have_seeprom = verify_cksum(&sc);
-
-			if (have_seeprom != 0 || sd.sd_chip == C56_66) {
-				if (bootverbose) {
-					if (have_seeprom == 0)
+			have_seeprom = read_seeprom(&sd,
+						    (u_int16_t *)&sc,
+						    start_addr,
+						    sizeof(sc)/2);
+
+			if (have_seeprom) {
+				/* Check checksum */
+				int i;
+				int maxaddr;
+				u_int32_t checksum;
+				u_int16_t *scarray;
+
+				maxaddr = (sizeof(sc)/2) - 1;
+				checksum = 0;
+				scarray = (u_int16_t *)&sc;
+
+				for (i = 0; i < maxaddr; i++)
+					checksum = checksum + scarray[i];
+				if (checksum == 0
+				    || (checksum & 0xFFFF) != sc.checksum) {
+					if (bootverbose && sd.sd_chip == C56_66)
 						printf ("checksum error\n");
-					else
-						printf ("done.\n");
+					have_seeprom = 0;
+				} else {
+					if (bootverbose)
+						printf("done.\n");
+					break;
 				}
-				break;
 			}
-			sd.sd_chip = C56_66;
-		}
-		release_seeprom(&sd);
-	}
 
-	if (!have_seeprom) {
-		/*
-		 * Pull scratch ram settings and treat them as
-		 * if they are the contents of an seeprom if
-		 * the 'ADPT' signature is found in SCB2.
-		 * We manually compose the data as 16bit values
-		 * to avoid endian issues.
-		 */
-		ahc_outb(ahc, SCBPTR, 2);
-		if (ahc_inb(ahc, SCB_BASE) == 'A'
-		 && ahc_inb(ahc, SCB_BASE + 1) == 'D'
-		 && ahc_inb(ahc, SCB_BASE + 2) == 'P'
-		 && ahc_inb(ahc, SCB_BASE + 3) == 'T') {
-			uint16_t *sc_data;
-			int	  i;
-
-			sc_data = (uint16_t *)&sc;
-			for (i = 0; i < 32; i++) {
-				uint16_t val;
-				int	 j;
-
-				j = i * 2;
-				val = ahc_inb(ahc, SRAM_BASE + j)
-				    | ahc_inb(ahc, SRAM_BASE + j + 1) << 8;
-			}
-			have_seeprom = verify_cksum(&sc);
+			if (sd.sd_chip == C56_66)
+				break;
+			sd.sd_chip = C56_66;
 		}
 	}
 
@@ -1041,8 +829,8 @@ check_extport(ahc, sxfrctl1)
 		 */
 		int i;
 		int max_targ = sc.max_targets & CFMAXTARG;
-		uint16_t discenable;
-		uint16_t ultraenb;
+		u_int16_t discenable;
+		u_int16_t ultraenb;
 
 		discenable = 0;
 		ultraenb = 0;
@@ -1052,7 +840,7 @@ check_extport(ahc, sxfrctl1)
 			 * SEEPROM format.
 			 */
 			for (i = 0; i < max_targ; i++) {
-				if ((sc.device_flags[i] & CFSYNCHISULTRA) != 0){
+				if ((sc.device_flags[i] & CFSYNCHISULTRA) != 0) {
 					ahc->flags |= AHC_NEWEEPROM_FMT;
 					break;
 				}
@@ -1061,7 +849,7 @@ check_extport(ahc, sxfrctl1)
 
 		for (i = 0; i < max_targ; i++) {
 			u_int     scsirate;
-			uint16_t target_mask;
+			u_int16_t target_mask;
 
 			target_mask = 0x01 << i;
 			if (sc.device_flags[i] & CFDISC)
@@ -1073,28 +861,22 @@ check_extport(ahc, sxfrctl1)
 				ultraenb |= target_mask;
 			}
 			if ((sc.device_flags[i] & CFXFER) == 0x04
-			 && (ultraenb & target_mask) != 0) {
+				 && (ultraenb & target_mask) != 0) {
 				/* Treat 10MHz as a non-ultra speed */
 				sc.device_flags[i] &= ~CFXFER;
-			 	ultraenb &= ~target_mask;
+				ultraenb &= ~target_mask;
 			}
 			if ((ahc->features & AHC_ULTRA2) != 0) {
 				u_int offset;
 
 				if (sc.device_flags[i] & CFSYNCH)
 					offset = MAX_OFFSET_ULTRA2;
-				else 
+				else
 					offset = 0;
 				ahc_outb(ahc, TARG_OFFSET + i, offset);
 
-				/*
-				 * The ultra enable bits contain the
-				 * high bit of the ultra2 sync rate
-				 * field.
-				 */
 				scsirate = (sc.device_flags[i] & CFXFER)
-					 | ((ultraenb & target_mask)
-					    ? 0x8 : 0x0);
+				| ((ultraenb & target_mask) ? 0x8 : 0x0);
 				if (sc.device_flags[i] & CFWIDEB)
 					scsirate |= WIDEXFER;
 			} else {
@@ -1114,35 +896,15 @@ check_extport(ahc, sxfrctl1)
 		if (sc.adapter_control & CFRESETB)
 			scsi_conf |= RESET_SCSI;
 
-		ahc->flags |=
-		    (sc.adapter_control & CFBOOTCHAN) >> CFBOOTCHANSHIFT;
-
 		if (sc.bios_control & CFEXTEND)
 			ahc->flags |= AHC_EXTENDED_TRANS_A;
-
-		if (sc.bios_control & CFBIOSEN)
-			ahc->flags |= AHC_BIOS_ENABLED;
 		if (ahc->features & AHC_ULTRA
-		 && (ahc->flags & AHC_NEWEEPROM_FMT) == 0) {
+			 && (ahc->flags & AHC_NEWEEPROM_FMT) == 0) {
 			/* Should we enable Ultra mode? */
 			if (!(sc.adapter_control & CFULTRAEN))
 				/* Treat us as a non-ultra card */
 				ultraenb = 0;
 		}
-
-		if (sc.signature == CFSIGNATURE
-		 || sc.signature == CFSIGNATURE2) {
-			pcireg_t devconfig;
-
-			/* Honor the STPWLEVEL settings */
-			devconfig = ahc_pci_read_config(ahc->dev_softc, 
-							DEVCONFIG, 4);
-			devconfig &= ~STPWLEVEL;
-			if ((sc.bios_control & CFSTPWLEVEL) != 0)
-				devconfig |= STPWLEVEL;
-			ahc_pci_write_config(ahc->dev_softc,
-					     DEVCONFIG, devconfig, 4);
-		}
 		/* Set SCSICONF info */
 		ahc_outb(ahc, SCSICONF, scsi_conf);
 		ahc_outb(ahc, DISC_DSB, ~(discenable & 0xff));
@@ -1170,26 +932,26 @@ check_extport(ahc, sxfrctl1)
 	 */
 	if ((ahc->features & AHC_SPIOCAP) != 0) {
 		if ((ahc_inb(ahc, SPIOCAP) & SSPIOCPS) != 0)
-			have_autoterm = TRUE;
+			have_autoterm = 1;
 		else
-			have_autoterm = FALSE;
+			have_autoterm = 0;
 	}
 
-	if (have_autoterm) {
-		acquire_seeprom(ahc, &sd);
+	if (have_autoterm)
 		configure_termination(ahc, &sd, adapter_control, sxfrctl1);
-		release_seeprom(&sd);
-	}
+
+	release_seeprom(&sd);
 }
 
 static void
-configure_termination(struct ahc_softc *ahc,
-		      struct seeprom_descriptor *sd,
-		      u_int adapter_control,
-		      u_int *sxfrctl1)
+configure_termination(ahc, sd, adapter_control, sxfrctl1)
+struct ahc_softc *ahc;
+struct seeprom_descriptor *sd;
+u_int adapter_control;
+u_int *sxfrctl1;
 {
-	uint8_t brddat;
-	
+	u_int8_t brddat;
+
 	brddat = 0;
 
 	/*
@@ -1197,7 +959,7 @@ configure_termination(struct ahc_softc *ahc,
 	 * termination settings 
 	 */
 	*sxfrctl1 = 0;
-	
+
 	/*
 	 * SEECS must be on for the GALS to latch
 	 * the data properly.  Be sure to leave MS
@@ -1205,7 +967,7 @@ configure_termination(struct ahc_softc *ahc,
 	 */
 	SEEPROM_OUTB(sd, sd->sd_MS | sd->sd_CS);
 	if ((adapter_control & CFAUTOTERM) != 0
-	 || (ahc->features & AHC_NEW_TERMCTL) != 0) {
+		 || (ahc->features & AHC_NEW_TERMCTL) != 0) {
 		int internal50_present;
 		int internal68_present;
 		int externalcable_present;
@@ -1214,7 +976,6 @@ configure_termination(struct ahc_softc *ahc,
 		int enableSEC_high;
 		int enablePRI_low;
 		int enablePRI_high;
-		int sum;
 
 		enableSEC_low = 0;
 		enableSEC_high = 0;
@@ -1222,24 +983,23 @@ configure_termination(struct ahc_softc *ahc,
 		enablePRI_high = 0;
 		if ((ahc->features & AHC_NEW_TERMCTL) != 0) {
 			ahc_new_term_detect(ahc, &enableSEC_low,
-					       &enableSEC_high,
-					       &enablePRI_low,
-					       &enablePRI_high,
-					       &eeprom_present);
+					    &enableSEC_high,
+					    &enablePRI_low,
+					    &enablePRI_high,
+					    &eeprom_present);
 			if ((adapter_control & CFSEAUTOTERM) == 0) {
 				if (bootverbose)
 					printf("%s: Manual SE Termination\n",
-					       ahc_name(ahc));
-				enableSEC_low = (adapter_control & CFSELOWTERM);
-				enableSEC_high =
-				    (adapter_control & CFSEHIGHTERM);
+							 ahc_name(ahc));
+				enableSEC_low = (adapter_control & CFSTERM);
+				enableSEC_high = (adapter_control & CFWSTERM);
 			}
 			if ((adapter_control & CFAUTOTERM) == 0) {
 				if (bootverbose)
 					printf("%s: Manual LVD Termination\n",
 					       ahc_name(ahc));
-				enablePRI_low = (adapter_control & CFSTERM);
-				enablePRI_high = (adapter_control & CFWSTERM);
+				enablePRI_low = enablePRI_high =
+					(adapter_control & CFLVDSTERM);
 			}
 			/* Make the table calculations below happy */
 			internal50_present = 0;
@@ -1259,22 +1019,21 @@ configure_termination(struct ahc_softc *ahc,
 		if ((ahc->features & AHC_WIDE) == 0)
 			internal68_present = 0;
 
-		if (bootverbose
-		 && (ahc->features & AHC_ULTRA2) == 0) {
-			printf("%s: internal 50 cable %s present",
-			       ahc_name(ahc),
-			       internal50_present ? "is":"not");
-
-			if ((ahc->features & AHC_WIDE) != 0)
-				printf(", internal 68 cable %s present",
+		if (bootverbose) {
+			if ((ahc->features & AHC_ULTRA2) == 0) {
+				printf("%s: internal 50 cable %s present, "
+				       "internal 68 cable %s present\n",
+				       ahc_name(ahc),
+				       internal50_present ? "is":"not",
 				       internal68_present ? "is":"not");
-			printf("\n%s: external cable %s present\n",
-			       ahc_name(ahc),
-			       externalcable_present ? "is":"not");
-		}
-		if (bootverbose)
+
+				printf("%s: external cable %s present\n",
+				       ahc_name(ahc),
+				       externalcable_present ? "is":"not");
+			}
 			printf("%s: BIOS eeprom %s present\n",
 			       ahc_name(ahc), eeprom_present ? "is" : "not");
+		}
 
 		if ((ahc->flags & AHC_INT50_SPEEDFLEX) != 0) {
 			/*
@@ -1296,9 +1055,9 @@ configure_termination(struct ahc_softc *ahc,
 		 * Primary High Term Enable = BRDDAT4 (7890)
 		 */
 		if ((ahc->features & AHC_ULTRA2) == 0
-		 && (internal50_present != 0)
-		 && (internal68_present != 0)
-		 && (externalcable_present != 0)) {
+		    && (internal50_present != 0)
+		    && (internal68_present != 0)
+		    && (externalcable_present != 0)) {
 			printf("%s: Illegal cable configuration!!. "
 			       "Only two connectors on the "
 			       "adapter may be used at a "
@@ -1306,9 +1065,9 @@ configure_termination(struct ahc_softc *ahc,
 		}
 
 		if ((ahc->features & AHC_WIDE) != 0
-		 && ((externalcable_present == 0)
-		  || (internal68_present == 0)
-		  || (enableSEC_high != 0))) {
+			 && ((externalcable_present == 0)
+				  || (internal68_present == 0)
+				  || (enableSEC_high != 0))) {
 			brddat |= BRDDAT6;
 			if (bootverbose) {
 				if ((ahc->flags & AHC_INT50_SPEEDFLEX) != 0)
@@ -1318,13 +1077,14 @@ configure_termination(struct ahc_softc *ahc,
 					printf("%s: %sHigh byte termination "
 					       "Enabled\n", ahc_name(ahc),
 					       enableSEC_high ? "Secondary "
-							      : "");
+					       : "");
 			}
 		}
 
-		sum = internal50_present + internal68_present
-		    + externalcable_present;
-		if (sum < 2 || (enableSEC_low != 0)) {
+		if (((internal50_present ? 1 : 0)
+			  + (internal68_present ? 1 : 0)
+			  + (externalcable_present ? 1 : 0)) <= 1
+			 || (enableSEC_low != 0)) {
 			if ((ahc->features & AHC_ULTRA2) != 0)
 				brddat |= BRDDAT5;
 			else
@@ -1337,7 +1097,7 @@ configure_termination(struct ahc_softc *ahc,
 					printf("%s: %sLow byte termination "
 					       "Enabled\n", ahc_name(ahc),
 					       enableSEC_low ? "Secondary "
-							     : "");
+					       : "");
 			}
 		}
 
@@ -1361,7 +1121,7 @@ configure_termination(struct ahc_softc *ahc,
 				       "termination Enabled\n",
 				       ahc_name(ahc));
 		}
-		
+
 		write_brdctl(ahc, brddat);
 
 	} else {
@@ -1371,18 +1131,17 @@ configure_termination(struct ahc_softc *ahc,
 			if (bootverbose)
 				printf("%s: %sLow byte termination Enabled\n",
 				       ahc_name(ahc),
-				       (ahc->features & AHC_ULTRA2) ? "Primary "
-								    : "");
+				       (ahc->features & AHC_ULTRA2)
+				       ? "Primary " : "");
 		}
 
-		if ((adapter_control & CFWSTERM) != 0
-		 && (ahc->features & AHC_WIDE) != 0) {
+		if ((adapter_control & CFWSTERM) != 0) {
 			brddat |= BRDDAT6;
 			if (bootverbose)
 				printf("%s: %sHigh byte termination Enabled\n",
 				       ahc_name(ahc),
 				       (ahc->features & AHC_ULTRA2)
-				     ? "Secondary " : "");
+				       ? "Secondary " : "");
 		}
 
 		/*
@@ -1391,8 +1150,7 @@ configure_termination(struct ahc_softc *ahc,
 		 */
 		ahc_outb(ahc, SXFRCTL1, *sxfrctl1);
 
-		if ((ahc->features & AHC_WIDE) != 0)
-			write_brdctl(ahc, brddat);
+		write_brdctl(ahc, brddat);
 	}
 	SEEPROM_OUTB(sd, sd->sd_MS); /* Clear CS */
 }
@@ -1400,12 +1158,12 @@ configure_termination(struct ahc_softc *ahc,
 static void
 ahc_new_term_detect(ahc, enableSEC_low, enableSEC_high, enablePRI_low, 
 		    enablePRI_high, eeprom_present)
-	struct ahc_softc *ahc;
-	int *enableSEC_low;
-	int *enableSEC_high;
-	int *enablePRI_low;
-	int *enablePRI_high;
-	int *eeprom_present;
+struct ahc_softc *ahc;
+int *enableSEC_low;
+int *enableSEC_high;
+int *enablePRI_low;
+int *enablePRI_high;
+int *eeprom_present;
 {
 	u_int8_t brdctl;
 
@@ -1427,11 +1185,11 @@ ahc_new_term_detect(ahc, enableSEC_low, enableSEC_high, enablePRI_low,
 static void
 aic787X_cable_detect(ahc, internal50_present, internal68_present,
 		     externalcable_present, eeprom_present)
-	struct ahc_softc *ahc;
-	int *internal50_present;
-	int *internal68_present;
-	int *externalcable_present;
-	int *eeprom_present;
+struct ahc_softc *ahc;
+int *internal50_present;
+int *internal68_present;
+int *externalcable_present;
+int *eeprom_present;
 {
 	u_int8_t brdctl;
 
@@ -1450,8 +1208,8 @@ aic787X_cable_detect(ahc, internal50_present, internal68_present,
 	 * BRDDAT7 is INT68.
 	 */
 	brdctl = read_brdctl(ahc);
-	*internal50_present = (brdctl & BRDDAT6) ? 0 : 1;
-	*internal68_present = (brdctl & BRDDAT7) ? 0 : 1;
+	*internal50_present = !(brdctl & BRDDAT6);
+	*internal68_present = !(brdctl & BRDDAT7);
 
 	/*
 	 * Set the rom bank to 1 and determine
@@ -1465,33 +1223,33 @@ aic787X_cable_detect(ahc, internal50_present, internal68_present,
 	 * BRDDAT7 is EPROMPS.
 	 */
 	brdctl = read_brdctl(ahc);
-	*externalcable_present = (brdctl & BRDDAT6) ? 0 : 1;
-	*eeprom_present = (brdctl & BRDDAT7) ? 1 : 0;
+	*externalcable_present = !(brdctl & BRDDAT6);
+	*eeprom_present = brdctl & BRDDAT7;
 }
 
 static void
 aic785X_cable_detect(ahc, internal50_present, externalcable_present,
 		     eeprom_present)
-	struct ahc_softc *ahc;
-	int *internal50_present;
-	int *externalcable_present;
-	int *eeprom_present;
+struct ahc_softc *ahc;
+int *internal50_present;
+int *externalcable_present;
+int *eeprom_present;
 {
 	u_int8_t brdctl;
 
 	ahc_outb(ahc, BRDCTL, BRDRW|BRDCS);
 	ahc_outb(ahc, BRDCTL, 0);
 	brdctl = ahc_inb(ahc, BRDCTL);
-	*internal50_present = (brdctl & BRDDAT5) ? 0 : 1;
-	*externalcable_present = (brdctl & BRDDAT6) ? 0 : 1;
+	*internal50_present = !(brdctl & BRDDAT5);
+	*externalcable_present = !(brdctl & BRDDAT6);
 
-	*eeprom_present = (ahc_inb(ahc, SPIOCAP) & EEPROM) ? 1 : 0;
+	*eeprom_present = (ahc_inb(ahc, SPIOCAP) & EEPROM) != 0;
 }
 
 static void
 write_brdctl(ahc, value)
-	struct   ahc_softc *ahc;
-	u_int8_t value;
+struct   ahc_softc *ahc;
+u_int8_t value;
 {
 	u_int8_t brdctl;
 
@@ -1505,16 +1263,16 @@ write_brdctl(ahc, value)
 		brdctl = BRDSTB|BRDCS;
 	}
 	ahc_outb(ahc, BRDCTL, brdctl);
-	ahc_flush_device_writes(ahc);
+	DELAY(20);
 	brdctl |= value;
 	ahc_outb(ahc, BRDCTL, brdctl);
-	ahc_flush_device_writes(ahc);
+	DELAY(20);
 	if ((ahc->features & AHC_ULTRA2) != 0)
 		brdctl |= BRDSTB_ULTRA2;
 	else
 		brdctl &= ~BRDSTB;
 	ahc_outb(ahc, BRDCTL, brdctl);
-	ahc_flush_device_writes(ahc);
+	DELAY(20);
 	if ((ahc->features & AHC_ULTRA2) != 0)
 		brdctl = 0;
 	else
@@ -1524,7 +1282,7 @@ write_brdctl(ahc, value)
 
 static u_int8_t
 read_brdctl(ahc)
-	struct   ahc_softc *ahc;
+struct   ahc_softc *ahc;
 {
 	u_int8_t brdctl;
 	u_int8_t value;
@@ -1539,7 +1297,7 @@ read_brdctl(ahc)
 		brdctl = BRDRW|BRDCS;
 	}
 	ahc_outb(ahc, BRDCTL, brdctl);
-	ahc_flush_device_writes(ahc);
+	DELAY(20);
 	value = ahc_inb(ahc, BRDCTL);
 	ahc_outb(ahc, BRDCTL, 0);
 	return (value);
@@ -1547,8 +1305,8 @@ read_brdctl(ahc)
 
 static int
 acquire_seeprom(ahc, sd)
-	struct ahc_softc *ahc;
-	struct seeprom_descriptor *sd;
+struct ahc_softc *ahc;
+struct seeprom_descriptor *sd;
 {
 	int wait;
 
@@ -1577,7 +1335,7 @@ acquire_seeprom(ahc, sd)
 
 static void
 release_seeprom(sd)
-	struct seeprom_descriptor *sd;
+struct seeprom_descriptor *sd;
 {
 	/* Release access to the memory port and the serial EEPROM. */
 	SEEPROM_OUTB(sd, 0);
@@ -1590,61 +1348,50 @@ release_seeprom(sd)
 #define STA	PCI_STATUS_TARGET_TARGET_ABORT
 #define DPR	PCI_STATUS_PARITY_ERROR
 
-#define PCIDEBUG
-#ifdef	PCIDEBUG
-#define	PCI_PRINT(Printstuff) printf Printstuff
-#else
-#define	PCI_PRINT(Printstuff)
-#endif
-
 int
 ahc_pci_intr(ahc)
-	struct ahc_softc *ahc;
+struct ahc_softc *ahc;
 {
 	pcireg_t status1;
+	struct ahc_pci_data *pd = ahc->pci_data;
 
 	if ((ahc_inb(ahc, ERROR) & PCIERRSTAT) == 0)
 		return 0;
-  	PCI_PRINT(("%s: PCI error Interrupt at seqaddr = 0x%x\n",
-		   ahc_name(ahc), 
-		   ahc_inb(ahc, SEQADDR0) | (ahc_inb(ahc, SEQADDR1) << 8)));
- 
-	status1 = ahc_pci_read_config(ahc->dev_softc, PCI_COMMAND_STATUS_REG, 4);
+
+	status1 = pci_conf_read(pd->pc, pd->tag, PCI_COMMAND_STATUS_REG);
 
 /* define AHC_SHOW_PCI_ERRORS to get painful errors on your i386 console */
-#ifdef AHC_SHOW_PCI_ERRORS
+#ifdef AHC_SHOW_PCI_ERRORS	
 	if (status1 & DPE) {
-		PCI_PRINT(("%s: Data Parity Error Detected during address "
-			   "or write data phase\n", ahc_name(ahc)));
+		printf("%s: Data Parity Error Detected during address "
+				 "or write data phase\n", ahc_name(ahc));
 	}
 #endif
 	if (status1 & SSE) {
-		PCI_PRINT(("%s: Signal System Error Detected\n", ahc_name(ahc)));
+		printf("%s: Signal System Error Detected\n", ahc_name(ahc));
 	}
 	if (status1 & RMA) {
-		PCI_PRINT(("%s: Received a Master Abort\n", ahc_name(ahc)));
+		printf("%s: Received a Master Abort\n", ahc_name(ahc));
 	}
 	if (status1 & RTA) {
-		PCI_PRINT(("%s: Received a Target Abort\n", ahc_name(ahc)));
+		printf("%s: Received a Target Abort\n", ahc_name(ahc));
 	}
 	if (status1 & STA) {
-		PCI_PRINT(("%s: Signaled a Target Abort\n", ahc_name(ahc)));
+		printf("%s: Signaled a Target Abort\n", ahc_name(ahc));
 	}
 	if (status1 & DPR) {
-		PCI_PRINT(("%s: Data Parity Error has been reported via PERR#\n",
-			   ahc_name(ahc)));
+		printf("%s: Data Parity Error has been reported via PERR#\n",
+				 ahc_name(ahc));
 	}
-	
-	ahc_pci_write_config(ahc->dev_softc, PCI_COMMAND_STATUS_REG, status1, 4);
-
 	if ((status1 & (DPE|SSE|RMA|RTA|STA|DPR)) == 0) {
 		printf("%s: Latched PCIERR interrupt with "
-		       "no status bits set\n", ahc_name(ahc)); 
-	} else {
+				 "no status bits set\n", ahc_name(ahc)); 
+	}
+	pci_conf_write(pd->pc, pd->tag, PCI_COMMAND_STATUS_REG, status1);
+
+	if (status1 & (DPR|RMA|RTA)) {
 		ahc_outb(ahc, CLRINT, CLRPARERR);
 	}
-	
-	ahc_unpause(ahc);
 
 	return 1;
 }