diff -u --recursive --new-file v2.0.12/linux/CREDITS linux/CREDITS
--- v2.0.12/linux/CREDITS	Sat Aug 10 10:03:14 1996
+++ linux/CREDITS	Mon Aug 12 13:33:48 1996
@@ -32,7 +32,7 @@
 D: Author of the SYSLINUX boot loader, maintainer of the linux.* news
 D: hierarchy and the Linux Device List; various kernel hacks
 S: 4390 Albany Dr. #46
-S: San Jose CA 95129
+S: San Jose, California 95129
 S: USA
 
 N: Derek Atkins
@@ -210,7 +210,7 @@
 E: chaffee@plateau.cs.berkeley.edu
 D: vfat filesystem
 S: 3674 Oakwood Terrace #201
-S: Fremont, CA 94536
+S: Fremont, California 94536
 S: USA
 
 N: Chih-Jen Chang     
@@ -466,7 +466,7 @@
 D: Loopback speedup, qlogic scsi hacking, VT_LOCKSWITCH
 S: Department of Computer Science
 S: University of California, Riverside
-S: Riverside, CA  92521-0304
+S: Riverside, California  92521-0304
 S: USA
 
 N: Dmitry S. Gorodchanin
@@ -490,7 +490,7 @@
 E: jgotts@engin.umich.edu
 D: kernel hacker
 S: 8124 Constitution Apt. 7
-S: Sterling Heights, MI  48313
+S: Sterling Heights, Michigan  48313
 S: USA
 
 N: Grant Guenther
@@ -558,7 +558,7 @@
 E: rth@tamu.edu
 D: Alpha/ELF, gcc, binutils, and glibc
 S: 304 E. North Ave.
-S: Bryan, TX  77801-3431
+S: Bryan, Texas  77801-3431
 S: USA
 
 N: Sebastian Hetze
@@ -589,7 +589,7 @@
 W: http://www.nurk.org/
 D: Berkshire PC Watchdog Driver
 S: PO Box 15
-S: Grants Pass, OR 97526
+S: Grants Pass, Oregon 97526
 S: USA
 
 N: Nick Holloway
@@ -822,7 +822,7 @@
 S: 00200 Helsinki
 S: Finland
 
-N: Kai M"akisara
+N: Kai Mäkisara
 E: Kai.Makisara@metla.fi
 D: SCSI Tape Driver
 
@@ -1089,23 +1089,27 @@
 D: The Linux Support Team Erlangen
 
 N: Daniel Quinlan
-E: quinlan@yggdrasil.com
-D: FSSTND Coordinator
-S: 816 Saratoga Avenue, Apartment M208
-S: San Jose, California 95129
+E: Daniel.Quinlan@linux.org
+W: http://www.bucknell.edu/~quinlan
+D: FSSTND coordinator; FHS editor
+D: random Linux documentation, patches, and hacks
+S: Box C-5083
+S: Bucknell University
+S: Lewisburg, Pennsylvania 17837
 S: USA
 
 N: Eric S. Raymond
 E: esr@thyrsus.com
 W: http://www.ccil.org/~esr/home.html
-S: 22 South Warren Avenue
-S: Malvern, PA 19355 USA
 D: ncurses library co-maintainer
 D: terminfo master file maintainer
 D: Distributions HOWTO editor
 D: Instigator, FHS standard
 D: Keeper of the Jargon File and curator of the Retrocomputing Museum
 D: Author, Emacs VC and GUD modes
+S: 22 South Warren Avenue
+S: Malvern, Pennsylvania 19355
+S: USA
 
 N: Stefan Reinauer
 E: stepan@home.culture.mipt.ru
@@ -1120,7 +1124,7 @@
 W: http://www.cfw.com/~roadcapw
 D: Author of menu based configuration tool, Menuconfig.
 S: 1407 Broad Street
-S: Waynesboro, Va  22980
+S: Waynesboro, Virginia  22980
 S: USA
 
 N: Florian La Roche
@@ -1198,7 +1202,7 @@
 E: sinster@darkwater.com
 D: Whatever I notice needs doing (so far: itimers, /proc)
 S: POB 64132
-S: Sunnyvale, CA 94088-4132
+S: Sunnyvale, California 94088-4132
 S: USA
 
 N: Simon Shapiro
@@ -1225,7 +1229,7 @@
 E: jshiffle@netcom.com
 D: Always IN2000 SCSI driver
 D: wd33c93 SCSI driver (linux-m68k)
-S: San Jose, CA
+S: San Jose, California
 S: USA
 
 N: Rick Sladkey
@@ -1369,7 +1373,7 @@
 S: Taipei 
 S: Taiwan 112, Republic of China
 S: 24335 Delta Drive
-S: Diamond Bar, CA 91765
+S: Diamond Bar, California 91765
 S: USA
 
 N: Simmule Turner
@@ -1456,7 +1460,7 @@
 S: Cornell University Computer Science Department
 S: Robotics and Vision Laboratory
 S: 4130 Upson Hall
-S: Ithaca NY 14850
+S: Ithaca, New York 14850
 S: USA
 
 N: Greg Wettstein
@@ -1470,7 +1474,7 @@
 S: Oncology Research Division Computing Facility
 S: Roger Maris Cancer Center
 S: 820 4th St. N.
-S: Fargo, ND  58122
+S: Fargo, North Dakota  58122
 S: USA
 
 N: Hans-Joachim Widmaier
diff -u --recursive --new-file v2.0.12/linux/Documentation/cdrom/00-INDEX linux/Documentation/cdrom/00-INDEX
--- v2.0.12/linux/Documentation/cdrom/00-INDEX	Thu Jun  6 14:57:43 1996
+++ linux/Documentation/cdrom/00-INDEX	Mon Aug 12 13:44:46 1996
@@ -21,7 +21,7 @@
 optcd
 	- info on the Optics Storage 8000 AT CD-ROM driver
 sbpcd
-	- info on the SoundBlaster Pro CD-ROM interface driver.
+	- info on the SoundBlaster/Panasonic CD-ROM interface driver.
 sjcd
 	- info on the SANYO CDR-H94A CD-ROM interface driver.
 sonycd535
diff -u --recursive --new-file v2.0.12/linux/Documentation/cdrom/cdrom-standard.tex linux/Documentation/cdrom/cdrom-standard.tex
--- v2.0.12/linux/Documentation/cdrom/cdrom-standard.tex	Sat May 18 11:15:10 1996
+++ linux/Documentation/cdrom/cdrom-standard.tex	Wed Aug 14 10:21:03 1996
@@ -1,5 +1,5 @@
 \documentclass{article}
-\def\version{$Id: cdrom-standard.tex,v 0.6 1996/05/14 15:42:39 david Exp david $}
+\def\version{$Id: cdrom-standard.tex,v 0.8 1996/08/10 10:57:16 david Exp $}
 
 \evensidemargin=0pt
 \oddsidemargin=0pt
@@ -11,6 +11,7 @@
 \def\cdromc{{\tt cdrom.c}}
 \def\cdromh{{\tt cdrom.h}}
 \def\ucdrom{{\tt ucdrom.h}}
+\def\fo{\sl}
 
 \everymath{\it} \everydisplay{\it}
 \catcode `\_=\active \def_{\_\penalty100 }
@@ -33,82 +34,103 @@
 write a driver for Linux (source code examples).
 \end{itemize}
 The vast choice and openness has lead not only to a wide support of
-hardware devices, but also to a certain divergence in behavior. Especially
-for \cdrom\ devices, the way a particular drive reacts to a `standard'
-$ioctl()$ call varies a lot from one brand to another; until today, the
-\linux\ \cdrom\ driver writers kept away from wilderness by a good practice:
-to evolve a new driver by copying, understanding and changing an existing
-one.
-
-Since the beginning of the \cdrom, many different interfaces developed.
-Some of them had their own proprietary design (Sony, Mitsumi, Panasonic),
-other manufacturers adopted an existing electrical interface and changed
-the functionality (CreativeLabs/SoundBlaster, Teac, Funai) or simply adapted
-their drives to one or more of the already existing electrical interfaces
-(Aztech, Sanyo, Funai, Vertos, Longshine, Optics Storage and most of the
-`NoName' manufacturers).
-In cases where a new drive really brought his own interface or used his
-own command set and flow control scheme, either a separate driver had to
-be written, or an existing driver had to get enhanced.
+hardware devices, but also to a certain divergence in behavior.
+Especially for \cdrom\ devices, the way a particular drive reacts to a
+`standard' $ioctl()$ call varies a lot from one brand to another;
+however, the \linux\ \cdrom\ driver writers kept away from wilderness
+by the practice of evolving a new driver by copying, understanding and
+changing an existing one.
+
+Since the beginning of the \cdrom, many different interfaces
+developed.  Some of them had their own proprietary design (Sony,
+Mitsumi, Panasonic, Philips), other manufacturers adopted an existing
+electrical interface and changed the functionality
+(CreativeLabs/SoundBlaster, Teac, Funai) or simply adapted their
+drives to one or more of the already existing electrical interfaces
+(Aztech, Sanyo, Funai, Vertos, Longshine, Optics Storage and most of
+the `NoName' manufacturers).  In cases where a new drive really
+brought his own interface or used his own command set and flow control
+scheme, either a separate driver had to be written, or an existing
+driver had to get enhanced.
 
 Nowadays, almost all new \cdrom\ types are either ATAPI/IDE or SCSI;
 it is very unlikely that any manufacturer still will create a new
 interface, and new drives for the existing proprietary interfaces are
-getting rare.
-But history has delivered us \cdrom\ support for many different interfaces.
+getting rare.  But history has delivered us \cdrom\ support for many
+different interfaces.
 
-Some of the \linux\ \cdrom\ driver writers look at the existing standard
-which is expressed through \cdromh\ as to a rather wild set of
-commands and data formats and feel that any structure is lost, and from
-this point of view, this documentation shall help to achieve a common
-programming interface.
+When (in the 1.3.70's) I looked at the existing interface which is
+expressed through \cdromh\ it appeared to be a rather wild set of
+commands and data formats.\footnote{I cannot recollect what kernel
+  version I looked at, then, presumably 1.2.13 and 1.3.34---the latest
+  kernel that I was indirectly involved in.} It seemed that many
+features of the interface have been added to include certain specific
+capabilities of certain drives, in an {\fo ad hoc\/} manner. More
+importantly, it appeared that actual execution of the commands is
+different for most of the different drivers: e.g., some drivers close
+the tray if an $open()$ call occurs while the tray is unloaded, while
+others do not. Some drivers lock the door upon opening the device, to
+prevent an incoherent file system, but others don't, to allow software
+ejection.  Undoubtedly, the capabilities of the different drives vary,
+but even when two drives have the same capability the driver behavior
+may be different.
+
+I decided to start a discussion on how to improve uniformity,
+addressing all \cdrom-driver developers found in the various driver
+files. The reactions encouraged me to write a uniform (compatible)
+software level \cdromc\ to which this document is the documentation.
+In the mean time, the data structure definitions in \cdromh\ had been
+cleaned up a lot---which was very helpful for the new code.
  
-Others---mainly those who used the already existing drivers not only
-as a coding example, but also as a `user interface' reference during
+\begin{quote}
+\small
+[Apparently, not all \cdrom\ developers support this initiative.
+They---mainly those who used the already existing drivers not only as
+a coding example, but also as a `user interface' reference during
 their own development---have taken care that \cdromh\ reflects a
 software interface to `user programs' which is unique between all
 drivers as much as possible; these driver writers will continue to
 refine the existing \cdromh\ where it seems necessary, and they tend
 to look if any newly requested functionality isn't already there
-before they are ready to define new structures. The sbpcd driver gives
-an example that it is possible to let a robot arm play juke
+before they are ready to define new structures. The {\tt sbpcd} driver
+gives an example that it is possible to let a robot arm play juke
 box---either with audio or with data CDs---and that it is possible to
 let the juke box work on even if a disk has fallen upon the floor and
 the drive door has closed without having a disk inside; without any
 new software layer or any structures which are not already present in
 \cdromh.  This `other' group of \linux\ \cdrom\ driver writers
 explicitly does {\em not\/} support the idea to define an additional
-software layer between driver and user program.
+software layer between driver and user program.]\parfillskip=0pt
+\end{quote}
 
-The following text reflects the opinion of the first mentioned \linux\ 
-\cdrom\ driver writer group only; the other group (not only the `silent
-majority') sees this text as a good base for a future documentation of the
-existing common \linux\ \cdrom\ programming interface, as it is stated 
-within \cdromh. Where \cdromh\ needs some external 
-explanation, this text can give it if the reader is aware that---at least
-at the moment---this text claims to be the proposal of something else than
-\cdromh.
-
-
-Apart from the somewhat unstructured interfacing with software, the
-actual execution of the commands is different for most of the
-different drivers: e.g., some drivers close the tray if an $open()$ call
-occurs while the tray is unloaded, while others do not. Some drivers lock the
-door upon opening the device, to prevent an incoherent file system,
-but others don't, to allow software ejection. Undoubtedly, the
-capabilities of the different drives vary, but even when two drives have
-the same capability the driver behavior may be different. 
-
-Personally, I think that the most important drive interfaces will be
-the IDE/ATAPI drives and of course the SCSI drives, but as prices of
-hardware drop continuously, it is not unlikely that people will have
-more than one \cdrom\ drive, possibly of mixed types.  (In December
-1994, one of the cheapest \cdrom\ drives was a Philips cm206, a
-double-speed proprietary drive. In the months that I was busy writing
-a \linux\ driver for it, proprietary drives became old-fashioned and
-IDE/ATAPI drives became standard. At the time of writing (April 1996)
-the cheapest double speed drive is IDE and at one fifth of the price
-of its predecessor. Eight speed drives are available now.)
+The effort (\cdromc) of which this is the documentation is {\em not\/}
+meant to drive a wedge between two groups of driver developers, but
+rather to enable sharing of `strategic code' among drivers. The code
+should {\em not\/} be viewed as a new interface to user-level
+programs, but rather as a new interface between driver code and
+kernel. 
+
+Care is taken that 100\,\% compatibility exists with the data
+structures and programmer's interface defined in \cdromh, and in order
+not to interfere with ongoing development in \cdromh, any `new' data
+structures have been put in a separate header file called \ucdrom.
+Because the data structures of \cdromh\ are fully supported, this
+documentation may also be of help to the programmers using the
+interface defined in \cdromh, but this guide is primarily written to
+help \cdrom\ driver developers adapt their code to use the `common
+\cdrom' code in \cdromc.
+
+Personally, I think that the most important hardware interfaces will
+be the IDE/ATAPI drives and of course the SCSI drives, but as prices
+of hardware drop continuously, it is not unlikely that people will
+have more than one \cdrom\ drive, possibly of mixed types. It is
+important that these drives behave in the same way. (In December 1994,
+one of the cheapest \cdrom\ drives was a Philips cm206, a double-speed
+proprietary drive. In the months that I was busy writing a \linux\ 
+driver for it, proprietary drives became old-fashioned and IDE/ATAPI
+drives became standard. At the time of writing (April 1996) the
+cheapest double speed drive is IDE and at one fifth of the price of
+its predecessor. Eight speed drives are available now.)
 
 This document defines (in pre-release versions: proposes) the various
 $ioctl$s, and the way the drivers should implement this.
@@ -125,12 +147,16 @@
 used when (at least part of) the \cdrom-device driver authors support
 the idea, an `I' is used for personal opinions} propose to define
 another software-level, that separates the $ioctl()$ and $open()$
-implementation from the actual hardware implementation. We believe
-that \cdrom\ drives are specific enough (i.e., different from other
-block-devices such as floppy or hard disc drives), to define a set of
-{\em \cdrom\ device operations}, $<cdrom-device>_dops$. These are of a
-different nature than the classical block-device file operations
-$<block-device>_fops$.
+implementation from the actual hardware implementation. Note that we
+do not wish to alter the existing application interface defined in
+\cdromh, but rather want to re-root the hardware-implementation through
+some common code. 
+
+We believe that \cdrom\ drives are specific enough (i.e., different
+from other block-devices such as floppy or hard disc drives), to
+define a set of {\em \cdrom\ device operations},
+$<cdrom-device>_dops$. These are of a different nature than the
+classical block-device file operations $<block-device>_fops$.
 
 The extra interfacing level routines are implemented in a file
 \cdromc, and a low-level \cdrom\ driver hands over the interfacing to
@@ -198,7 +224,7 @@
 \noalign{\medskip}
   &\llap{const\ }int& capability;&  capability flags \cr
   &int& mask;& mask of capability: disables them \cr
-  &\llap{$const\ $}float& speed;&  maximum speed for reading data \cr
+  &\llap{$const\ $}int& speed;&  maximum speed for reading data \cr
   &\llap{$const\ $}int& minors;& number of supported minor devices \cr
   &\llap{$const\ $}int& capacity;& number of discs in jukebox \cr
 \noalign{\medskip}
@@ -661,7 +687,7 @@
 user can replace it. 
 \end{description}
 We hope that these option can convince everybody (both driver
-maintainers and user program developers) to adapt to the new cdrom
+maintainers and user program developers) to adapt to the new \cdrom\
 driver scheme and option flag interpretation. 
 
 \section{Description of routines in \cdromc}
@@ -791,7 +817,7 @@
   First disc is numbered 0. The number $arg$ is checked against the
   maximum number of discs in the juke-box found in the $cdrom_dops$.
 \item[CDROM_MEDIA_CHANGED] Returns 1 if a disc has been changed since
-  the last call. Note that calls to cdrom_$media_changed$ by the VFS
+  the last call. Note that calls to $cdrom_media_changed$ by the VFS
   are treated by an independent queue, so both mechanisms will detect
   a media change once. Currently, \cdromc\ implements maximum 16 minors
   per major device.
@@ -817,7 +843,7 @@
 \item Get hold of the files \cdromc\ and \ucdrom, they should be in
 the directory tree that came with this documentation. 
 \item Include {\tt \char`\<linux/ucdrom.h>} just after {\tt cdrom.h}.
-\item change the 3rd argument of $register_blkdev$ from
+\item Change the 3rd argument of $register_blkdev$ from
 $\&<your-drive>_fops$ to $\&cdrom_fops$. 
 \item Just after that line, add a line to register to the \cdrom\
 routines: 
diff -u --recursive --new-file v2.0.12/linux/MAINTAINERS linux/MAINTAINERS
--- v2.0.12/linux/MAINTAINERS	Sat Aug 10 10:03:14 1996
+++ linux/MAINTAINERS	Mon Aug 12 13:44:46 1996
@@ -172,7 +172,7 @@
 S:      Odd fixes (e.g., new signatures)
 
 SCSI TAPE DRIVER
-P:	Kai Mdkisara
+P:	Kai Mäkisara
 M:	Kai.Makisara@metla.fi
 L:	linux-scsi@vger.rutgers.edu
 S:	Maintained
@@ -322,6 +322,18 @@
 P:	Juergen E. Fischer
 M:	Juergen Fischer <fischer@et-inf.fho-emden.de>
 L:	linux-scsi@vger.rutgers.edu
+S:	Maintained
+
+SBPCD CDROM DRIVER
+P:	Eberhard Moenkeberg
+M:	emoenke@gwdg.de
+L:	linux-kernel@vger.rutgers.edu
+S:	Maintained
+
+NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
+P:	Eberhard Moenkeberg
+M:	emoenke@gwdg.de
+L:	linux-kernel@vger.rutgers.edu
 S:	Maintained
 
 CREDITS FILE
diff -u --recursive --new-file v2.0.12/linux/Makefile linux/Makefile
--- v2.0.12/linux/Makefile	Sat Aug 10 10:03:14 1996
+++ linux/Makefile	Mon Aug 12 11:10:50 1996
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 0
-SUBLEVEL = 12
+SUBLEVEL = 13
 
 ARCH = i386
 
diff -u --recursive --new-file v2.0.12/linux/arch/alpha/kernel/process.c linux/arch/alpha/kernel/process.c
--- v2.0.12/linux/arch/alpha/kernel/process.c	Mon Aug  5 10:13:50 1996
+++ linux/arch/alpha/kernel/process.c	Thu Aug 15 11:33:18 1996
@@ -81,6 +81,17 @@
 }
 
 /*
+ * Re-start a thread when doing execve()
+ */
+void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
+{
+	current->tss.segment = USER_DS;
+	regs->pc = pc;
+	regs->ps = 8;
+	wrusp(sp);
+}
+
+/*
  * Free current thread data structures etc..
  */
 void exit_thread(void)
diff -u --recursive --new-file v2.0.12/linux/arch/alpha/mm/init.c linux/arch/alpha/mm/init.c
--- v2.0.12/linux/arch/alpha/mm/init.c	Sun Apr 14 11:43:56 1996
+++ linux/arch/alpha/mm/init.c	Tue Aug 13 09:27:47 1996
@@ -132,6 +132,7 @@
 	pgd_val(swapper_pg_dir[1023]) = (newptbr << 32) | pgprot_val(PAGE_KERNEL);
 	init_task.tss.ptbr = newptbr;
 	init_task.tss.flags = 1;
+	init_task.tss.segment = KERNEL_DS;
 	init_task.kernel_stack_page = INIT_STACK;
 	load_PCB(&init_task.tss);
 
diff -u --recursive --new-file v2.0.12/linux/arch/i386/kernel/process.c linux/arch/i386/kernel/process.c
--- v2.0.12/linux/arch/i386/kernel/process.c	Mon Aug  5 10:13:50 1996
+++ linux/arch/i386/kernel/process.c	Tue Aug 13 09:11:35 1996
@@ -25,6 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/config.h>
 #include <linux/unistd.h>
+#include <linux/delay.h>
 
 #include <asm/segment.h>
 #include <asm/pgtable.h>
@@ -206,6 +207,7 @@
 			for(j = 0; j < 100000 ; j++)
 				/* nothing */;
 			outb(0xfe,0x64);	 /* pulse reset low */
+			udelay(10);
 		}
 		__asm__ __volatile__("\tlidt %0": "=m" (no_idt));
 	}
diff -u --recursive --new-file v2.0.12/linux/arch/i386/kernel/time.c linux/arch/i386/kernel/time.c
--- v2.0.12/linux/arch/i386/kernel/time.c	Sun Jun  2 12:37:09 1996
+++ linux/arch/i386/kernel/time.c	Wed Aug 14 19:09:52 1996
@@ -68,7 +68,7 @@
 		 */
 		if (test_bit(TIMER_BH, &bh_active) )
 		{
-			missing_time = 997670/HZ;
+			missing_time = 1000020/HZ;
 		}
 
 		/* Get last timer tick in absolute kernel time */
@@ -90,7 +90,7 @@
 			:"r" (tmp),
 			 "0" (eax), "1" (edx));
 
-		edx = 997670/HZ;
+		edx = 1000020/HZ;
 		tmp = eax;
 		eax = 0;
 
@@ -111,7 +111,7 @@
 	eax -= low_timer;
 
 	/*
-	 * Time offset = (997670/HZ * time_low) / quotient.
+	 * Time offset = (1000020/HZ * time_low) / quotient.
 	 */
 
 	__asm__("mull %2"
@@ -124,8 +124,8 @@
 	 * we need to check the result so that we'll get a timer
 	 * that is monotonic.
 	 */
-	if (edx >= 997670/HZ)
-		edx = 997670/HZ-1;
+	if (edx >= 1000020/HZ)
+		edx = 1000020/HZ-1;
 
 	eax = edx + missing_time;
 	return eax;
diff -u --recursive --new-file v2.0.12/linux/drivers/block/cmd640.c linux/drivers/block/cmd640.c
--- v2.0.12/linux/drivers/block/cmd640.c	Sat Aug 10 10:03:14 1996
+++ linux/drivers/block/cmd640.c	Tue Aug 13 08:40:32 1996
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/block/cmd640.c	Version 0.99  Aug  6, 1996
+ *  linux/drivers/block/cmd640.c	Version 1.01  Aug 12, 1996
  *
  *  Copyright (C) 1995-1996  Linus Torvalds & authors (see below)
  */
@@ -17,8 +17,7 @@
  *  to work on every motherboard design that uses this screwed chip seems
  *  bloody well impossible.  However, we're still trying.
  *
- *  Version 0.96 worked for just about everybody.
- *  Version 0.97 should work for everyone
+ *  Version 0.97 worked for everybody.
  *
  *  User feedback is essential.  Many thanks to the beta test team:
  *
@@ -92,6 +91,9 @@
  *			other minor tune-ups:  0.96 was very good.
  *  Version 0.98	ignore PCI version when disabled by BIOS
  *  Version 0.99	display setup/active/recovery clocks with PIO mode
+ *  Version 1.00	Mmm.. cannot depend on PCMD_ENA in all systems
+ *  Version 1.01	slow/fast devsel can be selected with "hdparm -p6/-p7"
+ *			 ("fast" is necessary for 32bit I/O in some systems)
  */
 
 #undef REALLY_SLOW_IO		/* most systems can safely undef this */
@@ -291,10 +293,12 @@
 		if (get_cmd640_reg(i) != ven_dev[i])
 			return 0;
 	}
+#ifdef STUPIDLY_TRUST_BROKEN_PCMD_ENA_BIT
 	if ((get_cmd640_reg(PCMD) & PCMD_ENA) == 0) {
 		printk("ide: cmd640 on PCI disabled by BIOS\n");
 		return 0;
 	}
+#endif /* STUPIDLY_TRUST_BROKEN_PCMD_ENA_BIT */
 	return 1; /* success */
 }
 
@@ -634,6 +638,7 @@
  */
 static void cmd640_tune_drive (ide_drive_t *drive, byte mode_wanted)
 {
+	byte b;
 	ide_pio_data_t  d;
 	unsigned int index = 0;
 
@@ -643,18 +648,23 @@
 			return;
 		}
 	}
-	/*
-	 * If the user asks for pio_mode 9 (no such mode),
-	 * we take it to mean "turn ON prefetch" for this drive.
-	 *
-	 * If the user asks for pio_mode 8 (no such mode),
-	 * we take it to mean "turn OFF prefetch" for this drive.
-	 */
-	if ((mode_wanted & 0xfe) == 0x08) {	/* program prefetch? */
-		mode_wanted &= 1;
-		set_prefetch_mode(index, mode_wanted);
-		printk("%s: %sabled cmd640 prefetch\n", drive->name, mode_wanted ? "en" : "dis");
-		return;
+	switch (mode_wanted) {
+		case 6: /* set fast-devsel off */
+		case 7: /* set fast-devsel on */
+			mode_wanted &= 1;
+			b = get_cmd640_reg(CNTRL) & ~0x27;
+			if (mode_wanted)
+				b |= 0x27;
+			put_cmd640_reg(CNTRL, b);
+			printk("%s: %sabled cmd640 fast host timing (devsel)\n", drive->name, mode_wanted ? "en" : "dis");
+			return;
+
+		case 8: /* set prefetch off */
+		case 9: /* set prefetch on */
+			mode_wanted &= 1;
+			set_prefetch_mode(index, mode_wanted);
+			printk("%s: %sabled cmd640 prefetch\n", drive->name, mode_wanted ? "en" : "dis");
+			return;
 	}
 
 	(void) ide_get_best_pio_mode (drive, mode_wanted, 5, &d);
diff -u --recursive --new-file v2.0.12/linux/drivers/block/ide.c linux/drivers/block/ide.c
--- v2.0.12/linux/drivers/block/ide.c	Sat Aug 10 10:03:14 1996
+++ linux/drivers/block/ide.c	Mon Aug 12 10:24:26 1996
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/block/ide.c	Version 5.49  Aug  4, 1996
+ *  linux/drivers/block/ide.c	Version 5.51  Aug  10, 1996
  *
  *  Copyright (C) 1994-1996  Linus Torvalds & authors (see below)
  */
@@ -257,6 +257,8 @@
  *			prevent use of io_32bit on cmd640 with no prefetch
  * Version 5.49		fix minor quirks in probing routines
  * Version 5.50		allow values as small as 20 for idebus=
+ * Version 5.51		force non io_32bit in drive_cmd_intr()
+ *			change delay_10ms() to delay_50ms() to fix problems
  *
  *  Some additional driver compile-time options are in ide.h
  *
@@ -1211,7 +1213,10 @@
 
 	sti();
 	if ((stat & DRQ_STAT) && args && args[3]) {
+		byte io_32bit = drive->io_32bit;
+		drive->io_32bit = 0;
 		ide_input_data(drive, &args[4], args[3] * SECTOR_WORDS);
+		drive->io_32bit = io_32bit;
 		stat = GET_STAT();
 	}
 	if (OK_STAT(stat,READY_STAT,BAD_STAT))
@@ -2417,13 +2422,13 @@
 }
 
 /*
- * Delay for *at least* 10ms.  As we don't know how much time is left
+ * Delay for *at least* 50ms.  As we don't know how much time is left
  * until the next tick occurs, we wait an extra tick to be safe.
  * This is used only during the probing/polling for drives at boot time.
  */
-static void delay_10ms (void)
+static void delay_50ms (void)
 {
-	unsigned long timer = jiffies + (HZ + 99)/100 + 1;
+	unsigned long timer = jiffies + ((HZ + 19)/20) + 1;
 	while (timer > jiffies);
 }
 
@@ -2449,7 +2454,7 @@
 		OUT_BYTE(drive->ctl,IDE_CONTROL_REG);	/* enable device irq */
 	}
 
-	delay_10ms();				/* take a deep breath */
+	delay_50ms();				/* take a deep breath */
 	if ((IN_BYTE(IDE_ALTSTATUS_REG) ^ IN_BYTE(IDE_STATUS_REG)) & ~INDEX_STAT) {
 		printk("%s: probing with STATUS instead of ALTSTATUS\n", drive->name);
 		hd_status = IDE_STATUS_REG;	/* ancient Seagate drives */
@@ -2474,10 +2479,10 @@
 				(void) probe_irq_off(irqs);
 			return 1;	/* drive timed-out */
 		}
-		delay_10ms();		/* give drive a breather */
+		delay_50ms();		/* give drive a breather */
 	} while (IN_BYTE(hd_status) & BUSY_STAT);
 
-	delay_10ms();		/* wait for IRQ and DRQ_STAT */
+	delay_50ms();		/* wait for IRQ and DRQ_STAT */
 	if (OK_STAT(GET_STAT(),DRQ_STAT,BAD_R_STAT)) {
 		unsigned long flags;
 		save_flags(flags);
@@ -2546,11 +2551,10 @@
 		(cmd == WIN_IDENTIFY) ? "ATA" : "ATAPI");
 #endif
 	SELECT_DRIVE(hwif,drive);
-	delay_10ms();		/* allow BUSY_STAT to assert & clear */
-	delay_10ms();
+	delay_50ms();
 	if (IN_BYTE(IDE_SELECT_REG) != drive->select.all && !drive->present) {
 		OUT_BYTE(0xa0,IDE_SELECT_REG);	/* exit with drive0 selected */
-		delay_10ms();		/* allow BUSY_STAT to assert & clear */
+		delay_50ms();		/* allow BUSY_STAT to assert & clear */
 		return 3;    /* no i/f present: avoid killing ethernet cards */
 	}
 
@@ -2567,7 +2571,7 @@
 	}
 	if (drive->select.b.unit != 0) {
 		OUT_BYTE(0xa0,IDE_SELECT_REG);	/* exit with drive0 selected */
-		delay_10ms();
+		delay_50ms();
 		(void) GET_STAT();		/* ensure drive irq is clear */
 	}
 	return rc;
diff -u --recursive --new-file v2.0.12/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
--- v2.0.12/linux/drivers/block/ll_rw_blk.c	Tue Jun  4 09:14:23 1996
+++ linux/drivers/block/ll_rw_blk.c	Thu Aug 15 09:55:43 1996
@@ -274,7 +274,7 @@
 	tmp->next = req;
 
 /* for SCSI devices, call request_fn unconditionally */
-	if (scsi_major(MAJOR(req->rq_dev)))
+	if (scsi_blk_major(MAJOR(req->rq_dev)))
 		(dev->request_fn)();
 
 	sti();
diff -u --recursive --new-file v2.0.12/linux/drivers/block/triton.c linux/drivers/block/triton.c
--- v2.0.12/linux/drivers/block/triton.c	Thu Aug  1 15:53:34 1996
+++ linux/drivers/block/triton.c	Tue Aug 13 08:40:15 1996
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/block/triton.c	Version 1.12  Jul 24, 1996
+ *  linux/drivers/block/triton.c	Version 1.13  Aug 12, 1996
  *
  *  Copyright (c) 1995-1996  Mark Lord
  *  May be copied or modified under the terms of the GNU General Public License
@@ -9,6 +9,9 @@
  * This module provides support for the Bus Master IDE DMA function
  * of the Intel PCI Triton I/II chipsets (i82371FB or i82371SB).
  *
+ * Pretty much the same code will work for the OPTi "Viper" chipset.
+ * Look for DMA support for this in linux kernel 2.1.xx, when it appears.
+ *
  * DMA is currently supported only for hard disk drives (not cdroms).
  *
  * Support for cdroms will likely be added at a later date,
@@ -116,6 +119,8 @@
 
 #include "ide.h"
 
+#undef DISPLAY_TRITON_TIMINGS	/* define this to display timings */
+
 /*
  * good_dma_drives() lists the model names (from "hdparm -i")
  * of drives which do not support mword2 DMA but which are
@@ -223,7 +228,7 @@
 				if (bcount > size)
 					bcount = size;
 				*table++ = addr;
-				*table++ = bcount;
+				*table++ = bcount & 0xffff;
 				addr += bcount;
 				size -= bcount;
 			}
@@ -309,7 +314,7 @@
 		return 1;
 	outl(virt_to_bus (HWIF(drive)->dmatable), dma_base + 4); /* PRD table */
 	outb(reading, dma_base);			/* specify r/w */
-	outb(0x26, dma_base+2);				/* clear status bits */
+	outb(inb(dma_base+2)|0x06, dma_base+2);		/* clear status bits */
 #ifdef CONFIG_BLK_DEV_IDEATAPI
 	if (drive->media != ide_disk)
 		return 0;
@@ -320,6 +325,7 @@
 	return 0;
 }
 
+#ifdef DISPLAY_TRITON_TIMINGS
 /*
  * print_triton_drive_flags() displays the currently programmed options
  * in the i82371 (Triton) for a given drive.
@@ -341,6 +347,7 @@
 	printk(" IORDY=%s",	(flags&2)	? "on " : "off");
 	printk(" fastPIO=%s\n",	((flags&9)==1)	? "on " : "off");
 }
+#endif /* DISPLAY_TRITON_TIMINGS */
 
 static void init_triton_dma (ide_hwif_t *hwif, unsigned short base)
 {
@@ -354,11 +361,11 @@
 		hwif->dma_base = base;
 		if (!dmatable) {
 			/*
-			 * Since we know we are on a PCI bus, we could
-			 * actually use __get_free_pages() here instead
+			 * The BM-DMA uses a full 32-bits, so we can
+			 * safely use __get_free_page() here instead
 			 * of __get_dma_pages() -- no ISA limitations.
 			 */
-			dmatable = __get_dma_pages(GFP_KERNEL, 0);
+			dmatable = __get_free_page(GFP_KERNEL);
 		}
 		if (dmatable) {
 			hwif->dmatable = (unsigned long *) dmatable;
@@ -434,7 +441,10 @@
 	 * Save the dma_base port addr for each interface
 	 */
 	for (h = 0; h < MAX_HWIFS; ++h) {
+#ifdef DISPLAY_TRITON_TIMINGS
 		byte s_clks, r_clks;
+		unsigned short devid;
+#endif /* DISPLAY_TRITON_TIMINGS */
 		ide_hwif_t *hwif = &ide_hwifs[h];
 		unsigned short time;
 		if (hwif->io_base == 0x1f0) {
@@ -453,12 +463,32 @@
 				init_triton_dma(hwif, bmiba + 8);
 		} else
 			continue;
+#ifdef DISPLAY_TRITON_TIMINGS
 		s_clks = ((~time >> 12) & 3) + 2;
 		r_clks = ((~time >>  8) & 3) + 1;
 		printk("    %s timing: (0x%04x) sample_CLKs=%d, recovery_CLKs=%d\n",
 		 hwif->name, time, s_clks, r_clks);
+		if ((time & 0x40) && !pcibios_read_config_word(bus, fn, 0x02, &devid)
+		 && devid == PCI_DEVICE_ID_INTEL_82371SB_1)
+		{
+			byte stime;
+			if (pcibios_read_config_byte(bus, fn, 0x44, &stime)) {
+				if (hwif->io_base == 0x1f0) {
+					s_clks = ~stime >> 6;
+					r_clks = ~stime >> 4;
+				} else {
+					s_clks = ~stime >> 2;
+					r_clks = ~stime;
+				}
+				s_clks = (s_clks & 3) + 2;
+				r_clks = (r_clks & 3) + 1;
+				printk("                   slave: sample_CLKs=%d, recovery_CLKs=%d\n",
+		 			s_clks, r_clks);
+			}
+		}
 		print_triton_drive_flags (0, time & 0xf);
 		print_triton_drive_flags (1, (time >> 4) & 0xf);
+#endif /* DISPLAY_TRITON_TIMINGS */
 	}
 
 quit: if (rc) printk("ide: pcibios access failed - %s\n", pcibios_strerror(rc));
diff -u --recursive --new-file v2.0.12/linux/drivers/cdrom/cdrom.c linux/drivers/cdrom/cdrom.c
--- v2.0.12/linux/drivers/cdrom/cdrom.c	Wed Jul 10 13:10:59 1996
+++ linux/drivers/cdrom/cdrom.c	Wed Aug 14 10:21:03 1996
@@ -21,7 +21,7 @@
 
 #define FM_WRITE	0x2                 /* file mode write bit */
 
-#define VERSION "$Id: cdrom.c,v 0.4 1996/04/17 20:47:50 david Exp david $"
+#define VERSION "$Id: cdrom.c,v 0.8 1996/08/10 10:52:11 david Exp $"
 
 /* Not-exported routines. */
 int cdrom_open(struct inode *ip, struct file *fp);
@@ -351,7 +351,7 @@
                 return cdo->options;
                 
         case CDROM_SELECT_SPEED:
-                if (0 <= arg && arg < (int) (cdo->speed + 0.5) &&
+                if (0 <= arg && arg <= cdo->speed &&
                     cdo->capability & ~cdo->mask & CDC_SELECT_SPEED)
                         return cdo->select_speed(dev, arg);
                 else
diff -u --recursive --new-file v2.0.12/linux/drivers/cdrom/cm206.c linux/drivers/cdrom/cm206.c
--- v2.0.12/linux/drivers/cdrom/cm206.c	Thu May 30 15:40:07 1996
+++ linux/drivers/cdrom/cm206.c	Wed Aug 14 10:21:03 1996
@@ -98,7 +98,7 @@
  * - Philips/LMS cm260 product specification
  *
  *                       David van Leeuwen, david@tm.tno.nl.  */
-#define VERSION "$Id: cm206.c,v 0.99 1996/04/14 20:26:26 david Exp david $"
+#define VERSION "$Id: cm206.c,v 0.99.1.1 1996/08/11 10:35:01 david Exp $"
 
 #include <linux/module.h>	
 
@@ -1086,7 +1086,7 @@
   CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_MULTI_SESSION |
     CDC_MEDIA_CHANGED | CDC_MCN | CDC_PLAY_AUDIO, /* capability */
   0,				/* mask flags */
-  2.0,				/* maximum speed */
+  2,				/* maximum speed */
   1,				/* number of minor devices */
   1,				/* number of discs */
   0,				/* options, ignored */
@@ -1188,12 +1188,14 @@
   }
   else printk(" IRQ %d found\n", cm206_irq);
 #else
+  cli();
   reset_cm260();
   /* Now, the problem here is that reset_cm260 can generate an
      interrupt. It seems that this can cause a kernel oops some time
      later. So we wait a while and `service' this interrupt. */
   udelay(10);
   outw(dc_normal | READ_AHEAD, r_data_control);
+  sti();
   printk(" using IRQ %d\n", cm206_irq);
 #endif
   if (send_receive_polled(c_drive_configuration) != c_drive_configuration) 
diff -u --recursive --new-file v2.0.12/linux/drivers/cdrom/sbpcd.c linux/drivers/cdrom/sbpcd.c
--- v2.0.12/linux/drivers/cdrom/sbpcd.c	Mon Jul 15 09:55:10 1996
+++ linux/drivers/cdrom/sbpcd.c	Mon Aug 12 13:44:47 1996
@@ -13,7 +13,7 @@
  *             labelled E2550UA or MK4015 or 2800F).
  */
 
-#define VERSION "v4.4 Eberhard Moenkeberg <emoenke@gwdg.de>"
+#define VERSION "v4.5 Eberhard Moenkeberg <emoenke@gwdg.de>"
 
 /*   Copyright (C) 1993, 1994, 1995  Eberhard Moenkeberg <emoenke@gwdg.de>
  *
@@ -284,10 +284,18 @@
  *       Inhibited "play audio" attempts with data CDs. Provisions for a
  *       "data-safe" handling of "mixed" (data plus audio) Cds.
  *
+ *  4.5  Meanwhile Gonzalo Tornaria <tornaria@cmat.edu.uy> (GTL) built a
+ *       special end_request routine: we seem to have to take care for not
+ *       to have two processes working at the request list. My understanding
+ *       was and is that ll_rw_blk should not call do_sbpcd_request as long
+ *       as there is still one call active (the first call will care for all
+ *       outstanding I/Os, and if a second call happens, that is a bug in
+ *       ll_rw_blk.c).
+ *       "Check media change" without touching any drive.
+ *
  *
  *  TODO
  *
- *     disk change detection
  *     synchronize multi-activity
  *        (data + audio + ioctl + disk change, multiple drives)
  *     implement "read all subchannel data" (96 bytes per frame)
@@ -510,7 +518,6 @@
 static int sbpcd_debug = ((1<<DBG_INF) |
 			  (1<<DBG_TOC) |
 			  (1<<DBG_MUL) |
-			  (1<<DBG_AUD) |
 			  (1<<DBG_UPC));
 #endif DISTRIBUTION
 
@@ -914,7 +921,7 @@
 		if (sta==0x03) return (-607); /* unknown media */
 		if (sta==0x04) return (-612); /* general failure */
 		if (sta==0x05) return (0);
-		if (sta==0x06) return (-615); /* invalid disk change */
+		if (sta==0x06) return (-ERR_DISKCHANGE); /* disk change */
 		if (sta==0x0b) return (-612); /* general failure */
 		if (sta==0xff) return (-612); /* general failure */
 		return (0);
@@ -931,10 +938,9 @@
 		if (sta==0x0f) return (-611); /* read fault */
 		if (sta==0x10) return (-611); /* read fault */
 		if (sta>=0x16) return (-612); /* general failure */
-		D_S[d].CD_changed=0xFF;
-		if (sta==0x11) return (-615); /* invalid disk change (LCS: removed) */
+		if (sta==0x11) return (-ERR_DISKCHANGE); /* disk change (LCS: removed) */
 		if (famL_drive)
-			if (sta==0x12) return (-615); /* invalid disk change (inserted) */
+			if (sta==0x12) return (-ERR_DISKCHANGE); /* disk change (inserted) */
 		return (-602); /* drive not ready */
 	}
 }
@@ -1115,8 +1121,12 @@
 		/* 2: closed, disk in */
 		D_S[d].status_bits=p1_door_closed|p1_disk_in|p1_spinning|p1_disk_ok;
 	else if (D_S[d].error_state==6)
+	{
 		/* 3: closed, disk in, changed ("06 xx xx") */
 		D_S[d].status_bits=p1_door_closed|p1_disk_in;
+		D_S[d].CD_changed=0xFF;
+		D_S[d].diskstate_flags &= ~toc_bit;
+	}
 	else if ((D_S[d].error_state!=2)||(D_S[d].b3!=0x3A)||(D_S[d].b4==0x00))
 	{
 		/* 1: closed, no disk ("xx yy zz"or "02 3A 00") */
@@ -1230,6 +1240,11 @@
 	D_S[d].error_byte=infobuf[i];
 	msg(DBG_ERR,"cc_ReadError: infobuf[%d] is %d (%02X)\n",i,D_S[d].error_byte,D_S[d].error_byte);
 	i=sta2err(infobuf[i]);
+        if (i==-ERR_DISKCHANGE)
+        {
+                D_S[d].CD_changed=0xFF;
+                D_S[d].diskstate_flags &= ~toc_bit;
+        }
 	return (i);
 }
 /*==========================================================================*/
@@ -1924,7 +1939,7 @@
 	do
 	{
 		i=GetStatus();
-		if ((i<0)&&(i!=-615)) return (-2); /* i!=-615 is from sta2err */
+		if ((i<0)&&(i!=-ERR_DISKCHANGE)) return (-2); /* from sta2err */
 		if (!st_caddy_in) break;
 		sbp_sleep(1);
 	}
@@ -4448,7 +4463,7 @@
  *  special end_request for sbpcd to solve CURRENT==NULL bug. (GTL)
  *  GTL = Gonzalo Tornaria <tornaria@cmat.edu.uy>
  *
- *  This is a kluge so we don't need to modify end_request
+ *  This is a kludge so we don't need to modify end_request.
  *  We put the req we take out after INIT_REQUEST in the requests list,
  *  so that end_request will discard it. 
  *
@@ -4458,7 +4473,7 @@
  *
  *  Could be a race here?? Could e.g. a timer interrupt schedule() us?
  *  If so, we should copy end_request here, and do it right.. (or
- *  modify end_request and the block devices.
+ *  modify end_request and the block devices).
  *
  *  In any case, the race here would be much small than it was, and
  *  I couldn't reproduce..
@@ -4466,7 +4481,7 @@
  *  The race could be: suppose CURRENT==NULL. We put our req in the list,
  *  and we are scheduled. Other process takes over, and gets into
  *  do_sbpcd_request. It sees CURRENT!=NULL (it is == to our req), so
- *  proceds. It ends, so CURRENT is now NULL.. Now we awake somewhere in
+ *  proceeds. It ends, so CURRENT is now NULL.. Now we awake somewhere in
  *  end_request, but now CURRENT==NULL... oops!
  *
  */
@@ -4514,9 +4529,10 @@
 	sti();
 	
 	if (req->rq_status == RQ_INACTIVE)
-		goto err_done;
+		sbpcd_end_request(req, 0);
 	if (req -> sector == -1)
-		goto err_done;
+		sbpcd_end_request(req, 0);
+
 	if (req->cmd != READ)
 	{
 		msg(DBG_INF, "bad cmd %d\n", req->cmd);
@@ -5517,15 +5533,12 @@
 /*
  * Check if the media has changed in the CD-ROM drive.
  * used externally (isofs/inode.c, fs/buffer.c)
- * Currently disabled (has to get "synchronized").
  */
 static int sbpcd_chk_disk_change(kdev_t full_dev)
 {
-	int i, st;
+	int i;
 	
 	msg(DBG_CHK,"media_check (%d) called\n", MINOR(full_dev));
-	return (0); /* "busy" test necessary before we really can check */
-	
 	i=MINOR(full_dev);
 	if ( (i<0) || (i>=NR_SBPCD) || (D_S[i].drv_id==-1) )
 	{
@@ -5533,43 +5546,14 @@
 		return (-1);
 	}
 	
-	switch_drive(i);
-	
-	cc_ReadStatus();                         /* command: give 1-byte status */
-	st=ResponseStatus();
-	msg(DBG_CHK,"media_check: %02X\n",D_S[d].status_bits);
-	if (st<0)
-	{
-		msg(DBG_INF,"media_check: ResponseStatus error.\n");
-		return (1); /* status not obtainable */
-	}
-	if (D_S[d].CD_changed==0xFF) msg(DBG_CHK,"media_check: \"changed\" assumed.\n");
-	if (!st_spinning) msg(DBG_CHK,"media_check: motor off.\n");
-	if (!st_door_closed)
-	{
-		msg(DBG_CHK,"media_check: door open.\n");
-		D_S[d].CD_changed=0xFF;
-	}
-	if (!st_caddy_in)
-	{
-		msg(DBG_CHK,"media_check: no disk in drive.\n");
-		D_S[d].open_count=0;
-		D_S[d].CD_changed=0xFF;
-	}
-	if (!st_diskok) msg(DBG_CHK,"media_check: !st_diskok.\n");
-	
-#if 0000
-	if (D_S[d].CD_changed==0xFF)
-	{
-		D_S[d].CD_changed=1;
-		return (1); /* driver had a change detected before */
-	}
-#endif 0000 /* seems to give additional errors at the moment */
-	
-	if (!st_diskok) return (1); /* disk not o.k. */
-	if (!st_caddy_in) return (1); /* disk removed */
-	if (!st_door_closed) return (1); /* door open */
-	return (0);
+	if (D_S[i].CD_changed==0xFF)
+        {
+                D_S[i].CD_changed=0;
+                msg(DBG_CHK,"medium changed (drive %d)\n", i);
+                return (1);
+        }
+        else
+                return (0);
 }
 /*==========================================================================*/
 /*
diff -u --recursive --new-file v2.0.12/linux/drivers/net/strip.c linux/drivers/net/strip.c
--- v2.0.12/linux/drivers/net/strip.c	Fri Apr 12 09:49:39 1996
+++ linux/drivers/net/strip.c	Wed Aug 14 10:21:03 1996
@@ -14,33 +14,82 @@
  *		for kernel-based devices like TTY.  It interfaces between a
  *		raw TTY, and the kernel's INET protocol layers (via DDI).
  *
- * Version:	@(#)strip.c	0.9.1	3/6/95
+ * Version:	@(#)strip.c	0.9.8	June 1996
  *
  * Author:	Stuart Cheshire <cheshire@cs.stanford.edu>
  *
- * Fixes:
- *		Stuart Cheshire:
- *			Original version converted from SLIP driver
- *		Jonathan Stone:
- *			change to 1.3 calling conventions
- *		Stuart Cheshire:
- *			v0.9 12th Feb 1996.
- *			New byte stuffing (2+6 run-length encoding)
- *			New watchdog timer task
- *			New Protocol key (SIP0)
- *			v0.9.1 3rd March 1996
- *			Changed to dynamic device allocation
+ * Fixes:	v0.9 12th Feb 1996.
+ *		New byte stuffing (2+6 run-length encoding)
+ *		New watchdog timer task
+ *		New Protocol key (SIP0)
+ *		
+ *		v0.9.1 3rd March 1996
+ *		Changed to dynamic device allocation -- no more compile
+ *		time (or boot time) limit on the number of STRIP devices.
+ *		
+ *		v0.9.2 13th March 1996
+ *		Uses arp cache lookups (but doesn't send arp packets yet)
+ *		
+ *		v0.9.3 17th April 1996
+ *		Fixed bug where STR_ERROR flag was getting set unneccessarily
+ *		
+ *		v0.9.4 27th April 1996
+ *		First attempt at using "&COMMAND" Starmode AT commands
+ *		
+ *		v0.9.5 29th May 1996
+ *		First attempt at sending (unicast) ARP packets
+ *		
+ *		v0.9.6 5th June 1996
+ *		Elliot put "message level" tags in every "printk" statement
+ *		
+ *		v0.9.7 13th June 1996
+ *		Added support for the /proc fs (laik)
+ *
+ *              v0.9.8 July 1996
+ *              Added packet logging (Mema)
+ */
+
+/*
+ * Undefine this symbol if you don't have PROC_NET_STRIP_STATUS
+ * defined in include/linux/proc_fs.h
+ */
+
+#define DO_PROC_NET_STRIP_STATUS 1
+
+/*
+ * Define this symbol if you want to enable STRIP packet tracing.
  */
 
+#define DO_PROC_NET_STRIP_TRACE 0
+
+
+/************************************************************************/
+/* Header files								*/
+
 #include <linux/config.h>
+
 #ifdef MODULE
 #include <linux/module.h>
 #include <linux/version.h>
 #endif
 
+#include <stdlib.h>
 #include <asm/system.h>
 #include <asm/segment.h>
 #include <asm/bitops.h>
+
+/*
+ * isdigit() and isspace() use the ctype[] array, which is not available
+ * to kernel modules.  If compiling as a module,  use  a local definition
+ * of isdigit() and isspace() until  _ctype is added to ksyms.
+ */
+#ifdef MODULE
+# define isdigit(c) ('0' <= (c) && (c)  <= '9')
+# define isspace(c) ((c) == ' ' || (c)  == '\t')
+#else
+# include <linux/ctype.h>
+#endif
+
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
@@ -52,82 +101,316 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/if_strip.h>
+#include <linux/proc_fs.h>
 #include <net/arp.h>
+
 #ifdef CONFIG_INET
 #include <linux/ip.h>
 #include <linux/tcp.h>
+#include <linux/time.h>
 #endif
 
-#ifdef MODULE
-#define STRIP_VERSION    "0.9.1-STUART.CHESHIRE-MODULAR"
-#else
-#define STRIP_VERSION    "0.9.1-STUART.CHESHIRE"
-#endif
 
-#define STRIP_MTU 1024
-#define STRIP_MAGIC 0x5303
+/************************************************************************/
+/* Useful structures and definitions					*/
 
 /*
- *	Do we still needs all these flags? 
+ * A MetricomKey identifies the protocol being carried inside a Metricom
+ * Starmode packet.
  */
 
-enum 
+typedef union
 {
-	STR_INUSE = 0,		/* Channel in use	*/
-	STR_ESCAPE,			/* ESC received		*/
-	STR_ERROR			/* Parity, etc. error	*/
-}
-STRIP_FLAGS;
+    __u8 c[4];
+    __u32 l;
+} MetricomKey;
+
+/*
+ * An IP address can be viewed as four bytes in memory (which is what it is) or as
+ * a single 32-bit long (which is convenient for assignment, equality testing etc.)
+ */
 
-struct strip 
+typedef union
 {
-	int magic;
-	/*
-	 *	Other useful structures. 
-	 */
+    __u8 b[4];
+    __u32 l;
+} IPaddr;
 
-	/*
-	 *	These are pointers to the malloc()ed frame buffers.
-	 */
+/*
+ * A MetricomAddressString is used to hold a printable representation of
+ * a Metricom address.
+ */
 
-	unsigned char     *rx_buff;		/* buffer for received IP packet*/
-	unsigned char     *sx_buff;		/* buffer for received serial data*/
-	int                sx_count;		/* received serial data counter */
-	unsigned char     *tx_buff;		/* transmitter buffer  */
-	unsigned char     *tx_head;		/* pointer to next byte to XMIT */
-	int                tx_left;		/* bytes left in XMIT queue     */
+typedef struct
+{
+    __u8 c[24];
+} MetricomAddressString;
 
-	/*
-	 *	STRIP interface statistics.
-	 */
-	 
-	unsigned long      rx_packets;		/* inbound frames counter	*/
-	unsigned long      tx_packets;		/* outbound frames counter	*/
-	unsigned long      rx_errors;		/* Parity, etc. errors		*/
-	unsigned long      tx_errors;		/* Planned stuff		*/
-	unsigned long      rx_dropped;		/* No memory for skb		*/
-	unsigned long      tx_dropped;		/* When MTU change		*/
-	unsigned long      rx_over_errors;	/* Frame bigger then STRIP buf. */
+/*
+ * Note: A Metricom packet looks like this: *<address>*<key><payload><CR>
+ * eg. *0000-1234*SIP0<payload><CR>
+ * A STRIP_Header is never really sent over the radio, but making a dummy header
+ * for internal use within the kernel that looks like an Ethernet header makes
+ * certain other software happier. For example, tcpdump already understands
+ * Ethernet headers.
+ */
 
-	/*
-	 *	Internal variables.
-	 */
-	 
-	struct strip      *next;		/* The next struct in the list 	*/
-	struct strip     **referrer;		/* The pointer that points to us */
-	unsigned char      flags;		/* Flag values/ mode etc	*/
-	int                mtu;			/* Our mtu (to spot changes!)	*/
-	int                buffsize;		/* Max buffers sizes		*/
-	long               watchdog_doprobe;	/* Next time to test the radio	*/
-	long               watchdog_doreset;	/* Time to do next reset	*/
-	struct timer_list  idle_timer;
-
-	struct tty_struct *tty;			/* ptr to TTY structure		*/
-	char               if_name[8];		/* Dynamically generated name	*/
-	struct device       dev;		/* Our device structure		*/
+typedef struct
+{
+    MetricomAddress dst_addr;		/* Destination address, e.g. "0000-1234"   */
+    MetricomAddress src_addr;		/* Source address, e.g. "0000-5678"        */
+    unsigned short  protocol;		/* The protocol type, using Ethernet codes */
+} STRIP_Header;
+
+typedef struct GeographicLocation
+{
+    char s[18];
+} GeographicLocation;
+
+typedef enum {
+    NodeValid = 0x1,
+    NodeHasWAN = 0x2,
+    NodeIsRouter = 0x4
+} NodeType;
+
+typedef struct MetricomNode
+{
+    NodeType type;                  /* Some flags about the type of node */
+    GeographicLocation gl;     /* The location of the node. */
+    MetricomAddress addr;      /* The metricom address of this node */
+    int poll_latency;          /* The latency to poll that node ? */
+    int rssi;                  /* The Receiver Signal Strength Indicator */
+    struct MetricomNode *next; /* The next node */
+} MetricomNode;
+
+enum { FALSE = 0, TRUE = 1 };
+
+/*
+ * Holds the packet signature for an IP packet.
+ */
+typedef struct
+{
+    IPaddr src;
+    /* Data is stored in the following field in network byte order. */
+    __u16 id;
+} IPSignature;
+
+/*
+ * Holds the packet signature for an ARP packet.
+ */
+typedef struct
+{
+    IPaddr src;
+    /* Data is stored in the following field in network byte order. */
+    __u16 op;
+} ARPSignature;
+
+/*
+ * Holds the signature of a packet.
+ */
+typedef union
+{
+    IPSignature ip_sig;
+    ARPSignature arp_sig;
+    __u8 print_sig[6];
+} PacketSignature;
+
+typedef enum {
+    EntrySend = 0,
+    EntryReceive = 1
+} LogEntry;
+
+/* Structure for Packet Logging */
+typedef struct stripLog
+{
+    LogEntry entry_type;
+    u_long seqNum;
+    int packet_type;
+    PacketSignature sig;
+    MetricomAddress src;
+    MetricomAddress dest;
+    struct timeval timeStamp;
+    u_long rawSize;
+    u_long stripSize;
+    u_long slipSize;
+    u_long valid;
+} StripLog;
+
+#define ENTRY_TYPE_TO_STRING(X) ((X) ? "r" : "s")
+
+#define BOOLEAN_TO_STRING(X) ((X) ? "true" : "false")
+
+/*
+ * Holds the radio's firmware version.
+ */
+typedef struct
+{
+    char c[50];
+} MetricomFirmwareVersion;
+
+/*
+ * Holds the radio's serial number.
+ */
+typedef struct
+{
+    char c[18];
+} MetricomSerialNumber;
+
+/*
+ * Holds the radio's battery voltage.
+ */
+typedef struct
+{
+    char c[11];
+} MetricomBatteryVoltage;
+
+struct strip
+{
+    int magic;
+    /*
+     * These are pointers to the malloc()ed frame buffers.
+     */
+
+    unsigned char     *rx_buff;			/* buffer for received IP packet*/
+    unsigned char     *sx_buff;			/* buffer for received serial data*/
+    int                sx_count;		/* received serial data counter */
+    int                sx_size;			/* Serial buffer size		*/
+    unsigned char     *tx_buff;			/* transmitter buffer           */
+    unsigned char     *tx_head;			/* pointer to next byte to XMIT */
+    int                tx_left;			/* bytes left in XMIT queue     */
+    int                tx_size;			/* Serial buffer size		*/
+
+    /*
+     * STRIP interface statistics.
+     */
+
+    unsigned long      rx_packets;		/* inbound frames counter	*/
+    unsigned long      tx_packets;		/* outbound frames counter	*/
+    unsigned long      rx_errors;		/* Parity, etc. errors		*/
+    unsigned long      tx_errors;		/* Planned stuff		*/
+    unsigned long      rx_dropped;		/* No memory for skb		*/
+    unsigned long      tx_dropped;		/* When MTU change		*/
+    unsigned long      rx_over_errors;		/* Frame bigger then STRIP buf. */
+
+    /*
+     * Internal variables.
+     */
+
+    struct strip      *next;			/* The next struct in the list	*/
+    struct strip     **referrer;		/* The pointer that points to us*/
+    int                discard;			/* Set if serial error		*/
+    int                working;			/* Is radio working correctly?	*/
+    int                structured_messages;	/* Parsable AT response msgs?	*/
+    int                mtu;			/* Our mtu (to spot changes!)	*/
+    long               watchdog_doprobe;	/* Next time to test the radio	*/
+    long               watchdog_doreset;	/* Time to do next reset	*/
+    long               gratuitous_arp;		/* Time to send next ARP refresh*/
+    long               arp_interval;		/* Next ARP interval		*/
+    struct timer_list  idle_timer;		/* For periodic wakeup calls	*/
+    MetricomNode      *neighbor_list;		/* The list of neighbor nodes   */
+    int                neighbor_list_locked;    /* Indicates the list is locked */
+    MetricomFirmwareVersion firmware_version;	/* The radio's firmware version */
+    MetricomSerialNumber serial_number;		/* The radio's serial number    */
+    MetricomBatteryVoltage battery_voltage;     /* The radio's battery voltage  */
+
+    /*
+     * Other useful structures.
+     */
+
+    struct tty_struct *tty;			/* ptr to TTY structure		*/
+    char               if_name[8];		/* Dynamically generated name	*/
+    struct device      dev;			/* Our device structure		*/
+
+    /*
+     * Packet Logging Structures.
+     */
+
+    u_long             num_sent;
+    u_long             num_received;
+
+    int next_entry;                            	/* The index of the oldest packet; */
+                                                /* Also the next to be logged. */
+    StripLog packetLog[610];
 };
+
+
+/************************************************************************/
+/* Constants								*/
+
+#ifdef MODULE
+static const char StripVersion[] = "0.9.8-STUART.CHESHIRE-MODULAR";
+#else
+static const char StripVersion[] = "0.9.8-STUART.CHESHIRE";
+#endif
+
+static const char TickleString1[] = "***&COMMAND*ATS305?\r";
+static const char TickleString2[] = "***&COMMAND*ATS305?\r\r"
+       "*&COMMAND*ATS300?\r\r*&COMMAND*ATS325?\r\r*&COMMAND*AT~I2 nn\r\r";
+
+static const char            hextable[16]      = "0123456789ABCDEF";
+
+static const MetricomAddress zero_address;
+static const MetricomAddress broadcast_address = { { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF } };
+
+static const MetricomKey     SIP0Key           = { { "SIP0" } };
+static const MetricomKey     ARP0Key           = { { "ARP0" } };
+static const MetricomKey     ERR_Key           = { { "ERR_" } };
+static const MetricomKey     ATR_Key           = { { "ATR " } };
+
+static const long            MaxARPInterval    = 60 * HZ;          /* One minute */
+
+/*
+ * Maximum Starmode packet length (including starmode address) is 1183 bytes.
+ * Allowing 32 bytes for header, and 65/64 expansion for STRIP encoding,
+ * that translates to a maximum payload MTU of 1132.
+ */
+static const unsigned short  MAX_STRIP_MTU          = 1132;
+static const unsigned short  DEFAULT_STRIP_MTU      = 1024;
+static const int             STRIP_MAGIC            = 0x5303;
+static const long            LongTime               = 0x7FFFFFFF;
+
+static const int             STRIP_NODE_LEN         = 64;
+static const char            STRIP_PORTABLE_CHAR    = 'P';
+static const char            STRIP_ROUTER_CHAR      = 'r';
+static const int             STRIP_PROC_BUFFER_SIZE = 4096;
+static const int             STRIP_LOG_INT_SIZE     = 10;
+
 /************************************************************************/
-/* Utility routines for disabling and restoring interrupts		*/
+/* Global variables							*/
+
+static struct strip *struct_strip_list = NULL;
+
+
+/************************************************************************/
+/* Macros								*/
+
+#define READHEX(X) ((X)>='0' && (X)<='9' ? (X)-'0' :      \
+                    (X)>='a' && (X)<='f' ? (X)-'a'+10 :   \
+                    (X)>='A' && (X)<='F' ? (X)-'A'+10 : 0 )
+
+#define READDEC(X) ((X)>='0' && (X)<='9' ? (X)-'0' : 0)
+
+#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
+#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+#define ELEMENTS_OF(X) (sizeof(X) / sizeof((X)[0]))
+#define ARRAY_END(X) (&((X)[ELEMENTS_OF(X)]))
+
+/* Encapsulation can expand packet of size x to 65/64x + 1              */
+/* Sent packet looks like "*<address>*<key><encaps payload><CR>"        */
+/*                         1   1-18  1  4         ?         1           */
+/* We allow 31 bytes for the stars, the key, the address and the <CR>   */
+#define STRIP_ENCAP_SIZE(X) (32 + (X)*65L/64L)
+
+#define IS_RADIO_ADDRESS(p) (                                                   \
+    isdigit((p)[0]) && isdigit((p)[1]) && isdigit((p)[2]) && isdigit((p)[3]) && \
+    (p)[4] == '-' &&                                                            \
+    isdigit((p)[5]) && isdigit((p)[6]) && isdigit((p)[7]) && isdigit((p)[8])    )
+
+#define JIFFIE_TO_SEC(X) ((X) / HZ)
+
+
+/************************************************************************/
+/* Utility routines							*/
 
 typedef unsigned long InterruptStatus;
 
@@ -144,62 +427,67 @@
     restore_flags(x);
 }
 
-/************************************************************************/
-/* Useful structures and definitions					*/
-
-typedef struct {
-    __u8 c[32];
-} RadioName;
-
-typedef struct {
-    __u8 c[ 4];
-} MetricomKey;
+static void DumpData(char *msg, struct strip *strip_info, __u8 *ptr, __u8 *end)
+{
+    static const int MAX_DumpData = 80;
+    __u8 pkt_text[MAX_DumpData], *p = pkt_text;
 
-typedef union {
-    __u8 b[ 4];
-    __u32 l;
-} IPaddr;
+    *p++ = '\"';
 
-static const MetricomKey ProtocolKey = 
-{
+    while (ptr<end && p < &pkt_text[MAX_DumpData-4])
     {
-        "SIP0"
+        if (*ptr == '\\')
+        {
+            *p++ = '\\';
+            *p++ = '\\';
+        }
+        else
+        {
+            if (*ptr >= 32 && *ptr <= 126)
+            {
+                *p++ = *ptr;
+            }
+            else
+            {
+                sprintf(p, "\\%02X", *ptr);
+                p+= 3;
+            }
+        }
+        ptr++;
     }
-};
 
-enum 
-{
-    FALSE = 0,
-    TRUE = 1
-};
+    if (ptr == end)
+    {
+        *p++ = '\"';
+    }
 
-#define LONG_TIME 0x7FFFFFFF
+    *p++ = 0;
 
-typedef struct 
-{
-	RadioName   name;	/* The address, with delimiters eg. *0000-1164* */
-	MetricomKey key;	/* Protocol type */
-} STRIP_Header;
+    printk(KERN_INFO "%s: %-13s%s\n", strip_info->dev.name, msg, pkt_text);
+}
 
-typedef struct 
+#if 0
+static void HexDump(char *msg, struct strip *strip_info, __u8 *start, __u8 *end)
 {
-	STRIP_Header h;
-	__u8 data[4];		/* Placeholder for payload (The IP packet) */
-} STRIP_Packet;
+    __u8 *ptr = start;
+    printk(KERN_INFO "%s: %s: %d bytes\n", strip_info->dev.name, msg, end-ptr);
 
-/*
- *	STRIP_ENCAP_SIZE of an IP packet is the STRIP header at the front,
- *	byte-stuffing overhead of the payload, plus the CR at the end
- */
- 
-#define STRIP_ENCAP_SIZE(X) (sizeof(STRIP_Header) + (X)*65L/64L + 2)
-
-/*
- *	Note: A Metricom packet looks like this: *<address>*<key><payload><CR>
- *	eg. *0000-1164*SIP0<payload><CR>
- */
+    while (ptr < end)
+    {
+        long offset = ptr - start;
+        __u8 text[80], *p = text;
+        while (ptr < end && p < &text[16*3])
+        {
+            *p++ = hextable[*ptr >> 4];
+            *p++ = hextable[*ptr++ & 0xF];
+            *p++ = ' ';
+        }
+        p[-1] = 0;
+        printk(KERN_INFO "%s: %4lX %s\n", strip_info->dev.name, offset, text);
+    }
+}
+#endif
 
-static struct strip *struct_strip_list = NULL;
 
 /************************************************************************/
 /* Byte stuffing/unstuffing routines					*/
@@ -212,14 +500,14 @@
  * C0-FF Run of 1-64 zeroes (ASCII 0)
  */
 
-typedef enum 
+typedef enum
 {
     Stuff_Diff      = 0x00,
     Stuff_DiffZero  = 0x40,
     Stuff_Same      = 0x80,
     Stuff_Zero      = 0xC0,
     Stuff_NoCode    = 0xFF,	/* Special code, meaning no code selected */
-    
+
     Stuff_CodeMask  = 0xC0,
     Stuff_CountMask = 0x3F,
     Stuff_MaxCount  = 0x3F,
@@ -244,431 +532,1156 @@
 
 static __u8 *StuffData(__u8 *src, __u32 length, __u8 *dst, __u8 **code_ptr_ptr)
 {
-	__u8 *end = src + length;
-	__u8 *code_ptr = *code_ptr_ptr;
- 	__u8 code = Stuff_NoCode, count = 0;
-    
-	if (!length) 
-		return(dst);
-    
-	if (code_ptr) 
-	{
-		/*
-		 *	Recover state from last call, if applicable 
-		 */
-		code  = (*code_ptr ^ Stuff_Magic) & Stuff_CodeMask;
-		count = (*code_ptr ^ Stuff_Magic) & Stuff_CountMask;
-	}
+    __u8 *end = src + length;
+    __u8 *code_ptr = *code_ptr_ptr;
+     __u8 code = Stuff_NoCode, count = 0;
 
-	while (src < end) 
-	{
-		switch (code) 
-		{
-			/* Stuff_NoCode: If no current code, select one */
-			case Stuff_NoCode:
-				/* Record where we're going to put this code */
-				code_ptr = dst++;
-				count = 0;	/* Reset the count (zero means one instance) */
-				/* Tentatively start a new block */
-				if (*src == 0) 
-				{
-					code = Stuff_Zero;
-        				src++;
-				}
-				else
-				{
-					code = Stuff_Same;
-					*dst++ = *src++ ^ Stuff_Magic;
-				}
-				/* Note: We optimistically assume run of same -- */
-				/* which will be fixed later in Stuff_Same */
-				/* if it turns out not to be true. */
-				break;
-
-			/* Stuff_Zero: We already have at least one zero encoded */
-			case Stuff_Zero:
-                		/* If another zero, count it, else finish this code block */
-                		if (*src == 0) 
-                		{
-					count++;
-					src++;
-				}
-				else 
-				{
-					StuffData_FinishBlock(Stuff_Zero + count);
-        			}
-				break;
-
-			/* Stuff_Same: We already have at least one byte encoded */
-			case Stuff_Same:
-				/* If another one the same, count it */
-				if ((*src ^ Stuff_Magic) == code_ptr[1]) 
-				{
-					count++;
-					src++;
-					break;
-				}
-				/* else, this byte does not match this block. */
-        			/* If we already have two or more bytes encoded, */
-				/* finish this code block */
-				if (count) 
-				{
-					StuffData_FinishBlock(Stuff_Same + count);
-					break;
-				}
-				/* else, we only have one so far, */
-				/* so switch to Stuff_Diff code */
-				code = Stuff_Diff;
-				/* and fall through to Stuff_Diff case below */
-			 /* Stuff_Diff: We have at least two *different* bytes encoded */
-        		case Stuff_Diff:
-				/* If this is a zero, must encode a Stuff_DiffZero, */
-				/* and begin a new block */
-				if (*src == 0) 
-				{
-					StuffData_FinishBlock(Stuff_DiffZero + count);
-				}
-				/* else, if we have three in a row, it is worth starting */
-				/* a Stuff_Same block */
-				else if ((*src ^ Stuff_Magic)==dst[-1] && dst[-1]==dst[-2]) 
-				{
-				/* Back off the last two characters we encoded */
-				code += count-2;
-				/* Note: "Stuff_Diff + 0" is an illegal code */
-				if (code == Stuff_Diff + 0) 
-				{
-					code = Stuff_Same + 0;
-				}
-				StuffData_FinishBlock(code);
-				code_ptr = dst-2;
-				/* dst[-1] already holds the correct value */
-				count = 2;		/* 2 means three bytes encoded */
-				code = Stuff_Same;
-			}
-			/* else, another different byte, so add it to the block */
-			else 
-                	{
-                		*dst++ = *src ^ Stuff_Magic;
-                		count++;
-                	}
-                	src++;	/* Consume the byte */
-                	break;
-		}
-		if (count == Stuff_MaxCount) 
-		{
-			StuffData_FinishBlock(code + count);
-		}
-	}
-	if (code == Stuff_NoCode) 
-	{
-		*code_ptr_ptr = NULL;
-	}
-	else 
-	{
-		*code_ptr_ptr = code_ptr;
-		StuffData_FinishBlock(code + count);
-	}	
-	return(dst);
-}
-
-/* UnStuffData decodes the data at "src", up to (but not including) "end".
-It writes the decoded data into the buffer pointed to by "dst", up to a
-maximum of "dst_length", and returns the new value of "src" so that a
-follow-on call can read more data, continuing from where the first left off.
-
-There are three types of results:
-1. The source data runs out before extracting "dst_length" bytes:
-   UnStuffData returns NULL to indicate failure.
-2. The source data produces exactly "dst_length" bytes:
-   UnStuffData returns new_src = end to indicate that all bytes were consumed.
-3. "dst_length" bytes are extracted, with more remaining.
-   UnStuffData returns new_src < end to indicate that there are more bytes
-   to be read.
-
-Note: The decoding may be destructive, in that it may alter the source
-data in the process of decoding it (this is necessary to allow a follow-on
-call to resume correctly). */
+    if (!length)
+        return(dst);
+
+    if (code_ptr)
+    {
+        /*
+         * Recover state from last call, if applicable
+         */
+        code  = (*code_ptr ^ Stuff_Magic) & Stuff_CodeMask;
+        count = (*code_ptr ^ Stuff_Magic) & Stuff_CountMask;
+    }
+
+    while (src < end)
+    {
+        switch (code)
+        {
+            /* Stuff_NoCode: If no current code, select one */
+            case Stuff_NoCode:
+                /* Record where we're going to put this code */
+                code_ptr = dst++;
+                count = 0;    /* Reset the count (zero means one instance) */
+                /* Tentatively start a new block */
+                if (*src == 0)
+                {
+                    code = Stuff_Zero;
+                    src++;
+                }
+                else
+                {
+                    code = Stuff_Same;
+                    *dst++ = *src++ ^ Stuff_Magic;
+                }
+                /* Note: We optimistically assume run of same -- */
+                /* which will be fixed later in Stuff_Same */
+                /* if it turns out not to be true. */
+                break;
+
+            /* Stuff_Zero: We already have at least one zero encoded */
+            case Stuff_Zero:
+                /* If another zero, count it, else finish this code block */
+                if (*src == 0)
+                {
+                    count++;
+                    src++;
+                }
+                else
+                {
+                    StuffData_FinishBlock(Stuff_Zero + count);
+                }
+                break;
+
+            /* Stuff_Same: We already have at least one byte encoded */
+            case Stuff_Same:
+                /* If another one the same, count it */
+                if ((*src ^ Stuff_Magic) == code_ptr[1])
+                {
+                    count++;
+                    src++;
+                    break;
+                }
+                /* else, this byte does not match this block. */
+                /* If we already have two or more bytes encoded, finish this code block */
+                if (count)
+                {
+                    StuffData_FinishBlock(Stuff_Same + count);
+                    break;
+                }
+                /* else, we only have one so far, so switch to Stuff_Diff code */
+                code = Stuff_Diff;
+                /* and fall through to Stuff_Diff case below */
+
+            /* Stuff_Diff: We have at least two *different* bytes encoded */
+            case Stuff_Diff:
+                /* If this is a zero, must encode a Stuff_DiffZero, and begin a new block */
+                if (*src == 0)
+                {
+                    StuffData_FinishBlock(Stuff_DiffZero + count);
+                }
+                /* else, if we have three in a row, it is worth starting a Stuff_Same block */
+                else if ((*src ^ Stuff_Magic)==dst[-1] && dst[-1]==dst[-2])
+                {
+                    /* Back off the last two characters we encoded */
+                    code += count-2;
+                    /* Note: "Stuff_Diff + 0" is an illegal code */
+                    if (code == Stuff_Diff + 0)
+                    {
+                        code = Stuff_Same + 0;
+                    }
+                    StuffData_FinishBlock(code);
+                    code_ptr = dst-2;
+                    /* dst[-1] already holds the correct value */
+                    count = 2;        /* 2 means three bytes encoded */
+                    code = Stuff_Same;
+                }
+                /* else, another different byte, so add it to the block */
+                else
+                {
+                    *dst++ = *src ^ Stuff_Magic;
+                    count++;
+                }
+                src++;    /* Consume the byte */
+                break;
+        }
+    if (count == Stuff_MaxCount)
+    {
+        StuffData_FinishBlock(code + count);
+    }
+    }
+    if (code == Stuff_NoCode)
+    {
+        *code_ptr_ptr = NULL;
+    }
+    else
+    {
+        *code_ptr_ptr = code_ptr;
+        StuffData_FinishBlock(code + count);
+    }
+    return(dst);
+}
+
+/*
+ * UnStuffData decodes the data at "src", up to (but not including) "end".
+ * It writes the decoded data into the buffer pointed to by "dst", up to a
+ * maximum of "dst_length", and returns the new value of "src" so that a
+ * follow-on call can read more data, continuing from where the first left off.
+ * 
+ * There are three types of results:
+ * 1. The source data runs out before extracting "dst_length" bytes:
+ *    UnStuffData returns NULL to indicate failure.
+ * 2. The source data produces exactly "dst_length" bytes:
+ *    UnStuffData returns new_src = end to indicate that all bytes were consumed.
+ * 3. "dst_length" bytes are extracted, with more remaining.
+ *    UnStuffData returns new_src < end to indicate that there are more bytes
+ *    to be read.
+ * 
+ * Note: The decoding may be destructive, in that it may alter the source
+ * data in the process of decoding it (this is necessary to allow a follow-on
+ * call to resume correctly).
+ */
 
 static __u8 *UnStuffData(__u8 *src, __u8 *end, __u8 *dst, __u32 dst_length)
 {
-	__u8 *dst_end = dst + dst_length;
-	/* Sanity check */
-	if (!src || !end || !dst || !dst_length) 
-		return(NULL);
-	while (src < end && dst < dst_end) 
-	{
-		int count = (*src ^ Stuff_Magic) & Stuff_CountMask;
-		switch ((*src ^ Stuff_Magic) & Stuff_CodeMask) 
-		{
-			case Stuff_Diff:
-                		if (src+1+count >= end) 
-					return(NULL);
-		                do 
-		                {
-					*dst++ = *++src ^ Stuff_Magic;
-				}
-				while(--count >= 0 && dst < dst_end);
-				if (count < 0) 
-					src += 1;
-				else 
-				{
-					if (count == 0)
-						*src = Stuff_Same ^ Stuff_Magic;
-			                else
-						*src = (Stuff_Diff + count) ^ Stuff_Magic;
-		                }
-                		break;
-			case Stuff_DiffZero:
-				if (src+1+count >= end) 
-					return(NULL);
-				do 
-				{
-					*dst++ = *++src ^ Stuff_Magic;
-				}
-				while(--count >= 0 && dst < dst_end);
-				if (count < 0)
-					*src = Stuff_Zero ^ Stuff_Magic;
-        			else
-					*src = (Stuff_DiffZero + count) ^ Stuff_Magic;
-				break;
-			case Stuff_Same:
-				if (src+1 >= end)
-     					return(NULL);
-				do 
-				{
-					*dst++ = src[1] ^ Stuff_Magic;
-				}
-				while(--count >= 0 && dst < dst_end);
-				if (count < 0)
-					src += 2;
-		                else
-					*src = (Stuff_Same + count) ^ Stuff_Magic;
-				break;
-			case Stuff_Zero:
-				do 
-				{
-					*dst++ = 0;
-				}
-				while(--count >= 0 && dst < dst_end);
-				if (count < 0)
-					src += 1;
-				else
-					*src = (Stuff_Zero + count) ^ Stuff_Magic;
-		                break;
-		}
-	}
-	if (dst < dst_end) 
-		return(NULL);
-	else
-		return(src);
+    __u8 *dst_end = dst + dst_length;
+    /* Sanity check */
+    if (!src || !end || !dst || !dst_length)
+        return(NULL);
+    while (src < end && dst < dst_end)
+    {
+        int count = (*src ^ Stuff_Magic) & Stuff_CountMask;
+        switch ((*src ^ Stuff_Magic) & Stuff_CodeMask)
+        {
+            case Stuff_Diff:
+                if (src+1+count >= end)
+                    return(NULL);
+                do
+                {
+                    *dst++ = *++src ^ Stuff_Magic;
+                }
+                while(--count >= 0 && dst < dst_end);
+                if (count < 0)
+                    src += 1;
+                else
+                {
+                    if (count == 0)
+                        *src = Stuff_Same ^ Stuff_Magic;
+                    else
+                        *src = (Stuff_Diff + count) ^ Stuff_Magic;
+                }
+                break;
+            case Stuff_DiffZero:
+                if (src+1+count >= end)
+                    return(NULL);
+                do
+                {
+                    *dst++ = *++src ^ Stuff_Magic;
+                }
+                while(--count >= 0 && dst < dst_end);
+                if (count < 0)
+                    *src = Stuff_Zero ^ Stuff_Magic;
+                else
+                    *src = (Stuff_DiffZero + count) ^ Stuff_Magic;
+                break;
+            case Stuff_Same:
+                if (src+1 >= end)
+                    return(NULL);
+                do
+                {
+                    *dst++ = src[1] ^ Stuff_Magic;
+                }
+                while(--count >= 0 && dst < dst_end);
+                if (count < 0)
+                    src += 2;
+                else
+                    *src = (Stuff_Same + count) ^ Stuff_Magic;
+                break;
+            case Stuff_Zero:
+                do
+                {
+                    *dst++ = 0;
+                }
+                while(--count >= 0 && dst < dst_end);
+                if (count < 0)
+                    src += 1;
+                else
+                    *src = (Stuff_Zero + count) ^ Stuff_Magic;
+                break;
+        }
+    }
+    if (dst < dst_end)
+        return(NULL);
+    else
+        return(src);
 }
 
+
 /************************************************************************/
 /* General routines for STRIP						*/
 
-/* MTU has been changed by the IP layer. Unfortunately we are not told
- * about this, but we spot it ourselves and fix things up. We could be in
- * an upcall from the tty driver, or in an ip packet queue.
+/*
+ * Convert a string to a Metricom Address.
  */
 
-static void strip_changedmtu(struct strip *strip_info)
+static void string_to_radio_address(MetricomAddress *addr, __u8 *p)
 {
-	struct device *dev = &strip_info->dev;
-	unsigned char *tbuff, *rbuff, *sbuff, *otbuff, *orbuff, *osbuff;
-	int len;
-	InterruptStatus intstat;
-
-	len = STRIP_ENCAP_SIZE(dev->mtu);
-	if (len < STRIP_ENCAP_SIZE(576)) 
-		len = STRIP_ENCAP_SIZE(576);
-
-	tbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
-	rbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
-	sbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
-	if (!tbuff || !rbuff || !sbuff) 
-	{
-        	printk("%s: unable to grow strip buffers, MTU change cancelled.\n",
-        		strip_info->dev.name);
-		dev->mtu = strip_info->mtu;
-		if (tbuff)
-			kfree(tbuff);
-		if (rbuff)
-			kfree(rbuff);
-		if (sbuff)
-			kfree(sbuff);
-		return;
-	}
-
-	intstat = DisableInterrupts();
-	otbuff = strip_info->tx_buff; strip_info->tx_buff = tbuff;
-	orbuff = strip_info->rx_buff; strip_info->rx_buff = rbuff;
-	osbuff = strip_info->sx_buff; strip_info->sx_buff = sbuff;
-	if (strip_info->tx_left) 
-	{
-		if (strip_info->tx_left <= len)
-			memcpy(strip_info->tx_buff, strip_info->tx_head, strip_info->tx_left);
-		else 
-		{
-			strip_info->tx_left = 0;
-			strip_info->tx_dropped++;
-		}
-	}
-	strip_info->tx_head = strip_info->tx_buff;
-
-	if (strip_info->sx_count) 
-	{
-		if (strip_info->sx_count <= len)
-			memcpy(strip_info->sx_buff, osbuff, strip_info->sx_count);
-		else
-		{
-			strip_info->sx_count = 0;
-			strip_info->rx_over_errors++;
-			set_bit(STR_ERROR, &strip_info->flags);
-		}
-	}
-
-	strip_info->mtu      = STRIP_ENCAP_SIZE(dev->mtu);
-	strip_info->buffsize = len;
-
-	RestoreInterrupts(intstat);
-
-	if (otbuff != NULL)
-		 kfree(otbuff);
-	if (orbuff != NULL)
-		kfree(orbuff);
-	if (osbuff != NULL)
-		kfree(osbuff);
+    addr->c[0] = 0;
+    addr->c[1] = 0;
+    addr->c[2] = READHEX(p[0]) << 4 | READHEX(p[1]);
+    addr->c[3] = READHEX(p[2]) << 4 | READHEX(p[3]);
+    addr->c[4] = READHEX(p[5]) << 4 | READHEX(p[6]);
+    addr->c[5] = READHEX(p[7]) << 4 | READHEX(p[8]);
 }
 
-static void strip_unlock(struct strip *strip_info)
+/*
+ * Convert a Metricom Address to a string.
+ */
+
+static __u8 *radio_address_to_string(const MetricomAddress *addr, MetricomAddressString *p)
 {
-	strip_info->idle_timer.expires  = jiffies + 2 * HZ;
-	add_timer(&strip_info->idle_timer);
-	if (!clear_bit(0, (void *)&strip_info->dev.tbusy))
-		printk("%s: trying to unlock already unlocked device!\n",
-			strip_info->dev.name);
+    sprintf(p->c, "%02X%02X-%02X%02X", addr->c[2], addr->c[3], addr->c[4], addr->c[5]);
+    return(p->c);
 }
 
-/************************************************************************/
-/* Sending routines							*/
+/*
+ * Note: Must make sure sx_size is big enough to receive a stuffed
+ * MAX_STRIP_MTU packet. Additionally, we also want to ensure that it's
+ * big enough to receive a large radio neighbour list (currently 4K).
+ */
 
-static void ResetRadio(struct strip *strip_info)
-{	
-	static const char InitString[] = "ate0dt**starmode\r**";
-	strip_info->watchdog_doprobe = jiffies + 10 * HZ;
-	strip_info->watchdog_doreset = jiffies + 1 * HZ;
-	strip_info->tty->driver.write(strip_info->tty, 0,
-		(char *)InitString, sizeof(InitString)-1);
+static int allocate_buffers(struct strip *strip_info)
+{
+    struct device *dev = &strip_info->dev;
+    int stuffedlen = STRIP_ENCAP_SIZE(dev->mtu);
+    int sx_size    = MAX(stuffedlen, 4096);
+    int tx_size    = stuffedlen + sizeof(TickleString2);
+    __u8 *r = kmalloc(MAX_STRIP_MTU, GFP_ATOMIC);
+    __u8 *s = kmalloc(sx_size,       GFP_ATOMIC);
+    __u8 *t = kmalloc(tx_size,       GFP_ATOMIC);
+    if (r && s && t)
+    {
+        strip_info->rx_buff = r;
+        strip_info->sx_buff = s;
+        strip_info->tx_buff = t;
+        strip_info->sx_size = sx_size;
+        strip_info->tx_size = tx_size;
+        strip_info->mtu     = dev->mtu;
+        return(1);
+    }
+    if (r) kfree(r);
+    if (s) kfree(s);
+    if (t) kfree(t);
+    return(0);
 }
 
 /*
- * Called by the driver when there's room for more data.  If we have
- * more packets to send, we send them here.
+ * MTU has been changed by the IP layer. Unfortunately we are not told
+ * about this, but we spot it ourselves and fix things up. We could be in
+ * an upcall from the tty driver, or in an ip packet queue.
  */
 
-static void strip_write_some_more(struct tty_struct *tty)
+static void strip_changedmtu(struct strip *strip_info)
 {
-	InterruptStatus intstat;
-	int num_written;
-	struct strip *strip_info = (struct strip *) tty->disc_data;
-
-	/* First make sure we're connected. */
-	if (!strip_info || strip_info->magic != STRIP_MAGIC || !strip_info->dev.start)
-		return;
-
-	if (strip_info->tx_left > 0) 
-	{	/* If some data left, send it */
-		/* Must disable interrupts because otherwise the write_wakeup might
-		 * happen before we've had a chance to update the tx_left and
-		 *  tx_head fields
- 		 */
-		intstat = DisableInterrupts();
-		num_written = tty->driver.write(tty, 0, strip_info->tx_head, strip_info->tx_left);
-		strip_info->tx_left -= num_written;
-		strip_info->tx_head += num_written;
-		RestoreInterrupts(intstat);
-	}
-	else			/* Else start transmission of another packet */
-	{
-		tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
-		strip_unlock(strip_info);
-		mark_bh(NET_BH);
-	}
-}
+    int old_mtu           = strip_info->mtu;
+    struct device *dev    = &strip_info->dev;
+    unsigned char *orbuff = strip_info->rx_buff;
+    unsigned char *osbuff = strip_info->sx_buff;
+    unsigned char *otbuff = strip_info->tx_buff;
+    InterruptStatus intstat;
 
+    if (dev->mtu > MAX_STRIP_MTU)
+    {
+        printk(KERN_ERR "%s: MTU exceeds maximum allowable (%d), MTU change cancelled.\n",
+            strip_info->dev.name, MAX_STRIP_MTU);
+        dev->mtu = old_mtu;
+        return;
+    }
 
-/* Encapsulate one IP datagram. */
+    /*
+     * Have to disable interrupts here because we're reallocating and resizing
+     * the serial buffers, and we can't have data arriving in them while we're
+     * moving them around in memory. This may cause data to be lost on the serial
+     * port, but hopefully people won't change MTU that often.
+     * Also note, this may not work on a symmetric multi-processor system.
+     */
+    intstat = DisableInterrupts();
 
-static unsigned char *strip_stuff(unsigned char *ptr, struct strip *strip_info, struct sk_buff *skb)
-{
-    __u8         *start;
-    __u8         *stuffstate = NULL;
-    unsigned char  *icp        = skb->data;
-    int             len        = skb->len;
-    MetricomAddress haddr;
+    if (!allocate_buffers(strip_info))
+    {
+        RestoreInterrupts(intstat);
+        printk(KERN_ERR "%s: unable to grow strip buffers, MTU change cancelled.\n",
+            strip_info->dev.name);
+        dev->mtu = old_mtu;
+        return;
+    }
 
-    if (len > strip_info->mtu) {		/* Sigh, shouldn't occur BUT ... */
-        printk("%s: Dropping oversized transmit packet!\n", strip_info->dev.name);
-        strip_info->tx_dropped++;
-        return(NULL);
+    if (strip_info->sx_count)
+    {
+        if (strip_info->sx_count <= strip_info->sx_size)
+            memcpy(strip_info->sx_buff, osbuff, strip_info->sx_count);
+        else
+        {
+            strip_info->sx_count = 0;
+            strip_info->rx_over_errors++;
+            strip_info->discard = 1;
+        }
     }
 
-    if (!arp_query(haddr.c, skb->raddr, &strip_info->dev)) {
-        IPaddr a,b,c;
-        a.l = skb->raddr;
-        b.l = skb->saddr;
-        c.l = skb->daddr;
-        printk("%s: Unknown dest %d.%d.%d.%d s=%d.%d.%d.%d d=%d.%d.%d.%d\n",
-            strip_info->dev.name,
-            a.b[0], a.b[1], a.b[2], a.b[3],
-            b.b[0], b.b[1], b.b[2], b.b[3],
-            c.b[0], c.b[1], c.b[2], c.b[3]);
-        strip_info->tx_dropped++;
-        return(NULL);
+    if (strip_info->tx_left)
+    {
+        if (strip_info->tx_left <= strip_info->tx_size)
+            memcpy(strip_info->tx_buff, strip_info->tx_head, strip_info->tx_left);
+        else
+        {
+            strip_info->tx_left = 0;
+            strip_info->tx_dropped++;
+        }
     }
+    strip_info->tx_head = strip_info->tx_buff;
 
-    *ptr++ = '*';
-    ptr[3] = '0' + haddr.s[0] % 10; haddr.s[0] /= 10;
-    ptr[2] = '0' + haddr.s[0] % 10; haddr.s[0] /= 10;
-    ptr[1] = '0' + haddr.s[0] % 10; haddr.s[0] /= 10;
-    ptr[0] = '0' + haddr.s[0] % 10;
-    ptr+=4;
-    *ptr++ = '-';
-    ptr[3] = '0' + haddr.s[1] % 10; haddr.s[1] /= 10;
-    ptr[2] = '0' + haddr.s[1] % 10; haddr.s[1] /= 10;
-    ptr[1] = '0' + haddr.s[1] % 10; haddr.s[1] /= 10;
-    ptr[0] = '0' + haddr.s[1] % 10;
-    ptr+=4;
-    *ptr++ = '*';
-    *ptr++ = ProtocolKey.c[0];				/* Protocol key */
-    *ptr++ = ProtocolKey.c[1];
-    *ptr++ = ProtocolKey.c[2];
-    *ptr++ = ProtocolKey.c[3];
+    RestoreInterrupts(intstat);
 
-    start = ptr;
-    ptr = StuffData(icp, len, ptr, &stuffstate);	/* Make payload */
+    printk(KERN_NOTICE "%s: strip MTU changed fom %d to %d.\n",
+        strip_info->dev.name, old_mtu, strip_info->mtu);
 
-    *ptr++ = 0x0D;					/* Put on final delimiter */
-    return(ptr);
+    if (orbuff) kfree(orbuff);
+    if (osbuff) kfree(osbuff);
+    if (otbuff) kfree(otbuff);
 }
 
-/* Encapsulate one IP datagram and stuff into a TTY queue. */
-static void strip_send(struct strip *strip_info, struct sk_buff *skb)
+static void strip_unlock(struct strip *strip_info)
 {
-    unsigned char *ptr;
-
-    /* See if someone has been ifconfigging */
-    if (strip_info->mtu != STRIP_ENCAP_SIZE(strip_info->dev.mtu))
-        strip_changedmtu(strip_info);
+    /*
+     * Set the time to go off in one second.
+     */
+    strip_info->idle_timer.expires  = jiffies + HZ;
+    add_timer(&strip_info->idle_timer);
+    if (!clear_bit(0, (void *)&strip_info->dev.tbusy))
+        printk(KERN_ERR "%s: trying to unlock already unlocked device!\n",
+            strip_info->dev.name);
+}
+
+
+/************************************************************************/
+/* Callback routines for exporting information through /proc		*/
+
+#if DO_PROC_NET_STRIP_STATUS | DO_PROC_NET_STRIP_TRACE
+
+/*
+ * This function updates the total amount of data printed so far. It then
+ * determines if the amount of data printed into a buffer  has reached the
+ * offset requested. If it hasn't, then the buffer is shifted over so that
+ * the next bit of data can be printed over the old bit. If the total
+ * amount printed so far exceeds the total amount requested, then this
+ * function returns 1, otherwise 0.
+ */
+static int 
+shift_buffer(char *buffer, int requested_offset, int requested_len,
+	     int *total, int *slop, char **buf)
+{
+    int printed;
+
+    /* printk(KERN_DEBUG "shift: buffer: %d o: %d l: %d t: %d buf: %d\n",
+	   (int) buffer, requested_offset, requested_len, *total,
+	   (int) *buf); */
+    printed = *buf - buffer;
+    if (*total + printed <= requested_offset) {
+	*total += printed;
+	*buf = buffer;
+    }
+    else {
+	if (*total < requested_offset) {
+	    *slop = requested_offset - *total;
+	}
+	*total = requested_offset + printed - *slop;
+    }
+    if (*total > requested_offset + requested_len) {
+	return 1;
+    }
+    else {
+	return 0;
+    }
+}
+
+/*
+ * This function calculates the actual start of the requested data
+ * in the buffer. It also calculates actual length of data returned,
+ * which could be less that the amount of data requested.
+ */
+static int
+calc_start_len(char *buffer, char **start, int requested_offset,
+	       int requested_len, int total, char *buf)
+{
+    int return_len, buffer_len;
+
+    buffer_len = buf - buffer;
+    if (buffer_len >= STRIP_PROC_BUFFER_SIZE - 1) {
+ 	printk(KERN_ERR "STRIP: exceeded /proc buffer size\n");
+    }
+
+    /*
+     * There may be bytes before and after the
+     * chunk that was actually requested.
+     */
+    return_len = total - requested_offset;
+    if (return_len < 0) {
+	return_len = 0;
+    }
+    *start = buf - return_len;
+    if (return_len > requested_len) {
+	return_len = requested_len;
+    }
+    /* printk(KERN_DEBUG "return_len: %d\n", return_len); */
+    return return_len;
+}
+
+#endif DO_PROC_NET_STRIP_STATUS | DO_PROC_NET_STRIP_TRACE
+
+#if DO_PROC_NET_STRIP_STATUS
+
+/*
+ * If the time is in the near future, time_delta prints the number of
+ * seconds to go into the buffer and returns the address of the buffer.
+ * If the time is not in the near future, it returns the address of the
+ * string "Not scheduled" The buffer must be long enough to contain the
+ * ascii representation of the number plus 9 charactes for the " seconds"
+ * and the null character.
+ */
+static char *time_delta(char buffer[], long time)
+{
+    time -= jiffies;
+    if (time > LongTime / 2) return("Not scheduled");
+    if(time < 0) time = 0;  /* Don't print negative times */
+    sprintf(buffer, "%ld seconds", time / HZ);
+    return(buffer);
+}
+
+/*
+ * This function prints radio status information into the specified
+ * buffer.
+ */
+static int
+sprintf_status_info(char *buffer, struct strip *strip_info)
+{
+    char temp_buffer[32];
+    MetricomAddressString addr_string;
+    char *buf;
+
+    buf = buffer;
+    buf += sprintf(buf, "Interface name\t\t%s\n", strip_info->if_name);
+    buf += sprintf(buf, " Radio working:\t\t%s\n",
+		   strip_info->working &&
+                   (long)jiffies - strip_info->watchdog_doreset < 0 ? "Yes" : "No");
+    (void) radio_address_to_string((MetricomAddress *)
+				   &strip_info->dev.dev_addr,
+				   &addr_string);
+    buf += sprintf(buf, " Device address:\t%s\n", addr_string.c);
+    buf += sprintf(buf, " Firmware version:\t%s\n",
+		   !strip_info->working             ? "Unknown" :
+		   !strip_info->structured_messages ? "Should be upgraded" :
+		   strip_info->firmware_version.c);
+    buf += sprintf(buf, " Serial number:\t\t%s\n", strip_info->serial_number.c);
+    buf += sprintf(buf, " Battery voltage:\t%s\n", strip_info->battery_voltage.c);
+    buf += sprintf(buf, " Transmit queue (bytes):%d\n", strip_info->tx_left);
+    buf += sprintf(buf, " Next watchdog probe:\t%s\n",
+		   time_delta(temp_buffer, strip_info->watchdog_doprobe));
+    buf += sprintf(buf, " Next watchdog reset:\t%s\n",
+		   time_delta(temp_buffer, strip_info->watchdog_doreset));
+    buf += sprintf(buf, " Next gratuitous ARP:\t%s\n",
+		   time_delta(temp_buffer, strip_info->gratuitous_arp));
+    buf += sprintf(buf, " Next ARP interval:\t%ld seconds\n",
+		   JIFFIE_TO_SEC(strip_info->arp_interval));
+    return buf - buffer;
+}
+
+static int
+sprintf_portables(char *buffer, struct strip *strip_info)
+{
+
+    MetricomAddressString addr_string;
+    MetricomNode          *node;
+    char *buf;
+
+    buf = buffer;
+    buf += sprintf(buf, " portables: name\t\tpoll_latency\tsignal strength\n");
+    for (node = strip_info->neighbor_list; node != NULL;
+	 node = node->next) {
+	if (!(node->type & NodeValid)) {
+	    break;
+	}
+	if (node->type & NodeHasWAN) {
+	    continue;
+	}
+	(void) radio_address_to_string(&node->addr, &addr_string);
+	buf += sprintf(buf, "  %s\t\t\t\t%d\t\t%d\n",
+		       addr_string.c, node->poll_latency, node->rssi);
+    }
+    return buf - buffer;
+}
+
+static int
+sprintf_poletops(char *buffer, struct strip *strip_info)
+{
+    MetricomNode    *node;
+    char *buf;
+
+    buf = buffer;
+    buf += sprintf(buf, " poletops: GPS\t\t\tpoll_latency\tsignal strength\n");
+    for (node = strip_info->neighbor_list;
+	 node != NULL; node = node->next) {
+	if (!(node->type & NodeValid)) {
+	    break;
+	}
+	if (!(node->type & NodeHasWAN)) {
+	    continue;
+	}
+	buf += sprintf(buf, "  %s\t\t\t%d\t\t%d\n",
+		       node->gl.s, node->poll_latency, node->rssi);
+    }
+    return buf - buffer;
+}
+
+/*
+ * This function is exports status information from the STRIP driver through
+ * the /proc file system. /proc filesystem should be fixed:
+ *    1) slow (sprintfs here, a memory copy in the proc that calls this one)
+ *    2) length of buffer not passed
+ *    3) dummy isn't client data set when the callback was registered
+ *    4) poorly documented (this function is called until the requested amount
+ *       of data is returned, buffer is only 4K long, dummy is the permissions
+ *       of the file (?), the proc_dir_entry passed to proc_net_register must
+ *       be kmalloc-ed)
+ */
 
-    ptr = strip_info->tx_buff;
+static int
+strip_get_status_info(char *buffer, char **start, off_t requested_offset,
+		      int requested_len, int dummy)
+{
+    char            *buf;
+    int             total = 0, slop = 0, len_exceeded;
+    InterruptStatus i_status;
+    struct strip    *strip_info;
+
+    buf = buffer;
+    buf += sprintf(buf, "strip_version: %s\n", StripVersion);
+
+    i_status = DisableInterrupts();
+    strip_info = struct_strip_list;
+    RestoreInterrupts(i_status);
+
+    while (strip_info != NULL) {
+	i_status = DisableInterrupts();
+	buf += sprintf_status_info(buf, strip_info);
+	RestoreInterrupts(i_status);
+	len_exceeded = shift_buffer(buffer, requested_offset, requested_len,
+				    &total, &slop, &buf);
+	if (len_exceeded) {
+	    goto done;
+	}
+	strip_info->neighbor_list_locked = TRUE;
+	buf += sprintf_portables(buf, strip_info);
+	strip_info->neighbor_list_locked = FALSE;
+	len_exceeded = shift_buffer(buffer, requested_offset, requested_len,
+				    &total, &slop, &buf);
+	if (len_exceeded) {
+	    goto done;
+	}
+	strip_info->neighbor_list_locked = TRUE;
+	buf += sprintf_poletops(buf, strip_info);
+	strip_info->neighbor_list_locked = FALSE;
+	len_exceeded = shift_buffer(buffer, requested_offset, requested_len,
+				    &total, &slop, &buf);
+	if (len_exceeded) {
+	    goto done;
+	}
+	strip_info = strip_info->next;
+    }
+done:
+    return calc_start_len(buffer, start, requested_offset, requested_len,
+				total, buf);
+}
+
+#endif DO_PROC_NET_STRIP_STATUS
+
+#if DO_PROC_NET_STRIP_TRACE
+
+/*
+ * Convert an Ethernet protocol to a string
+ * Returns the number of characters printed.
+ */
+
+static int protocol_to_string(int protocol, __u8 *p)
+{
+    int printed;
+
+    switch (protocol) {
+    case ETH_P_IP:
+	printed = sprintf(p, "IP");
+	break;
+    case ETH_P_ARP:
+	printed = sprintf(p, "ARP");
+	break;
+    default: 
+	printed = sprintf(p, "%d", protocol);
+    }
+    return printed;
+}
+
+static int
+sprintf_log_entry(char *buffer, struct strip *strip_info, int packet_index)
+{
+    StripLog *entry;
+    MetricomAddressString addr_string;
+    __u8     sig_buf[24], *s;
+    char     *buf, proto_buf[10];
+
+    entry = &strip_info->packetLog[packet_index];
+    if (!entry->valid) {
+	return 0;
+    }
+    buf = buffer;
+    buf += sprintf(buf, "%-4s %s   %7lu ", strip_info->if_name,
+		   ENTRY_TYPE_TO_STRING(entry->entry_type), entry->seqNum);
+    (void) protocol_to_string(entry->packet_type, proto_buf);
+    buf += sprintf(buf, "%-4s", proto_buf);
+    s = entry->sig.print_sig;
+    sprintf(sig_buf, "%d.%d.%d.%d.%d.%d", s[0], s[1], s[2], s[3], s[4], s[5]);
+    buf += sprintf(buf, "%-24s", sig_buf);
+    (void) radio_address_to_string((MetricomAddress *) &entry->src,
+				   &addr_string);
+    buf += sprintf(buf, "%-10s", addr_string.c);
+    (void) radio_address_to_string((MetricomAddress *) &entry->dest,
+				   &addr_string);
+    buf += sprintf(buf, "%-10s", addr_string.c);
+    buf += sprintf(buf, "%8d %6d %5lu %6lu %5lu\n", entry->timeStamp.tv_sec,
+		   entry->timeStamp.tv_usec, entry->rawSize,
+		   entry->stripSize, entry->slipSize);
+    return buf - buffer;
+}
+
+/*
+ * This function exports trace information from the STRIP driver through the
+ * /proc file system.
+ */
+
+static int
+strip_get_trace_info(char *buffer, char **start, off_t requested_offset,
+		     int requested_len, int dummy)
+{
+    char            *buf;
+    int             len_exceeded, total = 0, slop = 0, packet_index, oldest;
+    InterruptStatus i_status;
+    struct strip    *strip_info;
+
+    buf = buffer;
+    buf += sprintf(buf, "if   s/r seqnum  t   signature               ");
+    buf += sprintf(buf,
+		   "src       dest      sec      usec   raw   strip  slip\n");
+
+    i_status = DisableInterrupts();
+    strip_info = struct_strip_list;
+    oldest = strip_info->next_entry;
+    RestoreInterrupts(i_status);
+
+    /*
+     * If we disable interrupts for this entire loop,
+     * characters from the serial port could be lost,
+     * so we only disable interrupts when accessing
+     * a log entry. If more than STRIP_LOG_INT_SIZE
+     * packets are logged before the first entry is
+     * printed, then some of the entries could be
+     * printed out of order.
+     */
+    while (strip_info != NULL) {
+	for (packet_index = oldest + STRIP_LOG_INT_SIZE;
+	     packet_index != oldest;
+	     packet_index = (packet_index + 1) %
+		 ELEMENTS_OF(strip_info->packetLog)) {
+	    i_status = DisableInterrupts();
+	    buf += sprintf_log_entry(buf, strip_info, packet_index);
+	    RestoreInterrupts(i_status);
+	    len_exceeded = shift_buffer(buffer, requested_offset,
+					requested_len, &total, &slop, &buf);
+	    if (len_exceeded) {
+		goto done;
+	    }
+	}
+	strip_info = strip_info->next;
+    }
+done:
+    return calc_start_len(buffer, start, requested_offset, requested_len,
+			  total, buf);
+}
+
+static int slip_len(unsigned char *data, int len)
+{
+    static const unsigned char SLIP_END=0300;	/* indicates end of SLIP frame	*/
+    static const unsigned char SLIP_ESC=0333;	/* indicates SLIP byte stuffing	*/
+    int count = len;
+    while (--len >= 0)
+    {
+	if (*data == SLIP_END || *data == SLIP_ESC) count++;
+	data++;
+    }
+    return(count);
+}
+
+/* Copied from kernel/sched.c */
+static void jiffiestotimeval(unsigned long jiffies, struct timeval *value)
+{
+    value->tv_usec = (jiffies % HZ) * (1000000.0 / HZ);
+    value->tv_sec = jiffies / HZ;
+    return;
+}
+
+/*
+ * This function logs a packet.
+ * A pointer to the packet itself is passed so that some of the data can be
+ * used to compute a signature. The pointer should point the the
+ * part of the packet following the STRIP_header.
+ */
+
+static void packet_log(struct strip *strip_info, __u8 *packet,
+		       LogEntry entry_type, STRIP_Header *hdr, 
+		       int raw_size, int strip_size, int slip_size)
+{
+    StripLog *entry;
+    struct iphdr *iphdr;
+    struct arphdr *arphdr;
+
+    entry = &strip_info->packetLog[strip_info->next_entry];
+    if (entry_type == EntrySend) {
+	entry->seqNum = strip_info->num_sent++;
+    }
+    else {
+	entry->seqNum = strip_info->num_received++;
+    }
+    entry->entry_type = entry_type;
+    entry->packet_type = ntohs(hdr->protocol);
+    switch (entry->packet_type) {
+    case ETH_P_IP:
+	/*
+	 * The signature for IP is the sender's ip address and
+	 * the identification field.
+	 */
+	iphdr = (struct iphdr *) packet;
+	entry->sig.ip_sig.id = iphdr->id;
+	entry->sig.ip_sig.src.l = iphdr->saddr;
+	break;
+    case ETH_P_ARP:
+	/*
+	 * The signature for ARP is the sender's ip address and
+	 * the operation.
+	 */
+	arphdr = (struct arphdr *) packet;
+	entry->sig.arp_sig.op = arphdr->ar_op;
+        memcpy(&entry->sig.arp_sig.src.l, packet + 8 + arphdr->ar_hln,
+	       sizeof(entry->sig.arp_sig.src.l));
+        entry->sig.arp_sig.src.l = entry->sig.arp_sig.src.l;
+	break;
+    default:
+	printk(KERN_DEBUG "STRIP: packet_log: unknown packet type: %d\n",
+	       entry->packet_type);
+	break;
+    }
+    memcpy(&entry->src, &hdr->src_addr, sizeof(MetricomAddress));
+    memcpy(&entry->dest, &hdr->dst_addr, sizeof(MetricomAddress));
+
+    jiffiestotimeval(jiffies, &(entry->timeStamp));
+    entry->rawSize = raw_size;
+    entry->stripSize = strip_size;
+    entry->slipSize = slip_size;
+    entry->valid = 1;
+
+    strip_info->next_entry = (strip_info->next_entry + 1) %
+	ELEMENTS_OF(strip_info->packetLog);
+}
+
+#endif DO_PROC_NET_STRIP_TRACE
+
+/*
+ * This function parses the response to the ATS300? command,
+ * extracting the radio version and serial number.
+ */
+static void get_radio_version(struct strip *strip_info, __u8 *ptr, __u8 *end)
+{
+    __u8 *p, *value_begin, *value_end;
+    int len;
+    
+    /* Determine the beginning of the second line of the payload */
+    p = ptr;
+    while (p < end && *p != 10) p++;
+    if (p >= end) return;
+    p++;
+    value_begin = p;
+    
+    /* Determine the end of line */
+    while (p < end && *p != 10) p++;
+    if (p >= end) return;
+    value_end = p;
+    p++;
+     
+    len = value_end - value_begin;
+    len = MIN(len, sizeof(MetricomFirmwareVersion) - 1);
+    sprintf(strip_info->firmware_version.c, "%.*s", len, value_begin);
+    
+    /* Look for the first colon */
+    while (p < end && *p != ':') p++;
+    if (p >= end) return;
+    /* Skip over the space */
+    p += 2;
+    len = sizeof(MetricomSerialNumber) - 1;
+    if (p + len <= end) {
+	sprintf(strip_info->serial_number.c, "%.*s", len, p);
+    }
+    else {
+     	printk(KERN_ERR "STRIP: radio serial number shorter (%d) than expected (%d)\n",
+     	       end - p, len);
+    }
+}
+
+/*
+ * This function parses the response to the ATS325? command,
+ * extracting the radio battery voltage.
+ */
+static void get_radio_voltage(struct strip *strip_info, __u8 *ptr, __u8 *end)
+{
+    int len;
+
+    len = sizeof(MetricomBatteryVoltage) - 1;
+    if (ptr + len <= end) {
+	sprintf(strip_info->battery_voltage.c, "%.*s", len, ptr);
+    }
+    else {
+ 	printk(KERN_ERR "STRIP: radio voltage string shorter (%d) than expected (%d)\n",
+ 	       end - ptr, len);
+    }
+}
+
+/*
+ * This function parses the response to the AT~I2 command,
+ * which gives the names of the radio's nearest neighbors.
+ * It relies on the format of the response.
+ */
+static void get_radio_neighbors(struct strip *strip_info, __u8 *ptr, __u8 *end)
+{
+    __u8 *p, *line_begin;
+    int num_nodes_reported, num_nodes_counted;
+    MetricomNode *node, *last;
+
+    /* Check if someone is reading the list */
+    if (strip_info->neighbor_list_locked) {
+	return;
+    }
+
+    /* Determine the number of Nodes */
+    p = ptr;
+    num_nodes_reported = simple_strtoul(p, NULL, 10);
+    /* printk(KERN_DEBUG "num_nodes: %d\n", num_nodes_reported); */
+
+    /* Determine the beginning of the next line */
+    while (p < end && *p != 10) p++;
+    if (p >= end) return;
+    p++;
+
+    /*
+     * The node list should never be empty because we allocate one empty
+     * node when the strip_info is allocated. The nodes which were allocated
+     * when the number of neighbors was high but are no longer needed because
+     * there aren't as many neighbors any more are marked invalid. Invalid nodes
+     * are kept at the end of the list.
+     */
+    node = strip_info->neighbor_list;
+    last = node;
+    if (node == NULL) {
+	DumpData("Neighbor list is NULL:", strip_info, p, end);
+	return;
+    }	
+    line_begin = p;
+    num_nodes_counted = 0;
+    while (line_begin < end) {
+ 	/* Check to see if the format is what we expect. */
+ 	if ((line_begin + STRIP_NODE_LEN) > end) {
+ 	    printk(KERN_ERR "STRIP: radio neighbor node string shorter (%d) than expected (%d)\n",
+ 	       end - line_begin, STRIP_NODE_LEN);
+	    break;
+ 	}
+
+	/* Get a node */
+	if (node == NULL) {
+	    node = kmalloc(sizeof(MetricomNode), GFP_ATOMIC);
+	    node->next = NULL;
+	}
+	node->type = NodeValid;
+
+	/* Fill the node in */
+
+	/* Determine if it has a GPS location and fill it in if it does. */
+	p = line_begin;
+	/* printk(KERN_DEBUG "node: %64s\n", p); */
+	if (p[0] != STRIP_PORTABLE_CHAR) {
+	    node->type |= NodeHasWAN;
+	    sprintf(node->gl.s, "%.*s", (int) sizeof(GeographicLocation) - 1, p);
+	}
+	
+	/* Determine if it is a router */
+	p = line_begin + 18;
+	if (p[0] == STRIP_ROUTER_CHAR) {
+	    node->type |= NodeIsRouter;
+	}
+
+	/* Could be a radio address or some weird poletop address. */
+	p = line_begin + 20;
+	/* printk(KERN_DEBUG "before addr: %6s\n", p); */
+	string_to_radio_address(&node->addr, p);
+	/* radio_address_to_string(&node->addr, addr_string);
+	printk(KERN_DEBUG "after addr: %s\n", addr_string);  */
+	
+	if (IS_RADIO_ADDRESS(p)) {
+	    string_to_radio_address(&node->addr, p);
+	}
+	else {
+	    memset(&node->addr, 0, sizeof(MetricomAddress));
+	}
+	
+	/* Get the poll latency. %$#!@ simple_strtoul can't skip white space */
+	p = line_begin + 41;
+	while (isspace(*p) && (p < end)) {
+	    p++;
+	}
+	node->poll_latency = simple_strtoul(p, NULL, 10);
+	
+	/* Get the signal strength. simple_strtoul doesn't do minus signs */
+	p = line_begin + 60;
+	node->rssi = -simple_strtoul(p, NULL, 10);
+	
+	if (last != node) {
+	    last->next = node;
+	    last = node;
+	}
+	node = node->next;
+	line_begin += STRIP_NODE_LEN;
+	num_nodes_counted++;
+    }
+
+    /* invalidate all remaining nodes */
+    for (;node != NULL; node = node->next) {
+	node->type &= ~NodeValid;
+    }
+
+    /*
+     * If the number of nodes reported is different
+     * from the number counted, might need to up the number
+     * requested.
+     */
+    if (num_nodes_reported != num_nodes_counted) {
+	printk(KERN_DEBUG "nodes reported: %d \tnodes counted: %d\n",
+	       num_nodes_reported, num_nodes_counted);
+    }	
+}
+
+
+/************************************************************************/
+/* Sending routines							*/
+
+static void ResetRadio(struct strip *strip_info)
+{	
+    static const char InitString[] = "\rat\r\rate0q1dt**starmode\r\r**";
+
+    /* If the radio isn't working anymore, we should clear the old status information. */
+    if (strip_info->working)
+    {
+        printk(KERN_INFO "%s: No response: Resetting radio.\n", strip_info->dev.name);
+        strip_info->firmware_version.c[0] = '\0';
+        strip_info->serial_number.c[0] = '\0';
+        strip_info->battery_voltage.c[0] = '\0';
+    }
+    /* Mark radio address as unknown */
+    *(MetricomAddress*)&strip_info->dev.dev_addr = zero_address;
+    strip_info->working = FALSE;
+    strip_info->structured_messages = FALSE;
+    strip_info->watchdog_doprobe = jiffies + 10 * HZ;
+    strip_info->watchdog_doreset = jiffies + 1 * HZ;
+    strip_info->tty->driver.write(strip_info->tty, 0, (char *)InitString, sizeof(InitString)-1);
+}
+
+/*
+ * Called by the driver when there's room for more data.  If we have
+ * more packets to send, we send them here.
+ */
+
+static void strip_write_some_more(struct tty_struct *tty)
+{
+    struct strip *strip_info = (struct strip *) tty->disc_data;
+
+    /* First make sure we're connected. */
+    if (!strip_info || strip_info->magic != STRIP_MAGIC || !strip_info->dev.start)
+        return;
+
+    if (strip_info->tx_left > 0)
+    {
+        /*
+         * If some data left, send it
+         * Note: There's a kernel design bug here. The write_wakeup routine has to
+         * know how many bytes were written in the previous call, but the number of
+         * bytes written is returned as the result of the tty->driver.write call,
+         * and there's no guarantee that the tty->driver.write routine will have
+         * returned before the write_wakeup routine is invoked. If the PC has fast
+         * Serial DMA hardware, then it's quite possible that the write could complete
+         * almost instantaneously, meaning that my write_wakeup routine could be
+         * called immediately, before tty->driver.write has had a chance to return
+         * the number of bytes that it wrote. In an attempt to guard against this,
+         * I disable interrupts around the call to tty->driver.write, although even
+         * this might not work on a symmetric multi-processor system.
+         */
+        InterruptStatus intstat = DisableInterrupts();
+        int num_written = tty->driver.write(tty, 0, strip_info->tx_head, strip_info->tx_left);
+        strip_info->tx_left -= num_written;
+        strip_info->tx_head += num_written;
+        RestoreInterrupts(intstat);
+    }
+    else            /* Else start transmission of another packet */
+    {
+        tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+        strip_unlock(strip_info);
+        mark_bh(NET_BH);
+    }
+}
+
+static unsigned char *strip_make_packet(unsigned char *ptr, struct strip *strip_info, struct sk_buff *skb)
+{
+#if DO_PROC_NET_STRIP_TRACE
+    unsigned char *start_ptr;
+#endif DO_PROC_NET_STRIP_TRACE
+
+    __u8           *stuffstate = NULL;
+    STRIP_Header   *header     = (STRIP_Header *)skb->data;
+    MetricomAddress haddr      = header->dst_addr;
+    int             len        = skb->len - sizeof(STRIP_Header);
+    MetricomKey     key;
+
+    /*HexDump("strip_make_packet", strip_info, skb->data, skb->data + skb->len);*/
+
+    if      (header->protocol == htons(ETH_P_IP))  key = SIP0Key;
+    else if (header->protocol == htons(ETH_P_ARP)) key = ARP0Key;
+    else
+    {
+        printk(KERN_ERR "%s: strip_make_packet: Unknown packet type 0x%04X\n",
+            strip_info->dev.name, ntohs(header->protocol));
+        strip_info->tx_dropped++;
+        return(NULL);
+    }
+
+    if (len > strip_info->mtu)
+    {
+        printk(KERN_ERR "%s: Dropping oversized transmit packet: %d bytes\n",
+            strip_info->dev.name, len);
+        strip_info->tx_dropped++;
+        return(NULL);
+    }
+
+    /*
+     * If this is a broadcast packet, send it to our designated Metricom
+     * 'broadcast hub' radio (First byte of address being 0xFF means broadcast)
+     */
+    if (haddr.c[0] == 0xFF)
+    {
+        /*IPaddr a;
+        a.l = strip_info->dev.pa_brdaddr;
+        printk(KERN_INFO "%s: Broadcast packet! Sending to %d.%d.%d.%d\n",
+                strip_info->dev.name, a.b[0], a.b[1], a.b[2], a.b[3]);*/
+
+        if (!arp_query(haddr.c, strip_info->dev.pa_brdaddr, &strip_info->dev))
+        {
+            /*IPaddr a;
+            a.l = strip_info->dev.pa_brdaddr;
+            printk(KERN_INFO "%s: No ARP cache entry for %d.%d.%d.%d\n",
+                strip_info->dev.name, a.b[0], a.b[1], a.b[2], a.b[3]);
+            strip_info->tx_dropped++;*/
+            return(NULL);
+        }
+    }
+
+    *ptr++ = '*';
+    *ptr++ = hextable[haddr.c[2] >> 4];
+    *ptr++ = hextable[haddr.c[2] & 0xF];
+    *ptr++ = hextable[haddr.c[3] >> 4];
+    *ptr++ = hextable[haddr.c[3] & 0xF];
+    *ptr++ = '-';
+    *ptr++ = hextable[haddr.c[4] >> 4];
+    *ptr++ = hextable[haddr.c[4] & 0xF];
+    *ptr++ = hextable[haddr.c[5] >> 4];
+    *ptr++ = hextable[haddr.c[5] & 0xF];
+    *ptr++ = '*';
+    *ptr++ = key.c[0];
+    *ptr++ = key.c[1];
+    *ptr++ = key.c[2];
+    *ptr++ = key.c[3];
+
+#if DO_PROC_NET_STRIP_TRACE
+    start_ptr = ptr;
+#endif DO_PROC_NET_STRIP_TRACE
+
+    ptr = StuffData(skb->data + sizeof(STRIP_Header), len, ptr, &stuffstate);
+
+#if DO_PROC_NET_STRIP_TRACE
+    packet_log(strip_info, skb->data + sizeof(STRIP_Header), EntrySend,
+	       header, len, ptr-start_ptr,
+	       slip_len(skb->data + sizeof(STRIP_Header), len)); 
+#endif DO_PROC_NET_STRIP_TRACE
+
+    *ptr++ = 0x0D;
+    return(ptr);
+}
+
+static void strip_send(struct strip *strip_info, struct sk_buff *skb)
+{
+    unsigned char *ptr = strip_info->tx_buff;
 
     /* If we have a packet, encapsulate it and put it in the buffer */
-    if (skb) {
-        ptr = strip_stuff(ptr, strip_info, skb);
+    if (skb)
+    {
+        ptr = strip_make_packet(ptr, strip_info, skb);
         /* If error, unlock and return */
         if (!ptr) { strip_unlock(strip_info); return; }
-        strip_info->tx_packets++;	/* Count another successful packet */
+        strip_info->tx_packets++;        /* Count another successful packet */
+        /*DumpData("Sending:", strip_info, strip_info->tx_buff, ptr);*/
+        /*HexDump("Sending", strip_info, strip_info->tx_buff, ptr);*/
     }
 
     /* Set up the strip_info ready to send the data */
@@ -677,238 +1690,528 @@
     strip_info->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
 
     /* If watchdog has expired, reset the radio */
-    if ((long)jiffies - strip_info->watchdog_doreset >= 0) {
-        printk("%s: No response: Resetting radio.\n", strip_info->dev.name);
+    if ((long)jiffies - strip_info->watchdog_doreset >= 0)
+    {
         ResetRadio(strip_info);
+        return;
         /* Note: if there's a packet to send, strip_write_some_more
                  will do it after the reset has finished */
+    }
+
+    /* No reset.
+     * If it is time for another tickle, tack it on the end of the packet
+     */
+    if ((long)jiffies - strip_info->watchdog_doprobe >= 0)
+    {
+        /* Send tickle to make radio protest */
+        /*printk(KERN_INFO "%s: Routine radio test.\n", strip_info->dev.name);*/
+        const char *TickleString = TickleString1;
+        int length = sizeof(TickleString1)-1;
+        if (strip_info->structured_messages)
+        {
+            TickleString = TickleString2;
+            length = sizeof(TickleString2)-1;
+        }
+        memcpy(ptr, TickleString, length);
+        strip_info->tx_left += length;
+        strip_info->watchdog_doprobe = jiffies + 10 * HZ;
+        strip_info->watchdog_doreset = jiffies + 1 * HZ;
+    }
+
+    /*
+     * If it is time for a periodic ARP, queue one up to be sent
+     */
+    if (strip_info->working && (long)jiffies - strip_info->gratuitous_arp >= 0 &&
+        memcmp(strip_info->dev.dev_addr, zero_address.c, sizeof(zero_address)))
+    {
+        /*printk(KERN_INFO "%s: Sending gratuitous ARP with interval %ld\n",
+            strip_info->dev.name, strip_info->arp_interval / HZ);*/
+        strip_info->gratuitous_arp = jiffies + strip_info->arp_interval;
+        strip_info->arp_interval *= 2;
+        if (strip_info->arp_interval > MaxARPInterval)
+            strip_info->arp_interval = MaxARPInterval;
+        arp_send(ARPOP_REPLY, ETH_P_ARP, strip_info->dev.pa_addr,
+                        &strip_info->dev, strip_info->dev.pa_addr,
+                        NULL, strip_info->dev.dev_addr, NULL);
+    }
+
+    if (strip_info->tx_size - strip_info->tx_left < 20)
+        printk(KERN_ERR "%s: Sending%5d bytes;%5d bytes free.\n", strip_info->dev.name,
+            strip_info->tx_left, strip_info->tx_size - strip_info->tx_left);
+
+    /* All ready. Start the transmission */
+    strip_write_some_more(strip_info->tty);
+}
+
+/* Encapsulate a datagram and kick it into a TTY queue. */
+static int strip_xmit(struct sk_buff *skb, struct device *dev)
+{
+    struct strip *strip_info = (struct strip *)(dev->priv);
+
+    if (!dev->start)
+    {
+        printk(KERN_ERR "%s: xmit call when iface is down\n", dev->name);
+        return(1);
+    }
+    if (set_bit(0, (void *) &strip_info->dev.tbusy)) return(1);
+    del_timer(&strip_info->idle_timer);
+
+    /* See if someone has been ifconfigging */
+    if (strip_info->mtu != strip_info->dev.mtu)
+        strip_changedmtu(strip_info);
+
+    strip_send(strip_info, skb);
+
+    if (skb) dev_kfree_skb(skb, FREE_WRITE);
+    return(0);
+}
+
+/*
+ * Create the MAC header for an arbitrary protocol layer
+ *
+ * saddr!=NULL        means use this specific address (n/a for Metricom)
+ * saddr==NULL        means use default device source address
+ * daddr!=NULL        means use this destination address
+ * daddr==NULL        means leave destination address alone
+ *                 (e.g. unresolved arp -- kernel will call
+ *                 rebuild_header later to fill in the address)
+ */
+
+static int strip_header(struct sk_buff *skb, struct device *dev,
+        unsigned short type, void *daddr, void *saddr, unsigned len)
+{
+    STRIP_Header *header = (STRIP_Header *)skb_push(skb, sizeof(STRIP_Header));
+
+    /*printk(KERN_INFO "%s: strip_header 0x%04X %s\n", dev->name, type,
+        type == ETH_P_IP ? "IP" : type == ETH_P_ARP ? "ARP" : "");*/
+
+    memcpy(header->src_addr.c, dev->dev_addr, dev->addr_len);
+    header->protocol = htons(type);
+
+    /*HexDump("strip_header", (struct strip *)(dev->priv), skb->data, skb->data + skb->len);*/
+
+    if (!daddr) return(-dev->hard_header_len);
+
+    memcpy(header->dst_addr.c, daddr, dev->addr_len);
+    return(dev->hard_header_len);
+}
+
+/*
+ * Rebuild the MAC header. This is called after an ARP
+ * (or in future other address resolution) has completed on this
+ * sk_buff. We now let ARP fill in the other fields.
+ * I think this should return zero if packet is ready to send,
+ * or non-zero if it needs more time to do an address lookup
+ */
+
+static int strip_rebuild_header(void *buff, struct device *dev,
+        unsigned long dst, struct sk_buff *skb)
+{
+    STRIP_Header *header = (STRIP_Header *)buff;
+
+    /*printk(KERN_INFO "%s: strip_rebuild_header\n", dev->name);*/
+
+#ifdef CONFIG_INET
+    /* Arp find returns zero if if knows the address, */
+    /* or if it doesn't know the address it sends an ARP packet and returns non-zero */
+    return arp_find(header->dst_addr.c, dst, dev, dev->pa_addr, skb)? 1 : 0;
+#else
+    return 0;
+#endif
+}
+
+/*
+ * IdleTask periodically calls strip_xmit, so even when we have no IP packets
+ * to send for an extended period of time, the watchdog processing still gets
+ * done to ensure that the radio stays in Starmode
+ */
+
+static void strip_IdleTask(unsigned long parameter)
+{
+    strip_xmit(NULL, (struct device *)parameter);
+}
+
+
+/************************************************************************/
+/* Receiving routines							*/
+
+static int strip_receive_room(struct tty_struct *tty)
+{
+    return 0x10000;  /* We can handle an infinite amount of data. :-) */
+}
+
+static void get_radio_address(struct strip *strip_info, __u8 *p)
+{
+    MetricomAddress addr;
+
+    string_to_radio_address(&addr, p);
+
+    /* See if our radio address has changed */
+    if (memcmp(strip_info->dev.dev_addr, addr.c, sizeof(addr)))
+    {
+        MetricomAddressString addr_string;
+        radio_address_to_string(&addr, &addr_string);
+        printk(KERN_INFO "%s: My radio address = %s\n", strip_info->dev.name, addr_string.c);
+        memcpy(strip_info->dev.dev_addr, addr.c, sizeof(addr));
+        /* Give the radio a few seconds to get its head straight, then send an arp */
+        strip_info->gratuitous_arp = jiffies + 6 * HZ;
+        strip_info->arp_interval = 1 * HZ;
+    }
+}
+
+static void RecvErr(char *msg, struct strip *strip_info)
+{
+    __u8 *ptr = strip_info->sx_buff;
+    __u8 *end = strip_info->sx_buff + strip_info->sx_count;
+    DumpData(msg, strip_info, ptr, end);
+    strip_info->rx_errors++;
+}
+
+static void RecvErr_Message(struct strip *strip_info, __u8 *sendername, const __u8 *msg)
+{
+    static const char ERR_001[] = "001"; /* Not in StarMode! */
+    static const char ERR_002[] = "002"; /* Remap handle */
+    static const char ERR_003[] = "003"; /* Can't resolve name */
+    static const char ERR_004[] = "004"; /* Name too small or missing */
+    static const char ERR_005[] = "005"; /* Bad count specification */
+    static const char ERR_006[] = "006"; /* Header too big */
+    static const char ERR_007[] = "007"; /* Body too big */
+    static const char ERR_008[] = "008"; /* Bad character in name */
+    static const char ERR_009[] = "009"; /* No count or line terminator */
+
+    if (!strncmp(msg, ERR_001, sizeof(ERR_001)-1))
+    {
+        RecvErr("Error Msg:", strip_info);
+        printk(KERN_INFO "%s: Radio %s is not in StarMode\n",
+            strip_info->dev.name, sendername);
+    }
+    else if (!strncmp(msg, ERR_002, sizeof(ERR_002)-1))
+    {
+        RecvErr("Error Msg:", strip_info);
+#ifdef notyet        /*Kernel doesn't have scanf!*/
+        int handle;
+        __u8 newname[64];
+        sscanf(msg, "ERR_002 Remap handle &%d to name %s", &handle, newname);
+        printk(KERN_INFO "%s: Radio name %s is handle %d\n",
+            strip_info->dev.name, newname, handle);
+#endif
+    }
+    else if (!strncmp(msg, ERR_003, sizeof(ERR_003)-1))
+    {
+        RecvErr("Error Msg:", strip_info);
+        printk(KERN_INFO "%s: Destination radio name is unknown\n",
+            strip_info->dev.name);
+    }
+    else if (!strncmp(msg, ERR_004, sizeof(ERR_004)-1))
+    {
+        strip_info->watchdog_doreset = jiffies + LongTime;
+        if (!strip_info->working)
+        {
+            strip_info->working = TRUE;
+            printk(KERN_INFO "%s: Radio now in starmode\n",
+                strip_info->dev.name);
+            /*
+             * If the radio has just entered a working state, we should do our first
+             * probe ASAP, so that we find out our radio address etc. without delay.
+             */
+            strip_info->watchdog_doprobe = jiffies;
+        }
+        if (!strip_info->structured_messages && sendername)
+        {
+            strip_info->structured_messages = TRUE;
+            printk(KERN_INFO "%s: Radio provides structured messages\n",
+                strip_info->dev.name);
+        }
+    }
+    else if (!strncmp(msg, ERR_005, sizeof(ERR_005)-1))
+        RecvErr("Error Msg:", strip_info);
+    else if (!strncmp(msg, ERR_006, sizeof(ERR_006)-1))
+        RecvErr("Error Msg:", strip_info);
+    else if (!strncmp(msg, ERR_007, sizeof(ERR_007)-1))
+    {
+        /*
+         * Note: This error knocks the radio back into
+         * command mode.
+         */
+        RecvErr("Error Msg:", strip_info);
+        printk(KERN_ERR "%s: Error! Packet size too big for radio.",
+            strip_info->dev.name);
+        strip_info->watchdog_doreset = jiffies;        /* Do reset ASAP */
+    }
+    else if (!strncmp(msg, ERR_008, sizeof(ERR_008)-1))
+    {
+        RecvErr("Error Msg:", strip_info);
+        printk(KERN_ERR "%s: Radio name contains illegal character\n",
+            strip_info->dev.name);
+    }
+    else if (!strncmp(msg, ERR_009, sizeof(ERR_009)-1))
+        RecvErr("Error Msg:", strip_info);
+    else
+        RecvErr("Error Msg:", strip_info);
+}
+
+static void process_AT_response(struct strip *strip_info, __u8 *ptr, __u8 *end)
+{
+    static const char ATS305[] = "ATS305?";
+    static const char ATS300[] = "ATS300?";
+    static const char ATS325[] = "ATS325?";
+    static const char ATI2[] = "AT~I2 nn";
+
+    /* Skip to the first newline character */
+    __u8 *p = ptr;
+    while (p < end && *p != 10) p++;
+    if (p >= end) return;
+    p++;
+
+    if (!strncmp(ptr, ATS305, sizeof(ATS305)-1))
+    {
+        if (IS_RADIO_ADDRESS(p)) get_radio_address(strip_info, p);
+    }
+    else if (!strncmp(ptr, ATS300, sizeof(ATS300)-1)) {
+        get_radio_version(strip_info, p, end);
+    }
+    else if (!strncmp(ptr, ATS325, sizeof(ATS325)-1)) {
+        get_radio_voltage(strip_info, p, end);
+    }
+    else if (!strncmp(ptr, ATI2, sizeof(ATI2)-1)) {
+        get_radio_neighbors(strip_info, p, end);
+    }
+    else RecvErr("Unknown AT Response:", strip_info);
+}
+
+/*
+ * Send one completely decapsulated datagram to the next layer.
+ */
+
+static void deliver_packet(struct strip *strip_info, STRIP_Header *header, __u16 packetlen)
+{
+    struct sk_buff *skb = dev_alloc_skb(sizeof(STRIP_Header) + packetlen);
+    if (!skb)
+    {
+        printk(KERN_INFO "%s: memory squeeze, dropping packet.\n", strip_info->dev.name);
+        strip_info->rx_dropped++;
+    }
+    else
+    {
+        memcpy(skb_put(skb, sizeof(STRIP_Header)), header, sizeof(STRIP_Header));
+        memcpy(skb_put(skb, packetlen), strip_info->rx_buff, packetlen);
+        skb->dev      = &strip_info->dev;
+        skb->protocol = header->protocol;
+        skb->mac.raw  = skb->data;
+
+        /* Having put a fake header on the front of the sk_buff for the */
+        /* benefit of tools like tcpdump, skb_pull now 'consumes' that  */
+        /* fake header before we hand the packet up to the next layer.  */
+        skb_pull(skb, sizeof(STRIP_Header));
+
+        /* Finally, hand the packet up to the next layer (e.g. IP or ARP, etc.) */
+        strip_info->rx_packets++;
+        netif_rx(skb);
+    }
+}
+
+static void process_IP_packet(struct strip *strip_info, STRIP_Header *header, __u8 *ptr, __u8 *end)
+{
+    __u16 packetlen;
+
+#if DO_PROC_NET_STRIP_TRACE
+    __u8 *start_ptr = ptr;
+#endif DO_PROC_NET_STRIP_TRACE
+
+    /* Decode start of the IP packet header */
+    ptr = UnStuffData(ptr, end, strip_info->rx_buff, 4);
+    if (!ptr)
+    {
+        RecvErr("IP Packet too short", strip_info);
+        return;
+    }
+
+    packetlen = ((__u16)strip_info->rx_buff[2] << 8) | strip_info->rx_buff[3];
+
+    if (packetlen > MAX_STRIP_MTU)
+    {
+        printk(KERN_ERR "%s: Dropping oversized receive packet: %d bytes\n",
+            strip_info->dev.name, packetlen);
+        strip_info->rx_dropped++;
+        return;
+    }
+
+    /*printk(KERN_INFO "%s: Got %d byte IP packet\n", strip_info->dev.name, packetlen);*/
+
+    /* Decode remainder of the IP packet */
+    ptr = UnStuffData(ptr, end, strip_info->rx_buff+4, packetlen-4);
+    if (!ptr)
+    {
+        RecvErr("IP Packet too short", strip_info);
         return;
     }
-    
-    /* No reset.
-     * If it is time for another tickle, tack it on the end of the packet
-     */
-    if ((long)jiffies - strip_info->watchdog_doprobe >= 0) {
-        /* printk("%s: Routine radio test.\n", strip_info->dev.name); */
-        *ptr++ = '*';			/* Tickle to make radio protest */
-        *ptr++ = '*';
-        strip_info->tx_left += 2;
-        strip_info->watchdog_doprobe = jiffies + 10 * HZ;
-        strip_info->watchdog_doreset = jiffies + 1 * HZ;
+
+    if (ptr < end)
+    {
+        RecvErr("IP Packet too long", strip_info);
+        return;
     }
-    
-    /* All ready. Start the transmission */
-    strip_write_some_more(strip_info->tty);
+
+    header->protocol = htons(ETH_P_IP);
+
+#if DO_PROC_NET_STRIP_TRACE
+    packet_log(strip_info, strip_info->rx_buff, EntryReceive, header,
+	       packetlen, end-start_ptr, slip_len(strip_info->rx_buff, packetlen)); 
+#endif DO_PROC_NET_STRIP_TRACE
+
+    deliver_packet(strip_info, header, packetlen);
 }
 
-/* Encapsulate an IP datagram and kick it into a TTY queue. */
-static int strip_xmit(struct sk_buff *skb, struct device *dev)
+static void process_ARP_packet(struct strip *strip_info, STRIP_Header *header, __u8 *ptr, __u8 *end)
 {
-    struct strip *strip_info = (struct strip *)(dev->priv);
+    __u16 packetlen;
+    struct arphdr *arphdr = (struct arphdr *)strip_info->rx_buff;
 
-    if (!dev->start) {
-	printk("%s: xmit call when iface is down\n", dev->name);
-	return(1);
+#if DO_PROC_NET_STRIP_TRACE
+    __u8 *start_ptr = ptr;
+#endif DO_PROC_NET_STRIP_TRACE
+
+    /* Decode start of the ARP packet */
+    ptr = UnStuffData(ptr, end, strip_info->rx_buff, 8);
+    if (!ptr)
+    {
+        RecvErr("ARP Packet too short", strip_info);
+        return;
     }
-    if (set_bit(0, (void *) &strip_info->dev.tbusy)) return(1);
-    del_timer(&strip_info->idle_timer);
-    strip_send(strip_info, skb);
-    if (skb) dev_kfree_skb(skb, FREE_WRITE);
-    return(0);
-}
 
-/* IdleTask periodically calls strip_xmit, so even when we have no IP packets
-   to send for an extended period of time, the watchdog processing still gets
-   done to ensure that the radio stays in Starmode */
+    packetlen = 8 + (arphdr->ar_hln + arphdr->ar_pln) * 2;
 
-static void strip_IdleTask(unsigned long parameter)
-{
-	strip_xmit(NULL, (struct device *)parameter);
-}
+    if (packetlen > MAX_STRIP_MTU)
+    {
+        printk(KERN_ERR "%s: Dropping oversized receive packet: %d bytes\n",
+            strip_info->dev.name, packetlen);
+        strip_info->rx_dropped++;
+        return;
+    }
 
-/************************************************************************/
-/* Receiving routines							*/
+    /*printk(KERN_INFO "%s: Got %d byte ARP %s\n",
+        strip_info->dev.name, packetlen,
+        ntohs(arphdr->ar_op) == ARPOP_REQUEST ? "request" : "reply");*/
+
+    /* Decode remainder of the ARP packet */
+    ptr = UnStuffData(ptr, end, strip_info->rx_buff+8, packetlen-8);
+    if (!ptr)
+    {
+        RecvErr("ARP Packet too short", strip_info);
+        return;
+    }
 
-static int strip_receive_room(struct tty_struct *tty)
-{
-	return 65536;  /* We can handle an infinite amount of data. :-) */
-}
+    if (ptr < end)
+    {
+        RecvErr("ARP Packet too long", strip_info);
+        return;
+    }
 
-/* Send one completely decapsulated IP datagram to the IP layer. */
+    header->protocol = htons(ETH_P_ARP);
 
-static void strip_bump(struct strip *strip_info, __u16 packetlen)
-{
-	int count = sizeof(STRIP_Header) + packetlen;
-	struct sk_buff *skb = dev_alloc_skb(count);
-	if (skb == NULL) 
-	{
-		printk("%s: memory squeeze, dropping packet.\n", 
-			strip_info->dev.name);
-		strip_info->rx_dropped++;
-		return;
-	}
-	skb->dev = &strip_info->dev;
-	memcpy(skb_put(skb, count), strip_info->rx_buff, count);
-	skb->mac.raw=skb->data;
-	skb->protocol = htons(ETH_P_IP);
-	netif_rx(skb);
-	strip_info->rx_packets++;
-}
+#if DO_PROC_NET_STRIP_TRACE
+    packet_log(strip_info, strip_info->rx_buff, EntryReceive, header,
+	       packetlen, end-start_ptr, slip_len(strip_info->rx_buff, packetlen)); 
+#endif DO_PROC_NET_STRIP_TRACE
 
-static void RecvErr(char *msg, struct strip *strip_info)
-{
-	static const int MAX_RecvErr = 80;
-	__u8 *ptr = strip_info->sx_buff;
-	__u8 *end = strip_info->sx_buff + strip_info->sx_count;
-	__u8 pkt_text[MAX_RecvErr], *p = pkt_text;
-	*p++ = '\"';
-	while (ptr<end && p < &pkt_text[MAX_RecvErr-4]) 
-	{
-		if (*ptr == '\\') 
-		{
-			*p++ = '\\';
-			*p++ = '\\';
-		}
-		else 
-		{
-			if (*ptr >= 32 && *ptr <= 126) 
-				*p++ = *ptr;
-			else
-			{
-				sprintf(p, "\\%02X", *ptr);
-				p+= 3;
-			}
-		}
-	        ptr++;
-	}
-	if (ptr == end)
-	        *p++ = '\"';
-	*p++ = 0;
-	printk("%-13s%s\n", msg, pkt_text);
-	set_bit(STR_ERROR, &strip_info->flags);
-	strip_info->rx_errors++;
-}
-
-static void RecvErr_Message(struct strip *strip_info, __u8 *sendername, __u8 *msg)
-{
-	static const char ERR_001[] = "ERR_001 Not in StarMode!";
-	static const char ERR_002[] = "ERR_002 Remap handle";
-	static const char ERR_003[] = "ERR_003 Can't resolve name";
-	static const char ERR_004[] = "ERR_004 Name too small or missing";
-	static const char ERR_007[] = "ERR_007 Body too big";
-	static const char ERR_008[] = "ERR_008 Bad character in name";
-
-	if (!strncmp(msg, ERR_001, sizeof(ERR_001)-1))
-		printk("Radio %s is not in StarMode\n", sendername);
-	else if (!strncmp(msg, ERR_002, sizeof(ERR_002)-1)) 
-	{
-#ifdef notyet		/*Kernel doesn't have scanf!*/
-		int handle;
-		__u8 newname[64];
-		sscanf(msg, "ERR_002 Remap handle &%d to name %s", &handle, newname);
-		printk("Radio name %s is handle %d\n", newname, handle);
-#endif
-	}
-	else if (!strncmp(msg, ERR_003, sizeof(ERR_003)-1)) 
-		printk("Radio name <unspecified> is unknown (\"Can't resolve name\" error)\n");
-	else if (!strncmp(msg, ERR_004, sizeof(ERR_004)-1)) 
-        	strip_info->watchdog_doreset = jiffies + LONG_TIME;
-	 else if (!strncmp(msg, ERR_007, sizeof(ERR_007)-1)) 
-	 {
-		/*
-		 *	Note: This error knocks the radio back into 
-		 *	command mode. 
-		 */
-		printk("Error! Packet size <unspecified> is too big for radio.");
-		strip_info->watchdog_doreset = jiffies;		/* Do reset ASAP */
-	}
-	else if (!strncmp(msg, ERR_008, sizeof(ERR_008)-1)) 
-		printk("Name <unspecified> contains illegal character\n");
-	else 
-		RecvErr("Error Msg:", strip_info);
+    deliver_packet(strip_info, header, packetlen);
 }
 
 static void process_packet(struct strip *strip_info)
 {
+    STRIP_Header header = { zero_address, zero_address, 0 };
     __u8 *ptr = strip_info->sx_buff;
     __u8 *end = strip_info->sx_buff + strip_info->sx_count;
-    __u8 *name, *name_end;
-    __u16 packetlen;
+    __u8 sendername[32], *sptr = sendername;
+    MetricomKey key;
 
-    /* Ignore empty lines */
-    if (strip_info->sx_count == 0) return;
+    /* Ignore 'OK' responses from prior commands */
+    if (strip_info->sx_count == 2 && ptr[0] == 'O' && ptr[1] == 'K') return;
 
-    /* Catch 'OK' responses which show radio has fallen out of starmode */
-    if (strip_info->sx_count == 2 && ptr[0] == 'O' && ptr[1] == 'K') {
-        printk("%s: Radio is back in AT command mode: Will Reset\n",
-            strip_info->dev.name);
-        strip_info->watchdog_doreset = jiffies;		/* Do reset ASAP */
+    /* Check for anything that looks like it might be our radio name: dddd-dddd */
+    /* (This is here for backwards compatibility with old firmware)             */
+    if (strip_info->sx_count == 9 && IS_RADIO_ADDRESS(ptr))
+    {
+        get_radio_address(strip_info, ptr);
         return;
     }
 
+    /*HexDump("Receiving", strip_info, ptr, end);*/
+
     /* Check for start of address marker, and then skip over it */
-    if (*ptr != '*') {
+    if (*ptr != '*')
+    {
         /* Catch other error messages */
         if (ptr[0] == 'E' && ptr[1] == 'R' && ptr[2] == 'R' && ptr[3] == '_')
-            RecvErr_Message(strip_info, NULL, strip_info->sx_buff);
+            RecvErr_Message(strip_info, NULL, &ptr[4]);
         else RecvErr("No initial *", strip_info);
         return;
     }
-    ptr++;
+    ptr++; /* Skip the initial '*' */
 
-    /* Skip the return address */
-    name = ptr;
-    while (ptr < end && *ptr != '*') ptr++;
+    /* Copy out the return address */
+    while (ptr < end && *ptr != '*' && sptr < ARRAY_END(sendername)-1) *sptr++ = *ptr++;
+    *sptr = 0;                /* Null terminate the sender name */
 
     /* Check for end of address marker, and skip over it */
-    if (ptr == end) {
+    if (ptr >= end || *ptr != '*')
+    {
         RecvErr("No second *", strip_info);
         return;
     }
-    name_end = ptr++;
+    ptr++; /* Skip the second '*' */
 
-    /* Check for STRIP key, and skip over it */
-    if (ptr[0] != ProtocolKey.c[0] ||
-        ptr[1] != ProtocolKey.c[1] ||
-        ptr[2] != ProtocolKey.c[2] ||
-        ptr[3] != ProtocolKey.c[3]) {
-        if (ptr[0] == 'E' && ptr[1] == 'R' && ptr[2] == 'R' && ptr[3] == '_') { *name_end = 0; RecvErr_Message(strip_info, name, ptr); }
-        else RecvErr("Unrecognized protocol key", strip_info);
+    /* If the sender name is "&COMMAND", ignore this 'packet'       */
+    /* (This is here for backwards compatibility with old firmware) */
+    if (!strcmp(sendername, "&COMMAND"))
+    {
+        strip_info->structured_messages = FALSE;
         return;
     }
-    ptr += 4;
 
-    /* Decode start of the IP packet header */
-    ptr = UnStuffData(ptr, end, strip_info->rx_buff, 4);
-    if (!ptr) {
-        RecvErr("Runt packet", strip_info);
+    if (ptr+4 >= end)
+    {
+        RecvErr("No proto key", strip_info);
         return;
     }
 
-    packetlen = ((__u16)strip_info->rx_buff[2] << 8) | strip_info->rx_buff[3];
-/*	printk("Packet %02X.%02X.%02X.%02X\n",
-        strip_info->rx_buff[0], strip_info->rx_buff[1],
-        strip_info->rx_buff[2], strip_info->rx_buff[3]);
-    printk("Got %d byte packet\n", packetlen);*/
-
-    /* Decode remainder of the IP packer */
-    ptr = UnStuffData(ptr, end, strip_info->rx_buff+4, packetlen-4);
-    if (!ptr) {
-        RecvErr("Runt packet", strip_info);
-        return;
-    }
-    strip_bump(strip_info, packetlen);
+    /*printk(KERN_INFO "%s: Got packet from \"%s\".\n", strip_info->dev.name, sendername);*/
 
-    /* This turns out to be a mistake. Taking receipt of a valid packet as
-     * evidence that the radio is correctly in Starmode (and resetting the
-     * watchdog_doreset timer) is wrong.  It turns out that if the radio is
-     * in command mode, with character echo on, then the echo of the packet
-     * you sent coming back looks like a valid packet and fools this test.
-     * We should only accept the "ERR_004 Name too small or missing" message
-     * as evidence that the radio is correctly in Starmode.
-    strip_info->watchdog_doprobe = jiffies + 10 * HZ;
-    strip_info->watchdog_doreset = jiffies + LONG_TIME;
+    /*
+     * Fill in (pseudo) source and destination addresses in the packet.
+     * We assume that the destination address was our address (the radio does not
+     * tell us this). If the radio supplies a source address, then we use it.
      */
+    memcpy(&header.dst_addr, strip_info->dev.dev_addr, sizeof(MetricomAddress));
+    if (IS_RADIO_ADDRESS(sendername)) string_to_radio_address(&header.src_addr, sendername);
+
+    /* Get the protocol key out of the buffer */
+    key.c[0] = *ptr++;
+    key.c[1] = *ptr++;
+    key.c[2] = *ptr++;
+    key.c[3] = *ptr++;
+
+    if      (key.l == SIP0Key.l) process_IP_packet(strip_info, &header, ptr, end);
+    else if (key.l == ARP0Key.l) process_ARP_packet(strip_info, &header, ptr, end);
+    else if (key.l == ATR_Key.l) process_AT_response(strip_info, ptr, end);
+    else if (key.l == ERR_Key.l) RecvErr_Message(strip_info, sendername, ptr);
+    else /* RecvErr("Unrecognized protocol key", strip_info); */
+
+    /* Note, this "else" block is temporary, until Metricom fix their */
+    /* packet corruption bug */
+    {
+        RecvErr("Unrecognized protocol key (retrying)", strip_info);
+        ptr -= 3; /* Back up and try again */
+        key.c[0] = *ptr++;
+        key.c[1] = *ptr++;
+        key.c[2] = *ptr++;
+        key.c[3] = *ptr++;
+        if      (key.l == SIP0Key.l) process_IP_packet(strip_info, &header, ptr, end);
+        else if (key.l == ARP0Key.l) process_ARP_packet(strip_info, &header, ptr, end);
+        else if (key.l == ATR_Key.l) process_AT_response(strip_info, ptr, end);
+        else if (key.l == ERR_Key.l) RecvErr_Message(strip_info, sendername, ptr);
+        else RecvErr("Unrecognized protocol key", strip_info);
+    }
 }
 
 /*
@@ -917,10 +2220,10 @@
  * a block of STRIP data has been received, which can now be decapsulated
  * and sent on to some IP layer for further processing.
  */
+
 static void
 strip_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, int count)
 {
-/*	struct timeval tv;*/
     struct strip *strip_info = (struct strip *) tty->disc_data;
     const unsigned char *end = cp + count;
 
@@ -928,104 +2231,86 @@
         return;
 
     /* Argh! mtu change time! - costs us the packet part received at the change */
-    if (strip_info->mtu != STRIP_ENCAP_SIZE(strip_info->dev.mtu))
+    if (strip_info->mtu != strip_info->dev.mtu)
         strip_changedmtu(strip_info);
 
-/*	do_gettimeofday(&tv);
-    printk("**** strip_receive_buf: %3d bytes at %d.%06d\n",
-        count, tv.tv_sec % 100, tv.tv_usec);*/
+#if 0
+    {
+    struct timeval tv;
+    do_gettimeofday(&tv);
+    printk(KERN_INFO "**** strip_receive_buf: %3d bytes at %d.%06d\n",
+        count, tv.tv_sec % 100, tv.tv_usec);
+    }
+#endif
+
     /* Read the characters out of the buffer */
-    while (cp < end) {
-        if (fp && *fp++) {
-            if (!set_bit(STR_ERROR, &strip_info->flags)) strip_info->rx_errors++;
-        }
-        else if (*cp == 0x0D) {
-            /*printk("Cut a %d byte packet (%d bytes remaining)\n",
-                strip_info->sx_count, end-cp-1);*/
-            if (!clear_bit(STR_ERROR, &strip_info->flags))
-                process_packet(strip_info);
-            strip_info->sx_count = 0;
+    while (cp < end)
+    {
+        if (fp && *fp++ && !strip_info->discard) /* If there's a serial error, record it */
+        {
+            strip_info->discard = 1;
+            strip_info->rx_errors++;
         }
-        else if (!test_bit(STR_ERROR, &strip_info->flags) &&
-            (strip_info->sx_count > 0 || *cp != 0x0A))
+
+        /* Leading control characters (CR, NL, Tab, etc.) are ignored */
+        if (strip_info->sx_count > 0 || *cp >= ' ')
         {
-            /* (leading newline characters are ignored) */
-            if (strip_info->sx_count < strip_info->buffsize)
-                strip_info->sx_buff[strip_info->sx_count++] = *cp;
-            else
+            if (*cp == 0x0D)                /* If end of packet, decide what to do with it */
+            {
+                if (strip_info->sx_count > 3000)
+                    printk(KERN_INFO "Cut a %d byte packet (%d bytes remaining)%s\n",
+                        strip_info->sx_count, end-cp-1,
+                        strip_info->discard ? " (discarded)" : "");
+                if (strip_info->sx_count > strip_info->sx_size)
+                {
+                    strip_info->discard = 1;
+                    strip_info->rx_over_errors++;
+                    printk(KERN_INFO "%s: sx_buff overflow (%d bytes total)\n",
+                           strip_info->dev.name, strip_info->sx_count);
+                }
+                if (!strip_info->discard) process_packet(strip_info);
+                strip_info->discard = 0;
+                strip_info->sx_count = 0;
+            }
+            else if (!strip_info->discard) /* If we're not discarding, store the character */
             {
-                set_bit(STR_ERROR, &strip_info->flags);
-                strip_info->rx_over_errors++;
+                /* Make sure we have space in the buffer */
+                if (strip_info->sx_count < strip_info->sx_size)
+                    strip_info->sx_buff[strip_info->sx_count] = *cp;
+                strip_info->sx_count++;
             }
         }
         cp++;
     }
 }
 
+
 /************************************************************************/
 /* General control routines						*/
 
-/*
- *	 Create the Ethernet MAC header for an arbitrary protocol layer 
- *
- *	saddr=NULL	means use device source address
- *	daddr=NULL	means leave destination address (eg unresolved arp)
- */
-
-static int strip_header(struct sk_buff *skb, struct device *dev, 
-	unsigned short type, void *daddr, void *saddr, unsigned len)
-{
-	return(-dev->hard_header_len);
-}
-
-/*
- *	Rebuild the Ethernet MAC header. This is called after an ARP
- *	(or in future other address resolution) has completed on this
- *	sk_buff. We now let ARP fill in the other fields.
- */
-
-/* I think this should return zero if packet is ready to send, */
-/* or non-zero if it needs more time to do an address lookup   */
-
-static int strip_rebuild_header(void *buff, struct device *dev, 
-	unsigned long dst, struct sk_buff *skb)
-{
-/*	STRIP_Header *h = (STRIP_Header *)buff;*/
-
-#ifdef CONFIG_INET
-	/* I'll use arp_find when I understand it */
-	/* Arp find returns zero if if knows the address, or if it doesn't */
-	/* know the address it sends an ARP packet and returns non-zero */
-	/*return arp_find(eth->h_dest, dst, dev, dev->pa_addr, skb)? 1 : 0;*/
-	return(0);
-#else
-	return(0);
-#endif	
-}
-
 static int strip_set_dev_mac_address(struct device *dev, void *addr)
 {
-	memcpy(dev->dev_addr, addr, 7);
-	return 0;
+    return -1;        /* You cannot override a Metricom radio's address */
 }
 
 static struct enet_statistics *strip_get_stats(struct device *dev)
 {
-	static struct enet_statistics stats;
-	struct strip *strip_info = (struct strip *)(dev->priv);
+    static struct enet_statistics stats;
+    struct strip *strip_info = (struct strip *)(dev->priv);
 
-	memset(&stats, 0, sizeof(struct enet_statistics));
+    memset(&stats, 0, sizeof(struct enet_statistics));
 
-	stats.rx_packets     = strip_info->rx_packets;
-	stats.tx_packets     = strip_info->tx_packets;
-	stats.rx_dropped     = strip_info->rx_dropped;
-	stats.tx_dropped     = strip_info->tx_dropped;
-	stats.tx_errors      = strip_info->tx_errors;
-	stats.rx_errors      = strip_info->rx_errors;
-	stats.rx_over_errors = strip_info->rx_over_errors;
-	return(&stats);
+    stats.rx_packets     = strip_info->rx_packets;
+    stats.tx_packets     = strip_info->tx_packets;
+    stats.rx_dropped     = strip_info->rx_dropped;
+    stats.tx_dropped     = strip_info->tx_dropped;
+    stats.tx_errors      = strip_info->tx_errors;
+    stats.rx_errors      = strip_info->rx_errors;
+    stats.rx_over_errors = strip_info->rx_over_errors;
+    return(&stats);
 }
 
+
 /************************************************************************/
 /* Opening and closing							*/
 
@@ -1055,298 +2340,286 @@
 
 static int strip_open_low(struct device *dev)
 {
-	struct strip *strip_info = (struct strip *)(dev->priv);
-	unsigned long len;
-
-	if (strip_info->tty == NULL) 
-		return(-ENODEV);
+    struct strip *strip_info = (struct strip *)(dev->priv);
 
-	/*
-	 * Allocate the STRIP frame buffers:
-	 *
-	 * rbuff	Receive buffer.
-	 * tbuff	Transmit buffer.
-	 * cbuff        Temporary compression buffer.
-	 */
+    if (strip_info->tty == NULL)
+        return(-ENODEV);
 
-	len = STRIP_ENCAP_SIZE(dev->mtu);
-	if (len < STRIP_ENCAP_SIZE(576)) 
-		len = STRIP_ENCAP_SIZE(576);
-	strip_info->rx_buff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
-	if (strip_info->rx_buff == NULL) 
-		goto norbuff;
-	strip_info->sx_buff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
-	if (strip_info->sx_buff == NULL) 
-		goto nosbuff;
-	strip_info->tx_buff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
-	if (strip_info->tx_buff == NULL) 
-		goto notbuff;
-
-	strip_info->flags   &= (1 << STR_INUSE); /* Clear ESCAPE & ERROR flags */
-	strip_info->mtu	 = STRIP_ENCAP_SIZE(dev->mtu);
-	strip_info->buffsize = len;
-	strip_info->sx_count = 0;
-	strip_info->tx_left  = 0;
+    if (!allocate_buffers(strip_info))
+        return(-ENOMEM);
 
-	/*
-	 *	Needed because address '0' is special 
-	 */
-	 
-	if (dev->pa_addr == 0) 
-		dev->pa_addr=ntohl(0xC0A80001);
-	dev->tbusy  = 0;
-	dev->start  = 1;
+    strip_info->discard  = 0;
+    strip_info->working  = FALSE;
+    strip_info->structured_messages = FALSE;
+    strip_info->sx_count = 0;
+    strip_info->tx_left  = 0;
 
-	printk("%s: Initializing Radio.\n", strip_info->dev.name);
-	ResetRadio(strip_info);
-	strip_info->idle_timer.expires  = jiffies + 2 * HZ;
-	add_timer(&strip_info->idle_timer);
-	return(0);
+    /*
+     * Needed because address '0' is special
+     */
 
-notbuff:
-	kfree(strip_info->sx_buff);
-nosbuff:
-	kfree(strip_info->rx_buff);
-norbuff:
-	return(-ENOMEM);
+    if (dev->pa_addr == 0)
+        dev->pa_addr=ntohl(0xC0A80001);
+    dev->tbusy  = 0;
+    dev->start  = 1;
+
+    printk(KERN_INFO "%s: Initializing Radio.\n", strip_info->dev.name);
+    ResetRadio(strip_info);
+    strip_info->idle_timer.expires  = jiffies + 2 * HZ;
+    add_timer(&strip_info->idle_timer);
+    return(0);
 }
 
 
 /*
- *	Close the low-level part of the STRIP channel. Easy! 
+ * Close the low-level part of the STRIP channel. Easy!
  */
- 
+
 static int strip_close_low(struct device *dev)
 {
-	struct strip *strip_info = (struct strip *)(dev->priv);
+    struct strip *strip_info = (struct strip *)(dev->priv);
 
-	if (strip_info->tty == NULL) 
-		return -EBUSY;
-	strip_info->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
-	dev->tbusy = 1;
-	dev->start = 0;
-    
-	/*
-	 *	Free all STRIP frame buffers.
-	 */
-	if (strip_info->rx_buff) 
-	{
-		kfree(strip_info->rx_buff);
-		strip_info->rx_buff = NULL;
-	}
-	if (strip_info->sx_buff) 
-	{
-		kfree(strip_info->sx_buff); 
-		strip_info->sx_buff = NULL;
-	}
-	if (strip_info->tx_buff) 
-	{
-		kfree(strip_info->tx_buff); 
-		strip_info->tx_buff = NULL; 
-	}
-	del_timer(&strip_info->idle_timer);
-	return 0;
+    if (strip_info->tty == NULL)
+        return -EBUSY;
+    strip_info->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+    dev->tbusy = 1;
+    dev->start = 0;
+
+    /*
+     * Free all STRIP frame buffers.
+     */
+    if (strip_info->rx_buff)
+    {
+        kfree(strip_info->rx_buff);
+        strip_info->rx_buff = NULL;
+    }
+    if (strip_info->sx_buff)
+    {
+        kfree(strip_info->sx_buff);
+        strip_info->sx_buff = NULL;
+    }
+    if (strip_info->tx_buff)
+    {
+        kfree(strip_info->tx_buff);
+        strip_info->tx_buff = NULL;
+    }
+    del_timer(&strip_info->idle_timer);
+    return 0;
 }
 
-/* 
- *	This routine is called by DDI when the
- *	(dynamically assigned) device is registered
+/*
+ * This routine is called by DDI when the
+ * (dynamically assigned) device is registered
  */
- 
+
 static int strip_dev_init(struct device *dev)
 {
-	int i;
-	
-	/*
-	 *	Finish setting up the DEVICE info. 
-	 */
+    int i;
 
-	dev->trans_start        = 0;
-	dev->last_rx            = 0;
-	dev->tx_queue_len       = 30; 	/* Drop after 30 frames queued */
-
-	dev->flags              = 0;
-	dev->family             = AF_INET;
-	dev->metric             = 0;
-	dev->mtu                = STRIP_MTU;
-	dev->type               = ARPHRD_METRICOM;        /* dtang */
-	dev->hard_header_len    = 8; /*sizeof(STRIP_Header);*/
-	/*
-	 *  dev->priv                 Already holds a pointer to our struct strip 
-	 */
+    /*
+     * Finish setting up the DEVICE info.
+     */
 
-	dev->broadcast[0]       = 0;
-	dev->dev_addr[0]        = 0;
-	dev->addr_len           = sizeof(MetricomAddress);
-	dev->pa_addr            = 0;
-	dev->pa_brdaddr         = 0;
-	dev->pa_mask            = 0;
-	dev->pa_alen            = sizeof(unsigned long);
+    dev->trans_start        = 0;
+    dev->last_rx            = 0;
+    dev->tx_queue_len       = 30;         /* Drop after 30 frames queued */
+
+    dev->flags              = 0;
+    dev->family             = AF_INET;
+    dev->metric             = 0;
+    dev->mtu                = DEFAULT_STRIP_MTU;
+    dev->type               = ARPHRD_METRICOM;        /* dtang */
+    dev->hard_header_len    = sizeof(STRIP_Header);
+    /*
+     *  dev->priv             Already holds a pointer to our struct strip
+     */
 
-	/*
-	 *	Pointer to the interface buffers. 
-	 */
-	 
-	for (i = 0; i < DEV_NUMBUFFS; i++) 
-		skb_queue_head_init(&dev->buffs[i]);
+    *(MetricomAddress*)&dev->broadcast = broadcast_address;
+    dev->dev_addr[0]        = 0;
+    dev->addr_len           = sizeof(MetricomAddress);
+    dev->pa_addr            = 0;
+    dev->pa_brdaddr         = 0;
+    dev->pa_mask            = 0;
+    dev->pa_alen            = sizeof(unsigned long);
 
-	/*
-	 *	Pointers to interface service routines. 
-	 */
+    /*
+     * Pointer to the interface buffers.
+     */
 
-	dev->open               = strip_open_low;
-	dev->stop               = strip_close_low;
-	dev->hard_start_xmit    = strip_xmit;
-	dev->hard_header        = strip_header;
-	dev->rebuild_header     = strip_rebuild_header;
-	/*  dev->type_trans            unused */
-	/*  dev->set_multicast_list   unused */
-	dev->set_mac_address    = strip_set_dev_mac_address;
-	/*  dev->do_ioctl             unused */
-	/*  dev->set_config           unused */
-	dev->get_stats          = strip_get_stats;
-	return 0;
+    for (i = 0; i < DEV_NUMBUFFS; i++)
+        skb_queue_head_init(&dev->buffs[i]);
+
+    /*
+     * Pointers to interface service routines.
+     */
+
+    dev->open               = strip_open_low;
+    dev->stop               = strip_close_low;
+    dev->hard_start_xmit    = strip_xmit;
+    dev->hard_header        = strip_header;
+    dev->rebuild_header     = strip_rebuild_header;
+    /*  dev->type_trans            unused */
+    /*  dev->set_multicast_list   unused */
+    dev->set_mac_address    = strip_set_dev_mac_address;
+    /*  dev->do_ioctl             unused */
+    /*  dev->set_config           unused */
+    dev->get_stats          = strip_get_stats;
+    return 0;
 }
 
 /*
- *	Free a STRIP channel. 
+ * Free a STRIP channel.
  */
- 
+
 static void strip_free(struct strip *strip_info)
 {
-	*(strip_info->referrer) = strip_info->next;
-	if (strip_info->next) 
-		strip_info->next->referrer = strip_info->referrer;
-	strip_info->magic = 0;
-	kfree(strip_info);
+    MetricomNode *node, *free;
+
+    *(strip_info->referrer) = strip_info->next;
+    if (strip_info->next)
+        strip_info->next->referrer = strip_info->referrer;
+    strip_info->magic = 0;
+
+    for (node = strip_info->neighbor_list; node != NULL; )
+    {
+        free = node;
+        node = node->next;
+        kfree(free);
+    }
+    kfree(strip_info);
 }
 
-/* 
- *	Allocate a new free STRIP channel 
+/*
+ * Allocate a new free STRIP channel
  */
- 
+
 static struct strip *strip_alloc(void)
 {
-	int channel_id = 0;
-	struct strip **s = &struct_strip_list;
-	struct strip *strip_info = (struct strip *)
-		kmalloc(sizeof(struct strip), GFP_KERNEL);
+    int channel_id = 0;
+    struct strip **s = &struct_strip_list;
+    struct strip *strip_info = (struct strip *)
+        kmalloc(sizeof(struct strip), GFP_KERNEL);
 
-	if (!strip_info) 
-		return(NULL);	/* If no more memory, return */
+    if (!strip_info)
+        return(NULL);        /* If no more memory, return */
 
-	/*
-	 *	Clear the allocated memory 
-	 */
-	 
-	memset(strip_info, 0, sizeof(struct strip));
+    /*
+     * Clear the allocated memory
+     */
 
-	/*
-	 *	Search the list to find where to put our new entry
-	 *	(and in the process decide what channel number it is
-	 *	going to be) 
-	 */
-	 
-	while (*s && (*s)->dev.base_addr == channel_id) 
-	{
-		channel_id++;
-		s = &(*s)->next;
-	}
+    memset(strip_info, 0, sizeof(struct strip));
 
-	/*
-	 *	Fill in the link pointers 
-	 */
-	 
-	strip_info->next = *s;
-	if (*s) 
-		(*s)->referrer = &strip_info->next;
-	strip_info->referrer = s;
-	*s = strip_info;
-
-	set_bit(STR_INUSE, &strip_info->flags);
-	strip_info->magic = STRIP_MAGIC;
-	strip_info->tty   = NULL;
-
-	init_timer(&strip_info->idle_timer);
-	strip_info->idle_timer.data     = (long)&strip_info->dev;
-	strip_info->idle_timer.function = strip_IdleTask;
-
-	sprintf(strip_info->if_name, "st%d", channel_id);
-	strip_info->dev.name         = strip_info->if_name;
-	strip_info->dev.base_addr    = channel_id;
-	strip_info->dev.priv         = (void*)strip_info;
-	strip_info->dev.next         = NULL;
-	strip_info->dev.init         = strip_dev_init;
-
-	return(strip_info);
+    /*
+     * Search the list to find where to put our new entry
+     * (and in the process decide what channel number it is
+     * going to be)
+     */
+
+    while (*s && (*s)->dev.base_addr == channel_id)
+    {
+        channel_id++;
+        s = &(*s)->next;
+    }
+
+    /*
+     * Fill in the link pointers
+     */
+
+    strip_info->next = *s;
+    if (*s)
+        (*s)->referrer = &strip_info->next;
+    strip_info->referrer = s;
+    *s = strip_info;
+
+    strip_info->magic = STRIP_MAGIC;
+    strip_info->tty   = NULL;
+
+    strip_info->gratuitous_arp   = jiffies + LongTime;
+    strip_info->arp_interval     = 0;
+    init_timer(&strip_info->idle_timer);
+    strip_info->idle_timer.data     = (long)&strip_info->dev;
+    strip_info->idle_timer.function = strip_IdleTask;
+
+    strip_info->neighbor_list = kmalloc(sizeof(MetricomNode), GFP_KERNEL);
+    strip_info->neighbor_list->type = 0;
+    strip_info->neighbor_list->next = NULL;
+
+    /* Note: strip_info->if_name is currently 8 characters long */
+    sprintf(strip_info->if_name, "st%d", channel_id);
+    strip_info->dev.name         = strip_info->if_name;
+    strip_info->dev.base_addr    = channel_id;
+    strip_info->dev.priv         = (void*)strip_info;
+    strip_info->dev.next         = NULL;
+    strip_info->dev.init         = strip_dev_init;
+
+    return(strip_info);
 }
 
 /*
- *	Open the high-level part of the STRIP channel.
- *	This function is called by the TTY module when the
- *	STRIP line discipline is called for.  Because we are
- *	sure the tty line exists, we only have to link it to
- *	a free STRIP channel...
+ * Open the high-level part of the STRIP channel.
+ * This function is called by the TTY module when the
+ * STRIP line discipline is called for.  Because we are
+ * sure the tty line exists, we only have to link it to
+ * a free STRIP channel...
  */
 
 static int strip_open(struct tty_struct *tty)
 {
-	struct strip *strip_info = (struct strip *) tty->disc_data;
+    struct strip *strip_info = (struct strip *) tty->disc_data;
 
-	/*
-	 *	First make sure we're not already connected.
-	 */
-	
-	if (strip_info && strip_info->magic == STRIP_MAGIC) 
-		return -EEXIST;
+    /*
+     * First make sure we're not already connected.
+     */
 
-	/*
-	 *	OK.  Find a free STRIP channel to use. 
-	 */
-	 
-	if ((strip_info = strip_alloc()) == NULL) 
-		return -ENFILE;
+    if (strip_info && strip_info->magic == STRIP_MAGIC)
+        return -EEXIST;
 
-	/*
-	 *	Register our newly created device so it can be ifconfig'd
-	 * strip_dev_init() will be called as a side-effect
-	 */
-     
-	if (register_netdev(&strip_info->dev) != 0) 
-	{
-		printk("strip: register_netdev() failed.\n");
-		strip_free(strip_info);
-		return -ENFILE;
-	}
+    /*
+     * OK.  Find a free STRIP channel to use.
+     */
+    if ((strip_info = strip_alloc()) == NULL)
+        return -ENFILE;
 
-	strip_info->tty = tty;
-	tty->disc_data = strip_info;
-	if (tty->driver.flush_buffer) 
-		tty->driver.flush_buffer(tty);
-	if (tty->ldisc.flush_buffer) 
-		tty->ldisc.flush_buffer(tty);
+    /*
+     * Register our newly created device so it can be ifconfig'd
+     * strip_dev_init() will be called as a side-effect
+     */
 
-	/*
-	 *	Restore default settings 
-	 */
-	 
-	strip_info->dev.type = ARPHRD_METRICOM;	/* dtang */
+    if (register_netdev(&strip_info->dev) != 0)
+    {
+        printk(KERN_ERR "strip: register_netdev() failed.\n");
+        strip_free(strip_info);
+        return -ENFILE;
+    }
 
-	/*
-	 *	Set tty options 
-	 */
+    strip_info->tty = tty;
+    tty->disc_data = strip_info;
+    if (tty->driver.flush_buffer)
+        tty->driver.flush_buffer(tty);
+    if (tty->ldisc.flush_buffer)
+        tty->ldisc.flush_buffer(tty);
+
+    /*
+     * Restore default settings
+     */
 
-	tty->termios->c_iflag |= IGNBRK |IGNPAR;/* Ignore breaks and parity errors. */
-	tty->termios->c_cflag |= CLOCAL;	/* Ignore modem control signals. */
-	tty->termios->c_cflag &= ~HUPCL;	/* Don't close on hup */
+    strip_info->dev.type = ARPHRD_METRICOM;    /* dtang */
+
+    /*
+     * Set tty options
+     */
+
+    tty->termios->c_iflag |= IGNBRK |IGNPAR;/* Ignore breaks and parity errors. */
+    tty->termios->c_cflag |= CLOCAL;    /* Ignore modem control signals. */
+    tty->termios->c_cflag &= ~HUPCL;    /* Don't close on hup */
 
 #ifdef MODULE
-	MOD_INC_USE_COUNT;
+    MOD_INC_USE_COUNT;
 #endif
-	/*
-	 *	Done.  We have linked the TTY line to a channel. 
-	 */
-	return(strip_info->dev.base_addr);
+    /*
+     * Done.  We have linked the TTY line to a channel.
+     */
+    return(strip_info->dev.base_addr);
 }
 
 /*
@@ -1355,80 +2628,108 @@
  * TTY line discipline to what it was before it got hooked to STRIP
  * (which usually is TTY again).
  */
+
 static void strip_close(struct tty_struct *tty)
 {
-	struct strip *strip_info = (struct strip *) tty->disc_data;
+    struct strip *strip_info = (struct strip *) tty->disc_data;
 
-	/*
-	 *	First make sure we're connected. 
-	 */
-	 
-	if (!strip_info || strip_info->magic != STRIP_MAGIC) 
-		return;
+    /*
+     * First make sure we're connected.
+     */
 
-	dev_close(&strip_info->dev);
-	unregister_netdev(&strip_info->dev);
-    
-	tty->disc_data = 0;
-	strip_info->tty = NULL;
-	strip_free(strip_info);
-	tty->disc_data = NULL;
+    if (!strip_info || strip_info->magic != STRIP_MAGIC)
+        return;
+
+    dev_close(&strip_info->dev);
+    unregister_netdev(&strip_info->dev);
+
+    tty->disc_data = 0;
+    strip_info->tty = NULL;
+    strip_free(strip_info);
+    tty->disc_data = NULL;
 #ifdef MODULE
-	MOD_DEC_USE_COUNT;
+    MOD_DEC_USE_COUNT;
 #endif
 }
 
 
 /************************************************************************/
-/* Perform I/O control calls on an active STRIP channel.       		*/
+/* Perform I/O control calls on an active STRIP channel.		*/
 
-static int strip_ioctl(struct tty_struct *tty, struct file *file, 
-	unsigned int cmd, unsigned long arg)
+static int strip_ioctl(struct tty_struct *tty, struct file *file,
+    unsigned int cmd, unsigned long arg)
 {
-	struct strip *strip_info = (struct strip *) tty->disc_data;
-	int err;
+    struct strip *strip_info = (struct strip *) tty->disc_data;
+    int err;
 
-	/*
-	 *	First make sure we're connected. 
-	 */
-	 
-	if (!strip_info || strip_info->magic != STRIP_MAGIC) 
-		return -EINVAL;
-
-	switch(cmd) 
-	{
-		case SIOCGIFNAME:
-			err = verify_area(VERIFY_WRITE, (void*)arg, 16);
-			if (err)
-				return -err;
-			memcpy_tofs((void*)arg, strip_info->dev.name, 
-				strlen(strip_info->dev.name) + 1);
-			return 0;
-
-		case SIOCSIFHWADDR:
-        		return -EINVAL;
-
-		/*
-		 *	Allow stty to read, but not set, the serial port 
-		 */
-	 
-		case TCGETS:
-		case TCGETA:
-			return n_tty_ioctl(tty, (struct file *) file, cmd, 
-				(unsigned long) arg);
+    /*
+     * First make sure we're connected.
+     */
 
-		default:
-			return -ENOIOCTLCMD;
-	}
+    if (!strip_info || strip_info->magic != STRIP_MAGIC)
+        return -EINVAL;
+
+    switch(cmd)
+    {
+        case SIOCGIFNAME:
+            err = verify_area(VERIFY_WRITE, (void*)arg, 16);
+            if (err)
+                return -err;
+            memcpy_tofs((void*)arg, strip_info->dev.name,
+                strlen(strip_info->dev.name) + 1);
+            return 0;
+
+        case SIOCSIFHWADDR:
+            return -EINVAL;
+
+        /*
+         * Allow stty to read, but not set, the serial port
+         */
+
+        case TCGETS:
+        case TCGETA:
+            return n_tty_ioctl(tty, (struct file *) file, cmd,
+                (unsigned long) arg);
+
+        default:
+            return -ENOIOCTLCMD;
+    }
 }
 
+
 /************************************************************************/
 /* Initialization							*/
 
 /*
- *	Initialize the STRIP driver.
- *	This routine is called at boot time, to bootstrap the multi-channel
- *	STRIP driver
+ *      Registers with the /proc file system to create different /proc/net files.
+ */
+
+static int strip_proc_net_register(unsigned short type, char *file_name,
+                                   int (*get_info)(char *, char **, off_t, int, int))
+{
+    struct proc_dir_entry *strip_entry;
+
+    strip_entry = kmalloc(sizeof(struct proc_dir_entry), GFP_ATOMIC);
+
+    memset(strip_entry, 0, sizeof(struct proc_dir_entry));
+    strip_entry->low_ino = type;
+    strip_entry->namelen = strlen(file_name);
+    strip_entry->name = file_name;
+    strip_entry->mode = S_IFREG | S_IRUGO;
+    strip_entry->nlink = 1;
+    strip_entry->uid = 0;
+    strip_entry->gid = 0;
+    strip_entry->size = 0;
+    strip_entry->ops = &proc_net_inode_operations;
+    strip_entry->get_info = get_info;
+
+    return proc_net_register(strip_entry);
+}
+
+/*
+ * Initialize the STRIP driver.
+ * This routine is called at boot time, to bootstrap the multi-channel
+ * STRIP driver
  */
 
 #ifdef MODULE
@@ -1436,44 +2737,67 @@
 #endif
 int strip_init_ctrl_dev(struct device *dummy)
 {
-	static struct tty_ldisc strip_ldisc;
-	int status;
-	printk("STRIP: version %s (unlimited channels)\n", STRIP_VERSION);
+    static struct tty_ldisc strip_ldisc;
+    int status;
 
-	/*
-	 *	Fill in our line protocol discipline, and register it
-	 */
-	 
-	memset(&strip_ldisc, 0, sizeof(strip_ldisc));
-	strip_ldisc.magic	= TTY_LDISC_MAGIC;
-	strip_ldisc.flags	= 0;
-	strip_ldisc.open	= strip_open;
-	strip_ldisc.close	= strip_close;
-	strip_ldisc.read	= NULL;
-	strip_ldisc.write	= NULL;
-	strip_ldisc.ioctl	= strip_ioctl;
-	strip_ldisc.select       = NULL;
-	strip_ldisc.receive_buf  = strip_receive_buf;
-	strip_ldisc.receive_room = strip_receive_room;
-	strip_ldisc.write_wakeup = strip_write_some_more;
-	status = tty_register_ldisc(N_STRIP, &strip_ldisc);
-	if (status != 0) 
-	{
-		printk("STRIP: can't register line discipline (err = %d)\n", status);
-	}
+    printk("STRIP: version %s (unlimited channels)\n", StripVersion);
+
+    /*
+     * Fill in our line protocol discipline, and register it
+     */
+
+    memset(&strip_ldisc, 0, sizeof(strip_ldisc));
+    strip_ldisc.magic        = TTY_LDISC_MAGIC;
+    strip_ldisc.flags        = 0;
+    strip_ldisc.open         = strip_open;
+    strip_ldisc.close        = strip_close;
+    strip_ldisc.read         = NULL;
+    strip_ldisc.write        = NULL;
+    strip_ldisc.ioctl        = strip_ioctl;
+    strip_ldisc.select       = NULL;
+    strip_ldisc.receive_buf  = strip_receive_buf;
+    strip_ldisc.receive_room = strip_receive_room;
+    strip_ldisc.write_wakeup = strip_write_some_more;
+    status = tty_register_ldisc(N_STRIP, &strip_ldisc);
+    if (status != 0)
+    {
+        printk(KERN_ERR "STRIP: can't register line discipline (err = %d)\n", status);
+    }
+
+    /*
+     * Register the status and trace files with /proc
+     */
+
+#if DO_PROC_NET_STRIP_STATUS
+    if (strip_proc_net_register(PROC_NET_STRIP_STATUS, "strip_status",
+                                               &strip_get_status_info) != 0)
+    {
+        printk(KERN_ERR "strip: status strip_proc_net_register() failed.\n");
+    }
+#endif
+
+#if DO_PROC_NET_STRIP_TRACE
+    if (strip_proc_net_register(PROC_NET_STRIP_TRACE, "strip_trace",
+                    &strip_get_trace_info) != 0)
+    {
+        printk(KERN_ERR "strip: trace strip_proc_net_register() failed.\n");
+    }
+#endif
 
 #ifdef MODULE
-	 return status;
+     return status;
 #else
-	/* Return "not found", so that dev_init() will unlink
-	 * the placeholder device entry for us.
-	 */
-	return ENODEV;
+
+    /* Return "not found", so that dev_init() will unlink
+     * the placeholder device entry for us.
+     */
+    return ENODEV;
 #endif
 }
 
+
 /************************************************************************/
-/* From here down is only used when compiled as an external module        */
+/* From here down is only used when compiled as an external module	*/
 
 #ifdef MODULE
 
@@ -1484,11 +2808,20 @@
 
 void cleanup_module(void)
 {
-	int i;
-	while (struct_strip_list) 
-		strip_free(struct_strip_list);
+    int i;
+    while (struct_strip_list)
+        strip_free(struct_strip_list);
+
+    /* Unregister with the /proc/net files here. */
+
+#if DO_PROC_NET_STRIP_TRACE
+    proc_net_unregister(PROC_NET_STRIP_TRACE);
+#endif
+#if DO_PROC_NET_STRIP_STATUS
+    proc_net_unregister(PROC_NET_STRIP_STATUS);
+#endif
 
-	if ((i = tty_register_ldisc(N_STRIP, NULL)))  
-		printk("STRIP: can't unregister line discipline (err = %d)\n", i);
+    if ((i = tty_register_ldisc(N_STRIP, NULL)))
+        printk(KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n", i);
 }
 #endif /* MODULE */
diff -u --recursive --new-file v2.0.12/linux/drivers/pci/pci.c linux/drivers/pci/pci.c
--- v2.0.12/linux/drivers/pci/pci.c	Thu Jul 11 13:45:47 1996
+++ linux/drivers/pci/pci.c	Sat Aug 10 10:44:18 1996
@@ -233,6 +233,7 @@
 	DEVICE( INTEL,		INTEL_P6,	"Orion P6"),
 	DEVICE( ADAPTEC,	ADAPTEC_7850,	"AIC-7850"),
 	DEVICE( ADAPTEC,	ADAPTEC_7855,	"AIC-7855"),
+	DEVICE( ADAPTEC,	ADAPTEC_7860,	"AIC-7860"),
 	DEVICE( ADAPTEC,	ADAPTEC_7870,	"AIC-7870"),
 	DEVICE( ADAPTEC,	ADAPTEC_7871,	"AIC-7871"),
 	DEVICE( ADAPTEC,	ADAPTEC_7872,	"AIC-7872"),
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/advansys.c linux/drivers/scsi/advansys.c
--- v2.0.12/linux/drivers/scsi/advansys.c	Fri May 10 07:55:36 1996
+++ linux/drivers/scsi/advansys.c	Wed Aug 14 09:59:04 1996
@@ -1,21 +1,26 @@
-/* $Id: advansys.c,v 1.14 1996/05/10 00:26:31 bobf Exp bobf $ */
+/* $Id: advansys.c,v 1.15 1996/08/12 17:20:23 bobf Exp bobf $ */
 /*
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
  * 
  * Copyright (c) 1995-1996 Advanced System Products, Inc.
  * All Rights Reserved.
  *
- * This driver may be modified and freely distributed provided that
- * the above copyright message and this comment are included in the
- * distribution. The latest version of this driver is available at
- * the AdvanSys FTP and BBS sites listed below.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that redistributions of source
+ * code retain the above copyright notice and this comment without
+ * modification.
+ *
+ * The latest version of this driver is available at the AdvanSys
+ * FTP and BBS sites listed below.
  *
  * Please send questions, comments, bug reports to:
  * bobf@advansys.com (Bob Frey)
  */
 
-/* The driver has been tested with Linux v1.2.13 and v1.3.57 kernels. */
-#define ASC_VERSION "1.4"	/* AdvanSys Driver Version */
+/*
+ * The driver has been run with the v1.2.13, v1.3.57, and v2.0.11 kernels.
+ */
+#define ASC_VERSION "1.5"    /* AdvanSys Driver Version */
 
 /*
 
@@ -23,7 +28,7 @@
 
   A. Adapters Supported by this Driver
   B. Linux v1.2.X - Directions for Adding the AdvanSys Driver
-  C. Linux v1.3.X - Directions for Adding the AdvanSys Driver
+  C. Linux v1.3.X, v2.X.X - Directions for Adding the AdvanSys Driver
   D. Source Comments
   E. Driver Compile Time Options and Debugging
   F. Driver LILO Option
@@ -32,7 +37,6 @@
   I. Credits
   J. AdvanSys Contact Information
 
-
   A. Adapters Supported by this Driver
  
      AdvanSys (Advanced System Products, Inc.) manufactures the following
@@ -41,35 +45,42 @@
      
      The CDB counts below indicate the number of SCSI CDB (Command
      Descriptor Block) requests that can be stored in the RISC chip
-     cache and board LRAM. The driver detect routine will display the
-     number of CDBs available for each adapter detected. This value
-     can be lowered in the BIOS by changing the 'Host Queue Size'
-     adapter setting.
+     cache and board LRAM. A CDB is a single SCSI command. The driver
+     detect routine will display the number of CDBs available for each
+     adapter detected. This value can be lowered in the BIOS by changing
+     the 'Host Queue Size' adapter setting.
 
      Connectivity Products:
-       ABP920 - Bus-Master PCI 16 CDB
-       ABP930 - Bus-Master PCI 16 CDB
-       ABP5140 - Bus-Master PnP ISA 16 CDB
-   
+        ABP510/5150 - Bus-Master ISA (240 CDB) (Footnote 1)
+        ABP5140 - Bus-Master ISA PnP (16 CDB) (Footnote 1)
+        ABP5142 - Bus-Master ISA PnP with floppy (16 CDB)
+        ABP920 - Bus-Master PCI (16 CDB)
+        ABP930 - Bus-Master PCI (16 CDB)
+        ABP960 - Bus-Master PCI MAC/PC (16 CDB) (Footnote 2)
+  
      Single Channel Products:
-       ABP542 - Bus-Master ISA 240 CDB
-       ABP5150 - Bus-Master ISA 240 CDB *
-       ABP742 - Bus-Master EISA 240 CDB
-       ABP842 - Bus-Master VL 240 CDB
-       ABP940 - Bus-Master PCI 240 CDB
-   
+        ABP542 - Bus-Master ISA with floppy (240 CDB)
+        ABP742 - Bus-Master EISA (240 CDB)
+        ABP842 - Bus-Master VL (240 CDB)
+        ABP940 - Bus-Master PCI (240 CDB)
+        ABP940U - Bus-Master PCI Ultra (240 CDB)
+        ABP970 - Bus-Master PCI MAC/PC (240 CDB)
+     
      Dual Channel Products:
-       ABP950 - Dual Channel Bus-Master PCI 240 CDB Per Channel
-       ABP852 - Dual Channel Bus-Master VL 240 CDB Per Channel
-       ABP752 - Dual Channel Bus-Master EISA 240 CDB Per Channel
-
-     * This board is shipped by HP with the 4020i CD-R drive. It has
-       no BIOS so it cannot control a boot device, but it can control
-       any secondary devices.
- 
+        ABP752 - Dual Channel Bus-Master EISA (240 CDB Per Channel)
+        ABP852 - Dual Channel Bus-Master VL (240 CDB Per Channel)
+        ABP950 - Dual Channel Bus-Master PCI (240 CDB Per Channel)
+     
+     Footnotes:
+       1. These boards have been shipped by HP with the 4020i CD-R drive.
+          They have no BIOS so they cannot control a boot device, but they
+          can control secondary devices.
+   
+       2. This board has been shipped by Iomega with the Jaz Jet drive.
+  
   B. Linux v1.2.X - Directions for Adding the AdvanSys Driver
 
-     These directions apply to v1.2.1. For versions that follow v1.2.1
+     These directions apply to v1.2.13. For versions that follow v1.2.13.
      but precede v1.3.57 some of the changes for Linux v1.3.X listed
      below may need to be modified or included.
  
@@ -137,7 +148,7 @@
         'make modules_install'. Use 'insmod' and 'rmmod' to install
         and remove advansys.o.
  
-  C. Linux v1.3.X - Directions for Adding the AdvanSys Driver
+  C. Linux v1.3.X, v2.X.X - Directions for Adding the AdvanSys Driver
 
      These directions apply to v1.3.57. For versions that precede v1.3.57
      some of these changes may need to be modified or eliminated. Beginning
@@ -217,8 +228,7 @@
            --- Driver Options
            --- Asc Library Constants and Macros
            --- Debugging Header
-           --- Driver Constants
-           --- Driver Macros
+           --- Driver Constants and Macros
            --- Driver Structures
            --- Driver Data
            --- Driver Function Prototypes
@@ -269,7 +279,6 @@
   
            insmod advansys.o asc_dbglvl=1
  
- 
         Debugging Message Levels:
            0: Errors Only
            1: High-Level Tracing
@@ -287,19 +296,24 @@
         I found that increasing LOG_BUF_LEN to 40960 in kernel/printk.c
         prevents most level 1 debug messages from being lost.
  
-     2. ADVANSYS_STATS - enable statistics and tracing
+     2. ADVANSYS_STATS - enable statistics
  
-        For Linux v1.2.X if ADVANSYS_STATS_1_2_PRINT is defined every
-        10,000 I/O operations the driver will print statistics to the
-        console. This value can be changed by modifying the constant
-        used in advansys_queuecommand(). ADVANSYS_STATS_1_2_PRINT is
-        off by default.
+        Statistics are maintained on a per adapter basis. Driver entry
+        point call counts and tranfer size counts are maintained.
+        Statistics are only available for kernels greater than or equal
+        to v1.3.0 with the CONFIG_PROC_FS (/proc) file system configured.
+
+        AdvanSys SCSI adapter files have the following path name format:
+
+           /proc/scsi/advansys/[0-(ASC_NUM_BOARD_SUPPORTED-1)]
+
+        This information can be displayed with cat. For example:
 
-        For Linux v1.3.X statistics can be accessed by reading the
-        /proc/scsi/advansys/[0-(ASC_NUM_BOARD_SUPPORTED-1)] files.
+           cat /proc/scsi/advansys/0
+
+        When ADVANSYS_STATS is not defined the AdvanSys /proc files only
+        contain adapter and device configuration information.
 
-        Note: these statistics are currently maintained on a global driver
-        basis and not per board.
 
   F. Driver LILO Option
  
@@ -334,14 +348,14 @@
 
   G. Release History
 
-     12/23/95 BETA-1.0:
+     BETA-1.0 (12/23/95): 
          First Release
 
-     12/28/95 BETA-1.1:
+     BETA-1.1 (12/28/95):
          1. Prevent advansys_detect() from being called twice.
          2. Add LILO 0xdeb[0-f] option to set 'asc_dbglvl'.
 
-     1/12/96 1.2:
+     1.2 (1/12/96):
          1. Prevent re-entrancy in the interrupt handler which
             resulted in the driver hanging Linux.
          2. Fix problem that prevented ABP-940 cards from being
@@ -350,7 +364,7 @@
          4. Fix check condition return status.
          5. Add conditionally compiled code for Linux v1.3.X.
 
-     2/23/96 1.3:
+     1.3 (2/23/96):
          1. Fix problem in advansys_biosparam() that resulted in the
             wrong drive geometry being returned for drives > 1GB with
             extended translation enabled.
@@ -360,7 +374,7 @@
          5. Try to fix problem with handling resets by increasing their
             timeout value.
 
-     5/8/96 1.4:
+     1.4 (5/8/96):
          1. Change definitions to eliminate conflicts with other subsystems.
          2. Add versioning code for the shared interrupt changes.
          3. Eliminate problem in asc_rmqueue() with iterating after removing
@@ -369,18 +383,29 @@
             Issues" section. This problem was isolated and fixed in the
             mid-level SCSI driver.
         
-  H. Known Problems or Issues
+     1.5 (8/8/96):
+         1. Add support for ABP-940U (PCI Ultra) adapter.
+         2. Add support for IRQ sharing by setting the SA_SHIRQ flag for
+            request_irq and supplying a dev_id pointer to both request_irq()
+            and free_irq().
+         3. In AscSearchIOPortAddr11() restore a call to check_region() which
+            should be used before any I/O port probing.
+         4. Fix bug in asc_prt_hex() which resulted in the displaying
+            the wrong data.
+         5. Incorporate miscellaneous Asc Library bug fixes and new microcode.
+         6. Change driver versioning to be specific to each Linux sub-level.
+         7. Change statistics gathering to be per adapter instead of global
+            to the driver.
+         8. Add more information and statistics to the adapter /proc file:
+            /proc/scsi/advansys[0...].
+         9. Remove 'cmd_per_lun' from the "Known Problems or Issues" list.
+            This problem has been addressed with the SCSI mid-level changes
+            made in v1.3.89. The advansys_select_queue_depths() function
+            was added for the v1.3.89 changes.
 
-     1. The setting for 'cmd_per_lun' needs to be changed. It is currently
-        less then what the AdvanSys boards can queue. Because the target and
-        mid-level Linux drivers base memory allocation on 'cmd_per_lun' (as
-        well as 'sg_tablesize') memory use gets out of hand with a large
-        'cmd_per_lun'. 'cmd_per_lun' should be per device instead of per
-        adapter. When the driver is compiled as a loadable module both
-        'cmd_per_lun' and 'sg_tablesize' are tuned down to try to prevent
-        memory allocation errors.
+  H. Known Problems or Issues
 
-     2. For the first scsi command sent to a device the driver increases
+     1. For the first scsi command sent to a device the driver increases
         the timeout value. This gives the driver more time to perform
         its own initialization for the board and each device. The timeout
         value is only changed on the first scsi command for each device
@@ -389,28 +414,26 @@
   I. Credits
 
      Nathan Hartwell <mage@cdc3.cdc.net> provided the directions and
-     and basis for the Linux v1.3.X changes which were included in the
+     basis for the Linux v1.3.X changes which were included in the
      1.2 release.
 
-     Thomas E Zerucha <zerucha@shell.portal.com> pointed out the bug
-     in advansys_biosparam() which was fixed the 1.3 release.
+     Thomas E Zerucha <zerucha@shell.portal.com> pointed out a bug
+     in advansys_biosparam() which was fixed in the 1.3 release.
 
   J. AdvanSys Contact Information
  
      Mail:                   Advanced System Products, Inc.
                              1150 Ringwood Court
-                             San Jose, CA 95131 USA
+                             San Jose, CA 95131
      Operator:               1-408-383-9400
      FAX:                    1-408-383-9612
-     Tech Support:           1-800-525-7440
-     BBS:                    1-408-383-9540 (9600,N,8,1)
+     Tech Support:           1-800-525-7440/1-408-467-2930
+     BBS:                    1-408-383-9540 (14400,N,8,1)
      Interactive FAX:        1-408-383-9753
-     Customer Direct Sales:  1-800-883-1099
+     Customer Direct Sales:  1-800-883-1099/1-408-383-5777
      Tech Support E-Mail:    support@advansys.com
-     Linux Support E-Mail:   bobf@advansys.com
      FTP Site:               ftp.advansys.com (login: anonymous)
      Web Site:               http://www.advansys.com
-
 */
 
 
@@ -418,30 +441,23 @@
  * --- Linux Version
  */
 
-/*
- * The driver can be used in Linux v1.2.X or v1.3.X.
- */
-#if !defined(LINUX_1_2) && !defined(LINUX_1_3)
+/* Convert Linux Version, Patch-level, Sub-level to LINUX_VERSION_CODE. */
+#define ASC_LINUX_VERSION(V, P, S)	(((V) * 65536) + ((P) * 256) + (S))
+
 #ifndef LINUX_VERSION_CODE
 #include <linux/version.h>
 #endif /* LINUX_VERSION_CODE */
-#if LINUX_VERSION_CODE > 65536 + 3 * 256
-#define LINUX_1_3
-#else /* LINUX_VERSION_CODE */
-#define LINUX_1_2
-#endif /* LINUX_VERSION_CODE */
-#endif /* !defined(LINUX_1_2) && !defined(LINUX_1_3) */
 
 
 /*
  * --- Linux Include Files 
  */
 
-#ifdef LINUX_1_3
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
 #ifdef MODULE
 #include <linux/module.h>
 #endif /* MODULE */
-#endif /* LINUX_1_3 */
+#endif /* version >= v1.3.0 */
 #include <linux/string.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -450,18 +466,18 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/malloc.h>
-#ifdef LINUX_1_3
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
 #include <linux/proc_fs.h>
-#endif /* LINUX_1_3 */ 
+#endif /* version >= v1.3.0 */
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/dma.h>
-#ifdef LINUX_1_2
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,0)
 #include "../block/blk.h"
-#else /* LINUX_1_3 */ 
+#else /* version >= v1.3.0 */
 #include <linux/blk.h>
 #include <linux/stat.h>
-#endif /* LINUX_1_3 */ 
+#endif /* version >= v1.3.0 */
 #include "scsi.h"
 #include "hosts.h"
 #include "sd.h"
@@ -471,11 +487,17 @@
 /*
  * --- Driver Options
  */
-#define ADVANSYS_DEBUG /* Enable for debugging and assertions. */
-#define ADVANSYS_STATS /* Enable for statistics and tracing. */
-#ifdef LINUX_1_2
-#undef ADVANSYS_STATS_1_2_PRINT /* Enable to print statistics to console. */
-#endif /* LINUX_1_2 */
+
+#define ADVANSYS_DEBUG /* Enable assertions and tracing. */
+/*
+ * Because of no /proc to display them, statistics are disabled
+ * for version prior to v1.3.0.
+ */
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,0)
+#undef ADVANSYS_STATS /* Disable statistics */
+#else /* version >= v1.3.0 */
+#define ADVANSYS_STATS /* Enable statistics. */
+#endif /* version >= v1.3.0 */
 
 
 /*
@@ -483,297 +505,236 @@
  */
 
 #define ASC_LIB_VERSION_MAJOR  1
-#define ASC_LIB_VERSION_MINOR  16
-#define ASC_LIB_SERIAL_NUMBER  53
+#define ASC_LIB_VERSION_MINOR  21
+#define ASC_LIB_SERIAL_NUMBER  88
 
 typedef unsigned char uchar;
 
 #ifndef NULL
 #define NULL     (0)
 #endif
-
 #ifndef TRUE
 #define TRUE     (1)
 #endif
-
 #ifndef FALSE
 #define FALSE    (0)
 #endif
-
 #define  REG     register
-
 #define rchar    REG __s8
 #define rshort   REG __s16
 #define rint     REG __s32
 #define rlong    REG __s32
-
 #define ruchar   REG __u8
 #define rushort  REG __u16
 #define ruint    REG __u32
 #define rulong   REG __u32
-
 #define NULLPTR   ( void *)0
 #define FNULLPTR  ( void dosfar *)0UL
 #define EOF      (-1)
 #define EOS      '\0'
 #define ERR      (-1)
-#define UB_ERR   (__u8)(0xFF)
-#define UW_ERR   (__u16)(0xFFFF)
-#define UL_ERR   (__u32)(0xFFFFFFFFUL)
-
-#define iseven_word( val )  ( ( ( ( __u16 )val) & ( __u16 )0x0001 ) == 0 )
-#define isodd_word( val )   ( ( ( ( __u16 )val) & ( __u16 )0x0001 ) != 0 )
-#define toeven_word( val )  ( ( ( __u16 )val ) & ( __u16 )0xFFFE )
-
-#define biton( val, bits )   ((( __u16 )( val >> bits ) & (__u16)0x0001 ) != 0 )
-#define bitoff( val, bits )  ((( __u16 )( val >> bits ) & (__u16)0x0001 ) == 0 )
-#define lbiton( val, bits )  ((( __u32 )( val >> bits ) & (__u32)0x00000001UL ) != 0 )
-#define lbitoff( val, bits ) ((( __u32 )( val >> bits ) & (__u32)0x00000001UL ) == 0 )
-
+#define UB_ERR   (uchar)(0xFF)
+#define UW_ERR   (uint)(0xFFFF)
+#define UL_ERR   (ulong)(0xFFFFFFFFUL)
+#define iseven_word( val )  ( ( ( ( uint )val) & ( uint )0x0001 ) == 0 )
+#define isodd_word( val )   ( ( ( ( uint )val) & ( uint )0x0001 ) != 0 )
+#define toeven_word( val )  ( ( ( uint )val ) & ( uint )0xFFFE )
+#define biton( val, bits )   ((( uint )( val >> bits ) & (uint)0x0001 ) != 0 )
+#define bitoff( val, bits )  ((( uint )( val >> bits ) & (uint)0x0001 ) == 0 )
+#define lbiton( val, bits )  ((( ulong )( val >> bits ) & (ulong)0x00000001UL ) != 0 )
+#define lbitoff( val, bits ) ((( ulong )( val >> bits ) & (ulong)0x00000001UL ) == 0 )
 #define  absh( val )    ( ( val ) < 0 ? -( val ) : ( val ) )
-
 #define  swapbyte( ch )  ( ( ( (ch) << 4 ) | ( (ch) >> 4 ) ) )
-
 #ifndef GBYTE
 #define GBYTE       (0x40000000UL)
 #endif
-
 #ifndef MBYTE
 #define MBYTE       (0x100000UL)
 #endif
-
 #ifndef KBYTE
 #define KBYTE       (0x400)
 #endif
-
 #define HI_BYTE(x) ( *( ( __u8 *)(&x)+1 ) )
 #define LO_BYTE(x) ( *( ( __u8 *)&x ) )
-
 #define HI_WORD(x) ( *( ( __u16 *)(&x)+1 ) )
 #define LO_WORD(x) ( *( ( __u16 *)&x ) )
-
 #ifndef MAKEWORD
 #define MAKEWORD(lo, hi)    ((__u16) (((__u16) lo) | ((__u16) hi << 8)))
 #endif
-
 #ifndef MAKELONG
 #define MAKELONG(lo, hi)    ((__u32) (((__u32) lo) | ((__u32) hi << 16)))
 #endif
-
 #define SwapWords(dWord)        ((__u32) ((dWord >> 16) | (dWord << 16)))
 #define SwapBytes(word)         ((__u16) ((word >> 8) | (word << 8)))
-
-#define BigToLittle(dWord) \
-    ((__u32) (SwapWords(MAKELONG(SwapBytes(LO_WORD(dWord)), SwapBytes(HI_WORD(dWord))))))
+#define BigToLittle(dWord) ((__u32) (SwapWords(MAKELONG(SwapBytes(LO_WORD(dWord)), SwapBytes(HI_WORD(dWord))))))
 #define LittleToBig(dWord)      BigToLittle(dWord)
+#define AscPCICmdRegBits_BusMastering     0x0007
+#define AscPCIConfigVendorIDRegister      0x0000
+#define AscPCIConfigDeviceIDRegister      0x0002
+#define AscPCIConfigCommandRegister       0x0004
+#define AscPCIConfigStatusRegister        0x0006
+#define AscPCIConfigCacheSize             0x000C
+#define AscPCIConfigLatencyTimer          0x000D
+#define AscPCIIOBaseRegister              0x0010
+#define ASC_PCI_ID2BUS( id )    ((id) & 0xFF)
+#define ASC_PCI_ID2DEV( id )    (((id) >> 11) & 0x1F)
+#define ASC_PCI_ID2FUNC( id )   (((id) >> 8) & 0x7)
+#define ASC_PCI_MKID( bus, dev, func ) ((((dev) & 0x1F) << 11) | (((func) & 0x7) << 8) | ((bus) & 0xFF))
 
 #define Lptr
 #define dosfar
 #define far
-#define PortAddr			unsigned short
-#define Ptr2Func        	ulong
-
-#define inp(port)        	inb(port)
-#define inpw(port)       	inw(port)
+#define PortAddr  unsigned short	/* port address size  */
+#define Ptr2Func	ulong
+#define inp(port)           inb(port)
+#define inpw(port)          inw(port)
+#define inpl(port)    		inl(port)
 #define outp(port, byte)    outb((byte), (port))
 #define outpw(port, word)   outw((word), (port))
-
+#define outpl(port, long)   outl((long), (port))
 #define ASC_MAX_SG_QUEUE	5
 #define ASC_MAX_SG_LIST		(1 + ((ASC_SG_LIST_PER_Q) * (ASC_MAX_SG_QUEUE)))
 
 #define CC_INIT_INQ_DISPLAY     FALSE
-
 #define CC_CLEAR_LRAM_SRB_PTR   FALSE
 #define CC_VERIFY_LRAM_COPY     FALSE
-
 #define CC_DEBUG_SG_LIST        FALSE
 #define CC_FAST_STRING_IO       FALSE
-
 #define CC_WRITE_IO_COUNT       FALSE
 #define CC_CLEAR_DMA_REMAIN     FALSE
-
 #define CC_DISABLE_PCI_PARITY_INT TRUE
-
 #define CC_LINK_BUSY_Q         FALSE
-
-#define CC_TARGET_MODE         FALSE
-
-#define CC_SCAM                FALSE
-
 #define CC_LITTLE_ENDIAN_HOST  TRUE
-
-#ifndef CC_TEST_LRAM_ENDIAN
-
-#if CC_LITTLE_ENDIAN_HOST
-#define CC_TEST_LRAM_ENDIAN     FALSE
-#else
-#define CC_TEST_LRAM_ENDIAN     TRUE
-#endif
-
-#endif
-
 #define CC_STRUCT_ALIGNED      TRUE
-
-#define CC_MEMORY_MAPPED_IO    FALSE
-
-#ifndef CC_TARGET_MODE
-#define CC_TARGET_MODE         FALSE
-#endif
-
-#ifndef CC_STRUCT_ALIGNED
-#define CC_STRUCT_ALIGNED      FALSE
-#endif
-
-#ifndef CC_LITTLE_ENDIAN_HOST
-#define CC_LITTLE_ENDIAN_HOST  TRUE
-#endif
-
-#if !CC_LITTLE_ENDIAN_HOST
-
-#ifndef CC_TEST_LRAM_ENDIAN
-#define CC_TEST_LRAM_ENDIAN    TRUE
-#endif
-
-#endif
-
-#ifndef CC_MEMORY_MAPPED_IO
 #define CC_MEMORY_MAPPED_IO    FALSE
-#endif
-
-#ifndef CC_WRITE_IO_COUNT
-#define CC_WRITE_IO_COUNT      FALSE
-#endif
-
-#ifndef CC_CLEAR_DMA_REMAIN
-#define CC_CLEAR_DMA_REMAIN    FALSE
-#endif
+#define CC_INCLUDE_EEP_CONFIG  TRUE
+#define CC_PCI_ULTRA           TRUE
+#define CC_INIT_TARGET_READ_CAPACITY    TRUE
+#define CC_INIT_TARGET_TEST_UNIT_READY  TRUE
+#define CC_ASC_SCSI_Q_USRDEF         FALSE
+#define CC_ASC_SCSI_REQ_Q_USRDEF     FALSE
+#define CC_ASCISR_CHECK_INT_PENDING  TRUE
+#define CC_CHK_FIX_EEP_CONTENT       TRUE
+#define CC_CHK_AND_COALESCE_SG_LIST  FALSE
+#define CC_DISABLE_PCI_PARITY_INT    TRUE
+#define CC_INCLUDE_EEP_CONFIG        TRUE
+#define CC_INIT_INQ_DISPLAY          FALSE
+#define CC_INIT_TARGET_TEST_UNIT_READY  TRUE
+#define CC_INIT_TARGET_START_UNIT       TRUE
+#define CC_PLEXTOR_VL                FALSE
+#define CC_TMP_USE_EEP_SDTR          FALSE
+#define CC_CHK_COND_REDO_SDTR        TRUE
+#define CC_SET_PCI_LATENCY_TIMER_ZERO  TRUE
+#define CC_FIX_QUANTUM_XP34301_1071  FALSE
+#define CC_DISABLE_ASYN_FIX_WANGTEK_TAPE  TRUE
 
 #define ASC_CS_TYPE  unsigned short
-
 #ifndef asc_ptr_type
 #define asc_ptr_type
 #endif
 
-#ifndef CC_SCAM
-#define CC_SCAM  FALSE
-#endif
-
 #ifndef ASC_GET_PTR2FUNC
 #define ASC_GET_PTR2FUNC( fun )  ( Ptr2Func )( fun )
 #endif
-
 #define FLIP_BYTE_NIBBLE( x )    ( ((x<<4)& 0xFF) | (x>>4) )
-
 #define ASC_IS_ISA          (0x0001)
 #define ASC_IS_ISAPNP       (0x0081)
 #define ASC_IS_EISA         (0x0002)
 #define ASC_IS_PCI          (0x0004)
+#define ASC_IS_PCI_ULTRA    (0x0104)
 #define ASC_IS_PCMCIA       (0x0008)
-#define ASC_IS_PNP          (0x0010)
 #define ASC_IS_MCA          (0x0020)
 #define ASC_IS_VL           (0x0040)
-
 #define ASC_ISA_PNP_PORT_ADDR  (0x279)
 #define ASC_ISA_PNP_PORT_WRITE (ASC_ISA_PNP_PORT_ADDR+0x800)
-
 #define ASC_IS_WIDESCSI_16  (0x0100)
 #define ASC_IS_WIDESCSI_32  (0x0200)
-
 #define ASC_IS_BIG_ENDIAN   (0x8000)
-
 #define ASC_CHIP_MIN_VER_VL      (0x01)
 #define ASC_CHIP_MAX_VER_VL      (0x07)
-
 #define ASC_CHIP_MIN_VER_PCI     (0x09)
 #define ASC_CHIP_MAX_VER_PCI     (0x0F)
 #define ASC_CHIP_VER_PCI_BIT     (0x08)
-
 #define ASC_CHIP_MIN_VER_ISA     (0x11)
 #define ASC_CHIP_MIN_VER_ISA_PNP (0x21)
 #define ASC_CHIP_MAX_VER_ISA     (0x27)
 #define ASC_CHIP_VER_ISA_BIT     (0x30)
 #define ASC_CHIP_VER_ISAPNP_BIT  (0x20)
-
 #define ASC_CHIP_VER_ASYN_BUG    (0x21)
-
+#define ASC_CHIP_VER_1ST_PCI_ULTRA   (0x0A)
 #define ASC_CHIP_MIN_VER_EISA (0x41)
 #define ASC_CHIP_MAX_VER_EISA (0x47)
 #define ASC_CHIP_VER_EISA_BIT (0x40)
-
+#define ASC_CHIP_LATEST_VER_EISA   ( ( ASC_CHIP_MIN_VER_EISA - 1 ) + 3 )
 #define ASC_MAX_VL_DMA_ADDR     (0x07FFFFFFL)
 #define ASC_MAX_VL_DMA_COUNT    (0x07FFFFFFL)
-
 #define ASC_MAX_PCI_DMA_ADDR    (0xFFFFFFFFL)
 #define ASC_MAX_PCI_DMA_COUNT   (0xFFFFFFFFL)
-
 #define ASC_MAX_ISA_DMA_ADDR    (0x00FFFFFFL)
 #define ASC_MAX_ISA_DMA_COUNT   (0x00FFFFFFL)
-
 #define ASC_MAX_EISA_DMA_ADDR   (0x07FFFFFFL)
 #define ASC_MAX_EISA_DMA_COUNT  (0x07FFFFFFL)
-
 #if !CC_STRUCT_ALIGNED
-
 #define DvcGetQinfo( iop_base, s_addr, outbuf, words)  \
-        AscMemWordCopyFromLram( iop_base, s_addr, outbuf, words)
-
+AscMemWordCopyFromLram(iop_base, s_addr, outbuf, words)
 #define DvcPutScsiQ( iop_base, s_addr, outbuf, words) \
-        AscMemWordCopyToLram( iop_base, s_addr, outbuf, words)
-
+AscMemWordCopyToLram(iop_base, s_addr, outbuf, words)
+#endif
+#ifdef ASC_CHIP_VERSION
+#endif
+#if CC_MEMORY_MAPPED_IO
+#define inp( port )            *( (uchar *)(port) )
+#define outp( port, data )     *( (uchar *)(port) ) = ( uchar )( data )
+#if CC_LITTLE_ENDIAN_HOST
+#define inpw( port )              *( (ushort *)(port) )
+#define outpw( port, data )       *( (ushort *)(port) ) = ( ushort )( data )
+#else
+#define inpw( port )             EndianSwap16Bit( (*((ushort *)(port))) )
+#define outpw( port, data )      *( (ushort *)(port) ) = EndianSwap16Bit( (ushort)(data) )
+#define inpw_noswap( port )          *( (ushort *)(port) )
+#define outpw_noswap( port, data )   *( (ushort *)(port) ) = ( ushort )( data )
+#endif
+#endif
+#ifndef inpw_noswap
+#define inpw_noswap( port )         inpw( port )
+#endif
+#ifndef outpw_noswap
+#define outpw_noswap( port, data )  outpw( port, data )
 #endif
-
 #define ASC_SCSI_ID_BITS  3
 #define ASC_SCSI_TIX_TYPE     uchar
 #define ASC_ALL_DEVICE_BIT_SET  0xFF
-
 #ifdef ASC_WIDESCSI_16
-
 #undef  ASC_SCSI_ID_BITS
 #define ASC_SCSI_ID_BITS  4
 #define ASC_ALL_DEVICE_BIT_SET  0xFFFF
-
 #endif
-
 #ifdef ASC_WIDESCSI_32
-
 #undef  ASC_SCSI_ID_BITS
 #define ASC_SCSI_ID_BITS  5
 #define ASC_ALL_DEVICE_BIT_SET  0xFFFFFFFFL
-
 #endif
-
 #if ASC_SCSI_ID_BITS == 3
-
 #define ASC_SCSI_BIT_ID_TYPE  uchar
 #define ASC_MAX_TID       7
 #define ASC_MAX_LUN       7
 #define ASC_SCSI_WIDTH_BIT_SET  0xFF
-
 #elif ASC_SCSI_ID_BITS == 4
-
 #define ASC_SCSI_BIT_ID_TYPE   ushort
 #define ASC_MAX_TID         15
 #define ASC_MAX_LUN         7
 #define ASC_SCSI_WIDTH_BIT_SET  0xFFFF
-
 #elif ASC_SCSI_ID_BITS == 5
-
 #define ASC_SCSI_BIT_ID_TYPE    ulong
 #define ASC_MAX_TID         31
 #define ASC_MAX_LUN         7
 #define ASC_SCSI_WIDTH_BIT_SET  0xFFFFFFFF
-
 #else
-
 #error  ASC_SCSI_ID_BITS definition is wrong
-
 #endif
-
 #define ASC_MAX_SENSE_LEN   32
 #define ASC_MIN_SENSE_LEN   14
-
 #define ASC_MAX_CDB_LEN     12
-
 #define SCSICMD_TestUnitReady     0x00
 #define SCSICMD_Rewind            0x01
 #define SCSICMD_Rezero            0x01
@@ -787,7 +748,6 @@
 #define SCSICMD_Verify6           0x13
 #define SCSICMD_ModeSelect6       0x15
 #define SCSICMD_ModeSense6        0x1A
-
 #define SCSICMD_StartStopUnit     0x1B
 #define SCSICMD_LoadUnloadTape    0x1B
 #define SCSICMD_ReadCapacity      0x25
@@ -797,15 +757,18 @@
 #define SCSICMD_Erase10           0x2C
 #define SCSICMD_WriteAndVerify10  0x2E
 #define SCSICMD_Verify10          0x2F
-
+#define SCSICMD_WriteBuffer       0x3B
+#define SCSICMD_ReadBuffer        0x3C
+#define SCSICMD_ReadLong          0x3E
+#define SCSICMD_WriteLong         0x3F
+#define SCSICMD_ReadTOC           0x43
+#define SCSICMD_ReadHeader        0x44
 #define SCSICMD_ModeSelect10      0x55
 #define SCSICMD_ModeSense10       0x5A
-
 #define SCSI_TYPE_DASD     0x00
 #define SCSI_TYPE_SASD     0x01
 #define SCSI_TYPE_PRN      0x02
 #define SCSI_TYPE_PROC     0x03
-
 #define SCSI_TYPE_WORM     0x04
 #define SCSI_TYPE_CDROM    0x05
 #define SCSI_TYPE_SCANNER  0x06
@@ -814,15 +777,10 @@
 #define SCSI_TYPE_COMM     0x09
 #define SCSI_TYPE_UNKNOWN  0x1F
 #define SCSI_TYPE_NO_DVC   0xFF
-
 #define ASC_SCSIDIR_NOCHK    0x00
-
 #define ASC_SCSIDIR_T2H      0x08
-
 #define ASC_SCSIDIR_H2T      0x10
-
 #define ASC_SCSIDIR_NODATA   0x18
-
 #define SCSI_SENKEY_NO_SENSE      0x00
 #define SCSI_SENKEY_UNDEFINED     0x01
 #define SCSI_SENKEY_NOT_READY     0x02
@@ -839,31 +797,23 @@
 #define SCSI_SENKEY_VOL_OVERFLOW  0x0D
 #define SCSI_SENKEY_MISCOMP       0x0E
 #define SCSI_SENKEY_RESERVED      0x0F
-
 #define ASC_SRB_HOST( x )  ( ( uchar )( ( uchar )( x ) >> 4 ) )
 #define ASC_SRB_TID( x )   ( ( uchar )( ( uchar )( x ) & ( uchar )0x0F ) )
-
 #define ASC_SRB_LUN( x )   ( ( uchar )( ( uint )( x ) >> 13 ) )
-
 #define PUT_CDB1( x )   ( ( uchar )( ( uint )( x ) >> 8 ) )
-
 #define SS_GOOD              0x00
 #define SS_CHK_CONDITION     0x02
 #define SS_CONDITION_MET     0x04
 #define SS_TARGET_BUSY       0x08
 #define SS_INTERMID          0x10
 #define SS_INTERMID_COND_MET 0x14
-
 #define SS_RSERV_CONFLICT    0x18
 #define SS_CMD_TERMINATED    0x22
-
 #define SS_QUEUE_FULL        0x28
-
 #define MS_CMD_DONE    0x00
 #define MS_EXTEND      0x01
 #define MS_SDTR_LEN    0x03
 #define MS_SDTR_CODE   0x01
-
 #define M1_SAVE_DATA_PTR        0x02
 #define M1_RESTORE_PTRS         0x03
 #define M1_DISCONNECT           0x04
@@ -880,36 +830,69 @@
 #define M1_INIT_RECOVERY        0x0F
 #define M1_RELEASE_RECOVERY     0x10
 #define M1_KILL_IO_PROC         0x11
-
 #define M2_QTAG_MSG_SIMPLE      0x20
 #define M2_QTAG_MSG_HEAD        0x21
 #define M2_QTAG_MSG_ORDERED     0x22
 #define M2_IGNORE_WIDE_RESIDUE  0x23
-
+#if CC_LITTLE_ENDIAN_HOST
 typedef struct {
 	uchar               peri_dvc_type:5;
 	uchar               peri_qualifier:3;
 } ASC_SCSI_INQ0;
 
+#else
+typedef struct {
+	uchar               peri_qualifier:3;
+	uchar               peri_dvc_type:5;
+} ASC_SCSI_INQ0;
+
+#endif
+#if CC_LITTLE_ENDIAN_HOST
 typedef struct {
 	uchar               dvc_type_modifier:7;
 	uchar               rmb:1;
 } ASC_SCSI_INQ1;
 
+#else
+typedef struct {
+	uchar               rmb:1;
+	uchar               dvc_type_modifier:7;
+} ASC_SCSI_INQ1;
+
+#endif
+#if CC_LITTLE_ENDIAN_HOST
 typedef struct {
 	uchar               ansi_apr_ver:3;
 	uchar               ecma_ver:3;
 	uchar               iso_ver:2;
 } ASC_SCSI_INQ2;
 
+#else
 typedef struct {
-	uchar               rsp_data_fmt:4;
+	uchar               iso_ver:2;
+	uchar               ecma_ver:3;
+	uchar               ansi_apr_ver:3;
+} ASC_SCSI_INQ2;
 
+#endif
+#if CC_LITTLE_ENDIAN_HOST
+typedef struct {
+	uchar               rsp_data_fmt:4;
 	uchar               res:2;
 	uchar               TemIOP:1;
 	uchar               aenc:1;
 } ASC_SCSI_INQ3;
 
+#else
+typedef struct {
+	uchar               aenc:1;
+	uchar               TemIOP:1;
+	uchar               res:2;
+	uchar               rsp_data_fmt:4;
+} ASC_SCSI_INQ3;
+
+#endif
+#if CC_LITTLE_ENDIAN_HOST
 typedef struct {
 	uchar               StfRe:1;
 	uchar               CmdQue:1;
@@ -921,6 +904,19 @@
 	uchar               RelAdr:1;
 } ASC_SCSI_INQ7;
 
+#else
+typedef struct {
+	uchar               RelAdr:1;
+	uchar               WBus32:1;
+	uchar               WBus16:1;
+	uchar               Sync:1;
+	uchar               Linked:1;
+	uchar               Reserved:1;
+	uchar               CmdQue:1;
+	uchar               StfRe:1;
+} ASC_SCSI_INQ7;
+
+#endif
 typedef struct {
 	ASC_SCSI_INQ0       byte0;
 	ASC_SCSI_INQ1       byte1;
@@ -935,6 +931,7 @@
 	uchar               product_rev_level[4];
 } ASC_SCSI_INQUIRY;
 
+#if CC_LITTLE_ENDIAN_HOST
 typedef struct asc_req_sense {
 	uchar               err_code:7;
 	uchar               info_valid:1;
@@ -949,7 +946,6 @@
 	uchar               cmd_sp_info[4];
 	uchar               asc;
 	uchar               ascq;
-
 	uchar               fruc;
 	uchar               sks_byte0:7;
 	uchar               sks_valid:1;
@@ -959,32 +955,50 @@
 	uchar               info2[4];
 } ASC_REQ_SENSE;
 
-#define ASC_SG_LIST_PER_Q   7
+#else
+typedef struct asc_req_sense {
+	uchar               info_valid:1;
+	uchar               err_code:7;
+	uchar               segment_no;
+	uchar               file_mark:1;
+	uchar               sense_EOM:1;
+	uchar               sense_ILI:1;
+	uchar               reserved_bit:1;
+	uchar               sense_key:4;
+	uchar               info1[4];
+	uchar               add_sense_len;
+	uchar               cmd_sp_info[4];
+	uchar               asc;
+	uchar               ascq;
+	uchar               fruc;
+	uchar               sks_valid:1;
+	uchar               sks_byte0:7;
+	uchar               sks_bytes[2];
+	uchar               notused[2];
+	uchar               ex_sense_code;
+	uchar               info2[4];
+} ASC_REQ_SENSE;
 
+#endif
+#define ASC_SG_LIST_PER_Q   7
 #define QS_FREE        0x00
 #define QS_READY       0x01
 #define QS_DISC1       0x02
 #define QS_DISC2       0x04
 #define QS_BUSY        0x08
-
 #define QS_ABORTED     0x40
 #define QS_DONE        0x80
-
 #define QC_NO_CALLBACK   0x01
-
 #define QC_SG_SWAP_QUEUE 0x02
 #define QC_SG_HEAD       0x04
 #define QC_DATA_IN       0x08
 #define QC_DATA_OUT      0x10
-
 #define QC_URGENT        0x20
 #define QC_MSG_OUT       0x40
 #define QC_REQ_SENSE     0x80
-
 #define QCSG_SG_XFER_LIST  0x02
 #define QCSG_SG_XFER_MORE  0x04
 #define QCSG_SG_XFER_END   0x08
-
 #define QD_IN_PROGRESS       0x00
 #define QD_NO_ERROR          0x01
 #define QD_ABORTED_BY_HOST   0x02
@@ -993,59 +1007,48 @@
 #define QD_INVALID_HOST_NUM  0x81
 #define QD_INVALID_DEVICE    0x82
 #define QD_ERR_INTERNAL      0xFF
-
 #define QHSTA_NO_ERROR               0x00
 #define QHSTA_M_SEL_TIMEOUT          0x11
 #define QHSTA_M_DATA_OVER_RUN        0x12
 #define QHSTA_M_DATA_UNDER_RUN       0x12
 #define QHSTA_M_UNEXPECTED_BUS_FREE  0x13
 #define QHSTA_M_BAD_BUS_PHASE_SEQ    0x14
-
 #define QHSTA_D_QDONE_SG_LIST_CORRUPTED 0x21
 #define QHSTA_D_ASC_DVC_ERROR_CODE_SET  0x22
 #define QHSTA_D_HOST_ABORT_FAILED       0x23
 #define QHSTA_D_EXE_SCSI_Q_FAILED       0x24
 #define QHSTA_D_EXE_SCSI_Q_BUSY_TIMEOUT 0x25
-
 #define QHSTA_D_ASPI_NO_BUF_POOL        0x26
-
 #define QHSTA_M_WTM_TIMEOUT         0x41
 #define QHSTA_M_BAD_CMPL_STATUS_IN  0x42
 #define QHSTA_M_NO_AUTO_REQ_SENSE   0x43
 #define QHSTA_M_AUTO_REQ_SENSE_FAIL 0x44
 #define QHSTA_M_TARGET_STATUS_BUSY  0x45
 #define QHSTA_M_BAD_TAG_CODE        0x46
-
 #define QHSTA_M_BAD_QUEUE_FULL_OR_BUSY  0x47
-
+#define QHSTA_M_HUNG_REQ_SCSI_BUS_RESET 0x48
 #define QHSTA_D_LRAM_CMP_ERROR        0x81
 #define QHSTA_M_MICRO_CODE_ERROR_HALT 0xA1
-
 #define ASC_FLAG_SCSIQ_REQ        0x01
 #define ASC_FLAG_BIOS_SCSIQ_REQ   0x02
 #define ASC_FLAG_BIOS_ASYNC_IO    0x04
 #define ASC_FLAG_SRB_LINEAR_ADDR  0x08
-
 #define ASC_FLAG_WIN16            0x10
 #define ASC_FLAG_WIN32            0x20
-
+#define ASC_FLAG_ISA_OVER_16MB    0x40
 #define ASC_FLAG_DOS_VM_CALLBACK  0x80
-
-#define ASC_TAG_FLAG_ADD_ONE_BYTE     0x10
-#define ASC_TAG_FLAG_ISAPNP_ADD_BYTES 0x40
-
+#define ASC_TAG_FLAG_EXTRA_BYTES               0x10
+#define ASC_TAG_FLAG_DISABLE_DISCONNECT        0x04
+#define ASC_TAG_FLAG_DISABLE_ASYN_USE_SYN_FIX  0x08
+#define ASC_TAG_FLAG_DISABLE_CHK_COND_INT_HOST 0x40
 #define ASC_SCSIQ_CPY_BEG              4
 #define ASC_SCSIQ_SGHD_CPY_BEG         2
-
 #define ASC_SCSIQ_B_FWD                0
 #define ASC_SCSIQ_B_BWD                1
-
 #define ASC_SCSIQ_B_STATUS             2
 #define ASC_SCSIQ_B_QNO                3
-
 #define ASC_SCSIQ_B_CNTL               4
 #define ASC_SCSIQ_B_SG_QUEUE_CNT       5
-
 #define ASC_SCSIQ_D_DATA_ADDR          8
 #define ASC_SCSIQ_D_DATA_CNT          12
 #define ASC_SCSIQ_B_SENSE_LEN         20
@@ -1066,37 +1069,27 @@
 #define ASC_SCSIQ_W_REQ_COUNT         52
 #define ASC_SCSIQ_B_LIST_CNT          6
 #define ASC_SCSIQ_B_CUR_LIST_CNT      7
-
 #define ASC_SGQ_B_SG_CNTL             4
 #define ASC_SGQ_B_SG_HEAD_QP          5
 #define ASC_SGQ_B_SG_LIST_CNT         6
 #define ASC_SGQ_B_SG_CUR_LIST_CNT     7
 #define ASC_SGQ_LIST_BEG              8
-
-#define ASC_DEF_SCSI1_QNG    2
-#define ASC_MAX_SCSI1_QNG    2
+#define ASC_DEF_SCSI1_QNG    4
+#define ASC_MAX_SCSI1_QNG    4
 #define ASC_DEF_SCSI2_QNG    16
 #define ASC_MAX_SCSI2_QNG    32
-
 #define ASC_TAG_CODE_MASK    0x23
-
 #define ASC_STOP_REQ_RISC_STOP      0x01
-
 #define ASC_STOP_ACK_RISC_STOP      0x03
-
 #define ASC_STOP_CLEAN_UP_BUSY_Q    0x10
 #define ASC_STOP_CLEAN_UP_DISC_Q    0x20
 #define ASC_STOP_HOST_REQ_RISC_HALT 0x40
-#define ASC_STOP_SEND_INT_TO_HOST   0x80
-
 #define ASC_TIDLUN_TO_IX( tid, lun )  ( ASC_SCSI_TIX_TYPE )( (tid) + ((lun)<<ASC_SCSI_ID_BITS) )
-
 #define ASC_TID_TO_TARGET_ID( tid )   ( ASC_SCSI_BIT_ID_TYPE )( 0x01 << (tid) )
 #define ASC_TIX_TO_TARGET_ID( tix )   ( 0x01 << ( (tix) & ASC_MAX_TID ) )
-#define ASC_TIX_TO_TID( tix )  ( (tix) & ASC_MAX_TID )
-#define ASC_TID_TO_TIX( tid )  ( (tid) & ASC_MAX_TID )
-#define ASC_TIX_TO_LUN( tix )  ( ( (tix) >> ASC_SCSI_ID_BITS ) & ASC_MAX_LUN )
-
+#define ASC_TIX_TO_TID( tix )         ( (tix) & ASC_MAX_TID )
+#define ASC_TID_TO_TIX( tid )         ( (tid) & ASC_MAX_TID )
+#define ASC_TIX_TO_LUN( tix )         ( ( (tix) >> ASC_SCSI_ID_BITS ) & ASC_MAX_LUN )
 #define ASC_QNO_TO_QADDR( q_no )      ( (ASC_QADR_BEG)+( ( int )(q_no) << 6 ) )
 
 typedef struct asc_scisq_1 {
@@ -1104,25 +1097,21 @@
 	uchar               q_no;
 	uchar               cntl;
 	uchar               sg_queue_cnt;
-
 	uchar               target_id;
 	uchar               target_lun;
-
 	ulong               data_addr;
 	ulong               data_cnt;
 	ulong               sense_addr;
 	uchar               sense_len;
-	uchar               user_def;
+	uchar               extra_bytes;
 } ASC_SCSIQ_1;
 
 typedef struct asc_scisq_2 {
 	ulong               srb_ptr;
 	uchar               target_ix;
-
 	uchar               flag;
 	uchar               cdb_len;
 	uchar               tag_code;
-
 	ushort              vm_id;
 } ASC_SCSIQ_2;
 
@@ -1138,7 +1127,7 @@
 	uchar               y_first_sg_list_qp;
 	uchar               y_working_sg_qp;
 	uchar               y_working_sg_ix;
-	uchar               y_cntl;
+	uchar               y_res;
 	ushort              x_req_count;
 	ushort              x_reconnect_rtn;
 	ulong               x_saved_data_addr;
@@ -1152,7 +1141,7 @@
 	uchar               q_no;
 	uchar               cntl;
 	uchar               sense_len;
-	uchar               user_def;
+	uchar               extra_bytes;
 	uchar               res;
 	ulong               remain_bytes;
 } ASC_QDONE_INFO;
@@ -1163,24 +1152,20 @@
 } ASC_SG_LIST;
 
 typedef struct asc_sg_head {
-	uchar               entry_cnt;
-
-	uchar               queue_cnt;
-
-	uchar               entry_to_copy;
-	uchar               res;
+	ushort              entry_cnt;
+	ushort              queue_cnt;
+	ushort              entry_to_copy;
+	ushort              res;
 	ASC_SG_LIST         sg_list[ASC_MAX_SG_LIST];
 } ASC_SG_HEAD;
 
 #define ASC_MIN_SG_LIST   2
 
 typedef struct asc_min_sg_head {
-	uchar               entry_cnt;
-
-	uchar               queue_cnt;
-
-	uchar               entry_to_copy;
-	uchar               res;
+	ushort              entry_cnt;
+	ushort              queue_cnt;
+	ushort              entry_to_copy;
+	ushort              res;
 	ASC_SG_LIST         sg_list[ASC_MIN_SG_LIST];
 } ASC_MIN_SG_HEAD;
 
@@ -1198,20 +1183,19 @@
 	uchar               q_required;
 	uchar               res;
 } ASC_EXT_SCSI_Q;
-
 #endif
 
 typedef struct asc_scsi_q {
 	ASC_SCSIQ_1         q1;
 	ASC_SCSIQ_2         q2;
 	uchar dosfar       *cdbptr;
-
 	ASC_SG_HEAD dosfar *sg_head;
-
 #if CC_LINK_BUSY_Q
 	ASC_EXT_SCSI_Q      ext;
 #endif
-
+#if CC_ASC_SCSI_Q_USRDEF
+	ASC_SCSI_Q_USR      usr;
+#endif
 } ASC_SCSI_Q;
 
 typedef struct asc_scsi_req_q {
@@ -1219,18 +1203,29 @@
 	ASC_SCSIQ_2         r2;
 	uchar dosfar       *cdbptr;
 	ASC_SG_HEAD dosfar *sg_head;
-
 #if CC_LINK_BUSY_Q
 	ASC_EXT_SCSI_Q      ext;
 #endif
-
 	uchar dosfar       *sense_ptr;
-
 	ASC_SCSIQ_3         r3;
 	uchar               cdb[ASC_MAX_CDB_LEN];
 	uchar               sense[ASC_MIN_SENSE_LEN];
+#if CC_ASC_SCSI_REQ_Q_USRDEF
+	ASC_SCSI_REQ_Q_USR  usr;
+#endif
 } ASC_SCSI_REQ_Q;
 
+typedef struct asc_scsi_bios_req_q {
+	ASC_SCSIQ_1         r1;
+	ASC_SCSIQ_2         r2;
+	uchar dosfar       *cdbptr;
+	ASC_SG_HEAD dosfar *sg_head;
+	uchar dosfar       *sense_ptr;
+	ASC_SCSIQ_3         r3;
+	uchar               cdb[ASC_MAX_CDB_LEN];
+	uchar               sense[ASC_MIN_SENSE_LEN];
+} ASC_SCSI_BIOS_REQ_Q;
+
 typedef struct asc_risc_q {
 	uchar               fwd;
 	uchar               bwd;
@@ -1241,14 +1236,12 @@
 } ASC_RISC_Q;
 
 typedef struct asc_sg_list_q {
-
 	uchar               seq_no;
 	uchar               q_no;
 	uchar               cntl;
 	uchar               sg_head_qp;
 	uchar               sg_list_cnt;
 	uchar               sg_cur_list_cnt;
-
 } ASC_SG_LIST_Q;
 
 typedef struct asc_risc_sg_list_q {
@@ -1260,7 +1253,6 @@
 
 #define ASC_EXE_SCSI_IO_MAX_IDLE_LOOP  0x1000000UL
 #define ASC_EXE_SCSI_IO_MAX_WAIT_LOOP  1024
-
 #define ASCQ_ERR_NO_ERROR             0
 #define ASCQ_ERR_IO_NOT_FOUND         1
 #define ASCQ_ERR_LOCAL_MEM            2
@@ -1298,24 +1290,20 @@
 #define ASCQ_ERR_SEND_SCSI_Q          0x22
 #define ASCQ_ERR_HOST_REQ_RISC_HALT   0x23
 #define ASCQ_ERR_RESET_SDTR           0x24
-
 #define ASC_WARN_NO_ERROR             0x0000
 #define ASC_WARN_IO_PORT_ROTATE       0x0001
 #define ASC_WARN_EEPROM_CHKSUM        0x0002
 #define ASC_WARN_IRQ_MODIFIED         0x0004
 #define ASC_WARN_AUTO_CONFIG          0x0008
 #define ASC_WARN_CMD_QNG_CONFLICT     0x0010
-
 #define ASC_WARN_EEPROM_RECOVER       0x0020
 #define ASC_WARN_CFG_MSW_RECOVER      0x0040
-
+#define ASC_WARN_SET_PCI_CONFIG_SPACE 0x0080
 #define ASC_IERR_WRITE_EEPROM         0x0001
 #define ASC_IERR_MCODE_CHKSUM         0x0002
 #define ASC_IERR_SET_PC_ADDR          0x0004
 #define ASC_IERR_START_STOP_CHIP      0x0008
-
 #define ASC_IERR_IRQ_NO               0x0010
-
 #define ASC_IERR_SET_IRQ_NO           0x0020
 #define ASC_IERR_CHIP_VERSION         0x0040
 #define ASC_IERR_SET_SCSI_ID          0x0080
@@ -1325,36 +1313,82 @@
 #define ASC_IERR_SCAM                 0x0800
 #define ASC_IERR_SET_SDTR             0x1000
 #define ASC_IERR_RW_LRAM              0x8000
-
 #define ASC_DEF_IRQ_NO  10
 #define ASC_MAX_IRQ_NO  15
 #define ASC_MIN_IRQ_NO  10
-
 #define ASC_MIN_REMAIN_Q        (0x02)
-#define ASC_DEF_MAX_TOTAL_QNG   (0x40)
-
+#define ASC_DEF_MAX_TOTAL_QNG   (0xF0)
 #define ASC_MIN_TAG_Q_PER_DVC   (0x04)
 #define ASC_DEF_TAG_Q_PER_DVC   (0x04)
-
 #define ASC_MIN_FREE_Q        ASC_MIN_REMAIN_Q
-
 #define ASC_MIN_TOTAL_QNG     (( ASC_MAX_SG_QUEUE )+( ASC_MIN_FREE_Q ))
-
 #define ASC_MAX_TOTAL_QNG 240
-#define ASC_MAX_PCI_INRAM_TOTAL_QNG 20
-
+#define ASC_MAX_PCI_ULTRA_INRAM_TOTAL_QNG 16
+#define ASC_MAX_PCI_ULTRA_INRAM_TAG_QNG   8
+#define ASC_MAX_PCI_INRAM_TOTAL_QNG  20
 #define ASC_MAX_INRAM_TAG_QNG   16
+#define ASC_IOADR_TABLE_MAX_IX  11
+#define ASC_IOADR_GAP   0x10
+#define ASC_SEARCH_IOP_GAP 0x10
+#define ASC_MIN_IOP_ADDR   ( PortAddr )0x0100
+#define ASC_MAX_IOP_ADDR   ( PortAddr )0x3F0
+#define ASC_IOADR_1     ( PortAddr )0x0110
+#define ASC_IOADR_2     ( PortAddr )0x0130
+#define ASC_IOADR_3     ( PortAddr )0x0150
+#define ASC_IOADR_4     ( PortAddr )0x0190
+#define ASC_IOADR_5     ( PortAddr )0x0210
+#define ASC_IOADR_6     ( PortAddr )0x0230
+#define ASC_IOADR_7     ( PortAddr )0x0250
+#define ASC_IOADR_8     ( PortAddr )0x0330
+#define ASC_IOADR_DEF   ASC_IOADR_8
+#define ASC_LIB_SCSIQ_WK_SP        256
+#define ASC_MAX_SYN_XFER_NO        16
+#define ASC_SYN_XFER_NO            8
+#define ASC_SYN_MAX_OFFSET         0x0F
+#define ASC_DEF_SDTR_OFFSET        0x0F
+#define ASC_DEF_SDTR_INDEX         0x00
+#define SYN_XFER_NS_0  25
+#define SYN_XFER_NS_1  30
+#define SYN_XFER_NS_2  35
+#define SYN_XFER_NS_3  40
+#define SYN_XFER_NS_4  50
+#define SYN_XFER_NS_5  60
+#define SYN_XFER_NS_6  70
+#define SYN_XFER_NS_7  85
+#define SYN_ULTRA_XFER_NS_0    12
+#define SYN_ULTRA_XFER_NS_1    19
+#define SYN_ULTRA_XFER_NS_2    25
+#define SYN_ULTRA_XFER_NS_3    32
+#define SYN_ULTRA_XFER_NS_4    38
+#define SYN_ULTRA_XFER_NS_5    44
+#define SYN_ULTRA_XFER_NS_6    50
+#define SYN_ULTRA_XFER_NS_7    57
+#define SYN_ULTRA_XFER_NS_8    63
+#define SYN_ULTRA_XFER_NS_9    69
+#define SYN_ULTRA_XFER_NS_10   75
+#define SYN_ULTRA_XFER_NS_11   82
+#define SYN_ULTRA_XFER_NS_12   88
+#define SYN_ULTRA_XFER_NS_13   94
+#define SYN_ULTRA_XFER_NS_14  100
+#define SYN_ULTRA_XFER_NS_15  107
+#define SYN_XMSG_WLEN  3
+
+typedef struct sdtr_xmsg {
+	uchar               msg_type;
+	uchar               msg_len;
+	uchar               msg_req;
+	uchar               xfer_period;
+	uchar               req_ack_offset;
+	uchar               res;
+} SDTR_XMSG;
 
 typedef struct asc_dvc_cfg {
 	ASC_SCSI_BIT_ID_TYPE can_tagged_qng;
-
 	ASC_SCSI_BIT_ID_TYPE cmd_qng_enabled;
 	ASC_SCSI_BIT_ID_TYPE disc_enable;
 	uchar               res;
 	uchar               chip_scsi_id:4;
-
 	uchar               isa_dma_speed:4;
-
 	uchar               isa_dma_channel;
 	uchar               chip_version;
 	ushort              pci_device_id;
@@ -1362,16 +1396,15 @@
 	ushort              lib_version;
 	ushort              mcode_date;
 	ushort              mcode_version;
-	uchar               sdtr_data[ASC_MAX_TID + 1];
 	uchar               max_tag_qng[ASC_MAX_TID + 1];
 	uchar dosfar       *overrun_buf;
-
+	uchar               sdtr_period_offset[ASC_MAX_TID + 1];
+	ushort              pci_slot_info;
 } ASC_DVC_CFG;
 
 #define ASC_DEF_DVC_CNTL       0xFFFF
 #define ASC_DEF_CHIP_SCSI_ID   7
 #define ASC_DEF_ISA_DMA_SPEED  4
-
 #define ASC_INIT_STATE_NULL          0x0000
 #define ASC_INIT_STATE_BEG_GET_CFG   0x0001
 #define ASC_INIT_STATE_END_GET_CFG   0x0002
@@ -1382,15 +1415,14 @@
 #define ASC_INIT_STATE_BEG_INQUIRY   0x0040
 #define ASC_INIT_STATE_END_INQUIRY   0x0080
 #define ASC_INIT_RESET_SCSI_DONE     0x0100
-
+#define ASC_INIT_STATE_WITHOUT_EEP   0x8000
 #define ASC_PCI_DEVICE_ID_REV_A      0x1100
 #define ASC_PCI_DEVICE_ID_REV_B      0x1200
-
-#define ASC_BUG_FIX_ADD_ONE_BYTE     0x0001
-
+#define ASC_BUG_FIX_IF_NOT_DWB       0x0001
+#define ASC_BUG_FIX_ASYN_USE_SYN     0x0002
 #define ASYN_SDTR_DATA_FIX_PCI_REV_AB 0x41
-
 #define ASC_MIN_TAGGED_CMD  7
+#define ASC_MAX_SCSI_RESET_WAIT      30
 
 typedef struct asc_dvc_var {
 	PortAddr            iop_base;
@@ -1400,49 +1432,41 @@
 	ushort              bus_type;
 	Ptr2Func            isr_callback;
 	Ptr2Func            exe_callback;
-
 	ASC_SCSI_BIT_ID_TYPE init_sdtr;
-
 	ASC_SCSI_BIT_ID_TYPE sdtr_done;
-
 	ASC_SCSI_BIT_ID_TYPE use_tagged_qng;
-
 	ASC_SCSI_BIT_ID_TYPE unit_not_ready;
-
 	ASC_SCSI_BIT_ID_TYPE queue_full_or_busy;
-
 	ASC_SCSI_BIT_ID_TYPE start_motor;
 	uchar               scsi_reset_wait;
 	uchar               chip_no;
-
 	char                is_in_int;
 	uchar               max_total_qng;
-
 	uchar               cur_total_qng;
-
 	uchar               in_critical_cnt;
-
 	uchar               irq_no;
 	uchar               last_q_shortage;
-
 	ushort              init_state;
 	uchar               cur_dvc_qng[ASC_MAX_TID + 1];
 	uchar               max_dvc_qng[ASC_MAX_TID + 1];
-
 	ASC_SCSI_Q dosfar  *scsiq_busy_head[ASC_MAX_TID + 1];
 	ASC_SCSI_Q dosfar  *scsiq_busy_tail[ASC_MAX_TID + 1];
-
-	ulong               int_count;
-	ulong               req_count;
-	ulong               busy_count;
-
+	uchar               sdtr_period_tbl[ASC_MAX_SYN_XFER_NO];
 	ASC_DVC_CFG dosfar *cfg;
 	Ptr2Func            saved_ptr2func;
-	ulong               reserved2;
-	ulong               reserved3;
+	ASC_SCSI_BIT_ID_TYPE pci_fix_asyn_xfer_always;
+	char                redo_scam;
+	ushort              res2;
+	uchar               dos_int13_table[ASC_MAX_TID + 1];
 	ulong               max_dma_count;
 	ASC_SCSI_BIT_ID_TYPE no_scam;
 	ASC_SCSI_BIT_ID_TYPE pci_fix_asyn_xfer;
+	uchar               max_sdtr_index;
+	uchar               res4;
+	ulong               drv_ptr;
+	ulong               res6;
+	ulong               res7;
+	ulong               res8;
 } ASC_DVC_VAR;
 
 typedef int         (dosfar * ASC_ISR_CALLBACK) (ASC_DVC_VAR asc_ptr_type *, ASC_QDONE_INFO dosfar *);
@@ -1461,115 +1485,50 @@
 	ASC_CAP_INFO        cap_info[ASC_MAX_TID + 1][ASC_MAX_LUN + 1];
 } ASC_CAP_INFO_ARRAY;
 
-#define ASC_IOADR_TABLE_MAX_IX  11
-#define ASC_IOADR_GAP   0x10
-#define ASC_SEARCH_IOP_GAP 0x10
-#define ASC_MIN_IOP_ADDR   ( PortAddr )0x0100
-#define ASC_MAX_IOP_ADDR   ( PortAddr )0x3F0
-
-#define ASC_IOADR_1     ( PortAddr )0x0110
-#define ASC_IOADR_2     ( PortAddr )0x0130
-#define ASC_IOADR_3     ( PortAddr )0x0150
-#define ASC_IOADR_4     ( PortAddr )0x0190
-#define ASC_IOADR_5     ( PortAddr )0x0210
-#define ASC_IOADR_6     ( PortAddr )0x0230
-#define ASC_IOADR_7     ( PortAddr )0x0250
-#define ASC_IOADR_8     ( PortAddr )0x0330
-#define ASC_IOADR_DEF   ASC_IOADR_8
-
-#define ASC_SYN_XFER_NO   8
-#define ASC_MAX_SDTR_PERIOD_INDEX  7
-#define ASC_SYN_MAX_OFFSET   0x0F
-#define ASC_DEF_SDTR_OFFSET  0x0F
-#define ASC_DEF_SDTR_INDEX   0x00
-
-#define SYN_XFER_NS_0  25
-#define SYN_XFER_NS_1  30
-#define SYN_XFER_NS_2  35
-#define SYN_XFER_NS_3  40
-#define SYN_XFER_NS_4  50
-#define SYN_XFER_NS_5  60
-#define SYN_XFER_NS_6  70
-#define SYN_XFER_NS_7  85
-
-#define ASC_SDTR_PERIOD_IX_MIN  7
-
-#define SYN_XMSG_WLEN  3
-
-typedef struct sdtr_xmsg {
-	uchar               msg_type;
-	uchar               msg_len;
-	uchar               msg_req;
-	uchar               xfer_period;
-	uchar               req_ack_offset;
-	uchar               res;
-} SDTR_XMSG;
-
 #define ASC_MCNTL_NO_SEL_TIMEOUT  ( ushort )0x0001
 #define ASC_MCNTL_NULL_TARGET     ( ushort )0x0002
-
 #define ASC_CNTL_INITIATOR         ( ushort )0x0001
 #define ASC_CNTL_BIOS_GT_1GB       ( ushort )0x0002
 #define ASC_CNTL_BIOS_GT_2_DISK    ( ushort )0x0004
 #define ASC_CNTL_BIOS_REMOVABLE    ( ushort )0x0008
 #define ASC_CNTL_NO_SCAM           ( ushort )0x0010
-#define ASC_CNTL_NO_PCI_FIX_ASYN_XFER ( ushort )0x0020
-
 #define ASC_CNTL_INT_MULTI_Q       ( ushort )0x0080
-
 #define ASC_CNTL_NO_LUN_SUPPORT    ( ushort )0x0040
-
 #define ASC_CNTL_NO_VERIFY_COPY    ( ushort )0x0100
 #define ASC_CNTL_RESET_SCSI        ( ushort )0x0200
 #define ASC_CNTL_INIT_INQUIRY      ( ushort )0x0400
 #define ASC_CNTL_INIT_VERBOSE      ( ushort )0x0800
-
 #define ASC_CNTL_SCSI_PARITY       ( ushort )0x1000
 #define ASC_CNTL_BURST_MODE        ( ushort )0x2000
-
 #define ASC_CNTL_USE_8_IOP_BASE    ( ushort )0x4000
-
 #define ASC_EEP_DVC_CFG_BEG_VL    2
 #define ASC_EEP_MAX_DVC_ADDR_VL   15
-
 #define ASC_EEP_DVC_CFG_BEG      32
 #define ASC_EEP_MAX_DVC_ADDR     45
-
 #define ASC_EEP_DEFINED_WORDS    10
 #define ASC_EEP_MAX_ADDR         63
 #define ASC_EEP_RES_WORDS         0
 #define ASC_EEP_MAX_RETRY        20
 #define ASC_MAX_INIT_BUSY_RETRY   8
-
 #define ASC_EEP_ISA_PNP_WSIZE    16
 
 typedef struct asceep_config {
 	ushort              cfg_lsw;
 	ushort              cfg_msw;
-
 	uchar               init_sdtr;
 	uchar               disc_enable;
-
 	uchar               use_cmd_qng;
-
 	uchar               start_motor;
 	uchar               max_total_qng;
 	uchar               max_tag_qng;
 	uchar               bios_scan;
-
 	uchar               power_up_wait;
-
 	uchar               no_scam;
 	uchar               chip_scsi_id:4;
-
 	uchar               isa_dma_speed:4;
-
-	uchar               sdtr_data[ASC_MAX_TID + 1];
-
+	uchar               dos_int13_table[ASC_MAX_TID + 1];
 	uchar               adapter_info[6];
-
 	ushort              cntl;
-
 	ushort              chksum;
 } ASCEEP_CONFIG;
 
@@ -1577,30 +1536,23 @@
 #define ASC_EEP_CMD_WRITE         0x40
 #define ASC_EEP_CMD_WRITE_ABLE    0x30
 #define ASC_EEP_CMD_WRITE_DISABLE 0x00
-
 #define ASC_OVERRUN_BSIZE  0x00000048UL
-
 #define ASCV_MSGOUT_BEG         0x0000
 #define ASCV_MSGOUT_SDTR_PERIOD (ASCV_MSGOUT_BEG+3)
 #define ASCV_MSGOUT_SDTR_OFFSET (ASCV_MSGOUT_BEG+4)
-
 #define ASCV_MSGIN_BEG          (ASCV_MSGOUT_BEG+8)
 #define ASCV_MSGIN_SDTR_PERIOD  (ASCV_MSGIN_BEG+3)
 #define ASCV_MSGIN_SDTR_OFFSET  (ASCV_MSGIN_BEG+4)
-
 #define ASCV_SDTR_DATA_BEG      (ASCV_MSGIN_BEG+8)
 #define ASCV_SDTR_DONE_BEG      (ASCV_SDTR_DATA_BEG+8)
 #define ASCV_MAX_DVC_QNG_BEG    ( ushort )0x0020
-
 #define ASCV_ASCDVC_ERR_CODE_W  ( ushort )0x0030
 #define ASCV_MCODE_CHKSUM_W   ( ushort )0x0032
 #define ASCV_MCODE_SIZE_W     ( ushort )0x0034
 #define ASCV_STOP_CODE_B      ( ushort )0x0036
 #define ASCV_DVC_ERR_CODE_B   ( ushort )0x0037
-
 #define ASCV_OVERRUN_PADDR_D  ( ushort )0x0038
 #define ASCV_OVERRUN_BSIZE_D  ( ushort )0x003C
-
 #define ASCV_HALTCODE_W       ( ushort )0x0040
 #define ASCV_CHKSUM_W         ( ushort )0x0042
 #define ASCV_MC_DATE_W        ( ushort )0x0044
@@ -1609,57 +1561,47 @@
 #define ASCV_DONENEXT_B       ( ushort )0x0049
 #define ASCV_USE_TAGGED_QNG_B ( ushort )0x004A
 #define ASCV_SCSIBUSY_B       ( ushort )0x004B
-#define ASCV_CDBCNT_B         ( ushort )0x004C
+#define ASCV_Q_DONE_IN_PROGRESS_B  ( ushort )0x004C
 #define ASCV_CURCDB_B         ( ushort )0x004D
 #define ASCV_RCLUN_B          ( ushort )0x004E
 #define ASCV_BUSY_QHEAD_B     ( ushort )0x004F
 #define ASCV_DISC1_QHEAD_B    ( ushort )0x0050
-
 #define ASCV_DISC_ENABLE_B    ( ushort )0x0052
 #define ASCV_CAN_TAGGED_QNG_B ( ushort )0x0053
 #define ASCV_HOSTSCSI_ID_B    ( ushort )0x0055
 #define ASCV_MCODE_CNTL_B     ( ushort )0x0056
 #define ASCV_NULL_TARGET_B    ( ushort )0x0057
-
 #define ASCV_FREE_Q_HEAD_W    ( ushort )0x0058
 #define ASCV_DONE_Q_TAIL_W    ( ushort )0x005A
 #define ASCV_FREE_Q_HEAD_B    ( ushort )(ASCV_FREE_Q_HEAD_W+1)
 #define ASCV_DONE_Q_TAIL_B    ( ushort )(ASCV_DONE_Q_TAIL_W+1)
-
 #define ASCV_HOST_FLAG_B      ( ushort )0x005D
-
 #define ASCV_TOTAL_READY_Q_B  ( ushort )0x0064
 #define ASCV_VER_SERIAL_B     ( ushort )0x0065
 #define ASCV_HALTCODE_SAVED_W ( ushort )0x0066
 #define ASCV_WTM_FLAG_B       ( ushort )0x0068
 #define ASCV_RISC_FLAG_B      ( ushort )0x006A
 #define ASCV_REQ_SG_LIST_QP   ( ushort )0x006B
-
 #define ASC_HOST_FLAG_IN_ISR        0x01
 #define ASC_HOST_FLAG_ACK_INT       0x02
-
 #define ASC_RISC_FLAG_GEN_INT      0x01
 #define ASC_RISC_FLAG_REQ_SG_LIST  0x02
-
 #define IOP_CTRL         (0x0F)
 #define IOP_STATUS       (0x0E)
 #define IOP_INT_ACK      IOP_STATUS
-
 #define IOP_REG_IFC      (0x0D)
-
-#define IOP_SYN_OFFSET   (0x0B)
-#define IOP_REG_PC       (0x0C)
-#define IOP_RAM_ADDR     (0x0A)
-#define IOP_RAM_DATA     (0x08)
-#define IOP_EEP_DATA     (0x06)
-#define IOP_EEP_CMD      (0x07)
-
-#define IOP_VERSION      (0x03)
-#define IOP_CONFIG_HIGH  (0x04)
-#define IOP_CONFIG_LOW   (0x02)
-#define IOP_ASPI_ID_LOW  (0x01)
-#define IOP_ASPI_ID_HIGH (0x00)
-
+#define IOP_SYN_OFFSET    (0x0B)
+#define IOP_EXTRA_CONTROL (0x0D)
+#define IOP_REG_PC        (0x0C)
+#define IOP_RAM_ADDR      (0x0A)
+#define IOP_RAM_DATA      (0x08)
+#define IOP_EEP_DATA      (0x06)
+#define IOP_EEP_CMD       (0x07)
+#define IOP_VERSION       (0x03)
+#define IOP_CONFIG_HIGH   (0x04)
+#define IOP_CONFIG_LOW    (0x02)
+#define IOP_SIG_BYTE      (0x01)
+#define IOP_SIG_WORD      (0x00)
 #define IOP_REG_DC1      (0x0E)
 #define IOP_REG_DC0      (0x0C)
 #define IOP_REG_SB       (0x0B)
@@ -1675,85 +1617,30 @@
 #define IOP_REG_IH       (0x02)
 #define IOP_REG_IX       (0x01)
 #define IOP_REG_AX       (0x00)
-
 #define IFC_REG_LOCK      (0x00)
 #define IFC_REG_UNLOCK    (0x09)
-
 #define IFC_WR_EN_FILTER  (0x10)
 #define IFC_RD_NO_EEPROM  (0x10)
 #define IFC_SLEW_RATE     (0x20)
 #define IFC_ACT_NEG       (0x40)
 #define IFC_INP_FILTER    (0x80)
-
 #define IFC_INIT_DEFAULT  ( IFC_ACT_NEG | IFC_REG_UNLOCK )
-
-#define SC_SEL   (0x80)
-#define SC_BSY   (0x40)
-#define SC_ACK   (0x20)
-#define SC_REQ   (0x10)
-#define SC_ATN   (0x08)
-#define SC_IO    (0x04)
-#define SC_CD    (0x02)
-#define SC_MSG   (0x01)
-
-#define AscGetVarFreeQHead( port )       AscReadLramWord( port, ASCV_FREE_Q_HEAD_W )
-#define AscGetVarDoneQTail( port )       AscReadLramWord( port, ASCV_DONE_Q_TAIL_W )
-#define AscPutVarFreeQHead( port, val )  AscWriteLramWord( port, ASCV_FREE_Q_HEAD_W, val )
-#define AscPutVarDoneQTail( port, val )  AscWriteLramWord( port, ASCV_DONE_Q_TAIL_W, val )
-
-#define AscGetRiscVarFreeQHead( port )        AscReadLramByte( port, ASCV_NEXTRDY_B )
-#define AscGetRiscVarDoneQTail( port )        AscReadLramByte( port, ASCV_DONENEXT_B )
-#define AscPutRiscVarFreeQHead( port, val )   AscWriteLramByte( port, ASCV_NEXTRDY_B, val )
-#define AscPutRiscVarDoneQTail( port, val )   AscWriteLramByte( port, ASCV_DONENEXT_B, val )
-
-#define AscGetChipIFC( port )               inp( (port)+IOP_REG_IFC )
-#define AscPutChipIFC( port, data )         outp( (port)+IOP_REG_IFC, data )
-
-#define AscGetChipLramAddr( port )          ( ushort )inpw( ( PortAddr )((port)+IOP_RAM_ADDR) )
-#define AscSetChipLramAddr( port, addr )    outpw( ( PortAddr )( (port)+IOP_RAM_ADDR ), addr )
-#define AscPutChipLramData( port, data )    outpw( (port)+IOP_RAM_DATA, data )
-#define AscGetChipLramData( port )          inpw( (port)+IOP_RAM_DATA )
-
-#define AscWriteChipSyn( port, data )       outp( (port)+IOP_SYN_OFFSET, data )
-#define AscReadChipSyn( port )              inp( (port)+IOP_SYN_OFFSET )
-
-#define AscWriteChipIH( port, data )        outpw( (port)+IOP_REG_IH, data )
-#define AscReadChipIH( port )               inpw( (port)+IOP_REG_IH )
-
-#define AscWriteChipScsiID( port, data )    outp( (port)+IOP_REG_ID, data )
-#define AscReadChipScsiID( port )           inp( (port)+IOP_REG_ID )
-
-#define AscGetChipDmaSpeed( port )         ( uchar )inp( (port)+IOP_DMA_SPEED )
-#define AscSetChipDmaSpeed( port, data )   outp( (port)+IOP_DMA_SPEED, data )
-#define AscGetChipQP( port )               ( uchar )inp( (port)+IOP_REG_QP )
-#define AscSetPCAddr( port, data )         outpw( (port)+IOP_REG_PC, data )
-#define AscGetPCAddr( port )               inpw( (port)+IOP_REG_PC )
-#define AscGetChipVerNo( port )            ( uchar )inp( (port)+IOP_VERSION )
-
-#define AscGetChipEEPCmd( port )           ( uchar )inp( (port)+IOP_EEP_CMD )
-#define AscSetChipEEPCmd( port, data )     outp( (port)+IOP_EEP_CMD, data )
-#define AscGetChipEEPData( port )          inpw( (port)+IOP_EEP_DATA )
-#define AscSetChipEEPData( port, data )    outpw( (port)+IOP_EEP_DATA, data )
-
-#define AscGetChipControl( port )          ( uchar )inp( (port)+IOP_CTRL )
-#define AscSetChipControl( port, cc_val )  outp( (port)+IOP_CTRL, cc_val )
-
-#define AscGetChipStatus( port )           ( ASC_CS_TYPE )inpw( (port)+IOP_STATUS )
-#define AscSetChipStatus( port, cs_val )   outpw( (port)+IOP_STATUS, cs_val )
-
-#define AscGetChipCfgLsw( port )           ( ushort )inpw( (port)+IOP_CONFIG_LOW )
-#define AscGetChipCfgMsw( port )           ( ushort )inpw( (port)+IOP_CONFIG_HIGH )
-#define AscSetChipCfgLsw( port, data )     outpw( (port)+IOP_CONFIG_LOW, data )
-#define AscSetChipCfgMsw( port, data )     outpw( (port)+IOP_CONFIG_HIGH, data )
-
-#define AscIsIntPending( port )           ( AscGetChipStatus( port ) & CSW_INT_PENDING )
-#define AscGetChipScsiID( port )          ( ( AscGetChipCfgLsw( port ) >> 8 ) & ASC_MAX_TID )
-
+#define SC_SEL   ( uchar )(0x80)
+#define SC_BSY   ( uchar )(0x40)
+#define SC_ACK   ( uchar )(0x20)
+#define SC_REQ   ( uchar )(0x10)
+#define SC_ATN   ( uchar )(0x08)
+#define SC_IO    ( uchar )(0x04)
+#define SC_CD    ( uchar )(0x02)
+#define SC_MSG   ( uchar )(0x01)
+#define SEC_ACTIVE_NEGATE    ( uchar )( 0x40 )
+#define SEC_SLEW_RATE        ( uchar )( 0x20 )
 #define ASC_HALT_EXTMSG_IN     ( ushort )0x8000
 #define ASC_HALT_CHK_CONDITION ( ushort )0x8100
 #define ASC_HALT_SS_QUEUE_FULL ( ushort )0x8200
+#define ASC_HALT_DISABLE_ASYN_USE_SYN_FIX  ( ushort )0x8300
+#define ASC_HALT_ENABLE_ASYN_USE_SYN_FIX   ( ushort )0x8400
 #define ASC_HALT_SDTR_REJECTED ( ushort )0x4000
-
 #define ASC_MAX_QNO        0xF8
 #define ASC_DATA_SEC_BEG   ( ushort )0x0080
 #define ASC_DATA_SEC_END   ( ushort )0x0080
@@ -1765,13 +1652,10 @@
 #define ASC_QLAST_ADR      ( ushort )0x7FC0
 #define ASC_QBLK_SIZE      0x40
 #define ASC_BIOS_DATA_QBEG 0xF8
-
 #define ASC_MIN_ACTIVE_QNO 0x01
-
 #define ASC_QLINK_END      0xFF
 #define ASC_EEPROM_WORDS   0x10
 #define ASC_MAX_MGS_LEN    0x10
-
 #define ASC_BIOS_ADDR_DEF  0xDC00
 #define ASC_BIOS_SIZE      0x3800
 #define ASC_BIOS_RAM_OFF   0x3800
@@ -1779,19 +1663,14 @@
 #define ASC_BIOS_MIN_ADDR  0xC000
 #define ASC_BIOS_MAX_ADDR  0xEC00
 #define ASC_BIOS_BANK_SIZE 0x0400
-
 #define ASC_MCODE_START_ADDR  0x0080
-
 #define ASC_CFG0_HOST_INT_ON    0x0020
 #define ASC_CFG0_BIOS_ON        0x0040
 #define ASC_CFG0_VERA_BURST_ON  0x0080
 #define ASC_CFG0_SCSI_PARITY_ON 0x0800
-
 #define ASC_CFG1_SCSI_TARGET_ON 0x0080
 #define ASC_CFG1_LRAM_8BITS_ON  0x0800
-
-#define ASC_CFG_MSW_CLR_MASK    0xF0C0
-
+#define ASC_CFG_MSW_CLR_MASK    0x30C0
 #define CSW_TEST1             ( ASC_CS_TYPE )0x8000
 #define CSW_AUTO_CONFIG       ( ASC_CS_TYPE )0x4000
 #define CSW_RESERVED1         ( ASC_CS_TYPE )0x2000
@@ -1802,24 +1681,18 @@
 #define CSW_RESERVED2         ( ASC_CS_TYPE )0x0100
 #define CSW_DMA_DONE          ( ASC_CS_TYPE )0x0080
 #define CSW_FIFO_RDY          ( ASC_CS_TYPE )0x0040
-
 #define CSW_EEP_READ_DONE     ( ASC_CS_TYPE )0x0020
-
 #define CSW_HALTED            ( ASC_CS_TYPE )0x0010
 #define CSW_SCSI_RESET_ACTIVE ( ASC_CS_TYPE )0x0008
-
 #define CSW_PARITY_ERR        ( ASC_CS_TYPE )0x0004
 #define CSW_SCSI_RESET_LATCH  ( ASC_CS_TYPE )0x0002
-
 #define CSW_INT_PENDING       ( ASC_CS_TYPE )0x0001
-
+#define CIW_CLR_SCSI_RESET_INT ( ASC_CS_TYPE )0x1000
 #define CIW_INT_ACK      ( ASC_CS_TYPE )0x0100
 #define CIW_TEST1        ( ASC_CS_TYPE )0x0200
 #define CIW_TEST2        ( ASC_CS_TYPE )0x0400
 #define CIW_SEL_33MHZ    ( ASC_CS_TYPE )0x0800
-
 #define CIW_IRQ_ACT      ( ASC_CS_TYPE )0x1000
-
 #define CC_CHIP_RESET   ( uchar )0x80
 #define CC_SCSI_RESET   ( uchar )0x40
 #define CC_HALT         ( uchar )0x20
@@ -1828,11 +1701,9 @@
 #define CC_TEST         ( uchar )0x04
 #define CC_BANK_ONE     ( uchar )0x02
 #define CC_DIAG         ( uchar )0x01
-
 #define ASC_1000_ID0W      0x04C1
 #define ASC_1000_ID0W_FIX  0x00C1
 #define ASC_1000_ID1B      0x25
-
 #define ASC_EISA_BIG_IOP_GAP   (0x1C30-0x0C50)
 #define ASC_EISA_SMALL_IOP_GAP (0x0020)
 #define ASC_EISA_MIN_IOP_ADDR  (0x0C30)
@@ -1840,17 +1711,13 @@
 #define ASC_EISA_REV_IOP_MASK  (0x0C83)
 #define ASC_EISA_PID_IOP_MASK  (0x0C80)
 #define ASC_EISA_CFG_IOP_MASK  (0x0C86)
-
 #define ASC_GET_EISA_SLOT( iop )  ( PortAddr )( (iop) & 0xF000 )
-
 #define ASC_EISA_ID_740    0x01745004UL
 #define ASC_EISA_ID_750    0x01755004UL
-
 #define INS_HALTINT        ( ushort )0x6281
 #define INS_HALT           ( ushort )0x6280
 #define INS_SINT           ( ushort )0x6200
 #define INS_RFLAG_WTM      ( ushort )0x7380
-
 #define ASC_MC_SAVE_CODE_WSIZE  0x500
 #define ASC_MC_SAVE_DATA_WSIZE  0x40
 
@@ -1859,6 +1726,76 @@
 	ushort              code[ASC_MC_SAVE_CODE_WSIZE];
 } ASC_MC_SAVED;
 
+#define AscGetQDoneInProgress( port )         AscReadLramByte( (port), ASCV_Q_DONE_IN_PROGRESS_B )
+#define AscPutQDoneInProgress( port, val )    AscWriteLramByte( (port), ASCV_Q_DONE_IN_PROGRESS_B, val )
+#define AscGetVarFreeQHead( port )            AscReadLramWord( (port), ASCV_FREE_Q_HEAD_W )
+#define AscGetVarDoneQTail( port )            AscReadLramWord( (port), ASCV_DONE_Q_TAIL_W )
+#define AscPutVarFreeQHead( port, val )       AscWriteLramWord( (port), ASCV_FREE_Q_HEAD_W, val )
+#define AscPutVarDoneQTail( port, val )       AscWriteLramWord( (port), ASCV_DONE_Q_TAIL_W, val )
+#define AscGetRiscVarFreeQHead( port )        AscReadLramByte( (port), ASCV_NEXTRDY_B )
+#define AscGetRiscVarDoneQTail( port )        AscReadLramByte( (port), ASCV_DONENEXT_B )
+#define AscPutRiscVarFreeQHead( port, val )   AscWriteLramByte( (port), ASCV_NEXTRDY_B, val )
+#define AscPutRiscVarDoneQTail( port, val )   AscWriteLramByte( (port), ASCV_DONENEXT_B, val )
+#define AscPutMCodeSDTRDoneAtID( port, id, data )  AscWriteLramByte( (port), ( ushort )( ( ushort )ASCV_SDTR_DONE_BEG+( ushort )id ), (data) ) ;
+#define AscGetMCodeSDTRDoneAtID( port, id )        AscReadLramByte( (port), ( ushort )( ( ushort )ASCV_SDTR_DONE_BEG+( ushort )id ) ) ;
+#define AscPutMCodeInitSDTRAtID( port, id, data )  AscWriteLramByte( (port), ( ushort )( ( ushort )ASCV_SDTR_DATA_BEG+( ushort )id ), data ) ;
+#define AscGetMCodeInitSDTRAtID( port, id )        AscReadLramByte( (port), ( ushort )( ( ushort )ASCV_SDTR_DATA_BEG+( ushort )id ) ) ;
+#define AscSynIndexToPeriod( index )        ( uchar )( asc_dvc->sdtr_period_tbl[ (index) ] )
+#define AscGetChipSignatureByte( port )     ( uchar )inp( (port)+IOP_SIG_BYTE )
+#define AscGetChipSignatureWord( port )     ( ushort )inpw( (port)+IOP_SIG_WORD )
+#define AscGetChipVerNo( port )             ( uchar )inp( (port)+IOP_VERSION )
+#define AscGetChipCfgLsw( port )            ( ushort )inpw( (port)+IOP_CONFIG_LOW )
+#define AscGetChipCfgMsw( port )            ( ushort )inpw( (port)+IOP_CONFIG_HIGH )
+#define AscSetChipCfgLsw( port, data )      outpw( (port)+IOP_CONFIG_LOW, data )
+#define AscSetChipCfgMsw( port, data )      outpw( (port)+IOP_CONFIG_HIGH, data )
+#define AscGetChipEEPCmd( port )            ( uchar )inp( (port)+IOP_EEP_CMD )
+#define AscSetChipEEPCmd( port, data )      outp( (port)+IOP_EEP_CMD, data )
+#define AscGetChipEEPData( port )           ( ushort )inpw( (port)+IOP_EEP_DATA )
+#define AscSetChipEEPData( port, data )     outpw( (port)+IOP_EEP_DATA, data )
+#define AscGetChipLramAddr( port )          ( ushort )inpw( ( PortAddr )((port)+IOP_RAM_ADDR) )
+#define AscSetChipLramAddr( port, addr )    outpw( ( PortAddr )( (port)+IOP_RAM_ADDR ), addr )
+#define AscGetChipLramData( port )          ( ushort )inpw( (port)+IOP_RAM_DATA )
+#define AscSetChipLramData( port, data )    outpw( (port)+IOP_RAM_DATA, data )
+#define AscGetChipLramDataNoSwap( port )         ( ushort )inpw_noswap( (port)+IOP_RAM_DATA )
+#define AscSetChipLramDataNoSwap( port, data )   outpw_noswap( (port)+IOP_RAM_DATA, data )
+#define AscGetChipIFC( port )               ( uchar )inp( (port)+IOP_REG_IFC )
+#define AscSetChipIFC( port, data )          outp( (port)+IOP_REG_IFC, data )
+#define AscGetChipStatus( port )            ( ASC_CS_TYPE )inpw( (port)+IOP_STATUS )
+#define AscSetChipStatus( port, cs_val )    outpw( (port)+IOP_STATUS, cs_val )
+#define AscGetChipControl( port )           ( uchar )inp( (port)+IOP_CTRL )
+#define AscSetChipControl( port, cc_val )   outp( (port)+IOP_CTRL, cc_val )
+#define AscGetChipSyn( port )               ( uchar )inp( (port)+IOP_SYN_OFFSET )
+#define AscSetChipSyn( port, data )         outp( (port)+IOP_SYN_OFFSET, data )
+#define AscSetPCAddr( port, data )          outpw( (port)+IOP_REG_PC, data )
+#define AscGetPCAddr( port )                ( ushort )inpw( (port)+IOP_REG_PC )
+#define AscIsIntPending( port )             ( AscGetChipStatus(port) & ( CSW_INT_PENDING | CSW_SCSI_RESET_LATCH ) )
+#define AscGetChipScsiID( port )            ( ( AscGetChipCfgLsw(port) >> 8 ) & ASC_MAX_TID )
+#define AscGetExtraControl( port )          ( uchar )inp( (port)+IOP_EXTRA_CONTROL )
+#define AscSetExtraControl( port, data )    outp( (port)+IOP_EXTRA_CONTROL, data )
+#define AscReadChipAX( port )               ( ushort )inpw( (port)+IOP_REG_AX )
+#define AscWriteChipAX( port, data )        outpw( (port)+IOP_REG_AX, data )
+#define AscReadChipIX( port )               ( uchar )inp( (port)+IOP_REG_IX )
+#define AscWriteChipIX( port, data )        outp( (port)+IOP_REG_IX, data )
+#define AscReadChipIH( port )               ( ushort )inpw( (port)+IOP_REG_IH )
+#define AscWriteChipIH( port, data )        outpw( (port)+IOP_REG_IH, data )
+#define AscReadChipQP( port )               ( uchar )inp( (port)+IOP_REG_QP )
+#define AscWriteChipQP( port, data )        outp( (port)+IOP_REG_QP, data )
+#define AscReadChipFIFO_L( port )           ( ushort )inpw( (port)+IOP_REG_FIFO_L )
+#define AscWriteChipFIFO_L( port, data )    outpw( (port)+IOP_REG_FIFO_L, data )
+#define AscReadChipFIFO_H( port )           ( ushort )inpw( (port)+IOP_REG_FIFO_H )
+#define AscWriteChipFIFO_H( port, data )    outpw( (port)+IOP_REG_FIFO_H, data )
+#define AscReadChipDmaSpeed( port )         ( uchar )inp( (port)+IOP_DMA_SPEED )
+#define AscWriteChipDmaSpeed( port, data )  outp( (port)+IOP_DMA_SPEED, data )
+#define AscReadChipDA0( port )              ( ushort )inpw( (port)+IOP_REG_DA0 )
+#define AscWriteChipDA0( port )             outpw( (port)+IOP_REG_DA0, data )
+#define AscReadChipDA1( port )              ( ushort )inpw( (port)+IOP_REG_DA1 )
+#define AscWriteChipDA1( port )             outpw( (port)+IOP_REG_DA1, data )
+#define AscReadChipDC0( port )              ( ushort )inpw( (port)+IOP_REG_DC0 )
+#define AscWriteChipDC0( port )             outpw( (port)+IOP_REG_DC0, data )
+#define AscReadChipDC1( port )              ( ushort )inpw( (port)+IOP_REG_DC1 )
+#define AscWriteChipDC1( port )             outpw( (port)+IOP_REG_DC1, data )
+#define AscReadChipDvcID( port )            ( uchar )inp( (port)+IOP_REG_ID )
+#define AscWriteChipDvcID( port, data )     outp( (port)+IOP_REG_ID, data )
 int                 AscWriteEEPCmdReg(PortAddr iop_base, uchar cmd_reg);
 int                 AscWriteEEPDataReg(PortAddr iop_base, ushort data_reg);
 void                AscWaitEEPRead(void);
@@ -1869,17 +1806,14 @@
 int                 AscSetEEPConfigOnce(PortAddr, ASCEEP_CONFIG dosfar *, ushort);
 int                 AscSetEEPConfig(PortAddr, ASCEEP_CONFIG dosfar *, ushort);
 ushort              AscEEPSum(PortAddr, uchar, uchar);
-
 int                 AscStartChip(PortAddr);
 int                 AscStopChip(PortAddr);
 void                AscSetChipIH(PortAddr, ushort);
-int                 AscSetRunChipSynRegAtID(PortAddr, uchar, uchar);
-
 int                 AscIsChipHalted(PortAddr);
-
+void                AscResetScsiBus(PortAddr);
+int                 AscResetChip(PortAddr);
 void                AscSetChipCfgDword(PortAddr, ulong);
 ulong               AscGetChipCfgDword(PortAddr);
-
 void                AscAckInterrupt(PortAddr);
 void                AscDisableInterrupt(PortAddr);
 void                AscEnableInterrupt(PortAddr);
@@ -1890,7 +1824,6 @@
 ushort              AscSetIsaDmaChannel(PortAddr, ushort);
 uchar               AscSetIsaDmaSpeed(PortAddr, uchar);
 uchar               AscGetIsaDmaSpeed(PortAddr);
-
 uchar               AscReadLramByte(PortAddr, ushort);
 ushort              AscReadLramWord(PortAddr, ushort);
 ulong               AscReadLramDWord(PortAddr, ushort);
@@ -1900,33 +1833,26 @@
 int                 AscVerWriteLramDWord(PortAddr, ushort, ulong);
 int                 AscVerWriteLramWord(PortAddr, ushort, ushort);
 int                 AscVerWriteLramByte(PortAddr, ushort, uchar);
-
-ulong               AscMemSumLramWord(PortAddr, ushort, int);
-void                AscMemWordSetLram(PortAddr, ushort, ushort, int);
+ulong               AscMemSumLramWord(PortAddr, ushort, rint);
+void                AscMemWordSetLram(PortAddr, ushort, ushort, rint);
 void                AscMemWordCopyToLram(PortAddr, ushort, ushort dosfar *, int);
 void                AscMemDWordCopyToLram(PortAddr, ushort, ulong dosfar *, int);
 void                AscMemWordCopyFromLram(PortAddr, ushort, ushort dosfar *, int);
 int                 AscMemWordCmpToLram(PortAddr, ushort, ushort dosfar *, int);
-
 ushort              AscInitAscDvcVar(ASC_DVC_VAR asc_ptr_type *);
-ulong               AscLoadMicroCode(PortAddr, ushort,
-									 ushort dosfar *, ushort);
 ushort              AscInitFromEEP(ASC_DVC_VAR asc_ptr_type *);
+ushort              AscInitWithoutEEP(ASC_DVC_VAR asc_ptr_type *);
 ushort              AscInitFromAscDvcVar(ASC_DVC_VAR asc_ptr_type *);
 ushort              AscInitMicroCodeVar(ASC_DVC_VAR asc_ptr_type * asc_dvc);
-
 void dosfar         AscInitPollIsrCallBack(ASC_DVC_VAR asc_ptr_type *,
 										   ASC_QDONE_INFO dosfar *);
 int                 AscTestExternalLram(ASC_DVC_VAR asc_ptr_type *);
 ushort              AscTestLramEndian(PortAddr);
-
-uchar               AscMsgOutSDTR(PortAddr, uchar, uchar);
-
-uchar               AscCalSDTRData(uchar, uchar);
+uchar               AscMsgOutSDTR(ASC_DVC_VAR asc_ptr_type *, uchar, uchar);
+uchar               AscCalSDTRData(ASC_DVC_VAR asc_ptr_type *, uchar, uchar);
 void                AscSetChipSDTR(PortAddr, uchar, uchar);
 int                 AscInitChipAllSynReg(ASC_DVC_VAR asc_ptr_type *, uchar);
-uchar               AscGetSynPeriodIndex(uchar);
-uchar               AscSynIndexToPeriod(uchar);
+uchar               AscGetSynPeriodIndex(ASC_DVC_VAR asc_ptr_type *, ruchar);
 uchar               AscAllocFreeQueue(PortAddr, uchar);
 uchar               AscAllocMultipleFreeQueue(PortAddr, uchar, uchar);
 int                 AscRiscHaltedAbortSRB(ASC_DVC_VAR asc_ptr_type *, ulong);
@@ -1944,7 +1870,6 @@
 int                 AscWaitTixISRDone(ASC_DVC_VAR asc_ptr_type *, uchar);
 int                 AscWaitISRDone(ASC_DVC_VAR asc_ptr_type *);
 ulong               AscGetOnePhyAddr(ASC_DVC_VAR asc_ptr_type *, uchar dosfar *, ulong);
-
 int                 AscSendScsiQueue(ASC_DVC_VAR asc_ptr_type * asc_dvc,
 									 ASC_SCSI_Q dosfar * scsiq,
 									 uchar n_q_required);
@@ -1960,10 +1885,8 @@
 ushort              AscInitQLinkVar(ASC_DVC_VAR asc_ptr_type *);
 int                 AscSetLibErrorCode(ASC_DVC_VAR asc_ptr_type *, ushort);
 int                 _AscWaitQDone(PortAddr, ASC_SCSI_Q dosfar *);
-
 int                 AscEnterCritical(void);
 void                AscLeaveCritical(int);
-
 int                 AscIsrChipHalted(ASC_DVC_VAR asc_ptr_type *);
 uchar               _AscCopyLramScsiDoneQ(PortAddr, ushort,
 										  ASC_QDONE_INFO dosfar *, ulong);
@@ -1971,7 +1894,6 @@
 ushort              AscIsrExeBusyQueue(ASC_DVC_VAR asc_ptr_type *, uchar);
 int                 AscScsiSetupCmdQ(ASC_DVC_VAR asc_ptr_type *, ASC_SCSI_REQ_Q dosfar *,
 									 uchar dosfar *, ulong);
-
 int                 AscScsiInquiry(ASC_DVC_VAR asc_ptr_type *, ASC_SCSI_REQ_Q dosfar *,
 								   uchar dosfar *, int);
 int                 AscScsiTestUnitReady(ASC_DVC_VAR asc_ptr_type *, ASC_SCSI_REQ_Q dosfar *);
@@ -1980,7 +1902,6 @@
 int                 AscScsiReadCapacity(ASC_DVC_VAR asc_ptr_type *,
 										ASC_SCSI_REQ_Q dosfar *,
 										uchar dosfar *);
-
 ulong dosfar       *swapfarbuf4(uchar dosfar *);
 int                 PollQueueDone(ASC_DVC_VAR asc_ptr_type *,
 								  ASC_SCSI_REQ_Q dosfar *,
@@ -1999,30 +1920,29 @@
 void                AscDispInquiry(uchar, uchar, ASC_SCSI_INQUIRY dosfar *);
 int                 AscPollQDone(ASC_DVC_VAR asc_ptr_type *,
 								 ASC_SCSI_REQ_Q dosfar *, int);
-
+int                 AscCompareString(uchar *, uchar *, int);
 int                 AscSetBIOSBank(PortAddr, int, ushort);
 int                 AscSetVlBIOSBank(PortAddr, int);
 int                 AscSetEisaBIOSBank(PortAddr, int);
 int                 AscSetIsaBIOSBank(PortAddr, int);
-
-int                 AscIsBiosEnabled(PortAddr, ushort);
-void                AscResetScsiBus(PortAddr);
+ushort              AscGetEisaChipCfg(PortAddr);
+ushort              AscGetEisaChipGpReg(PortAddr);
+ushort              AscSetEisaChipCfg(PortAddr, ushort);
+ushort              AscSetEisaChipGpReg(PortAddr, ushort);
+ulong               AscGetEisaProductID(PortAddr);
+PortAddr            AscSearchIOPortAddrEISA(PortAddr);
 void                AscClrResetScsiBus(PortAddr);
-
-void                AscSingleStepChip(PortAddr);
+uchar               AscGetChipScsiCtrl(PortAddr);
 uchar               AscSetChipScsiID(PortAddr, uchar);
-ushort              AscGetChipBiosAddress(PortAddr, ushort);
-ushort              AscSetChipBiosAddress(PortAddr, ushort, ushort);
 uchar               AscGetChipVersion(PortAddr, ushort);
 ushort              AscGetChipBusType(PortAddr);
-
+ulong               AscLoadMicroCode(PortAddr, ushort,
+									 ushort dosfar *, ushort);
+int                 AscFindSignature(PortAddr);
 PortAddr            AscSearchIOPortAddr11(PortAddr);
 PortAddr            AscSearchIOPortAddr100(PortAddr);
-int                 AscFindSignature(PortAddr);
 void                AscToggleIRQAct(PortAddr);
-int                 AscResetChip(PortAddr);
 void                AscClrResetChip(PortAddr);
-
 short               itos(ushort, uchar dosfar *, short, short);
 int                 insnchar(uchar dosfar *, short, short, ruchar, short);
 void                itoh(ushort, ruchar dosfar *);
@@ -2032,55 +1952,46 @@
 uchar dosfar       *tohstr(ushort, uchar dosfar *);
 uchar dosfar       *tobhstr(uchar, uchar dosfar *);
 uchar dosfar       *tolhstr(ulong, uchar dosfar *);
-
 void                AscSetISAPNPWaitForKey(void);
 uchar               AscGetChipIRQ(PortAddr, ushort);
 uchar               AscSetChipIRQ(PortAddr, uchar, ushort);
-uchar               AscGetChipScsiCtrl(PortAddr);
-
-ushort              AscGetEisaChipCfg(PortAddr);
-ushort              AscGetEisaChipGpReg(PortAddr);
-ushort              AscSetEisaChipCfg(PortAddr, ushort);
-ushort              AscSetEisaChipGpReg(PortAddr, ushort);
-
-ulong               AscGetEisaProductID(PortAddr);
-PortAddr            AscSearchIOPortAddrEISA(PortAddr);
-
+int                 AscIsBiosEnabled(PortAddr, ushort);
+int                 AscEnableBios(PortAddr, ushort);
+ushort              AscGetChipBiosAddress(PortAddr, ushort);
+ushort              AscSetChipBiosAddress(PortAddr, ushort, ushort);
+void                AscSingleStepChip(PortAddr);
 int                 AscPollQTailSync(PortAddr);
 int                 AscPollQHeadSync(PortAddr);
 int                 AscWaitQTailSync(PortAddr);
-
 int                 _AscRestoreMicroCode(PortAddr, ASC_MC_SAVED dosfar *);
-
 int                 AscSCAM(ASC_DVC_VAR asc_ptr_type *);
-
 ushort              SwapByteOfWord(ushort word_val);
 ulong               SwapWordOfDWord(ulong dword_val);
 ulong               AdjEndianDword(ulong dword_val);
-
 int                 AscAdjEndianScsiQ(ASC_SCSI_Q dosfar *);
 int                 AscAdjEndianQDoneInfo(ASC_QDONE_INFO dosfar *);
-
+int                 AscCoalesceSgList(ASC_SCSI_Q dosfar *);
 extern int          DvcEnterCritical(void);
 extern void         DvcLeaveCritical(int);
-
+extern void         DvcSetMemory(uchar dosfar *, uint, uchar);
+extern void         DvcCopyMemory(uchar dosfar *, uchar dosfar *, uint);
 extern void         DvcInPortWords(PortAddr, ushort dosfar *, int);
 extern void         DvcOutPortWords(PortAddr, ushort dosfar *, int);
 extern void         DvcOutPortDWords(PortAddr, ulong dosfar *, int);
-
+extern uchar        DvcReadPCIConfigByte(ASC_DVC_VAR asc_ptr_type *, ushort);
+extern void         DvcWritePCIConfigByte(ASC_DVC_VAR asc_ptr_type *, ushort, uchar);
+ushort 				AscGetChipBiosAddress(PortAddr, ushort);
 extern void         DvcSleepMilliSecond(ulong);
+extern void         DvcDelayNanoSecond(ASC_DVC_VAR asc_ptr_type *, ulong);
 extern void         DvcDisplayString(uchar dosfar *);
 extern ulong        DvcGetPhyAddr(uchar dosfar * buf_addr, ulong buf_len);
 extern ulong        DvcGetSGList(ASC_DVC_VAR asc_ptr_type *, uchar dosfar *, ulong,
 								 ASC_SG_HEAD dosfar *);
-
 extern void         DvcSCAMDelayMS(ulong);
 extern int          DvcDisableCPUInterrupt(void);
 extern void         DvcRestoreCPUInterrupt(int);
-
 void                DvcPutScsiQ(PortAddr, ushort, ushort dosfar *, int);
 void                DvcGetQinfo(PortAddr, ushort, ushort dosfar *, int);
-
 PortAddr            AscSearchIOPortAddr(PortAddr, ushort);
 ushort              AscInitGetConfig(ASC_DVC_VAR asc_ptr_type *);
 ushort              AscInitSetConfig(ASC_DVC_VAR asc_ptr_type *);
@@ -2097,34 +2008,27 @@
 									  ASC_SCSI_INQUIRY dosfar *,
 									  ASC_CAP_INFO dosfar *);
 int                 AscExeScsiQueue(ASC_DVC_VAR asc_ptr_type *, ASC_SCSI_Q dosfar *);
-
 int                 AscISR(ASC_DVC_VAR asc_ptr_type *);
 void                AscISR_AckInterrupt(ASC_DVC_VAR asc_ptr_type *);
 int                 AscISR_CheckQDone(ASC_DVC_VAR asc_ptr_type *,
 									  ASC_QDONE_INFO dosfar *,
 									  uchar dosfar *);
-
 int                 AscStartUnit(ASC_DVC_VAR asc_ptr_type *, ASC_SCSI_TIX_TYPE);
 int                 AscStopUnit(
 								   ASC_DVC_VAR asc_ptr_type * asc_dvc,
 								   ASC_SCSI_TIX_TYPE target_ix
 );
-
 uint                AscGetNumOfFreeQueue(ASC_DVC_VAR asc_ptr_type *, uchar, uchar);
 int                 AscSgListToQueue(int);
 int                 AscQueueToSgList(int);
 int                 AscSetDvcErrorCode(ASC_DVC_VAR asc_ptr_type *, uchar);
-
 int                 AscAbortSRB(ASC_DVC_VAR asc_ptr_type *, ulong);
 int                 AscResetDevice(ASC_DVC_VAR asc_ptr_type *, uchar);
 int                 AscResetSB(ASC_DVC_VAR asc_ptr_type *);
-
 void                AscEnableIsaDma(uchar);
 void                AscDisableIsaDma(uchar);
-
 ulong               AscGetMaxDmaAddress(ushort);
 ulong               AscGetMaxDmaCount(ushort);
-
 int                 AscSaveMicroCode(ASC_DVC_VAR asc_ptr_type *, ASC_MC_SAVED dosfar *);
 int                 AscRestoreOldMicroCode(ASC_DVC_VAR asc_ptr_type *, ASC_MC_SAVED dosfar *);
 int                 AscRestoreNewMicroCode(ASC_DVC_VAR asc_ptr_type *, ASC_MC_SAVED dosfar *);
@@ -2148,13 +2052,27 @@
 #define ASC_NUM_BUS				4
 
 /* Reference Scsi_Host hostdata */
-#define ASC_BOARD(host) ((struct asc_board *) &(host)->hostdata)
+#define ASC_BOARDP(host) ((struct asc_board *) &((host)->hostdata))
 
-#define NO_ISA_DMA	0xff		/* No ISA DMA Channel Used */
+#define NO_ISA_DMA				0xff		/* No ISA DMA Channel Used */
 
-#ifndef min
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-#endif /* min */
+#define ASC_INFO_SIZE			128			/* advansys_info() line size */
+
+/* /proc/scsi/advansys/[0...] related definitions */
+#define ASC_PRTBUF_SIZE			1024
+#define ASC_PRTLINE_SIZE		160
+
+#define ASC_PRT_NEXT() \
+	if (cp) { \
+		totlen += len; \
+		leftlen -= len; \
+		if (leftlen == 0) { \
+			return totlen; \
+		} \
+		cp += len; \
+	}
+
+#define ASC_MIN(a, b) (((a) < (b)) ? (a) : (b))
 
 /* Asc Library return codes */
 #define ASC_TRUE		1
@@ -2169,17 +2087,23 @@
 #define HOST_BYTE(byte)		((byte) << 16)
 #define DRIVER_BYTE(byte)	((byte) << 24)
 
+/*
+ * REQ and REQP are the generic name for a SCSI request block and pointer.
+ * REQPTID(reqp) returns reqp's target id.
+ * REQPNEXT(reqp) returns reqp's next pointer.
+ * REQPNEXTP(reqp) returns a pointer to reqp's next pointer.
+ */
+typedef Scsi_Cmnd			REQ, *REQP;
+#define REQPNEXT(reqp)		((REQP) ((reqp)->host_scribble))
+#define REQPNEXTP(reqp)		((REQP *) &((reqp)->host_scribble))
+#define REQPTID(reqp)		((reqp)->target)
+
 /* asc_enqueue() flags */
 #define ASC_FRONT		1
 #define ASC_BACK		2
 
 /* PCI configuration declarations */
 
-#define ASC_PCI_REV_A_INIT		0x01
-#define ASC_PCI_REV_A_DONE		0x02
-#define ASC_PCI_REV_B_INIT		0x04
-#define ASC_PCI_REV_B_DONE		0x08
-
 #define PCI_BASE_CLASS_PREDEFINED			0x00
 #define PCI_BASE_CLASS_MASS_STORAGE			0x01
 #define PCI_BASE_CLASS_NETWORK				0x02
@@ -2227,8 +2151,11 @@
 
 #define PCI_MAX_SLOT			0x1F
 #define PCI_MAX_BUS				0xFF
-#define ASC_PCI_VENDORID		0x10CD
 #define PCI_IOADDRESS_MASK		0xFFFE
+#define ASC_PCI_VENDORID		0x10CD
+#define ASC_PCI_DEVICE_ID_1100	0x1100
+#define ASC_PCI_DEVICE_ID_1200	0x1200
+#define ASC_PCI_DEVICE_ID_1300	0x1300
 
 /* PCI IO Port Addresses to generate special cycle */
 
@@ -2249,18 +2176,54 @@
 #define VENDORID_OFFSET		0x00
 #define DEVICEID_OFFSET		0x02
 
-/*
- * --- Driver Macros
- */
-
 #ifndef ADVANSYS_STATS
-#define ASC_STATS(counter)
-#define ASC_STATS_ADD(counter, count)
+#define ASC_STATS(shp, counter)
+#define ASC_STATS_ADD(shp, counter, count)
 #else /* ADVANSYS_STATS */
-#define ASC_STATS(counter)				asc_stats.counter++
-#define ASC_STATS_ADD(counter, count)	asc_stats.counter += (count)
+#define ASC_STATS(shp, counter) \
+	(ASC_BOARDP(shp)->asc_stats.counter++)
+
+#define ASC_STATS_ADD(shp, counter, count) \
+	(ASC_BOARDP(shp)->asc_stats.counter += (count))
 #endif /* ADVANSYS_STATS */
 
+#define ASC_CEILING(val, unit) (((val) + ((unit) - 1))/(unit))
+#define ASC_TENTHS(num, den) ((((num) * 10)/(den)) - (10 * ((num)/(den))))
+
+/*
+ * Display a message to the console.
+ */
+#define ASC_PRINT(s) \
+	{ \
+		printk("advansys: "); \
+		printk(s); \
+	}
+
+#define ASC_PRINT1(s, a1) \
+	{ \
+		printk("advansys: "); \
+		printk((s), (a1)); \
+	}
+
+#define ASC_PRINT2(s, a1, a2) \
+	{ \
+		printk("advansys: "); \
+		printk((s), (a1), (a2)); \
+	}
+
+#define ASC_PRINT3(s, a1, a2, a3) \
+	{ \
+		printk("advansys: "); \
+		printk((s), (a1), (a2), (a3)); \
+	}
+
+#define ASC_PRINT4(s, a1, a2, a3, a4) \
+	{ \
+		printk("advansys: "); \
+		printk((s), (a1), (a2), (a3), (a4)); \
+	}
+
+
 #ifndef ADVANSYS_DEBUG
 
 #define	ASC_DBG(lvl, s)
@@ -2388,6 +2351,48 @@
  * --- Driver Structures
  */
 
+#ifdef ADVANSYS_STATS
+
+/* Per board statistics structure */
+struct asc_stats {
+	/* Driver Entrypoint Statistics */
+	ulong 	command;		/* # calls to advansys_command() */
+	ulong 	queuecommand;	/* # calls to advansys_queuecommand() */
+	ulong 	abort;			/* # calls to advansys_abort() */
+	ulong 	reset;			/* # calls to advansys_reset() */
+	ulong 	biosparam;		/* # calls to advansys_biosparam() */
+	ulong 	check_interrupt;/* # advansys_interrupt() check pending calls */
+	ulong 	interrupt;		/* # advansys_interrupt() interrupts */
+	ulong 	callback;		/* # calls asc_isr_callback() */
+	/* AscExeScsiQueue() Statistics */
+	ulong 	asc_noerror;	/* # AscExeScsiQueue() ASC_NOERROR returns. */
+	ulong 	asc_busy;		/* # AscExeScsiQueue() ASC_BUSY returns. */
+	ulong 	asc_error;		/* # AscExeScsiQueue() ASC_ERROR returns. */
+	ulong 	asc_unknown;	/* # AscExeScsiQueue() unknown returns. */
+	/* Data Transfer Statistics */
+	ulong 	cont_cnt;		/* # non-scatter-gather I/O requests received */
+	ulong 	cont_xfer;		/* # contiguous transfer 512-bytes */
+	ulong 	sg_cnt;			/* # scatter-gather I/O requests received */
+	ulong 	sg_elem;		/* # scatter-gather elements */
+	ulong 	sg_xfer;		/* # scatter-gather tranfer 512-bytes */
+	/* Device SCSI Command Queuing Statistics */
+	ASC_SCSI_BIT_ID_TYPE queue_full;
+	ushort	queue_full_cnt[ASC_MAX_TID+1];
+};
+#endif /* ADVANSYS_STATS */
+
+/*
+ * Request queuing structure
+ */
+typedef struct asc_queue {
+	ASC_SCSI_BIT_ID_TYPE	tidmask;				  /* queue mask */
+	REQP					queue[ASC_MAX_TID+1];	  /* queue linked list */
+#ifdef ADVANSYS_STATS
+	short					cur_count[ASC_MAX_TID+1]; /* current queue count */
+	short					max_count[ASC_MAX_TID+1]; /* maximum queue count */
+#endif /* ADVANSYS_STATS */
+} asc_queue_t;
+
 /*
  * Structure allocated for each board.
  *
@@ -2396,18 +2401,26 @@
  * field. It is guaranteed to be allocated from DMA-able memory.
  */
 struct asc_board {
+	int				 	 id;					  /* Board Id */
 	/* Asc Library */
-	ASC_DVC_VAR			 board;					/* Board configuration */
-	ASC_DVC_CFG			 cfg;					/* Device configuration */
-	uchar				 overrun_buf[ASC_OVERRUN_BSIZE];
+	ASC_DVC_VAR			 asc_dvc_var;			  /* Board configuration */
+	ASC_DVC_CFG			 asc_dvc_cfg;			  /* Device configuration */
 	/* Queued Commands */
-	ASC_SCSI_BIT_ID_TYPE pending_tidmask;		/* Pending command mask */
-	Scsi_Cmnd			 *pending[ASC_MAX_TID];
+	asc_queue_t			 active;				  /* Active command queue */
+	asc_queue_t			 pending;		  		  /* Pending command queue */
 	/* Target Initialization */
-	ASC_SCSI_BIT_ID_TYPE init_tidmask;			/* Target initialized mask */
+	ASC_SCSI_BIT_ID_TYPE init_tidmask;			  /* Target initialized mask */
 	ASC_SCSI_REQ_Q		 scsireqq;
 	ASC_CAP_INFO		 cap_info;
 	ASC_SCSI_INQUIRY	 inquiry;
+	ASCEEP_CONFIG		 eep_config;			  /* EEPROM configuration */
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+	/* /proc/scsi/advansys/[0...] */
+	char				 *prtbuf;				  /* Statistics Print Buffer */
+#endif /* version >= v1.3.0 */
+#ifdef ADVANSYS_STATS
+	struct asc_stats	 asc_stats;				  /* Board statistics */
+#endif /* ADVANSYS_STATS */
 };
 
 /*
@@ -2459,48 +2472,14 @@
 	uchar	maxLatency;
 } PCI_CONFIG_SPACE;
 
-#ifdef ADVANSYS_STATS
-struct asc_stats {
-	ulong 	command;		/* # calls to advansys_command() */
-	ulong 	queuecommand;	/* # calls to advansys_queuecommand() */
-	ulong 	abort;			/* # calls to advansys_abort() */
-	ulong 	reset;			/* # calls to advansys_reset() */
-	ulong 	biosparam;		/* # calls to advansys_biosparam() */
-	ulong 	interrupt;		/* # calls to advansys_interrupt() */
-	ulong 	callback;		/* # calls asc_isr_callback() */
-	ulong 	cont_cnt;		/* # non-scatter-gather I/O requests received */
-	ulong 	cont_xfer;		/* contiguous transfer total (512 byte units) */
-	ulong 	sg_cnt;			/* # scatter-gather I/O requests received */
-	ulong 	sg_elem;		/* scatter-gather element total */
-	ulong 	sg_xfer;		/* scatter-gather transfer total (512 byte units) */
-	ulong 	error;			/* # AscExeScsiQueue() ASC_ERROR returns. */
-	/*
-	 * Number of times interrupts disabled in advansys_queuecommand() and
-	 * asc_isr_callback(), respectively. For the former indicates how many
-	 * times commands were pending when a new command was received.
-	 */
-	ulong 	cmd_disable;
-	ulong 	intr_disable;
-	/*
-	 * Number of times asc_enqueue() called. Indicates how many ASC_BUSY
-	 * returns have occurred.
-	 */
-	ulong 	enqueue;
-	ulong 	dequeue;		/* # calls to asc_dequeue(). */
-	/*
-	 * Number of times asc_rmqueue() called and the specified command
-	 * was found and removed.
-	 */
-	ulong 	rmqueue;
-} asc_stats;
-#endif /* ADVANSYS_STATS */
-
 
 /*
  * --- Driver Data
  */
 
-#ifdef LINUX_1_3
+/* Note: All driver global data should be initialized. */
+
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
 struct proc_dir_entry proc_scsi_advansys =
 {
 	PROC_SCSI_ADVANSYS,				/* unsigned short low_ino */
@@ -2509,12 +2488,19 @@
 	S_IFDIR | S_IRUGO | S_IXUGO,	/* mode_t mode */
 	2								/* nlink_t nlink */
 };
-#endif /* LINUX_1_3 */
+#endif /* version >= v1.3.0 */
+
+/* Number of boards detected in system. */
+STATIC int asc_board_count = 0;
+STATIC struct Scsi_Host	*asc_host[ASC_NUM_BOARD_SUPPORTED] = { 0 };
 
-STATIC int asc_board_count; /* Number of boards detected in system. */
-STATIC struct Scsi_Host	*asc_host[ASC_NUM_BOARD_SUPPORTED];
-STATIC Scsi_Cmnd *asc_scsi_done; /* Commands needing done function call. */
+/* Global list of commands needing done function. */
+STATIC Scsi_Cmnd *asc_scsi_done = NULL;
 
+/* Overrun buffer shared between all boards. */
+STATIC uchar overrun_buf[ASC_OVERRUN_BSIZE] = { 0 };
+
+/* List of supported bus types. */
 STATIC ushort asc_bus[ASC_NUM_BUS] = {
 	ASC_IS_ISA,
 	ASC_IS_VL,
@@ -2522,6 +2508,8 @@
 	ASC_IS_PCI,
 };
 
+STATIC int pci_scan_method = -1;
+
 /*
  * Used with the LILO 'advansys' option to eliminate or
  * limit I/O port probing at boot time, cf. advansys_setup().
@@ -2548,45 +2536,55 @@
  * advansys.h contains function prototypes for functions global to Linux.
  */
 
-#ifdef LINUX_1_3
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
 STATIC int			asc_proc_copy(off_t, off_t, char *, int , char *, int);
-#endif /* LINUX_1_3 */
-#ifdef LINUX_1_2
+#endif /* version >= v1.3.0 */
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,70)
 STATIC void 		advansys_interrupt(int, struct pt_regs *);
-#else /* LINUX_1_3 */
+#else /* version >= v1.3.70 */
 STATIC void 		advansys_interrupt(int, void *, struct pt_regs *);
-#endif /* LINUX_1_3 */
+#endif /* version >= v1.3.70 */
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+STATIC void 		advansys_select_queue_depths(struct Scsi_Host *,
+												Scsi_Device *);
+#endif /* version >= v1.3.89 */
 STATIC void 		advansys_command_done(Scsi_Cmnd *);
 STATIC int 			asc_execute_scsi_cmnd(Scsi_Cmnd *);
 STATIC void 		asc_isr_callback(ASC_DVC_VAR *, ASC_QDONE_INFO *);
-STATIC void			asc_execute_pending(struct Scsi_Host *);
 STATIC int 			asc_init_dev(ASC_DVC_VAR *, Scsi_Cmnd *);
 STATIC int 			asc_srch_pci_dev(PCI_DEVICE *);
-STATIC uchar 		asc_scan_method(PCI_DEVICE *);
+STATIC uchar 		asc_scan_method(void);
 STATIC int 			asc_pci_find_dev(PCI_DEVICE *);
 STATIC void 		asc_get_pci_cfg(PCI_DEVICE *, PCI_CONFIG_SPACE *);
 STATIC ushort 		asc_get_cfg_word(PCI_DATA *);
 STATIC uchar 		asc_get_cfg_byte(PCI_DATA *);
-STATIC void			asc_enqueue(struct Scsi_Host *, Scsi_Cmnd *, int, int);
-STATIC Scsi_Cmnd 	*asc_dequeue(struct Scsi_Host *, int);
-STATIC int 			asc_rmqueue(struct Scsi_Host *, Scsi_Cmnd *, int);
+STATIC void 		asc_put_cfg_byte(PCI_DATA *, uchar);
+void				asc_enqueue(asc_queue_t *, REQP, int);
+REQP 				asc_dequeue(asc_queue_t *, int);
+int					asc_rmqueue(asc_queue_t *, REQP);
+int					asc_isqueued(asc_queue_t *, REQP);
+void				asc_execute_queue(asc_queue_t *);
+STATIC int			asc_prt_board_devices(struct Scsi_Host *, char *, int);
+STATIC int			asc_prt_board_eeprom(struct Scsi_Host *, char *, int);
+STATIC int			asc_prt_board_info(struct Scsi_Host *, char *, int);
+STATIC int			asc_proc_copy(off_t, off_t, char *, int , char *, int);
+STATIC int			asc_prt_line(char *, int, char *fmt, ...);
 
 /* XXX - Asc Library Routines not supposed to be used directly */
-ushort 			AscGetChipBiosAddress(PortAddr, ushort);
-int             AscFindSignature(PortAddr);
+int             	AscFindSignature(PortAddr);
+ushort          	AscGetEEPConfig(PortAddr, ASCEEP_CONFIG *, ushort);
 
 #ifdef ADVANSYS_STATS
-STATIC int		asc_prt_stats(char *, int);
-STATIC int		asc_prt_stats_line(char *, int, char *fmt, ...);
+STATIC int			asc_prt_board_stats(struct Scsi_Host *, char *, int);
 #endif /* ADVANSYS_STATS */
 #ifdef ADVANSYS_DEBUG
-STATIC void 	asc_prt_scsi_host(struct Scsi_Host *);
-STATIC void 	asc_prt_dvc_cfg(ASC_DVC_CFG *);
-STATIC void 	asc_prt_dvc_var(ASC_DVC_VAR *);
-STATIC void 	asc_prt_scsi_q(ASC_SCSI_Q *);
-STATIC void 	asc_prt_qdone_info(ASC_QDONE_INFO *);
-STATIC void 	asc_prt_hex(char *f, uchar *, int);
-STATIC int 		interrupts_enabled(void);
+STATIC void 		asc_prt_scsi_host(struct Scsi_Host *);
+STATIC void 		asc_prt_dvc_cfg(ASC_DVC_CFG *);
+STATIC void 		asc_prt_dvc_var(ASC_DVC_VAR *);
+STATIC void 		asc_prt_scsi_q(ASC_SCSI_Q *);
+STATIC void 		asc_prt_qdone_info(ASC_QDONE_INFO *);
+STATIC void 		asc_prt_hex(char *f, uchar *, int);
+STATIC int 			interrupts_enabled(void);
 #endif /* ADVANSYS_DEBUG */
 
 
@@ -2594,25 +2592,33 @@
  * --- Linux 'Scsi_Host_Template' and advansys_setup() Functions
  */
 
-#ifdef LINUX_1_3
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
 /*
  * advansys_proc_info() - /proc/scsi/advansys/[0-(ASC_NUM_BOARD_SUPPORTED-1)]
  *
  * *buffer: I/O buffer
  * **start: if inout == FALSE pointer into buffer where user read should start
- * offset: current offset into /proc/scsi/advansys file
+ * offset: current offset into a /proc/scsi/advansys/[0...] file
  * length: length of buffer
  * hostno: Scsi_Host host_no
  * inout: TRUE - user is writing; FALSE - user is reading
  *
- * Return the number of bytes read from or written to
- * /proc/scsi/advansys file.
+ * Return the number of bytes read from or written to a
+ * /proc/scsi/advansys/[0...] file.
+ *
+ * Note: This function uses the per board buffer 'prtbuf' which is
+ * allocated when the board is initialized in advansys_detect(). The
+ * buffer is ASC_PRTBUF_SIZE bytes. The function asc_proc_copy() is
+ * used to write to the buffer. The way asc_proc_copy() is written
+ * if 'prtbuf' is too small it will not be overwritten. Instead the
+ * user just won't get all the available statistics.
  */
 int
 advansys_proc_info(char *buffer, char **start, off_t offset, int length, 
 				   int hostno, int inout)
 {
 	struct Scsi_Host	*shp;
+	struct asc_board	*boardp;
 	int					i;
 	char				*cp;
 	int					cplen;
@@ -2622,7 +2628,6 @@
 	char				*curbuf;
 	off_t				advoffset;
     Scsi_Device			*scd;
-	char				prtbuf[480];	/* 6 lines */
 
 	ASC_DBG(1, "advansys_proc_info: begin\n");
 
@@ -2634,7 +2639,7 @@
 	}
 
 	/*
-	 * User read of /proc/scsi/advansys file.
+	 * User read of /proc/scsi/advansys/[0...] file.
 	 */
 
 	/* Find the specified board. */
@@ -2646,21 +2651,25 @@
 	if (i == asc_board_count) {
 		return(-ENOENT);
 	}
+
 	shp = asc_host[i];
+	boardp = ASC_BOARDP(shp);
 
-	/* Always copy read data to the beginning of the buffer. */
+	/* Copy read data starting at the beginning of the buffer. */
 	*start = buffer;
-
 	curbuf = buffer;
 	advoffset = 0;
 	totcnt = 0;
 	leftlen = length;
 
-	/* Get board information. */
+	/*
+	 * Get board configuration information.
+	 *
+	 * advansys_info() returns the board string from its own static buffer.
+	 */
 	cp = (char *) advansys_info(shp);
 	strcat(cp, "\n");
 	cplen = strlen(cp);
-
 	/* Copy board information. */
 	cnt = asc_proc_copy(advoffset, offset, curbuf, leftlen, cp, cplen);
 	totcnt += cnt;
@@ -2673,11 +2682,11 @@
 	curbuf += cnt;
 
 	/*
-	 * Get and copy information for each device attached to the board.
+	 * Display driver information for each device attached to the board.
 	 */
-	cp = &prtbuf[0];
-	sprintf(cp, "\nDevices attached to SCSI Host %d:\n", shp->host_no);
-	cplen = strlen(cp);
+	cp = boardp->prtbuf;
+	cplen = asc_prt_board_devices(shp, cp, ASC_PRTBUF_SIZE);
+	ASC_ASSERT(cplen < ASC_PRTBUF_SIZE);
 	cnt = asc_proc_copy(advoffset, offset, curbuf, leftlen, cp, cplen);
 	totcnt += cnt;
 	leftlen -= cnt;
@@ -2688,10 +2697,19 @@
 	advoffset += cplen;
 	curbuf += cnt;
 
-	cp = &prtbuf[0];
+	/*
+	 * Display target driver information for each device attached
+	 * to the board.
+	 */
     for (scd = scsi_devices; scd; scd = scd->next) {
 		if (scd->host == shp) {
+			cp = boardp->prtbuf;
+			/*
+			 * Note: If proc_print_scsidevice() writes more than
+			 * ASC_PRTBUF_SIZE bytes, it will overrun 'prtbuf'.
+			 */
 	    	proc_print_scsidevice(scd, cp, &cplen, 0);
+			ASC_ASSERT(cplen < ASC_PRTBUF_SIZE);
 			cnt = asc_proc_copy(advoffset, offset, curbuf, leftlen, cp, cplen);
 			totcnt += cnt;
 			leftlen -= cnt;
@@ -2704,15 +2722,29 @@
 		}
     }
     
+	/*
+	 * Display EEPROM configuration for the board.
+	 */
+	cp = boardp->prtbuf;
+	cplen = asc_prt_board_eeprom(shp, cp, ASC_PRTBUF_SIZE);
+	ASC_ASSERT(cplen < ASC_PRTBUF_SIZE);
+	cnt = asc_proc_copy(advoffset, offset, curbuf, leftlen, cp, cplen);
+	totcnt += cnt;
+	leftlen -= cnt;
+	if (leftlen == 0) {
+		ASC_DBG1(1, "advansys_proc_info: totcnt %d\n", totcnt);
+		return totcnt;
+	}
+	advoffset += cplen;
+	curbuf += cnt;
+
 #ifdef ADVANSYS_STATS
 	/*
-	 * prtbuf[] has about 6 lines worth of space. If the statistics ever
-	 * get longer than 6 lines, prtbuf[] should be increased in size. If
-	 * prtbuf[] is too small it will not be overwritten. Instead the user
-	 * just won't get all of the available statistics.
+	 * Display driver statistics for the board.
 	 */
-	cp = &prtbuf[0];
-	cplen = asc_prt_stats(cp, sizeof(prtbuf));
+	cp = boardp->prtbuf;
+	cplen = asc_prt_board_stats(shp, cp, ASC_PRTBUF_SIZE);
+	ASC_ASSERT(cplen < ASC_PRTBUF_SIZE);
 	cnt = asc_proc_copy(advoffset, offset, curbuf, leftlen, cp, cplen);
 	totcnt += cnt;
 	leftlen -= cnt;
@@ -2724,11 +2756,28 @@
 	curbuf += cnt;
 #endif /* ADVANSYS_STATS */
 
+	/*
+	 * Display Asc Library dynamic configuration information
+	 * for the board.
+	 */
+	cp = boardp->prtbuf;
+	cplen = asc_prt_board_info(shp, cp, ASC_PRTBUF_SIZE);
+	ASC_ASSERT(cplen < ASC_PRTBUF_SIZE);
+	cnt = asc_proc_copy(advoffset, offset, curbuf, leftlen, cp, cplen);
+	totcnt += cnt;
+	leftlen -= cnt;
+	if (leftlen == 0) {
+		ASC_DBG1(1, "advansys_proc_info: totcnt %d\n", totcnt);
+		return totcnt;
+	}
+	advoffset += cplen;
+	curbuf += cnt;
+
 	ASC_DBG1(1, "advansys_proc_info: totcnt %d\n", totcnt);
 
 	return totcnt;
 }
-#endif /* LINUX_1_3 */
+#endif /* version >= v1.3.0 */
 
 
 /*
@@ -2751,8 +2800,10 @@
 	int					iop;
 	int					bus;
 	struct Scsi_Host	*shp;
-	ASC_DVC_VAR			*boardp;
+	struct asc_board	*boardp;
+	ASC_DVC_VAR			*asc_dvc_varp;
 	int					ioport = 0;
+	int					share_irq = FALSE;
 	PCI_DEVICE			pciDevice;
 	PCI_CONFIG_SPACE	pciConfig;
 	int					ret;
@@ -2762,19 +2813,15 @@
 	if (detect_called == ASC_FALSE) {
 		detect_called = ASC_TRUE;
 	} else {
-		printk("AdvanSys SCSI: advansys_detect() multiple calls ignored\n");
+		printk("AdvanSys SCSI: advansys_detect() mulitple calls ignored\n");
 		return 0;
 	}
 
 	ASC_DBG(1, "advansys_detect: begin\n");
 
-#ifdef LINUX_1_3
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
 	tpnt->proc_dir = &proc_scsi_advansys;
-#endif /* LINUX_1_3 */
-
-#ifdef ADVANSYS_STATS
-	memset(&asc_stats, 0, sizeof(asc_stats));
-#endif /* ADVANSYS_STATS */
+#endif /* version >= v1.3.0 */
 
 	asc_board_count = 0;
 
@@ -2899,7 +2946,8 @@
 				break;
 
 			default:
-				ASC_DBG(0, "advansys_detect: unknown bus type\n");
+				ASC_PRINT1("advansys_detect: unknown bus type: %d\n",
+					asc_bus[bus]);
 				break;
 			}
 			ASC_DBG1(1, "advansys_detect: iop %x\n", iop);
@@ -2920,106 +2968,192 @@
 			ASC_DBG(2, "advansys_detect: scsi_register()\n");
 			shp = scsi_register(tpnt, sizeof(struct asc_board));
 
-			/* Save a pointer to the Scsi_host of each found board. */
+			/* Save a pointer to the Scsi_host of each board found. */
 			asc_host[asc_board_count++] = shp;
 
 			/* Initialize private per board data */
-			memset(ASC_BOARD(shp), 0, sizeof(struct asc_board));
-			boardp = &ASC_BOARD(shp)->board;
-			boardp->cfg = &ASC_BOARD(shp)->cfg;
-			boardp->cfg->overrun_buf = &ASC_BOARD(shp)->overrun_buf[0];
-			boardp->iop_base = iop;
+			boardp = ASC_BOARDP(shp);
+			memset(boardp, 0, sizeof(struct asc_board));
+			boardp->id = asc_board_count - 1;
+			asc_dvc_varp = &boardp->asc_dvc_var;
+			asc_dvc_varp->cfg = &boardp->asc_dvc_cfg;
+			asc_dvc_varp->cfg->overrun_buf = &overrun_buf[0];
+			asc_dvc_varp->iop_base = iop;
+
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+			if ((boardp->prtbuf =
+				kmalloc(ASC_PRTBUF_SIZE, GFP_ATOMIC)) == NULL) {
+				ASC_PRINT3(
+"advansys_detect: Board %d: kmalloc(%d, %d) returned NULL\n",
+					boardp->id, ASC_PRTBUF_SIZE, GFP_ATOMIC);
+				scsi_unregister(shp);
+				asc_board_count--;
+				continue;
+			}
+#endif /* version >= v1.3.0 */
 
 			/*
 			 * Set the board bus type and PCI IRQ for AscInitGetConfig().
 			 */
-			boardp->bus_type = asc_bus[bus];
-			switch (boardp->bus_type) {
+			asc_dvc_varp->bus_type = asc_bus[bus];
+			switch (asc_dvc_varp->bus_type) {
 			case ASC_IS_ISA:
 				shp->unchecked_isa_dma = TRUE;
+				share_irq = FALSE;
 				break;
-			case ASC_IS_EISA:
+			case ASC_IS_VL:
 				shp->unchecked_isa_dma = FALSE;
+				share_irq = FALSE;
 				break;
-			case ASC_IS_VL:
+			case ASC_IS_EISA:
 				shp->unchecked_isa_dma = FALSE;
+				share_irq = TRUE;
 				break;
 			case ASC_IS_PCI:
-				shp->irq = boardp->irq_no = pciConfig.irqLine;
-				boardp->cfg->pci_device_id = pciConfig.deviceID;
+				shp->irq = asc_dvc_varp->irq_no = pciConfig.irqLine;
+				asc_dvc_varp->cfg->pci_device_id = pciConfig.deviceID;
+				asc_dvc_varp->cfg->pci_slot_info =
+						ASC_PCI_MKID(pciDevice.busNumber,
+									 pciDevice.slotFound,
+									 pciDevice.devFunc);
 				shp->unchecked_isa_dma = FALSE;
+				share_irq = TRUE;
 				break;
 			default:
-				ASC_DBG(0, "advansys_detect: unknown adapter type");
+				ASC_PRINT2(
+"advansys_detect: Board %d: unknown adapter type: %d",
+					boardp->id, asc_dvc_varp->bus_type);
 				shp->unchecked_isa_dma = TRUE;
+				share_irq = FALSE;
 				break;
 			}
 
 			/*
-			 * Get the board configuration.  AscInitGetConfig() may change
-			 * the board's bus_type value. The asc_bus[bus] value should no
-			 * longer be used.
+			 * Get the board configuration.
+			 *
+			 * AscInitGetConfig() may change the board's bus_type value.
+			 * The asc_bus[bus] value should no longer be used. If the
+			 * bus_type field must be referenced only use the bit-wise
+			 * AND operator "&".
 			 */
 			ASC_DBG(2, "advansys_detect: AscInitGetConfig()\n");
-			switch(ret = AscInitGetConfig(boardp)) {
+			switch(ret = AscInitGetConfig(asc_dvc_varp)) {
 			case 0:	/* No error */
 				break;
 			case ASC_WARN_IO_PORT_ROTATE:
-				ASC_DBG(0, "AscInitGetConfig: I/O port address modified\n");
+				ASC_PRINT1(
+"AscInitGetConfig: Board: %d: I/O port address modified\n",
+					boardp->id);
+				break;
+			case ASC_WARN_AUTO_CONFIG:
+				ASC_PRINT1(
+"AscInitGetConfig: Board %d: I/O port increment switch enabled\n",
+					boardp->id);
 				break;
 			case ASC_WARN_EEPROM_CHKSUM:
-				ASC_DBG(0, "AscInitGetConfig: EEPROM checksum error\n");
+				ASC_PRINT1(
+"AscInitGetConfig: Board %d: EEPROM checksum error\n",
+					boardp->id);
 				break;
 			case ASC_WARN_IRQ_MODIFIED:
-				ASC_DBG(0, "AscInitGetConfig: IRQ modified\n");
+				ASC_PRINT1(
+"AscInitGetConfig: Board %d: IRQ modified\n",
+					boardp->id);
 				break;
 			case ASC_WARN_CMD_QNG_CONFLICT:
-				ASC_DBG(0,
-					"AscInitGetConfig: Tag queuing enabled w/o disconnects\n");
+				ASC_PRINT1(
+"AscInitGetConfig: Board %d: tag queuing enabled w/o disconnects\n",
+					boardp->id);
 				break;
 			default:
-				ASC_DBG1(0, "AscInitGetConfig: Unknown warning: %x\n", ret);
+				ASC_PRINT2(
+"AscInitGetConfig: Board %d: unknown warning: %x\n",
+					boardp->id, ret);
 				break;
 			}
-			if (boardp->err_code != 0) {
-				ASC_DBG2(0,
-					"AscInitGetConfig: error: init_state %x, err_code %x\n",
-					boardp->init_state, boardp->err_code);
+			if (asc_dvc_varp->err_code != 0) {
+				ASC_PRINT3(
+"AscInitGetConfig: Board %d error: init_state %x, err_code %x\n",
+					boardp->id, asc_dvc_varp->init_state,
+					asc_dvc_varp->err_code);
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+				kfree(boardp->prtbuf);
+#endif /* version >= v1.3.0 */
 				scsi_unregister(shp);
 				asc_board_count--;
 				continue;
 			}
 
 			/*
+			 * Set the adapter's target id bit in the init_tidmask field.
+			 */
+			boardp->init_tidmask |=
+				ASC_TIX_TO_TARGET_ID(asc_dvc_varp->cfg->chip_scsi_id);
+
+			/*
+			 * Save EEPROM settings for the board.
+			 */
+			boardp->eep_config.init_sdtr = asc_dvc_varp->init_sdtr;
+			boardp->eep_config.disc_enable = asc_dvc_varp->cfg->disc_enable;
+			boardp->eep_config.use_cmd_qng = asc_dvc_varp->cfg->cmd_qng_enabled;
+			boardp->eep_config.isa_dma_speed = asc_dvc_varp->cfg->isa_dma_speed;
+			boardp->eep_config.start_motor = asc_dvc_varp->start_motor;
+			boardp->eep_config.cntl = asc_dvc_varp->dvc_cntl;
+			boardp->eep_config.no_scam = asc_dvc_varp->no_scam;
+			boardp->eep_config.max_total_qng = asc_dvc_varp->max_total_qng;
+			boardp->eep_config.chip_scsi_id = asc_dvc_varp->cfg->chip_scsi_id;
+			/* 'max_tag_qng' is set to the same value for every device. */
+			boardp->eep_config.max_tag_qng = asc_dvc_varp->cfg->max_tag_qng[0];
+
+			/*
 			 * Modify board configuration.
 			 */
-			boardp->isr_callback = (Ptr2Func) asc_isr_callback;
-			boardp->exe_callback = (Ptr2Func) NULL;
+			asc_dvc_varp->isr_callback = (Ptr2Func) asc_isr_callback;
+			asc_dvc_varp->exe_callback = (Ptr2Func) NULL;
 
 			ASC_DBG(2, "advansys_detect: AscInitSetConfig()\n");
-			switch (ret = AscInitSetConfig(boardp)) {
+			switch (ret = AscInitSetConfig(asc_dvc_varp)) {
 			case 0:	/* No error. */
 				break;
 			case ASC_WARN_IO_PORT_ROTATE:
-				ASC_DBG(0, "AscInitSetConfig: I/O port address modified\n");
+				ASC_PRINT1(
+"AscInitSetConfig: Board %d: I/O port address modified\n",
+					boardp->id);
+				break;
+			case ASC_WARN_AUTO_CONFIG:
+				ASC_PRINT1(
+"AscInitSetConfig: Board %d: I/O port increment switch enabled\n",
+					boardp->id);
 				break;
 			case ASC_WARN_EEPROM_CHKSUM:
-				ASC_DBG(0, "AscInitSetConfig: EEPROM checksum error\n");
+				ASC_PRINT1(
+"AscInitSetConfig: Board %d: EEPROM checksum error\n",
+					boardp->id);
 				break;
 			case ASC_WARN_IRQ_MODIFIED:
-				ASC_DBG(0, "AscInitSetConfig: IRQ modified\n");
+				ASC_PRINT1(
+"AscInitSetConfig: Board %d: IRQ modified\n",
+					boardp->id);
 				break;
 			case ASC_WARN_CMD_QNG_CONFLICT:
-				ASC_DBG(0, "AscInitSetConfig: Tag queuing w/o disconnects\n");
+				ASC_PRINT1(
+"AscInitSetConfig: Board %d: tag queuing w/o disconnects\n",
+					boardp->id);
 				break;
 			default:
-				ASC_DBG1(0, "AscInitSetConfig: Unknown warning: %x\n", ret);
+				ASC_PRINT2(
+"AscInitSetConfig: Board %d: unknown warning: %x\n",
+					boardp->id, ret);
 				break;
 			}
-			if (boardp->err_code != 0) {
-				ASC_DBG2(0,
-					"AscInitSetConfig: error: init_state %x, err_code %x\n",
-					boardp->init_state, boardp->err_code);
+			if (asc_dvc_varp->err_code != 0) {
+				ASC_PRINT3(
+"AscInitSetConfig: Board %d error: init_state %x, err_code %x\n",
+					boardp->id, asc_dvc_varp->init_state,
+					asc_dvc_varp->err_code);
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+				kfree(boardp->prtbuf);
+#endif /* version >= v1.3.0 */
 				scsi_unregister(shp);
 				asc_board_count--;
 				continue;
@@ -3030,33 +3164,21 @@
 			 */
 
 			/* AscInitSetConfig() will set the IRQ for non-PCI boards. */
-			if (boardp->bus_type != ASC_IS_PCI) {
-				shp->irq = boardp->irq_no;
+			if (asc_dvc_varp->bus_type != ASC_IS_PCI) {
+				shp->irq = asc_dvc_varp->irq_no;
 			}
 
-			shp->io_port = boardp->iop_base;
+			shp->io_port = asc_dvc_varp->iop_base;
 			shp->n_io_port = ASC_IOADR_GAP;
-			shp->this_id = boardp->cfg->chip_scsi_id;
+			shp->this_id = asc_dvc_varp->cfg->chip_scsi_id;
 
 			/* Maximum number of queues this adapter can handle. */
-			shp->can_queue = boardp->max_total_qng;
+			shp->can_queue = asc_dvc_varp->max_total_qng;
 
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,89)
 			/*
-			 * XXX - Command queuing limits are maintained per target
-			 * by AdvanSys adapters. Set 'cmd_per_lun' to the minimum
-			 * value of the all the target settings for the adapter.
-			 *
-			 * For now set 'cmd_per_lun' to 'max_total_qng'. This
-			 * value should be adjusted every time a new device is
-			 * found in asc_init_dev().
-			 *
-			 * XXX - memory allocation is done by the mid-level scsi
-			 * driver based on 'cmd_per_lun'. If 'sg_tablesize' is too large
-			 * allocation failures can occur in scsi_register_host().
-			 * A 'Scsi_Cmnd' structure is pre-allocated for each command
-			 * also DMA memory is reserved. Set it artificially low for now.
-			 *
-			 * shp->cmd_per_lun = boardp->max_total_qng;
+			 * Set a conservative 'cmd_per_lun' value to prevent memory
+			 * allocation failures.
 			 */
 #ifdef MODULE
 			shp->cmd_per_lun = 1;
@@ -3064,12 +3186,22 @@
 			shp->cmd_per_lun = 4;
 #endif /* MODULE */
 			ASC_DBG1(1, "advansys_detect: cmd_per_lun: %d\n", shp->cmd_per_lun);
+#else /* version >= v1.3.89 */
+			/*
+			 * Use the host 'select_queue_depths' function to determine
+			 * the number of commands to queue per device.
+			 */
+			shp->select_queue_depths = advansys_select_queue_depths;
+
+			shp->cmd_per_lun = 0; /* 'cmd_per_lun' is no longer used. */
+#endif /* version >= v1.3.89 */
+
 			
-			/* Maximum number of scatter-gather elements adapter can handle. */
 			/*
-			 * XXX - memory allocation is done by the mid-level scsi
-			 * driver based on sg_tablesize. If 'sg_tablesize' is too large
-			 * allocation failures can occur in scsi_register_host().
+			 * Maximum number of scatter-gather elements adapter can handle.
+			 *
+			 * Set a conservative 'sg_tablesize' value to prevent memory
+			 * allocation failures.
 			 */
 #ifdef MODULE
 			shp->sg_tablesize = 8;
@@ -3081,8 +3213,8 @@
 
 			/* BIOS start address. */
 			shp->base = (char *) ((ulong) AscGetChipBiosAddress(
-												boardp->iop_base,
-												boardp->bus_type));
+												asc_dvc_varp->iop_base,
+												asc_dvc_varp->bus_type));
 
 			/*
 			 * Register Board Resources - I/O Port, DMA, IRQ
@@ -3093,14 +3225,18 @@
 			request_region(shp->io_port, shp->n_io_port, "advansys");
 
 			/* Register DMA channel for ISA bus. */
-			if ((boardp->bus_type & ASC_IS_ISA) == 0) {
+			if ((asc_dvc_varp->bus_type & ASC_IS_ISA) == 0) {
 				shp->dma_channel = NO_ISA_DMA;
 			} else {
-				shp->dma_channel = boardp->cfg->isa_dma_channel;
+				shp->dma_channel = asc_dvc_varp->cfg->isa_dma_channel;
 				if ((ret = request_dma(shp->dma_channel, "advansys")) != 0) {
-					ASC_DBG2(0, "advansys_detect: request_dma() %d failed %d\n",
-						shp->dma_channel, ret);
+					ASC_PRINT3(
+"advansys_detect: Board %d: request_dma() %d failed %d\n",
+						boardp->id, shp->dma_channel, ret);
 					release_region(shp->io_port, shp->n_io_port);
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+					kfree(boardp->prtbuf);
+#endif /* version >= v1.3.0 */
 					scsi_unregister(shp);
 					asc_board_count--;
 					continue;
@@ -3110,18 +3246,24 @@
 
 			/* Register IRQ Number. */
 			ASC_DBG1(2, "advansys_detect: request_irq() %d\n", shp->irq);
-#ifdef LINUX_1_2
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,70)
 			if ((ret = request_irq(shp->irq, advansys_interrupt,
-								SA_INTERRUPT, "advansys")) != 0) {
-#else /* LINUX_1_3 */
+							SA_INTERRUPT, "advansys")) != 0) {
+#else /* version >= v1.3.70 */
 			if ((ret = request_irq(shp->irq, advansys_interrupt,
-								SA_INTERRUPT, "advansys", NULL)) != 0) {
-#endif /* LINUX_1_3 */
-				ASC_DBG1(0, "advansys_detect: request_irq() failed %d\n", ret);
+							SA_INTERRUPT | (share_irq == TRUE ? SA_SHIRQ : 0),
+							"advansys", boardp)) != 0) {
+#endif /* version >= v1.3.70 */
+				ASC_PRINT2(
+"advansys_detect: Board %d: request_irq() failed %d\n",
+					boardp->id, ret);
 				release_region(shp->io_port, shp->n_io_port);
 				if (shp->dma_channel != NO_ISA_DMA) {
 					free_dma(shp->dma_channel);
 				}
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+				kfree(boardp->prtbuf);
+#endif /* version >= v1.3.0 */
 				scsi_unregister(shp);
 				asc_board_count--;
 				continue;
@@ -3131,19 +3273,23 @@
 			 * Initialize board RISC chip and enable interrupts.
 			 */
 			ASC_DBG(2, "advansys_detect: AscInitAsc1000Driver()\n");
-			if (AscInitAsc1000Driver(boardp)) {
-				ASC_DBG2(0,
-					"AscInitAsc1000Driver: error: init_state %x, err_code %x\n",
-					boardp->init_state, boardp->err_code);
+			if (AscInitAsc1000Driver(asc_dvc_varp)) {
+				ASC_PRINT3(
+"AscInitAsc1000Driver: Board %d error: init_state %x, err_code %x\n",
+					boardp->id, asc_dvc_varp->init_state,
+					asc_dvc_varp->err_code);
 				release_region(shp->io_port, shp->n_io_port);
 				if (shp->dma_channel != NO_ISA_DMA) {
 					free_dma(shp->dma_channel);
 				}
-#ifdef LINUX_1_2
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+				kfree(boardp->prtbuf);
+#endif /* version >= v1.3.0 */
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,70)
 				free_irq(shp->irq);
-#else /* LINUX_1_3 */
-				free_irq(shp->irq, NULL);
-#endif /* LINUX_1_3 */
+#else /* version >= v1.3.70 */
+				free_irq(shp->irq, boardp);
+#endif /* version >= v1.3.70 */
 				scsi_unregister(shp);
 				asc_board_count--;
 				continue;
@@ -3151,7 +3297,6 @@
 			ASC_DBG_PRT_SCSI_HOST(2, shp);
 		}
 	}
-
 	ASC_DBG1(1, "advansys_detect: done: asc_board_count %d\n", asc_board_count);
 	return asc_board_count;
 }
@@ -3164,17 +3309,24 @@
 int
 advansys_release(struct Scsi_Host *shp)
 {
+	struct asc_board	*boardp;
+
 	ASC_DBG(1, "advansys_release: begin\n");
-#ifdef LINUX_1_2
+	boardp = ASC_BOARDP(shp);
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,70)
 	free_irq(shp->irq);
-#else /* LINUX_1_3 */
-	free_irq(shp->irq, NULL);
-#endif /* LINUX_1_3 */
+#else /* version >= v1.3.70 */
+	free_irq(shp->irq, boardp);
+#endif /* version >= v1.3.70 */
 	if (shp->dma_channel != NO_ISA_DMA) {
 		ASC_DBG(1, "advansys_release: free_dma()\n");
 		free_dma(shp->dma_channel);
 	}
 	release_region(shp->io_port, shp->n_io_port);
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+	ASC_ASSERT(boardp->prtbuf != NULL);
+	kfree(boardp->prtbuf);
+#endif /* version >= v1.3.0 */
 	scsi_unregister(shp);
 	ASC_DBG(1, "advansys_release: end\n");
 	return 0;
@@ -3185,46 +3337,50 @@
  *
  * Return suitable for printing on the console with the argument
  * adapter's configuration information.
+ *
+ * Note: The information line should not exceed ASC_INFO_SIZE bytes,
+ * otherwise the static 'info' array will be overrun.
  */
 const char *
 advansys_info(struct Scsi_Host *shp)
 {
-	static char 	info[128];
-	ASC_DVC_VAR		*boardp;
-	char			*busname;
+	static char 		info[ASC_INFO_SIZE];
+	struct asc_board	*boardp;
+	ASC_DVC_VAR			*asc_dvc_varp;
+	char				*busname;
 
-	boardp = &ASC_BOARD(shp)->board;
+	boardp = ASC_BOARDP(shp);
+	asc_dvc_varp = &boardp->asc_dvc_var;
 	ASC_DBG(1, "advansys_info: begin\n");
-	if (boardp->bus_type & ASC_IS_ISA) {
+	if (asc_dvc_varp->bus_type & ASC_IS_ISA) {
 		sprintf(info,
 			"AdvanSys SCSI %s: ISA (%u CDB): BIOS %X, IO %X-%X, IRQ %u, DMA %u",
-			ASC_VERSION, ASC_BOARD(shp)->board.max_total_qng,
+			ASC_VERSION, boardp->asc_dvc_var.max_total_qng,
 			(unsigned) shp->base, shp->io_port,
 			shp->io_port + (shp->n_io_port - 1), shp->irq, shp->dma_channel);
 	} else {
-		switch (boardp->bus_type) {
-		case ASC_IS_EISA:
-			busname = "EISA";
-			break;
-		case ASC_IS_VL:
+		if (asc_dvc_varp->bus_type & ASC_IS_VL) {
 			busname = "VL";
-			break;
-		case ASC_IS_PCI:
+		} else if (asc_dvc_varp->bus_type & ASC_IS_EISA) {
+			busname = "EISA";
+		} else if (asc_dvc_varp->bus_type & ASC_IS_PCI) {
 			busname = "PCI";
-			break;
-		default:
+		} else {
 			busname = "?";
-			ASC_DBG1(0, "advansys_info: unknown bus type %d\n",
-				boardp->bus_type);
-			break;
+			ASC_PRINT2(
+"advansys_info: Board %d: unknown bus type %d\n",
+				boardp->id, asc_dvc_varp->bus_type);
 		}
 		/* No DMA channel for non-ISA busses. */
 		sprintf(info,
 			"AdvanSys SCSI %s: %s (%u CDB): BIOS %X, IO %X-%X, IRQ %u",
-			ASC_VERSION, busname, ASC_BOARD(shp)->board.max_total_qng,
+			ASC_VERSION, busname, boardp->asc_dvc_var.max_total_qng,
 			(unsigned) shp->base, shp->io_port,
 			shp->io_port + (shp->n_io_port - 1), shp->irq);
 	}
+#ifdef ADVANSYS_DEBUG
+	ASC_ASSERT(strlen(info) < ASC_INFO_SIZE);
+#endif /* ADVANSYS_DEBUG */
 	ASC_DBG(1, "advansys_info: end\n");
 	return info;
 }
@@ -3241,7 +3397,7 @@
 advansys_command(Scsi_Cmnd *scp)
 {
 	ASC_DBG1(1, "advansys_command: scp %x\n", (unsigned) scp);
-	ASC_STATS(command);
+	ASC_STATS(scp->host, command);
 	scp->SCp.Status = 0; /* Set to a known state */
 	advansys_queuecommand(scp, advansys_command_done);
 	while (scp->SCp.Status == 0) {
@@ -3261,26 +3417,13 @@
 advansys_queuecommand(Scsi_Cmnd *scp, void (*done)(Scsi_Cmnd *))
 {
 	struct Scsi_Host		*shp;
+	struct asc_board		*boardp;
 	int						flags = 0;
 	int						interrupts_disabled;
 
-	ASC_STATS(queuecommand);
 	shp = scp->host;
-
-#ifdef LINUX_1_2
-	/*
-	 * For LINUX_1_3, if statistics are enabled they can be accessed
-	 * by reading /proc/scsi/advansys/[0-(ASC_NUM_BOARD_SUPPORTED-1)].
-	 */
-#ifdef ADVANSYS_STATS_1_2_PRINT
-	/* Display statistics every 10000 commands. */
-	if ((asc_stats.queuecommand % 10000) == 0) {
-		printk("\n");
-		(void) asc_prt_stats(NULL, 0);
-		printk("\n");
-	}
-#endif /* ADVANSYS_STATS_1_2_PRINT */
-#endif /* LINUX_1_2 */
+	boardp = ASC_BOARDP(shp);
+	ASC_STATS(shp, queuecommand);
 
 	/*
 	 * If there are any pending commands for this board before trying
@@ -3289,17 +3432,16 @@
 	 * The typical case will be no pending commands and interrupts
 	 * not disabled.
 	 */
-	if (ASC_BOARD(shp)->pending_tidmask == 0) {
+	if (boardp->pending.tidmask == 0) {
 		interrupts_disabled = ASC_FALSE;
 	} else {
-		ASC_STATS(cmd_disable);
 		/* Disable interrupts */
 		interrupts_disabled = ASC_TRUE;
 		save_flags(flags);
 		cli();
-		ASC_DBG1(1, "advansys_queuecommand: asc_execute_pending() %x\n",
-			ASC_BOARD(shp)->pending_tidmask);
-		asc_execute_pending(shp);
+		ASC_DBG1(1, "advansys_queuecommand: asc_execute_queue() %x\n",
+			boardp->pending.tidmask);
+		asc_execute_queue(&boardp->pending);
 	}
 
 	/*
@@ -3313,7 +3455,7 @@
 			cli();
 			interrupts_disabled = ASC_TRUE;
 		}
-		asc_enqueue(shp, scp, scp->target, ASC_BACK);
+		asc_enqueue(&boardp->pending, scp, ASC_BACK);
 	}
 
 	if (interrupts_disabled == ASC_TRUE) {
@@ -3326,50 +3468,87 @@
 /*
  * advansys_abort()
  *
- * Abort the specified command and reset the device
- * associated with the command 'scp'.
+ * Abort the command specified by 'scp'.
  */
 int
 advansys_abort(Scsi_Cmnd *scp)
 {
-	ASC_DVC_VAR		*boardp;
-	int				flags;
-	int				ret;
+	struct asc_board	*boardp;
+	ASC_DVC_VAR			*asc_dvc_varp;
+	int					flags;
+	int					abort;
+	int					ret;
 
 	ASC_DBG1(1, "advansys_abort: scp %x\n", (unsigned) scp);
+	ASC_STATS(scp->host, abort);
+
+	/* Save current flags and disable interrupts. */
 	save_flags(flags);
 	cli();
-	ASC_STATS(abort);
+
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+	if (scp->serial_number != scp->serial_number_at_timeout) {
+		ret = SCSI_ABORT_NOT_RUNNING;
+	} else
+#endif /* version >= v1.3.89 */
 	if (scp->host == NULL) {
 		scp->result = HOST_BYTE(DID_ERROR);
 		ret = SCSI_ABORT_ERROR;
-	} else if (asc_rmqueue(scp->host, scp, scp->target) == ASC_TRUE) {
-		scp->result = HOST_BYTE(DID_ABORT);
-		ret = SCSI_ABORT_SUCCESS;
-		(void) AscResetDevice(&ASC_BOARD(scp->host)->board, scp->target);
 	} else {
-		/* Must enable interrupts for AscAbortSRB() */
-		sti();
-		boardp = &ASC_BOARD(scp->host)->board;
-		scp->result = HOST_BYTE(DID_ABORT);
-		switch (AscAbortSRB(boardp, (ulong) scp)) {
-		case ASC_TRUE:
-			/* asc_isr_callback() will be called */
-			ASC_DBG(1, "advansys_abort: AscAbortSRB() TRUE\n");
-			ret = SCSI_ABORT_PENDING;
-			break;
-		case ASC_FALSE:
-			/* Request has apparently already completed. */
-			ASC_DBG(1, "advansys_abort: AscAbortSRB() FALSE\n");
+		boardp = ASC_BOARDP(scp->host);
+		if (asc_rmqueue(&boardp->pending, scp) == ASC_TRUE) {
+			/*
+		 	 * If asc_rmqueue() found the command on the pending
+			 * queue, it had not been sent to the Asc Library.
+			 * After the queue is removed, no other handling is required.
+		 	 */
+			scp->result = HOST_BYTE(DID_ABORT);
+			ret = SCSI_ABORT_SUCCESS;
+		} else if (asc_isqueued(&boardp->active, scp) == ASC_TRUE) {
+			/*
+		 	 * If asc_isqueued() found the command on the active
+			 * queue, it has been sent to the Asc Library. The
+			 * command should be returned through the interrupt
+			 * handler after calling AscAbortSRB().
+		 	 */
+			asc_dvc_varp = &boardp->asc_dvc_var;
+			scp->result = HOST_BYTE(DID_ABORT);
+			/* Must enable interrupts for AscAbortSRB() */
+			sti();
+			switch (abort = AscAbortSRB(asc_dvc_varp, (ulong) scp)) {
+			case ASC_TRUE:
+				/* asc_isr_callback() will be called */
+				ASC_DBG(1, "advansys_abort: AscAbortSRB() TRUE\n");
+				ret = SCSI_ABORT_PENDING;
+				break;
+			case ASC_FALSE:
+				/* Request has apparently already completed. */
+				ASC_DBG(1, "advansys_abort: AscAbortSRB() FALSE\n");
+				ret = SCSI_ABORT_NOT_RUNNING;
+				break;
+			case ASC_ERROR:
+			default:
+				ASC_DBG(1, "advansys_abort: AscAbortSRB() ERROR\n");
+				ret = SCSI_ABORT_ERROR;
+				break;
+			}
+			cli();
+			/*
+			 * If the abort failed, remove the request from the
+			 * active list and complete it.
+			 */
+			if (abort != ASC_TRUE) {
+				if (asc_rmqueue(&boardp->active, scp) == ASC_TRUE) {
+					scp->result = HOST_BYTE(DID_ABORT);
+					scp->scsi_done(scp);
+				}
+			}
+		} else {
+			/*
+			 * The command was not found on the active or pending queues.
+			 */
 			ret = SCSI_ABORT_NOT_RUNNING;
-			break;
-		case ASC_ERROR:
-		default:
-			ASC_DBG(1, "advansys_abort: AscAbortSRB() ERROR\n");
-			ret = SCSI_ABORT_ERROR;
-			break;
 		}
-		(void) AscResetDevice(boardp, scp->target);
 	}
 	restore_flags(flags);
 	ASC_DBG1(1, "advansys_abort: ret %d\n", ret);
@@ -3379,82 +3558,169 @@
 /*
  * advansys_reset()
  *
- * Reset all devices and the SCSI bus for the board
- * associated with 'scp'.
+ * Reset the device associated with the command 'scp'.
  */
 int
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,89)
 advansys_reset(Scsi_Cmnd *scp)
+#else /* version >= v1.3.89 */
+advansys_reset(Scsi_Cmnd *scp, unsigned int reset_flags)
+#endif /* version >= v1.3.89 */
 {
-	ASC_DVC_VAR		*boardp;
-	int				flags;
-	Scsi_Cmnd		*tscp;
-	int				i;
-	int				ret;
+	struct asc_board	*boardp;
+	ASC_DVC_VAR			*asc_dvc_varp;
+	int					flags;
+	Scsi_Cmnd			*tscp;
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+	int					scp_found = ASC_FALSE;
+#endif /* version >= v1.3.89 */
+	int					i;
+	int					ret;
 
 	ASC_DBG1(1, "advansys_reset: %x\n", (unsigned) scp);
+	ASC_STATS(scp->host, reset);
+
+	/* Save current flags and disable interrupts. */
 	save_flags(flags);
 	cli();
-	ASC_STATS(reset);
+
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+	if (scp->serial_number != scp->serial_number_at_timeout) {
+		ret = SCSI_RESET_NOT_RUNNING;
+	} else
+#endif /* version >= v1.3.89 */
 	if (scp->host == NULL) {
 		scp->result = HOST_BYTE(DID_ERROR);
 		ret = SCSI_RESET_ERROR;
 	} else {
-		/* Remove any pending commands, set DID_RESET, and done them.  */
-		for (i = 0; i < ASC_MAX_TID; i++) {
-			while ((tscp = asc_dequeue(scp->host, i)) != NULL) {
-				tscp->result = HOST_BYTE(DID_RESET);
-				tscp->scsi_done(tscp);
-			}
+		boardp = ASC_BOARDP(scp->host);
+
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+		/*
+	 	 * If the request is on the target pending or active queue,
+		 * note that it was found.
+		 */
+		if ((asc_isqueued(&boardp->pending, scp) == ASC_TRUE) ||
+		    (asc_isqueued(&boardp->active, scp) == ASC_TRUE)) {
+			scp_found = ASC_TRUE;
 		}
+#endif /* version >= v1.3.89 */
+
 		/*
-		 * XXX - Host drivers should not modify the timeout field.
-		 * Allow the SCSI bus reset more time to complete.
+		 * If the suggest reset bus flags are set, reset the bus.
+		 * Otherwise only reset the device.
 		 */
-		scp->timeout += 2000;	/* Add 5 seconds to the request timeout. */
+		asc_dvc_varp = &boardp->asc_dvc_var;
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+		if (reset_flags &
+			(SCSI_RESET_SUGGEST_BUS_RESET | SCSI_RESET_SUGGEST_HOST_RESET)) {
+#endif /* version >= v1.3.89 */
 
-		/* Must enable interrupts for AscResetSB() */
-		sti();
-		boardp = &ASC_BOARD(scp->host)->board;
-		scp->result = HOST_BYTE(DID_RESET);
-		switch (AscResetSB(boardp)) {
-		case ASC_TRUE:
-			ASC_DBG(1, "advansys_reset: AscResetSB() TRUE\n");
-			ret = SCSI_RESET_SUCCESS;
-			break;
-		case ASC_ERROR:
-		default:
-			ASC_DBG(1, "advansys_reset: AscResetSB() ERROR\n");
-			ret = SCSI_RESET_ERROR;
-			break;
-		}
-	}
-	restore_flags(flags);
-	ASC_DBG1(1, "advansys_reset: ret %d", ret);
-	return ret;
-}
+			/*
+			 * Done all pending requests for all targets with DID_RESET.
+			 */
+			for (i = 0; i <= ASC_MAX_TID; i++) {
+				while ((tscp = asc_dequeue(&boardp->pending, i)) != NULL) {
+					tscp->result = HOST_BYTE(DID_RESET);
+					tscp->scsi_done(tscp);
+				}
+			}
 
-/*
- * advansys_biosparam()
- *
- * Translate disk drive geometry if the "BIOS greater than 1 GB"
- * support is enabled for a drive.
- *
- * ip (information pointer) is an int array with the following definition:
- * ip[0]: heads
- * ip[1]: sectors
- * ip[2]: cylinders
+			/*
+			 * Reset the target's SCSI bus.
+			 */
+			sti();	/* Enable interrupts for AscResetSB(). */
+			switch (AscResetSB(asc_dvc_varp)) {
+			case ASC_TRUE:
+				ASC_DBG(1, "advansys_reset: AscResetSB() TRUE\n");
+				ret = SCSI_RESET_SUCCESS;
+				break;
+			case ASC_ERROR:
+			default:
+				ASC_DBG(1, "advansys_reset: AscResetSB() ERROR\n");
+				ret = SCSI_RESET_ERROR;
+				break;
+			}
+			cli();
+
+			/*
+			 * Done all active requests for all targets with DID_RESET.
+			 */
+			for (i = 0; i <= ASC_MAX_TID; i++) {
+				while ((tscp = asc_dequeue(&boardp->active, i)) != NULL) {
+					tscp->result = HOST_BYTE(DID_RESET);
+					tscp->scsi_done(tscp);
+				}
+			}
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+		} else {
+			/*
+			 * Done all pending requests for the target with DID_RESET.
+			 */
+			while ((tscp = asc_dequeue(&boardp->pending, scp->target))
+					!= NULL) {
+				tscp->result = HOST_BYTE(DID_RESET);
+				tscp->scsi_done(tscp);
+			}
+
+			sti();	/* Enabled interrupts for AscResetDevice(). */
+			ASC_DBG(1, "advansys_reset: AscResetDevice()\n");
+			(void) AscResetDevice(asc_dvc_varp, scp->target);
+			cli();
+
+			/*
+			 * Done all active requests for the target with DID_RESET.
+			 */
+			while ((tscp = asc_dequeue(&boardp->active, scp->target))
+					!= NULL) {
+				tscp->result = HOST_BYTE(DID_RESET);
+				tscp->scsi_done(tscp);
+			}
+		}
+#endif /* version >= v1.3.89 */
+
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+		/*
+		 * If the command was not on the active or pending request
+		 * queues and the SCSI_RESET_SYNCHRONOUS flag is set, then
+		 * done the command now. If the command had been on the
+		 * active or pending request queues it would have already
+		 * been completed.
+		 */
+		if (scp_found == ASC_FALSE && (reset_flags & SCSI_RESET_SYNCHRONOUS)) {
+			scp->result = HOST_BYTE(DID_RESET);
+			scp->scsi_done(tscp);
+		}
+#endif /* version >= v1.3.89 */
+		ret = SCSI_RESET_SUCCESS;
+	}
+	restore_flags(flags);
+	ASC_DBG1(1, "advansys_reset: ret %d", ret);
+	return ret;
+}
+
+/*
+ * advansys_biosparam()
+ *
+ * Translate disk drive geometry if the "BIOS greater than 1 GB"
+ * support is enabled for a drive.
+ *
+ * ip (information pointer) is an int array with the following definition:
+ * ip[0]: heads
+ * ip[1]: sectors
+ * ip[2]: cylinders
  */
 int
-#ifdef LINUX_1_2
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,0)
 advansys_biosparam(Disk *dp, int dep, int ip[])
-#else /* LINUX_1_3 */
+#else /* version >= v1.3.0 */
 advansys_biosparam(Disk *dp, kdev_t dep, int ip[])
-#endif /* LINUX_1_3 */
+#endif /* version >= v1.3.0 */
 {
 	ASC_DBG(1, "advansys_biosparam: begin\n");
-	ASC_STATS(biosparam);
-	if ((ASC_BOARD(dp->device->host)->board.dvc_cntl & ASC_CNTL_BIOS_GT_1GB) &&
-		dp->capacity > 0x200000) {
+	ASC_STATS(dp->device->host, biosparam);
+	if ((ASC_BOARDP(dp->device->host)->asc_dvc_var.dvc_cntl &
+	     ASC_CNTL_BIOS_GT_1GB) && dp->capacity > 0x200000) {
 			ip[0] = 255;
 			ip[1] = 63;
 	} else {
@@ -3556,49 +3822,21 @@
  * --- Miscellaneous Driver Functions
  */
 
-#ifdef LINUX_1_3
-/*
- * asc_proc_copy() 
- *
- * Copy proc information to a read buffer considering the current read
- * offset in the file and the remaining space in the read buffer.
- */
-STATIC int
-asc_proc_copy(off_t advoffset, off_t offset, char *curbuf, int leftlen,
-			  char *cp, int cplen)
-{
-	int cnt = 0;
-	
-	ASC_DBG3(2, "asc_proc_copy: offset %d, advoffset %d, cplen %d\n",
-			(unsigned) offset, (unsigned) advoffset, cplen);
-	if (offset <= advoffset) {
-		/* Read offset below current offset, copy everything. */
-		cnt = min(cplen, leftlen);
-		ASC_DBG3(2, "asc_proc_copy: curbuf %x, cp %x, cnt %d\n",
-				(unsigned) curbuf, (unsigned) cp, cnt);
-		memcpy(curbuf, cp, cnt);
-	} else if (offset < advoffset + cplen) {
-		/* Read offset within current range, partial copy. */
-		cnt = (advoffset + cplen) - offset;
-		cp = (cp + cplen) - cnt;
-		cnt = min(cnt, leftlen);
-		ASC_DBG3(2, "asc_proc_copy: curbuf %x, cp %x, cnt %d\n",
-				(unsigned) curbuf, (unsigned) cp, cnt);
-		memcpy(curbuf, cp, cnt);
-	}
-	return cnt;
-}
-#endif /* LINUX_1_3 */
-
 /*
  * First-level interrupt handler.
+ *
+ * For versions > v1.3.70, 'dev_id' is a pointer to the interrupting
+ * adapter's struct asc_board. Because all boards are currently checked
+ * for interrupts on each interrupt, 'dev_id' is not referenced. 'dev_id'
+ * could be used to identify an interrupt passed to the AdvanSys driver
+ * but actually for a device sharing an interrupt with an AdvanSys adapter.
  */
 STATIC void
-#ifdef LINUX_1_2
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,70)
 advansys_interrupt(int irq, struct pt_regs *regs)
-#else /* LINUX_1_3 */
+#else /* version >= v1.3.70 */
 advansys_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-#endif /* LINUX_1_3 */
+#endif /* version >= v1.3.70 */
 {
 	int			i;
 	int			flags;
@@ -3610,18 +3848,18 @@
 	cli();
 
 	ASC_DBG(1, "advansys_interrupt: begin\n");
-	ASC_STATS(interrupt);
 	/*
 	 * Check for interrupts on all boards.
 	 * AscISR() will call asc_isr_callback().
 	 */
 	for (i = 0; i < asc_board_count; i++) {
+		ASC_STATS(asc_host[i], check_interrupt);
 		while (AscIsIntPending(asc_host[i]->io_port)) {
+			ASC_STATS(asc_host[i], interrupt);
 			ASC_DBG(1, "advansys_interrupt: before AscISR()\n");
-			AscISR(&ASC_BOARD(asc_host[i])->board);
+			AscISR(&ASC_BOARDP(asc_host[i])->asc_dvc_var);
 		}
 	}
-	ASC_DBG(1, "advansys_interrupt: end\n");
 
 	/*
 	 * While interrupts are still disabled save the list of requests that
@@ -3641,9 +3879,33 @@
 		scp = tscp;
 	}
 
+	ASC_DBG(1, "advansys_interrupt: end\n");
 	return;
 }
 
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,89)
+/*
+ * Set the number of commands to queue per device for the
+ * specified host adapter.
+ */
+STATIC void
+advansys_select_queue_depths(struct Scsi_Host *shp, Scsi_Device *devicelist)
+{
+	Scsi_Device			*device;
+	struct asc_board	*boardp;
+
+	boardp = ASC_BOARDP(shp);
+	for (device = devicelist; device != NULL; device = device->next) {
+		if (device->host != shp) {
+			continue;
+		}
+		device->queue_depth = boardp->asc_dvc_var.max_dvc_qng[device->id];
+		ASC_DBG3(1, "advansys_select_queue_depths: shp %x, id %d, depth %d\n",
+			(unsigned) shp, device->id, device->queue_depth);
+	}
+}
+#endif /* version >= v1.3.89 */
+
 /*
  * Function used only with polled I/O requests that are initiated by
  * advansys_command().
@@ -3697,28 +3959,30 @@
 STATIC int
 asc_execute_scsi_cmnd(Scsi_Cmnd *scp)
 {
-	ASC_DVC_VAR		*boardp;
-	ASC_SCSI_Q		scsiq;
-	ASC_SG_HEAD		sghead;
-	int				ret;
+	struct asc_board	*boardp;
+	ASC_DVC_VAR			*asc_dvc_varp;
+	ASC_SCSI_Q			scsiq;
+	ASC_SG_HEAD			sghead;
+	int					flags;
+	int					ret;
 
 	ASC_DBG2(1, "asc_execute_scsi_cmnd: scp %x, done %x\n",
 		(unsigned) scp, (unsigned) scp->scsi_done);
 
-	boardp = &ASC_BOARD(scp->host)->board;
+	boardp = ASC_BOARDP(scp->host);
+	asc_dvc_varp = &boardp->asc_dvc_var;
 
 	/*
 	 * If this is the first command, then initialize the device. If
 	 * no device is found set 'DID_BAD_TARGET' and return.
 	 */
-	if ((ASC_BOARD(scp->host)->init_tidmask &
-		 ASC_TIX_TO_TARGET_ID(scp->target)) == 0) {
-		if (asc_init_dev(boardp, scp) == ASC_FALSE) {
+	if ((boardp->init_tidmask & ASC_TIX_TO_TARGET_ID(scp->target)) == 0) {
+		if (asc_init_dev(asc_dvc_varp, scp) == ASC_FALSE) {
 			scp->result = HOST_BYTE(DID_BAD_TARGET);
 			scp->scsi_done(scp);
 			return ASC_ERROR;
 		}
-		ASC_BOARD(scp->host)->init_tidmask |= ASC_TIX_TO_TARGET_ID(scp->target);
+		boardp->init_tidmask |= ASC_TIX_TO_TARGET_ID(scp->target);
 	}
 
 	memset(&scsiq, 0, sizeof(ASC_SCSI_Q));
@@ -3748,11 +4012,12 @@
 		/*
 		 * CDB request of single contiguous buffer.
 		 */
-		ASC_STATS(cont_cnt);
+		ASC_STATS(scp->host, cont_cnt);
  		/* request_buffer is already a real address. */
 		scsiq.q1.data_addr = (ulong) scp->request_buffer;
 		scsiq.q1.data_cnt = scp->request_bufflen;
-		ASC_STATS_ADD(cont_xfer, (scp->request_bufflen + 511) >> 9);
+		ASC_STATS_ADD(scp->host, cont_xfer,
+					  ASC_CEILING(scp->request_bufflen, 512));
 		scsiq.q1.sg_queue_cnt = 0;
 		scsiq.sg_head = NULL;
 	} else {
@@ -3763,14 +4028,14 @@
 		struct scatterlist	*slp;
 
 		if (scp->use_sg > ASC_MAX_SG_LIST) {
-			ASC_DBG2(0, "asc_execute_scsi_cmnd: use_sg %d > %d\n",
-				scp->use_sg, ASC_MAX_SG_LIST);
+			ASC_PRINT3("asc_execute_scsi_cmnd: Board %d: use_sg %d > %d\n",
+				boardp->id, scp->use_sg, ASC_MAX_SG_LIST);
 			scp->result = HOST_BYTE(DID_ERROR);
 			scp->scsi_done(scp);
 			return ASC_ERROR;
 		}
 
-		ASC_STATS(sg_cnt);
+		ASC_STATS(scp->host, sg_cnt);
 
 		/*
 		 * Allocate a ASC_SG_HEAD structure and set the ASC_SCSI_Q
@@ -3783,7 +4048,7 @@
 		scsiq.q1.data_cnt = 0;
 		scsiq.q1.data_addr = 0;
 		sghead.entry_cnt = scsiq.q1.sg_queue_cnt = scp->use_sg;
-		ASC_STATS_ADD(sg_elem, sghead.entry_cnt);
+		ASC_STATS_ADD(scp->host, sg_elem, sghead.entry_cnt);
 
 		/*
 		 * Convert scatter-gather list into ASC_SG_HEAD list.
@@ -3792,29 +4057,48 @@
 		for (sgcnt = 0; sgcnt < scp->use_sg; sgcnt++, slp++) {
 			sghead.sg_list[sgcnt].addr = (ulong) slp->address;
 			sghead.sg_list[sgcnt].bytes = slp->length;
-			ASC_STATS_ADD(sg_xfer, (slp->length + 511) >> 9);
+			ASC_STATS_ADD(scp->host, sg_xfer, ASC_CEILING(slp->length, 512));
 		}
 	}
 
 	ASC_DBG_PRT_SCSI_Q(2, &scsiq);
 	ASC_DBG_PRT_CDB(1, scp->cmnd, scp->cmd_len);
 
-	switch (ret = AscExeScsiQueue(boardp, &scsiq)) {
+	/*
+	 * Disable interrupts to issue the command and add the
+	 * command to the active queue if it is started.
+	 */
+	save_flags(flags);
+	cli();
+
+	switch (ret = AscExeScsiQueue(asc_dvc_varp, &scsiq)) {
 	case ASC_NOERROR:
-		ASC_DBG(1, "asc_execute_scsi_cmnd: AscExeScsiQueue() ASC_NOERROR\n");
+		asc_enqueue(&boardp->active, scp, ASC_BACK);
+		ASC_STATS(scp->host, asc_noerror);
+		ASC_DBG(1, "asc_execute_scsi_cmnd: AscExeScsiQueue(), ASC_NOERROR\n");
 		break;
 	case ASC_BUSY:
 		/* Caller must enqueue request and retry later. */
+		ASC_STATS(scp->host, asc_busy);
 		break;
 	case ASC_ERROR:
-		ASC_DBG1(0,
-			"asc_execute_scsi_cmnd: AscExeScsiQueue() ASC_ERROR err_code %x\n",
-			boardp->err_code);
-		ASC_STATS(error);
+		ASC_PRINT2(
+"asc_execute_scsi_cmnd: Board %d: AscExeScsiQueue() ASC_ERROR, err_code %x\n",
+			boardp->id, asc_dvc_varp->err_code);
+		ASC_STATS(scp->host, asc_error);
+		scp->result = HOST_BYTE(DID_ERROR);
+		scp->scsi_done(scp);
+		break;
+	default:
+		ASC_PRINT2(
+"asc_execute_scsi_cmnd: Board %d: AscExeScsiQueue() unknown, err_code %x\n",
+			boardp->id, asc_dvc_varp->err_code);
+		ASC_STATS(scp->host, asc_unknown);
 		scp->result = HOST_BYTE(DID_ERROR);
 		scp->scsi_done(scp);
 		break;
 	}
+	restore_flags(flags);
 
 	ASC_DBG(1, "asc_execute_scsi_cmnd: end\n");
 	return ret;
@@ -3824,17 +4108,16 @@
  * asc_isr_callback() - Second Level Interrupt Handler called by AscISR().
  */
 void
-asc_isr_callback(ASC_DVC_VAR *boardp, ASC_QDONE_INFO *qdonep)
+asc_isr_callback(ASC_DVC_VAR *asc_dvc_varp, ASC_QDONE_INFO *qdonep)
 {
+	struct asc_board	*boardp;
 	Scsi_Cmnd			*scp;
 	struct Scsi_Host	*shp;
-	int					flags;
 	Scsi_Cmnd			**scpp;
 
 	ASC_ASSERT(interrupts_enabled() == ASC_FALSE);
-	ASC_DBG2(1, "asc_isr_callback: boardp %x, qdonep %x\n",
-		(unsigned) boardp, (unsigned) qdonep);
-	ASC_STATS(callback);
+	ASC_DBG2(1, "asc_isr_callback: asc_dvc_varp %x, qdonep %x\n",
+		(unsigned) asc_dvc_varp, (unsigned) qdonep);
 	ASC_DBG_PRT_QDONE_INFO(2, qdonep);
 
 	/*
@@ -3847,8 +4130,16 @@
 
 	shp = scp->host;
 	ASC_ASSERT(shp);
+	ASC_STATS(shp, callback);
 	ASC_DBG1(1, "asc_isr_callback: shp %x\n", (unsigned) shp);
 
+	boardp = ASC_BOARDP(shp);
+	if (asc_rmqueue(&boardp->active, scp) == ASC_FALSE) {
+		ASC_PRINT2(
+"asc_isr_callback: Board %d: scp %x not on active queue\n",
+			boardp->id, (unsigned) scp);
+	}
+
 	/*
 	 * 'qdonep' contains the command's ending status.
 	 */
@@ -3875,12 +4166,14 @@
 				ASC_DBG_PRT_SENSE(2, scp->sense_buffer,
 					sizeof(scp->sense_buffer));
 				/*
-				 * Note: The status_byte() macro used by target drivers
+				 * Note: The 'status_byte()' macro used by target drivers
 				 * defined in scsi.h shifts the status byte returned by
 				 * host drivers right by 1 bit. This is why target drivers
-				 * also use left shifted status byte definitions. For instance
-				 * target drivers use CHECK_CONDITION, defined to 0x1, instead
-				 * of the SCSI defined check condition value of 0x2.
+				 * also use right shifted status byte definitions. For
+				 * instance target drivers use CHECK_CONDITION, defined to
+				 * 0x1, instead of the SCSI defined check condition value
+				 * of 0x2. Host drivers are supposed to return the status
+				 * byte as it is defined by SCSI.
 				 */
 				scp->result = DRIVER_BYTE(DRIVER_SENSE) |
 					STATUS_BYTE(qdonep->d3.scsi_stat); 
@@ -3906,7 +4199,7 @@
 		break;
 
 	default:
-		ASC_DBG1(0, "asc_isr_callback: done_stat %x\n", qdonep->d3.done_stat );
+		ASC_PRINT1("asc_isr_callback: done_stat %x\n", qdonep->d3.done_stat );
 		scp->result = HOST_BYTE(DID_ERROR) | MSG_BYTE(qdonep->d3.scsi_msg) |
 				STATUS_BYTE(qdonep->d3.scsi_stat);
 		break;
@@ -3917,18 +4210,15 @@
 	 * triggering more commands to be issued, try to start any pending
 	 * commands.
 	 */
-	if (ASC_BOARD(shp)->pending_tidmask != 0) {
+	if (boardp->pending.tidmask != 0) {
 	 	/*
 		 * If there are any pending commands for this board before trying
 	 	 * to execute them, disable interrupts to preserve request ordering.
 		 */
-		ASC_STATS(intr_disable);
-		save_flags(flags);
-		cli();
-		ASC_DBG1(1, "asc_isr_callback: asc_execute_pending() %x\n",
-			ASC_BOARD(shp)->pending_tidmask);
-		asc_execute_pending(shp);
-		restore_flags(flags);
+		ASC_ASSERT(interrupts_enabled() == ASC_FALSE);
+		ASC_DBG1(1, "asc_isr_callback: asc_execute_queue() %x\n",
+			boardp->pending.tidmask);
+		asc_execute_queue(&boardp->pending);
 	}
 
 	/* 
@@ -3946,46 +4236,14 @@
 }
 
 /*
- * Execute as many pending requests as possible for the
- * board specified by 'Scsi_Host'.
- */
-STATIC void
-asc_execute_pending(struct Scsi_Host *shp)
-{
-	ASC_SCSI_BIT_ID_TYPE	scan_tidmask;
-	Scsi_Cmnd				*scp;
-	int						i;
-
-	ASC_ASSERT(interrupts_enabled() == ASC_FALSE);
-	/*
-	 * Execute pending commands for devices attached to
-	 * the current board in round-robin fashion.
-	 */
-	scan_tidmask = ASC_BOARD(shp)->pending_tidmask;
-	do {
-		for (i = 0; i < ASC_MAX_TID; i++) {
-			if (scan_tidmask & ASC_TIX_TO_TARGET_ID(i)) {
-				if ((scp = asc_dequeue(shp, i)) == NULL) {
-					scan_tidmask &= ~ASC_TIX_TO_TARGET_ID(i);
-				} else if (asc_execute_scsi_cmnd(scp) == ASC_BUSY) {
-					scan_tidmask &= ~ASC_TIX_TO_TARGET_ID(i);
-					/* Put the request back at front of the list. */
-					asc_enqueue(shp, scp, i, ASC_FRONT);
-				}
-			}
-		}
-	} while (scan_tidmask);
-	return;
-}
-
-/*
  * asc_init_dev()
  *
  * Perform one-time initialization of a device.
  */
 STATIC int
-asc_init_dev(ASC_DVC_VAR *boardp, Scsi_Cmnd *scp)
+asc_init_dev(ASC_DVC_VAR *asc_dvc_varp, Scsi_Cmnd *scp)
 {
+	struct asc_board		*boardp;
 	ASC_SCSI_REQ_Q			*scsireqq;
 	ASC_CAP_INFO			*cap_info;
 	ASC_SCSI_INQUIRY		*inquiry;
@@ -3999,10 +4257,10 @@
 
 	ASC_DBG1(1, "asc_init_dev: target %d\n", (unsigned) scp->target);
 
-	/* Return true for the board's target id. */
-	if (boardp->cfg->chip_scsi_id == scp->target) {
-		return ASC_TRUE;
-	}
+	/* The hosts's target id is set in init_tidmask during initialization. */
+	ASC_ASSERT(asc_dvc_varp->cfg->chip_scsi_id != scp->target);
+
+	boardp = ASC_BOARDP(scp->host);
 
 	/*
 	 * XXX - Host drivers should not modify the timeout field.
@@ -4013,11 +4271,11 @@
 	scp->timeout += 2000;	/* Add 5 seconds to the request timeout. */
 
 	/* Set-up AscInitPollTarget() arguments. */
-	scsireqq = &ASC_BOARD(scp->host)->scsireqq;
+	scsireqq = &boardp->scsireqq;
 	memset(scsireqq, 0, sizeof(ASC_SCSI_REQ_Q));
-	cap_info = &ASC_BOARD(scp->host)->cap_info;
+	cap_info = &boardp->cap_info;
 	memset(cap_info, 0, sizeof(ASC_CAP_INFO));
-	inquiry = &ASC_BOARD(scp->host)->inquiry;
+	inquiry = &boardp->inquiry;
 	memset(inquiry, 0, sizeof(ASC_SCSI_INQUIRY));
 
 	/*
@@ -4026,12 +4284,13 @@
 	 * AscInitPollEnd(). Normally all targets are initialized within
 	 * a call to AscInitPollBegin() and AscInitPollEnd().
 	 */
-	save_use_tagged_qng = boardp->use_tagged_qng;
-    save_can_tagged_qng = boardp->cfg->can_tagged_qng;
+	save_use_tagged_qng = asc_dvc_varp->use_tagged_qng;
+    save_can_tagged_qng = asc_dvc_varp->cfg->can_tagged_qng;
 
 	ASC_DBG(2, "asc_init_dev: AscInitPollBegin()\n");
-	if (AscInitPollBegin(boardp)) {
-		ASC_DBG(0, "asc_init_dev: AscInitPollBegin() failed\n");
+	if (AscInitPollBegin(asc_dvc_varp)) {
+		ASC_PRINT1("asc_init_dev: Board %d: AscInitPollBegin() failed\n",
+			boardp->id);
 		return ASC_FALSE;
 	}
 
@@ -4043,7 +4302,7 @@
 
 	found = ASC_FALSE;
 	ASC_DBG(2, "asc_init_dev: AscInitPollTarget()\n");
-	switch (ret = AscInitPollTarget(boardp, scsireqq, inquiry, cap_info)) {
+	switch (ret = AscInitPollTarget(asc_dvc_varp, scsireqq, inquiry, cap_info)) {
 	case ASC_TRUE:
 		found = ASC_TRUE;
 #ifdef ADVANSYS_DEBUG
@@ -4052,19 +4311,19 @@
 			cap_info->lba, cap_info->blk_size);
 		ASC_DBG1(1, "asc_init_dev: peri_dvc_type %x\n",
 			inquiry->byte0.peri_dvc_type);
-		if (boardp->use_tagged_qng & tidmask) {
+		if (asc_dvc_varp->use_tagged_qng & tidmask) {
 			ASC_DBG1(1, "asc_init_dev: command queuing enabled: %d\n",
-				boardp->max_dvc_qng[scp->target]);
+				asc_dvc_varp->max_dvc_qng[scp->target]);
 		} else {
 			ASC_DBG(1, "asc_init_dev: command queuing disabled\n");
 		}
-		if (boardp->init_sdtr & tidmask) {
+		if (asc_dvc_varp->init_sdtr & tidmask) {
 			ASC_DBG(1, "asc_init_dev: synchronous transfers enabled\n");
 		} else {
 			ASC_DBG(1, "asc_init_dev: synchronous transfers disabled\n");
 		}
 		/* Set bit means fix disabled. */
-		if (boardp->pci_fix_asyn_xfer & tidmask) {
+		if (asc_dvc_varp->pci_fix_asyn_xfer & tidmask) {
 			ASC_DBG(1, "asc_init_dev: synchronous transfer fix disabled\n");
 		} else {
 			ASC_DBG(1, "asc_init_dev: synchronous transfer fix enabled\n");
@@ -4075,31 +4334,22 @@
 		ASC_DBG(1, "asc_init_dev: no device found\n");
 		break;
 	case ASC_ERROR:
-		ASC_DBG(0, "asc_init_dev: AscInitPollTarget() ASC_ERROR\n");
+		ASC_PRINT1("asc_init_dev: Board %d: AscInitPollTarget() ASC_ERROR\n",
+				boardp->id);
 		break;
 	default:
-		ASC_DBG1(0, "asc_init_dev: AscInitPollTarget() unknown ret %d\n", ret);
+		ASC_PRINT2(
+"asc_init_dev: Board %d: AscInitPollTarget() unknown ret %d\n",
+				boardp->id, ret);
 		break;
 	}
 
 	/* XXX - 'Or' in original tag bits. */
-	boardp->use_tagged_qng |= save_use_tagged_qng;
-	boardp->cfg->can_tagged_qng |= save_can_tagged_qng;
+	asc_dvc_varp->use_tagged_qng |= save_use_tagged_qng;
+	asc_dvc_varp->cfg->can_tagged_qng |= save_can_tagged_qng;
 
 	ASC_DBG(2, "asc_init_dev: AscInitPollEnd()\n");
-	AscInitPollEnd(boardp);
-
-#ifdef ASC_SET_CMD_PER_LUN
-	/*
-	 * XXX - Refer to the comment in advansys_detect()
-	 * regarding cmd_per_lun.
-	 */
-	for (i = 0; i <= ASC_MAX_TID; i++) {
-		if (boardp->max_dvc_qng[i] < scp->host->cmd_per_lun) {
-			scp->host->cmd_per_lun = boardp->max_dvc_qng[i];
-		}
-	}
-#endif /* ASC_SET_CMD_PER_LUN */
+	AscInitPollEnd(asc_dvc_varp);
 
 	return found;
 }
@@ -4111,15 +4361,15 @@
 asc_srch_pci_dev(PCI_DEVICE *pciDevice)
 {
 	int ret;
-	static int scan = 1;
 
 	ASC_DBG(2, "asc_srch_pci_dev: begin\n");
 
-	if (scan) {
-		pciDevice->type = asc_scan_method(pciDevice);
-		scan = 0;
-		ASC_DBG1(2, "asc_srch_pci_dev: type %d\n", pciDevice->type);
+	if (pci_scan_method == -1) {
+		pci_scan_method = asc_scan_method();
 	}
+	pciDevice->type = pci_scan_method;
+	ASC_DBG1(2, "asc_srch_pci_dev: type %d\n", pciDevice->type);
+
 	ret = asc_pci_find_dev(pciDevice);
 	ASC_DBG1(2, "asc_srch_pci_dev: asc_pci_find_dev() return %d\n", ret);
 	if (ret == PCI_DEVICE_FOUND) {
@@ -4134,7 +4384,7 @@
 			pciDevice->startSlot = 0;
 			pciDevice->endSlot = 0x0f;
 			ret = asc_srch_pci_dev(pciDevice);
-			ASC_DBG1(2, "asc_srch_pci_dev recursive call return %d\n", ret);
+			ASC_DBG1(2, "asc_srch_pci_dev: recursive call return %d\n", ret);
 		}
 	}
 	ASC_DBG1(2, "asc_srch_pci_dev: return %d\n", ret);
@@ -4145,7 +4395,7 @@
  * Determine the access method to be used for 'pciDevice'.
  */
 STATIC uchar
-asc_scan_method(PCI_DEVICE *pciDevice)
+asc_scan_method(void)
 {
 	ushort data;
 	PCI_DATA pciData;
@@ -4197,8 +4447,9 @@
 			deviceid = asc_get_cfg_word(&pciData);
 			ASC_DBG1(3, "asc_pci_find_dev: deviceid %x\n", deviceid);
 			if ((vendorid == ASC_PCI_VENDORID) &&
-				((deviceid == ASC_PCI_DEVICE_ID_REV_A) ||
-				(deviceid == ASC_PCI_DEVICE_ID_REV_B))) {
+				((deviceid == ASC_PCI_DEVICE_ID_1100) ||
+				 (deviceid == ASC_PCI_DEVICE_ID_1200) ||
+				 (deviceid == ASC_PCI_DEVICE_ID_1300))) {
 				pciDevice->slotFound = lslot;
 				ASC_DBG(3, "asc_pci_find_dev: PCI_DEVICE_FOUND\n");
 				return PCI_DEVICE_FOUND;
@@ -4255,29 +4506,29 @@
 STATIC ushort
 asc_get_cfg_word(PCI_DATA *pciData)
 {
-	ushort tmp;
-	ulong address;
-	ulong lbus = pciData->bus;
-	ulong lslot = pciData->slot;
-	ulong lfunc = pciData->func;
-	uchar t2CFA, t2CF8;
-	ushort t1CF8, t1CFA, t1CFC, t1CFE;
+	ushort	tmp;
+	ulong	address;
+	ulong	lbus = pciData->bus;
+	ulong	lslot = pciData->slot;
+	ulong	lfunc = pciData->func;
+	uchar	t2CFA, t2CF8;
+	ulong	t1CF8, t1CFC;
 
 	ASC_DBG4(4, "asc_get_cfg_word: type %d, bus %lu, slot %lu, func %lu\n",
 		pciData->type, lbus, lslot, lfunc);
 
 	/*
-	 * check type of configuration mechanism
+	 * Check type of configuration mechanism.
 	 */
 	if (pciData->type == 2) {
 		/*
-		 * save these registers so we can restore them after we are done
+		 * Save registers to be restored later.
 		 */
 		t2CFA = inp(0xCFA);	/* save PCI bus register */
 		t2CF8 = inp(0xCF8);	/* save config space enable register */
 
 		/*
-		 * go out and write the bus and enable registers
+		 * Write the bus and enable registers.
 		 */
 		/* set for type 1 cycle, if needed */
 		outp(0xCFA, pciData->bus);
@@ -4285,19 +4536,20 @@
 		outp(0xCF8, 0x10 | (pciData->func << 1)) ;
 
 		/*
-		 * read the configuration space type 2 locations
+		 * Read the configuration space type 2 locations.
 		 */
 		tmp = (ushort) inpw(0xC000 | ((pciData->slot << 8) + pciData->offset));
+
+		outp(0xCFA, t2CFA);	/* save PCI bus register */
+		outp(0xCF8, t2CF8);	/* save config space enable register */
 	} else {
 		/*
-		 * type 1 configuration mechanism
+		 * Type 1 or 3 configuration mechanism.
 		 *
-		 * save the CONFIG_ADDRESS and CONFIG_DATA register values
+		 * Save the CONFIG_ADDRESS and CONFIG_DATA register values.
 		 */
-		t1CFC = inpw(0xCFC);
-		t1CFE = inpw(0xCFE);
-		t1CF8 = inpw(0xCF8);
-		t1CFA = inpw(0xCFA);
+		t1CF8 = inpl(0xCF8);
+		t1CFC = inpl(0xCFC);
 
 		/*
 		 * enable <31>, bus = <23:16>, slot = <15:11>,
@@ -4307,15 +4559,21 @@
 			(lfunc << 8) | (pciData->offset & 0xFC) | 0x80000000L);
 
 		/*
-		 * write out the address to CONFIG_ADDRESS
+		 * Write out the address to CONFIG_ADDRESS.
 		 */
-		outl(address, 0xCF8);
+		outpl(0xCF8, address);
 
 		/*
-		 * read in the word from CONFIG_DATA
+		 * Read in word from CONFIG_DATA.
 		 */
-		tmp = (ushort) ((inl(0xCFC) >>
+		tmp = (ushort) ((inpl(0xCFC) >>
 				 ((pciData->offset & 2) * 8)) & 0xFFFF);
+
+		/*
+		 * Restore registers.
+		 */
+		outpl(0xCF8, t1CF8);
+		outpl(0xCFC, t1CFC);
 	}
 	ASC_DBG1(4, "asc_get_cfg_word: config data: %x\n", tmp);
 	return tmp;
@@ -4333,22 +4591,22 @@
 	ulong address;
 	ulong lbus = pciData->bus, lslot = pciData->slot, lfunc = pciData->func;
 	uchar t2CFA, t2CF8;
-	ushort t1CF8, t1CFA, t1CFC, t1CFE;
+	ulong t1CF8, t1CFC;
 
 	ASC_DBG1(4, "asc_get_cfg_byte: type: %d\n", pciData->type);
 
 	/*
-	 * check type of configuration mechanism
+	 * Check type of configuration mechanism.
 	 */
 	if (pciData->type == 2) {
 		/*
-		 * save these registers so we can restore them after we are done
+		 * Save registers to be restored later.
 		 */
 		t2CFA = inp(0xCFA);	/* save PCI bus register */
 		t2CF8 = inp(0xCF8);	/* save config space enable register */
 
 		/*
-		 * go out and write the bus and enable registers
+		 * Write the bus and enable registers.
 		 */
 		/* set for type 1 cycle, if needed */
 		outp(0xCFA, pciData->bus);
@@ -4356,25 +4614,23 @@
 		outp(0xCF8, 0x10 | (pciData->func << 1));
 
 		/*
-		 * read the configuration space type 2 locations
+		 * Read configuration space type 2 locations.
 		 */
 		tmp = inp(0xC000 | ((pciData->slot << 8) + pciData->offset));
 
 		/*
-		 * restore the registers used for our transaction
+		 * Restore registers.
 		 */
 		outp(0xCF8, t2CF8);	/* restore the enable register */
 		outp(0xCFA, t2CFA);	/* restore PCI bus register */
 	} else {
 		/*
-		 * type 1 configuration mechanism
+		 * Type 1 or 3 configuration mechanism.
 		 *
-		 * save the CONFIG_ADDRESS and CONFIG_DATA register values
+		 * Save CONFIG_ADDRESS and CONFIG_DATA register values.
 		 */
-		t1CFC = inpw(0xCFC);
-		t1CFE = inpw(0xCFE);
-		t1CF8 = inpw(0xCF8);
-		t1CFA = inpw(0xCFA);
+		t1CF8 = inpl(0xCF8);
+		t1CFC = inpl(0xCFC);
 
 		/*
 		 * enable <31>, bus = <23:16>, slot = <15:11>, func = <10:8>,
@@ -4384,104 +4640,636 @@
 			(lfunc << 8) | (pciData->offset & 0xFC) | 0x80000000L);
 
 		/*
-		 * write out the address to CONFIG_ADDRESS
+		 * Write out address to CONFIG_ADDRESS.
+		 */
+		outpl(0xCF8, address);
+
+		/*
+		 * Read in word from CONFIG_DATA.
 		 */
-		outl(address, 0xCF8);
+		tmp = (uchar) ((inpl(0xCFC) >> ((pciData->offset & 3) * 8)) & 0xFF);
 
 		/*
-		 * read in the word from CONFIG_DATA
+		 * Restore registers.
 		 */
-		tmp = (uchar) ((inl(0xCFC) >> ((pciData->offset & 3) * 8)) & 0xFF);
+		outpl(0xCF8, t1CF8);
+		outpl(0xCFC, t1CFC);
 	}
 	ASC_DBG1(4, "asc_get_cfg_byte: config data: %x\n", tmp);
 	return tmp;
 }
 
 /*
- * Add a 'Scsi_Cmnd' to the end of specified 'Scsi_Host' 
- * target device pending command list. Set 'pending_tidmask'
+ * Write a byte to the PCI configuration space.
+ */
+void
+asc_put_cfg_byte(PCI_DATA *pciData, uchar byte_data)
+{
+	ulong tmpl;
+	ulong address;
+	ulong lbus = pciData->bus, lslot = pciData->slot, lfunc = pciData->func;
+	uchar t2CFA, t2CF8;
+	ulong t1CF8, t1CFC;
+
+	ASC_DBG2(4, "asc_put_cfg_byte: type: %d, byte_data %x\n",
+		pciData->type, byte_data);
+
+	/*
+	 * Check type of configuration mechanism.
+	 */
+	if (pciData->type == 2) {
+
+		/*
+		 * Save registers to be restored later.
+		 */
+		t2CFA = inp(0xCFA);	/* save PCI bus register */
+		t2CF8 = inp(0xCF8);	/* save config space enable register */
+
+		/*
+		 * Write bus and enable registers.
+		 */
+		outp(0xCFA, pciData->bus);
+
+		/*
+		 * Set the function number.
+		 */
+		outp(0xCF8, 0x10 | (pciData->func << 1));
+
+		/*
+		 * Write the configuration space type 2 locations.
+		 */
+		outp(0xC000 | ((pciData->slot << 8) + pciData->offset), byte_data);
+
+		/*
+		 * Restore registers.
+		 */
+		outp(0xCF8, t2CF8);	/* restore the enable register */
+		outp(0xCFA, t2CFA);	/* restore PCI bus register	*/
+	} else {
+
+		/*
+		 * Type 1 or 3 configuration mechanism.
+		 *
+		 * Save the CONFIG_ADDRESS and CONFIG_DATA register values.
+		 */
+		t1CF8 = inpl(0xCF8);
+		t1CFC = inpl(0xCFC);
+
+		/*
+		 * enable <31>, bus = <23:16>, slot = <15:11>, func = <10:8>,
+		 * reg = <7:2>
+		 */
+		address = (ulong) ((lbus << 16) | (lslot << 11) | (lfunc << 8) |
+				(pciData->offset & 0xFC) | 0x80000000L);
+		/*
+		 * Write out address to CONFIG_ADDRESS.
+		 */
+		outpl(0xCF8, address);
+
+		/*
+		 * Write double word to CONFIG_DATA preserving the bytes
+		 * in the double not written.
+		 */
+		tmpl = inpl(0xCFC) & ~(0xFF << ((pciData->offset & 3) * 8));
+		outpl(0xCFC, tmpl | (byte_data << ((pciData->offset & 3) * 8)));
+
+		/*
+		 * Restore registers.
+		 */
+		outpl(0xCF8, t1CF8);
+		outpl(0xCFC, t1CFC);
+	}
+	ASC_DBG(4, "asc_put_cfg_byte: end\n");
+}
+
+/*
+ * Add a 'REQP' to the end of specified queue. Set 'tidmask'
  * to indicate a command is queued for the device.
  *
  * 'flag' may be either ASC_FRONT or ASC_BACK.
  *
- * The 'Scsi_Cmnd' host_scribble field is used as a next pointer.
+ * 'REQPNEXT(reqp)' returns reqp's next pointer.
  */
-STATIC void
-asc_enqueue(struct Scsi_Host *shp, Scsi_Cmnd *scp, int tid, int flag)
+void
+asc_enqueue(asc_queue_t *ascq, REQP reqp, int flag)
 {
-	Scsi_Cmnd	**scpp;
+	REQP	*reqpp;
+	int		tid;
 
 	ASC_ASSERT(interrupts_enabled() == ASC_FALSE);
+	ASC_DBG3(2, "asc_enqueue: ascq %x, reqp %x, flag %d\n",
+		(unsigned) ascq, (unsigned) reqp, flag);
+	tid = REQPTID(reqp);
 	ASC_ASSERT(flag == ASC_FRONT || flag == ASC_BACK);
-	ASC_STATS(enqueue);
 	if (flag == ASC_FRONT) {
-		scp->host_scribble = (unsigned char *) ASC_BOARD(shp)->pending[tid];
-		ASC_BOARD(shp)->pending[tid] = (Scsi_Cmnd *) scp;
+		REQPNEXT(reqp) = ascq->queue[tid];
+		ascq->queue[tid] = reqp;
 	} else { /* ASC_BACK */
-		for (scpp = &ASC_BOARD(shp)->pending[tid]; *scpp;
-			 scpp = (Scsi_Cmnd **) &(*scpp)->host_scribble) {
+		for (reqpp = &ascq->queue[tid]; *reqpp; reqpp = REQPNEXTP(*reqpp)) {
+			ASC_ASSERT(ascq->tidmask & ASC_TIX_TO_TARGET_ID(tid));
 			;
 		}
-		*scpp = scp;
-		scp->host_scribble = NULL;
+		*reqpp = reqp;
+		REQPNEXT(reqp) = NULL;
 	}
-	ASC_BOARD(shp)->pending_tidmask |= ASC_TIX_TO_TARGET_ID(tid);
+	/* The queue has at least one entry, set its bit. */
+	ascq->tidmask |= ASC_TIX_TO_TARGET_ID(tid);
+#ifdef ADVANSYS_STATS
+	/*
+	 * Maintain request queue statistics.
+	 */
+	ascq->cur_count[tid]++;
+	if (ascq->cur_count[tid] > ascq->max_count[tid]) {
+		ascq->max_count[tid] = ascq->cur_count[tid];
+		ASC_DBG2(1, "asc_enqueue: new max_count[%d] %d\n",
+			tid, ascq->max_count[tid]);
+	}
+#endif /* ADVANSYS_STATS */
+	ASC_DBG1(1, "asc_enqueue: reqp %x\n", (unsigned) reqp);
+	return;
 }
 
 /*
- * Return first pending 'Scsi_Cmnd' on the specified 'Scsi_Host'
- * for the specified target device. Clear the 'pending_tidmask'
- * bit for the device if no more commands are left queued for it.
+ * Return first queued 'REQP' on the specified queue for
+ * the specified target device. Clear the 'tidmask' bit for
+ * the device if no more commands are left queued for it.
  *
- * The 'Scsi_Cmnd' host_scribble field is used as a next pointer.
+ * 'REQPNEXT(reqp)' returns reqp's next pointer.
  */
-STATIC Scsi_Cmnd *
-asc_dequeue(struct Scsi_Host *shp, int tid)
+REQP
+asc_dequeue(asc_queue_t *ascq, int tid)
 {
-	Scsi_Cmnd	*scp;
+	REQP	reqp;
 
-	ASC_STATS(dequeue);
 	ASC_ASSERT(interrupts_enabled() == ASC_FALSE);
-	if ((scp = ASC_BOARD(shp)->pending[tid]) != NULL) {
-		ASC_BOARD(shp)->pending[tid] = (Scsi_Cmnd *) scp->host_scribble;
+	ASC_DBG2(1, "asc_dequeue: ascq %x, tid %d\n", (unsigned) ascq, tid);
+	if ((reqp = ascq->queue[tid]) != NULL) {
+		ASC_ASSERT(ascq->tidmask & ASC_TIX_TO_TARGET_ID(tid));
+		ascq->queue[tid] = REQPNEXT(reqp);
+		/* If the queue is empty, clear its bit. */
+		if (ascq->queue[tid] == NULL) {
+			ascq->tidmask &= ~ASC_TIX_TO_TARGET_ID(tid);
+		}
 	}
-	if (ASC_BOARD(shp)->pending[tid] == NULL) {
-		ASC_BOARD(shp)->pending_tidmask &= ~ASC_TIX_TO_TARGET_ID(tid);
+#ifdef ADVANSYS_STATS
+	/*
+	 * Maintain request queue statistics.
+	 */
+	if (reqp != NULL) {
+		ascq->cur_count[tid]--;
 	}
-	return scp;
+	ASC_ASSERT(ascq->cur_count[tid] >= 0);
+#endif /* ADVANSYS_STATS */
+	ASC_DBG1(1, "asc_dequeue: reqp %x\n", (unsigned) reqp);
+	return reqp;
 }
 
 /*
- * Remove the specified 'Scsi_Cmnd' from the specified 'Scsi_Host'
- * for the specified target device. Clear the 'pending_tidmask'
- * bit for the device if no more commands are left queued for it.
+ * Remove the specified 'REQP' from the specified queue for
+ * the specified target device. Clear the 'tidmask' bit for the
+ * device if no more commands are left queued for it.
  *
- * The 'Scsi_Cmnd' host_scribble field is used as a next pointer.
+ * 'REQPNEXT(reqp)' returns reqp's the next pointer.
  *
- * Return ASC_TRUE if the command was found and removed, otherwise
- * return ASC_FALSE if the command was not found.
+ * Return ASC_TRUE if the command was found and removed,
+ * otherwise return ASC_FALSE.
  */
-STATIC int
-asc_rmqueue(struct Scsi_Host *shp, Scsi_Cmnd *scp, int tid)
+int
+asc_rmqueue(asc_queue_t *ascq, REQP reqp)
 {
-	Scsi_Cmnd	**scpp;
+	REQP		*reqpp;
+	int			tid;
 	int			ret;
 
 	ASC_ASSERT(interrupts_enabled() == ASC_FALSE);
 	ret = ASC_FALSE;
-	for (scpp = &ASC_BOARD(shp)->pending[tid];
-	     *scpp; scpp = (Scsi_Cmnd **) &(*scpp)->host_scribble) {
-		if (*scpp == scp) {
-			*scpp = (Scsi_Cmnd *) scp->host_scribble;	
-			scp->host_scribble = NULL;
-			ASC_STATS(rmqueue);
+	tid = REQPTID(reqp);
+	for (reqpp = &ascq->queue[tid]; *reqpp; reqpp = REQPNEXTP(*reqpp)) {
+		ASC_ASSERT(ascq->tidmask & ASC_TIX_TO_TARGET_ID(tid));
+		if (*reqpp == reqp) {
 			ret = ASC_TRUE;
-			break; /* Note: Don't iterate, *scpp may be NULL. */
+			*reqpp = REQPNEXT(reqp);
+			REQPNEXT(reqp) = NULL;
+			/* If the queue is now empty, clear its bit. */
+			if (ascq->queue[tid] == NULL) {
+				ascq->tidmask &= ~ASC_TIX_TO_TARGET_ID(tid);
+			}
+			break; /* Note: *reqpp may now be NULL, don't iterate. */
+		}
+	}
+#ifdef ADVANSYS_STATS
+	/*
+	 * Maintain request queue statistics.
+	 */
+	if (ret == ASC_TRUE) {
+		ascq->cur_count[tid]--;
+	}
+	ASC_ASSERT(ascq->cur_count[tid] >= 0);
+#endif /* ADVANSYS_STATS */
+	ASC_DBG2(1, "asc_rmqueue: reqp %x, ret %d\n", (unsigned) reqp, ret);
+	return ret;
+}
+
+/*
+ * If the specified 'REQP' is queued on the specified queue for
+ * the specified target device, return ASC_TRUE.
+ */
+int
+asc_isqueued(asc_queue_t *ascq, REQP reqp)
+{
+	REQP		*reqpp;
+	int			tid;
+	int			ret;
+
+	ASC_ASSERT(interrupts_enabled() == ASC_FALSE);
+	ret = ASC_FALSE;
+	tid = REQPTID(reqp);
+	for (reqpp = &ascq->queue[tid]; *reqpp; reqpp = REQPNEXTP(*reqpp)) {
+		ASC_ASSERT(ascq->tidmask & ASC_TIX_TO_TARGET_ID(tid));
+		if (*reqpp == reqp) {
+			ret = ASC_TRUE;
+			break;
+		}
+	}
+	return ret;
+}
+
+/*
+ * Execute as many queued requests as possible for the specified queue.
+ *
+ * Calls asc_execute_scsi_cmnd() to execute a REQP/Scsi_Cmnd.
+ */
+void
+asc_execute_queue(asc_queue_t *ascq)
+{
+	ASC_SCSI_BIT_ID_TYPE	scan_tidmask;
+	REQP					reqp;
+	int						i;
+
+	ASC_ASSERT(interrupts_enabled() == ASC_FALSE);
+	ASC_DBG1(1, "asc_execute_queue: ascq %x\n", (unsigned) ascq);
+	/*
+	 * Execute queued commands for devices attached to
+	 * the current board in round-robin fashion.
+	 */
+	scan_tidmask = ascq->tidmask;
+	do {
+		for (i = 0; i <= ASC_MAX_TID; i++) {
+			if (scan_tidmask & ASC_TIX_TO_TARGET_ID(i)) {
+				if ((reqp = asc_dequeue(ascq, i)) == NULL) {
+					scan_tidmask &= ~ASC_TIX_TO_TARGET_ID(i);
+				} else if (asc_execute_scsi_cmnd((Scsi_Cmnd *) reqp)
+							== ASC_BUSY) {
+					scan_tidmask &= ~ASC_TIX_TO_TARGET_ID(i);
+					/* Put the request back at front of the list. */
+					asc_enqueue(ascq, reqp, ASC_FRONT);
+				}
+			}
+		}
+	} while (scan_tidmask);
+	return;
+}
+
+/*
+ * asc_prt_board_devices()
+ *
+ * Print driver information for devices attached to the board.
+ *
+ * Note: no single line should be greater than ASC_PRTLINE_SIZE,
+ * cf. asc_prt_line().
+ *
+ * Return the number of characters copied into 'cp'. No more than
+ * 'cplen' characters will be copied to 'cp'.
+ */
+STATIC int
+asc_prt_board_devices(struct Scsi_Host *shp, char *cp, int cplen)
+{
+	struct asc_board	*boardp;
+	int					leftlen;
+	int					totlen;
+	int					len;
+	int					i;
+
+	boardp = ASC_BOARDP(shp);
+	leftlen = cplen;
+	totlen = len = 0;
+
+	len = asc_prt_line(cp, leftlen,
+"\nDevice Information for AdvanSys SCSI Host %d:\n", shp->host_no);
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen, "Target Ids Detected:");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		if (boardp->asc_dvc_cfg.chip_scsi_id == i) {
+			continue;
+		} else if (boardp->init_tidmask & (1 << i)) {
+			len = asc_prt_line(cp, leftlen, " %d,", i);
+			ASC_PRT_NEXT();
 		}
 	}
-	if (ASC_BOARD(shp)->pending[tid] == NULL) {
-		ASC_BOARD(shp)->pending_tidmask &= ~ASC_TIX_TO_TARGET_ID(tid);
+	len = asc_prt_line(cp, leftlen, " (%d=Host Adapter)\n",
+					   boardp->asc_dvc_cfg.chip_scsi_id);
+	ASC_PRT_NEXT();
+
+ 	return totlen;
+}
+
+/*
+ * asc_prt_board_eeprom()
+ *
+ * Print board EEPROM configuration.
+ *
+ * Note: no single line should be greater than ASC_PRTLINE_SIZE,
+ * cf. asc_prt_line().
+ *
+ * Return the number of characters copied into 'cp'. No more than
+ * 'cplen' characters will be copied to 'cp'.
+ */
+STATIC int
+asc_prt_board_eeprom(struct Scsi_Host *shp, char *cp, int cplen)
+{
+	struct asc_board	*boardp;
+	ASC_DVC_VAR			*asc_dvc_varp;
+	int					leftlen;
+	int					totlen;
+	int					len;
+	ASCEEP_CONFIG       *ep;
+	int					i;
+	int					isa_dma_speed[] = { 10, 8, 7, 6, 5, 4, 3, 2 };
+
+	boardp = ASC_BOARDP(shp);
+	asc_dvc_varp = &boardp->asc_dvc_var;
+	ep = &boardp->eep_config;
+
+	leftlen = cplen;
+	totlen = len = 0;
+
+	len = asc_prt_line(cp, leftlen,
+"\nEEPROM Settings for AdvanSys SCSI Host %d:\n", shp->host_no);
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" Host SCSI ID: %u, Host Queue Size: %u, Device Queue Size: %u\n",
+		ep->chip_scsi_id, ep->max_total_qng, ep->max_tag_qng);
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" Disconnects:         ");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		len = asc_prt_line(cp, leftlen, " %d:%c",
+			i, (ep->disc_enable & (1 << i)) ? 'Y' : 'N');
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" Command Queuing:     ");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		len = asc_prt_line(cp, leftlen, " %d:%c",
+			i, (ep->use_cmd_qng & (1 << i)) ? 'Y' : 'N');
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" Start Motor:         ");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		len = asc_prt_line(cp, leftlen, " %d:%c",
+			i, (ep->start_motor & (1 << i)) ? 'Y' : 'N');
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" Synchronous Transfer:");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		len = asc_prt_line(cp, leftlen, " %d:%c",
+			i, (ep->init_sdtr & (1 << i)) ? 'Y' : 'N');
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+
+	if (asc_dvc_varp->bus_type & ASC_IS_ISA) {
+		len = asc_prt_line(cp, leftlen,
+" Host ISA DMA speed:   %d MB/S\n",
+			isa_dma_speed[ep->isa_dma_speed]);
+		ASC_PRT_NEXT();
+	}
+
+ 	return totlen;
+}
+
+/*
+ * asc_prt_board_info()
+ *
+ * Print dynamic board configuration information.
+ *
+ * Note: no single line should be greater than ASC_PRTLINE_SIZE,
+ * cf. asc_prt_line().
+ *
+ * Return the number of characters copied into 'cp'. No more than
+ * 'cplen' characters will be copied to 'cp'.
+ */
+STATIC int
+asc_prt_board_info(struct Scsi_Host *shp, char *cp, int cplen)
+{
+	struct asc_board	*boardp;
+	int					leftlen;
+	int					totlen;
+	int					len;
+	ASC_DVC_VAR			*v;
+	ASC_DVC_CFG			*c;
+	int					i;
+#ifdef ADVANSYS_STATS
+	struct asc_stats	*s;
+#endif /* ADVANSYS_STATS */
+
+	boardp = ASC_BOARDP(shp);
+	v = &boardp->asc_dvc_var;
+	c = &boardp->asc_dvc_cfg;
+
+	leftlen = cplen;
+	totlen = len = 0;
+
+	len = asc_prt_line(cp, leftlen,
+"\nAsc Library Configuration and Statistics for AdvanSys SCSI Host %d:\n",
+	shp->host_no);
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" chip_version %u, lib_version %u, lib_serial_no %u mcode_date %u\n",
+		c->chip_version, c->lib_version, c->lib_serial_no, c->mcode_date);
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" mcode_version %u, err_code %u\n",
+		 c->mcode_version, v->err_code);
+	ASC_PRT_NEXT();
+
+	/* Current number of commands pending for the host. */
+	len = asc_prt_line(cp, leftlen,
+" Total Command Pending:    %d\n", v->cur_total_qng);
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" Synchronous Transfer:    ");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		if ((boardp->asc_dvc_cfg.chip_scsi_id == i) ||
+		    ((boardp->init_tidmask & (1 << i)) == 0)) {
+			continue;
+		}
+		len = asc_prt_line(cp, leftlen, " %d:%c",
+			i, (v->sdtr_done & (1 << i)) ? 'Y' : 'N');
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" Command Queuing:         ");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		if ((boardp->asc_dvc_cfg.chip_scsi_id == i) ||
+		    ((boardp->init_tidmask & (1 << i)) == 0)) {
+			continue;
+		}
+		len = asc_prt_line(cp, leftlen, " %d:%c",
+			i, (v->use_tagged_qng & (1 << i)) ? 'Y' : 'N');
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+
+	/* Current number of commands pending for a device. */
+	len = asc_prt_line(cp, leftlen,
+" Command Queue Pending:   ");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		if ((boardp->asc_dvc_cfg.chip_scsi_id == i) ||
+		    ((boardp->init_tidmask & (1 << i)) == 0)) {
+			continue;
+		}
+		len = asc_prt_line(cp, leftlen, " %d:%u", i, v->cur_dvc_qng[i]);
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+
+	/* Current limit on number of commands that can be sent to a device. */
+	len = asc_prt_line(cp, leftlen,
+" Command Queue Limit:     ");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		if ((boardp->asc_dvc_cfg.chip_scsi_id == i) ||
+		    ((boardp->init_tidmask & (1 << i)) == 0)) {
+			continue;
+		}
+		len = asc_prt_line(cp, leftlen, " %d:%u", i, v->max_dvc_qng[i]);
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+
+#ifdef ADVANSYS_STATS
+	s = &boardp->asc_stats;
+
+	/* Indicate whether the device has returned queue full status. */
+	len = asc_prt_line(cp, leftlen,
+" Command Queue Full:      ");
+	ASC_PRT_NEXT();
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		if ((boardp->asc_dvc_cfg.chip_scsi_id == i) ||
+		    ((boardp->init_tidmask & (1 << i)) == 0)) {
+			continue;
+		}
+		if (s->queue_full & (1 << i)) {
+			len = asc_prt_line(cp, leftlen, " %d:Y-%d",
+				i, s->queue_full_cnt[i]);
+		} else {
+			len = asc_prt_line(cp, leftlen, " %d:N", i);
+		}
+		ASC_PRT_NEXT();
+	}
+	len = asc_prt_line(cp, leftlen, "\n");
+	ASC_PRT_NEXT();
+#endif /* ADVANSYS_STATS */
+
+ 	return totlen;
+}
+
+#if LINUX_VERSION_CODE >= ASC_LINUX_VERSION(1,3,0)
+/*
+ * asc_proc_copy() 
+ *
+ * Copy proc information to a read buffer taking into account the current
+ * read offset in the file and the remaining space in the read buffer.
+ */
+STATIC int
+asc_proc_copy(off_t advoffset, off_t offset, char *curbuf, int leftlen,
+			  char *cp, int cplen)
+{
+	int cnt = 0;
+	
+	ASC_DBG3(2, "asc_proc_copy: offset %d, advoffset %d, cplen %d\n",
+			(unsigned) offset, (unsigned) advoffset, cplen);
+	if (offset <= advoffset) {
+		/* Read offset below current offset, copy everything. */
+		cnt = ASC_MIN(cplen, leftlen);
+		ASC_DBG3(2, "asc_proc_copy: curbuf %x, cp %x, cnt %d\n",
+				(unsigned) curbuf, (unsigned) cp, cnt);
+		memcpy(curbuf, cp, cnt);
+	} else if (offset < advoffset + cplen) {
+		/* Read offset within current range, partial copy. */
+		cnt = (advoffset + cplen) - offset;
+		cp = (cp + cplen) - cnt;
+		cnt = ASC_MIN(cnt, leftlen);
+		ASC_DBG3(2, "asc_proc_copy: curbuf %x, cp %x, cnt %d\n",
+				(unsigned) curbuf, (unsigned) cp, cnt);
+		memcpy(curbuf, cp, cnt);
+	}
+	return cnt;
+}
+#endif /* version >= v1.3.0 */
+
+/*
+ * asc_prt_line()
+ *
+ * If 'cp' is NULL print to the console, otherwise print to a buffer.
+ *
+ * Return 0 if printing to the console, otherwise return the number of
+ * bytes written to the buffer.
+ *
+ * Note: If any single line is greater than ASC_PRTLINE_SIZE bytes the stack
+ * will be corrupted. 's[]' is defined to be ASC_PRTLINE_SIZE bytes.
+ */
+int
+asc_prt_line(char *buf, int buflen, char *fmt, ...)
+{
+	va_list		args;
+	int			ret;
+	char		s[ASC_PRTLINE_SIZE];
+
+	va_start(args, fmt);
+	ret = vsprintf(s, fmt, args);
+	ASC_ASSERT(ret < ASC_PRTLINE_SIZE);
+	if (buf == NULL) {
+		(void) printk(s);
+		ret = 0;
+	} else {
+		ret = ASC_MIN(buflen, ret);
+		memcpy(buf, s, ret);
 	}
+	va_end(args);
 	return ret;
 }
 
@@ -4578,7 +5366,7 @@
 		if (i == 2 || i == 10) {
 			continue;
 		}
-		AscPutChipLramData(iop_base, *outbuf);
+		AscSetChipLramDataNoSwap(iop_base, *outbuf);
 	}
 }
 
@@ -4602,7 +5390,7 @@
 		if (i == 5) {
 			continue;
 		}
-		*inbuf = AscGetChipLramData(iop_base);
+		*inbuf = AscGetChipLramDataNoSwap(iop_base);
 	}
 	ASC_DBG_PRT_HEX(2, "DvcGetQinfo", (uchar *) inbuf, 2 * words);
 }
@@ -4669,111 +5457,207 @@
 	return;
 }
 
+/*
+ * Read a PCI configuration byte.
+ */
+uchar
+DvcReadPCIConfigByte( 
+        ASC_DVC_VAR asc_ptr_type *asc_dvc, 
+        ushort offset )
+{
+    PCI_DATA	pciData;
+
+    pciData.bus = ASC_PCI_ID2BUS(asc_dvc->cfg->pci_slot_info);
+    pciData.slot = ASC_PCI_ID2DEV(asc_dvc->cfg->pci_slot_info);
+    pciData.func = ASC_PCI_ID2FUNC(asc_dvc->cfg->pci_slot_info);
+    pciData.offset = offset;
+    pciData.type = pci_scan_method;
+    return asc_get_cfg_byte(&pciData);
+}
 
 /*
- * --- Tracing and Debugging Functions
+ * Write a PCI configuration byte.
  */
+void
+DvcWritePCIConfigByte(
+        ASC_DVC_VAR asc_ptr_type *asc_dvc, 
+        ushort offset, 
+        uchar  byte_data )
+{
+    PCI_DATA	pciData;
 
-#ifdef ADVANSYS_STATS
+    pciData.bus = ASC_PCI_ID2BUS(asc_dvc->cfg->pci_slot_info);
+    pciData.slot = ASC_PCI_ID2DEV(asc_dvc->cfg->pci_slot_info);
+    pciData.func = ASC_PCI_ID2FUNC(asc_dvc->cfg->pci_slot_info);
+    pciData.offset = offset;
+    pciData.type = pci_scan_method;
+    asc_put_cfg_byte(&pciData, byte_data);
+}
 
-#define ASC_PRT_STATS_NEXT() \
-	if (cp) { \
-		totlen += len; \
-		leftlen -= len; \
-		if (leftlen == 0) { \
-			return totlen; \
-		} \
-		cp += len; \
-	}
+/*
+ * Return the BIOS address of the adatper at the specified
+ * I/O port and with the specified bus type.
+ *
+ * This function was formerly supplied by the library.
+ */
+ushort
+AscGetChipBiosAddress(
+        PortAddr iop_base,
+        ushort bus_type
+    )
+{
+    ushort  cfg_lsw ;
+    ushort  bios_addr ;
+
+    /*
+     *   We can't get the BIOS address for PCI
+     */
+    if ( bus_type & ASC_IS_PCI )
+    {
+        return( 0 );
+    }
+
+    if( ( bus_type & ASC_IS_EISA ) != 0 )
+    {
+        cfg_lsw = AscGetEisaChipCfg( iop_base ) ;
+        cfg_lsw &= 0x000F ;
+        bios_addr = ( ushort )( ASC_BIOS_MIN_ADDR  +
+                                ( cfg_lsw * ASC_BIOS_BANK_SIZE ) ) ;
+        return( bios_addr ) ;
+    }/* if */
+
+    cfg_lsw = AscGetChipCfgLsw( iop_base ) ;
+
+    /*
+    *  ISA PnP uses the top bit as the 32K BIOS flag
+    */
+    if ( bus_type == ASC_IS_ISAPNP )
+    {
+        cfg_lsw &= 0x7FFF;
+    }/* if */
+
+    bios_addr = ( ushort )( ( ( cfg_lsw >> 12 ) * ASC_BIOS_BANK_SIZE ) +
+			ASC_BIOS_MIN_ADDR ) ;
+    return( bios_addr ) ;
+}
+
+
+/*
+ * --- Tracing and Debugging Functions
+ */
 
+#ifdef ADVANSYS_STATS
 /*
- * asc_prt_stats()
+ * asc_prt_board_stats()
  *
- * Note: no single line should be greater than 160 characters, cf.
- * asc_prt_stats_line().
+ * Note: no single line should be greater than ASC_PRTLINE_SIZE,
+ * cf. asc_prt_line().
  *
  * Return the number of characters copied into 'cp'. No more than
  * 'cplen' characters will be copied to 'cp'.
  */
 STATIC int
-asc_prt_stats(char *cp, int cplen)
+asc_prt_board_stats(struct Scsi_Host *shp, char *cp, int cplen)
 {
- 	struct asc_stats	*s;
 	int					leftlen;
 	int					totlen;
 	int					len;
+	struct asc_stats	*s;
+	int					i;
+	asc_queue_t			*active;
+	asc_queue_t			*pending;
 
- 	s = &asc_stats;
 	leftlen = cplen;
 	totlen = len = 0;
 
-	len = asc_prt_stats_line(cp, leftlen,
-"\nAdvanSys SCSI Host Driver Statistics:\n");
-	ASC_PRT_STATS_NEXT();
+	s = &ASC_BOARDP(shp)->asc_stats;
+	len = asc_prt_line(cp, leftlen,
+"\nLinux Driver Statistics for AdvanSys SCSI Host %d:\n", shp->host_no);
+	ASC_PRT_NEXT();
 	
-	len = asc_prt_stats_line(cp, leftlen,
-" command %lu, queuecommand %lu, abort %lu, reset %lu, biosparam %lu,\n",
+	len = asc_prt_line(cp, leftlen,
+" command %lu, queuecommand %lu, abort %lu, reset %lu, biosparam %lu\n",
 		s->command, s->queuecommand, s->abort, s->reset, s->biosparam);
-	ASC_PRT_STATS_NEXT();
+	ASC_PRT_NEXT();
 
-	len = asc_prt_stats_line(cp, leftlen,
-" interrupt %lu, callback %lu, cmd_disable %lu, intr_disable %lu,\n",
-		s->interrupt, s->callback, s->cmd_disable, s->intr_disable);
-	ASC_PRT_STATS_NEXT();
-
-	len = asc_prt_stats_line(cp, leftlen,
-" error %lu, enqueue %lu, dequeue %lu, rmqueue %lu,\n",
-		s->error, s->enqueue, s->dequeue, s->rmqueue);
-	ASC_PRT_STATS_NEXT();
+	len = asc_prt_line(cp, leftlen,
+" check_interrupt %lu, interrupt %lu, callback %lu\n",
+		s->check_interrupt, s->interrupt, s->callback);
+	ASC_PRT_NEXT();
+
+	len = asc_prt_line(cp, leftlen,
+" asc_noerror %lu, asc_busy %lu, asc_error %lu, asc_unknown %lu\n",
+		s->asc_noerror, s->asc_busy, s->asc_error, s->asc_unknown);
+	ASC_PRT_NEXT();
+
+	/*
+	 * Display request queuing statistics.
+	 */
+	len = asc_prt_line(cp, leftlen,
+" Active and Pending Request Queues:\n");
+	ASC_PRT_NEXT();
+
+	active = &ASC_BOARDP(shp)->active;
+	pending = &ASC_BOARDP(shp)->pending;
+	for (i = 0; i < ASC_MAX_TID + 1; i++) {
+		if (active->max_count[i] > 0 || pending->max_count[i] > 0) {
+			len = asc_prt_line(cp, leftlen,
+"  target %d: active [cur %d, max %d], pending [cur %d, max %d]\n",
+				i, active->cur_count[i], active->max_count[i],
+				pending->cur_count[i], pending->max_count[i]);
+			ASC_PRT_NEXT();
+		}
+	}
 
+	/*
+	 * Display data transfer statistics.
+	 */
 	if (s->cont_cnt > 0) {
-		len = asc_prt_stats_line(cp, leftlen,
-" cont_cnt %lu, cont_xfer %lu: avg_xfer=%lu kb\n",
-			s->cont_cnt, s->cont_xfer, (s->cont_xfer/2)/s->cont_cnt);
-		ASC_PRT_STATS_NEXT();
+		len = asc_prt_line(cp, leftlen, " cont_cnt %lu, ", s->cont_cnt);
+		ASC_PRT_NEXT();
+
+		len = asc_prt_line(cp, leftlen, "cont_xfer %lu.%01lu kb ",
+					s->cont_xfer/2,
+					ASC_TENTHS(s->cont_xfer, 2));
+		ASC_PRT_NEXT();
+
+		/* Contiguous transfer average size */
+		len = asc_prt_line(cp, leftlen, "avg_xfer %lu.%01lu kb\n",
+					(s->cont_xfer/2)/s->cont_cnt,
+					ASC_TENTHS((s->cont_xfer/2), s->cont_cnt));
+		ASC_PRT_NEXT();
 	}
 
 	if (s->sg_cnt > 0) {
-		len = asc_prt_stats_line(cp, leftlen,
-" sg_cnt %lu, sg_elem %lu, sg_xfer %lu: avg_elem=%lu, avg_size=%lu kb\n",
-			s->sg_cnt, s->sg_elem, s->sg_xfer,
-			s->sg_elem/s->sg_cnt, (s->sg_xfer/2)/s->sg_cnt);
-		ASC_PRT_STATS_NEXT();
+
+		len = asc_prt_line(cp, leftlen, " sg_cnt %lu, sg_elem %lu, ",
+					s->sg_cnt, s->sg_elem);
+		ASC_PRT_NEXT();
+
+		len = asc_prt_line(cp, leftlen, "sg_xfer %lu.%01lu kb\n",
+					s->sg_xfer/2,
+					ASC_TENTHS(s->sg_xfer, 2));
+		ASC_PRT_NEXT();
+
+		/* Scatter gather transfer statistics */
+		len = asc_prt_line(cp, leftlen, " avg_num_elem %lu.%01lu, ",
+					s->sg_elem/s->sg_cnt,
+					ASC_TENTHS(s->sg_elem, s->sg_cnt));
+		ASC_PRT_NEXT();
+
+		len = asc_prt_line(cp, leftlen, "avg_elem_size %lu.%01lu kb, ",
+					(s->sg_xfer/2)/s->sg_elem,
+					ASC_TENTHS((s->sg_xfer/2), s->sg_elem));
+		ASC_PRT_NEXT();
+
+		len = asc_prt_line(cp, leftlen, "avg_xfer_size %lu.%01lu kb\n",
+					(s->sg_xfer/2)/s->sg_cnt,
+					ASC_TENTHS((s->sg_xfer/2), s->sg_cnt));
+		ASC_PRT_NEXT();
 	}
 
  	return totlen;
 }
-
-/*
- * asc_prt_stats_line()
- *
- * If 'cp' is NULL print to the console, otherwise print to a buffer.
- *
- * Return 0 if printing to the console, otherwise return the number of
- * bytes written to the buffer.
- *
- * Note: If any single line is greater than 160 bytes the stack
- * will be corrupted. 's[]' is defined to be 160 bytes.
- */
-int
-asc_prt_stats_line(char *buf, int buflen, char *fmt, ...)
-{
-	va_list		args;
-	int			ret;
-	char		s[160];		/* 2 lines */
-
-	va_start(args, fmt);
-	ret = vsprintf(s, fmt, args);
-	if (buf == NULL) {
-		(void) printk(s);
-		ret = 0;
-	} else {
-		ret = min(buflen, ret);
-		memcpy(buf, s, ret);
-	}
-	va_end(args);
-	return ret;
-}
 #endif /* ADVANSYS_STATS */
 
 #ifdef ADVANSYS_DEBUG
@@ -4787,7 +5671,7 @@
 	printk(
 " next %x, extra_bytes %u, host_busy %u, host_no %d, last_reset %d,\n",
 		(unsigned) s->next, s->extra_bytes, s->host_busy, s->host_no,
-		s->last_reset);
+		(unsigned) s->last_reset);
 
 	printk(
 " host_wait %x, host_queue %x, hostt %x, block %x,\n",
@@ -4807,10 +5691,8 @@
 		s->cmd_per_lun, s->sg_tablesize, s->unchecked_isa_dma,
 		s->loaded_as_module);
 
-	printk("hostdata (struct asc_board)\n");
-	asc_prt_dvc_var(&ASC_BOARD(s)->board);
-	asc_prt_dvc_cfg(&ASC_BOARD(s)->cfg);
-	printk(" overrun_buf %x\n", (unsigned) &ASC_BOARD(s)->overrun_buf[0]);
+	asc_prt_dvc_var(&ASC_BOARDP(s)->asc_dvc_var);
+	asc_prt_dvc_cfg(&ASC_BOARDP(s)->asc_dvc_cfg);
 }
 
 /*
@@ -4851,9 +5733,8 @@
 		(unsigned) h->no_scam, (unsigned) h->pci_fix_asyn_xfer);
 
 	printk(
-" int_count %ld, req_count %ld, busy_count %ld, cfg %x, saved_ptr2func %x\n",
-		h->int_count, h->req_count, h->busy_count, (unsigned) h->cfg,
-		(unsigned) h->saved_ptr2func);
+" cfg %x, saved_ptr2func %x\n",
+		(unsigned) h->cfg, (unsigned) h->saved_ptr2func);
 }
 
 /*
@@ -4974,18 +5855,18 @@
 			break;
 		case 1:
 			printk(" %2.2X",
-				(unsigned) s[i+(j*4)+4]);
+				(unsigned) s[i+(j*4)]);
 			break;
 		case 2:
 			printk(" %2.2X%2.2X",
-				(unsigned) s[i+(j*4)+4],
-				(unsigned) s[i+(j*4)+5]);
+				(unsigned) s[i+(j*4)],
+				(unsigned) s[i+(j*4)+1]);
 			break;
 		case 3:
 			printk(" %2.2X%2.2X%2.2X",
-				(unsigned) s[i+(j*4)+4],
-				(unsigned) s[i+(j*4)+5],
-				(unsigned) s[i+(j*4)+6]);
+				(unsigned) s[i+(j*4)+1],
+				(unsigned) s[i+(j*4)+2],
+				(unsigned) s[i+(j*4)+3]);
 			break;
 		}
 
@@ -5024,7 +5905,6 @@
 )
 {
 	PortAddr            eisa_cfg_iop;
-
 	eisa_cfg_iop = (PortAddr) ASC_GET_EISA_SLOT(iop_base) |
 	  (PortAddr) (ASC_EISA_CFG_IOP_MASK);
 	return (inpw(eisa_cfg_iop));
@@ -5037,7 +5917,6 @@
 )
 {
 	ushort              cfg_lsw;
-
 	if (AscGetChipScsiID(iop_base) == new_host_id) {
 		return (new_host_id);
 	}
@@ -5048,25 +5927,16 @@
 	return (AscGetChipScsiID(iop_base));
 }
 
-ushort
-AscGetChipBiosAddress(
-						 PortAddr iop_base,
-						 ushort bus_type
+uchar
+AscGetChipScsiCtrl(
+					  PortAddr iop_base
 )
 {
-	ushort              cfg_lsw;
-	ushort              bios_addr;
-
-	if ((bus_type & ASC_IS_EISA) != 0) {
-		cfg_lsw = AscGetEisaChipCfg(iop_base);
-		cfg_lsw &= 0x000F;
-		bios_addr = (ushort) (ASC_BIOS_MIN_ADDR +
-							  (cfg_lsw * ASC_BIOS_BANK_SIZE));
-		return (bios_addr);
-	}
-	cfg_lsw = AscGetChipCfgLsw(iop_base);
-	bios_addr = (ushort) (((cfg_lsw >> 12) * ASC_BIOS_BANK_SIZE) + ASC_BIOS_MIN_ADDR);
-	return (bios_addr);
+	uchar               sc;
+	AscSetBank(iop_base, 1);
+	sc = inp(iop_base + IOP_REG_SC);
+	AscSetBank(iop_base, 0);
+	return (sc);
 }
 
 uchar
@@ -5076,10 +5946,8 @@
 )
 {
 	if ((bus_type & ASC_IS_EISA) != 0) {
-
 		PortAddr            eisa_iop;
 		uchar               revision;
-
 		eisa_iop = (PortAddr) ASC_GET_EISA_SLOT(iop_base) |
 		  (PortAddr) ASC_EISA_REV_IOP_MASK;
 		revision = inp(eisa_iop);
@@ -5094,17 +5962,21 @@
 )
 {
 	ushort              chip_ver;
-
 	chip_ver = AscGetChipVerNo(iop_base);
-	if ((chip_ver >= ASC_CHIP_MIN_VER_VL) &&
-		(chip_ver <= ASC_CHIP_MAX_VER_VL)) {
-		if (((iop_base & 0x0C30) == 0x0C30) ||
-			((iop_base & 0x0C50) == 0x0C50)) {
+	if (
+		   (chip_ver >= ASC_CHIP_MIN_VER_VL)
+		   && (chip_ver <= ASC_CHIP_MAX_VER_VL)
+	  ) {
+		if (
+			   ((iop_base & 0x0C30) == 0x0C30)
+			   || ((iop_base & 0x0C50) == 0x0C50)
+		  ) {
 			return (ASC_IS_EISA);
 		}
 		return (ASC_IS_VL);
-	} else if ((chip_ver >= ASC_CHIP_MIN_VER_ISA) &&
-			   (chip_ver <= ASC_CHIP_MAX_VER_ISA)) {
+	}
+	if ((chip_ver >= ASC_CHIP_MIN_VER_ISA) &&
+		(chip_ver <= ASC_CHIP_MAX_VER_ISA)) {
 		if (chip_ver >= ASC_CHIP_MIN_VER_ISA_PNP) {
 			return (ASC_IS_ISAPNP);
 		}
@@ -5112,25 +5984,8 @@
 	} else if ((chip_ver >= ASC_CHIP_MIN_VER_PCI) &&
 			   (chip_ver <= ASC_CHIP_MAX_VER_PCI)) {
 		return (ASC_IS_PCI);
-	} else {
-		return (0);
-	}
-}
-
-void
-AscEnableIsaDma(
-				   uchar dma_channel
-)
-{
-	if (dma_channel < 4) {
-		outp(0x000B, (ushort) (0xC0 | dma_channel));
-		outp(0x000A, dma_channel);
-	} else if (dma_channel < 8) {
-
-		outp(0x00D6, (ushort) (0xC0 | (dma_channel - 4)));
-		outp(0x00D4, (ushort) (dma_channel - 4));
 	}
-	return;
+	return (0);
 }
 
 ulong
@@ -5144,11 +5999,9 @@
 	ulong               chksum;
 	ushort              mcode_word_size;
 	ushort              mcode_chksum;
-
 	mcode_word_size = (ushort) (mcode_size >> 1);
 	AscMemWordSetLram(iop_base, s_addr, 0, mcode_word_size);
 	AscMemWordCopyToLram(iop_base, s_addr, mcode_buf, mcode_word_size);
-
 	chksum = AscMemSumLramWord(iop_base, s_addr, mcode_word_size);
 	mcode_chksum = (ushort) AscMemSumLramWord(iop_base,
 											  (ushort) ASC_CODE_SEC_BEG,
@@ -5158,12 +6011,23 @@
 	return (chksum);
 }
 
-uchar               _hextbl_[16] =
-{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
- 'A', 'B', 'C', 'D', 'E', 'F'};
+int
+AscFindSignature(
+					PortAddr iop_base
+)
+{
+	ushort              sig_word;
+	if (AscGetChipSignatureByte(iop_base) == (uchar) ASC_1000_ID1B) {
+		sig_word = AscGetChipSignatureWord(iop_base);
+		if ((sig_word == (ushort) ASC_1000_ID0W) ||
+			(sig_word == (ushort) ASC_1000_ID0W_FIX)) {
+			return (1);
+		}
+	}
+	return (0);
+}
 
 uchar               _isa_pnp_inited = 0;
-
 PortAddr            _asc_def_iop_base[ASC_IOADR_TABLE_MAX_IX] =
 {
 	0x100, ASC_IOADR_1, 0x120, ASC_IOADR_2, 0x140, ASC_IOADR_3, ASC_IOADR_4,
@@ -5210,10 +6074,8 @@
 						 PortAddr s_addr
 )
 {
-
 	int                 i;
 	PortAddr            iop_base;
-
 	for (i = 0; i < ASC_IOADR_TABLE_MAX_IX; i++) {
 		if (_asc_def_iop_base[i] > s_addr) {
 			break;
@@ -5221,6 +6083,13 @@
 	}
 	for (; i < ASC_IOADR_TABLE_MAX_IX; i++) {
 		iop_base = _asc_def_iop_base[i];
+		if (check_region(iop_base, ASC_IOADR_GAP) != 0) {
+			ASC_DBG1(1,
+			   "AscSearchIOPortAddr11: check_region() failed I/O port %x\n",
+					 iop_base);
+			continue;
+		}
+		ASC_DBG1(1, "AscSearchIOPortAddr11: probing I/O port %x\n", iop_base);
 		if (AscFindSignature(iop_base)) {
 			return (iop_base);
 		}
@@ -5228,23 +6097,6 @@
 	return (0);
 }
 
-int
-AscFindSignature(
-					PortAddr iop_base
-)
-{
-	ushort              sig_word;
-
-	if ((inp((PortAddr) (iop_base + 1)) & 0xFF) == (uchar) ASC_1000_ID1B) {
-		sig_word = inpw(iop_base);
-		if ((sig_word == (ushort) ASC_1000_ID0W) ||
-			(sig_word == (ushort) ASC_1000_ID0W_FIX)) {
-			return (1);
-		}
-	}
-	return (0);
-}
-
 void
 AscToggleIRQAct(
 				   PortAddr iop_base
@@ -5256,14 +6108,17 @@
 }
 
 #if CC_INIT_INQ_DISPLAY
-
+uchar               _hextbl_[16] =
+{
+	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+	'A', 'B', 'C', 'D', 'E', 'F'
+};
 #endif
 
 void
 AscSetISAPNPWaitForKey(
-						  void)
+	void)
 {
-
 	outp(ASC_ISA_PNP_PORT_ADDR, 0x02);
 	outp(ASC_ISA_PNP_PORT_WRITE, 0x02);
 	return;
@@ -5277,35 +6132,34 @@
 {
 	ushort              cfg_lsw;
 	uchar               chip_irq;
-
 	if ((bus_type & ASC_IS_EISA) != 0) {
-
 		cfg_lsw = AscGetEisaChipCfg(iop_base);
 		chip_irq = (uchar) (((cfg_lsw >> 8) & 0x07) + 10);
 		if ((chip_irq == 13) || (chip_irq > 15)) {
-
 			return (0);
 		}
 		return (chip_irq);
-	} else {
-
+	}
+	if ((bus_type & ASC_IS_VL) != 0) {
 		cfg_lsw = AscGetChipCfgLsw(iop_base);
-
-		if ((bus_type & ASC_IS_VL) != 0) {
-
-			chip_irq = (uchar) (((cfg_lsw >> 2) & 0x07));
-			if ((chip_irq == 0) ||
-				(chip_irq == 4) ||
-				(chip_irq == 7)) {
-				return (0);
-			}
-			return ((uchar) (chip_irq + (ASC_MIN_IRQ_NO - 1)));
+		chip_irq = (uchar) (((cfg_lsw >> 2) & 0x07));
+		if ((chip_irq == 0) ||
+			(chip_irq == 4) ||
+			(chip_irq == 7)) {
+			return (0);
+		}
+#if CC_PLEXTOR_VL
+		if (chip_irq == 5) {
+			return (9);
 		}
-		chip_irq = (uchar) (((cfg_lsw >> 2) & 0x03));
-		if (chip_irq == 3)
-			chip_irq += (uchar) 2;
-		return ((uchar) (chip_irq + ASC_MIN_IRQ_NO));
+#endif
+		return ((uchar) (chip_irq + (ASC_MIN_IRQ_NO - 1)));
 	}
+	cfg_lsw = AscGetChipCfgLsw(iop_base);
+	chip_irq = (uchar) (((cfg_lsw >> 2) & 0x03));
+	if (chip_irq == 3)
+		chip_irq += (uchar) 2;
+	return ((uchar) (chip_irq + ASC_MIN_IRQ_NO));
 }
 
 uchar
@@ -5316,10 +6170,13 @@
 )
 {
 	ushort              cfg_lsw;
-
 	if ((bus_type & ASC_IS_VL) != 0) {
-
 		if (irq_no != 0) {
+#if CC_PLEXTOR_VL
+			if (irq_no == 9) {
+				irq_no = 14;
+			}
+#endif
 			if ((irq_no < ASC_MIN_IRQ_NO) || (irq_no > ASC_MAX_IRQ_NO)) {
 				irq_no = 0;
 			} else {
@@ -5330,16 +6187,13 @@
 		cfg_lsw |= (ushort) 0x0010;
 		AscSetChipCfgLsw(iop_base, cfg_lsw);
 		AscToggleIRQAct(iop_base);
-
 		cfg_lsw = (ushort) (AscGetChipCfgLsw(iop_base) & 0xFFE0);
 		cfg_lsw |= (ushort) ((irq_no & 0x07) << 2);
 		AscSetChipCfgLsw(iop_base, cfg_lsw);
 		AscToggleIRQAct(iop_base);
-
 		return (AscGetChipIRQ(iop_base, bus_type));
-
-	} else if ((bus_type & (ASC_IS_ISA)) != 0) {
-
+	}
+	if ((bus_type & (ASC_IS_ISA)) != 0) {
 		if (irq_no == 15)
 			irq_no -= (uchar) 2;
 		irq_no -= (uchar) ASC_MIN_IRQ_NO;
@@ -5347,30 +6201,28 @@
 		cfg_lsw |= (ushort) ((irq_no & 0x03) << 2);
 		AscSetChipCfgLsw(iop_base, cfg_lsw);
 		return (AscGetChipIRQ(iop_base, bus_type));
-	} else {
-
-		return (0);
 	}
+	return (0);
 }
 
-uchar
-AscGetChipScsiCtrl(
-					  PortAddr iop_base
+void
+AscEnableIsaDma(
+				   uchar dma_channel
 )
 {
-	uchar               sc;
-
-	AscSetBank(iop_base, 1);
-	sc = inp(iop_base + IOP_REG_SC);
-	AscSetBank(iop_base, 0);
-	return (sc);
+	if (dma_channel < 4) {
+		outp(0x000B, (ushort) (0xC0 | dma_channel));
+		outp(0x000A, dma_channel);
+	} else if (dma_channel < 8) {
+		outp(0x00D6, (ushort) (0xC0 | (dma_channel - 4)));
+		outp(0x00D4, (ushort) (dma_channel - 4));
+	}
+	return;
 }
 
-extern uchar        _sdtr_period_tbl_[];
-
 int
 AscIsrChipHalted(
-					ASC_DVC_VAR asc_ptr_type * asc_dvc
+					REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	SDTR_XMSG           sdtr_xmsg;
@@ -5384,16 +6236,14 @@
 	uchar               tag_code;
 	uchar               q_status;
 	uchar               halt_qp;
-	uchar               sdtr_data;
+	uchar               sdtr_data = 0;
 	uchar               target_ix;
 	uchar               q_cntl, tid_no;
 	uchar               cur_dvc_qng;
 	uchar               asyn_sdtr;
 	uchar               scsi_status;
-
 	iop_base = asc_dvc->iop_base;
 	int_halt_code = AscReadLramWord(iop_base, ASCV_HALTCODE_W);
-
 	halt_qp = AscReadLramByte(iop_base, ASCV_CURCDB_B);
 	halt_q_addr = ASC_QNO_TO_QADDR(halt_qp);
 	target_ix = AscReadLramByte(iop_base,
@@ -5403,53 +6253,73 @@
 	tid_no = ASC_TIX_TO_TID(target_ix);
 	target_id = (uchar) ASC_TID_TO_TARGET_ID(tid_no);
 	if (asc_dvc->pci_fix_asyn_xfer & target_id) {
-
 		asyn_sdtr = ASYN_SDTR_DATA_FIX_PCI_REV_AB;
 	} else {
 		asyn_sdtr = 0;
 	}
-	if (int_halt_code == ASC_HALT_EXTMSG_IN) {
-
+	if (int_halt_code == ASC_HALT_DISABLE_ASYN_USE_SYN_FIX) {
+		if (asc_dvc->pci_fix_asyn_xfer & target_id) {
+			AscSetChipSDTR(iop_base, 0, tid_no);
+		}
+		AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
+		return (0);
+	} else if (int_halt_code == ASC_HALT_ENABLE_ASYN_USE_SYN_FIX) {
+		if (asc_dvc->pci_fix_asyn_xfer & target_id) {
+			AscSetChipSDTR(iop_base, asyn_sdtr, tid_no);
+		}
+		AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
+		return (0);
+	} else if (int_halt_code == ASC_HALT_EXTMSG_IN) {
 		AscMemWordCopyFromLram(iop_base,
 							   ASCV_MSGIN_BEG,
 							   (ushort dosfar *) & sdtr_xmsg,
 							   (ushort) (sizeof (SDTR_XMSG) >> 1));
-		if ((sdtr_xmsg.msg_type == MS_EXTEND) &&
-			(sdtr_xmsg.msg_len == MS_SDTR_LEN)) {
+		if (
+			   (sdtr_xmsg.msg_type == MS_EXTEND)
+			   && (sdtr_xmsg.msg_len == MS_SDTR_LEN)
+		  ) {
 			sdtr_accept = TRUE;
 			if (sdtr_xmsg.msg_req == MS_SDTR_CODE) {
-				if (sdtr_xmsg.req_ack_offset > ASC_SYN_MAX_OFFSET) {
-
+				if (
+					   (sdtr_xmsg.req_ack_offset > ASC_SYN_MAX_OFFSET)
+				  ) {
 					sdtr_accept = FALSE;
 					sdtr_xmsg.req_ack_offset = ASC_SYN_MAX_OFFSET;
 				}
-				sdtr_data = AscCalSDTRData(sdtr_xmsg.xfer_period,
-										   sdtr_xmsg.req_ack_offset);
+				if (
+					   (sdtr_xmsg.xfer_period < asc_dvc->sdtr_period_tbl[0])
+					   || (sdtr_xmsg.xfer_period > asc_dvc->sdtr_period_tbl[asc_dvc->max_sdtr_index])
+				  ) {
+					sdtr_accept = FALSE;
+				}
+				if (sdtr_accept) {
+					sdtr_data = AscCalSDTRData(asc_dvc, sdtr_xmsg.xfer_period,
+											   sdtr_xmsg.req_ack_offset);
+					if ((sdtr_data == 0xFF)) {
+						q_cntl |= QC_MSG_OUT;
+						asc_dvc->init_sdtr &= ~target_id;
+						asc_dvc->sdtr_done &= ~target_id;
+						AscSetChipSDTR(iop_base, asyn_sdtr, tid_no);
+					}
+				}
 				if (sdtr_xmsg.req_ack_offset == 0) {
-
 					q_cntl &= ~QC_MSG_OUT;
 					asc_dvc->init_sdtr &= ~target_id;
 					asc_dvc->sdtr_done &= ~target_id;
 					AscSetChipSDTR(iop_base, asyn_sdtr, tid_no);
-				} else if ((sdtr_data == 0xFF)) {
-
-					q_cntl |= QC_MSG_OUT;
-					asc_dvc->init_sdtr &= ~target_id;
-					asc_dvc->sdtr_done &= ~target_id;
-					AscSetChipSDTR(iop_base, asyn_sdtr, tid_no);
 				} else {
-					if (sdtr_accept && (q_cntl & QC_MSG_OUT)) {
-
+					if (
+						   sdtr_accept
+						   && (q_cntl & QC_MSG_OUT)
+					  ) {
 						q_cntl &= ~QC_MSG_OUT;
 						asc_dvc->sdtr_done |= target_id;
 						asc_dvc->init_sdtr |= target_id;
 						asc_dvc->pci_fix_asyn_xfer &= ~target_id;
 						AscSetChipSDTR(iop_base, sdtr_data, tid_no);
 					} else {
-
 						q_cntl |= QC_MSG_OUT;
-
-						AscMsgOutSDTR(iop_base,
+						AscMsgOutSDTR(asc_dvc,
 									  sdtr_xmsg.xfer_period,
 									  sdtr_xmsg.req_ack_offset);
 						asc_dvc->pci_fix_asyn_xfer &= ~target_id;
@@ -5458,7 +6328,6 @@
 						asc_dvc->init_sdtr |= target_id;
 					}
 				}
-
 				AscWriteLramByte(iop_base,
 						 (ushort) (halt_q_addr + (ushort) ASC_SCSIQ_B_CNTL),
 								 q_cntl);
@@ -5467,62 +6336,59 @@
 			}
 		}
 	} else if (int_halt_code == ASC_HALT_CHK_CONDITION) {
-
 		q_cntl |= QC_REQ_SENSE;
+#if CC_CHK_COND_REDO_SDTR
 		if (((asc_dvc->init_sdtr & target_id) != 0) &&
 			((asc_dvc->sdtr_done & target_id) != 0)) {
-
-			sdtr_data = AscReadLramByte(iop_base,
-				  (ushort) ((ushort) ASCV_SDTR_DATA_BEG + (ushort) tid_no));
-			AscMsgOutSDTR(iop_base,
-						  _sdtr_period_tbl_[(sdtr_data >> 4) & (uchar) (ASC_SYN_XFER_NO - 1)],
-						  (uchar) (sdtr_data & (uchar) ASC_SYN_MAX_OFFSET));
+			asc_dvc->sdtr_done &= ~target_id;
+			sdtr_data = AscGetMCodeInitSDTRAtID(iop_base, tid_no);
 			q_cntl |= QC_MSG_OUT;
+			AscMsgOutSDTR(asc_dvc,
+						  asc_dvc->sdtr_period_tbl[(sdtr_data >> 4) & (uchar) (ASC_SYN_XFER_NO - 1)],
+						  (uchar) (sdtr_data & (uchar) ASC_SYN_MAX_OFFSET));
 		}
+#endif
 		AscWriteLramByte(iop_base,
 						 (ushort) (halt_q_addr + (ushort) ASC_SCSIQ_B_CNTL),
 						 q_cntl);
-
 		tag_code = AscReadLramByte(iop_base,
 					(ushort) (halt_q_addr + (ushort) ASC_SCSIQ_B_TAG_CODE));
 		tag_code &= 0xDC;
+		if (
+			   (asc_dvc->pci_fix_asyn_xfer & target_id)
+			   && !(asc_dvc->pci_fix_asyn_xfer_always & target_id)
+		  ) {
+			tag_code |= (ASC_TAG_FLAG_DISABLE_DISCONNECT
+						 | ASC_TAG_FLAG_DISABLE_ASYN_USE_SYN_FIX);
+		}
 		AscWriteLramByte(iop_base,
 					 (ushort) (halt_q_addr + (ushort) ASC_SCSIQ_B_TAG_CODE),
 						 tag_code);
-
 		q_status = AscReadLramByte(iop_base,
 					  (ushort) (halt_q_addr + (ushort) ASC_SCSIQ_B_STATUS));
 		q_status |= (QS_READY | QS_BUSY);
 		AscWriteLramByte(iop_base,
 					   (ushort) (halt_q_addr + (ushort) ASC_SCSIQ_B_STATUS),
 						 q_status);
-
 		scsi_busy = AscReadLramByte(iop_base,
 									(ushort) ASCV_SCSIBUSY_B);
 		scsi_busy &= ~target_id;
 		AscWriteLramByte(iop_base, (ushort) ASCV_SCSIBUSY_B, scsi_busy);
-
 		AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
 		return (0);
 	} else if (int_halt_code == ASC_HALT_SDTR_REJECTED) {
-
 		AscMemWordCopyFromLram(iop_base,
 							   ASCV_MSGOUT_BEG,
 							   (ushort dosfar *) & out_msg,
 							   (ushort) (sizeof (SDTR_XMSG) >> 1));
-
 		if ((out_msg.msg_type == MS_EXTEND) &&
 			(out_msg.msg_len == MS_SDTR_LEN) &&
 			(out_msg.msg_req == MS_SDTR_CODE)) {
-
 			asc_dvc->init_sdtr &= ~target_id;
 			asc_dvc->sdtr_done &= ~target_id;
 			AscSetChipSDTR(iop_base, asyn_sdtr, tid_no);
-
 		} else {
-
 		}
-
 		q_cntl &= ~QC_MSG_OUT;
 		AscWriteLramByte(iop_base,
 						 (ushort) (halt_q_addr + (ushort) ASC_SCSIQ_B_CNTL),
@@ -5530,30 +6396,44 @@
 		AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
 		return (0);
 	} else if (int_halt_code == ASC_HALT_SS_QUEUE_FULL) {
-
 		scsi_status = AscReadLramByte(iop_base,
 		  (ushort) ((ushort) halt_q_addr + (ushort) ASC_SCSIQ_SCSI_STATUS));
 		cur_dvc_qng = AscReadLramByte(iop_base,
 					 (ushort) ((ushort) ASC_QADR_BEG + (ushort) target_ix));
 		if ((cur_dvc_qng > 0) &&
 			(asc_dvc->cur_dvc_qng[tid_no] > 0)) {
-
 			scsi_busy = AscReadLramByte(iop_base,
 										(ushort) ASCV_SCSIBUSY_B);
 			scsi_busy |= target_id;
 			AscWriteLramByte(iop_base,
 							 (ushort) ASCV_SCSIBUSY_B, scsi_busy);
 			asc_dvc->queue_full_or_busy |= target_id;
-
 			if (scsi_status == SS_QUEUE_FULL) {
 				if (cur_dvc_qng > ASC_MIN_TAGGED_CMD) {
 					cur_dvc_qng -= 1;
 					asc_dvc->max_dvc_qng[tid_no] = cur_dvc_qng;
-
 					AscWriteLramByte(iop_base,
 									 (ushort) ((ushort) ASCV_MAX_DVC_QNG_BEG + (ushort) tid_no),
 									 cur_dvc_qng);
 				}
+#ifdef ADVANSYS_STATS
+				{
+					struct asc_board   *boardp;
+					int                 i;
+					for (i = 0; i < ASC_NUM_BOARD_SUPPORTED; i++) {
+						if (asc_host[i] == NULL) {
+							continue;
+						}
+						boardp = ASC_BOARDP(asc_host[i]);
+						if (&boardp->asc_dvc_var == asc_dvc) {
+							boardp->asc_stats.queue_full |= target_id;
+							boardp->asc_stats.queue_full_cnt[tid_no] =
+							  cur_dvc_qng;
+							break;
+						}
+					}
+				}
+#endif
 			}
 		}
 		AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
@@ -5566,57 +6446,52 @@
 _AscCopyLramScsiDoneQ(
 						 PortAddr iop_base,
 						 ushort q_addr,
-						 ASC_QDONE_INFO dosfar * scsiq,
+						 REG ASC_QDONE_INFO dosfar * scsiq,
 						 ulong max_dma_count
 )
 {
 	ushort              _val;
 	uchar               sg_queue_cnt;
-
 	DvcGetQinfo(iop_base,
 				(ushort) (q_addr + (ushort) ASC_SCSIQ_DONE_INFO_BEG),
 				(ushort dosfar *) scsiq,
 			  (ushort) ((sizeof (ASC_SCSIQ_2) + sizeof (ASC_SCSIQ_3)) / 2));
-
 #if !CC_LITTLE_ENDIAN_HOST
 	AscAdjEndianQDoneInfo(scsiq);
 #endif
-
 	_val = AscReadLramWord(iop_base,
 						   (ushort) (q_addr + (ushort) ASC_SCSIQ_B_STATUS));
 	scsiq->q_status = (uchar) _val;
 	scsiq->q_no = (uchar) (_val >> 8);
-
 	_val = AscReadLramWord(iop_base,
 						   (ushort) (q_addr + (ushort) ASC_SCSIQ_B_CNTL));
 	scsiq->cntl = (uchar) _val;
 	sg_queue_cnt = (uchar) (_val >> 8);
-
 	_val = AscReadLramWord(iop_base,
 						(ushort) (q_addr + (ushort) ASC_SCSIQ_B_SENSE_LEN));
 	scsiq->sense_len = (uchar) _val;
-	scsiq->user_def = (uchar) (_val >> 8);
-
+	scsiq->extra_bytes = (uchar) (_val >> 8);
 	scsiq->remain_bytes = AscReadLramDWord(iop_base,
 				 (ushort) (q_addr + (ushort) ASC_SCSIQ_DW_REMAIN_XFER_CNT));
 	scsiq->remain_bytes &= max_dma_count;
-
 	return (sg_queue_cnt);
 }
 
 int
 AscIsrQDone(
-			   ASC_DVC_VAR asc_ptr_type * asc_dvc
+			   REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	uchar               next_qp;
-	uchar               i;
 	uchar               n_q_used;
 	uchar               sg_list_qp;
 	uchar               sg_queue_cnt;
+	uchar               q_cnt;
 	uchar               done_q_tail;
-
 	uchar               tid_no;
+#if CC_LINK_BUSY_Q
+	uchar               exe_tid_no;
+#endif
 	ASC_SCSI_BIT_ID_TYPE scsi_busy;
 	ASC_SCSI_BIT_ID_TYPE target_id;
 	PortAddr            iop_base;
@@ -5624,20 +6499,14 @@
 	ushort              sg_q_addr;
 	uchar               cur_target_qng;
 	ASC_QDONE_INFO      scsiq_buf;
-	ASC_QDONE_INFO dosfar *scsiq;
+	REG ASC_QDONE_INFO dosfar *scsiq;
 	int                 false_overrun;
 	ASC_ISR_CALLBACK    asc_isr_callback;
-
-	uchar               tag_code;
-
 #if CC_LINK_BUSY_Q
 	ushort              n_busy_q_done;
-
 #endif
-
 	iop_base = asc_dvc->iop_base;
 	asc_isr_callback = (ASC_ISR_CALLBACK) asc_dvc->isr_callback;
-
 	n_q_used = 1;
 	scsiq = (ASC_QDONE_INFO dosfar *) & scsiq_buf;
 	done_q_tail = (uchar) AscGetVarDoneQTail(iop_base);
@@ -5645,12 +6514,9 @@
 	next_qp = AscReadLramByte(iop_base,
 							  (ushort) (q_addr + (ushort) ASC_SCSIQ_B_FWD));
 	if (next_qp != ASC_QLINK_END) {
-
 		AscPutVarDoneQTail(iop_base, next_qp);
 		q_addr = ASC_QNO_TO_QADDR(next_qp);
-
 		sg_queue_cnt = _AscCopyLramScsiDoneQ(iop_base, q_addr, scsiq, asc_dvc->max_dma_count);
-
 		AscWriteLramByte(iop_base,
 						 (ushort) (q_addr + (ushort) ASC_SCSIQ_B_STATUS),
 			 (uchar) (scsiq->q_status & (uchar) ~ (QS_READY | QS_ABORTED)));
@@ -5659,7 +6525,7 @@
 		if ((scsiq->cntl & QC_SG_HEAD) != 0) {
 			sg_q_addr = q_addr;
 			sg_list_qp = next_qp;
-			for (i = 0; i < sg_queue_cnt; i++) {
+			for (q_cnt = 0; q_cnt < sg_queue_cnt; q_cnt++) {
 				sg_list_qp = AscReadLramByte(iop_base,
 						   (ushort) (sg_q_addr + (ushort) ASC_SCSIQ_B_FWD));
 				sg_q_addr = ASC_QNO_TO_QADDR(sg_list_qp);
@@ -5673,12 +6539,10 @@
 						 (ushort) (sg_q_addr + (ushort) ASC_SCSIQ_B_STATUS),
 								 QS_FREE);
 			}
-
 			n_q_used = sg_queue_cnt + 1;
 			AscPutVarDoneQTail(iop_base, sg_list_qp);
 		}
 		if (asc_dvc->queue_full_or_busy & target_id) {
-
 			cur_target_qng = AscReadLramByte(iop_base,
 			(ushort) ((ushort) ASC_QADR_BEG + (ushort) scsiq->d2.target_ix));
 			if (cur_target_qng < asc_dvc->max_dvc_qng[tid_no]) {
@@ -5700,37 +6564,31 @@
 			scsiq->d3.done_stat = QD_WITH_ERROR;
 			goto FATAL_ERR_QDONE;
 		}
-
 		if ((scsiq->d2.srb_ptr == 0UL) ||
 			((scsiq->q_status & QS_ABORTED) != 0)) {
-
 			return (0x11);
 		} else if (scsiq->q_status == QS_DONE) {
-
 			false_overrun = FALSE;
-
-			if (asc_dvc->bug_fix_cntl) {
-				if (asc_dvc->bug_fix_cntl & ASC_BUG_FIX_ADD_ONE_BYTE) {
-					tag_code = AscReadLramByte(iop_base,
-						 (ushort) (q_addr + (ushort) ASC_SCSIQ_B_TAG_CODE));
-					if (tag_code & ASC_TAG_FLAG_ADD_ONE_BYTE) {
-						if (scsiq->remain_bytes != 0UL) {
-							scsiq->remain_bytes--;
-							if (scsiq->remain_bytes == 0UL) {
-								false_overrun = TRUE;
-							}
-						}
-					}
-				}
+			if (scsiq->extra_bytes != 0) {
+				scsiq->remain_bytes += (ulong) scsiq->extra_bytes;
 			}
-			if ((scsiq->d3.done_stat == QD_WITH_ERROR) &&
-				(scsiq->d3.host_stat == QHSTA_M_DATA_OVER_RUN)) {
-				if ((scsiq->cntl & (QC_DATA_IN | QC_DATA_OUT)) == 0) {
-					scsiq->d3.done_stat = QD_NO_ERROR;
-					scsiq->d3.host_stat = QHSTA_NO_ERROR;
-				} else if (false_overrun) {
-					scsiq->d3.done_stat = QD_NO_ERROR;
-					scsiq->d3.host_stat = QHSTA_NO_ERROR;
+			if (scsiq->d3.done_stat == QD_WITH_ERROR) {
+				if (scsiq->d3.host_stat == QHSTA_M_DATA_OVER_RUN) {
+					if ((scsiq->cntl & (QC_DATA_IN | QC_DATA_OUT)) == 0) {
+						scsiq->d3.done_stat = QD_NO_ERROR;
+						scsiq->d3.host_stat = QHSTA_NO_ERROR;
+					} else if (false_overrun) {
+						scsiq->d3.done_stat = QD_NO_ERROR;
+						scsiq->d3.host_stat = QHSTA_NO_ERROR;
+					}
+				} else if (scsiq->d3.host_stat == QHSTA_M_HUNG_REQ_SCSI_BUS_RESET) {
+					AscStopChip(iop_base);
+					AscSetChipControl(iop_base, (uchar) (CC_SCSI_RESET | CC_HALT));
+					DvcDelayNanoSecond(asc_dvc, 30000);
+					AscSetChipControl(iop_base, CC_HALT);
+					AscSetChipStatus(iop_base, CIW_CLR_SCSI_RESET_INT);
+					AscSetChipStatus(iop_base, 0);
+					AscSetChipControl(iop_base, 0);
 				}
 			}
 #if CC_CLEAR_LRAM_SRB_PTR
@@ -5738,46 +6596,39 @@
 							(ushort) (q_addr + (ushort) ASC_SCSIQ_D_SRBPTR),
 							  asc_dvc->int_count);
 #endif
-
 			if ((scsiq->cntl & QC_NO_CALLBACK) == 0) {
 				(*asc_isr_callback) (asc_dvc, scsiq);
 			} else {
 				if ((AscReadLramByte(iop_base,
 						  (ushort) (q_addr + (ushort) ASC_SCSIQ_CDB_BEG)) ==
 					 SCSICMD_StartStopUnit)) {
-
 					asc_dvc->unit_not_ready &= ~target_id;
 					if (scsiq->d3.done_stat != QD_NO_ERROR) {
 						asc_dvc->start_motor &= ~target_id;
 					}
 				}
 			}
-
 #if CC_LINK_BUSY_Q
 			n_busy_q_done = AscIsrExeBusyQueue(asc_dvc, tid_no);
 			if (n_busy_q_done == 0) {
-
-				i = tid_no + 1;
+				exe_tid_no = (uint) tid_no + 1;
 				while (TRUE) {
-					if (i > ASC_MAX_TID)
-						i = 0;
-					if (i == tid_no)
+					if (exe_tid_no > ASC_MAX_TID)
+						exe_tid_no = 0;
+					if (exe_tid_no == (uint) tid_no)
 						break;
-					n_busy_q_done = AscIsrExeBusyQueue(asc_dvc, i);
+					n_busy_q_done = AscIsrExeBusyQueue(asc_dvc, exe_tid_no);
 					if (n_busy_q_done != 0)
 						break;
-					i++;
+					exe_tid_no++;
 				}
 			}
 			if (n_busy_q_done == 0xFFFF)
 				return (0x80);
 #endif
-
 			return (1);
 		} else {
-
 			AscSetLibErrorCode(asc_dvc, ASCQ_ERR_Q_STATUS);
-
 		  FATAL_ERR_QDONE:
 			if ((scsiq->cntl & QC_NO_CALLBACK) == 0) {
 				(*asc_isr_callback) (asc_dvc, scsiq);
@@ -5788,9 +6639,12 @@
 	return (0);
 }
 
+#if CC_LINK_BUSY_Q
+#endif
+
 int
 AscISR(
-		  ASC_DVC_VAR asc_ptr_type * asc_dvc
+		  REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	ASC_CS_TYPE         chipstat;
@@ -5801,15 +6655,11 @@
 	int                 int_pending;
 	int                 status;
 	uchar               host_flag;
-
 	iop_base = asc_dvc->iop_base;
 	int_pending = FALSE;
-
-	asc_dvc->int_count++;
-
-	if (((asc_dvc->init_state & ASC_INIT_STATE_END_LOAD_MC) == 0) ||
-		(asc_dvc->isr_callback == 0)) {
-
+	if (((asc_dvc->init_state & ASC_INIT_STATE_END_LOAD_MC) == 0)
+		|| (asc_dvc->isr_callback == 0)
+	  ) {
 		return (ERR);
 	}
 	if (asc_dvc->in_critical_cnt != 0) {
@@ -5818,42 +6668,54 @@
 	}
 	if (asc_dvc->is_in_int) {
 		AscSetLibErrorCode(asc_dvc, ASCQ_ERR_ISR_RE_ENTRY);
-		asc_dvc->busy_count++;
 		return (ERR);
 	}
 	asc_dvc->is_in_int = TRUE;
 	ctrl_reg = AscGetChipControl(iop_base);
 	saved_ctrl_reg = ctrl_reg & (~(CC_SCSI_RESET | CC_CHIP_RESET |
 								   CC_SINGLE_STEP | CC_DIAG | CC_TEST));
-
-	if ((chipstat = AscGetChipStatus(iop_base)) & CSW_INT_PENDING) {
-		int_pending = TRUE;
+	chipstat = AscGetChipStatus(iop_base);
+	if (chipstat & CSW_SCSI_RESET_LATCH) {
+		if (
+			   !(asc_dvc->bus_type & (ASC_IS_VL | ASC_IS_EISA))
+		  ) {
+			int_pending = TRUE;
+			asc_dvc->sdtr_done = 0;
+			saved_ctrl_reg &= (uchar) (~CC_HALT);
+			while (AscGetChipStatus(iop_base) & CSW_SCSI_RESET_ACTIVE) ;
+			AscSetChipControl(iop_base, (CC_CHIP_RESET | CC_HALT));
+			AscSetChipControl(iop_base, CC_HALT);
+			AscSetChipStatus(iop_base, CIW_CLR_SCSI_RESET_INT);
+			AscSetChipStatus(iop_base, 0);
+			chipstat = AscGetChipStatus(iop_base);
+		}
+	}
+	saved_ram_addr = AscGetChipLramAddr(iop_base);
+	host_flag = AscReadLramByte(iop_base, ASCV_HOST_FLAG_B) & (uchar) (~ASC_HOST_FLAG_IN_ISR);
+	AscWriteLramByte(iop_base, ASCV_HOST_FLAG_B,
+					 (uchar) (host_flag | (uchar) ASC_HOST_FLAG_IN_ISR));
+#if CC_ASCISR_CHECK_INT_PENDING
+	if ((chipstat & CSW_INT_PENDING)
+		|| (int_pending)
+	  ) {
 		AscAckInterrupt(iop_base);
-
-		host_flag = AscReadLramByte(iop_base, ASCV_HOST_FLAG_B);
-		AscWriteLramByte(iop_base, ASCV_HOST_FLAG_B,
-						 (uchar) (host_flag | (uchar) ASC_HOST_FLAG_IN_ISR));
-		saved_ram_addr = AscGetChipLramAddr(iop_base);
-
+#endif
+		int_pending = TRUE;
 		if ((chipstat & CSW_HALTED) &&
 			(ctrl_reg & CC_SINGLE_STEP)) {
 			if (AscIsrChipHalted(asc_dvc) == ERR) {
-
 				goto ISR_REPORT_QDONE_FATAL_ERROR;
-
 			} else {
-				saved_ctrl_reg &= ~CC_HALT;
+				saved_ctrl_reg &= (uchar) (~CC_HALT);
 			}
 		} else {
 		  ISR_REPORT_QDONE_FATAL_ERROR:
 			if ((asc_dvc->dvc_cntl & ASC_CNTL_INT_MULTI_Q) != 0) {
 				while (((status = AscIsrQDone(asc_dvc)) & 0x01) != 0) {
-
 				}
 			} else {
 				do {
 					if ((status = AscIsrQDone(asc_dvc)) == 1) {
-
 						break;
 					}
 				} while (status == 0x11);
@@ -5861,12 +6723,11 @@
 			if ((status & 0x80) != 0)
 				int_pending = ERR;
 		}
-		AscSetChipLramAddr(iop_base, saved_ram_addr);
-		if (AscGetChipLramAddr(iop_base) != saved_ram_addr) {
-			AscSetLibErrorCode(asc_dvc, ASCQ_ERR_SET_LRAM_ADDR);
-		}
-		AscWriteLramByte(iop_base, ASCV_HOST_FLAG_B, host_flag);
+#if CC_ASCISR_CHECK_INT_PENDING
 	}
+#endif
+	AscWriteLramByte(iop_base, ASCV_HOST_FLAG_B, host_flag);
+	AscSetChipLramAddr(iop_base, saved_ram_addr);
 	AscSetChipControl(iop_base, saved_ctrl_reg);
 	asc_dvc->is_in_int = FALSE;
 	return (int_pending);
@@ -5874,32 +6735,29 @@
 
 int
 AscScsiSetupCmdQ(
-					ASC_DVC_VAR asc_ptr_type * asc_dvc,
-					ASC_SCSI_REQ_Q dosfar * scsiq,
+					REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					REG ASC_SCSI_REQ_Q dosfar * scsiq,
 					uchar dosfar * buf_addr,
 					ulong buf_len
 )
 {
 	ulong               phy_addr;
-
 	scsiq->r1.cntl = 0;
 	scsiq->r1.sg_queue_cnt = 0;
 	scsiq->r1.q_no = 0;
-	scsiq->r1.user_def = 0;
-	scsiq->cdbptr = (uchar dosfar *) scsiq->cdb;
+	scsiq->r1.extra_bytes = 0;
 	scsiq->r3.scsi_stat = 0;
 	scsiq->r3.scsi_msg = 0;
 	scsiq->r3.host_stat = 0;
 	scsiq->r3.done_stat = 0;
 	scsiq->r2.vm_id = 0;
+	scsiq->cdbptr = (uchar dosfar *) scsiq->cdb;
 	scsiq->r1.data_cnt = buf_len;
-
 	scsiq->r2.tag_code = (uchar) M2_QTAG_MSG_SIMPLE;
 	scsiq->r2.flag = (uchar) ASC_FLAG_SCSIQ_REQ;
 	scsiq->r2.srb_ptr = (ulong) scsiq;
 	scsiq->r1.status = (uchar) QS_READY;
 	scsiq->r1.data_addr = 0L;
-
 	if (buf_len != 0L) {
 		if ((phy_addr = AscGetOnePhyAddr(asc_dvc,
 					(uchar dosfar *) buf_addr, scsiq->r1.data_cnt)) == 0L) {
@@ -5916,180 +6774,202 @@
 	0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xDD, 0x0A, 0x01, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xC4, 0x0C, 0x08, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0xFF, 0x80, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x23, 0x00, 0x16, 0x00, 0x00, 0x00, 0x07, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
-	0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0x88, 0x00, 0x00, 0x00, 0x00,
-	0x80, 0x73, 0x48, 0x04, 0x36, 0x00, 0x00, 0xA2, 0xC8, 0x00, 0x80, 0x73, 0x03, 0x23, 0x36, 0x40,
-	0xB6, 0x00, 0x36, 0x00, 0x06, 0xD6, 0x0D, 0xD2, 0x15, 0xDE, 0x12, 0xDA, 0x00, 0xA2, 0xC8, 0x00,
-	0x92, 0x80, 0xE0, 0x97, 0x50, 0x00, 0xF5, 0x00, 0x0A, 0x98, 0xDF, 0x23, 0x36, 0x60, 0xB6, 0x00,
-	0x92, 0x80, 0x4F, 0x00, 0xF5, 0x00, 0x0A, 0x98, 0xEF, 0x23, 0x36, 0x60, 0xB6, 0x00, 0x92, 0x80,
-	0x80, 0x62, 0x92, 0x80, 0x00, 0x62, 0x92, 0x80, 0x00, 0x46, 0x17, 0xEE, 0x13, 0xEA, 0x02, 0x01,
-	0x09, 0xD8, 0xCD, 0x04, 0x4D, 0x00, 0x00, 0xA3, 0xDC, 0x00, 0x68, 0x97, 0x7F, 0x23, 0x04, 0x61,
-	0x84, 0x01, 0xB2, 0x84, 0xCF, 0xC1, 0x80, 0x73, 0xCD, 0x04, 0x4D, 0x00, 0x00, 0xA3, 0xE8, 0x01,
-	0x68, 0x97, 0xD4, 0x81, 0x00, 0x33, 0x02, 0x00, 0x82, 0x88, 0x80, 0x73, 0x80, 0x77, 0x00, 0x01,
-	0x01, 0xA1, 0x08, 0x01, 0x4F, 0x00, 0x46, 0x97, 0x07, 0xA6, 0x12, 0x01, 0x00, 0x33, 0x03, 0x00,
-	0x82, 0x88, 0x03, 0x03, 0x03, 0xDE, 0x00, 0x33, 0x05, 0x00, 0x82, 0x88, 0xCE, 0x00, 0x69, 0x60,
-	0xCE, 0x00, 0x02, 0x03, 0x4A, 0x60, 0x00, 0xA2, 0x86, 0x01, 0x80, 0x63, 0x07, 0xA6, 0x32, 0x01,
-	0x86, 0x81, 0x03, 0x03, 0x80, 0x63, 0xE2, 0x00, 0x07, 0xA6, 0x42, 0x01, 0x00, 0x33, 0x04, 0x00,
-	0x82, 0x88, 0x03, 0x07, 0x02, 0x01, 0x04, 0xCA, 0x0D, 0x23, 0x2A, 0x98, 0x4D, 0x04, 0xD0, 0x84,
-	0x05, 0xD8, 0x0D, 0x23, 0x2A, 0x98, 0xCD, 0x04, 0x15, 0x23, 0xB8, 0x88, 0xFB, 0x23, 0x02, 0x61,
-	0x82, 0x01, 0x80, 0x63, 0x02, 0x03, 0x06, 0xA3, 0x70, 0x01, 0x00, 0x33, 0x0A, 0x00, 0x82, 0x88,
-	0x4E, 0x00, 0x07, 0xA3, 0x7C, 0x01, 0x00, 0x33, 0x0B, 0x00, 0x82, 0x88, 0xCD, 0x04, 0x36, 0x2D,
-	0x00, 0x33, 0x1A, 0x00, 0x82, 0x88, 0x50, 0x04, 0x96, 0x81, 0x06, 0xAB, 0x90, 0x01, 0x96, 0x81,
-	0x4E, 0x00, 0x07, 0xA3, 0xA0, 0x01, 0x50, 0x00, 0x00, 0xA3, 0x4A, 0x01, 0x00, 0x05, 0x8A, 0x81,
-	0x08, 0x97, 0x02, 0x01, 0x05, 0xC6, 0x04, 0x23, 0xA0, 0x01, 0x15, 0x23, 0xA1, 0x01, 0xCC, 0x81,
-	0xFD, 0x23, 0x02, 0x61, 0x82, 0x01, 0x0A, 0xDA, 0x4A, 0x00, 0x06, 0x61, 0x00, 0xA0, 0xC2, 0x01,
-	0x80, 0x63, 0xCD, 0x04, 0x36, 0x2D, 0x00, 0x33, 0x1B, 0x00, 0x82, 0x88, 0x06, 0x23, 0x2A, 0x98,
-	0xCD, 0x04, 0xB2, 0x84, 0x06, 0x01, 0x00, 0xA2, 0xE2, 0x01, 0x57, 0x60, 0x00, 0xA0, 0xE8, 0x01,
-	0xB2, 0x84, 0x80, 0x23, 0xA0, 0x01, 0xB2, 0x84, 0x80, 0x73, 0x4B, 0x00, 0x06, 0x61, 0x00, 0xA2,
-	0x10, 0x02, 0x04, 0x01, 0x0D, 0xDE, 0x02, 0x01, 0x03, 0xCC, 0x4F, 0x00, 0x46, 0x97, 0x0A, 0x82,
-	0x08, 0x23, 0x02, 0x41, 0x82, 0x01, 0x4F, 0x00, 0x24, 0x97, 0x48, 0x04, 0xFF, 0x23, 0x84, 0x80,
-	0xB2, 0x97, 0x00, 0x46, 0x56, 0x00, 0x03, 0xC0, 0x01, 0x23, 0xE8, 0x00, 0x81, 0x73, 0x06, 0x29,
-	0x03, 0x42, 0x06, 0xE2, 0x03, 0xEE, 0x66, 0xEB, 0x11, 0x23, 0xB8, 0x88, 0xC6, 0x97, 0xFA, 0x80,
-	0x80, 0x73, 0x80, 0x77, 0x06, 0xA6, 0x3E, 0x02, 0x00, 0x33, 0x31, 0x00, 0x82, 0x88, 0x04, 0x01,
-	0x03, 0xD8, 0x74, 0x98, 0x02, 0x96, 0x50, 0x82, 0xA2, 0x95, 0x80, 0x67, 0x83, 0x03, 0x80, 0x63,
-	0xB6, 0x2D, 0x02, 0xA6, 0x7A, 0x02, 0x07, 0xA6, 0x68, 0x02, 0x06, 0xA6, 0x6C, 0x02, 0x03, 0xA6,
-	0x70, 0x02, 0x00, 0x33, 0x10, 0x00, 0x82, 0x88, 0x4A, 0x95, 0x52, 0x82, 0xF8, 0x95, 0x52, 0x82,
-	0x04, 0x23, 0xA0, 0x01, 0x14, 0x23, 0xA1, 0x01, 0x16, 0x84, 0x04, 0x01, 0x0C, 0xDC, 0xE0, 0x23,
-	0x25, 0x61, 0xEF, 0x00, 0x14, 0x01, 0x4F, 0x04, 0xA8, 0x01, 0x6F, 0x00, 0xA5, 0x01, 0x03, 0x23,
-	0xA4, 0x01, 0x06, 0x23, 0x9C, 0x01, 0x24, 0x2B, 0x1C, 0x01, 0x02, 0xA6, 0xAC, 0x02, 0x07, 0xA6,
-	0x68, 0x02, 0x06, 0xA6, 0x6C, 0x02, 0x00, 0x33, 0x12, 0x00, 0x82, 0x88, 0x00, 0x0E, 0x80, 0x63,
-	0x00, 0x43, 0x00, 0xA0, 0x9A, 0x02, 0x4D, 0x04, 0x04, 0x01, 0x0B, 0xDC, 0xE7, 0x23, 0x04, 0x61,
-	0x84, 0x01, 0x10, 0x31, 0x12, 0x35, 0x14, 0x01, 0xEC, 0x00, 0x6C, 0x38, 0x00, 0x3F, 0x00, 0x00,
-	0xEC, 0x82, 0x18, 0x23, 0x04, 0x61, 0x18, 0xA0, 0xE4, 0x02, 0x04, 0x01, 0x8E, 0xC8, 0x00, 0x33,
-	0x1F, 0x00, 0x82, 0x88, 0x08, 0x31, 0x0A, 0x35, 0x0C, 0x39, 0x0E, 0x3D, 0x40, 0x98, 0xB6, 0x2D,
-	0x01, 0xA6, 0x0E, 0x03, 0x00, 0xA6, 0x1C, 0x03, 0x07, 0xA6, 0x2A, 0x03, 0x06, 0xA6, 0x2E, 0x03,
-	0x03, 0xA6, 0xFA, 0x03, 0x02, 0xA6, 0x7A, 0x02, 0x00, 0x33, 0x33, 0x00, 0x82, 0x88, 0x08, 0x23,
-	0xB3, 0x01, 0x04, 0x01, 0x0E, 0xD0, 0x00, 0x33, 0x14, 0x00, 0x82, 0x88, 0x10, 0x23, 0xB3, 0x01,
-	0x04, 0x01, 0x07, 0xCC, 0x00, 0x33, 0x15, 0x00, 0x82, 0x88, 0x4A, 0x95, 0xF0, 0x82, 0xF8, 0x95,
-	0xF0, 0x82, 0x44, 0x98, 0x80, 0x42, 0x40, 0x98, 0x48, 0xE4, 0x04, 0x01, 0x29, 0xC8, 0x31, 0x05,
-	0x07, 0x01, 0x00, 0xA2, 0x72, 0x03, 0x00, 0x43, 0x87, 0x01, 0x05, 0x05, 0x48, 0x98, 0x40, 0x98,
-	0x00, 0xA6, 0x34, 0x03, 0x07, 0xA6, 0x6A, 0x03, 0x03, 0xA6, 0x16, 0x04, 0x06, 0xA6, 0x6E, 0x03,
-	0x01, 0xA6, 0x34, 0x03, 0x00, 0x33, 0x25, 0x00, 0x82, 0x88, 0x4A, 0x95, 0x50, 0x83, 0xF8, 0x95,
-	0x50, 0x83, 0x04, 0x01, 0x0C, 0xCE, 0x03, 0xC8, 0x00, 0x33, 0x42, 0x00, 0x82, 0x88, 0x00, 0x01,
-	0x05, 0x05, 0xFF, 0xA2, 0x90, 0x03, 0xB1, 0x01, 0x08, 0x23, 0xB2, 0x01, 0x4C, 0x83, 0x05, 0x05,
-	0x01, 0xA6, 0x9A, 0x03, 0x00, 0xA6, 0xAA, 0x03, 0xF0, 0x83, 0x68, 0x98, 0x80, 0x42, 0x01, 0xA6,
-	0x9A, 0x03, 0xBA, 0x83, 0x00, 0x33, 0x2F, 0x00, 0x82, 0x88, 0x68, 0x98, 0x80, 0x42, 0x00, 0xA6,
-	0xAA, 0x03, 0xBA, 0x83, 0x00, 0x33, 0x26, 0x00, 0x82, 0x88, 0x38, 0x2B, 0x80, 0x32, 0x80, 0x36,
-	0x04, 0x23, 0xA0, 0x01, 0x12, 0x23, 0xA1, 0x01, 0xF0, 0x83, 0x04, 0xF0, 0x80, 0x6B, 0x00, 0x33,
-	0x20, 0x00, 0x82, 0x88, 0x03, 0xA6, 0xEE, 0x03, 0x07, 0xA6, 0xE6, 0x03, 0x06, 0xA6, 0xEA, 0x03,
-	0x00, 0x33, 0x17, 0x00, 0x82, 0x88, 0x4A, 0x95, 0xD4, 0x83, 0xF8, 0x95, 0xD4, 0x83, 0xFA, 0x83,
-	0x04, 0xF0, 0x80, 0x6B, 0x00, 0x33, 0x20, 0x00, 0x82, 0x88, 0xB6, 0x2D, 0x03, 0xA6, 0x16, 0x04,
-	0x07, 0xA6, 0x0E, 0x04, 0x06, 0xA6, 0x12, 0x04, 0x00, 0x33, 0x30, 0x00, 0x82, 0x88, 0x4A, 0x95,
-	0xFA, 0x83, 0xF8, 0x95, 0xFA, 0x83, 0xA2, 0x0D, 0x80, 0x63, 0x07, 0xA6, 0x24, 0x04, 0x00, 0x33,
-	0x18, 0x00, 0x82, 0x88, 0x03, 0x03, 0x80, 0x63, 0xA3, 0x01, 0x07, 0xA4, 0x2E, 0x04, 0x23, 0x01,
-	0x00, 0xA2, 0x50, 0x04, 0x0A, 0xA0, 0x40, 0x04, 0xE0, 0x00, 0x00, 0x33, 0x1D, 0x00, 0x82, 0x88,
-	0x0B, 0xA0, 0x4C, 0x04, 0xE0, 0x00, 0x00, 0x33, 0x1E, 0x00, 0x82, 0x88, 0x42, 0x23, 0xB8, 0x88,
-	0x00, 0x23, 0x22, 0xA3, 0xB2, 0x04, 0x08, 0x23, 0x22, 0xA3, 0x6C, 0x04, 0x28, 0x23, 0x22, 0xA3,
-	0x78, 0x04, 0x02, 0x23, 0x22, 0xA3, 0x8E, 0x04, 0x42, 0x23, 0xB8, 0x88, 0x4A, 0x00, 0x06, 0x61,
-	0x00, 0xA0, 0x78, 0x04, 0x45, 0x23, 0xB8, 0x88, 0xC6, 0x97, 0x00, 0xA2, 0x8A, 0x04, 0x74, 0x98,
-	0x00, 0x33, 0x00, 0x82, 0xC0, 0x20, 0x81, 0x62, 0xF6, 0x81, 0x47, 0x23, 0xB8, 0x88, 0x04, 0x01,
-	0x0C, 0xDE, 0x14, 0x01, 0x00, 0xA2, 0xA6, 0x04, 0xC6, 0x97, 0x74, 0x98, 0x00, 0x33, 0x00, 0x81,
-	0xC0, 0x20, 0x81, 0x62, 0x10, 0x82, 0x43, 0x23, 0xB8, 0x88, 0x04, 0x23, 0xA0, 0x01, 0x44, 0x23,
-	0xA1, 0x01, 0x80, 0x73, 0x4D, 0x00, 0x03, 0xA3, 0xC0, 0x04, 0x00, 0x33, 0x27, 0x00, 0x82, 0x88,
-	0x04, 0x01, 0x04, 0xDC, 0x02, 0x23, 0xA2, 0x01, 0x04, 0x23, 0xA0, 0x01, 0xC6, 0x97, 0xF4, 0x94,
-	0x4B, 0x00, 0xF6, 0x00, 0x4F, 0x04, 0x4F, 0x00, 0x00, 0xA3, 0xEE, 0x04, 0x00, 0x05, 0x76, 0x00,
-	0x06, 0x61, 0x00, 0xA2, 0xE8, 0x04, 0xD6, 0x84, 0x08, 0x97, 0xCD, 0x04, 0xF2, 0x84, 0x48, 0x04,
-	0xFF, 0x23, 0x84, 0x80, 0x02, 0x01, 0x03, 0xDA, 0x80, 0x23, 0x82, 0x01, 0x02, 0x85, 0x02, 0x23,
-	0xA0, 0x01, 0x4A, 0x00, 0x06, 0x61, 0x00, 0xA2, 0x0E, 0x05, 0x1D, 0x01, 0x04, 0xD6, 0xFF, 0x23,
+	0x00, 0x00, 0x00, 0x23, 0x00, 0x20, 0x00, 0x00, 0x00, 0x07, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
+	0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE4, 0x88, 0x00, 0x00, 0x00, 0x00,
+	0x80, 0x73, 0x48, 0x04, 0x36, 0x00, 0x00, 0xA2, 0xC6, 0x00, 0x80, 0x73, 0x03, 0x23, 0x36, 0x40,
+	0xB6, 0x00, 0x36, 0x00, 0x05, 0xD6, 0x0C, 0xD2, 0x12, 0xDA, 0x00, 0xA2, 0xC6, 0x00, 0x92, 0x80,
+	0x20, 0x98, 0x50, 0x00, 0xF5, 0x00, 0x4A, 0x98, 0xDF, 0x23, 0x36, 0x60, 0xB6, 0x00, 0x92, 0x80,
+	0x4F, 0x00, 0xF5, 0x00, 0x4A, 0x98, 0xEF, 0x23, 0x36, 0x60, 0xB6, 0x00, 0x92, 0x80, 0x80, 0x62,
+	0x92, 0x80, 0x00, 0x62, 0x92, 0x80, 0x00, 0x46, 0x17, 0xEE, 0x13, 0xEA, 0x02, 0x01, 0x09, 0xD8,
+	0xCD, 0x04, 0x4D, 0x00, 0x00, 0xA3, 0xDA, 0x00, 0xA8, 0x97, 0x7F, 0x23, 0x04, 0x61, 0x84, 0x01,
+	0xD2, 0x84, 0xD0, 0xC1, 0x80, 0x73, 0xCD, 0x04, 0x4D, 0x00, 0x00, 0xA3, 0xE6, 0x01, 0xA8, 0x97,
+	0xD2, 0x81, 0x00, 0x33, 0x02, 0x00, 0xC2, 0x88, 0x80, 0x73, 0x80, 0x77, 0x00, 0x01, 0x01, 0xA1,
+	0x06, 0x01, 0x4F, 0x00, 0x86, 0x97, 0x07, 0xA6, 0x10, 0x01, 0x00, 0x33, 0x03, 0x00, 0xC2, 0x88,
+	0x03, 0x03, 0x03, 0xDE, 0x00, 0x33, 0x05, 0x00, 0xC2, 0x88, 0xCE, 0x00, 0x69, 0x60, 0xCE, 0x00,
+	0x02, 0x03, 0x4A, 0x60, 0x00, 0xA2, 0x84, 0x01, 0x80, 0x63, 0x07, 0xA6, 0x30, 0x01, 0x84, 0x81,
+	0x03, 0x03, 0x80, 0x63, 0xE2, 0x00, 0x07, 0xA6, 0x40, 0x01, 0x00, 0x33, 0x04, 0x00, 0xC2, 0x88,
+	0x03, 0x07, 0x02, 0x01, 0x04, 0xCA, 0x0D, 0x23, 0x6A, 0x98, 0x4D, 0x04, 0xF0, 0x84, 0x05, 0xD8,
+	0x0D, 0x23, 0x6A, 0x98, 0xCD, 0x04, 0x15, 0x23, 0xF8, 0x88, 0xFB, 0x23, 0x02, 0x61, 0x82, 0x01,
+	0x80, 0x63, 0x02, 0x03, 0x06, 0xA3, 0x6E, 0x01, 0x00, 0x33, 0x0A, 0x00, 0xC2, 0x88, 0x4E, 0x00,
+	0x07, 0xA3, 0x7A, 0x01, 0x00, 0x33, 0x0B, 0x00, 0xC2, 0x88, 0xCD, 0x04, 0x36, 0x2D, 0x00, 0x33,
+	0x1A, 0x00, 0xC2, 0x88, 0x50, 0x04, 0x94, 0x81, 0x06, 0xAB, 0x8E, 0x01, 0x94, 0x81, 0x4E, 0x00,
+	0x07, 0xA3, 0x9E, 0x01, 0x50, 0x00, 0x00, 0xA3, 0x48, 0x01, 0x00, 0x05, 0x88, 0x81, 0x48, 0x97,
+	0x02, 0x01, 0x05, 0xC6, 0x04, 0x23, 0xA0, 0x01, 0x15, 0x23, 0xA1, 0x01, 0xCA, 0x81, 0xFD, 0x23,
+	0x02, 0x61, 0x82, 0x01, 0x0A, 0xDA, 0x4A, 0x00, 0x06, 0x61, 0x00, 0xA0, 0xC0, 0x01, 0x80, 0x63,
+	0xCD, 0x04, 0x36, 0x2D, 0x00, 0x33, 0x1B, 0x00, 0xC2, 0x88, 0x06, 0x23, 0x6A, 0x98, 0xCD, 0x04,
+	0xD2, 0x84, 0x06, 0x01, 0x00, 0xA2, 0xE0, 0x01, 0x57, 0x60, 0x00, 0xA0, 0xE6, 0x01, 0xD2, 0x84,
+	0x80, 0x23, 0xA0, 0x01, 0xD2, 0x84, 0x80, 0x73, 0x4B, 0x00, 0x06, 0x61, 0x00, 0xA2, 0x0E, 0x02,
+	0x04, 0x01, 0x0D, 0xDE, 0x02, 0x01, 0x03, 0xCC, 0x4F, 0x00, 0x86, 0x97, 0x08, 0x82, 0x08, 0x23,
+	0x02, 0x41, 0x82, 0x01, 0x4F, 0x00, 0x64, 0x97, 0x48, 0x04, 0xFF, 0x23, 0x84, 0x80, 0xF2, 0x97,
+	0x00, 0x46, 0x56, 0x00, 0x03, 0xC0, 0x01, 0x23, 0xE8, 0x00, 0x81, 0x73, 0x06, 0x29, 0x03, 0x42,
+	0x06, 0xE2, 0x03, 0xEE, 0x66, 0xEB, 0x11, 0x23, 0xF8, 0x88, 0x06, 0x98, 0xF8, 0x80, 0x80, 0x73,
+	0x80, 0x77, 0x06, 0xA6, 0x3C, 0x02, 0x00, 0x33, 0x31, 0x00, 0xC2, 0x88, 0x04, 0x01, 0x03, 0xD8,
+	0xB4, 0x98, 0x3E, 0x96, 0x4E, 0x82, 0xCE, 0x95, 0x80, 0x67, 0x83, 0x03, 0x80, 0x63, 0xB6, 0x2D,
+	0x02, 0xA6, 0x78, 0x02, 0x07, 0xA6, 0x66, 0x02, 0x06, 0xA6, 0x6A, 0x02, 0x03, 0xA6, 0x6E, 0x02,
+	0x00, 0x33, 0x10, 0x00, 0xC2, 0x88, 0x6A, 0x95, 0x50, 0x82, 0x34, 0x96, 0x50, 0x82, 0x04, 0x23,
+	0xA0, 0x01, 0x14, 0x23, 0xA1, 0x01, 0x28, 0x84, 0x04, 0x01, 0x0C, 0xDC, 0xE0, 0x23, 0x25, 0x61,
+	0xEF, 0x00, 0x14, 0x01, 0x4F, 0x04, 0xA8, 0x01, 0x6F, 0x00, 0xA5, 0x01, 0x03, 0x23, 0xA4, 0x01,
+	0x06, 0x23, 0x9C, 0x01, 0x24, 0x2B, 0x1C, 0x01, 0x02, 0xA6, 0xAA, 0x02, 0x07, 0xA6, 0x66, 0x02,
+	0x06, 0xA6, 0x6A, 0x02, 0x00, 0x33, 0x12, 0x00, 0xC2, 0x88, 0x00, 0x0E, 0x80, 0x63, 0x00, 0x43,
+	0x00, 0xA0, 0x98, 0x02, 0x4D, 0x04, 0x04, 0x01, 0x0B, 0xDC, 0xE7, 0x23, 0x04, 0x61, 0x84, 0x01,
+	0x10, 0x31, 0x12, 0x35, 0x14, 0x01, 0xEC, 0x00, 0x6C, 0x38, 0x00, 0x3F, 0x00, 0x00, 0xEA, 0x82,
+	0x18, 0x23, 0x04, 0x61, 0x18, 0xA0, 0xE2, 0x02, 0x04, 0x01, 0x98, 0xC8, 0x00, 0x33, 0x1F, 0x00,
+	0xC2, 0x88, 0x08, 0x31, 0x0A, 0x35, 0x0C, 0x39, 0x0E, 0x3D, 0x80, 0x98, 0xB6, 0x2D, 0x01, 0xA6,
+	0x14, 0x03, 0x00, 0xA6, 0x14, 0x03, 0x07, 0xA6, 0x0C, 0x03, 0x06, 0xA6, 0x10, 0x03, 0x03, 0xA6,
+	0x0C, 0x04, 0x02, 0xA6, 0x78, 0x02, 0x00, 0x33, 0x33, 0x00, 0xC2, 0x88, 0x6A, 0x95, 0xEE, 0x82,
+	0x34, 0x96, 0xEE, 0x82, 0x84, 0x98, 0x80, 0x42, 0x80, 0x98, 0x60, 0xE4, 0x04, 0x01, 0x29, 0xC8,
+	0x31, 0x05, 0x07, 0x01, 0x00, 0xA2, 0x54, 0x03, 0x00, 0x43, 0x87, 0x01, 0x05, 0x05, 0x88, 0x98,
+	0x80, 0x98, 0x00, 0xA6, 0x16, 0x03, 0x07, 0xA6, 0x4C, 0x03, 0x03, 0xA6, 0x28, 0x04, 0x06, 0xA6,
+	0x50, 0x03, 0x01, 0xA6, 0x16, 0x03, 0x00, 0x33, 0x25, 0x00, 0xC2, 0x88, 0x6A, 0x95, 0x32, 0x83,
+	0x34, 0x96, 0x32, 0x83, 0x04, 0x01, 0x0C, 0xCE, 0x03, 0xC8, 0x00, 0x33, 0x42, 0x00, 0xC2, 0x88,
+	0x00, 0x01, 0x05, 0x05, 0xFF, 0xA2, 0x72, 0x03, 0xB1, 0x01, 0x08, 0x23, 0xB2, 0x01, 0x2E, 0x83,
+	0x05, 0x05, 0x15, 0x01, 0x00, 0xA2, 0x92, 0x03, 0xEC, 0x00, 0x6E, 0x00, 0x95, 0x01, 0x6C, 0x38,
+	0x00, 0x3F, 0x00, 0x00, 0x01, 0xA6, 0x8E, 0x03, 0x00, 0xA6, 0x8E, 0x03, 0x02, 0x84, 0x80, 0x42,
+	0x80, 0x98, 0x01, 0xA6, 0x9C, 0x03, 0x00, 0xA6, 0xB4, 0x03, 0x02, 0x84, 0xA8, 0x98, 0x80, 0x42,
+	0x01, 0xA6, 0x9C, 0x03, 0x07, 0xA6, 0xAA, 0x03, 0xCC, 0x83, 0x6A, 0x95, 0xA0, 0x83, 0x00, 0x33,
+	0x2F, 0x00, 0xC2, 0x88, 0xA8, 0x98, 0x80, 0x42, 0x00, 0xA6, 0xB4, 0x03, 0x07, 0xA6, 0xC2, 0x03,
+	0xCC, 0x83, 0x6A, 0x95, 0xB8, 0x83, 0x00, 0x33, 0x26, 0x00, 0xC2, 0x88, 0x38, 0x2B, 0x80, 0x32,
+	0x80, 0x36, 0x04, 0x23, 0xA0, 0x01, 0x12, 0x23, 0xA1, 0x01, 0x02, 0x84, 0x04, 0xF0, 0x80, 0x6B,
+	0x00, 0x33, 0x20, 0x00, 0xC2, 0x88, 0x03, 0xA6, 0x00, 0x04, 0x07, 0xA6, 0xF8, 0x03, 0x06, 0xA6,
+	0xFC, 0x03, 0x00, 0x33, 0x17, 0x00, 0xC2, 0x88, 0x6A, 0x95, 0xE6, 0x83, 0x34, 0x96, 0xE6, 0x83,
+	0x0C, 0x84, 0x04, 0xF0, 0x80, 0x6B, 0x00, 0x33, 0x20, 0x00, 0xC2, 0x88, 0xB6, 0x2D, 0x03, 0xA6,
+	0x28, 0x04, 0x07, 0xA6, 0x20, 0x04, 0x06, 0xA6, 0x24, 0x04, 0x00, 0x33, 0x30, 0x00, 0xC2, 0x88,
+	0x6A, 0x95, 0x0C, 0x84, 0x34, 0x96, 0x0C, 0x84, 0x1D, 0x01, 0x06, 0xCC, 0x00, 0x33, 0x00, 0x84,
+	0xC0, 0x20, 0x00, 0x23, 0xEA, 0x00, 0x81, 0x62, 0xA2, 0x0D, 0x80, 0x63, 0x07, 0xA6, 0x46, 0x04,
+	0x00, 0x33, 0x18, 0x00, 0xC2, 0x88, 0x03, 0x03, 0x80, 0x63, 0xA3, 0x01, 0x07, 0xA4, 0x50, 0x04,
+	0x23, 0x01, 0x00, 0xA2, 0x72, 0x04, 0x0A, 0xA0, 0x62, 0x04, 0xE0, 0x00, 0x00, 0x33, 0x1D, 0x00,
+	0xC2, 0x88, 0x0B, 0xA0, 0x6E, 0x04, 0xE0, 0x00, 0x00, 0x33, 0x1E, 0x00, 0xC2, 0x88, 0x42, 0x23,
+	0xF8, 0x88, 0x00, 0x23, 0x22, 0xA3, 0xD2, 0x04, 0x08, 0x23, 0x22, 0xA3, 0x8E, 0x04, 0x28, 0x23,
+	0x22, 0xA3, 0x9A, 0x04, 0x02, 0x23, 0x22, 0xA3, 0xB0, 0x04, 0x42, 0x23, 0xF8, 0x88, 0x4A, 0x00,
+	0x06, 0x61, 0x00, 0xA0, 0x9A, 0x04, 0x45, 0x23, 0xF8, 0x88, 0x06, 0x98, 0x00, 0xA2, 0xAC, 0x04,
+	0xB4, 0x98, 0x00, 0x33, 0x00, 0x82, 0xC0, 0x20, 0x81, 0x62, 0xF4, 0x81, 0x47, 0x23, 0xF8, 0x88,
+	0x04, 0x01, 0x0B, 0xDE, 0x06, 0x98, 0xB4, 0x98, 0x00, 0x33, 0x00, 0x81, 0xC0, 0x20, 0x81, 0x62,
+	0x14, 0x01, 0x00, 0xA0, 0x0E, 0x02, 0x43, 0x23, 0xF8, 0x88, 0x04, 0x23, 0xA0, 0x01, 0x44, 0x23,
+	0xA1, 0x01, 0x80, 0x73, 0x4D, 0x00, 0x03, 0xA3, 0xE0, 0x04, 0x00, 0x33, 0x27, 0x00, 0xC2, 0x88,
+	0x04, 0x01, 0x04, 0xDC, 0x02, 0x23, 0xA2, 0x01, 0x04, 0x23, 0xA0, 0x01, 0x06, 0x98, 0x14, 0x95,
+	0x4B, 0x00, 0xF6, 0x00, 0x4F, 0x04, 0x4F, 0x00, 0x00, 0xA3, 0x0E, 0x05, 0x00, 0x05, 0x76, 0x00,
+	0x06, 0x61, 0x00, 0xA2, 0x08, 0x05, 0xF6, 0x84, 0x48, 0x97, 0xCD, 0x04, 0x12, 0x85, 0x48, 0x04,
+	0xFF, 0x23, 0x84, 0x80, 0x02, 0x01, 0x03, 0xDA, 0x80, 0x23, 0x82, 0x01, 0x22, 0x85, 0x02, 0x23,
+	0xA0, 0x01, 0x4A, 0x00, 0x06, 0x61, 0x00, 0xA2, 0x2E, 0x05, 0x1D, 0x01, 0x04, 0xD6, 0xFF, 0x23,
 	0x86, 0x41, 0x4B, 0x60, 0xCB, 0x00, 0xFF, 0x23, 0x80, 0x01, 0x49, 0x00, 0x81, 0x01, 0x04, 0x01,
 	0x02, 0xC8, 0x30, 0x01, 0x80, 0x01, 0xF7, 0x04, 0x03, 0x01, 0x49, 0x04, 0x80, 0x01, 0xC9, 0x00,
-	0x00, 0x05, 0x00, 0x01, 0xFF, 0xA0, 0x2E, 0x05, 0x77, 0x04, 0x01, 0x23, 0xEA, 0x00, 0x5D, 0x00,
-	0xFE, 0xC7, 0x00, 0x62, 0x00, 0x23, 0xEA, 0x00, 0x00, 0x63, 0x07, 0xA4, 0xA0, 0x05, 0x03, 0x03,
-	0x02, 0xA0, 0x5C, 0x05, 0x9C, 0x85, 0x00, 0x33, 0x2D, 0x00, 0x82, 0x88, 0x04, 0xA0, 0x82, 0x05,
-	0x80, 0x63, 0x4A, 0x00, 0x06, 0x61, 0x00, 0xA2, 0x6E, 0x05, 0x1D, 0x01, 0x06, 0xD6, 0x02, 0x23,
-	0x02, 0x41, 0x82, 0x01, 0x50, 0x00, 0x24, 0x97, 0xD0, 0x84, 0x04, 0x23, 0x02, 0x41, 0x82, 0x01,
-	0xD0, 0x84, 0x08, 0xA0, 0x88, 0x05, 0x9C, 0x85, 0x03, 0xA0, 0x8E, 0x05, 0x9C, 0x85, 0x01, 0xA0,
-	0x9A, 0x05, 0x88, 0x00, 0x80, 0x63, 0x78, 0x96, 0x4A, 0x85, 0x88, 0x86, 0x80, 0x63, 0x4A, 0x85,
-	0x00, 0x63, 0x4A, 0x00, 0x06, 0x61, 0x00, 0xA2, 0xDE, 0x05, 0x1D, 0x01, 0x18, 0xD4, 0xC0, 0x23,
-	0x07, 0x41, 0x83, 0x03, 0x80, 0x63, 0x06, 0xA6, 0xC0, 0x05, 0x00, 0x33, 0x37, 0x00, 0x82, 0x88,
-	0x1D, 0x01, 0x02, 0xD6, 0x46, 0x23, 0xB8, 0x88, 0x63, 0x60, 0x83, 0x03, 0x80, 0x63, 0x06, 0xA6,
-	0xD8, 0x05, 0x00, 0x33, 0x38, 0x00, 0x82, 0x88, 0xEF, 0x04, 0x6F, 0x00, 0x00, 0x63, 0x4B, 0x00,
-	0x06, 0x41, 0xCB, 0x00, 0x52, 0x00, 0x06, 0x61, 0x00, 0xA2, 0xF2, 0x05, 0xC0, 0x23, 0x07, 0x41,
-	0x00, 0x63, 0x80, 0x23, 0x07, 0x41, 0x00, 0x63, 0x80, 0x67, 0x08, 0x23, 0x83, 0x03, 0x80, 0x63,
-	0x00, 0x63, 0x06, 0xA6, 0x14, 0x06, 0x07, 0xA6, 0x64, 0x06, 0x02, 0xA6, 0xBC, 0x06, 0x00, 0x33,
-	0x39, 0x00, 0x82, 0x88, 0x00, 0x00, 0x01, 0xA0, 0xD6, 0x06, 0xA2, 0x95, 0x83, 0x03, 0x80, 0x63,
-	0x06, 0xA6, 0x28, 0x06, 0x07, 0xA6, 0x64, 0x06, 0x00, 0x00, 0x00, 0x2B, 0x40, 0x0E, 0x80, 0x63,
-	0x01, 0x00, 0x06, 0xA6, 0x40, 0x06, 0x07, 0xA6, 0x64, 0x06, 0x00, 0x33, 0x3A, 0x00, 0x82, 0x88,
-	0x40, 0x0E, 0x80, 0x63, 0x00, 0x43, 0x00, 0xA0, 0x32, 0x06, 0x06, 0xA6, 0x58, 0x06, 0x07, 0xA6,
-	0x64, 0x06, 0x00, 0x33, 0x3B, 0x00, 0x82, 0x88, 0x80, 0x67, 0x40, 0x0E, 0x80, 0x63, 0x07, 0xA6,
-	0x64, 0x06, 0x00, 0x63, 0x03, 0x03, 0x80, 0x63, 0x88, 0x00, 0x01, 0xA2, 0x78, 0x06, 0x07, 0xA2,
-	0xBC, 0x06, 0x00, 0x33, 0x35, 0x00, 0x82, 0x88, 0x07, 0xA6, 0x82, 0x06, 0x00, 0x33, 0x2A, 0x00,
-	0x82, 0x88, 0x03, 0x03, 0x03, 0xA2, 0x8E, 0x06, 0x07, 0x23, 0x80, 0x00, 0xC8, 0x86, 0x80, 0x63,
-	0x89, 0x00, 0x0A, 0x2B, 0x07, 0xA6, 0x9E, 0x06, 0x00, 0x33, 0x29, 0x00, 0x82, 0x88, 0x00, 0x43,
-	0x00, 0xA2, 0xAA, 0x06, 0xC0, 0x0E, 0x80, 0x63, 0x94, 0x86, 0xC0, 0x0E, 0x00, 0x33, 0x00, 0x80,
+	0x00, 0x05, 0x00, 0x01, 0xFF, 0xA0, 0x4E, 0x05, 0x77, 0x04, 0x01, 0x23, 0xEA, 0x00, 0x5D, 0x00,
+	0xFE, 0xC7, 0x00, 0x62, 0x00, 0x23, 0xEA, 0x00, 0x00, 0x63, 0x07, 0xA4, 0xCC, 0x05, 0x03, 0x03,
+	0x02, 0xA0, 0x7C, 0x05, 0xC8, 0x85, 0x00, 0x33, 0x2D, 0x00, 0xC2, 0x88, 0x04, 0xA0, 0xA2, 0x05,
+	0x80, 0x63, 0x4A, 0x00, 0x06, 0x61, 0x00, 0xA2, 0x8E, 0x05, 0x1D, 0x01, 0x06, 0xD6, 0x02, 0x23,
+	0x02, 0x41, 0x82, 0x01, 0x50, 0x00, 0x64, 0x97, 0xF0, 0x84, 0x04, 0x23, 0x02, 0x41, 0x82, 0x01,
+	0xF0, 0x84, 0x08, 0xA0, 0xA8, 0x05, 0xC8, 0x85, 0x03, 0xA0, 0xAE, 0x05, 0xC8, 0x85, 0x01, 0xA0,
+	0xBA, 0x05, 0x88, 0x00, 0x80, 0x63, 0xB8, 0x96, 0x6A, 0x85, 0x07, 0xA0, 0xC6, 0x05, 0x06, 0x23,
+	0x6A, 0x98, 0x48, 0x23, 0xF8, 0x88, 0xC8, 0x86, 0x80, 0x63, 0x6A, 0x85, 0x00, 0x63, 0x4A, 0x00,
+	0x06, 0x61, 0x00, 0xA2, 0x0A, 0x06, 0x1D, 0x01, 0x18, 0xD4, 0xC0, 0x23, 0x07, 0x41, 0x83, 0x03,
+	0x80, 0x63, 0x06, 0xA6, 0xEC, 0x05, 0x00, 0x33, 0x37, 0x00, 0xC2, 0x88, 0x1D, 0x01, 0x02, 0xD6,
+	0x46, 0x23, 0xF8, 0x88, 0x63, 0x60, 0x83, 0x03, 0x80, 0x63, 0x06, 0xA6, 0x04, 0x06, 0x00, 0x33,
+	0x38, 0x00, 0xC2, 0x88, 0xEF, 0x04, 0x6F, 0x00, 0x00, 0x63, 0x4B, 0x00, 0x06, 0x41, 0xCB, 0x00,
+	0x52, 0x00, 0x06, 0x61, 0x00, 0xA2, 0x22, 0x06, 0x1D, 0x01, 0x03, 0xCA, 0xC0, 0x23, 0x07, 0x41,
+	0x00, 0x63, 0x1D, 0x01, 0x04, 0xCC, 0x00, 0x33, 0x00, 0x83, 0xC0, 0x20, 0x81, 0x62, 0x80, 0x23,
+	0x07, 0x41, 0x00, 0x63, 0x80, 0x67, 0x08, 0x23, 0x83, 0x03, 0x80, 0x63, 0x00, 0x63, 0x06, 0xA6,
+	0x50, 0x06, 0x07, 0xA6, 0xA4, 0x06, 0x02, 0xA6, 0xFC, 0x06, 0x00, 0x33, 0x39, 0x00, 0xC2, 0x88,
+	0x00, 0x00, 0x01, 0xA0, 0x16, 0x07, 0xCE, 0x95, 0x83, 0x03, 0x80, 0x63, 0x06, 0xA6, 0x64, 0x06,
+	0x07, 0xA6, 0xA4, 0x06, 0x00, 0x00, 0x01, 0xA0, 0x16, 0x07, 0x00, 0x2B, 0x40, 0x0E, 0x80, 0x63,
+	0x01, 0x00, 0x06, 0xA6, 0x80, 0x06, 0x07, 0xA6, 0xA4, 0x06, 0x00, 0x33, 0x3A, 0x00, 0xC2, 0x88,
+	0x40, 0x0E, 0x80, 0x63, 0x00, 0x43, 0x00, 0xA0, 0x72, 0x06, 0x06, 0xA6, 0x98, 0x06, 0x07, 0xA6,
+	0xA4, 0x06, 0x00, 0x33, 0x3B, 0x00, 0xC2, 0x88, 0x80, 0x67, 0x40, 0x0E, 0x80, 0x63, 0x07, 0xA6,
+	0xA4, 0x06, 0x00, 0x63, 0x03, 0x03, 0x80, 0x63, 0x88, 0x00, 0x01, 0xA2, 0xB8, 0x06, 0x07, 0xA2,
+	0xFC, 0x06, 0x00, 0x33, 0x35, 0x00, 0xC2, 0x88, 0x07, 0xA6, 0xC2, 0x06, 0x00, 0x33, 0x2A, 0x00,
+	0xC2, 0x88, 0x03, 0x03, 0x03, 0xA2, 0xCE, 0x06, 0x07, 0x23, 0x80, 0x00, 0x08, 0x87, 0x80, 0x63,
+	0x89, 0x00, 0x0A, 0x2B, 0x07, 0xA6, 0xDE, 0x06, 0x00, 0x33, 0x29, 0x00, 0xC2, 0x88, 0x00, 0x43,
+	0x00, 0xA2, 0xEA, 0x06, 0xC0, 0x0E, 0x80, 0x63, 0xD4, 0x86, 0xC0, 0x0E, 0x00, 0x33, 0x00, 0x80,
 	0xC0, 0x20, 0x81, 0x62, 0x04, 0x01, 0x08, 0xDA, 0x80, 0x63, 0x00, 0x63, 0x80, 0x67, 0x00, 0x33,
-	0x00, 0x40, 0xC0, 0x20, 0x81, 0x62, 0x00, 0x63, 0x80, 0x7B, 0x80, 0x63, 0x06, 0xA6, 0x20, 0x06,
-	0x00, 0x33, 0x2C, 0x00, 0x82, 0x88, 0x0C, 0xA2, 0xF0, 0x06, 0xA2, 0x95, 0x83, 0x03, 0x80, 0x63,
-	0x06, 0xA6, 0xEE, 0x06, 0x07, 0xA6, 0x64, 0x06, 0x00, 0x33, 0x3D, 0x00, 0x82, 0x88, 0x00, 0x00,
-	0x80, 0x67, 0x83, 0x03, 0x80, 0x63, 0x0C, 0xA0, 0x06, 0x07, 0x07, 0xA6, 0x64, 0x06, 0xBF, 0x23,
-	0x04, 0x61, 0x84, 0x01, 0xB2, 0x84, 0x00, 0x63, 0xF0, 0x04, 0x01, 0x01, 0xF1, 0x00, 0x00, 0x01,
+	0x00, 0x40, 0xC0, 0x20, 0x81, 0x62, 0x00, 0x63, 0x80, 0x7B, 0x80, 0x63, 0x06, 0xA6, 0x5C, 0x06,
+	0x00, 0x33, 0x2C, 0x00, 0xC2, 0x88, 0x0C, 0xA2, 0x30, 0x07, 0xCE, 0x95, 0x83, 0x03, 0x80, 0x63,
+	0x06, 0xA6, 0x2E, 0x07, 0x07, 0xA6, 0xA4, 0x06, 0x00, 0x33, 0x3D, 0x00, 0xC2, 0x88, 0x00, 0x00,
+	0x80, 0x67, 0x83, 0x03, 0x80, 0x63, 0x0C, 0xA0, 0x46, 0x07, 0x07, 0xA6, 0xA4, 0x06, 0xBF, 0x23,
+	0x04, 0x61, 0x84, 0x01, 0xD2, 0x84, 0x00, 0x63, 0xF0, 0x04, 0x01, 0x01, 0xF1, 0x00, 0x00, 0x01,
 	0xF2, 0x00, 0x01, 0x05, 0x80, 0x01, 0x72, 0x04, 0x71, 0x00, 0x81, 0x01, 0x70, 0x04, 0x80, 0x05,
 	0x81, 0x05, 0x00, 0x63, 0xF0, 0x04, 0xF2, 0x00, 0x72, 0x04, 0x01, 0x01, 0xF1, 0x00, 0x70, 0x00,
 	0x81, 0x01, 0x70, 0x04, 0x71, 0x00, 0x81, 0x01, 0x72, 0x00, 0x80, 0x01, 0x71, 0x04, 0x70, 0x00,
 	0x80, 0x01, 0x70, 0x04, 0x00, 0x63, 0xF0, 0x04, 0xF2, 0x00, 0x72, 0x04, 0x00, 0x01, 0xF1, 0x00,
 	0x70, 0x00, 0x80, 0x01, 0x70, 0x04, 0x71, 0x00, 0x80, 0x01, 0x72, 0x00, 0x81, 0x01, 0x71, 0x04,
 	0x70, 0x00, 0x81, 0x01, 0x70, 0x04, 0x00, 0x63, 0x00, 0x23, 0xB3, 0x01, 0x83, 0x05, 0xA3, 0x01,
-	0xA2, 0x01, 0xA1, 0x01, 0x01, 0x23, 0xA0, 0x01, 0x00, 0x01, 0xC8, 0x00, 0x03, 0xA1, 0x86, 0x07,
-	0x00, 0x33, 0x07, 0x00, 0x82, 0x88, 0x80, 0x05, 0x81, 0x05, 0x04, 0x01, 0x11, 0xC8, 0x48, 0x00,
+	0xA2, 0x01, 0xA1, 0x01, 0x01, 0x23, 0xA0, 0x01, 0x00, 0x01, 0xC8, 0x00, 0x03, 0xA1, 0xC6, 0x07,
+	0x00, 0x33, 0x07, 0x00, 0xC2, 0x88, 0x80, 0x05, 0x81, 0x05, 0x04, 0x01, 0x11, 0xC8, 0x48, 0x00,
 	0xB0, 0x01, 0xB1, 0x01, 0x08, 0x23, 0xB2, 0x01, 0x05, 0x01, 0x48, 0x04, 0x00, 0x43, 0x00, 0xA2,
-	0xA6, 0x07, 0x00, 0x05, 0x9C, 0x87, 0x00, 0x01, 0xC8, 0x00, 0xFF, 0x23, 0x80, 0x01, 0x05, 0x05,
+	0xE6, 0x07, 0x00, 0x05, 0xDC, 0x87, 0x00, 0x01, 0xC8, 0x00, 0xFF, 0x23, 0x80, 0x01, 0x05, 0x05,
 	0x00, 0x63, 0xF7, 0x04, 0x1A, 0x09, 0xF6, 0x08, 0x6E, 0x04, 0x00, 0x02, 0x80, 0x43, 0x76, 0x08,
 	0x80, 0x02, 0x77, 0x04, 0x00, 0x63, 0xF7, 0x04, 0x1A, 0x09, 0xF6, 0x08, 0x6E, 0x04, 0x00, 0x02,
-	0x00, 0xA0, 0xD6, 0x07, 0xD8, 0x87, 0x00, 0x43, 0x76, 0x08, 0x80, 0x02, 0x77, 0x04, 0x00, 0x63,
+	0x00, 0xA0, 0x16, 0x08, 0x18, 0x88, 0x00, 0x43, 0x76, 0x08, 0x80, 0x02, 0x77, 0x04, 0x00, 0x63,
 	0xF3, 0x04, 0x00, 0x23, 0xF4, 0x00, 0x74, 0x00, 0x80, 0x43, 0xF4, 0x00, 0xCF, 0x40, 0x00, 0xA2,
-	0x06, 0x08, 0x74, 0x04, 0x02, 0x01, 0xF7, 0xC9, 0xF6, 0xD9, 0x00, 0x01, 0x01, 0xA1, 0xE6, 0x07,
-	0xC6, 0x97, 0xF4, 0x94, 0xE6, 0x87, 0x73, 0x04, 0x00, 0x63, 0xF3, 0x04, 0x75, 0x04, 0x1C, 0x88,
-	0x02, 0x01, 0x04, 0xD8, 0x08, 0x97, 0xC6, 0x97, 0xF4, 0x94, 0x0C, 0x88, 0x75, 0x00, 0x00, 0xA3,
-	0x26, 0x08, 0x00, 0x05, 0x10, 0x88, 0x73, 0x04, 0x00, 0x63, 0x80, 0x7B, 0x80, 0x63, 0x06, 0xA6,
-	0x38, 0x08, 0x00, 0x33, 0x3E, 0x00, 0x82, 0x88, 0x80, 0x67, 0x83, 0x03, 0x80, 0x63, 0x00, 0x63,
-	0x38, 0x2B, 0x5E, 0x88, 0x38, 0x2B, 0x54, 0x88, 0x32, 0x09, 0x31, 0x05, 0x54, 0x98, 0x05, 0x05,
+	0x46, 0x08, 0x74, 0x04, 0x02, 0x01, 0xF7, 0xC9, 0xF6, 0xD9, 0x00, 0x01, 0x01, 0xA1, 0x26, 0x08,
+	0x06, 0x98, 0x14, 0x95, 0x26, 0x88, 0x73, 0x04, 0x00, 0x63, 0xF3, 0x04, 0x75, 0x04, 0x5C, 0x88,
+	0x02, 0x01, 0x04, 0xD8, 0x48, 0x97, 0x06, 0x98, 0x14, 0x95, 0x4C, 0x88, 0x75, 0x00, 0x00, 0xA3,
+	0x66, 0x08, 0x00, 0x05, 0x50, 0x88, 0x73, 0x04, 0x00, 0x63, 0x80, 0x7B, 0x80, 0x63, 0x06, 0xA6,
+	0x78, 0x08, 0x00, 0x33, 0x3E, 0x00, 0xC2, 0x88, 0x80, 0x67, 0x83, 0x03, 0x80, 0x63, 0x00, 0x63,
+	0x38, 0x2B, 0x9E, 0x88, 0x38, 0x2B, 0x94, 0x88, 0x32, 0x09, 0x31, 0x05, 0x94, 0x98, 0x05, 0x05,
 	0xB2, 0x09, 0x00, 0x63, 0x00, 0x32, 0x00, 0x36, 0x00, 0x3A, 0x00, 0x3E, 0x00, 0x63, 0x80, 0x32,
 	0x80, 0x36, 0x80, 0x3A, 0x80, 0x3E, 0x00, 0x63, 0x38, 0x2B, 0x40, 0x32, 0x40, 0x36, 0x40, 0x3A,
-	0x40, 0x3E, 0x00, 0x63, 0x5A, 0x20, 0xC9, 0x40, 0x00, 0xA0, 0x74, 0x08, 0x5D, 0x00, 0xFE, 0xC3,
+	0x40, 0x3E, 0x00, 0x63, 0x5A, 0x20, 0xC9, 0x40, 0x00, 0xA0, 0xB4, 0x08, 0x5D, 0x00, 0xFE, 0xC3,
 	0x00, 0x63, 0x80, 0x73, 0xE6, 0x20, 0x02, 0x23, 0xE8, 0x00, 0x82, 0x73, 0xFF, 0xFD, 0x80, 0x73,
-	0x13, 0x23, 0xB8, 0x88, 0x66, 0x20, 0xC0, 0x20, 0x04, 0x23, 0xA0, 0x01, 0xA1, 0x23, 0xA1, 0x01,
-	0x81, 0x62, 0xA2, 0x88, 0x80, 0x73, 0x80, 0x77, 0x68, 0x00, 0x00, 0xA2, 0x80, 0x00, 0x03, 0xC2,
-	0xF1, 0xC7, 0x41, 0x23, 0xB8, 0x88, 0x11, 0x23, 0xA1, 0x01, 0x04, 0x23, 0xA0, 0x01, 0xB2, 0x84,
-
+	0x13, 0x23, 0xF8, 0x88, 0x66, 0x20, 0xC0, 0x20, 0x04, 0x23, 0xA0, 0x01, 0xA1, 0x23, 0xA1, 0x01,
+	0x81, 0x62, 0xE2, 0x88, 0x80, 0x73, 0x80, 0x77, 0x68, 0x00, 0x00, 0xA2, 0x80, 0x00, 0x03, 0xC2,
+	0xF1, 0xC7, 0x41, 0x23, 0xF8, 0x88, 0x11, 0x23, 0xA1, 0x01, 0x04, 0x23, 0xA0, 0x01, 0xD2, 0x84,
 };
 
 ushort              _mcode_size = sizeof (_mcode_buf);
-ulong               _mcode_chksum = 0x012258FBUL;
-
-extern uchar        _sdtr_period_tbl_[];
+ulong               _mcode_chksum = 0x012CD3FFUL;
+#define ASC_SYN_OFFSET_ONE_DISABLE_LIST  16
+uchar               _syn_offset_one_disable_cmd[ASC_SYN_OFFSET_ONE_DISABLE_LIST] =
+{
+	SCSICMD_Inquiry,
+	SCSICMD_RequestSense,
+	SCSICMD_ReadCapacity,
+	SCSICMD_ReadTOC,
+	SCSICMD_ModeSelect6,
+	SCSICMD_ModeSense6,
+	SCSICMD_ModeSelect10,
+	SCSICMD_ModeSense10,
+	0xFF,
+	0xFF,
+	0xFF,
+	0xFF,
+	0xFF,
+	0xFF,
+	0xFF,
+	0xFF
+};
 
 int
 AscExeScsiQueue(
-				   ASC_DVC_VAR asc_ptr_type * asc_dvc,
-				   ASC_SCSI_Q dosfar * scsiq
+				   REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+				   REG ASC_SCSI_Q dosfar * scsiq
 )
 {
 	PortAddr            iop_base;
 	int                 last_int_level;
 	int                 sta;
+	int                 n_q_required;
+	int                 disable_syn_offset_one_fix;
+	int                 i;
 	ulong               addr;
-	uchar               sg_entry_cnt;
+	ASC_EXE_CALLBACK    asc_exe_callback;
+	ushort              sg_entry_cnt = 0;
+	ushort              sg_entry_cnt_minus_one = 0;
 	uchar               target_ix;
-	int                 n_q_required;
-	uchar               sg_entry_cnt_minus_one;
 	uchar               tid_no;
 	uchar               sdtr_data;
-	ASC_EXE_CALLBACK    asc_exe_callback;
-
-#if CC_DEBUG_SG_LIST
-	int                 i;
-
-#endif
+	uchar               extra_bytes;
+	uchar               scsi_cmd;
+	uchar               disable_cmd;
+	ASC_SG_HEAD dosfar *sg_head;
+	ulong               data_cnt;
 #if CC_LINK_BUSY_Q
 	ASC_SCSI_Q dosfar  *scsiq_tail;
 	ASC_SCSI_Q dosfar  *scsiq_next;
 	ASC_SCSI_Q dosfar  *scsiq_prev;
-
 #endif
-
 	iop_base = asc_dvc->iop_base;
+	sg_head = scsiq->sg_head;
 	asc_exe_callback = (ASC_EXE_CALLBACK) asc_dvc->exe_callback;
 	if (asc_dvc->err_code != 0)
 		return (ERR);
@@ -6098,20 +6978,17 @@
 		return (ERR);
 	}
 	scsiq->q1.q_no = 0;
+	scsiq->q1.extra_bytes = 0;
 	sta = 0;
 	target_ix = scsiq->q2.target_ix;
 	tid_no = ASC_TIX_TO_TID(target_ix);
-
 	n_q_required = 1;
-
 	if (scsiq->cdbptr[0] == SCSICMD_RequestSense) {
-
 		if (((asc_dvc->init_sdtr & scsiq->q1.target_id) != 0) &&
 			((asc_dvc->sdtr_done & scsiq->q1.target_id) != 0)) {
-			sdtr_data = AscReadLramByte(iop_base,
-				  (ushort) ((ushort) ASCV_SDTR_DATA_BEG + (ushort) tid_no));
-			AscMsgOutSDTR(iop_base,
-						  _sdtr_period_tbl_[(sdtr_data >> 4) & (uchar) (ASC_SYN_XFER_NO - 1)],
+			sdtr_data = AscGetMCodeInitSDTRAtID(iop_base, tid_no);
+			AscMsgOutSDTR(asc_dvc,
+						  asc_dvc->sdtr_period_tbl[(sdtr_data >> 4) & (uchar) (ASC_SYN_XFER_NO - 1)],
 						  (uchar) (sdtr_data & (uchar) ASC_SYN_MAX_OFFSET));
 			scsiq->q1.cntl |= (QC_MSG_OUT | QC_URGENT);
 		}
@@ -6123,33 +7000,30 @@
 		return (ERR);
 	}
 	asc_dvc->in_critical_cnt++;
-
 	if ((scsiq->q1.cntl & QC_SG_HEAD) != 0) {
-
-		if ((sg_entry_cnt = scsiq->sg_head->entry_cnt) == 0) {
+		if ((sg_entry_cnt = sg_head->entry_cnt) == 0) {
 			asc_dvc->in_critical_cnt--;
 			DvcLeaveCritical(last_int_level);
 			return (ERR);
 		}
-		if (sg_entry_cnt == 1) {
-			scsiq->q1.data_addr = scsiq->sg_head->sg_list[0].addr;
-			scsiq->q1.data_cnt = scsiq->sg_head->sg_list[0].bytes;
-			scsiq->q1.cntl &= ~(QC_SG_HEAD | QC_SG_SWAP_QUEUE);
-			goto NON_SG_LIST_REQ;
-		}
 		if (sg_entry_cnt > ASC_MAX_SG_LIST) {
-
 			return (ERR);
 		}
+		if (sg_entry_cnt == 1) {
+			scsiq->q1.data_addr = sg_head->sg_list[0].addr;
+			scsiq->q1.data_cnt = sg_head->sg_list[0].bytes;
+			scsiq->q1.cntl &= ~(QC_SG_HEAD | QC_SG_SWAP_QUEUE);
+		} else {
+#if CC_CHK_AND_COALESCE_SG_LIST
+			AscCoalesceSgList(scsiq);
+			sg_entry_cnt = sg_head->entry_cnt;
+#endif
+		}
 		sg_entry_cnt_minus_one = sg_entry_cnt - 1;
-
 #if CC_DEBUG_SG_LIST
 		if (asc_dvc->bus_type & (ASC_IS_ISA | ASC_IS_VL | ASC_IS_EISA)) {
 			for (i = 0; i < sg_entry_cnt_minus_one; i++) {
-
-				addr = scsiq->sg_head->sg_list[i].addr +
-				  scsiq->sg_head->sg_list[i].bytes;
-
+				addr = sg_head->sg_list[i].addr + sg_head->sg_list[i].bytes;
 				if (((ushort) addr & 0x0003) != 0) {
 					asc_dvc->in_critical_cnt--;
 					DvcLeaveCritical(last_int_level);
@@ -6159,40 +7033,78 @@
 			}
 		}
 #endif
-
+	}
+	scsi_cmd = scsiq->cdbptr[0];
+	disable_syn_offset_one_fix = FALSE;
+	if (
+		   (asc_dvc->pci_fix_asyn_xfer & scsiq->q1.target_id)
+		   && !(asc_dvc->pci_fix_asyn_xfer_always & scsiq->q1.target_id)
+	  ) {
+		if (scsiq->q1.cntl & QC_SG_HEAD) {
+			data_cnt = 0;
+			for (i = 0; i < sg_entry_cnt; i++) {
+				data_cnt += sg_head->sg_list[i].bytes;
+			}
+		} else {
+			data_cnt = scsiq->q1.data_cnt;
+		}
+		if (data_cnt != 0UL) {
+			if (data_cnt < 512UL) {
+				disable_syn_offset_one_fix = TRUE;
+			} else {
+				for (i = 0; i < ASC_SYN_OFFSET_ONE_DISABLE_LIST; i++) {
+					disable_cmd = _syn_offset_one_disable_cmd[i];
+					if (disable_cmd == 0xFF) {
+						break;
+					}
+					if (scsi_cmd == disable_cmd) {
+						disable_syn_offset_one_fix = TRUE;
+						break;
+					}
+				}
+			}
+		}
+	}
+	if (disable_syn_offset_one_fix) {
+		scsiq->q2.tag_code &= ~M2_QTAG_MSG_SIMPLE;
+		scsiq->q2.tag_code |= (ASC_TAG_FLAG_DISABLE_ASYN_USE_SYN_FIX |
+							   ASC_TAG_FLAG_DISABLE_DISCONNECT);
+	} else {
+		scsiq->q2.tag_code &= 0x23;
+	}
+	if ((scsiq->q1.cntl & QC_SG_HEAD) != 0) {
 		if (asc_dvc->bug_fix_cntl) {
-			if (asc_dvc->bug_fix_cntl & ASC_BUG_FIX_ADD_ONE_BYTE) {
-
-				addr = scsiq->sg_head->sg_list[sg_entry_cnt_minus_one].addr +
-				  scsiq->sg_head->sg_list[sg_entry_cnt_minus_one].bytes;
-				if (((ushort) addr & 0x0003) != 0) {
-					if ((scsiq->cdbptr[0] == SCSICMD_Read6) ||
-						(scsiq->cdbptr[0] == SCSICMD_Read10)) {
-						if ((scsiq->q2.tag_code & ASC_TAG_FLAG_ADD_ONE_BYTE) == 0) {
-
-							scsiq->sg_head->sg_list[sg_entry_cnt_minus_one].bytes++;
-							scsiq->q2.tag_code |= ASC_TAG_FLAG_ADD_ONE_BYTE;
-						}
+			if (asc_dvc->bug_fix_cntl & ASC_BUG_FIX_IF_NOT_DWB) {
+				if (
+					   (scsi_cmd == SCSICMD_Read6)
+					   || (scsi_cmd == SCSICMD_Read10)
+				  ) {
+					addr = sg_head->sg_list[sg_entry_cnt_minus_one].addr +
+					  sg_head->sg_list[sg_entry_cnt_minus_one].bytes;
+					extra_bytes = (uchar) ((ushort) addr & 0x0003);
+					if (extra_bytes != 0) {
+						scsiq->q2.tag_code |= ASC_TAG_FLAG_EXTRA_BYTES;
+						scsiq->q1.extra_bytes = extra_bytes;
+						sg_head->sg_list[sg_entry_cnt_minus_one].bytes -= (ulong) extra_bytes;
 					}
 				}
 			}
 		}
-		scsiq->sg_head->entry_to_copy = scsiq->sg_head->entry_cnt;
+		sg_head->entry_to_copy = sg_head->entry_cnt;
 		n_q_required = AscSgListToQueue(sg_entry_cnt);
-
 #if CC_LINK_BUSY_Q
 		scsiq_next = (ASC_SCSI_Q dosfar *) asc_dvc->scsiq_busy_head[tid_no];
 		if (scsiq_next != (ASC_SCSI_Q dosfar *) 0L) {
 			goto link_scisq_to_busy_list;
 		}
 #endif
-
-		if ((AscGetNumOfFreeQueue(asc_dvc, target_ix, n_q_required)
-			 >= (uint) n_q_required) ||
-			((scsiq->q1.cntl & QC_URGENT) != 0)) {
+		if (
+			   (AscGetNumOfFreeQueue(asc_dvc, target_ix, n_q_required)
+				>= (uint) n_q_required) ||
+			   ((scsiq->q1.cntl & QC_URGENT) != 0)
+		  ) {
 			if ((sta = AscSendScsiQueue(asc_dvc, scsiq,
 										n_q_required)) == 1) {
-
 				asc_dvc->in_critical_cnt--;
 				if (asc_exe_callback != 0) {
 					(*asc_exe_callback) (asc_dvc, scsiq);
@@ -6202,30 +7114,25 @@
 			}
 		}
 	} else {
-
-	  NON_SG_LIST_REQ:
-
 		if (asc_dvc->bug_fix_cntl) {
-			if (asc_dvc->bug_fix_cntl & ASC_BUG_FIX_ADD_ONE_BYTE) {
-
-				addr = scsiq->q1.data_addr + scsiq->q1.data_cnt;
-				if ((scsiq->cdbptr[0] == SCSICMD_Read6) ||
-					(scsiq->cdbptr[0] == SCSICMD_Read10)) {
-					if (((ushort) addr & 0x0003) != 0) {
+			if (asc_dvc->bug_fix_cntl & ASC_BUG_FIX_IF_NOT_DWB) {
+				if (
+					   (scsi_cmd == SCSICMD_Read6)
+					   || (scsi_cmd == SCSICMD_Read10)
+				  ) {
+					addr = scsiq->q1.data_addr + scsiq->q1.data_cnt;
+					extra_bytes = (uchar) ((ushort) addr & 0x0003);
+					if (extra_bytes != 0) {
 						if (((ushort) scsiq->q1.data_cnt & 0x01FF) == 0) {
-
-							if ((scsiq->q2.tag_code & ASC_TAG_FLAG_ADD_ONE_BYTE) == 0) {
-
-								scsiq->q2.tag_code |= ASC_TAG_FLAG_ADD_ONE_BYTE;
-								scsiq->q1.data_cnt++;
-							}
+							scsiq->q2.tag_code |= ASC_TAG_FLAG_EXTRA_BYTES;
+							scsiq->q1.data_cnt -= (ulong) extra_bytes;
+							scsiq->q1.extra_bytes = extra_bytes;
 						}
 					}
 				}
 			}
 		}
 		n_q_required = 1;
-
 #if CC_LINK_BUSY_Q
 		scsiq_next = (ASC_SCSI_Q dosfar *) asc_dvc->scsiq_busy_head[tid_no];
 		if (scsiq_next != (ASC_SCSI_Q dosfar *) 0L) {
@@ -6236,7 +7143,6 @@
 			((scsiq->q1.cntl & QC_URGENT) != 0)) {
 			if ((sta = AscSendScsiQueue(asc_dvc, scsiq,
 										n_q_required)) == 1) {
-
 				asc_dvc->in_critical_cnt--;
 				if (asc_exe_callback != 0) {
 					(*asc_exe_callback) (asc_dvc, scsiq);
@@ -6246,10 +7152,8 @@
 			}
 		}
 	}
-
 #if CC_LINK_BUSY_Q
 	if (sta == 0) {
-
 	  link_scisq_to_busy_list:
 		scsiq->ext.q_required = n_q_required;
 		if (scsiq_next == (ASC_SCSI_Q dosfar *) 0L) {
@@ -6263,7 +7167,6 @@
 			scsiq_tail = (ASC_SCSI_Q dosfar *) asc_dvc->scsiq_busy_tail[tid_no];
 			if (scsiq_tail->ext.next == (ASC_SCSI_Q dosfar *) 0L) {
 				if ((scsiq->q1.cntl & QC_URGENT) != 0) {
-
 					asc_dvc->scsiq_busy_head[tid_no] = (ASC_SCSI_Q dosfar *) scsiq;
 					scsiq->ext.next = scsiq_next;
 					scsiq->ext.join = (ASC_SCSI_Q dosfar *) 0L;
@@ -6275,7 +7178,6 @@
 							if (scsiq->ext.lba < scsiq_prev->ext.lba)
 								break;
 						} while (scsiq_next != (ASC_SCSI_Q dosfar *) 0L);
-
 						scsiq_prev->ext.next = scsiq;
 						scsiq->ext.next = scsiq_next;
 						if (scsiq_next == (ASC_SCSI_Q dosfar *) 0L) {
@@ -6283,7 +7185,6 @@
 						}
 						scsiq->ext.join = (ASC_SCSI_Q dosfar *) 0L;
 					} else {
-
 						scsiq_tail->ext.next = (ASC_SCSI_Q dosfar *) scsiq;
 						asc_dvc->scsiq_busy_tail[tid_no] = (ASC_SCSI_Q dosfar *) scsiq;
 						scsiq->ext.next = (ASC_SCSI_Q dosfar *) 0L;
@@ -6293,7 +7194,6 @@
 				scsiq->q1.status = QS_BUSY;
 				sta = 1;
 			} else {
-
 				AscSetLibErrorCode(asc_dvc, ASCQ_ERR_SCSIQ_BAD_NEXT_PTR);
 				sta = ERR;
 			}
@@ -6307,8 +7207,8 @@
 
 int
 AscSendScsiQueue(
-					ASC_DVC_VAR asc_ptr_type * asc_dvc,
-					ASC_SCSI_Q dosfar * scsiq,
+					REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					REG ASC_SCSI_Q dosfar * scsiq,
 					uchar n_q_required
 )
 {
@@ -6318,7 +7218,6 @@
 	uchar               tid_no;
 	uchar               target_ix;
 	int                 sta;
-
 	iop_base = asc_dvc->iop_base;
 	target_ix = scsiq->q2.target_ix;
 	tid_no = ASC_TIX_TO_TID(target_ix);
@@ -6331,14 +7230,11 @@
 			asc_dvc->last_q_shortage = 0;
 			scsiq->sg_head->queue_cnt = n_q_required - 1;
 			scsiq->q1.q_no = free_q_head;
-
 			if ((sta = AscPutReadySgListQueue(asc_dvc, scsiq,
 											  free_q_head)) == 1) {
-
 #if CC_WRITE_IO_COUNT
 				asc_dvc->req_count++;
 #endif
-
 				AscPutVarFreeQHead(iop_base, next_qp);
 				asc_dvc->cur_total_qng += (uchar) (n_q_required);
 				asc_dvc->cur_dvc_qng[tid_no]++;
@@ -6346,18 +7242,14 @@
 			return (sta);
 		}
 	} else if (n_q_required == 1) {
-
 		if ((next_qp = AscAllocFreeQueue(iop_base,
 										 free_q_head)) != ASC_QLINK_END) {
-
 			scsiq->q1.q_no = free_q_head;
 			if ((sta = AscPutReadyQueue(asc_dvc, scsiq,
 										free_q_head)) == 1) {
-
 #if CC_WRITE_IO_COUNT
 				asc_dvc->req_count++;
 #endif
-
 				AscPutVarFreeQHead(iop_base, next_qp);
 				asc_dvc->cur_total_qng++;
 				asc_dvc->cur_dvc_qng[tid_no]++;
@@ -6374,24 +7266,24 @@
 )
 {
 	int                 n_sg_list_qs;
-
 	n_sg_list_qs = ((sg_list - 1) / ASC_SG_LIST_PER_Q);
 	if (((sg_list - 1) % ASC_SG_LIST_PER_Q) != 0)
 		n_sg_list_qs++;
 	return (n_sg_list_qs + 1);
 }
 
+
 uint
 AscGetNumOfFreeQueue(
-						ASC_DVC_VAR asc_ptr_type * asc_dvc,
-						uchar target_ix, uchar n_qs
+						REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						uchar target_ix,
+						uchar n_qs
 )
 {
 	uint                cur_used_qs;
 	uint                cur_free_qs;
 	ASC_SCSI_BIT_ID_TYPE target_id;
 	uchar               tid_no;
-
 	target_id = ASC_TIX_TO_TARGET_ID(target_ix);
 	tid_no = ASC_TIX_TO_TID(target_ix);
 	if ((asc_dvc->unit_not_ready & target_id) ||
@@ -6406,7 +7298,6 @@
 		cur_used_qs = (uint) asc_dvc->cur_total_qng +
 		  (uint) ASC_MIN_FREE_Q;
 	}
-
 	if ((uint) (cur_used_qs + n_qs) <= (uint) asc_dvc->max_total_qng) {
 		cur_free_qs = (uint) asc_dvc->max_total_qng - cur_used_qs;
 		if (asc_dvc->cur_dvc_qng[tid_no] >=
@@ -6425,8 +7316,8 @@
 
 int
 AscPutReadyQueue(
-					ASC_DVC_VAR asc_ptr_type * asc_dvc,
-					ASC_SCSI_Q dosfar * scsiq,
+					REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					REG ASC_SCSI_Q dosfar * scsiq,
 					uchar q_no
 )
 {
@@ -6436,55 +7327,41 @@
 	uchar               syn_period_ix;
 	uchar               syn_offset;
 	PortAddr            iop_base;
-
 	iop_base = asc_dvc->iop_base;
-
 	if (((asc_dvc->init_sdtr & scsiq->q1.target_id) != 0) &&
 		((asc_dvc->sdtr_done & scsiq->q1.target_id) == 0)) {
-
 		tid_no = ASC_TIX_TO_TID(scsiq->q2.target_ix);
-
-		sdtr_data = AscReadLramByte(iop_base,
-				  (ushort) ((ushort) ASCV_SDTR_DATA_BEG + (ushort) tid_no));
+		sdtr_data = AscGetMCodeInitSDTRAtID(iop_base, tid_no);
 		syn_period_ix = (sdtr_data >> 4) & (ASC_SYN_XFER_NO - 1);
 		syn_offset = sdtr_data & ASC_SYN_MAX_OFFSET;
-		AscMsgOutSDTR(iop_base,
-					  _sdtr_period_tbl_[syn_period_ix],
+		AscMsgOutSDTR(asc_dvc,
+					  asc_dvc->sdtr_period_tbl[syn_period_ix],
 					  syn_offset);
-
 		scsiq->q1.cntl |= QC_MSG_OUT;
 	}
 	q_addr = ASC_QNO_TO_QADDR(q_no);
-
 	if ((scsiq->q1.target_id & asc_dvc->use_tagged_qng) == 0) {
 		scsiq->q2.tag_code &= ~M2_QTAG_MSG_SIMPLE;
 	}
 	scsiq->q1.status = QS_FREE;
-
 	AscMemWordCopyToLram(iop_base,
 						 (ushort) (q_addr + (ushort) ASC_SCSIQ_CDB_BEG),
 						 (ushort dosfar *) scsiq->cdbptr,
 						 (ushort) ((ushort) scsiq->q2.cdb_len >> 1));
-
 #if !CC_LITTLE_ENDIAN_HOST
 	AscAdjEndianScsiQ(scsiq);
 #endif
-
 	DvcPutScsiQ(iop_base,
 				(ushort) (q_addr + (ushort) ASC_SCSIQ_CPY_BEG),
 				(ushort dosfar *) & scsiq->q1.cntl,
 	  (ushort) ((((sizeof (ASC_SCSIQ_1) + sizeof (ASC_SCSIQ_2)) / 2) - 1)));
-
 #if CC_WRITE_IO_COUNT
 	AscWriteLramWord(iop_base,
 					 (ushort) (q_addr + (ushort) ASC_SCSIQ_W_REQ_COUNT),
 					 (ushort) asc_dvc->req_count);
-
 #endif
-
 #if CC_VERIFY_LRAM_COPY
 	if ((asc_dvc->dvc_cntl & ASC_CNTL_NO_VERIFY_COPY) == 0) {
-
 		if (AscMemWordCmpToLram(iop_base,
 							 (ushort) (q_addr + (ushort) ASC_SCSIQ_CDB_BEG),
 								(ushort dosfar *) scsiq->cdbptr,
@@ -6502,16 +7379,12 @@
 		}
 	}
 #endif
-
 #if CC_CLEAR_DMA_REMAIN
-
 	AscWriteLramDWord(iop_base,
 		   (ushort) (q_addr + (ushort) ASC_SCSIQ_DW_REMAIN_XFER_ADDR), 0UL);
 	AscWriteLramDWord(iop_base,
 			(ushort) (q_addr + (ushort) ASC_SCSIQ_DW_REMAIN_XFER_CNT), 0UL);
-
 #endif
-
 	AscWriteLramWord(iop_base,
 					 (ushort) (q_addr + (ushort) ASC_SCSIQ_B_STATUS),
 			 (ushort) (((ushort) scsiq->q1.q_no << 8) | (ushort) QS_READY));
@@ -6520,27 +7393,25 @@
 
 int
 AscPutReadySgListQueue(
-						  ASC_DVC_VAR asc_ptr_type * asc_dvc,
-						  ASC_SCSI_Q dosfar * scsiq,
+						  REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						  REG ASC_SCSI_Q dosfar * scsiq,
 						  uchar q_no
 )
 {
-	uchar               sg_list_dwords;
-	uchar               sg_index, i;
-	uchar               sg_entry_cnt;
-	uchar               next_qp;
-	ushort              q_addr;
 	int                 sta;
+	int                 i;
 	ASC_SG_HEAD dosfar *sg_head;
 	ASC_SG_LIST_Q       scsi_sg_q;
 	ulong               saved_data_addr;
 	ulong               saved_data_cnt;
 	PortAddr            iop_base;
-
+	ushort              sg_list_dwords;
+	ushort              sg_index;
+	ushort              sg_entry_cnt;
+	ushort              q_addr;
+	uchar               next_qp;
 	iop_base = asc_dvc->iop_base;
-
 	sg_head = scsiq->sg_head;
-
 	saved_data_addr = scsiq->q1.data_addr;
 	saved_data_cnt = scsiq->q1.data_cnt;
 	scsiq->q1.data_addr = sg_head->sg_list[0].addr;
@@ -6566,7 +7437,6 @@
 					scsi_sg_q.sg_cur_list_cnt = ASC_SG_LIST_PER_Q - 1;
 				}
 			} else {
-
 				scsi_sg_q.cntl |= QCSG_SG_XFER_END;
 				sg_list_dwords = sg_entry_cnt << 1;
 				if (i == 0) {
@@ -6582,25 +7452,20 @@
 									  (ushort) (q_addr + ASC_SCSIQ_B_FWD));
 			scsi_sg_q.q_no = next_qp;
 			q_addr = ASC_QNO_TO_QADDR(next_qp);
-
 			AscMemWordCopyToLram(iop_base,
 								 (ushort) (q_addr + ASC_SCSIQ_SGHD_CPY_BEG),
 								 (ushort dosfar *) & scsi_sg_q,
 								 (ushort) (sizeof (ASC_SG_LIST_Q) >> 1));
-
 			AscMemDWordCopyToLram(iop_base,
 								  (ushort) (q_addr + ASC_SGQ_LIST_BEG),
 							  (ulong dosfar *) & sg_head->sg_list[sg_index],
 								  (ushort) sg_list_dwords);
-
 			sg_index += ASC_SG_LIST_PER_Q;
 		}
 	} else {
-
 		scsiq->q1.cntl &= ~QC_SG_HEAD;
 	}
 	sta = AscPutReadyQueue(asc_dvc, scsiq, q_no);
-
 	scsiq->q1.data_addr = saved_data_addr;
 	scsiq->q1.data_cnt = saved_data_cnt;
 	return (sta);
@@ -6608,14 +7473,13 @@
 
 int
 AscAbortSRB(
-			   ASC_DVC_VAR asc_ptr_type * asc_dvc,
+			   REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
 			   ulong srb_ptr
 )
 {
 	int                 sta;
 	ASC_SCSI_BIT_ID_TYPE saved_unit_not_ready;
 	PortAddr            iop_base;
-
 	iop_base = asc_dvc->iop_base;
 	sta = ERR;
 	saved_unit_not_ready = asc_dvc->unit_not_ready;
@@ -6626,7 +7490,6 @@
 			sta = 1;
 			AscCleanUpBusyQueue(iop_base);
 			AscStartQueueExe(iop_base);
-
 		} else {
 			sta = 0;
 			AscStartQueueExe(iop_base);
@@ -6638,7 +7501,7 @@
 
 int
 AscResetDevice(
-				  ASC_DVC_VAR asc_ptr_type * asc_dvc,
+				  REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
 				  uchar target_ix
 )
 {
@@ -6651,7 +7514,6 @@
 	ASC_SCSI_REQ_Q dosfar *scsiq;
 	uchar dosfar       *buf;
 	ASC_SCSI_BIT_ID_TYPE saved_unit_not_ready;
-
 	iop_base = asc_dvc->iop_base;
 	tid_no = ASC_TIX_TO_TID(target_ix);
 	target_id = ASC_TID_TO_TARGET_ID(tid_no);
@@ -6661,56 +7523,43 @@
 	AscWaitTixISRDone(asc_dvc, target_ix);
 	if (AscStopQueueExe(iop_base) == 1) {
 		if (AscRiscHaltedAbortTIX(asc_dvc, target_ix) == 1) {
-
 			AscCleanUpBusyQueue(iop_base);
 			AscStartQueueExe(iop_base);
-
 			AscWaitTixISRDone(asc_dvc, target_ix);
-
 			sta = TRUE;
 			scsiq = (ASC_SCSI_REQ_Q dosfar *) & scsiq_buf;
 			buf = (uchar dosfar *) & scsiq_buf;
 			for (i = 0; i < sizeof (ASC_SCSI_REQ_Q); i++) {
 				*buf++ = 0x00;
 			}
-
 			scsiq->r1.status = (uchar) QS_READY;
 			scsiq->r2.cdb_len = 6;
 			scsiq->r2.tag_code = M2_QTAG_MSG_SIMPLE;
 			scsiq->r1.target_id = target_id;
-
 			scsiq->r2.target_ix = ASC_TIDLUN_TO_IX(tid_no, 0);
 			scsiq->cdbptr = (uchar dosfar *) scsiq->cdb;
-
 			scsiq->r1.cntl = QC_NO_CALLBACK | QC_MSG_OUT | QC_URGENT;
 			AscWriteLramByte(asc_dvc->iop_base, ASCV_MSGOUT_BEG,
 							 M1_BUS_DVC_RESET);
-
 			asc_dvc->unit_not_ready &= ~target_id;
-
 			asc_dvc->sdtr_done |= target_id;
-
 			if (AscExeScsiQueue(asc_dvc, (ASC_SCSI_Q dosfar *) scsiq)
 				== 1) {
 				asc_dvc->unit_not_ready = target_id;
 				DvcSleepMilliSecond(1000);
 				_AscWaitQDone(iop_base, (ASC_SCSI_Q dosfar *) scsiq);
 				if (AscStopQueueExe(iop_base) == 1) {
-
 					AscCleanUpDiscQueue(iop_base);
 					AscStartQueueExe(iop_base);
 					if (asc_dvc->pci_fix_asyn_xfer & target_id) {
-
 						AscSetRunChipSynRegAtID(iop_base, tid_no,
 											 ASYN_SDTR_DATA_FIX_PCI_REV_AB);
 					}
 					AscWaitTixISRDone(asc_dvc, target_ix);
 				}
 			} else {
-
 				sta = 0;
 			}
-
 			asc_dvc->sdtr_done &= ~target_id;
 		} else {
 			sta = ERR;
@@ -6723,41 +7572,28 @@
 
 int
 AscResetSB(
-			  ASC_DVC_VAR asc_ptr_type * asc_dvc
+			  REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	int                 sta;
 	int                 i;
 	PortAddr            iop_base;
-
 	iop_base = asc_dvc->iop_base;
 	asc_dvc->unit_not_ready = 0xFF;
 	sta = TRUE;
 	AscWaitISRDone(asc_dvc);
 	AscStopQueueExe(iop_base);
-
 	asc_dvc->sdtr_done = 0;
 	AscResetChipAndScsiBus(iop_base);
-
 	DvcSleepMilliSecond((ulong) ((ushort) asc_dvc->scsi_reset_wait * 1000));
-
-#if CC_SCAM
-	if (!(asc_dvc->dvc_cntl & ASC_CNTL_NO_SCAM)) {
-		AscSCAM(asc_dvc);
-	}
-#endif
 	AscReInitLram(asc_dvc);
-
 	for (i = 0; i <= ASC_MAX_TID; i++) {
 		asc_dvc->cur_dvc_qng[i] = 0;
-		if (asc_dvc->pci_fix_asyn_xfer & (0x01 << i)) {
-
+		if (asc_dvc->pci_fix_asyn_xfer & (ASC_SCSI_BIT_ID_TYPE) (0x01 << i)) {
 			AscSetChipSynRegAtID(iop_base, i, ASYN_SDTR_DATA_FIX_PCI_REV_AB);
 		}
 	}
-
 	asc_dvc->err_code = 0;
-
 	AscSetPCAddr(iop_base, ASC_MCODE_START_ADDR);
 	if (AscGetPCAddr(iop_base) != ASC_MCODE_START_ADDR) {
 		sta = ERR;
@@ -6779,10 +7615,8 @@
 )
 {
 	int                 sta = FALSE;
-
 	if (AscHostReqRiscHalt(iop_base)) {
 		sta = AscSetChipSynRegAtID(iop_base, tid_no, sdtr_data);
-
 		AscStartChip(iop_base);
 		return (sta);
 	}
@@ -6796,22 +7630,36 @@
 						uchar sdtr_data
 )
 {
+	ASC_SCSI_BIT_ID_TYPE org_id;
+	int                 i;
+	int                 sta;
+	sta = TRUE;
 	AscSetBank(iop_base, 1);
-	AscWriteChipScsiID(iop_base, id);
-	if (AscReadChipScsiID(iop_base) != (0x01 << id)) {
-		return (FALSE);
+	org_id = AscReadChipDvcID(iop_base);
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		if (org_id == (0x01 << i))
+			break;
 	}
-	AscSetBank(iop_base, 0);
-	AscWriteChipSyn(iop_base, sdtr_data);
-	if (AscReadChipSyn(iop_base) != sdtr_data) {
-		return (FALSE);
+	org_id = i;
+	AscWriteChipDvcID(iop_base, id);
+	if (AscReadChipDvcID(iop_base) == (0x01 << id)) {
+		AscSetBank(iop_base, 0);
+		AscSetChipSyn(iop_base, sdtr_data);
+		if (AscGetChipSyn(iop_base) != sdtr_data) {
+			sta = FALSE;
+		}
+	} else {
+		sta = FALSE;
 	}
-	return (TRUE);
+	AscSetBank(iop_base, 1);
+	AscWriteChipDvcID(iop_base, org_id);
+	AscSetBank(iop_base, 0);
+	return (sta);
 }
 
 int
 AscReInitLram(
-				 ASC_DVC_VAR asc_ptr_type * asc_dvc
+				 REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	AscInitLram(asc_dvc);
@@ -6821,23 +7669,20 @@
 
 ushort
 AscInitLram(
-			   ASC_DVC_VAR asc_ptr_type * asc_dvc)
+			   REG ASC_DVC_VAR asc_ptr_type * asc_dvc
+)
 {
 	uchar               i;
 	ushort              s_addr;
 	PortAddr            iop_base;
 	ushort              warn_code;
-
 	iop_base = asc_dvc->iop_base;
 	warn_code = 0;
-
 	AscMemWordSetLram(iop_base, ASC_QADR_BEG, 0,
 			   (ushort) (((int) (asc_dvc->max_total_qng + 2 + 1) * 64) >> 1)
 	  );
-
 	i = ASC_MIN_ACTIVE_QNO;
 	s_addr = ASC_QADR_BEG + ASC_QBLK_SIZE;
-
 	AscWriteLramByte(iop_base, (ushort) (s_addr + ASC_SCSIQ_B_FWD),
 					 (uchar) (i + 1));
 	AscWriteLramByte(iop_base, (ushort) (s_addr + ASC_SCSIQ_B_BWD),
@@ -6854,7 +7699,6 @@
 		AscWriteLramByte(iop_base, (ushort) (s_addr + ASC_SCSIQ_B_QNO),
 						 (uchar) i);
 	}
-
 	AscWriteLramByte(iop_base, (ushort) (s_addr + ASC_SCSIQ_B_FWD),
 					 (uchar) ASC_QLINK_END);
 	AscWriteLramByte(iop_base, (ushort) (s_addr + ASC_SCSIQ_B_BWD),
@@ -6863,10 +7707,8 @@
 					 (uchar) asc_dvc->max_total_qng);
 	i++;
 	s_addr += ASC_QBLK_SIZE;
-
 	for (; i <= (uchar) (asc_dvc->max_total_qng + 3);
 		 i++, s_addr += ASC_QBLK_SIZE) {
-
 		AscWriteLramByte(iop_base,
 						 (ushort) (s_addr + (ushort) ASC_SCSIQ_B_FWD), i);
 		AscWriteLramByte(iop_base,
@@ -6874,58 +7716,48 @@
 		AscWriteLramByte(iop_base,
 						 (ushort) (s_addr + (ushort) ASC_SCSIQ_B_QNO), i);
 	}
-
 	return (warn_code);
 }
 
 ushort
 AscInitQLinkVar(
-				   ASC_DVC_VAR asc_ptr_type * asc_dvc
+				   REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	PortAddr            iop_base;
 	int                 i;
 	ushort              lram_addr;
-
 	iop_base = asc_dvc->iop_base;
 	AscPutRiscVarFreeQHead(iop_base, 1);
 	AscPutRiscVarDoneQTail(iop_base, asc_dvc->max_total_qng);
-
 	AscPutVarFreeQHead(iop_base, 1);
 	AscPutVarDoneQTail(iop_base, asc_dvc->max_total_qng);
-
 	AscWriteLramByte(iop_base, ASCV_BUSY_QHEAD_B,
 					 (uchar) ((int) asc_dvc->max_total_qng + 1));
 	AscWriteLramByte(iop_base, ASCV_DISC1_QHEAD_B,
 					 (uchar) ((int) asc_dvc->max_total_qng + 2));
-
 	AscWriteLramByte(iop_base, (ushort) ASCV_TOTAL_READY_Q_B,
 					 asc_dvc->max_total_qng);
-
 	AscWriteLramWord(iop_base, ASCV_ASCDVC_ERR_CODE_W, 0);
 	AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
 	AscWriteLramByte(iop_base, ASCV_STOP_CODE_B, 0);
 	AscWriteLramByte(iop_base, ASCV_SCSIBUSY_B, 0);
 	AscWriteLramByte(iop_base, ASCV_WTM_FLAG_B, 0);
-
-	AscWriteLramByte(iop_base, (ushort) ASCV_CDBCNT_B, 0);
-
+	AscPutQDoneInProgress(iop_base, 0);
 	lram_addr = ASC_QADR_BEG;
 	for (i = 0; i < 32; i++, lram_addr += 2) {
 		AscWriteLramWord(iop_base, lram_addr, 0);
 	}
-
 	return (0);
 }
 
 int
 AscSetLibErrorCode(
-					  ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					  REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
 					  ushort err_code
 )
 {
 	if (asc_dvc->err_code == 0) {
-
 		asc_dvc->err_code = err_code;
 		AscWriteLramWord(asc_dvc->iop_base, ASCV_ASCDVC_ERR_CODE_W,
 						 err_code);
@@ -6933,19 +7765,18 @@
 	return (err_code);
 }
 
+
 int
 _AscWaitQDone(
 				 PortAddr iop_base,
-				 ASC_SCSI_Q dosfar * scsiq
+				 REG ASC_SCSI_Q dosfar * scsiq
 )
 {
 	ushort              q_addr;
 	uchar               q_status;
 	int                 count = 0;
-
 	while (scsiq->q1.q_no == 0) ;
 	q_addr = ASC_QNO_TO_QADDR(scsiq->q1.q_no);
-
 	do {
 		q_status = AscReadLramByte(iop_base, q_addr + ASC_SCSIQ_B_STATUS);
 		DvcSleepMilliSecond(100L);
@@ -6956,56 +7787,52 @@
 	return (1);
 }
 
-uchar               _sdtr_period_tbl_[ASC_SYN_XFER_NO] =
-{
-	SYN_XFER_NS_0,
-	SYN_XFER_NS_1,
-	SYN_XFER_NS_2,
-	SYN_XFER_NS_3,
-	SYN_XFER_NS_4,
-	SYN_XFER_NS_5,
-	SYN_XFER_NS_6,
-	SYN_XFER_NS_7};
-
 uchar
 AscMsgOutSDTR(
-				 PortAddr iop_base,
+				 REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
 				 uchar sdtr_period,
 				 uchar sdtr_offset
 )
 {
 	SDTR_XMSG           sdtr_buf;
 	uchar               sdtr_period_index;
-
+	PortAddr            iop_base;
+	iop_base = asc_dvc->iop_base;
 	sdtr_buf.msg_type = MS_EXTEND;
 	sdtr_buf.msg_len = MS_SDTR_LEN;
 	sdtr_buf.msg_req = MS_SDTR_CODE;
 	sdtr_buf.xfer_period = sdtr_period;
 	sdtr_offset &= ASC_SYN_MAX_OFFSET;
 	sdtr_buf.req_ack_offset = sdtr_offset;
-	AscMemWordCopyToLram(iop_base, ASCV_MSGOUT_BEG,
-						 (ushort dosfar *) & sdtr_buf, SYN_XMSG_WLEN);
-	if ((sdtr_period_index = AscGetSynPeriodIndex(sdtr_period)) <=
-		ASC_MAX_SDTR_PERIOD_INDEX) {
+	if ((sdtr_period_index =
+		 AscGetSynPeriodIndex(asc_dvc, sdtr_period)) <=
+		asc_dvc->max_sdtr_index) {
+		AscMemWordCopyToLram(iop_base,
+							 ASCV_MSGOUT_BEG,
+							 (ushort dosfar *) & sdtr_buf, SYN_XMSG_WLEN);
 		return ((sdtr_period_index << 4) | sdtr_offset);
 	} else {
-
+		sdtr_buf.req_ack_offset = 0;
+		AscMemWordCopyToLram(iop_base,
+							 ASCV_MSGOUT_BEG,
+							 (ushort dosfar *) & sdtr_buf, SYN_XMSG_WLEN);
 		return (0);
 	}
 }
 
 uchar
 AscCalSDTRData(
+				  REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
 				  uchar sdtr_period,
 				  uchar syn_offset
 )
 {
 	uchar               byte;
 	uchar               sdtr_period_ix;
-
-	sdtr_period_ix = AscGetSynPeriodIndex(sdtr_period);
-	if ((sdtr_period_ix > ASC_MAX_SDTR_PERIOD_INDEX) ||
-		(sdtr_period_ix > ASC_SDTR_PERIOD_IX_MIN)) {
+	sdtr_period_ix = AscGetSynPeriodIndex(asc_dvc, sdtr_period);
+	if (
+		   (sdtr_period_ix > asc_dvc->max_sdtr_index)
+	  ) {
 		return (0xFF);
 	}
 	byte = (sdtr_period_ix << 4) | (syn_offset & ASC_SYN_MAX_OFFSET);
@@ -7019,51 +7846,34 @@
 				  uchar tid_no
 )
 {
-
-	AscWriteChipSyn(iop_base, sdtr_data);
-	AscWriteLramByte(iop_base,
-				   (ushort) ((ushort) ASCV_SDTR_DONE_BEG + (ushort) tid_no),
-					 sdtr_data);
+	AscSetChipSynRegAtID(iop_base, tid_no, sdtr_data);
+	AscPutMCodeSDTRDoneAtID(iop_base, tid_no, sdtr_data);
 	return;
 }
 
 uchar
 AscGetSynPeriodIndex(
-						uchar syn_time
+						ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						ruchar syn_time
 )
 {
-	if ((syn_time >= SYN_XFER_NS_0) && (syn_time <= SYN_XFER_NS_7)) {
-		if (syn_time <= SYN_XFER_NS_6) {
-			if (syn_time <= SYN_XFER_NS_5) {
-				if (syn_time <= SYN_XFER_NS_4) {
-					if (syn_time <= SYN_XFER_NS_3) {
-						if (syn_time <= SYN_XFER_NS_2) {
-							if (syn_time <= SYN_XFER_NS_1) {
-								if (syn_time <= SYN_XFER_NS_0) {
-									return (0);
-								} else
-									return (1);
-							} else {
-								return (2);
-							}
-						} else {
-							return (3);
-						}
-					} else {
-						return (4);
-					}
-				} else {
-					return (5);
-				}
-			} else {
-				return (6);
+	ruchar             *period_table;
+	int                 max_index;
+	int                 i;
+	period_table = asc_dvc->sdtr_period_tbl;
+	max_index = (int) asc_dvc->max_sdtr_index;
+	if (
+		   (syn_time >= period_table[0])
+		   && (syn_time <= period_table[max_index])
+	  ) {
+		for (i = 0; i < (max_index - 1); i++) {
+			if (syn_time <= period_table[i]) {
+				return (i);
 			}
-		} else {
-			return (7);
 		}
+		return (max_index);
 	} else {
-
-		return (8);
+		return (max_index + 1);
 	}
 }
 
@@ -7076,14 +7886,15 @@
 	ushort              q_addr;
 	uchar               next_qp;
 	uchar               q_status;
-
 	q_addr = ASC_QNO_TO_QADDR(free_q_head);
 	q_status = (uchar) AscReadLramByte(iop_base,
 									(ushort) (q_addr + ASC_SCSIQ_B_STATUS));
 	next_qp = AscReadLramByte(iop_base,
 							  (ushort) (q_addr + ASC_SCSIQ_B_FWD));
-	if (((q_status & QS_READY) == 0) &&
-		(next_qp != ASC_QLINK_END)) {
+	if (
+		   ((q_status & QS_READY) == 0)
+		   && (next_qp != ASC_QLINK_END)
+	  ) {
 		return (next_qp);
 	}
 	return (ASC_QLINK_END);
@@ -7097,7 +7908,6 @@
 )
 {
 	uchar               i;
-
 	for (i = 0; i < n_free_q; i++) {
 		if ((free_q_head = AscAllocFreeQueue(iop_base, free_q_head))
 			== ASC_QLINK_END) {
@@ -7109,7 +7919,7 @@
 
 int
 AscRiscHaltedAbortSRB(
-						 ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						 REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
 						 ulong srb_ptr
 )
 {
@@ -7120,16 +7930,13 @@
 	ASC_QDONE_INFO dosfar *scsiq;
 	ASC_ISR_CALLBACK    asc_isr_callback;
 	int                 last_int_level;
-
 	iop_base = asc_dvc->iop_base;
 	asc_isr_callback = (ASC_ISR_CALLBACK) asc_dvc->isr_callback;
 	last_int_level = DvcEnterCritical();
 	scsiq = (ASC_QDONE_INFO dosfar *) & scsiq_buf;
-
 #if CC_LINK_BUSY_Q
 	_AscAbortSrbBusyQueue(asc_dvc, scsiq, srb_ptr);
 #endif
-
 	for (q_no = ASC_MIN_ACTIVE_QNO; q_no <= asc_dvc->max_total_qng;
 		 q_no++) {
 		q_addr = ASC_QNO_TO_QADDR(q_no);
@@ -7137,10 +7944,11 @@
 						   (ushort) (q_addr + (ushort) ASC_SCSIQ_D_SRBPTR));
 		if (scsiq->d2.srb_ptr == srb_ptr) {
 			_AscCopyLramScsiDoneQ(iop_base, q_addr, scsiq, asc_dvc->max_dma_count);
-			if (((scsiq->q_status & QS_READY) != 0) &&
-				((scsiq->q_status & QS_ABORTED) == 0) &&
-				((scsiq->cntl & QCSG_SG_XFER_LIST) == 0)) {
-
+			if (
+				   ((scsiq->q_status & QS_READY) != 0)
+				   && ((scsiq->q_status & QS_ABORTED) == 0)
+				   && ((scsiq->cntl & QCSG_SG_XFER_LIST) == 0)
+			  ) {
 				scsiq->q_status |= QS_ABORTED;
 				scsiq->d3.done_stat = QD_ABORTED_BY_HOST;
 				AscWriteLramDWord(iop_base,
@@ -7160,7 +7968,7 @@
 
 int
 AscRiscHaltedAbortTIX(
-						 ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						 REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
 						 uchar target_ix
 )
 {
@@ -7171,39 +7979,32 @@
 	ASC_QDONE_INFO dosfar *scsiq;
 	ASC_ISR_CALLBACK    asc_isr_callback;
 	int                 last_int_level;
-
 #if CC_LINK_BUSY_Q
 	uchar               tid_no;
-
 #endif
-
 	iop_base = asc_dvc->iop_base;
 	asc_isr_callback = (ASC_ISR_CALLBACK) asc_dvc->isr_callback;
 	last_int_level = DvcEnterCritical();
 	scsiq = (ASC_QDONE_INFO dosfar *) & scsiq_buf;
-
 #if CC_LINK_BUSY_Q
-
 	tid_no = ASC_TIX_TO_TID(target_ix);
 	_AscAbortTidBusyQueue(asc_dvc, scsiq, tid_no);
-
 #endif
-
 	for (q_no = ASC_MIN_ACTIVE_QNO; q_no <= asc_dvc->max_total_qng;
 		 q_no++) {
 		q_addr = ASC_QNO_TO_QADDR(q_no);
 		_AscCopyLramScsiDoneQ(iop_base, q_addr, scsiq, asc_dvc->max_dma_count);
-		if (((scsiq->q_status & QS_READY) != 0) &&
-			((scsiq->q_status & QS_ABORTED) == 0) &&
-			((scsiq->cntl & QCSG_SG_XFER_LIST) == 0)) {
+		if (
+			   ((scsiq->q_status & QS_READY) != 0)
+			   && ((scsiq->q_status & QS_ABORTED) == 0)
+			   && ((scsiq->cntl & QCSG_SG_XFER_LIST) == 0)
+		  ) {
 			if (scsiq->d2.target_ix == target_ix) {
 				scsiq->q_status |= QS_ABORTED;
 				scsiq->d3.done_stat = QD_ABORTED_BY_HOST;
-
 				AscWriteLramDWord(iop_base,
 							(ushort) (q_addr + (ushort) ASC_SCSIQ_D_SRBPTR),
 								  0L);
-
 				AscWriteLramByte(iop_base,
 							(ushort) (q_addr + (ushort) ASC_SCSIQ_B_STATUS),
 								 scsiq->q_status);
@@ -7227,11 +8028,9 @@
 	int                 count = 0;
 	int                 sta = 0;
 	uchar               saved_stop_code;
-
 	if (AscIsChipHalted(iop_base))
 		return (1);
 	saved_stop_code = AscReadLramByte(iop_base, ASCV_STOP_CODE_B);
-
 	AscWriteLramByte(iop_base, ASCV_STOP_CODE_B,
 					 ASC_STOP_HOST_REQ_RISC_HALT | ASC_STOP_REQ_RISC_STOP
 	  );
@@ -7242,7 +8041,6 @@
 		}
 		DvcSleepMilliSecond(100);
 	} while (count++ < 20);
-
 	AscWriteLramByte(iop_base, ASCV_STOP_CODE_B, saved_stop_code);
 	return (sta);
 }
@@ -7253,14 +8051,14 @@
 )
 {
 	int                 count;
-
 	count = 0;
 	if (AscReadLramByte(iop_base, ASCV_STOP_CODE_B) == 0) {
 		AscWriteLramByte(iop_base, ASCV_STOP_CODE_B,
 						 ASC_STOP_REQ_RISC_STOP);
 		do {
-			if (AscReadLramByte(iop_base, ASCV_STOP_CODE_B) &
-				ASC_STOP_ACK_RISC_STOP) {
+			if (
+				   AscReadLramByte(iop_base, ASCV_STOP_CODE_B) &
+				   ASC_STOP_ACK_RISC_STOP) {
 				return (1);
 			}
 			DvcSleepMilliSecond(100);
@@ -7287,7 +8085,6 @@
 {
 	int                 count;
 	uchar               stop_code;
-
 	count = 0;
 	if (AscReadLramByte(iop_base, ASCV_STOP_CODE_B) != 0) {
 		AscWriteLramByte(iop_base, ASCV_STOP_CODE_B,
@@ -7309,7 +8106,6 @@
 {
 	int                 count;
 	uchar               stop_code;
-
 	count = 0;
 	if (AscReadLramByte(iop_base, ASCV_STOP_CODE_B) != 0) {
 		AscWriteLramByte(iop_base, ASCV_STOP_CODE_B,
@@ -7332,7 +8128,6 @@
 {
 	uchar               cur_req;
 	uchar               tid_no;
-
 	tid_no = ASC_TIX_TO_TID(target_ix);
 	while (TRUE) {
 		if ((cur_req = asc_dvc->cur_dvc_qng[tid_no]) == 0) {
@@ -7348,11 +8143,10 @@
 
 int
 AscWaitISRDone(
-				  ASC_DVC_VAR asc_ptr_type * asc_dvc
+				  REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	int                 tid;
-
 	for (tid = 0; tid <= ASC_MAX_TID; tid++) {
 		AscWaitTixISRDone(asc_dvc, ASC_TID_TO_TIX(tid));
 	}
@@ -7361,13 +8155,12 @@
 
 ulong
 AscGetOnePhyAddr(
-					ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
 					uchar dosfar * buf_addr,
 					ulong buf_size
 )
 {
 	ASC_MIN_SG_HEAD     sg_head;
-
 	sg_head.entry_cnt = ASC_MIN_SG_LIST;
 	if (DvcGetSGList(asc_dvc, (uchar dosfar *) buf_addr,
 				  buf_size, (ASC_SG_HEAD dosfar *) & sg_head) != buf_size) {
@@ -7379,6 +8172,23 @@
 	return (sg_head.sg_list[0].addr);
 }
 
+void
+DvcDelayNanoSecond(
+					  ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					  ulong nano_sec
+)
+{
+	ulong               loop;
+	PortAddr            iop_base;
+	iop_base = asc_dvc->iop_base;
+	loop = nano_sec / 90;
+	loop++;
+	while (loop-- != 0) {
+		inp(iop_base);
+	}
+	return;
+}
+
 ulong
 AscGetEisaProductID(
 					   PortAddr iop_base
@@ -7387,7 +8197,6 @@
 	PortAddr            eisa_iop;
 	ushort              product_id_high, product_id_low;
 	ulong               product_id;
-
 	eisa_iop = ASC_GET_EISA_SLOT(iop_base) | ASC_EISA_PID_IOP_MASK;
 	product_id_low = inpw(eisa_iop);
 	product_id_high = inpw(eisa_iop + 2);
@@ -7401,7 +8210,6 @@
 )
 {
 	ulong               eisa_product_id;
-
 	if (iop_base == 0) {
 		iop_base = ASC_EISA_MIN_IOP_ADDR;
 	} else {
@@ -7414,12 +8222,12 @@
 		}
 	}
 	while (iop_base <= ASC_EISA_MAX_IOP_ADDR) {
-
 		eisa_product_id = AscGetEisaProductID(iop_base);
-		if ((eisa_product_id == ASC_EISA_ID_740) ||
-			(eisa_product_id == ASC_EISA_ID_750)) {
+		if (
+			   (eisa_product_id == ASC_EISA_ID_740)
+			   || (eisa_product_id == ASC_EISA_ID_750)
+		  ) {
 			if (AscFindSignature(iop_base)) {
-
 				inpw(iop_base + 4);
 				return (iop_base);
 			}
@@ -7453,7 +8261,6 @@
 )
 {
 	uchar               cc_val;
-
 	cc_val = AscGetChipControl(iop_base) & (~(CC_SINGLE_STEP | CC_TEST | CC_DIAG));
 	AscSetChipControl(iop_base, (uchar) (cc_val | CC_HALT));
 	AscSetChipIH(iop_base, INS_HALT);
@@ -7469,7 +8276,6 @@
 				   PortAddr iop_base
 )
 {
-
 	if ((AscGetChipStatus(iop_base) & CSW_HALTED) != 0) {
 		if ((AscGetChipControl(iop_base) & CC_HALT) != 0) {
 			return (1);
@@ -7495,11 +8301,9 @@
 				   PortAddr iop_base
 )
 {
-
 	uchar               host_flag;
 	uchar               risc_flag;
 	ushort              loop;
-
 	loop = 0;
 	do {
 		risc_flag = AscReadLramByte(iop_base, ASCV_RISC_FLAG_B);
@@ -7507,21 +8311,17 @@
 			break;
 		}
 	} while ((risc_flag & ASC_RISC_FLAG_GEN_INT) != 0);
-
-	host_flag = AscReadLramByte(iop_base, ASCV_HOST_FLAG_B);
+	host_flag = AscReadLramByte(iop_base, ASCV_HOST_FLAG_B) & (~ASC_HOST_FLAG_ACK_INT);
 	AscWriteLramByte(iop_base, ASCV_HOST_FLAG_B,
 					 (uchar) (host_flag | ASC_HOST_FLAG_ACK_INT));
-
 	AscSetChipStatus(iop_base, CIW_INT_ACK);
 	loop = 0;
 	while (AscGetChipStatus(iop_base) & CSW_INT_PENDING) {
-
 		AscSetChipStatus(iop_base, CIW_INT_ACK);
 		if (loop++ > 3) {
 			break;
 		}
 	}
-
 	AscWriteLramByte(iop_base, ASCV_HOST_FLAG_B, host_flag);
 	return;
 }
@@ -7532,7 +8332,6 @@
 )
 {
 	ushort              cfg;
-
 	cfg = AscGetChipCfgLsw(iop_base);
 	AscSetChipCfgLsw(iop_base, cfg & (~ASC_CFG0_HOST_INT_ON));
 	return;
@@ -7544,12 +8343,13 @@
 )
 {
 	ushort              cfg;
-
 	cfg = AscGetChipCfgLsw(iop_base);
 	AscSetChipCfgLsw(iop_base, cfg | ASC_CFG0_HOST_INT_ON);
 	return;
 }
 
+
+
 void
 AscSetBank(
 			  PortAddr iop_base,
@@ -7557,7 +8357,6 @@
 )
 {
 	uchar               val;
-
 	val = AscGetChipControl(iop_base) &
 	  (~(CC_SINGLE_STEP | CC_TEST | CC_DIAG | CC_SCSI_RESET | CC_CHIP_RESET));
 	if (bank == 1) {
@@ -7571,31 +8370,47 @@
 	return;
 }
 
+
+
 int
 AscResetChipAndScsiBus(
 						  PortAddr iop_base
 )
 {
+	while (AscGetChipStatus(iop_base) & CSW_SCSI_RESET_ACTIVE) ;
 	AscStopChip(iop_base);
 	AscSetChipControl(iop_base, CC_CHIP_RESET | CC_SCSI_RESET | CC_HALT);
 	DvcSleepMilliSecond(200);
-
 	AscSetChipIH(iop_base, INS_RFLAG_WTM);
 	AscSetChipIH(iop_base, INS_HALT);
-
 	AscSetChipControl(iop_base, CC_CHIP_RESET | CC_HALT);
 	AscSetChipControl(iop_base, CC_HALT);
 	DvcSleepMilliSecond(200);
+	AscSetChipStatus(iop_base, CIW_CLR_SCSI_RESET_INT);
+	AscSetChipStatus(iop_base, 0);
 	return (AscIsChipHalted(iop_base));
 }
 
+
+
+ulong
+AscGetMaxDmaCount(
+					 ushort bus_type
+)
+{
+	if (bus_type & ASC_IS_ISA)
+		return (ASC_MAX_ISA_DMA_COUNT);
+	else if (bus_type & (ASC_IS_EISA | ASC_IS_VL))
+		return (ASC_MAX_VL_DMA_COUNT);
+	return (ASC_MAX_PCI_DMA_COUNT);
+}
+
 ushort
 AscGetIsaDmaChannel(
 					   PortAddr iop_base
 )
 {
 	ushort              channel;
-
 	channel = AscGetChipCfgLsw(iop_base) & 0x0003;
 	if (channel == 0x03)
 		return (0);
@@ -7612,9 +8427,7 @@
 {
 	ushort              cfg_lsw;
 	uchar               value;
-
 	if ((dma_channel >= 5) && (dma_channel <= 7)) {
-
 		if (dma_channel == 7)
 			value = 0x00;
 		else
@@ -7635,7 +8448,7 @@
 {
 	speed_value &= 0x07;
 	AscSetBank(iop_base, 1);
-	AscSetChipDmaSpeed(iop_base, speed_value);
+	AscWriteChipDmaSpeed(iop_base, speed_value);
 	AscSetBank(iop_base, 0);
 	return (AscGetIsaDmaSpeed(iop_base));
 }
@@ -7646,45 +8459,38 @@
 )
 {
 	uchar               speed_value;
-
 	AscSetBank(iop_base, 1);
-	speed_value = AscGetChipDmaSpeed(iop_base);
+	speed_value = AscReadChipDmaSpeed(iop_base);
 	speed_value &= 0x07;
 	AscSetBank(iop_base, 0);
 	return (speed_value);
 }
 
-ulong
-AscGetMaxDmaCount(
-					 ushort bus_type
-)
-{
-	if (bus_type & ASC_IS_ISA)
-		return (ASC_MAX_ISA_DMA_COUNT);
-	else if (bus_type & (ASC_IS_EISA | ASC_IS_VL))
-		return (ASC_MAX_VL_DMA_COUNT);
-	return (ASC_MAX_PCI_DMA_COUNT);
-}
-
 ushort
 AscInitGetConfig(
 					ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	ushort              warn_code;
-
 	warn_code = 0;
 	asc_dvc->init_state = ASC_INIT_STATE_BEG_GET_CFG;
 	if (asc_dvc->err_code != 0)
 		return (UW_ERR);
 	if (AscFindSignature(asc_dvc->iop_base)) {
 		warn_code |= AscInitAscDvcVar(asc_dvc);
-		warn_code |= AscInitFromEEP(asc_dvc);
+#if CC_INCLUDE_EEP_CONFIG
+		if (asc_dvc->init_state & ASC_INIT_STATE_WITHOUT_EEP) {
+			warn_code |= AscInitWithoutEEP(asc_dvc);
+		} else {
+			warn_code |= AscInitFromEEP(asc_dvc);
+		}
+#else
+		warn_code |= AscInitWithoutEEP(asc_dvc);
+#endif
 		asc_dvc->init_state |= ASC_INIT_STATE_END_GET_CFG;
-
-		if (asc_dvc->scsi_reset_wait > 10)
-			asc_dvc->scsi_reset_wait = 10;
-
+		if (asc_dvc->scsi_reset_wait > ASC_MAX_SCSI_RESET_WAIT) {
+			asc_dvc->scsi_reset_wait = ASC_MAX_SCSI_RESET_WAIT;
+		}
 	} else {
 		asc_dvc->err_code = ASC_IERR_BAD_SIGNATURE;
 	}
@@ -7697,7 +8503,6 @@
 )
 {
 	ushort              warn_code;
-
 	warn_code = 0;
 	asc_dvc->init_state |= ASC_INIT_STATE_BEG_SET_CFG;
 	if (asc_dvc->err_code != 0)
@@ -7712,53 +8517,124 @@
 }
 
 ushort
+AscInitFromAscDvcVar(
+						ASC_DVC_VAR asc_ptr_type * asc_dvc
+)
+{
+	PortAddr            iop_base;
+	ushort              cfg_msw;
+	ushort              warn_code;
+	ushort              pci_device_id;
+	iop_base = asc_dvc->iop_base;
+	pci_device_id = asc_dvc->cfg->pci_device_id;
+	warn_code = 0;
+	cfg_msw = AscGetChipCfgMsw(iop_base);
+	if ((cfg_msw & ASC_CFG_MSW_CLR_MASK) != 0) {
+		cfg_msw &= (~(ASC_CFG_MSW_CLR_MASK));
+		warn_code |= ASC_WARN_CFG_MSW_RECOVER;
+		AscSetChipCfgMsw(iop_base, cfg_msw);
+	}
+	if ((asc_dvc->cfg->cmd_qng_enabled & asc_dvc->cfg->disc_enable) !=
+		asc_dvc->cfg->cmd_qng_enabled) {
+		asc_dvc->cfg->disc_enable = asc_dvc->cfg->cmd_qng_enabled;
+		warn_code |= ASC_WARN_CMD_QNG_CONFLICT;
+	}
+	if (AscGetChipStatus(iop_base) & CSW_AUTO_CONFIG) {
+		warn_code |= ASC_WARN_AUTO_CONFIG;
+	}
+	if ((asc_dvc->bus_type & (ASC_IS_ISA | ASC_IS_VL)) != 0) {
+		if (AscSetChipIRQ(iop_base, asc_dvc->irq_no, asc_dvc->bus_type)
+			!= asc_dvc->irq_no) {
+			asc_dvc->err_code |= ASC_IERR_SET_IRQ_NO;
+		}
+	}
+	if (asc_dvc->bus_type & ASC_IS_PCI) {
+#if CC_DISABLE_PCI_PARITY_INT
+		cfg_msw &= 0xFFC0;
+		AscSetChipCfgMsw(iop_base, cfg_msw);
+#endif
+		if ((asc_dvc->bus_type & ASC_IS_PCI_ULTRA) == ASC_IS_PCI_ULTRA) {
+		} else {
+			if ((pci_device_id == ASC_PCI_DEVICE_ID_REV_A) ||
+				(pci_device_id == ASC_PCI_DEVICE_ID_REV_B)) {
+				asc_dvc->bug_fix_cntl |= ASC_BUG_FIX_IF_NOT_DWB;
+				asc_dvc->bug_fix_cntl |= ASC_BUG_FIX_ASYN_USE_SYN;
+#if CC_SET_PCI_LATENCY_TIMER_ZERO
+				DvcWritePCIConfigByte(asc_dvc,
+									  AscPCIConfigCommandRegister,
+									  AscPCICmdRegBits_BusMastering
+				  );
+				if ((DvcReadPCIConfigByte(asc_dvc,
+										  AscPCIConfigCommandRegister
+					 )
+					 & AscPCICmdRegBits_BusMastering)
+					!= AscPCICmdRegBits_BusMastering) {
+					warn_code |= ASC_WARN_SET_PCI_CONFIG_SPACE;
+				}
+				DvcWritePCIConfigByte(asc_dvc,
+									  AscPCIConfigLatencyTimer,
+									  0x00
+				  );
+				if (DvcReadPCIConfigByte(asc_dvc,
+										 AscPCIConfigLatencyTimer
+					) != 0x00) {
+					warn_code |= ASC_WARN_SET_PCI_CONFIG_SPACE;
+				}
+#endif
+			}
+		}
+	} else if (asc_dvc->bus_type == ASC_IS_ISAPNP) {
+		if (AscGetChipVersion(iop_base, asc_dvc->bus_type)
+			== ASC_CHIP_VER_ASYN_BUG) {
+			asc_dvc->bug_fix_cntl |= ASC_BUG_FIX_ASYN_USE_SYN;
+		}
+	}
+	if (AscSetChipScsiID(iop_base, asc_dvc->cfg->chip_scsi_id) !=
+		asc_dvc->cfg->chip_scsi_id) {
+		asc_dvc->err_code |= ASC_IERR_SET_SCSI_ID;
+	}
+	if (asc_dvc->bus_type & ASC_IS_ISA) {
+		AscSetIsaDmaChannel(iop_base, asc_dvc->cfg->isa_dma_channel);
+		AscSetIsaDmaSpeed(iop_base, asc_dvc->cfg->isa_dma_speed);
+	}
+	return (warn_code);
+}
+
+ushort
 AscInitAsc1000Driver(
 						ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	ushort              warn_code;
 	PortAddr            iop_base;
-
 	extern ushort       _mcode_size;
 	extern ulong        _mcode_chksum;
 	extern uchar        _mcode_buf[];
-
-	ASC_DBG(3, "AscInitAsc1000Driver: begin\n");
 	iop_base = asc_dvc->iop_base;
 	warn_code = 0;
-
 	if ((asc_dvc->dvc_cntl & ASC_CNTL_RESET_SCSI) &&
 		!(asc_dvc->init_state & ASC_INIT_RESET_SCSI_DONE)) {
-
-		ASC_DBG(3, "AscInitAsc1000Driver: AscResetChipAndScsiBus()\n");
 		AscResetChipAndScsiBus(iop_base);
 		DvcSleepMilliSecond((ulong) ((ushort) asc_dvc->scsi_reset_wait * 1000));
 	}
 	asc_dvc->init_state |= ASC_INIT_STATE_BEG_LOAD_MC;
 	if (asc_dvc->err_code != 0)
 		return (UW_ERR);
-	ASC_DBG(3, "AscInitAsc1000Driver: AscFindSignature()\n");
 	if (!AscFindSignature(asc_dvc->iop_base)) {
 		asc_dvc->err_code = ASC_IERR_BAD_SIGNATURE;
 		return (warn_code);
 	}
-	ASC_DBG(3, "AscInitAsc1000Driver: AscDisableInterrupt()\n");
 	AscDisableInterrupt(iop_base);
-
-	ASC_DBG(3, "AscInitAsc1000Driver: AscInitLram()\n");
 	warn_code |= AscInitLram(asc_dvc);
 	if (asc_dvc->err_code != 0)
 		return (UW_ERR);
-	ASC_DBG(3, "AscInitAsc1000Driver: AscLoadMicroCode()\n");
 	if (AscLoadMicroCode(iop_base, 0, (ushort dosfar *) _mcode_buf,
 						 _mcode_size) != _mcode_chksum) {
 		asc_dvc->err_code |= ASC_IERR_MCODE_CHKSUM;
 		return (warn_code);
 	}
-	ASC_DBG(3, "AscInitAsc1000Driver: AscInitMicroCodeVar()\n");
 	warn_code |= AscInitMicroCodeVar(asc_dvc);
 	asc_dvc->init_state |= ASC_INIT_STATE_END_LOAD_MC;
-	ASC_DBG(3, "AscInitAsc1000Driver: AscEnableInterrupt()\n");
 	AscEnableInterrupt(iop_base);
 	return (warn_code);
 }
@@ -7771,121 +8647,111 @@
 	int                 i;
 	PortAddr            iop_base;
 	ushort              warn_code;
-
+	uchar               chip_version;
 	iop_base = asc_dvc->iop_base;
 	warn_code = 0;
 	asc_dvc->err_code = 0;
-
-	if ((asc_dvc->bus_type &
-		 (ASC_IS_ISA | ASC_IS_PCI | ASC_IS_EISA | ASC_IS_VL)) == 0) {
+	if (
+		   (asc_dvc->bus_type &
+			(ASC_IS_ISA | ASC_IS_PCI | ASC_IS_EISA | ASC_IS_VL)) == 0
+	  ) {
 		asc_dvc->err_code |= ASC_IERR_NO_BUS_TYPE;
 	}
+	AscSetChipControl(iop_base, CC_HALT);
+	AscSetChipStatus(iop_base, 0);
 #if CC_LINK_BUSY_Q
 	for (i = 0; i <= ASC_MAX_TID; i++) {
 		asc_dvc->scsiq_busy_head[i] = (ASC_SCSI_Q dosfar *) 0L;
 		asc_dvc->scsiq_busy_tail[i] = (ASC_SCSI_Q dosfar *) 0L;
 	}
 #endif
-
-	asc_dvc->dvc_cntl = ASC_DEF_DVC_CNTL;
 	asc_dvc->bug_fix_cntl = 0;
 	asc_dvc->pci_fix_asyn_xfer = 0;
-	asc_dvc->init_sdtr = 0;
+	asc_dvc->pci_fix_asyn_xfer_always = 0;
+	asc_dvc->init_state = 0;
 	asc_dvc->sdtr_done = 0;
-	asc_dvc->max_total_qng = ASC_DEF_MAX_TOTAL_QNG;
 	asc_dvc->cur_total_qng = 0;
 	asc_dvc->is_in_int = 0;
-	asc_dvc->scsi_reset_wait = 3;
 	asc_dvc->in_critical_cnt = 0;
-
 	asc_dvc->last_q_shortage = 0;
 	asc_dvc->use_tagged_qng = 0;
-	asc_dvc->cfg->can_tagged_qng = 0;
 	asc_dvc->no_scam = 0;
-	asc_dvc->irq_no = 10;
-	asc_dvc->start_motor = ASC_SCSI_WIDTH_BIT_SET;
-	asc_dvc->cfg->disc_enable = ASC_SCSI_WIDTH_BIT_SET;
-	asc_dvc->cfg->cmd_qng_enabled = ASC_SCSI_WIDTH_BIT_SET;
-	asc_dvc->cfg->chip_scsi_id = ASC_DEF_CHIP_SCSI_ID;
-	asc_dvc->cfg->chip_version = AscGetChipVersion(iop_base,
-												   asc_dvc->bus_type);
-	if (AscGetChipBusType(iop_base) == ASC_IS_ISAPNP) {
-
-		AscPutChipIFC(iop_base, IFC_INIT_DEFAULT);
-		asc_dvc->bus_type = ASC_IS_ISAPNP;
-	}
 	asc_dvc->unit_not_ready = 0;
 	asc_dvc->queue_full_or_busy = 0;
-
-	if ((asc_dvc->bus_type & ASC_IS_ISA) != 0) {
-		asc_dvc->cfg->isa_dma_channel = (uchar) AscGetIsaDmaChannel(iop_base);
-		asc_dvc->cfg->isa_dma_speed = ASC_DEF_ISA_DMA_SPEED;
-	}
-	asc_dvc->cfg->lib_serial_no = ASC_LIB_SERIAL_NUMBER;
-	asc_dvc->cfg->lib_version = (ASC_LIB_VERSION_MAJOR << 8) |
-	  ASC_LIB_VERSION_MINOR;
-	asc_dvc->int_count = 0L;
-	asc_dvc->req_count = 0L;
-	asc_dvc->busy_count = 0L;
-	asc_dvc->max_dma_count = AscGetMaxDmaCount(asc_dvc->bus_type);
-
-	for (i = 0; i <= ASC_MAX_TID; i++) {
-		asc_dvc->cfg->sdtr_data[i] =
-		  (uchar) (ASC_DEF_SDTR_OFFSET | (ASC_DEF_SDTR_INDEX << 4));
-		asc_dvc->cur_dvc_qng[i] = 0;
-		asc_dvc->max_dvc_qng[i] = ASC_MAX_SCSI1_QNG;
-		asc_dvc->scsiq_busy_head[i] = (ASC_SCSI_Q dosfar *) 0L;
-		asc_dvc->scsiq_busy_tail[i] = (ASC_SCSI_Q dosfar *) 0L;
-	}
-	return (warn_code);
-}
-
-ushort
-AscInitFromAscDvcVar(
-						ASC_DVC_VAR asc_ptr_type * asc_dvc
-)
-{
-	PortAddr            iop_base;
-	ushort              cfg_msw;
-	ushort              warn_code;
-
-	iop_base = asc_dvc->iop_base;
-	warn_code = 0;
-
-	cfg_msw = AscGetChipCfgMsw(iop_base);
-
-	if ((cfg_msw & ASC_CFG_MSW_CLR_MASK) != 0) {
-		cfg_msw &= (~(ASC_CFG_MSW_CLR_MASK));
-		warn_code |= ASC_WARN_CFG_MSW_RECOVER;
-		AscSetChipCfgMsw(iop_base, cfg_msw);
-	}
-	if (AscGetChipStatus(iop_base) & CSW_AUTO_CONFIG) {
-		warn_code |= ASC_WARN_AUTO_CONFIG;
-
-	}
-	if ((asc_dvc->cfg->cmd_qng_enabled & asc_dvc->cfg->disc_enable) !=
-		asc_dvc->cfg->cmd_qng_enabled) {
-		asc_dvc->cfg->disc_enable = asc_dvc->cfg->cmd_qng_enabled;
-		warn_code |= ASC_WARN_CMD_QNG_CONFLICT;
-	}
-	if ((asc_dvc->bus_type & (ASC_IS_ISA | ASC_IS_VL)) != 0) {
-
-		if (AscSetChipIRQ(iop_base, asc_dvc->irq_no, asc_dvc->bus_type)
-			!= asc_dvc->irq_no) {
-			asc_dvc->err_code |= ASC_IERR_SET_IRQ_NO;
-		}
+	asc_dvc->dvc_cntl = ASC_DEF_DVC_CNTL;
+	asc_dvc->init_sdtr = ASC_SCSI_WIDTH_BIT_SET;
+	asc_dvc->max_total_qng = ASC_DEF_MAX_TOTAL_QNG;
+	asc_dvc->scsi_reset_wait = 3;
+	asc_dvc->start_motor = ASC_SCSI_WIDTH_BIT_SET;
+	asc_dvc->max_dma_count = AscGetMaxDmaCount(asc_dvc->bus_type);
+	asc_dvc->redo_scam = 0;
+	asc_dvc->res2 = 0;
+	asc_dvc->res4 = 0;
+	asc_dvc->res6 = 0;
+	asc_dvc->res7 = 0;
+	asc_dvc->res8 = 0;
+	asc_dvc->cfg->disc_enable = ASC_SCSI_WIDTH_BIT_SET;
+	asc_dvc->cfg->can_tagged_qng = 0;
+	asc_dvc->cfg->cmd_qng_enabled = 0;
+	asc_dvc->cfg->chip_scsi_id = ASC_DEF_CHIP_SCSI_ID;
+	asc_dvc->cfg->lib_serial_no = ASC_LIB_SERIAL_NUMBER;
+	asc_dvc->cfg->lib_version = (ASC_LIB_VERSION_MAJOR << 8) |
+	  ASC_LIB_VERSION_MINOR;
+	chip_version = AscGetChipVersion(iop_base, asc_dvc->bus_type);
+	asc_dvc->cfg->chip_version = chip_version;
+	asc_dvc->sdtr_period_tbl[0] = SYN_XFER_NS_0;
+	asc_dvc->sdtr_period_tbl[1] = SYN_XFER_NS_1;
+	asc_dvc->sdtr_period_tbl[2] = SYN_XFER_NS_2;
+	asc_dvc->sdtr_period_tbl[3] = SYN_XFER_NS_3;
+	asc_dvc->sdtr_period_tbl[4] = SYN_XFER_NS_4;
+	asc_dvc->sdtr_period_tbl[5] = SYN_XFER_NS_5;
+	asc_dvc->sdtr_period_tbl[6] = SYN_XFER_NS_6;
+	asc_dvc->sdtr_period_tbl[7] = SYN_XFER_NS_7;
+	asc_dvc->max_sdtr_index = 7;
+	if (
+		   (asc_dvc->bus_type & ASC_IS_PCI) &&
+		   (chip_version >= ASC_CHIP_VER_1ST_PCI_ULTRA)
+	  ) {
+		asc_dvc->sdtr_period_tbl[0] = SYN_ULTRA_XFER_NS_0;
+		asc_dvc->sdtr_period_tbl[1] = SYN_ULTRA_XFER_NS_1;
+		asc_dvc->sdtr_period_tbl[2] = SYN_ULTRA_XFER_NS_2;
+		asc_dvc->sdtr_period_tbl[3] = SYN_ULTRA_XFER_NS_3;
+		asc_dvc->sdtr_period_tbl[4] = SYN_ULTRA_XFER_NS_4;
+		asc_dvc->sdtr_period_tbl[5] = SYN_ULTRA_XFER_NS_5;
+		asc_dvc->sdtr_period_tbl[6] = SYN_ULTRA_XFER_NS_6;
+		asc_dvc->sdtr_period_tbl[7] = SYN_ULTRA_XFER_NS_7;
+		asc_dvc->sdtr_period_tbl[8] = SYN_ULTRA_XFER_NS_8;
+		asc_dvc->sdtr_period_tbl[9] = SYN_ULTRA_XFER_NS_9;
+		asc_dvc->sdtr_period_tbl[10] = SYN_ULTRA_XFER_NS_10;
+		asc_dvc->sdtr_period_tbl[11] = SYN_ULTRA_XFER_NS_11;
+		asc_dvc->sdtr_period_tbl[12] = SYN_ULTRA_XFER_NS_12;
+		asc_dvc->sdtr_period_tbl[13] = SYN_ULTRA_XFER_NS_13;
+		asc_dvc->sdtr_period_tbl[14] = SYN_ULTRA_XFER_NS_14;
+		asc_dvc->sdtr_period_tbl[15] = SYN_ULTRA_XFER_NS_15;
+		asc_dvc->max_sdtr_index = 15;
+		AscSetExtraControl(iop_base, (SEC_ACTIVE_NEGATE | SEC_SLEW_RATE));
+		asc_dvc->bus_type = ASC_IS_PCI_ULTRA;
 	}
-	if (AscSetChipScsiID(iop_base, asc_dvc->cfg->chip_scsi_id) !=
-		asc_dvc->cfg->chip_scsi_id) {
-		asc_dvc->err_code |= ASC_IERR_SET_SCSI_ID;
+	asc_dvc->cfg->isa_dma_speed = ASC_DEF_ISA_DMA_SPEED;
+	if (AscGetChipBusType(iop_base) == ASC_IS_ISAPNP) {
+		AscSetChipIFC(iop_base, IFC_INIT_DEFAULT);
+		asc_dvc->bus_type = ASC_IS_ISAPNP;
 	}
 	if ((asc_dvc->bus_type & ASC_IS_ISA) != 0) {
-		AscSetIsaDmaChannel(iop_base, asc_dvc->cfg->isa_dma_channel);
-		AscSetIsaDmaSpeed(iop_base, asc_dvc->cfg->isa_dma_speed);
+		asc_dvc->cfg->isa_dma_channel = (uchar) AscGetIsaDmaChannel(iop_base);
+	}
+	for (i = 0; i <= ASC_MAX_TID; i++) {
+		asc_dvc->cur_dvc_qng[i] = 0;
+		asc_dvc->max_dvc_qng[i] = ASC_MAX_SCSI1_QNG;
+		asc_dvc->scsiq_busy_head[i] = (ASC_SCSI_Q dosfar *) 0L;
+		asc_dvc->scsiq_busy_tail[i] = (ASC_SCSI_Q dosfar *) 0L;
+		asc_dvc->cfg->max_tag_qng[i] = ASC_MAX_INRAM_TAG_QNG;
+		asc_dvc->cfg->sdtr_period_offset[i] = (uchar) (ASC_DEF_SDTR_OFFSET | (ASC_DEF_SDTR_INDEX << 4));
 	}
 	return (warn_code);
 }
 
+#if CC_INCLUDE_EEP_CONFIG
 ushort
 AscInitFromEEP(
 				  ASC_DVC_VAR asc_ptr_type * asc_dvc
@@ -7897,13 +8763,10 @@
 	ushort              chksum;
 	ushort              warn_code;
 	ushort              cfg_msw, cfg_lsw;
-	uchar               i;
-
+	int                 i;
 	iop_base = asc_dvc->iop_base;
 	warn_code = 0;
-
 	AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0x00FE);
-
 	AscStopQueueExe(iop_base);
 	if ((AscStopChip(iop_base) == FALSE) ||
 		(AscGetChipScsiCtrl(iop_base) != 0)) {
@@ -7921,33 +8784,18 @@
 		return (warn_code);
 	}
 	eep_config = (ASCEEP_CONFIG dosfar *) & eep_config_buf;
-
 	cfg_msw = AscGetChipCfgMsw(iop_base);
 	cfg_lsw = AscGetChipCfgLsw(iop_base);
-
-	if (asc_dvc->bus_type & ASC_IS_PCI) {
-#if CC_DISABLE_PCI_PARITY_INT
-		cfg_msw &= 0xFFC0;
-		AscSetChipCfgMsw(iop_base, cfg_msw);
-#endif
-		if (asc_dvc->cfg->pci_device_id == ASC_PCI_DEVICE_ID_REV_A) {
-			asc_dvc->bug_fix_cntl |= ASC_BUG_FIX_ADD_ONE_BYTE;
-		}
-	}
 	if ((cfg_msw & ASC_CFG_MSW_CLR_MASK) != 0) {
 		cfg_msw &= (~(ASC_CFG_MSW_CLR_MASK));
 		warn_code |= ASC_WARN_CFG_MSW_RECOVER;
 		AscSetChipCfgMsw(iop_base, cfg_msw);
 	}
 	chksum = AscGetEEPConfig(iop_base, eep_config, asc_dvc->bus_type);
-
 	eep_config->cfg_msw &= (~(ASC_CFG_MSW_CLR_MASK));
-
 	if (AscGetChipStatus(iop_base) & CSW_AUTO_CONFIG) {
 		warn_code |= ASC_WARN_AUTO_CONFIG;
-
 		if (asc_dvc->cfg->chip_version == 3) {
-
 			if (eep_config->cfg_lsw != cfg_lsw) {
 				warn_code |= ASC_WARN_EEPROM_RECOVER;
 				eep_config->cfg_lsw = AscGetChipCfgLsw(iop_base);
@@ -7964,28 +8812,18 @@
 	}
 	asc_dvc->init_sdtr = eep_config->init_sdtr;
 	asc_dvc->cfg->disc_enable = eep_config->disc_enable;
-
 	asc_dvc->cfg->cmd_qng_enabled = eep_config->use_cmd_qng;
 	asc_dvc->cfg->isa_dma_speed = eep_config->isa_dma_speed;
 	asc_dvc->start_motor = eep_config->start_motor;
 	asc_dvc->dvc_cntl = eep_config->cntl;
 	asc_dvc->no_scam = eep_config->no_scam;
-
-	if ((asc_dvc->bus_type & ASC_IS_PCI) &&
-		!(asc_dvc->dvc_cntl & ASC_CNTL_NO_PCI_FIX_ASYN_XFER)) {
-		if ((asc_dvc->cfg->pci_device_id == ASC_PCI_DEVICE_ID_REV_A) ||
-			(asc_dvc->cfg->pci_device_id == ASC_PCI_DEVICE_ID_REV_B)) {
-			asc_dvc->pci_fix_asyn_xfer = ASC_ALL_DEVICE_BIT_SET;
-		}
-	} else if ((asc_dvc->bus_type & ASC_IS_ISAPNP) == ASC_IS_ISAPNP) {
-
-		if (AscGetChipVersion(iop_base, asc_dvc->bus_type)
-			== ASC_CHIP_VER_ASYN_BUG) {
-			asc_dvc->pci_fix_asyn_xfer = ASC_ALL_DEVICE_BIT_SET;
-		}
-	}
 	if (!AscTestExternalLram(asc_dvc)) {
-		if (asc_dvc->bus_type & ASC_IS_PCI) {
+		if (
+			   ((asc_dvc->bus_type & ASC_IS_PCI_ULTRA) == ASC_IS_PCI_ULTRA)
+		  ) {
+			eep_config->max_total_qng = ASC_MAX_PCI_ULTRA_INRAM_TOTAL_QNG;
+			eep_config->max_tag_qng = ASC_MAX_PCI_ULTRA_INRAM_TAG_QNG;
+		} else {
 			eep_config->cfg_msw |= 0x0800;
 			cfg_msw |= 0x0800;
 			AscSetChipCfgMsw(iop_base, cfg_msw);
@@ -7993,9 +8831,6 @@
 			eep_config->max_tag_qng = ASC_MAX_INRAM_TAG_QNG;
 		}
 	} else {
-#if CC_TEST_RW_LRAM
-		asc_dvc->err_code |= AscTestLramEndian(iop_base);
-#endif
 	}
 	if (eep_config->max_total_qng < ASC_MIN_TOTAL_QNG) {
 		eep_config->max_total_qng = ASC_MIN_TOTAL_QNG;
@@ -8010,25 +8845,60 @@
 		eep_config->max_tag_qng = ASC_MIN_TAG_Q_PER_DVC;
 	}
 	asc_dvc->max_total_qng = eep_config->max_total_qng;
-
 	if ((eep_config->use_cmd_qng & eep_config->disc_enable) !=
 		eep_config->use_cmd_qng) {
 		eep_config->disc_enable = eep_config->use_cmd_qng;
 		warn_code |= ASC_WARN_CMD_QNG_CONFLICT;
 	}
-	asc_dvc->irq_no = AscGetChipIRQ(iop_base, asc_dvc->bus_type);
+	if (asc_dvc->bus_type & (ASC_IS_ISA | ASC_IS_VL | ASC_IS_EISA)) {
+		asc_dvc->irq_no = AscGetChipIRQ(iop_base, asc_dvc->bus_type);
+	}
 	eep_config->chip_scsi_id &= ASC_MAX_TID;
 	asc_dvc->cfg->chip_scsi_id = eep_config->chip_scsi_id;
-
 	for (i = 0; i <= ASC_MAX_TID; i++) {
-		asc_dvc->cfg->sdtr_data[i] = eep_config->sdtr_data[i];
+#if CC_TMP_USE_EEP_SDTR
+		asc_dvc->cfg->sdtr_period_offset[i] = eep_config->dos_int13_table[i];
+#endif
+		asc_dvc->dos_int13_table[i] = eep_config->dos_int13_table[i];
 		asc_dvc->cfg->max_tag_qng[i] = eep_config->max_tag_qng;
 	}
-
 	eep_config->cfg_msw = AscGetChipCfgMsw(iop_base);
+#if CC_CHK_FIX_EEP_CONTENT
 	if (AscSetEEPConfig(iop_base, eep_config, asc_dvc->bus_type) != 0) {
 		asc_dvc->err_code |= ASC_IERR_WRITE_EEPROM;
 	}
+#endif
+	return (warn_code);
+}
+#endif
+
+ushort
+AscInitWithoutEEP(
+					 ASC_DVC_VAR asc_ptr_type * asc_dvc
+)
+{
+	PortAddr            iop_base;
+	ushort              warn_code;
+	ushort              cfg_msw;
+	iop_base = asc_dvc->iop_base;
+	warn_code = 0;
+	cfg_msw = AscGetChipCfgMsw(iop_base);
+	if ((cfg_msw & ASC_CFG_MSW_CLR_MASK) != 0) {
+		cfg_msw &= (~(ASC_CFG_MSW_CLR_MASK));
+		warn_code |= ASC_WARN_CFG_MSW_RECOVER;
+		AscSetChipCfgMsw(iop_base, cfg_msw);
+	}
+	if (!AscTestExternalLram(asc_dvc)) {
+		if (asc_dvc->bus_type & ASC_IS_PCI) {
+			cfg_msw |= 0x0800;
+			AscSetChipCfgMsw(iop_base, cfg_msw);
+			asc_dvc->max_total_qng = ASC_MAX_PCI_INRAM_TOTAL_QNG;
+		}
+	} else {
+	}
+	if (asc_dvc->bus_type & (ASC_IS_ISA | ASC_IS_VL | ASC_IS_EISA)) {
+		asc_dvc->irq_no = AscGetChipIRQ(iop_base, asc_dvc->bus_type);
+	}
 	return (warn_code);
 }
 
@@ -8041,16 +8911,14 @@
 	ushort              warn_code;
 	PortAddr            iop_base;
 	ulong               phy_addr;
-
 	iop_base = asc_dvc->iop_base;
 	warn_code = 0;
 	for (i = 0; i <= ASC_MAX_TID; i++) {
-		AscWriteLramByte(iop_base, (ushort) (ASCV_SDTR_DATA_BEG + i),
-						 asc_dvc->cfg->sdtr_data[i]);
+		AscPutMCodeInitSDTRAtID(iop_base, i,
+								asc_dvc->cfg->sdtr_period_offset[i]
+		  );
 	}
-
 	AscInitQLinkVar(asc_dvc);
-
 	AscWriteLramByte(iop_base, ASCV_DISC_ENABLE_B,
 					 asc_dvc->cfg->disc_enable);
 	AscWriteLramByte(iop_base, ASCV_HOSTSCSI_ID_B,
@@ -8060,13 +8928,11 @@
 									 ASC_OVERRUN_BSIZE)) == 0L) {
 		asc_dvc->err_code |= ASC_IERR_GET_PHY_ADDR;
 	} else {
-
 		phy_addr = (phy_addr & 0xFFFFFFF8UL) + 8;
 		AscWriteLramDWord(iop_base, ASCV_OVERRUN_PADDR_D, phy_addr);
 		AscWriteLramDWord(iop_base, ASCV_OVERRUN_BSIZE_D,
 						  ASC_OVERRUN_BSIZE - 8);
 	}
-
 	asc_dvc->cfg->mcode_date = AscReadLramWord(iop_base,
 											   (ushort) ASCV_MC_DATE_W);
 	asc_dvc->cfg->mcode_version = AscReadLramWord(iop_base,
@@ -8093,11 +8959,8 @@
 	ASC_ISR_CALLBACK    asc_isr_callback;
 	uchar               cp_sen_len;
 	uchar               i;
-
 	if ((scsi_done_q->d2.flag & ASC_FLAG_SCSIQ_REQ) != 0) {
 		scsiq_req = (ASC_SCSI_REQ_Q dosfar *) scsi_done_q->d2.srb_ptr;
-		ASC_DBG2(3, "AscInitPollIsrCallBack: done_stat %x, host_stat %x\n",
-				 scsiq_req->r3.done_stat, scsiq_req->r3.host_stat);
 		scsiq_req->r3.done_stat = scsi_done_q->d3.done_stat;
 		scsiq_req->r3.host_stat = scsi_done_q->d3.host_stat;
 		scsiq_req->r3.scsi_stat = scsi_done_q->d3.scsi_stat;
@@ -8113,8 +8976,6 @@
 			}
 		}
 	} else {
-		ASC_DBG1(3, "AscInitPollIsrCallBack: isr_callback %x\n",
-				 (unsigned) asc_dvc->isr_callback);
 		if (asc_dvc->isr_callback != 0) {
 			asc_isr_callback = (ASC_ISR_CALLBACK) asc_dvc->isr_callback;
 			(*asc_isr_callback) (asc_dvc, scsi_done_q);
@@ -8132,23 +8993,22 @@
 	ushort              q_addr;
 	ushort              saved_word;
 	int                 sta;
-
 	iop_base = asc_dvc->iop_base;
 	sta = 0;
-
 	q_addr = ASC_QNO_TO_QADDR(241);
 	saved_word = AscReadLramWord(iop_base, q_addr);
-	if (AscVerWriteLramWord(iop_base, q_addr, 0x55AA) == 0) {
+	AscSetChipLramAddr(iop_base, q_addr);
+	AscSetChipLramData(iop_base, 0x55AA);
+	DvcSleepMilliSecond(10);
+	AscSetChipLramAddr(iop_base, q_addr);
+	if (AscGetChipLramData(iop_base) == 0x55AA) {
 		sta = 1;
 		AscWriteLramWord(iop_base, q_addr, saved_word);
 	}
 	return (sta);
 }
 
-#if CC_TEST_LRAM_ENDIAN
-
-#endif
-
+#if CC_INCLUDE_EEP_CONFIG
 int
 AscWriteEEPCmdReg(
 					 PortAddr iop_base,
@@ -8157,7 +9017,6 @@
 {
 	uchar               read_back;
 	int                 retry;
-
 	retry = 0;
 	while (TRUE) {
 		AscSetChipEEPCmd(iop_base, cmd_reg);
@@ -8180,7 +9039,6 @@
 {
 	ushort              read_back;
 	int                 retry;
-
 	retry = 0;
 	while (TRUE) {
 		AscSetChipEEPData(iop_base, data_reg);
@@ -8221,7 +9079,6 @@
 {
 	ushort              read_wval;
 	uchar               cmd_reg;
-
 	AscWriteEEPCmdReg(iop_base, ASC_EEP_CMD_WRITE_DISABLE);
 	AscWaitEEPRead();
 	cmd_reg = addr | ASC_EEP_CMD_READ;
@@ -8240,19 +9097,15 @@
 )
 {
 	ushort              read_wval;
-
 	read_wval = AscReadEEPWord(iop_base, addr);
 	if (read_wval != word_val) {
 		AscWriteEEPCmdReg(iop_base, ASC_EEP_CMD_WRITE_ABLE);
 		AscWaitEEPRead();
-
 		AscWriteEEPDataReg(iop_base, word_val);
 		AscWaitEEPRead();
-
 		AscWriteEEPCmdReg(iop_base,
 						  (uchar) ((uchar) ASC_EEP_CMD_WRITE | addr));
 		AscWaitEEPWrite();
-
 		AscWriteEEPCmdReg(iop_base, ASC_EEP_CMD_WRITE_DISABLE);
 		AscWaitEEPRead();
 		return (AscReadEEPWord(iop_base, addr));
@@ -8273,17 +9126,14 @@
 	int                 cfg_end;
 	int                 s_addr;
 	int                 isa_pnp_wsize;
-
 	wbuf = (ushort dosfar *) cfg_buf;
 	sum = 0;
-
 	isa_pnp_wsize = 0;
 	for (s_addr = 0; s_addr < (2 + isa_pnp_wsize); s_addr++, wbuf++) {
 		wval = AscReadEEPWord(iop_base, (uchar) s_addr);
 		sum += wval;
 		*wbuf = wval;
 	}
-
 	if (bus_type & ASC_IS_VL) {
 		cfg_beg = ASC_EEP_DVC_CFG_BEG_VL;
 		cfg_end = ASC_EEP_MAX_DVC_ADDR_VL;
@@ -8291,7 +9141,6 @@
 		cfg_beg = ASC_EEP_DVC_CFG_BEG;
 		cfg_end = ASC_EEP_MAX_DVC_ADDR;
 	}
-
 	for (s_addr = cfg_beg; s_addr <= (cfg_end - 1);
 		 s_addr++, wbuf++) {
 		wval = AscReadEEPWord(iop_base, (uchar) s_addr);
@@ -8302,6 +9151,7 @@
 	return (sum);
 }
 
+#if CC_CHK_FIX_EEP_CONTENT
 int
 AscSetEEPConfigOnce(
 					   PortAddr iop_base,
@@ -8314,7 +9164,6 @@
 	int                 s_addr;
 	int                 cfg_beg;
 	int                 cfg_end;
-
 	wbuf = (ushort dosfar *) cfg_buf;
 	n_error = 0;
 	sum = 0;
@@ -8365,7 +9214,6 @@
 {
 	int                 retry;
 	int                 n_error;
-
 	retry = 0;
 	while (TRUE) {
 		if ((n_error = AscSetEEPConfigOnce(iop_base, cfg_buf,
@@ -8378,24 +9226,21 @@
 	}
 	return (n_error);
 }
+#endif
+#endif
 
 int
 AscInitPollBegin(
-					ASC_DVC_VAR asc_ptr_type * asc_dvc
+					REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	PortAddr            iop_base;
-
 	iop_base = asc_dvc->iop_base;
-
 #if CC_INIT_INQ_DISPLAY
 	DvcDisplayString((uchar dosfar *) "\r\n");
 #endif
-
 	AscDisableInterrupt(iop_base);
-
 	asc_dvc->init_state |= ASC_INIT_STATE_BEG_INQUIRY;
-
 	AscWriteLramByte(iop_base, ASCV_DISC_ENABLE_B, 0x00);
 	asc_dvc->use_tagged_qng = 0;
 	asc_dvc->cfg->can_tagged_qng = 0;
@@ -8406,12 +9251,11 @@
 
 int
 AscInitPollEnd(
-				  ASC_DVC_VAR asc_ptr_type * asc_dvc
+				  REG ASC_DVC_VAR asc_ptr_type * asc_dvc
 )
 {
 	PortAddr            iop_base;
-	int                 i;
-
+	rint                i;
 	iop_base = asc_dvc->iop_base;
 	asc_dvc->isr_callback = (Ptr2Func) asc_dvc->saved_ptr2func;
 	AscWriteLramByte(iop_base, ASCV_DISC_ENABLE_B,
@@ -8420,20 +9264,17 @@
 					 asc_dvc->use_tagged_qng);
 	AscWriteLramByte(iop_base, ASCV_CAN_TAGGED_QNG_B,
 					 asc_dvc->cfg->can_tagged_qng);
-
 	for (i = 0; i <= ASC_MAX_TID; i++) {
 		AscWriteLramByte(iop_base,
 					  (ushort) ((ushort) ASCV_MAX_DVC_QNG_BEG + (ushort) i),
 						 asc_dvc->max_dvc_qng[i]);
 	}
-
+	AscAckInterrupt(iop_base);
 	AscEnableInterrupt(iop_base);
-
 #if CC_INIT_INQ_DISPLAY
 	DvcDisplayString((uchar dosfar *) "\r\n");
 #endif
 	asc_dvc->init_state |= ASC_INIT_STATE_END_INQUIRY;
-
 	return (0);
 }
 
@@ -8441,10 +9282,10 @@
 
 int
 AscInitPollTarget(
-					 ASC_DVC_VAR asc_ptr_type * asc_dvc,
-					 ASC_SCSI_REQ_Q dosfar * scsiq,
-					 ASC_SCSI_INQUIRY dosfar * inq,
-					 ASC_CAP_INFO dosfar * cap_info
+					 REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					 REG ASC_SCSI_REQ_Q dosfar * scsiq,
+					 REG ASC_SCSI_INQUIRY dosfar * inq,
+					 REG ASC_CAP_INFO dosfar * cap_info
 )
 {
 	uchar               tid_no, lun;
@@ -8453,42 +9294,49 @@
 	int                 dvc_found;
 	int                 support_read_cap;
 	int                 tmp_disable_init_sdtr;
+	int                 sta;
 	ulong               phy_addr;
-
 	dvc_found = 0;
 	tmp_disable_init_sdtr = FALSE;
 	tid_bits = scsiq->r1.target_id;
 	lun = scsiq->r1.target_lun;
 	tid_no = ASC_TIX_TO_TID(scsiq->r2.target_ix);
-	if ((phy_addr = AscGetOnePhyAddr(asc_dvc,
-									 (uchar dosfar *) scsiq->sense_ptr,
-									 (ulong) scsiq->r1.sense_len)) == 0L) {
+	if (
+		   (phy_addr = AscGetOnePhyAddr(asc_dvc,
+										(uchar dosfar *) scsiq->sense_ptr,
+										(ulong) scsiq->r1.sense_len)) == 0L
+	  ) {
 		return (ERR);
 	}
 	scsiq->r1.sense_addr = phy_addr;
-	if (((asc_dvc->init_sdtr & tid_bits) != 0) &&
-		((asc_dvc->sdtr_done & tid_bits) == 0)) {
-
+	if (
+		   ((asc_dvc->init_sdtr & tid_bits) != 0)
+		   && ((asc_dvc->sdtr_done & tid_bits) == 0)
+	  ) {
 		asc_dvc->init_sdtr &= ~tid_bits;
 		tmp_disable_init_sdtr = TRUE;
 	}
-	ASC_DBG(3, "AscInitPollTarget: PollScsiInquiry()\n");
-	if (PollScsiInquiry(asc_dvc, scsiq, (uchar dosfar *) inq,
-						sizeof (ASC_SCSI_INQUIRY)) == 1) {
+	if (
+		   PollScsiInquiry(asc_dvc, scsiq, (uchar dosfar *) inq,
+						   sizeof (ASC_SCSI_INQUIRY)) == 1
+	  ) {
 		dvc_found = 1;
 		support_read_cap = TRUE;
 		dvc_type = inq->byte0.peri_dvc_type;
 		if (dvc_type != SCSI_TYPE_UNKNOWN) {
-			if ((dvc_type != SCSI_TYPE_DASD) &&
-				(dvc_type != SCSI_TYPE_WORM) &&
-				(dvc_type != SCSI_TYPE_CDROM) &&
-				(dvc_type != SCSI_TYPE_OPTMEM)) {
+			if (
+				   (dvc_type != SCSI_TYPE_DASD)
+				   && (dvc_type != SCSI_TYPE_WORM)
+				   && (dvc_type != SCSI_TYPE_CDROM)
+				   && (dvc_type != SCSI_TYPE_OPTMEM)
+			  ) {
 				asc_dvc->start_motor &= ~tid_bits;
 				support_read_cap = FALSE;
 			}
-			if ((dvc_type != SCSI_TYPE_DASD) ||
-				inq->byte1.rmb) {
-
+			if (
+				   (dvc_type != SCSI_TYPE_DASD)
+				   || inq->byte1.rmb
+			  ) {
 				if (!_asc_wait_slow_device_) {
 					DvcSleepMilliSecond(3000 - ((int) tid_no * 250));
 					_asc_wait_slow_device_ = TRUE;
@@ -8497,105 +9345,105 @@
 #if CC_INIT_INQ_DISPLAY
 			AscDispInquiry(tid_no, lun, inq);
 #endif
-
-			ASC_DBG_PRT_INQUIRY(2, inq, sizeof(ASC_SCSI_INQUIRY));
-
 			if (lun == 0) {
-
-				ASC_DBG1(2, "AscInitPollTarget: vendor_id: \"%.8s\"\n",
-					inq->vendor_id);
-				ASC_DBG1(2, "AscInitPollTarget: product_id: \"%.16s\"\n",
-					inq->product_id);
-				ASC_DBG1(2, "AscInitPollTarget: product_rev_level: \"%.4s\"\n",
-					inq->product_rev_level);
-
-				ASC_DBG1(2, "AscInitPollTarget: byte3.rsp_data_fmt %x\n",
-					inq->byte3.rsp_data_fmt);
-				ASC_DBG1(2, "AscInitPollTarget: byte3.ansi_apr_ver %x\n",
-					inq->byte2.ansi_apr_ver);
-					
-				if ((inq->byte3.rsp_data_fmt >= 2) ||
-					(inq->byte2.ansi_apr_ver >= 2)) {
-
-					ASC_DBG1(2, "AscInitPollTarget: byte7.CmdQue %x\n",
-						inq->byte7.CmdQue);
-
+				if (
+					   (inq->byte3.rsp_data_fmt >= 2)
+					   || (inq->byte2.ansi_apr_ver >= 2)
+				  ) {
 					if (inq->byte7.CmdQue) {
 						asc_dvc->cfg->can_tagged_qng |= tid_bits;
 						if (asc_dvc->cfg->cmd_qng_enabled & tid_bits) {
-							asc_dvc->use_tagged_qng |= tid_bits;
-							asc_dvc->max_dvc_qng[tid_no] =
-							  asc_dvc->cfg->max_tag_qng[tid_no];
+#if CC_FIX_QUANTUM_XP34301_1071
+							if (
+								   (inq->add_len >= 32)
+								   && (AscCompareString(inq->vendor_id, (uchar *) "QUANTUM XP34301", 15) == 0)
+								   && (AscCompareString(inq->product_rev_level, (uchar *) "1071", 4) == 0)
+							  ) {
+							} else {
+#endif
+								asc_dvc->use_tagged_qng |= tid_bits;
+								asc_dvc->max_dvc_qng[tid_no] = asc_dvc->cfg->max_tag_qng[tid_no];
+#if CC_FIX_QUANTUM_XP34301_1071
+							}
+#endif
 						}
 					}
-					ASC_DBG1(2, "AscInitPollTarget: byte7.Sync %x\n",
-						inq->byte7.Sync);
-
 					if (!inq->byte7.Sync) {
-
 						asc_dvc->init_sdtr &= ~tid_bits;
 						asc_dvc->sdtr_done &= ~tid_bits;
 					} else if (tmp_disable_init_sdtr) {
-
 						asc_dvc->init_sdtr |= tid_bits;
 					}
 				} else {
-
 					asc_dvc->init_sdtr &= ~tid_bits;
 					asc_dvc->sdtr_done &= ~tid_bits;
 					asc_dvc->use_tagged_qng &= ~tid_bits;
 				}
 			}
-			if (asc_dvc->pci_fix_asyn_xfer & tid_bits) {
+			if (asc_dvc->bug_fix_cntl & ASC_BUG_FIX_ASYN_USE_SYN) {
 				if (!(asc_dvc->init_sdtr & tid_bits)) {
-
-					AscSetRunChipSynRegAtID(asc_dvc->iop_base, tid_no,
-											ASYN_SDTR_DATA_FIX_PCI_REV_AB);
+					if (
+						   (dvc_type == SCSI_TYPE_CDROM)
+						   && (AscCompareString((uchar *) inq->vendor_id, (uchar *) "HP ", 3) == 0)
+					  ) {
+						asc_dvc->pci_fix_asyn_xfer_always |= tid_bits;
+					}
+					asc_dvc->pci_fix_asyn_xfer |= tid_bits;
+#if CC_DISABLE_ASYN_FIX_WANGTEK_TAPE
+					if (
+						   (dvc_type == SCSI_TYPE_SASD)
+						   && (AscCompareString((uchar *) inq->vendor_id, (uchar *) "WANGTEK ", 8) == 0)
+					  ) {
+						asc_dvc->pci_fix_asyn_xfer &= ~tid_bits;
+					}
+#endif
+					if (asc_dvc->pci_fix_asyn_xfer & tid_bits) {
+						AscSetRunChipSynRegAtID(asc_dvc->iop_base, tid_no,
+											 ASYN_SDTR_DATA_FIX_PCI_REV_AB);
+					}
 				}
 			}
-			ASC_DBG(3, "AscInitPollTarget: InitTestUnitReady()\n");
-			if (InitTestUnitReady(asc_dvc, scsiq) != 1) {
-
-			} else {
+			sta = 1;
+#if CC_INIT_TARGET_TEST_UNIT_READY
+			sta = InitTestUnitReady(asc_dvc, scsiq);
+#endif
+#if CC_INIT_TARGET_READ_CAPACITY
+			if (sta == 1) {
 				if ((cap_info != 0L) && support_read_cap) {
-					ASC_DBG(3, "AscInitPollTarget: PollScsiReadCapacity()\n");
 					if (PollScsiReadCapacity(asc_dvc, scsiq,
 											 cap_info) != 1) {
 						cap_info->lba = 0L;
 						cap_info->blk_size = 0x0000;
 					} else {
-
 					}
 				}
 			}
+#endif
 		} else {
 			asc_dvc->start_motor &= ~tid_bits;
 		}
 	} else {
-
 	}
 	return (dvc_found);
 }
 
 int
 PollQueueDone(
-				 ASC_DVC_VAR asc_ptr_type * asc_dvc,
-				 ASC_SCSI_REQ_Q dosfar * scsiq,
+				 REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+				 REG ASC_SCSI_REQ_Q dosfar * scsiq,
 				 int timeout_sec
 )
 {
 	int                 status;
 	int                 retry;
-
 	retry = 0;
 	do {
-		ASC_DBG(3, "PollQueueDone: AscExeScsiQueue()\n");
-		if ((status = AscExeScsiQueue(asc_dvc,
-									  (ASC_SCSI_Q dosfar *) scsiq)) == 1) {
-			ASC_DBG(3, "PollQueueDone: AscPollQDone()\n");
+		if (
+			   (status = AscExeScsiQueue(asc_dvc,
+										 (ASC_SCSI_Q dosfar *) scsiq)) == 1
+		  ) {
 			if ((status = AscPollQDone(asc_dvc, scsiq,
 									   timeout_sec)) != 1) {
-				ASC_DBG1(3, "PollQueueDone: AscPollQDone() status %x\n", status);
 				if (status == 0x80) {
 					if (retry++ > ASC_MAX_INIT_BUSY_RETRY) {
 						break;
@@ -8604,30 +9452,25 @@
 					scsiq->r3.host_stat = 0;
 					scsiq->r3.scsi_stat = 0;
 					scsiq->r3.scsi_msg = 0;
-					DvcSleepMilliSecond(100);
+					DvcSleepMilliSecond(2000);
 					continue;
 				}
 				scsiq->r3.done_stat = 0;
 				scsiq->r3.host_stat = 0;
 				scsiq->r3.scsi_stat = 0;
 				scsiq->r3.scsi_msg = 0;
-				ASC_DBG1(3, "PollQueueDone: AscAbortSRB() scsiq %x\n",
-						 (unsigned) scsiq);
-
 				AscAbortSRB(asc_dvc, (ulong) scsiq);
 			}
-			ASC_DBG1(3, "PollQueueDone: done_stat %x\n", scsiq->r3.done_stat);
 			return (scsiq->r3.done_stat);
 		}
 	} while ((status == 0) || (status == 0x80));
-	ASC_DBG(3, "PollQueueDone: done_stat QD_WITH_ERROR\n");
 	return (scsiq->r3.done_stat = QD_WITH_ERROR);
 }
 
 int
 PollScsiInquiry(
-				   ASC_DVC_VAR asc_ptr_type * asc_dvc,
-				   ASC_SCSI_REQ_Q dosfar * scsiq,
+				   REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+				   REG ASC_SCSI_REQ_Q dosfar * scsiq,
 				   uchar dosfar * buf,
 				   int buf_len
 )
@@ -8638,16 +9481,30 @@
 	return (PollQueueDone(asc_dvc, (ASC_SCSI_REQ_Q dosfar *) scsiq, 4));
 }
 
+#if CC_INIT_TARGET_START_UNIT
+int
+PollScsiStartUnit(
+					 REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					 REG ASC_SCSI_REQ_Q dosfar * scsiq
+)
+{
+	if (AscScsiStartStopUnit(asc_dvc, scsiq, 1) == ERR) {
+		return (scsiq->r3.done_stat = QD_WITH_ERROR);
+	}
+	return (PollQueueDone(asc_dvc, (ASC_SCSI_REQ_Q dosfar *) scsiq, 40));
+}
+#endif
+
+#if CC_INIT_TARGET_READ_CAPACITY
 int
 PollScsiReadCapacity(
-						ASC_DVC_VAR asc_ptr_type * asc_dvc,
-						ASC_SCSI_REQ_Q dosfar * scsiq,
-						ASC_CAP_INFO dosfar * cap_info
+						REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						REG ASC_SCSI_REQ_Q dosfar * scsiq,
+						REG ASC_CAP_INFO dosfar * cap_info
 )
 {
 	ASC_CAP_INFO        scsi_cap_info;
 	int                 status;
-
 	if (AscScsiReadCapacity(asc_dvc, scsiq,
 							(uchar dosfar *) & scsi_cap_info) == ERR) {
 		return (scsiq->r3.done_stat = QD_WITH_ERROR);
@@ -8665,6 +9522,7 @@
 	}
 	return (scsiq->r3.done_stat = QD_WITH_ERROR);
 }
+#endif
 
 ulong dosfar       *
 swapfarbuf4(
@@ -8684,10 +9542,11 @@
 	return ((ulong dosfar *) buf);
 }
 
+#if CC_INIT_TARGET_TEST_UNIT_READY
 int
 PollScsiTestUnitReady(
-						 ASC_DVC_VAR asc_ptr_type * asc_dvc,
-						 ASC_SCSI_REQ_Q dosfar * scsiq
+						 REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						 REG ASC_SCSI_REQ_Q dosfar * scsiq
 )
 {
 	if (AscScsiTestUnitReady(asc_dvc, scsiq) == ERR) {
@@ -8697,45 +9556,26 @@
 }
 
 int
-PollScsiStartUnit(
-					 ASC_DVC_VAR asc_ptr_type * asc_dvc,
-					 ASC_SCSI_REQ_Q dosfar * scsiq
-)
-{
-	if (AscScsiStartStopUnit(asc_dvc, scsiq, 1) == ERR) {
-		return (scsiq->r3.done_stat = QD_WITH_ERROR);
-	}
-	return (PollQueueDone(asc_dvc, (ASC_SCSI_REQ_Q dosfar *) scsiq, 40));
-}
-
-int
 InitTestUnitReady(
-					 ASC_DVC_VAR asc_ptr_type * asc_dvc,
-					 ASC_SCSI_REQ_Q dosfar * scsiq
+					 REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					 REG ASC_SCSI_REQ_Q dosfar * scsiq
 )
 {
 	ASC_SCSI_BIT_ID_TYPE tid_bits;
 	int                 retry;
 	ASC_REQ_SENSE dosfar *sen;
-
 	retry = 0;
 	tid_bits = scsiq->r1.target_id;
 	while (retry++ < 2) {
-		ASC_DBG(3, "InitTestUnitReady: PollScsiTestUnitReady()\n");
 		PollScsiTestUnitReady(asc_dvc, scsiq);
-		ASC_DBG1(3, "InitTestUnitReady: done_stat %x\n", scsiq->r3.done_stat);
 		if (scsiq->r3.done_stat == 0x01) {
 			return (1);
 		} else if (scsiq->r3.done_stat == QD_WITH_ERROR) {
 			DvcSleepMilliSecond(100);
-
 			sen = (ASC_REQ_SENSE dosfar *) scsiq->sense_ptr;
-
 			if ((scsiq->r3.scsi_stat == SS_CHK_CONDITION) &&
 				((sen->err_code & 0x70) != 0)) {
-
 				if (sen->sense_key == SCSI_SENKEY_NOT_READY) {
-
 					if (asc_dvc->start_motor & tid_bits) {
 						if (PollScsiStartUnit(asc_dvc, scsiq) == 1) {
 							retry = 0;
@@ -8745,10 +9585,10 @@
 							break;
 						}
 					} else {
-						DvcSleepMilliSecond(100);
+						DvcSleepMilliSecond(5000);
 					}
 				} else if (sen->sense_key == SCSI_SENKEY_ATTENSION) {
-					DvcSleepMilliSecond(100);
+					DvcSleepMilliSecond(500);
 				} else {
 					break;
 				}
@@ -8763,31 +9603,23 @@
 	}
 	return (0);
 }
-
-#if CC_INIT_INQ_DISPLAY
-
 #endif
 
 int
 AscPollQDone(
-				ASC_DVC_VAR asc_ptr_type * asc_dvc,
-				ASC_SCSI_REQ_Q dosfar * scsiq,
+				REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+				REG ASC_SCSI_REQ_Q dosfar * scsiq,
 				int timeout_sec
 )
 {
 	int                 loop, loop_end;
 	int                 sta;
 	PortAddr            iop_base;
-
 	iop_base = asc_dvc->iop_base;
 	loop = 0;
 	loop_end = timeout_sec * 100;
 	sta = 1;
-
 	while (TRUE) {
-		ASC_DBG4(3,
-		 "AscPollQDone: loop %d, err_code %x, done_stat %x, scsi_stat %x\n",
-		 loop, asc_dvc->err_code, scsiq->r3.done_stat, scsiq->r3.scsi_stat);
 		if (asc_dvc->err_code != 0) {
 			scsiq->r3.done_stat = QD_WITH_ERROR;
 			sta = ERR;
@@ -8797,7 +9629,6 @@
 			if ((scsiq->r3.done_stat == QD_WITH_ERROR) &&
 				(scsiq->r3.scsi_stat == SS_TARGET_BUSY)) {
 				sta = 0x80;
-				break;
 			}
 			break;
 		}
@@ -8807,20 +9638,40 @@
 			break;
 		}
 		if (AscIsChipHalted(iop_base)) {
+#if !CC_ASCISR_CHECK_INT_PENDING
+			AscAckInterrupt(iop_base);
+#endif
 			AscISR(asc_dvc);
 			loop = 0;
 		} else {
-			ASC_DBG(3, "AscPollQDone: AscIsIntPending()\n");
 			if (AscIsIntPending(iop_base)) {
-				ASC_DBG(3, "AscPollQDone: AscISR()\n");
+#if !CC_ASCISR_CHECK_INT_PENDING
+				AscAckInterrupt(iop_base);
+#endif
 				AscISR(asc_dvc);
 			}
 		}
 	}
-	ASC_DBG1(3, "AscPollQDone: sta %x\n", sta);
 	return (sta);
 }
 
+int
+AscCompareString(
+					ruchar * str1,
+					ruchar * str2,
+					int len
+)
+{
+	int                 i;
+	int                 diff;
+	for (i = 0; i < len; i++) {
+		diff = (int) (str1[i] - str2[i]);
+		if (diff != 0)
+			return (diff);
+	}
+	return (0);
+}
+
 uchar
 AscReadLramByte(
 				   PortAddr iop_base,
@@ -8829,27 +9680,14 @@
 {
 	uchar               byte_data;
 	ushort              word_data;
-
 	if (isodd_word(addr)) {
 		AscSetChipLramAddr(iop_base, addr - 1);
 		word_data = AscGetChipLramData(iop_base);
-
-#if CC_LITTLE_ENDIAN_HOST
 		byte_data = (uchar) ((word_data >> 8) & 0xFF);
-#else
-		byte_data = (uchar) (word_data & 0xFF);
-#endif
-
 	} else {
 		AscSetChipLramAddr(iop_base, addr);
 		word_data = AscGetChipLramData(iop_base);
-
-#if CC_LITTLE_ENDIAN_HOST
 		byte_data = (uchar) (word_data & 0xFF);
-#else
-		byte_data = (uchar) ((word_data >> 8) & 0xFF);
-#endif
-
 	}
 	return (byte_data);
 }
@@ -8861,7 +9699,6 @@
 )
 {
 	ushort              word_data;
-
 	AscSetChipLramAddr(iop_base, addr);
 	word_data = AscGetChipLramData(iop_base);
 	return (word_data);
@@ -8875,18 +9712,9 @@
 {
 	ushort              val_low, val_high;
 	ulong               dword_data;
-
 	AscSetChipLramAddr(iop_base, addr);
-
-#if CC_LITTLE_ENDIAN_HOST
 	val_low = AscGetChipLramData(iop_base);
-
-	val_high = AscGetChipLramData(iop_base);
-#else
 	val_high = AscGetChipLramData(iop_base);
-	val_low = AscGetChipLramData(iop_base);
-#endif
-
 	dword_data = ((ulong) val_high << 16) | (ulong) val_low;
 	return (dword_data);
 }
@@ -8899,7 +9727,7 @@
 )
 {
 	AscSetChipLramAddr(iop_base, addr);
-	AscPutChipLramData(iop_base, word_val);
+	AscSetChipLramData(iop_base, word_val);
 	return;
 }
 
@@ -8911,20 +9739,11 @@
 )
 {
 	ushort              word_val;
-
 	AscSetChipLramAddr(iop_base, addr);
-
-#if CC_LITTLE_ENDIAN_HOST
 	word_val = (ushort) dword_val;
-	AscPutChipLramData(iop_base, word_val);
-	word_val = (ushort) (dword_val >> 16);
-	AscPutChipLramData(iop_base, word_val);
-#else
+	AscSetChipLramData(iop_base, word_val);
 	word_val = (ushort) (dword_val >> 16);
-	AscPutChipLramData(iop_base, word_val);
-	word_val = (ushort) dword_val;
-	AscPutChipLramData(iop_base, word_val);
-#endif
+	AscSetChipLramData(iop_base, word_val);
 	return;
 }
 
@@ -8936,7 +9755,6 @@
 )
 {
 	ushort              word_data;
-
 	if (isodd_word(addr)) {
 		addr--;
 		word_data = AscReadLramWord(iop_base, addr);
@@ -8951,24 +9769,8 @@
 	return;
 }
 
-int
-AscVerWriteLramWord(
-					   PortAddr iop_base,
-					   ushort addr,
-					   ushort word_val
-)
-{
-	int                 sta;
 
-	sta = 0;
-	AscSetChipLramAddr(iop_base, addr);
-	AscPutChipLramData(iop_base, word_val);
-	AscSetChipLramAddr(iop_base, addr);
-	if (word_val != AscGetChipLramData(iop_base)) {
-		sta = ERR;
-	}
-	return (sta);
-}
+
 
 void
 AscMemWordCopyToLram(
@@ -9018,7 +9820,6 @@
 {
 	ulong               sum;
 	int                 i;
-
 	sum = 0L;
 	for (i = 0; i < words; i++, s_addr += 2) {
 		sum += AscReadLramWord(iop_base, s_addr);
@@ -9035,19 +9836,20 @@
 )
 {
 	rint                i;
-
 	AscSetChipLramAddr(iop_base, s_addr);
 	for (i = 0; i < words; i++) {
-		AscPutChipLramData(iop_base, set_wval);
+		AscSetChipLramData(iop_base, set_wval);
 	}
 	return;
 }
 
+
 int
 AscScsiInquiry(
-				  ASC_DVC_VAR asc_ptr_type * asc_dvc,
-				  ASC_SCSI_REQ_Q dosfar * scsiq,
-				  uchar dosfar * buf, int buf_len
+				  REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+				  REG ASC_SCSI_REQ_Q dosfar * scsiq,
+				  uchar dosfar * buf,
+				  int buf_len
 )
 {
 	if (AscScsiSetupCmdQ(asc_dvc, scsiq, buf,
@@ -9064,10 +9866,11 @@
 	return (0);
 }
 
+#if CC_INIT_TARGET_READ_CAPACITY
 int
 AscScsiReadCapacity(
-					   ASC_DVC_VAR asc_ptr_type * asc_dvc,
-					   ASC_SCSI_REQ_Q dosfar * scsiq,
+					   REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+					   REG ASC_SCSI_REQ_Q dosfar * scsiq,
 					   uchar dosfar * info
 )
 {
@@ -9087,11 +9890,13 @@
 	scsiq->r2.cdb_len = 10;
 	return (0);
 }
+#endif
 
+#if CC_INIT_TARGET_TEST_UNIT_READY
 int
 AscScsiTestUnitReady(
-						ASC_DVC_VAR asc_ptr_type * asc_dvc,
-						ASC_SCSI_REQ_Q dosfar * scsiq
+						REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						REG ASC_SCSI_REQ_Q dosfar * scsiq
 )
 {
 	if (AscScsiSetupCmdQ(asc_dvc, scsiq, FNULLPTR,
@@ -9108,11 +9913,13 @@
 	scsiq->r2.cdb_len = 6;
 	return (0);
 }
+#endif
 
+#if CC_INIT_TARGET_START_UNIT
 int
 AscScsiStartStopUnit(
-						ASC_DVC_VAR asc_ptr_type * asc_dvc,
-						ASC_SCSI_REQ_Q dosfar * scsiq,
+						REG ASC_DVC_VAR asc_ptr_type * asc_dvc,
+						REG ASC_SCSI_REQ_Q dosfar * scsiq,
 						uchar op_mode
 )
 {
@@ -9125,8 +9932,8 @@
 	scsiq->cdb[2] = 0;
 	scsiq->cdb[3] = 0;
 	scsiq->cdb[4] = op_mode;
-
 	scsiq->cdb[5] = 0;
 	scsiq->r2.cdb_len = 6;
 	return (0);
 }
+#endif
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/advansys.h linux/drivers/scsi/advansys.h
--- v2.0.12/linux/drivers/scsi/advansys.h	Wed Jan 17 07:27:36 1996
+++ linux/drivers/scsi/advansys.h	Wed Aug 14 09:59:04 1996
@@ -1,13 +1,16 @@
-/* $Id: advansys.h,v 1.10 1996/01/15 04:51:06 bobf Exp bobf $ */
+/* $Id: advansys.h,v 1.11 1996/08/12 17:20:44 bobf Exp bobf $ */
 /*
  * advansys.h - Linux Host Driver for AdvanSys SCSI Adapters
  *
  * Copyright (c) 1995-1996 Advanced System Products, Inc.
  *
- * This driver may be modified and freely distributed provided that
- * the above copyright message and this comment are included in the
- * distribution. The latest version of this driver is available at
- * the AdvanSys FTP and BBS sites listed below.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that redistributions of source
+ * code retain the above copyright notice and this comment without
+ * modification.
+ *
+ * The latest version of this driver is available at the AdvanSys
+ * FTP and BBS sites listed below.
  *
  * Please send questions, comments, and bug reports to:
  * bobf@advansys.com (Bob Frey)
@@ -16,17 +19,12 @@
 #ifndef _ADVANSYS_H
 #define _ADVANSYS_H
 
-/* The driver can be used in Linux 1.2.X or 1.3.X. */
-#if !defined(LINUX_1_2) && !defined(LINUX_1_3)
+/* Convert Linux Version, Patch-level, Sub-level to LINUX_VERSION_CODE. */
+#define ASC_LINUX_VERSION(V, P, S)	(((V) * 65536) + ((P) * 256) + (S))
+
 #ifndef LINUX_VERSION_CODE
 #include <linux/version.h>
 #endif /* LINUX_VERSION_CODE */
-#if LINUX_VERSION_CODE > 65536 + 3 * 256
-#define LINUX_1_3
-#else /* LINUX_VERSION_CODE */
-#define LINUX_1_2
-#endif /* LINUX_VERSION_CODE */
-#endif /* !defined(LINUX_1_2) && !defined(LINUX_1_3) */
 
 /*
  * Scsi_Host_Template function prototypes.
@@ -37,14 +35,18 @@
 int advansys_command(Scsi_Cmnd *);
 int advansys_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
 int advansys_abort(Scsi_Cmnd *);
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,89)
 int advansys_reset(Scsi_Cmnd *);
-#ifdef LINUX_1_2
+#else /* version >= v1.3.89 */
+int advansys_reset(Scsi_Cmnd *, unsigned int);
+#endif /* version >= v1.3.89 */
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,0)
 int advansys_biosparam(Disk *, int, int[]);
-#else /* LINUX_1_3 */
+#else /* version >= v1.3.0 */
 int advansys_biosparam(Disk *, kdev_t, int[]);
 extern struct proc_dir_entry proc_scsi_advansys;
 int advansys_proc_info(char *, char **, off_t, int, int, int);
-#endif /* LINUX_1_3 */
+#endif /* version >= v1.3.0 */
 
 /* init/main.c setup function */
 void advansys_setup(char *, int *);
@@ -52,7 +54,7 @@
 /*
  * AdvanSys Host Driver Scsi_Host_Template (struct SHT) from hosts.h.
  */
-#ifdef LINUX_1_2
+#if LINUX_VERSION_CODE < ASC_LINUX_VERSION(1,3,0)
 #define ADVANSYS { \
 	NULL,					/* struct SHT *next */ \
 	NULL,					/* int *usage_count */ \
@@ -88,7 +90,7 @@
 	 */ \
 	DISABLE_CLUSTERING,		/* unsigned use_clustering:1 */ \
 }
-#else /* LINUX_1_3 */
+#else /* version >= v1.3.0 */
 #define ADVANSYS { \
 	NULL,					/* struct SHT *next */ \
 	NULL,					/* long *usage_count */ \
@@ -103,7 +105,9 @@
 	advansys_queuecommand, \
 			/* int (*queuecommand)(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)) */ \
 	advansys_abort,			/* int (*abort)(Scsi_Cmnd *) */ \
-	advansys_reset,			/* int (*reset)(Scsi_Cmnd *) */ \
+	advansys_reset, \
+		/* version < v1.3.89 int (*reset)(Scsi_Cmnd *) */ \
+		/* version >= v1.3.89 int (*reset)(Scsi_Cmnd *, unsigned int) */ \
 	NULL,					/* int (*slave_attach)(int, int) */ \
 	advansys_biosparam,		/* int (* bios_param)(Disk *, kdev_t, int []) */ \
 	/* \
@@ -127,5 +131,5 @@
 	 */ \
 	DISABLE_CLUSTERING,		/* unsigned use_clustering:1 */ \
 }
-#endif /* LINUX_1_3 */
+#endif /* version >= v1.3.0 */
 #endif /* _ADVANSYS_H */
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/aic7xxx.c linux/drivers/scsi/aic7xxx.c
--- v2.0.12/linux/drivers/scsi/aic7xxx.c	Sun May 12 21:52:54 1996
+++ linux/drivers/scsi/aic7xxx.c	Sat Aug 10 10:44:18 1996
@@ -30,7 +30,7 @@
  * ----------------------------------------------------------------
  *  Modified to include support for wide and twin bus adapters,
  *  DMAing of SCBs, tagged queueing, IRQ sharing, bug fixes,
- *  and other rework of the code.
+ *  SCB paging, and other rework of the code.
  *
  *  Parts of this driver are based on the FreeBSD driver by Justin
  *  T. Gibbs.
@@ -39,9 +39,9 @@
  *
  *    Form:  aic7xxx=extended,no_reset
  *
- *    -- Daniel M. Eischen, deischen@iworks.InterWorks.org, 04/03/95
+ *    -- Daniel M. Eischen, deischen@iworks.InterWorks.org, 07/07/96
  *
- *  $Id: aic7xxx.c,v 3.2 1996/05/12 17:28:23 deang Exp $
+ *  $Id: aic7xxx.c,v 3.4 1996/08/09 15:56:31 deang Exp $
  *-M*************************************************************************/
 
 #ifdef MODULE
@@ -74,7 +74,7 @@
     S_IFDIR | S_IRUGO | S_IXUGO, 2
 };
 
-#define AIC7XXX_C_VERSION  "$Revision: 3.2 $"
+#define AIC7XXX_C_VERSION  "$Revision: 3.4 $"
 
 #define NUMBER(arr)     (sizeof(arr) / sizeof(arr[0]))
 #define MIN(a,b)        ((a < b) ? a : b)
@@ -109,15 +109,9 @@
  *     set to 2. If you want to implement tagged queueing, ensure
  *     this define is not commented out.
  *
- *   o Sharing IRQs - allowed for sharing of IRQs. This will allow
- *     for multiple aic7xxx host adapters sharing the same IRQ, but
- *     not for sharing IRQs with other devices. The higher level
- *     PCI code and interrupt handling needs to be modified to
- *     support this.
- *
  *   o Commands per lun - If tagged queueing is enabled, then you
  *     may want to try increasing AIC7XXX_CMDS_PER_LUN to more
- *     than 2.  By default, we limit the SCBs per lun to 2 with
+ *     than 2.  By default, we limit the SCBs per LUN to 2 with
  *     or without tagged queueing enabled.  If tagged queueing is
  *     disabled, the sequencer will keep the 2nd SCB in the input
  *     queue until the first one completes - so it is OK to to have
@@ -125,10 +119,16 @@
  *     the sequencer will attempt to send the 2nd SCB to the device
  *     while the first SCB is executing and the device is disconnected.
  *     For adapters limited to 4 SCBs, you may want to actually
- *     decrease the commands per lun to 1, if you often have more
+ *     decrease the commands per LUN to 1, if you often have more
  *     than 2 devices active at the same time.  This will allocate
  *     1 SCB for each device and ensure that there will always be
  *     a free SCB for up to 4 devices active at the same time.
+ *     When SCB paging is enabled, set the commands per LUN to 8
+ *     or higher (see SCB paging support below).  Note that if
+ *     AIC7XXX_CMDS_PER_LUN is not defined and tagged queueing is
+ *     enabled, the driver will attempt to set the commands per
+ *     LUN using its own heuristic based on the number of available
+ *     SCBs.
  *
  *   o 3985 support - The 3985 adapter is much like the 3940, but
  *     has three 7870 controllers as opposed to two for the 3940.
@@ -140,7 +140,18 @@
  *     In the near future, we'll modify the driver to reserve 1/3
  *     of the SCBs for each controller.
  *
- *  Daniel M. Eischen, deischen@iworks.InterWorks.org, 01/11/96
+ *   o SCB paging support - SCB paging is enabled by defining
+ *     AIC7XXX_PAGE_ENABLE.  Support for this was taken from the
+ *     FreeBSD driver (by Justin Gibbs) and allows for up to 255
+ *     active SCBs.  This will increase performance when tagged
+ *     queueing is enabled.  Note that you should increase the
+ *     AIC7XXX_CMDS_PER_LUN to 8 as most tagged queueing devices
+ *     allow at least this many.
+ *
+ *  Note that sharing of IRQs is not an option any longer.  Linux supports
+ *  it so we support it.
+ *
+ *  Daniel M. Eischen, deischen@iworks.InterWorks.org, 06/30/96
  */
 
 /* Uncomment this for testing twin bus support. */
@@ -149,14 +160,11 @@
 /* Uncomment this for tagged queueing. */
 /* #define AIC7XXX_TAGGED_QUEUEING */
 
-/* Uncomment this for allowing sharing of IRQs. */
-#define AIC7XXX_SHARE_IRQS
-
 /*
  * You can try raising me if tagged queueing is enabled, or lowering
  * me if you only have 4 SCBs.
  */
-#define AIC7XXX_CMDS_PER_LUN 2
+/* #define AIC7XXX_CMDS_PER_LUN 8 */
 
 /* Set this to the delay in seconds after SCSI bus reset. */
 #define AIC7XXX_RESET_DELAY 15
@@ -170,9 +178,14 @@
 /* #define AIC7XXX_PROC_STATS */
 
 /*
+ * Uncomment the following to enable SCB paging.
+ */
+/* #define AIC7XXX_PAGE_ENABLE */
+
+/*
  * For debugging the abort/reset code.
  */
-/* #define AIC7XXX_DEBUG_ABORT */
+#define AIC7XXX_DEBUG_ABORT
 
 /*
  * For general debug messages
@@ -189,6 +202,7 @@
   AIC_284x,	/* VLB  aic7770 on 284x, BIOS disabled */
   AIC_7850,	/* PCI  aic7850 */
   AIC_7855,	/* PCI  aic7855 */
+  AIC_7860,	/* PCI  aic7860 (7850 Ultra) */
   AIC_7870,	/* PCI  aic7870 on motherboard */
   AIC_7871,	/* PCI  aic7871 on 294x */
   AIC_7872,	/* PCI  aic7872 on 3940 */
@@ -235,13 +249,14 @@
  * Define an array of board names that can be indexed by aha_type.
  * Don't forget to change this when changing the types!
  */
-static const char * board_names[] = {
+static const char *board_names[] = {
   "<AIC-7xxx Unknown>",		/* AIC_NONE */
   "AIC-7770",			/* AIC_7770 */
   "AHA-2740",			/* AIC_7771 */
   "AHA-2840",			/* AIC_284x */
   "AIC-7850",			/* AIC_7850 */
   "AIC-7855",			/* AIC_7855 */
+  "AIC-7850 Ultra",		/* AIC_7860 */
   "AIC-7870",			/* AIC_7870 */
   "AHA-2940",			/* AIC_7871 */
   "AHA-3940",			/* AIC_7872 */
@@ -265,8 +280,15 @@
  *  the command to us. There is no specific driver status for this
  *  condition, but the higher level scsi driver will requeue the
  *  command on a DID_BUS_BUSY error.
+ *
+ *  Upon further inspection and testing, it seems that DID_BUS_BUSY
+ *  will *always* retry the command.  We can get into an infinite loop
+ *  if this happens when we really want some sort of counter that
+ *  will automatically abort/reset the command after so many retries.
+ *  Using DID_ERROR will do just that.  (Made by a suggestion by
+ *  Doug Ledford 8/1/96)
  */
-#define DID_RETRY_COMMAND DID_BUS_BUSY
+#define DID_RETRY_COMMAND DID_ERROR
 
 /*
  * EISA/VL-bus stuff
@@ -395,6 +417,9 @@
   unsigned short checksum;		/* word 31 */
 };
 
+
+#define SCSI_RESET 0x040
+
 /*
  * Pause the sequencer and wait for it to actually stop - this
  * is important since the sequencer can disable pausing for critical
@@ -514,17 +539,18 @@
 /*16*/  unsigned long data_count;
 /*20*/  unsigned char SCSI_cmd_pointer[4] __attribute__ ((packed));
 /*24*/  unsigned char SCSI_cmd_length;
-#define SCB_PIO_TRANSFER_SIZE   25      /*
-                                         * amount we need to upload/download
-                                         * via rep in/outsb to perform
-                                         * a request sense.  The second
-                                         * RESERVED byte is initialized to
-                                         * 0 in getscb().
+/*25*/	u_char tag;			/* Index into our kernel SCB array.
+					 * Also used as the tag for tagged I/O
+					 */
+#define SCB_PIO_TRANSFER_SIZE	26 	/* amount we need to upload/download
+					 * via PIO to initialize a transaction.
+					 */
+/*26*/  u_char next;                    /* Used to thread SCBs awaiting selection
+                                         * or disconnected down in the sequencer.
                                          */
-/*25*/  u_char next_waiting;            /* Used to thread SCBs awaiting selection. */
 	/*-----------------end of hardware supported fields----------------*/
-	struct aic7xxx_scb *next;	/* next ptr when in free list */
 	Scsi_Cmnd          *cmd;	/* Scsi_Cmnd for this scb */
+        struct aic7xxx_scb *q_next;     /* next scb in queue */
 #define SCB_FREE               0x00
 #define SCB_ACTIVE             0x01
 #define SCB_ABORTED            0x02
@@ -532,6 +558,12 @@
 #define SCB_IMMED              0x08
 #define SCB_SENSE              0x10
 #define SCB_QUEUED_FOR_DONE    0x40
+#define SCB_PAGED_OUT          0x80
+#define SCB_WAITINGQ           0x100
+#define SCB_ASSIGNEDQ          0x200
+#define SCB_SENTORDEREDTAG     0x400
+#define SCB_IN_PROGRESS        (SCB_ACTIVE | SCB_PAGED_OUT | \
+                                SCB_WAITINGQ | SCB_ASSIGNEDQ)
 	int                 state;          /* current state of scb */
 	unsigned int        position;       /* Position in scb array */
 	struct scatterlist  sg;
@@ -539,6 +571,14 @@
 	unsigned char       sense_cmd[6];   /* Allocate 6 characters for sense command */
 };
 
+/*
+ * Define a linked list of SCBs.
+ */
+typedef struct {
+  struct aic7xxx_scb *head;
+  struct aic7xxx_scb *tail;
+} scb_queue_type;
+
 static struct {
   unsigned char errno;
   const char *errmesg;
@@ -564,34 +604,73 @@
  */
 struct aic7xxx_host {
   struct Scsi_Host        *host;             /* pointer to scsi host */
+  int                      host_no;          /* SCSI host number */
   int                      base;             /* card base address */
-  int                      maxscb;           /* hardware SCBs */
-  int                      numscb;           /* current number of scbs */
-  int                      extended;         /* extended xlate? */
+  int                      maxhscbs;         /* hardware SCBs */
+  int                      maxscbs;          /* max SCBs (including pageable) */
+  int                      numscbs;          /* current number of scbs */
+  int                      activescbs;       /* active scbs */
+#define A_SCANNED              0x0001
+#define B_SCANNED              0x0002
+#define EXTENDED_TRANSLATION   0x0004
+#define HAVE_SEEPROM           0x0008
+#define ULTRA_ENABLED          0x0010
+#define PAGE_ENABLED           0x0020
+#define IN_ISR                 0x0040
+#define USE_DEFAULTS           0x0080
+  unsigned int             flags;
+  unsigned int             isr_count;        /* Interrupt count */
+  unsigned short           needsdtr_copy;    /* default config */
+  unsigned short           needsdtr;
+  unsigned short           sdtr_pending;
+  unsigned short           needwdtr_copy;    /* default config */
+  unsigned short           needwdtr;
+  unsigned short           wdtr_pending;
+  unsigned short           orderedtag;
+  unsigned short           discenable;	     /* Targets allowed to disconnect */
   aha_type                 type;             /* card type */
   aha_chip_type            chip_type;        /* chip base type */
-  int                      ultra_enabled;    /* Ultra SCSI speed enabled */
-  int                      chan_num;         /* for 3940/3985, channel number */
   aha_bus_type             bus_type;         /* normal/twin/wide bus */
-  unsigned char            a_scanned;        /* 0 not scanned, 1 scanned */
-  unsigned char            b_scanned;        /* 0 not scanned, 1 scanned */
-  unsigned int             isr_count;        /* Interrupt count */
-  volatile unsigned char   unpause;          /* unpause value for HCNTRL */
-  volatile unsigned char   pause;            /* pause value for HCNTRL */
-  volatile unsigned short  needsdtr_copy;    /* default config */
-  volatile unsigned short  needsdtr;
-  volatile unsigned short  sdtr_pending;
-  volatile unsigned short  needwdtr_copy;    /* default config */
-  volatile unsigned short  needwdtr;
-  volatile unsigned short  wdtr_pending;
-  volatile unsigned short  discenable;       /* Targets allowed to disconnect */
-  struct seeprom_config    seeprom;
-  int                      have_seeprom;
+  char *                   mbase;            /* I/O memory address */
+  unsigned char            chan_num;         /* for 3940/3985, channel number */
+  unsigned char            unpause;          /* unpause value for HCNTRL */
+  unsigned char            pause;            /* pause value for HCNTRL */
   unsigned char            qcntmask;
+  struct seeprom_config    seeprom;
   struct Scsi_Host        *next;             /* allow for multiple IRQs */
   struct aic7xxx_scb       scb_array[AIC7XXX_MAXSCB];  /* active commands */
-  struct aic7xxx_scb      *free_scb;         /* list of free SCBs */
-  struct aic7xxx_scb      *aborted_scb;       /* list of aborted SCBs */
+  struct aic7xxx_scb      *pagedout_ntscbs[16];  /*
+                                                  * paged-out, non-tagged scbs
+                                                  * indexed by target.
+                                                  */
+  scb_queue_type           free_scbs;        /*
+                                              * SCBs assigned to free slot on
+                                              * card (no paging required)
+                                              */
+  scb_queue_type           page_scbs;        /*
+                                              * SCBs that will require paging
+                                              * before use (no assigned slot)
+                                              */
+  scb_queue_type           waiting_scbs;     /*
+                                              * SCBs waiting to be paged and
+                                              * started.
+                                              */
+  scb_queue_type           assigned_scbs;    /*
+                                              * SCBs that were waiting but have
+                                              * have now been assigned a slot
+                                              * by aic7xxx_free_scb
+                                              */
+  struct aic7xxx_cmd_queue {
+    Scsi_Cmnd *head;
+    Scsi_Cmnd *tail;
+  } completeq;
+  struct aic7xxx_device_status {
+    long last_reset;
+#define  DEVICE_SUCCESS                 0x01
+#define  BUS_DEVICE_RESET_PENDING       0x02
+    int  flags;
+    int  commands_sent;
+  } device_status[16];
 #ifdef AIC7XXX_PROC_STATS
   /*
    * Statistics Kept:
@@ -618,16 +697,16 @@
 
 struct aic7xxx_host_config {
   int              irq;        /* IRQ number */
-  int              base;       /* I/O base */
-  int              maxscb;     /* hardware SCBs */
+  int              mbase;      /* memory base address*/
+  int              base;       /* I/O base address*/
+  int              maxhscbs;   /* hardware SCBs */
+  int              maxscbs;    /* max SCBs (including pageable) */
   int              unpause;    /* unpause value for HCNTRL */
   int              pause;      /* pause value for HCNTRL */
   int              scsi_id;    /* host SCSI ID */
   int              scsi_id_b;  /* host SCSI ID B channel for twin cards */
-  int              extended;   /* extended xlate? */
-  int              ultra_enabled;    /* Ultra SCSI speed enabled */
+  unsigned int     flags;      /* used the same as struct aic7xxx_host flags */
   int              chan_num;   /* for 3940/3985, channel number */
-  int              use_defaults;   /* Use default wide/sync settings. */
   unsigned char    busrtime;   /* bus release time */
   unsigned char    bus_speed;  /* bus speed */
   unsigned char    qcntmask;
@@ -652,39 +731,28 @@
   short rate;
   const char *english;
 } aic7xxx_syncrates[] = {
-  {  50,  0x100,  "20.0" },
-  {  62,  0x110,  "16.0" },
-  {  75,  0x120,  "13.4" },
-  { 100,  0x140,  "10.0" },
-  { 100,  0x000,  "10.0" },
-  { 125,  0x010,  "8.0"  },
-  { 150,  0x020,  "6.67" },
-  { 175,  0x030,  "5.7"  },
-  { 200,  0x040,  "5.0"  },
-  { 225,  0x050,  "4.4"  },
-  { 250,  0x060,  "4.0"  },
-  { 275,  0x070,  "3.6"  }
+  {  50,  0x100,  "20.0"  },
+  {  62,  0x110,  "16.0"  },
+  {  75,  0x120,  "13.4"  },
+  { 100,  0x000,  "10.0"  },
+  { 125,  0x010,   "8.0"  },
+  { 150,  0x020,   "6.67" },
+  { 175,  0x030,   "5.7"  },
+  { 200,  0x040,   "5.0"  },
+  { 225,  0x050,   "4.4"  },
+  { 250,  0x060,   "4.0"  },
+  { 275,  0x070,   "3.6"  }
 };
 
 static int num_aic7xxx_syncrates =
     sizeof(aic7xxx_syncrates) / sizeof(aic7xxx_syncrates[0]);
 
 #ifdef CONFIG_PCI
-static int number_of_39xxs = 0;
+static int number_of_3940s = 0;
+static int number_of_3985s = 0;
 #endif CONFIG_PCI
 
 #ifdef AIC7XXX_DEBUG
-static void
-debug(const char *fmt, ...)
-{
-  va_list ap;
-  char buf[256];
-
-  va_start(ap, fmt);
-  vsprintf(buf, fmt, ap);
-  printk(buf);
-  va_end(ap);
-}
 
 static void
 debug_config(struct aic7xxx_host_config *p)
@@ -700,7 +768,7 @@
   scsi_conf = inb(SCSICONF + p->base);
 
   /*
-   * Scale the Data FIFO Threshold and the Bus Release Time; they are
+   * Scale the Data FIFO Threshhold and the Bus Release Time; they are
    * stored in formats compatible for writing to sequencer registers.
    */
   dfthresh = p->bus_speed  >> 6;
@@ -733,6 +801,7 @@
 
     case AIC_7850:
     case AIC_7855:
+    case AIC_7860:
     case AIC_7870:
     case AIC_7871:
     case AIC_7872:
@@ -743,7 +812,8 @@
     case AIC_7882:
     case AIC_7883:
     case AIC_7884:
-      printk("%s%s (PCI-bus):\n", board_names[p->type], BUSW[p->bus_type]);
+      printk("%s%s (PCI-bus), I/O 0x%x, Mem 0x%x:\n", board_names[p->type],
+             BUSW[p->bus_type], p->base, p->mbase);
       break;
 
     default:
@@ -819,11 +889,16 @@
 #endif
 
 #else
-#  define debug(fmt, args...)
 #  define debug_config(x)
 #  define debug_scb(x)
 #endif AIC7XXX_DEBUG
 
+#define TCL_OF_SCB(x)  (((x)->target_channel_lun >> 4) & 0xf),  \
+                       (((x)->target_channel_lun >> 3) & 0x01), \
+                       ((x)->target_channel_lun & 0x07)
+
+#define TARGET_INDEX(x)  ((x)->target | ((x)->channel << 3))
+
 /*
  * XXX - these options apply unilaterally to _all_ 274x/284x/294x
  *       cards in the system. This should be fixed, but then,
@@ -831,7 +906,11 @@
  */
 static unsigned int aic7xxx_extended = 0;    /* extended translation on? */
 static unsigned int aic7xxx_no_reset = 0;    /* no resetting of SCSI bus */
-
+static int aic7xxx_irq_trigger = -1;         /*
+                                              * -1 use board setting
+                                              *  0 use edge triggered
+                                              *  1 use level triggered
+                                              */
 /*+F*************************************************************************
  * Function:
  *   aic7xxx_setup
@@ -853,6 +932,7 @@
   } options[] = {
     { "extended",    &aic7xxx_extended },
     { "no_reset",    &aic7xxx_no_reset },
+    { "irq_trigger", &aic7xxx_irq_trigger },
     { NULL,          NULL }
   };
 
@@ -1072,6 +1152,8 @@
     short period, unsigned char offset, int target, char channel)
 {
   int i;
+  unsigned long ultra_enb_addr;
+  unsigned char ultra_enb, sxfrctl0;
 
   for (i = 0; i < num_aic7xxx_syncrates; i++)
   {
@@ -1081,36 +1163,44 @@
        * Watch out for Ultra speeds when ultra is not enabled and
        * vice-versa.
        */
-      if (p->ultra_enabled)
-      {
-        if (!(aic7xxx_syncrates[i].rate & ULTRA_SXFR))
-        {
-          printk ("aic7xxx: Target %d, channel %c, requests %sMHz transfers, "
-                  "but adapter in Ultra mode can only sync at 7.2MHz or "
-                  "above.\n", target, channel, aic7xxx_syncrates[i].english);
-          break;  /* Use asynchronous transfers. */
-        }
-      }
-      else
+      if (!(p->flags & ULTRA_ENABLED) &&
+          (aic7xxx_syncrates[i].rate & ULTRA_SXFR))
       {
         /*
-         * Check for an Ultra device trying to negotiate an Ultra rate
-         * on an adapter with Ultra mode disabled.
+         * This should only happen if the drive is the first to negotiate
+         * and chooses a high rate.   We'll just move down the table until
+         * we hit a non ultra speed.
          */
-        if (aic7xxx_syncrates[i].rate & ULTRA_SXFR)
-        {
-          /*
-           * This should only happen if the driver is the first to negotiate
-           * and chooses a high rate.  We'll just move down the table until
-           * we hit a non Ultra speed.
-           */
-           continue;
-        }
+        continue;
       }
       *scsirate = (aic7xxx_syncrates[i].rate) | (offset & 0x0F);
-      printk("aic7xxx: Target %d, channel %c, now synchronous at %sMHz, "
-             "offset(0x%x).\n",
-	     target, channel, aic7xxx_syncrates[i].english, offset);
+
+      /*
+       * Ensure Ultra mode is set properly for this target.
+       */
+      ultra_enb_addr = ULTRA_ENB;
+      if ((channel == 'B') || (target > 7))
+      {
+        ultra_enb_addr++;
+      }
+      ultra_enb = inb(p->base + ultra_enb_addr);
+      sxfrctl0 = inb(p->base + SXFRCTL0);
+      if (aic7xxx_syncrates[i].rate & ULTRA_SXFR)
+      {
+        ultra_enb |= 0x01 << (target & 0x07);
+        sxfrctl0 |= ULTRAEN;
+      }
+      else
+      {
+        ultra_enb &= ~(0x01 << (target & 0x07));
+        sxfrctl0 &= ~ULTRAEN;
+      }
+      outb(ultra_enb, p->base + ultra_enb_addr);
+      outb(sxfrctl0, p->base + SXFRCTL0);
+
+      printk("scsi%d: Target %d, channel %c, now synchronous at %sMHz, "
+             "offset %d.\n", p->host_no, target, channel,
+	     aic7xxx_syncrates[i].english, offset);
       return;
     }
   }
@@ -1119,8 +1209,8 @@
    * Default to asynchronous transfer
    */
   *scsirate = 0;
-  printk("aic7xxx: Target %d, channel %c, using asynchronous transfers.\n",
-         target, channel);
+  printk("scsi%d: Target %d, channel %c, using asynchronous transfers.\n",
+         p->host_no, target, channel);
 }
 
 /*+F*************************************************************************
@@ -1133,11 +1223,8 @@
 static inline void
 aic7xxx_putscb(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
 {
-  unsigned char curscb;
   int base = p->base;
 
-  curscb = inb(SCBPTR + base);
-  outb(scb->position, SCBPTR + base);
   outb(SCBAUTO, SCBCNT + base);
 
   /*
@@ -1158,7 +1245,6 @@
   }
 
   outb(0, SCBCNT + base);
-  outb(curscb, SCBPTR + base);
 }
 
 /*+F*************************************************************************
@@ -1183,6 +1269,75 @@
 
 /*+F*************************************************************************
  * Function:
+ *   scbq_init
+ *
+ * Description:
+ *   SCB queue initialization.
+ *
+ *-F*************************************************************************/
+static inline void
+scbq_init(scb_queue_type *queue)
+{
+  queue->head = NULL;
+  queue->tail = NULL;
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   scbq_insert_head
+ *
+ * Description:
+ *   Add an SCB to the head of the list.
+ *
+ *-F*************************************************************************/
+static inline void
+scbq_insert_head(scb_queue_type *queue, struct aic7xxx_scb *scb)
+{
+  scb->q_next = queue->head;
+  queue->head = scb;
+  if (queue->tail == NULL)       /* If list was empty, update tail. */
+    queue->tail = queue->head;
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   scbq_remove_head
+ *
+ * Description:
+ *   Remove an SCB from the head of the list.
+ *
+ *-F*************************************************************************/
+static inline void
+scbq_remove_head(scb_queue_type *queue)
+{
+  if (queue->head != NULL)
+    queue->head = queue->head->q_next;
+  if (queue->head == NULL)       /* If list is now empty, update tail. */
+    queue->tail = NULL;
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   scbq_insert_tail
+ *
+ * Description:
+ *   Add an SCB at the tail of the list.
+ *
+ *-F*************************************************************************/
+static inline void
+scbq_insert_tail(scb_queue_type *queue, struct aic7xxx_scb *scb)
+{
+  scb->q_next = NULL;
+  if (queue->tail != NULL)       /* Add the scb at the end of the list. */
+    queue->tail->q_next = scb;
+
+  queue->tail = scb;             /* Update the tail. */
+  if (queue->head == NULL)       /* If list was empty, update head. */
+    queue->head = queue->tail;
+}
+
+/*+F*************************************************************************
+ * Function:
  *   aic7xxx_match_scb
  *
  * Description:
@@ -1198,8 +1353,8 @@
   char chan = (scb->target_channel_lun & SELBUSB) ? 'B' : 'A';
 
 #ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (match_scb) comparing target/channel %d/%c to scb %d/%c\n",
-          target, channel, targ, chan);
+  printk("aic7xxx: (match_scb) comparing target/channel %d/%c to scb %d/%c\n",
+         target, channel, targ, chan);
 #endif
   if (target == ALL_TARGETS)
   {
@@ -1250,10 +1405,6 @@
   unsigned char active;
   unsigned long active_port = ACTIVE_A + base;
 
-#ifdef 0
-  printk ("aic7xxx: (unbusy_target) target/channel %d/%c\n",
-          target, channel);
-#endif
   if ((target > 0x07) || (channel == 'B'))
   {
     /*
@@ -1269,6 +1420,164 @@
 
 /*+F*************************************************************************
  * Function:
+ *   aic7xxx_allocate_scb
+ *
+ * Description:
+ *   Get a free SCB either from one already assigned to a hardware
+ *   slot, or one that will require an SCB to be paged out before
+ *   use.  If there are none, attempt to allocate a new one.
+ *-F*************************************************************************/
+static struct aic7xxx_scb *
+aic7xxx_allocate_scb(struct aic7xxx_host *p)
+{
+  struct aic7xxx_scb *scbp = NULL;
+  int maxscbs;
+
+  scbp = p->free_scbs.head;
+  if (scbp != NULL)
+  {
+    scbq_remove_head(&p->free_scbs);
+  }
+  else
+  {
+    /*
+     * This should always be NULL if paging is not enabled.
+     */
+    scbp = p->page_scbs.head;
+    if (scbp != NULL)
+    {
+      scbq_remove_head(&p->page_scbs);
+    }
+    else
+    {
+      /*
+       * Set limit the SCB allocation to the maximum number of
+       * hardware SCBs if paging is not enabled; otherwise use
+       * the maximum (255).
+       */
+      if (p->flags & PAGE_ENABLED)
+        maxscbs = p->maxscbs;
+      else
+        maxscbs = p->maxhscbs;
+      if (p->numscbs < maxscbs)
+      {
+        scbp = &(p->scb_array[p->numscbs]);
+        memset(scbp, 0, sizeof(*scbp));
+        scbp->tag = p->numscbs;
+        if (p->numscbs < p->maxhscbs)
+	  scbp->position = p->numscbs;
+        else
+	  scbp->position = SCB_LIST_NULL;
+        p->numscbs++;
+      }
+    }
+  }
+  if (scbp != NULL)
+  {
+#ifdef AIC7XXX_DEBUG
+    p->activescbs++;
+#endif
+  }
+  return (scbp);
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   aic7xxx_queue_cmd_complete
+ *
+ * Description:
+ *   Due to race conditions present in the SCSI subsystem, it is easier
+ *   to queue completed commands, then call scsi_done() on them when
+ *   we're finished.  This function queues the completed commands.
+ *-F*************************************************************************/
+static inline void
+aic7xxx_queue_cmd_complete(struct aic7xxx_host *p, Scsi_Cmnd *cmd)
+{
+  if (p->completeq.tail == NULL)
+    p->completeq.head = cmd;
+  else
+    p->completeq.tail->host_scribble = (char *) cmd;
+  p->completeq.tail = cmd;
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   aic7xxx_done_cmds_complete
+ *
+ * Description:
+ *   Process the completed command queue.
+ *-F*************************************************************************/
+static inline void
+aic7xxx_done_cmds_complete(struct aic7xxx_host *p)
+{
+  Scsi_Cmnd *cmd;
+
+  while (p->completeq.head != NULL)
+  {
+    cmd = p->completeq.head;
+    p->completeq.head = (Scsi_Cmnd *)cmd->host_scribble;
+    cmd->host_scribble = NULL;
+    cmd->scsi_done(cmd);
+  }
+  p->completeq.tail = NULL;
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   aic7xxx_free_scb
+ *
+ * Description:
+ *   Free the scb and update the page, waiting, free scb lists.
+ *-F*************************************************************************/
+static void
+aic7xxx_free_scb(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
+{
+  struct aic7xxx_scb *wscb;
+
+  scb->state = SCB_FREE;
+  scb->cmd = NULL;
+  scb->control = 0;
+  scb->state = 0;
+
+  if (scb->position == SCB_LIST_NULL)
+  {
+    scbq_insert_head(&p->page_scbs, scb);
+  }
+  else
+  {
+    /*
+     * If there are any SCBS on the waiting queue, assign the slot of this
+     * "freed" SCB to the first one.  We'll run the waiting queues after
+     * all command completes for a particular interrupt are completed or
+     * when we start another command.
+     */
+    wscb = p->waiting_scbs.head;
+    if (wscb != NULL)
+    {
+      scbq_remove_head(&p->waiting_scbs);
+      wscb->position = scb->position;
+      scbq_insert_tail(&p->assigned_scbs, wscb);
+      wscb->state = (wscb->state & ~SCB_WAITINGQ) | SCB_ASSIGNEDQ;
+
+      /* 
+       * The "freed" SCB will need to be assigned a slot before being
+       * used, so put it in the page_scbs queue.
+       */
+      scb->position = SCB_LIST_NULL;
+      scbq_insert_head(&p->page_scbs, scb);
+    }
+    else
+    {
+      scbq_insert_head(&p->free_scbs, scb);
+    }
+#ifdef AIC7XXX_DEBUG
+    p->activescbs--;  /* For debugging purposes. */
+#endif
+  }
+}
+
+/*+F*************************************************************************
+ * Function:
  *   aic7xxx_done
  *
  * Description:
@@ -1277,31 +1586,11 @@
 static void
 aic7xxx_done(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
 {
-  long flags;
   Scsi_Cmnd *cmd = scb->cmd;
 
-#ifdef 0
-  printk ("aic7xxx: (done) target/channel %d/%d\n",
-          cmd->target, cmd->channel);
-#endif
-  /*
-   * This is a critical section, since we don't want the
-   * queue routine mucking with the host data.
-   */
-  save_flags(flags);
-  cli();
-
-  /*
-   * Process the command after marking the scb as free
-   * and adding it to the free list.
-   */
-  scb->state = SCB_FREE;
-  scb->next = p->free_scb;
-  p->free_scb = scb;
-  scb->cmd = NULL;
+  aic7xxx_free_scb(p, scb);
+  aic7xxx_queue_cmd_complete(p, cmd);
 
-  restore_flags(flags);
-  cmd->scsi_done(cmd);
 }
 
 /*+F*************************************************************************
@@ -1313,49 +1602,31 @@
  *   aborted list, and adds each scb to the free list.
  *-F*************************************************************************/
 static void
-aic7xxx_done_aborted_scbs (struct aic7xxx_host *p)
+aic7xxx_done_aborted_scbs(struct aic7xxx_host *p)
 {
   Scsi_Cmnd *cmd;
   struct aic7xxx_scb *scb;
   int i;
 
-#ifdef AIC7XXX_DEBUG_ABORT
-  int scb_aborted = 0;
-  printk("aic7xxx: (done_aborted_scbs) calling scsi_done() for aborted scbs\n");
-#endif
-
-  for (i = 0; i < p->numscb; i++)
+  for (i = 0; i < p->numscbs; i++)
   {
     scb = &(p->scb_array[i]);
     if (scb->state & SCB_QUEUED_FOR_DONE)
     {
 #ifdef AIC7XXX_DEBUG_ABORT
-      if (scb_aborted == 0)
-      {
-        printk("aic7xxx: (done_aborted_scbs) Aborting scb %d", scb->position);
-        scb_aborted++;
-      }
-      else
-      {
-        printk(", %d", scb->position);
-      }
+      printk("aic7xxx: (done_aborted_scbs) Aborting scb %d, TCL=%d/%d/%d\n",
+      scb->position, TCL_OF_SCB(scb));
 #endif
       /*
        * Process the command after marking the scb as free
        * and adding it to the free list.
        */
-      scb->state = SCB_FREE;
-      scb->next = p->free_scb;
-      p->free_scb = scb;
       cmd = scb->cmd;
-      scb->cmd = NULL;
+      p->device_status[TARGET_INDEX(cmd)].flags = 0;
+      aic7xxx_free_scb(p, scb);
       cmd->scsi_done(cmd);  /* call the done function */
     }
   }
-#ifdef AIC7XXX_DEBUG_ABORT
-  if (scb_aborted != 0)
-    printk("\n");
-#endif
 }
 
 /*+F*************************************************************************
@@ -1375,7 +1646,7 @@
   next = inb(WAITING_SCBH + base);
 
   outb(scb->position, SCBPTR + base);
-  outb(next, SCB_NEXT_WAITING + base);
+  outb(next, SCB_NEXT + base);
   outb(scb->position, WAITING_SCBH + base);
 
   outb(curscb, SCBPTR + base);
@@ -1391,7 +1662,7 @@
  *-F*************************************************************************/
 static unsigned char
 aic7xxx_abort_waiting_scb(struct aic7xxx_host *p, struct aic7xxx_scb *scb,
-    unsigned char prev, unsigned char timedout_scb)
+    unsigned char prev)
 {
   unsigned char curscb, next;
   int target = (scb->target_channel_lun >> 4) & 0x0F;
@@ -1403,13 +1674,13 @@
    */
   curscb = inb(SCBPTR + base);
   outb(scb->position, SCBPTR + base);
-  next = inb(SCB_NEXT_WAITING + base);
+  next = inb(SCB_NEXT + base);
 
   /*
    * Clear the necessary fields
    */
   outb(0, SCB_CONTROL + base);
-  outb(SCB_LIST_NULL, SCB_NEXT_WAITING + base);
+  outb(SCB_LIST_NULL, SCB_NEXT + base);
   aic7xxx_unbusy_target(target, channel, base);
 
   /*
@@ -1428,7 +1699,7 @@
      * Select the scb that pointed to us and update its next pointer.
      */
     outb(prev, SCBPTR + base);
-    outb(next, SCB_NEXT_WAITING + base);
+    outb(next, SCB_NEXT + base);
   }
   /*
    * Point us back at the original scb position and inform the SCSI
@@ -1438,10 +1709,6 @@
   scb->state |= SCB_ABORTED | SCB_QUEUED_FOR_DONE;
   scb->cmd->result = (DID_RESET << 16);
 
-#ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (abort_waiting_scb) target/channel %d/%c, prev %d, "
-          "to_scb %d, next %d\n", target, channel, prev, timedout_scb, next);
-#endif
   return (next);
 }
 
@@ -1454,8 +1721,7 @@
  *   all active and queued scbs for that target/channel.
  *-F*************************************************************************/
 static int
-aic7xxx_reset_device(struct aic7xxx_host *p, int target, char channel,
-    unsigned char timedout_scb)
+aic7xxx_reset_device(struct aic7xxx_host *p, int target, char channel)
 {
   int base = p->base;
   struct aic7xxx_scb *scb;
@@ -1469,36 +1735,33 @@
   active_scb = inb(SCBPTR + base);
 
 #ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (reset_device) target/channel %d/%c, to_scb %d, "
-          "active_scb %d\n", target, channel, timedout_scb, active_scb);
+  printk("aic7xxx: (reset_device) target/channel %d/%c, active_scb %d\n",
+         target, channel, active_scb);
 #endif
   /*
    * Search the QINFIFO.
    */
   {
     int saved_queue[AIC7XXX_MAXSCB];
-    int queued = inb(QINCNT + base);
+    int queued = inb(QINCNT + base) & p->qcntmask;
 
-#ifdef AIC7XXX_DEBUG_ABORT
-    if (queued)
-      printk ("aic7xxx: (reset_device) found %d SCBs in queue\n", queued);
-#endif
     for (i = 0; i < (queued - found); i++)
     {
       saved_queue[i] = inb(QINFIFO + base);
-      scb = &(p->scb_array[saved_queue[i]]);
+      outb(saved_queue[i], SCBPTR + base);
+      scb = &(p->scb_array[inb(SCB_TAG + base)]);
       if (aic7xxx_match_scb(scb, target, channel))
       {
         /*
          * We found an scb that needs to be aborted.
          */
 #ifdef AIC7XXX_DEBUG_ABORT
-        printk ("aic7xxx: (reset_device) aborting SCB %d\n", saved_queue[i]);
+        printk("aic7xxx: (reset_device) aborting SCB %d, TCL=%d/%d/%d\n",
+               saved_queue[i], TCL_OF_SCB(scb));
 #endif
         scb->state |= SCB_ABORTED | SCB_QUEUED_FOR_DONE;
         scb->cmd->result = (DID_RESET << 16);
-        outb(scb->position, SCBPTR + base);
-        outb(0, SCBARRAY + base);
+        outb(0, SCB_CONTROL + base);
         i--;
         found++;
       }
@@ -1521,25 +1784,22 @@
     next = inb(WAITING_SCBH + base);  /* Start at head of list. */
     prev = SCB_LIST_NULL;
 
-#ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (reset_device) Searching waiting SCBs, head %d\n", next);
-#endif
     while (next != SCB_LIST_NULL)
     {
-      scb = &(p->scb_array[next]);
+      outb(next, SCBPTR + base);
+      scb = &(p->scb_array[inb(SCB_TAG + base)]);
       /*
        * Select the SCB.
        */
       if (aic7xxx_match_scb(scb, target, channel))
       {
-        next = aic7xxx_abort_waiting_scb(p, scb, prev, timedout_scb);
+        next = aic7xxx_abort_waiting_scb(p, scb, prev);
         found++;
       }
       else
       {
-        outb(scb->position, SCBPTR + base);
         prev = next;
-        next = inb(SCB_NEXT_WAITING + base);
+        next = inb(SCB_NEXT + base);
       }
     }
   }
@@ -1549,7 +1809,7 @@
    * for this target that are active.  These are other (most likely
    * tagged) commands that were disconnected when the reset occurred.
    */
-  for (i = 0; i < p->numscb; i++)
+  for (i = 0; i < p->numscbs; i++)
   {
     scb = &(p->scb_array[i]);
     if ((scb->state & SCB_ACTIVE) && aic7xxx_match_scb(scb, target, channel))
@@ -1557,12 +1817,12 @@
       /*
        * Ensure the target is "free"
        */
-#ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (reset_device) freeing disconnected SCB %d\n", i);
-#endif
       aic7xxx_unbusy_target(target, channel, base);
-      outb(scb->position, SCBPTR + base);
-      outb(0, SCBARRAY + base);
+      if (! (scb->state & SCB_PAGED_OUT))
+      {
+        outb(scb->position, SCBPTR + base);
+        outb(0, SCB_CONTROL + base);
+      }
       scb->state |= SCB_ABORTED | SCB_QUEUED_FOR_DONE;
       scb->cmd->result = (DID_RESET << 16);
       found++;
@@ -1583,9 +1843,6 @@
 static void
 aic7xxx_reset_current_bus(int base)
 {
-#ifdef AIC7XXX_DEBUG_ABORT
-    printk ("aic7xxx: (reset_current_bus)\n");
-#endif
   outb(SCSIRSTO, SCSISEQ + base);
   udelay(1000);
   outb(0, SCSISEQ + base);
@@ -1599,8 +1856,7 @@
  *   Reset the channel.
  *-F*************************************************************************/
 static int
-aic7xxx_reset_channel(struct aic7xxx_host *p, char channel,
-    unsigned char timedout_scb, int initiate_reset)
+aic7xxx_reset_channel(struct aic7xxx_host *p, char channel, int initiate_reset)
 {
   int base = p->base;
   unsigned char sblkctl;
@@ -1608,15 +1864,11 @@
   unsigned long offset, offset_max;
   int found;
 
-#ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (reset_channel) channel %c, to_scb %d\n",
-          channel, timedout_scb);
-#endif
   /*
    * Clean up all the state information for the
    * pending transactions on this bus.
    */
-  found = aic7xxx_reset_device(p, ALL_TARGETS, channel, timedout_scb);
+  found = aic7xxx_reset_device(p, ALL_TARGETS, channel);
 
   if (channel == 'B')
   {
@@ -1673,8 +1925,8 @@
   if (cur_channel != channel)
   {
 #ifdef AIC7XXX_DEBUG_ABORT
-    printk ("aic7xxx: (reset_channel) Stealthily resetting channel %c\n",
-            channel);
+    printk("aic7xxx: (reset_channel) Stealthily resetting channel %c\n",
+           channel);
 #endif
     /*
      * Stealthily reset the other bus without upsetting the current bus
@@ -1684,10 +1936,6 @@
     {
       aic7xxx_reset_current_bus(base);
     }
-
-    /*
-     * Ensure we don't get a RSTI interrupt from this.
-     */
     outb(CLRSCSIRSTI | CLRSELTIMEO, CLRSINT1 + base);
     outb(CLRSCSIINT, CLRINT + base);
     outb(sblkctl, SBLKCTL + base);
@@ -1700,29 +1948,25 @@
   else
   {
 #ifdef AIC7XXX_DEBUG_ABORT
-    printk ("aic7xxx: (reset_channel) Resetting current channel %c\n",
-            channel);
+    printk("aic7xxx: (reset_channel) Resetting current channel %c\n",
+           channel);
 #endif
     if (initiate_reset)
     {
       aic7xxx_reset_current_bus(base);
     }
-    /*
-     * Ensure we don't get a RSTI interrupt from this.
-     */
     outb(CLRSCSIRSTI | CLRSELTIMEO, CLRSINT1 + base);
     outb(CLRSCSIINT, CLRINT + base);
-
     RESTART_SEQUENCER(p);
 #ifdef AIC7XXX_DEBUG_ABORT
-    printk ("aic7xxx: (reset_channel) Channel reset, sequencer restarted\n");
+    printk("aic7xxx: (reset_channel) Channel reset, sequencer restarted\n");
 #endif
   }
 
   /*
-   * Set the time of last reset.
+   * Delay by the bus settle time.
    */
-  p->host->last_reset = jiffies;
+  aic7xxx_delay(AIC7XXX_RESET_DELAY);
 
   /*
    * Now loop through all the SCBs that have been marked for abortion,
@@ -1734,74 +1978,217 @@
 
 /*+F*************************************************************************
  * Function:
- *   aic7xxx_isr
+ *   aic7xxx_page_scb
  *
  * Description:
- *   SCSI controller interrupt handler.
+ *   Swap in_scbp for out_scbp down in the cards SCB array.
+ *   We assume that the SCB for out_scbp is already selected in SCBPTR.
  *
- *   NOTE: Since we declared this using SA_INTERRUPT, interrupts should
- *         be disabled all through this function unless we say otherwise.
  *-F*************************************************************************/
-static void
-aic7xxx_isr(int irq, void *dev_id, struct pt_regs * regs)
+static inline void
+aic7xxx_page_scb(struct aic7xxx_host *p, struct aic7xxx_scb *out_scbp,
+    struct aic7xxx_scb *in_scbp)
+{
+  int index;
+
+  /* Page-out */
+#if 0
+printk("aic7xxx: Paging out target %d SCB and paging in target %d SCB\n",
+       out_scbp->cmd->target, in_scbp->cmd->target);
+#endif
+  aic7xxx_getscb(p, out_scbp);
+  out_scbp->state |= SCB_PAGED_OUT;
+  if (!(out_scbp->control & TAG_ENB))
+  {
+    /* Stick in non-tagged array */
+    index = (out_scbp->target_channel_lun >> 4) | 
+            (out_scbp->target_channel_lun & SELBUSB);
+    p->pagedout_ntscbs[index] = out_scbp;
+  }
+
+  /* Page-in */
+  in_scbp->position = out_scbp->position;
+  out_scbp->position = SCB_LIST_NULL;
+  aic7xxx_putscb(p, in_scbp);
+  in_scbp->state &= ~SCB_PAGED_OUT;
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   aic7xxx_run_waiting_queues
+ *
+ * Description:
+ *   Scan the assigned_scbs and waiting_scbs queues.  For scbs in the
+ *   assigned_scbs queue, we download and start them.  For scbs in the
+ *   waiting_scbs queue, we page in as many as we can being careful
+ *   not to cause a deadlock for a reconnecting target.
+ *
+ *-F*************************************************************************/
+static inline void
+aic7xxx_run_waiting_queues(struct aic7xxx_host *p)
 {
-  int base, intstat;
-  struct aic7xxx_host *p;
   struct aic7xxx_scb *scb;
-  unsigned char ha_flags;
-  short         transfer;
-  unsigned char scsi_id, bus_width;
-  unsigned char offset, rate, scratch, scratch_offset;
-  unsigned char max_offset, rej_byte;
-  unsigned short target_mask;
-  char channel;
-  void *addr;
-  int actual;
-  int scb_index;
-  Scsi_Cmnd *cmd;
+  u_char cur_scb;
+  u_long base = p->base;
+  long flags;
 
-  p = (struct aic7xxx_host *) aic7xxx_boards[irq]->hostdata;
+  if ((p->assigned_scbs.head == NULL) && (p->waiting_scbs.head == NULL))
+    return;
+
+  save_flags(flags);
+  cli();
+
+  PAUSE_SEQUENCER(p);
+  cur_scb = inb(SCBPTR + base);
 
   /*
-   * Search for the host with a pending interrupt.  If we can't find
-   * one, then we've encountered a spurious interrupt.
+   * First handle SCBs that are waiting but have been assigned a slot.
    */
-  while ((p != NULL) && !(inb(INTSTAT + p->base) & INT_PEND))
+  scb = p->assigned_scbs.head;
+  while (scb != NULL)
   {
-    if (p->next == NULL)
+    scbq_remove_head(&(p->assigned_scbs));
+    outb(scb->position, SCBPTR + base);
+    aic7xxx_putscb(p, scb);
+    /* Mark this as an active command. */
+    scb->state = (scb->state & ~SCB_ASSIGNEDQ) | SCB_ACTIVE;
+    outb(scb->position, QINFIFO + base);
+    scb = p->assigned_scbs.head;
+  }
+
+  /* Now deal with SCBs that require paging. */
+  scb = p->waiting_scbs.head;
+  if (scb != NULL)
+  {
+    u_char disc_scb = inb(DISCONNECTED_SCBH + base);
+    u_char active = inb(FLAGS + base) & (SELECTED | IDENTIFY_SEEN);
+    int count = 0;
+    u_char next_scb;
+
+    while (scb != NULL)
     {
-      p = NULL;
+      /* Attempt to page this SCB in */
+      if (disc_scb == SCB_LIST_NULL)
+        break;
+
+      /*
+       * Advance disc_scb to the next one in the list.
+       */
+      outb(disc_scb, SCBPTR + base);
+      next_scb = inb(SCB_NEXT + base); 
+
+      /*
+       * We have to be careful about when we allow an SCB to be paged out. 
+       * There must always be at least one slot availible for a reconnecting
+       * target in case it references an SCB that has been paged out.  Our
+       * heuristic is that either the disconnected list has at least two
+       * entries in it or there is one entry and the sequencer is activily
+       * working on an SCB which implies that it will either complete or
+       * disconnect before another reconnection can occur.
+       */
+      if ((next_scb != SCB_LIST_NULL) || active)
+      {
+        u_char out_scbi;
+        struct aic7xxx_scb *out_scbp;
+
+        scbq_remove_head(&(p->waiting_scbs));
+
+        /*
+         * Find the in-core SCB for the one we're paging out.
+         */
+        out_scbi = inb(SCB_TAG + base); 
+        out_scbp = &(p->scb_array[out_scbi]);
+
+        /* Do the page out and mark the paged in SCB as active. */
+        aic7xxx_page_scb(p, out_scbp, scb);
+
+        /* Mark this as an active command. */
+        scb->state = (scb->state & ~SCB_WAITINGQ) | SCB_ACTIVE;
+
+        /* Queue the command */
+        outb(scb->position, QINFIFO + base);
+        count++;
+
+        /* Advance to the next disconnected SCB */
+        disc_scb = next_scb;
+        scb = p->waiting_scbs.head;
+      }
+      else
+        scb = NULL;
     }
-    else
+
+    if (count)
     {
-      p = (struct aic7xxx_host *) p->next->hostdata;
+      /* 
+       * Update the head of the disconnected list.
+       */
+      outb(disc_scb, DISCONNECTED_SCBH + base);
+      if (disc_scb != SCB_LIST_NULL)
+      {
+        outb(disc_scb, SCBPTR + base);
+        outb(SCB_LIST_NULL, SCB_PREV + base);
+      }
     }
   }
+  /* Restore old position */
+  outb(cur_scb, SCBPTR + base);
+  UNPAUSE_SEQUENCER(p);
 
-  if (p == NULL)
+  restore_flags(flags);
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   aic7xxx_isr
+ *
+ * Description:
+ *   SCSI controller interrupt handler.
+ *
+ *   NOTE: Since we declared this using SA_INTERRUPT, interrupts should
+ *         be disabled all through this function unless we say otherwise.
+ *-F*************************************************************************/
+static void
+aic7xxx_isr(int irq, void *dev_id, struct pt_regs *regs)
+{
+  int base, intstat, actual, scb_index, run_aborted_queue = FALSE;
+  struct aic7xxx_host *p;
+  struct aic7xxx_scb *scb = NULL;
+  short         transfer;
+  unsigned char ha_flags, scsi_id, bus_width;
+  unsigned char offset, rate, scratch, scratch_offset;
+  unsigned char max_offset, rej_byte;
+  unsigned short target_mask;
+  char channel;
+  void *addr;
+  Scsi_Cmnd *cmd;
+
+  p = (struct aic7xxx_host *) aic7xxx_boards[irq]->hostdata;
+
+  /*
+   * Search for the host with a pending interrupt.  If we can't find
+   * one, then we've encountered a spurious interrupt.
+   */
+  while ((p != NULL) && !(inb(INTSTAT + p->base) & INT_PEND))
   {
-    if (aic7xxx_spurious_count == 1)
+    if (p->next == NULL)
     {
-      aic7xxx_spurious_count = 2;
-      printk("aic7xxx: (aic7xxx_isr) Encountered spurious interrupt.\n");
-      return;
+      p = NULL;
     }
     else
     {
-      /*
-       * The best we can do is to set p back to head of list and process
-       * the erroneous interrupt - most likely a BRKADRINT.
-       */
-      p = (struct aic7xxx_host *) aic7xxx_boards[irq]->hostdata;
+      p = (struct aic7xxx_host *) p->next->hostdata;
     }
   }
 
+  if (p == NULL)
+    return;
+
   /*
    * Keep track of interrupts for /proc/scsi
    */
   p->isr_count++;
 
-  if (!p->a_scanned && (p->isr_count == 1))
+  if (!(p->flags & A_SCANNED) && (p->isr_count == 1))
   {
     /*
      * We must only have one card at this IRQ and it must have been
@@ -1820,21 +2207,26 @@
    */
   intstat = inb(INTSTAT + base);
 
+  /*
+   * Indicate that we're in the interrupt handler.
+   */
+  p->flags |= IN_ISR;
+
   if (intstat & BRKADRINT)
   {
     int i;
     unsigned char errno = inb(ERROR + base);
 
-    printk("aic7xxx: (aic7xxx_isr) BRKADRINT error(0x%x):\n", errno);
+    printk(KERN_ERR "scsi%d: BRKADRINT error(0x%x):\n", p->host_no, errno);
     for (i = 0; i < NUMBER(hard_error); i++)
     {
       if (errno & hard_error[i].errno)
       {
-	printk("  %s\n", hard_error[i].errmesg);
+        printk(KERN_ERR "  %s\n", hard_error[i].errmesg);
       }
     }
-    panic("aic7xxx: (aic7xxx_isr) BRKADRINT, error(0x%x) seqaddr(0x%x).\n",
-	  inb(ERROR + base), (inb(SEQADDR1 + base) << 8) | inb(SEQADDR0 + base));
+    panic("scsi%d: BRKADRINT, error 0x%x, seqaddr 0x%x.\n", p->host_no,
+          inb(ERROR + base), (inb(SEQADDR1 + base) << 8) | inb(SEQADDR0 + base));
   }
 
   if (intstat & SEQINT)
@@ -1858,43 +2250,234 @@
 
     switch (intstat & SEQINT_MASK)
     {
+      case NO_MATCH:
+    	if (p->flags & PAGE_ENABLED)
+        {
+    	  /* SCB Page-in request */
+    	  struct aic7xxx_scb *outscb;
+    	  u_char arg_1 = inb(ARG_1 + base);
+          int use_disconnected = FALSE;
+
+          /*
+           * The sequencer expects this value upon return.  Assume
+           * we will find the paged out SCB and set the value now.
+           * If we don't, and one of the methods used to acquire an
+           * SCB calls aic7xxx_done(), we will end up in our queue
+           * routine and unpause the sequencer without giving it the
+           * correct return value, which causes a hang.
+           */
+    	  outb(SCB_PAGEDIN, RETURN_1 + base);
+    	  if (arg_1 == SCB_LIST_NULL)
+          {
+    	    /* Non-tagged command */
+    	    int index = scsi_id;
+            if (channel == 'B')
+            {
+              index |= SELBUSB;
+            }
+    	    scb = p->pagedout_ntscbs[index];
+    	  }
+    	  else
+    	    scb = &(p->scb_array[arg_1]);
+
+          if (!(scb->state & SCB_PAGED_OUT))
+          {
+  	    printk(KERN_WARNING "scsi%d: No active paged-out SCB for reconnecting "
+  	  	  "target %d, channel %c - Issuing ABORT. SAVED_TCL(0x%x).\n",
+    		  p->host_no, scsi_id, channel, inb(SAVED_TCL + base));
+    	    aic7xxx_unbusy_target(scsi_id, channel, base);
+  	    outb(CLRSELTIMEO, CLRSINT1 + base);
+            outb(0, RETURN_1 + base);
+            break;
+          }
+
+    	  /*
+    	   * Now to pick the SCB to page out.  Either take a free SCB, an
+           * assigned SCB, an SCB that just completed, or the first one
+           * on the disconnected SCB list.
+    	   */
+    	  if (p->free_scbs.head != NULL)
+          {
+    	    outscb = p->free_scbs.head;
+    	    scbq_remove_head(&p->free_scbs);
+    	    scb->position = outscb->position;
+    	    outscb->position = SCB_LIST_NULL;
+    	    scbq_insert_head(&p->page_scbs, outscb);
+    	    outb(scb->position, SCBPTR + base);
+    	    aic7xxx_putscb(p, scb);
+    	    scb->state &= ~SCB_PAGED_OUT;
+    	  }
+    	  else if (p->assigned_scbs.head != NULL)
+          {
+            outscb = p->assigned_scbs.head;
+            scbq_remove_head(&p->assigned_scbs);
+            scb->position = outscb->position;
+            outscb->position = SCB_LIST_NULL;
+            scbq_insert_head(&p->waiting_scbs, outscb);
+            outscb->state = (outscb->state & ~SCB_ASSIGNEDQ) | SCB_WAITINGQ;
+            outb(scb->position, SCBPTR + base);
+    	    aic7xxx_putscb(p, scb);
+            scb->state &= ~SCB_PAGED_OUT;
+          }
+          else if (intstat & CMDCMPLT)
+          {
+            int scb_index;
+
+            outb(CLRCMDINT, CLRINT + base);
+            scb_index = inb(QOUTFIFO + base);
+            if (!(inb(QOUTCNT + base) & p->qcntmask))
+            {
+              intstat &= ~CMDCMPLT;
+            }
+            outscb = &(p->scb_array[scb_index]);
+            if (!(outscb->state & SCB_ACTIVE))
+            {
+	      printk(KERN_WARNING "scsi%d: No command for completed SCB %d "
+	             "during NO_MATCH interrupt\n", scb_index, p->host_no);
+              use_disconnected = TRUE;
+            }
+            else
+            {
+              scb->position = outscb->position;
+              outscb->position = SCB_LIST_NULL;
+              outb(scb->position, SCBPTR + base);
+              aic7xxx_putscb(p, scb);
+              scb->state &= ~SCB_PAGED_OUT;
+              outscb->cmd->result |= (aic7xxx_error(outscb->cmd) << 16);
+              if ((outscb->cmd->flags & WAS_SENSE) && 
+                 !(outscb->cmd->flags & ASKED_FOR_SENSE))
+              {
+                /*
+                 * Got sense information.
+                 */
+	        outscb->cmd->flags &= ASKED_FOR_SENSE;
+              }
+              p->device_status[TARGET_INDEX(outscb->cmd)].flags
+                |= DEVICE_SUCCESS;
+              aic7xxx_done(p, outscb);
+            }
+          }
+          else
+          {
+            use_disconnected = TRUE;
+          }
+          if (use_disconnected)
+          {
+    	    u_char tag;
+    	    u_char next;
+    	    u_char disc_scb = inb(DISCONNECTED_SCBH + base);
+    	    if (disc_scb != SCB_LIST_NULL)
+            {
+    	      outb(disc_scb, SCBPTR + base);
+    	      tag = inb(SCB_TAG + base);
+    	      outscb = &(p->scb_array[tag]);
+    	      next = inb(SCB_NEXT + base);
+    	      if (next != SCB_LIST_NULL)
+              {
+    	        outb(next, SCBPTR + base);
+    	        outb(SCB_LIST_NULL, SCB_PREV + base);
+    	        outb(disc_scb, SCBPTR + base);
+    	      }
+    	      outb(next, DISCONNECTED_SCBH + base);
+    	      aic7xxx_page_scb(p, outscb, scb);
+    	    }
+            else if (inb(QINCNT + base) & p->qcntmask)
+            {
+              /* Pull one of our queued commands as a last resort. */
+              disc_scb = inb(QINFIFO + base);
+              outb(disc_scb, SCBPTR + base);
+              tag = inb(SCB_TAG + base);
+              outscb = &p->scb_array[tag];
+              if ((outscb->control & 0x23) != TAG_ENB)
+              {
+                /*
+                 * This is not a simple tagged command so its position
+                 * in the queue matters.  Take the command at the end of
+                 * the queue instead.
+                 */
+                int i;
+                int saved_queue[AIC7XXX_MAXSCB];
+                int queued = inb(QINCNT + base) & p->qcntmask;
+
+                /* Count the command we removed already */
+                saved_queue[0] = disc_scb;
+                queued++;
+
+                /* Empty the input queue. */
+                for (i = 1; i < queued; i++)
+                {
+                  saved_queue[i] = inb(QINFIFO + base);
+                }
+
+                /* Put everyone back but the last entry. */
+                queued--;
+                for (i = 0; i < queued; i++)
+                {
+                  outb(saved_queue[i], QINFIFO + base);
+                }
+
+                outb(saved_queue[queued], SCBPTR + base);
+                tag = inb(SCB_TAG + base);
+                outscb = &p->scb_array[tag];
+              }
+              scb->position = outscb->position;
+              outscb->position = SCB_LIST_NULL;
+              scbq_insert_head(&p->waiting_scbs, outscb);
+              outscb->state |= SCB_WAITINGQ;
+              aic7xxx_putscb(p, scb);
+              scb->state &= ~SCB_PAGED_OUT;
+            }
+            else
+            {
+  	      printk(KERN_WARNING "scsi%d: Page-in request with no candidates "
+  	  	    "target %d, channel %c - Issuing ABORT. SAVED_TCL(0x%x).\n",
+    		    p->host_no, scsi_id, channel, inb(SAVED_TCL + base));
+              aic7xxx_unbusy_target(scsi_id, channel, base);
+              outb(CLRSELTIMEO, CLRSINT1 + base);
+              outb(0, RETURN_1 + base);
+            }
+          }
+    	}
+    	else
+        {
+  	  printk(KERN_WARNING "scsi%d: No active SCB for reconnecting "
+  	  	"target %d, channel %c - Issuing ABORT. SAVED_TCL(0x%x).\n",
+    		p->host_no, scsi_id, channel, inb(SAVED_TCL + base));
+    	  aic7xxx_unbusy_target(scsi_id, channel, base);
+    	  outb(0, SCB_CONTROL + base);
+  	  outb(CLRSELTIMEO, CLRSINT1 + base);
+          outb(0, RETURN_1 + base);
+        }
+  	break;
+
       case BAD_PHASE:
-	panic("aic7xxx: (aic7xxx_isr) Unknown scsi bus phase.\n");
+	panic("scsi%d: Unknown scsi bus phase.\n", p->host_no);
 	break;
 
       case SEND_REJECT:
         rej_byte = inb(REJBYTE + base);
         if ((rej_byte & 0xF0) == 0x20)
         {
-          scb_index = inb(SCBPTR + base);
+          scb_index = inb(SCB_TAG + base);
           scb = &(p->scb_array[scb_index]);
-          printk("aic7xxx: Warning - Tagged message received without identify."
+          printk(KERN_WARNING "scsi%d: Tagged message received without identify."
                  "Disabling tagged commands for target %d channel %c.\n",
-                  scsi_id, channel);
+                  p->host_no, scsi_id, channel);
           scb->cmd->device->tagged_supported = 0;
           scb->cmd->device->tagged_queue = 0;
         }
         else
         {
-          debug("aic7xxx: Warning - Rejecting unknown message (0x%x) received "
-                "from target %d channel %c.\n", rej_byte, scsi_id, channel);
+          printk(KERN_WARNING "scsi%d: Rejecting unknown message (0x%x) received "
+                 "from target %d channel %c.\n",
+                 p->host_no, rej_byte, scsi_id, channel);
         }
 	break;
 
       case NO_IDENT:
-	panic("aic7xxx: Target %d, channel %c, did not send an IDENTIFY "
-	      "message. SAVED_TCL(0x%x).\n",
-              scsi_id, channel, inb(SAVED_TCL + base));
-	break;
-
-      case NO_MATCH:
-	printk("aic7xxx: No active SCB for reconnecting target %d, "
-	      "channel %c - Issuing ABORT. SAVED_TCL(0x%x).\n",
-              scsi_id, channel, inb(SAVED_TCL + base));
-        aic7xxx_unbusy_target(scsi_id, channel, base);
-        outb(0, SCBARRAY + base);
-	outb(CLRSELTIMEO, CLRSINT1 + base);
-	RESTART_SEQUENCER(p);
+	panic("scsi%d: Target %d, channel %c, did not send an IDENTIFY "
+	      "message. SAVED_TCL 0x%x.\n",
+              p->host_no, scsi_id, channel, inb(SAVED_TCL + base));
 	break;
 
       case SDTR_MSG:
@@ -1967,8 +2550,8 @@
       case WDTR_MSG:
       {
 	bus_width = inb(ARG_1 + base);
-	printk("aic7xxx: Received MSG_WDTR, Target %d, channel %c "
-	       "needwdtr(0x%x).\n", scsi_id, channel, p->needwdtr);
+	printk(KERN_INFO "scsi%d: Received MSG_WDTR, Target %d, channel %c "
+	       "needwdtr(0x%x).\n", p->host_no, scsi_id, channel, p->needwdtr);
 	scratch = inb(TARG_SCRATCH + base + scratch_offset);
 
 	if (p->wdtr_pending & target_mask)
@@ -1984,15 +2567,15 @@
 	      break;
 
 	    case BUS_16_BIT:
-	      printk("aic7xxx: Target %d, channel %c, using 16 bit "
-                     "transfers.\n", scsi_id, channel);
+	      printk(KERN_INFO "scsi%d: Target %d, channel %c, using 16 bit "
+                     "transfers.\n", p->host_no, scsi_id, channel);
 	      scratch |= 0x80;
 	      break;
 
 	    case BUS_32_BIT:
 	      outb(SEND_REJ, RETURN_1 + base);
-	      printk("aic7xxx: Target %d, channel %c, requesting 32 bit "
-                     "transfers, rejecting...\n", scsi_id, channel);
+	      printk(KERN_INFO "scsi%d: Target %d, channel %c, requesting 32 bit "
+                     "transfers, rejecting...\n", p->host_no, scsi_id, channel);
 	      break;
 	  }
 	}
@@ -2001,7 +2584,7 @@
 	  /*
 	   * Send our own WDTR in reply.
 	   */
-	  printk("aic7xxx: Will send WDTR!!\n");
+	  printk(KERN_INFO "scsi%d: Will send WDTR!!\n", p->host_no);
 	  switch (bus_width)
 	  {
 	    case BUS_8_BIT:
@@ -2016,8 +2599,8 @@
 	      /* Yes, we mean to fall thru here. */
 
 	    case BUS_16_BIT:
-	      printk("aic7xxx: Target %d, channel %c, using 16 bit "
-                     "transfers.\n", scsi_id, channel);
+	      printk(KERN_INFO "scsi%d: Target %d, channel %c, using 16 bit "
+                     "transfers.\n", p->host_no, scsi_id, channel);
 	      scratch |= 0x80;
 	      break;
 	  }
@@ -2049,8 +2632,9 @@
 	  scratch &= 0x7F;
 	  p->needwdtr &= ~target_mask;
 	  p->wdtr_pending &= ~target_mask;
-	  printk("aic7xxx: Target %d, channel %c, refusing WIDE negotiation. "
-                 "Using 8 bit transfers.\n", scsi_id, channel);
+	  printk(KERN_WARNING "scsi%d: Target %d, channel %c, refusing WIDE "
+                 "negotiation; using 8 bit transfers.\n",
+                 p->host_no, scsi_id, channel);
 	}
 	else
 	{
@@ -2062,9 +2646,9 @@
 	    scratch &= 0xF0;
 	    p->needsdtr &= ~target_mask;
 	    p->sdtr_pending &= ~target_mask;
-	    printk("aic7xxx: Target %d, channel %c, refusing synchronous "
-                   "negotiation. Using asynchronous transfers.\n",
-                   scsi_id, channel);
+	    printk(KERN_WARNING "scsi%d: Target %d, channel %c, refusing "
+                   "synchronous negotiation; using asynchronous transfers.\n",
+                   p->host_no, scsi_id, channel);
 	  }
 	  /*
 	   * Otherwise, we ignore it.
@@ -2076,19 +2660,25 @@
       }
 
       case BAD_STATUS:
-	scb_index = inb(SCBPTR + base);
+        /* The sequencer will notify us when a command has an error that
+         * would be of interest to the kernel.  This allows us to leave
+         * the sequencerrunning in the common case of command completes
+         * without error.
+         */
+
+	scb_index = inb(SCB_TAG + base);
 	scb = &(p->scb_array[scb_index]);
 	outb(0, RETURN_1 + base);   /* CHECK_CONDITION may change this */
 	if (!(scb->state & SCB_ACTIVE) || (scb->cmd == NULL))
 	{
-	  printk("aic7xxx: Referenced SCB not valid during SEQINT(0x%x) "
-		 "scb(%d) state(0x%x) cmd(0x%x).\n",
+	  printk(KERN_WARNING "scsi%d: Referenced SCB not valid during "
+		 "SEQINT 0x%x, scb %d, state 0x%x, cmd 0x%x.\n", p->host_no,
 		 intstat, scb_index, scb->state, (unsigned int) scb->cmd);
 	}
 	else
 	{
 	  cmd = scb->cmd;
-	  aic7xxx_getscb(p, scb);
+          scb->target_status = inb(SCB_TARGET_STATUS + base);
 	  aic7xxx_status(cmd) = scb->target_status;
 
 	  cmd->result |= scb->target_status;
@@ -2096,14 +2686,13 @@
 	  switch (status_byte(scb->target_status))
 	  {
 	    case GOOD:
-              printk("aic7xxx: Interrupted for status of GOOD???\n");
+              printk(KERN_WARNING "aic7xxx: Interrupted for status of GOOD???\n");
 	      break;
 
 	    case CHECK_CONDITION:
 	      if ((aic7xxx_error(cmd) == 0) && !(cmd->flags & WAS_SENSE))
 	      {
                 unsigned char tcl;
-                unsigned char control;
 		void         *req_buf;
 
                 tcl = scb->target_channel_lun;
@@ -2122,10 +2711,8 @@
 		scb->sense_sg.length = sizeof(cmd->sense_buffer);
 		req_buf = &scb->sense_sg;
 		cmd->cmd_len = COMMAND_SIZE(cmd->cmnd[0]);
-                control = scb->control;
 
-		memset(scb, 0, SCB_PIO_TRANSFER_SIZE);
-                scb->control = control & DISCENB;
+                scb->control = scb->control & DISCENB;
 		scb->target_channel_lun = tcl;
 		addr = scb->sense_cmd;
 		scb->SCSI_cmd_length = COMMAND_SIZE(scb->sense_cmd[0]);
@@ -2138,7 +2725,6 @@
 		memcpy(scb->data_pointer, &(scb->sense_sg.address), 4);
 
                 aic7xxx_putscb(p, scb);
-		outb(SCB_LIST_NULL, SCB_NEXT_WAITING + base);
                 /*
                  * Ensure that the target is "BUSY" so we don't get overlapping
                  * commands if we happen to be doing tagged I/O.
@@ -2159,7 +2745,8 @@
 	      break;
 
 	    case BUSY:
-	      printk("aic7xxx: Target busy.\n");
+	      printk(KERN_WARNING "scsi%d: Target busy, TCL=0x%x.\n",
+                     p->host_no, scb->target_channel_lun);
 	      if (!aic7xxx_error(cmd))
 	      {
 		aic7xxx_error(cmd) = DID_BUS_BUSY;
@@ -2167,16 +2754,14 @@
 	      break;
 
 	    case QUEUE_FULL:
-	      printk("aic7xxx: Queue full.\n");
-	      if (!aic7xxx_error(cmd))
-	      {
-		aic7xxx_error(cmd) = DID_RETRY_COMMAND;
-	      }
+	      printk(KERN_WARNING "scsi%d: Queue full.\n", p->host_no);
+              scb->state |= SCB_ASSIGNEDQ;
+              scbq_insert_tail(&p->assigned_scbs, scb);
 	      break;
 
 	    default:
-	      printk("aic7xxx: Unexpected target status(0x%x).\n",
-		     scb->target_status);
+	      printk(KERN_WARNING "scsi%d: Unexpected target status 0x%x.\n",
+		     p->host_no, scb->target_status);
 	      if (!aic7xxx_error(cmd))
 	      {
 		aic7xxx_error(cmd) = DID_RETRY_COMMAND;
@@ -2187,12 +2772,12 @@
 	break;
 
       case RESIDUAL:
-	scb_index = inb(SCBPTR + base);
+	scb_index = inb(SCB_TAG + base);
 	scb = &(p->scb_array[scb_index]);
 	if (!(scb->state & SCB_ACTIVE) || (scb->cmd == NULL))
 	{
-	  printk("aic7xxx: Referenced SCB not valid during SEQINT(0x%x) "
-		 "scb(%d) state(0x%x) cmd(0x%x).\n",
+	  printk(KERN_WARNING "scsi%d: Referenced SCB not valid during "
+		 "SEQINT 0x%x, scb %d, state 0x%x, cmd 0x%x.\n", p->host_no,
 		 intstat, scb_index, scb->state, (unsigned int) scb->cmd);
 	}
 	else
@@ -2218,9 +2803,9 @@
 
 	    if (actual < cmd->underflow)
 	    {
-	      printk("aic7xxx: Target %d underflow - "
-		     "Wanted (at least) (%u) got(%u) count(%d).\n",
-		     cmd->target, cmd->underflow, actual,
+	      printk(KERN_WARNING "scsi%d: Target %d underflow - "
+		     "Wanted at least %u, got %u, residual SG count %d.\n",
+		     p->host_no, cmd->target, cmd->underflow, actual,
                      inb(SCB_RESID_SGCNT + base));
 	      aic7xxx_error(cmd) = DID_RETRY_COMMAND;
 	      aic7xxx_status(cmd) = scb->target_status;
@@ -2230,12 +2815,12 @@
 	break;
 
       case ABORT_TAG:
-	scb_index = inb(SCBPTR + base);
+	scb_index = inb(SCB_TAG + base);
 	scb = &(p->scb_array[scb_index]);
 	if (!(scb->state & SCB_ACTIVE) || (scb->cmd == NULL))
 	{
-	  printk("aic7xxx: Referenced SCB not valid during SEQINT(0x%x) "
-		 "scb(%d) state(0x%x) cmd(0x%x)\n",
+	  printk(KERN_WARNING "scsi%d: Referenced SCB not valid during "
+		 "SEQINT 0x%x, scb %d, state 0x%x, cmd 0x%x\n", p->host_no,
 		 intstat, scb_index, scb->state, (unsigned int) scb->cmd);
 	}
 	else
@@ -2245,8 +2830,8 @@
 	   * We didn't receive a valid tag back from the target
 	   * on a reconnect.
 	   */
-	  printk("aic7xxx: Invalid tag received on target %d, channel %c, "
-                 "lun %d - Sending ABORT_TAG.\n",
+	  printk("scsi%d: Invalid tag received on target %d, channel %c, "
+                 "lun %d - Sending ABORT_TAG.\n", p->host_no,
 		  scsi_id, channel, cmd->lun & 0x07);
 
 	  cmd->result = (DID_RETRY_COMMAND << 16);
@@ -2255,12 +2840,12 @@
 	break;
 
       case AWAITING_MSG:
-	scb_index = inb(SCBPTR + base);
+	scb_index = inb(SCB_TAG + base);
 	scb = &(p->scb_array[scb_index]);
 	if (!(scb->state & SCB_ACTIVE) || (scb->cmd == NULL))
 	{
-	  printk("aic7xxx: Referenced SCB not valid during SEQINT(0x%x) "
-		 "scb(%d) state(0x%x) cmd(0x%x).\n",
+	  printk(KERN_WARNING "scsi%d: Referenced SCB not valid during "
+		 "SEQINT 0x%x, scb %d, state 0x%x, cmd 0x%x.\n", p->host_no,
 		 intstat, scb_index, scb->state, (unsigned int) scb->cmd);
 	}
 	else
@@ -2281,18 +2866,18 @@
 	   }
 	   else
 	   {
-	     panic("aic7xxx: AWAITING_SCB for an SCB that does "
-		   "not have a waiting message.\n");
+	     panic("scsi%d: AWAITING_SCB for an SCB that does "
+		   "not have a waiting message.\n", p->host_no);
 	   }
 	}
 	break;
 
       case IMMEDDONE:
-        scb_index = inb(SCBPTR + base);
+        scb_index = inb(SCB_TAG + base);
 	scb = &(p->scb_array[scb_index]);
 #ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (isr) received IMMEDDONE for target %d, scb %d, state %d\n",
-          scsi_id, scb_index, scb->state);
+  printk("aic7xxx: received IMMEDDONE for target %d, scb %d, state %d\n",
+         scsi_id, scb_index, scb->state);
 #endif
         if (scb->state & SCB_DEVICE_RESET)
         {
@@ -2309,15 +2894,33 @@
           scratch = inb(TARG_SCRATCH + base + scratch_offset);
           scratch &= SXFR;
           outb(scratch, TARG_SCRATCH + base + scratch_offset);
-          found = aic7xxx_reset_device(p, (int) scsi_id, channel, SCB_LIST_NULL);
-          aic7xxx_done_aborted_scbs (p);
+          found = aic7xxx_reset_device(p, (int) scsi_id, channel);
+          printk(KERN_INFO "scsi%d: Bus Device Reset delivered, %d SCBs "
+                 "aborted.\n", p->host_no, found);
+          /* Indicate that we want to call aic7xxx_done_aborted_scbs() */
+          run_aborted_queue = TRUE;
         }
         else
         {
-          panic("aic7xxx: Immediate complete for unknown operation.\n");
+          panic("scsi%d: Immediate complete for unknown operation.\n",
+                p->host_no);
         }
         break;
 
+      case DATA_OVERRUN:
+      {
+        unsigned int overrun;
+
+        scb = &p->scb_array[inb(base + SCB_TAG)];
+        overrun = inb(base + STCNT0) | (inb(base + STCNT1) << 8) |
+                  (inb(base + STCNT2) << 16);
+        overrun =0x00FFFFFF - overrun;
+        printk(KERN_WARNING "scsi%d: data overrun of %d bytes detected; forcing "
+               "a retry.\n", p->host_no, overrun);
+        aic7xxx_error(scb->cmd) = DID_RETRY_COMMAND;
+        break;
+      }
+
 #if AIC7XXX_NOT_YET
       /* XXX Fill these in later */
       case MESG_BUFFER_BUSY:
@@ -2327,8 +2930,8 @@
 #endif
 
       default:               /* unknown */
-	debug("aic7xxx: SEQINT, INTSTAT(0x%x) SCSISIGI(0x%x).\n",
-	      intstat, inb(SCSISIGI + base));
+	printk(KERN_WARNING "scsi%d: SEQINT, INTSTAT 0x%x, SCSISIGI 0x%x.\n",
+	       p->host_no, intstat, inb(SCSISIGI + base));
 	break;
     }
 
@@ -2349,11 +2952,23 @@
       channel = 'B';
     }
 
-    scb_index = inb(SCBPTR + base);
+    scb_index = inb(SCB_TAG + base);
     scb = &(p->scb_array[scb_index]);
-    if (!(scb->state & SCB_ACTIVE) || (scb->cmd == NULL))
+    if (status & SCSIRSTI)
+    {
+      PAUSE_SEQUENCER(p);
+      printk(KERN_WARNING "scsi%d: SCSIINT - Someone reset channel %c.\n",
+             p->host_no, channel);
+      /*
+       * Go through and abort all commands for the channel, but do not
+       * reset the channel again.
+       */
+      aic7xxx_reset_channel(p, channel, FALSE);
+      run_aborted_queue = TRUE;
+    }
+    else if (!(scb->state & SCB_ACTIVE) || (scb->cmd == NULL))
     {
-      printk("aic7xxx: No command for SCB (SCSIINT).\n");
+      printk(KERN_WARNING "scsi%d: SCSIINT - No command for SCB.\n", p->host_no);
       /*
        * Turn off the interrupt and set status to zero, so that it
        * falls through the rest of the SCSIINT code.
@@ -2363,16 +2978,6 @@
       outb(CLRSCSIINT, CLRINT + base);
       scb = NULL;
     }
-    else if (status & SCSIRSTI)
-    {
-      PAUSE_SEQUENCER(p);
-      printk ("aic7xxx: Someone reset channel %c (SCSIINT).\n", channel);
-      /*
-       * Go through and abort all commands for the channel, but do not
-       * reset the channel again.
-       */
-      aic7xxx_reset_channel (p, channel, SCB_LIST_NULL, FALSE);
-    }
     else if (status & SCSIPERR)
     {
       char  *phase;
@@ -2412,8 +3017,8 @@
        * A parity error has occurred during a data
        * transfer phase. Flag it and continue.
        */
-      printk("aic7xxx: Parity error during phase %s on target %d, "
-             "channel %d, lun %d.\n", phase,
+      printk(KERN_WARNING "scsi%d: Parity error during phase %s on target %d, "
+             "channel %d, lun %d.\n", p->host_no, phase,
              cmd->target, cmd->channel & 0x01, cmd->lun & 0x07);
 
       /*
@@ -2424,16 +3029,16 @@
        */
       if (mesg_out != MSG_NOP)
       {
-         outb(mesg_out, MSG0 + base);
-         outb(1, MSG_LEN + base);
-         cmd->result = DID_PARITY << 16;
+        outb(mesg_out, MSG0 + base);
+        outb(1, MSG_LEN + base);
+        cmd->result = DID_PARITY << 16;
       }
       else
       {
-         /*
-          * Should we allow the target to make this decision for us?
-          */
-         cmd->result = DID_RETRY_COMMAND << 16;
+        /*
+         * Should we allow the target to make this decision for us?
+         */
+        cmd->result = DID_RETRY_COMMAND << 16;
       }
       aic7xxx_done(p, scb);
     }
@@ -2443,11 +3048,6 @@
 
       cmd = scb->cmd;
 
-     /*
-       * Hardware selection timer has expired. Turn
-       * off SCSI selection sequence.
-       */
-      outb(ENRSELI, SCSISEQ + base);
       cmd->result = (DID_TIME_OUT << 16);
       /*
        * Clear an pending messages for the timed out
@@ -2456,26 +3056,12 @@
       ha_flags = inb(FLAGS + base);
       outb(0, MSG_LEN + base);
       aic7xxx_unbusy_target(scsi_id, channel, base);
-
-      outb(0, SCBARRAY + base);
-
       /*
-       * Shut off the offending interrupt sources, reset
-       * the sequencer address to zero and unpause it,
-       * then call the high-level SCSI completion routine.
-       *
-       * WARNING!  This is a magic sequence!  After many
-       * hours of guesswork, turning off the SCSI interrupts
-       * in CLRSINT? does NOT clear the SCSIINT bit in
-       * INTSTAT. By writing to the (undocumented, unused
-       * according to the AIC-7770 manual) third bit of
-       * CLRINT, you can clear INTSTAT. But, if you do it
-       * while the sequencer is paused, you get a BRKADRINT
-       * with an Illegal Host Address status, so the
-       * sequencer has to be restarted first.
+       * Stop the selection.
        */
+      outb(0, SCSISEQ + base);
+      outb(0, SCB_CONTROL + base);
       outb(CLRSELTIMEO, CLRSINT1 + base);
-
       outb(CLRSCSIINT, CLRINT + base);
 
       /*
@@ -2483,15 +3069,11 @@
        */
       waiting = inb(WAITING_SCBH + base);
       outb(waiting, SCBPTR + base);
-      waiting = inb(SCB_NEXT_WAITING + base);
+      waiting = inb(SCB_NEXT + base);
       outb(waiting, WAITING_SCBH + base);
 
       RESTART_SEQUENCER(p);
       aic7xxx_done(p, scb);
-#if 0
-printk("aic7xxx: SELTO SCB(%d) state(0x%x) cmd(0x%x).\n",
-       scb->position, scb->state, (unsigned int) scb->cmd);
-#endif
     }
     else if (!(status & BUSFREE))
     {
@@ -2499,13 +3081,16 @@
        * We don't know what's going on. Turn off the
        * interrupt source and try to continue.
        */
-      printk("aic7xxx: SSTAT1(0x%x).\n", status);
+      printk(KERN_WARNING "aic7xxx: SSTAT1(0x%x).\n", status);
       outb(status, CLRSINT1 + base);
       UNPAUSE_SEQUENCER(p);
       outb(CLRSCSIINT, CLRINT + base);
     }
   }
 
+  if (run_aborted_queue)
+    aic7xxx_done_aborted_scbs(p);
+
   if (intstat & CMDCMPLT)
   {
     int complete;
@@ -2521,11 +3106,11 @@
       scb = &(p->scb_array[complete]);
       if (!(scb->state & SCB_ACTIVE) || (scb->cmd == NULL))
       {
-	printk("aic7xxx: Warning - No command for SCB %d (CMDCMPLT).\n"
-	       "         QOUTCNT(%d) QINCNT(%d) SCB state(0x%x) cmd(0x%x) "
-               "pos(%d).\n",
-	       complete, inb(QOUTCNT + base), inb(QINCNT + base),
-	       scb->state, (unsigned int) scb->cmd, scb->position);
+	printk(KERN_WARNING "scsi%d: CMDCMPLT without command for SCB %d.\n"
+	       "       QOUTCNT %d, QINCNT %d, SCB state 0x%x, cmd 0x%x, "
+               "pos(%d).\n", p->host_no, complete, inb(QOUTCNT + base),
+               inb(QINCNT + base), scb->state, (unsigned int) scb->cmd,
+               scb->position);
 	outb(CLRCMDINT, CLRINT + base);
 	continue;
       }
@@ -2538,30 +3123,17 @@
          */
 	cmd->flags &= ASKED_FOR_SENSE;
       }
-#if 0
-      printk("aic7xxx: (complete) State(%d) cmd(0x%x) free(0x%x).\n",
-	     scb->state, (unsigned int) scb->cmd, (unsigned int) p->free_scb);
-#endif
+      p->device_status[TARGET_INDEX(cmd)].flags |= DEVICE_SUCCESS;
 
       /*
-       * Clear interrupt status before checking
-       * the output queue again. This eliminates
-       * a race condition whereby a command could
-       * complete between the queue poll and the
-       * interrupt clearing, so notification of the
-       * command being complete never made it back
-       * up to the kernel.
+       * Clear interrupt status before checking the output queue again.
+       * This eliminates a race condition whereby a command could
+       * complete between the queue poll and the interrupt clearing,
+       * so notification of the command being complete never made it
+       * back up to the kernel.
        */
       outb(CLRCMDINT, CLRINT + base);
       aic7xxx_done(p, scb);
-#if 0
-  if (scb != &p->scb_array[scb->position])
-  {
-    printk("aic7xxx: (complete) Address mismatch, pos(%d).\n", scb->position);
-  }
-  printk("aic7xxx: (complete) State(%d) cmd(0x%x) free(0x%x).\n",
-	 scb->state, (unsigned int) scb->cmd, (unsigned int) p->free_scb);
-#endif
 
 #ifdef AIC7XXX_PROC_STATS
       /*
@@ -2607,6 +3179,67 @@
 
     } while (inb(QOUTCNT + base) & p->qcntmask);
   }
+  aic7xxx_done_cmds_complete(p);
+  p->flags &= ~IN_ISR;
+  aic7xxx_run_waiting_queues(p);
+}
+
+/*+F*************************************************************************
+ * Function:
+ *   aic7xxx_select_queue_depth
+ *
+ * Description:
+ *   Sets the queue depth for each SCSI device hanging off the input
+ *   host adapter.  We use a queue depth of 2 for devices that do not
+ *   support tagged queueing.  If AIC7XXX_CMDS_PER_LUN is defined, we
+ *   use that for tagged queueing devices; otherwise we use our own
+ *   algorithm for determining the queue depth based on the maximum
+ *   SCBs for the controller.
+ *-F*************************************************************************/
+static void aic7xxx_select_queue_depth(struct Scsi_Host *host,
+    Scsi_Device *scsi_devs)
+{
+  Scsi_Device *device = scsi_devs;
+  int tq_depth = 2;
+
+#ifdef AIC7XXX_CMDS_PER_LUN
+  tq_depth = AIC7XXX_CMDS_PER_LUN;
+#else
+  {
+    struct aic7xxx_host *p = (struct aic7xxx_host *) host->hostdata;
+
+    if (p->maxhscbs <= 4)
+    {
+      tq_depth = 4;  /* Not many SCBs to work with. */
+    }
+    else
+    {
+      tq_depth = 8;
+    }
+  }
+#endif
+
+  for (device = scsi_devs; device != NULL; device = device->next)
+  {
+    if (device->host == host)
+    {
+      device->queue_depth = 2;
+#ifdef AIC7XXX_TAGGED_QUEUEING
+      if (device->tagged_supported)
+      {
+        device->queue_depth = tq_depth;
+        if (device->tagged_queue == 0)
+        {
+          printk(KERN_INFO "scsi%d: Enabled tagged queuing for target %d, "
+	         "channel %d, LUN %d, queue depth %d.\n", host->host_no,
+                 device->id, device->channel, device->lun, device->queue_depth);
+          device->tagged_queue = 1;
+          device->current_tag = SCB_LIST_NULL;
+        }
+      }
+#endif
+    }
+  }
 }
 
 /*+F*************************************************************************
@@ -3043,6 +3676,9 @@
   unsigned char sblkctl_reg;
   int base, i;
 
+#ifdef AIC7XXX_PAGE_ENABLE
+  config->flags |= PAGE_ENABLED;
+#endif
   base = config->base;
   switch (config->type)
   {
@@ -3052,8 +3688,9 @@
       /*
        * Check for Rev C or E boards. Rev E boards can supposedly have
        * more than 4 SCBs, while the Rev C boards are limited to 4 SCBs.
-       * Until we know how to access more than 4 SCBs for the Rev E chips,
-       * we limit them, along with the Rev C chips, to 4 SCBs.
+       * It's still not clear extactly what is different about the Rev E
+       * boards, but we think it allows 8 bit entries in the QOUTFIFO to
+       * support "paging" SCBs (more than 4 commands can be active at once).
        *
        * The Rev E boards have a read/write autoflush bit in the
        * SBLKCTL register, while in the Rev C boards it is read only.
@@ -3063,15 +3700,18 @@
       if (inb(SBLKCTL + base) == sblkctl_reg)
       {
         /*
-         * We detected a Rev E board.
+         * We detected a Rev E board, we allow paging on this board.
          */
-        printk("aic7xxx: %s Rev E and subsequent.\n",
+        printk(KERN_INFO "aic7xxx: %s Rev E and subsequent.\n",
                board_names[config->type]);
 	outb(sblkctl_reg ^ AUTOFLUSHDIS, SBLKCTL + base);
       }
       else
       {
-        printk("aic7xxx: %s Rev C and previous.\n", board_names[config->type]);
+        /* Do not allow paging. */
+        config->flags &= ~PAGE_ENABLED;
+        printk(KERN_INFO "aic7xxx: %s Rev C and previous.\n",
+               board_names[config->type]);
       }
       break;
 
@@ -3083,8 +3723,8 @@
    * Walk the SCBs to determine how many there are.
    */
   i = 1;
-  outb (0, SCBPTR + base);
-  outb (0, SCBARRAY + base);
+  outb(0, SCBPTR + base);
+  outb(0, SCBARRAY + base);
 
   while (i < AIC7XXX_MAXSCB)
   {
@@ -3107,11 +3747,23 @@
   outb(0, SCBPTR + base); 
   outb(0, SCBARRAY + base);
 
-  config->maxscb = i;
+  config->maxhscbs = i;
   config->qcntmask |= i;
+  if ((config->flags & PAGE_ENABLED) && (config->maxhscbs < AIC7XXX_MAXSCB))
+  {
+    config->maxscbs = AIC7XXX_MAXSCB;
+  }
+  else
+  {
+    config->flags &= ~PAGE_ENABLED;  /* Disable paging if we have 255 SCBs!. */
+    config->maxscbs = config->maxhscbs;
+  }
 
-  printk("aic7xxx: Using %d SCB's after checking for SCB memory.\n",
-         config->maxscb);
+  printk(KERN_INFO "aic7xxx: Memory check yields %d SCBs", config->maxhscbs);
+  if (config->flags & PAGE_ENABLED)
+    printk(", %d page-enabled SCBs.\n", config->maxscbs);
+  else
+    printk(", paging not enabled.\n");
 
 }
 
@@ -3127,11 +3779,13 @@
     struct aic7xxx_host_config *config)
 {
   int i;
-  unsigned char sblkctl;
+  unsigned char sblkctl, flags = 0;
   int max_targets;
-  int found = 1, base;
+  int found = 1;
+  unsigned int sram, base;
   unsigned char target_settings;
   unsigned char scsi_conf, host_conf;
+  unsigned short ultraenable = 0;
   int have_seeprom = FALSE;
   struct Scsi_Host *host;
   struct aic7xxx_host *p;
@@ -3142,31 +3796,40 @@
   /*
    * Lock out other contenders for our i/o space.
    */
-  request_region(MINREG + base, MAXREG - MINREG, "aic7xxx");
+  request_region(base, MAXREG - MINREG, "aic7xxx");
 
   switch (config->type)
   {
     case AIC_7770:
     case AIC_7771:
       /*
-       * For some 274x boards, we must clear the CHIPRST bit
-       * and pause the sequencer. For some reason, this makes
-       * the driver work. For 284x boards, we give it a
-       * CHIPRST just like the 294x boards.
-       *
-       * Use the BIOS settings to determine the interrupt
-       * trigger type (level or edge) and use this value
-       * for pausing and unpausing the sequencer.
+       * Use the boot-time option for the interrupt trigger type.  If not
+       * supplied (-1), then we use BIOS settings to determine the interrupt
+       * trigger type (level or edge) and use this value for pausing and
+       * unpausing the sequencer.
        */
-      config->unpause = (inb(HCNTRL + base) & IRQMS) | INTEN;
+      switch (aic7xxx_irq_trigger)
+      {
+        case  0: config->unpause = INTEN;          /* Edge */
+                 break;
+        case  1: config->unpause = IRQMS | INTEN;  /* Level */
+                 break;
+        case -1:
+        default: config->unpause = (inb(HCNTRL + base) & IRQMS) | INTEN; 
+                 break;
+      }
       config->pause = config->unpause | PAUSE;
-      config->extended = aic7xxx_extended;
 
+      /*
+       * For some 274x boards, we must clear the CHIPRST bit and pause
+       * the sequencer. For some reason, this makes the driver work.
+       * For 284x boards, we give it a CHIPRST just like the 294x boards.
+       */
       outb(config->pause | CHIPRST, HCNTRL + base);
       aic7xxx_delay(1);
       if (inb(HCNTRL + base) & CHIPRST)
       {
-	printk("aic7xxx: Chip reset not cleared; clearing manually.\n");
+	printk(KERN_INFO "aic7xxx: Chip reset not cleared; clearing manually.\n");
       }
       outb(config->pause, HCNTRL + base);
 
@@ -3179,7 +3842,7 @@
           (inb(HA_274_BIOSCTRL + base) & BIOSMODE) == BIOSDISABLED)
       {
         config->bios = AIC_DISABLED;
-        config->use_defaults = TRUE;
+        config->flags |= USE_DEFAULTS;
       }
       else
       {
@@ -3197,8 +3860,8 @@
       /*
        * A reminder until this can be detected automatically.
        */
-      printk("aic7xxx: Extended translation %sabled.\n",
-	     config->extended ? "en" : "dis");
+      printk(KERN_INFO "aic7xxx: Extended translation %sabled.\n",
+	     (config->flags & EXTENDED_TRANSLATION) ? "en" : "dis");
       break;
 
     case AIC_284x:
@@ -3209,11 +3872,10 @@
       outb(config->pause, HCNTRL + base);
 
       config->parity = AIC_ENABLED;
-      config->extended = aic7xxx_extended;
       config->irq = inb(INTDEF + base) & 0x0F;
       host_conf = inb(HOSTCONF + base);
 
-      printk("aic7xxx: Reading SEEPROM...");
+      printk(KERN_INFO "aic7xxx: Reading SEEPROM...");
       have_seeprom = read_2840_seeprom(base, &sc);
       if (!have_seeprom)
       {
@@ -3222,7 +3884,9 @@
       else
       {
 	printk("done.\n");
-	config->extended = ((sc.bios_control & CF284XEXTEND) >> 5);
+        config->flags |= HAVE_SEEPROM;
+        if (sc.bios_control & CF284XEXTEND)
+          config->flags |= EXTENDED_TRANSLATION;
         if (!(sc.bios_control & CFBIOSEN))
         {
           /*
@@ -3256,10 +3920,23 @@
       outb(config->bus_speed & DFTHRSH, BUSSPD + base);
       outb(config->busrtime, BUSTIME + base);
 
-      printk("aic7xxx: Extended translation %sabled.\n",
-	     config->extended ? "en" : "dis");
+      printk(KERN_INFO "aic7xxx: Extended translation %sabled.\n",
+	     (config->flags & EXTENDED_TRANSLATION) ? "en" : "dis");
       break;
 
+    case AIC_7860:
+    case AIC_7880:
+    case AIC_7881:
+    case AIC_7882:
+    case AIC_7883:
+    case AIC_7884:
+      /*
+       * Remember if Ultra was enabled in case there is no SEEPROM.
+       * Fall through to the rest of the AIC_78xx code.
+       */
+      if (inb(SXFRCTL0 + base) & ULTRAEN)
+        config->flags |= ULTRA_ENABLED;
+
     case AIC_7850:
     case AIC_7855:
     case AIC_7870:
@@ -3267,31 +3944,56 @@
     case AIC_7872:
     case AIC_7873:
     case AIC_7874:
-    case AIC_7880:
-    case AIC_7881:
-    case AIC_7882:
-    case AIC_7883:
-    case AIC_7884:
+      /*
+       * Grab the SCSI ID before chip reset in case there is no SEEPROM.
+       */
+      config->scsi_id = inb(SCSIID + base) & OID;
       outb(CHIPRST, HCNTRL + base);
       config->unpause = UNPAUSE_294X;
       config->pause = config->unpause | PAUSE;
       aic7xxx_delay(1);
       outb(config->pause, HCNTRL + base);
 
-      config->extended = aic7xxx_extended;
-      config->scsi_id = 7;
       config->parity = AIC_ENABLED;
 
-      printk("aic7xxx: Reading SEEPROM...");
+      printk(KERN_INFO "aic7xxx: Reading SEEPROM...");
       have_seeprom = read_seeprom(base, config->chan_num * (sizeof(sc) / 2), &sc);
       if (!have_seeprom)
       {
-	printk("\naic7xxx: Unable to read SEEPROM; "
-               "using leftover BIOS values.\n");
+        for (sram = base + TARG_SCRATCH; sram < base + 0x60; sram++)
+        {
+          if (inb(sram) != 0x00)
+            break;
+        }
+        if (sram == base + TARG_SCRATCH)
+        {
+          for (sram = base + TARG_SCRATCH; sram < base + 0x60; sram++)
+          {
+            if (inb(sram) != 0xFF)
+              break;
+          }
+        }
+        if ((sram != base + 0x60) && (config->scsi_id != 0))
+        {
+          config->flags &= ~USE_DEFAULTS;
+	  printk("\naic7xxx: Unable to read SEEPROM; "
+                 "using leftover BIOS values.\n");
+        }
+        else
+        {
+          printk("\n");
+          printk(KERN_INFO "aic7xxx: Unable to read SEEPROM; using default "
+                 "settings.\n");
+          config->flags |= USE_DEFAULTS;
+          config->flags &= ~ULTRA_ENABLED;
+          config->scsi_id = 7;
+        }
+        scsi_conf = ENSPCHK | RESET_SCSI;
       }
       else
       {
 	printk("done.\n");
+        config->flags |= HAVE_SEEPROM;
         if (!(sc.bios_control & CFBIOSEN))
         {
           /*
@@ -3300,10 +4002,17 @@
            * AIC-7770 case.
            */
           config->bios = AIC_DISABLED;
+          scsi_conf = ENSPCHK | RESET_SCSI;
         }
         else
         {
-	  config->extended = ((sc.bios_control & CFEXTEND) >> 7);
+          scsi_conf = 0;
+          if (sc.adapter_control & CFRESETB)
+            scsi_conf |= RESET_SCSI;
+          if (sc.adapter_control & CFSPARITY)
+            scsi_conf |= ENSPCHK;
+	  if (sc.bios_control & CFEXTEND)
+            config->flags |= EXTENDED_TRANSLATION;
 	  config->scsi_id = (sc.brtime_id & CFSCSIID);
 	  config->parity = (sc.adapter_control & CFSPARITY) ?
 			     AIC_ENABLED : AIC_DISABLED;
@@ -3312,32 +4021,19 @@
 	  config->high_term = (sc.adapter_control & CFWSTERM) ?
 			        AIC_ENABLED : AIC_DISABLED;
 	  config->busrtime = ((sc.brtime_id & CFBRTIME) >> 8);
-          if (((config->type == AIC_7880) || (config->type == AIC_7882) ||
-               (config->type == AIC_7883) || (config->type == AIC_7884)) &&
-              (sc.adapter_control & CFULTRAEN))
+          if (((config->type == AIC_7880) || (config->type == AIC_7881) ||
+               (config->type == AIC_7882) || (config->type == AIC_7883) ||
+               (config->type == AIC_7884)) && (sc.adapter_control & CFULTRAEN))
           {
-            printk ("aic7xxx: Enabling support for Ultra SCSI speed.\n");
-            config->ultra_enabled = TRUE;
+            printk(KERN_INFO "aic7xxx: Enabling support for Ultra SCSI "
+                   "speed.\n");
+            config->flags |= ULTRA_ENABLED;
           }
         }
       }
 
-      /*
-       * XXX - force data fifo threshold to 100%. Why does this
-       *       need to be done?
-       *
-       * We don't know where this is set in the SEEPROM or by the BIOS,
-       * so we default it to 100%.
-       */
+      outb(scsi_conf | (config->scsi_id & 0x07), SCSICONF + base);
       config->bus_speed = DFTHRSH_100;
-      scsi_conf = config->scsi_id | config->bus_speed;
-#if 0
-      if (config->parity == AIC_ENABLED)
-      {
-        scsi_conf |= ENSPCHK;
-      }
-#endif
-      outb(scsi_conf, SCSICONF + base);
       outb(config->bus_speed, DSPCISTATUS + base);
 
       /*
@@ -3345,12 +4041,12 @@
        */
       outb(config->scsi_id, SCSICONF + base + 1);
 
-      printk("aic7xxx: Extended translation %sabled.\n",
-	     config->extended ? "en" : "dis");
+      printk(KERN_INFO "aic7xxx: Extended translation %sabled.\n",
+	     (config->flags & EXTENDED_TRANSLATION) ? "en" : "dis");
       break;
 
     default:
-      panic("aic7xxx: (aic7xxx_register) Internal error.\n");
+      panic(KERN_WARNING "aic7xxx: (aic7xxx_register) Internal error.\n");
   }
 
   detect_maxscb(config);
@@ -3359,11 +4055,11 @@
   {
     if (config->pause & IRQMS)
     {
-      printk("aic7xxx: Using level sensitive interrupts.\n");
+      printk(KERN_INFO "aic7xxx: Using level sensitive interrupts.\n");
     }
     else
     {
-      printk("aic7xxx: Using edge triggered interrupts.\n");
+      printk(KERN_INFO "aic7xxx: Using edge triggered interrupts.\n");
     }
   }
 
@@ -3372,12 +4068,15 @@
    * register in the sequencer for twin and wide bus cards.
    */
   sblkctl = inb(SBLKCTL + base);
+  if (config->flags & PAGE_ENABLED)
+    flags = PAGESCBS;
+
   switch (sblkctl & SELBUS_MASK)
   {
     case SELNARROW:     /* narrow/normal bus */
       config->scsi_id = inb(SCSICONF + base) & 0x07;
       config->bus_type = AIC_SINGLE;
-      outb(SINGLE_BUS, FLAGS + base);
+      outb(flags | SINGLE_BUS, FLAGS + base);
       break;
 
     case SELWIDE:     /* Wide bus */
@@ -3385,7 +4084,7 @@
       config->bus_type = AIC_WIDE;
       printk("aic7xxx: Enabling wide channel of %s-Wide.\n",
 	     board_names[config->type]);
-      outb(WIDE_BUS, FLAGS + base);
+      outb(flags | WIDE_BUS, FLAGS + base);
       break;
 
     case SELBUSB:     /* Twin bus */
@@ -3393,19 +4092,19 @@
 #ifdef AIC7XXX_TWIN_SUPPORT
       config->scsi_id_b = inb(SCSICONF + base + 1) & 0x07;
       config->bus_type = AIC_TWIN;
-      printk("aic7xxx: Enabled channel B of %s-Twin.\n",
+      printk(KERN_INFO "aic7xxx: Enabled channel B of %s-Twin.\n",
 	     board_names[config->type]);
-      outb(TWIN_BUS, FLAGS + base);
+      outb(flags | TWIN_BUS, FLAGS + base);
 #else
       config->bus_type = AIC_SINGLE;
-      printk("aic7xxx: Channel B of %s-Twin will be ignored.\n",
+      printk(KERN_INFO "aic7xxx: Channel B of %s-Twin will be ignored.\n",
 	     board_names[config->type]);
-      outb(0, FLAGS + base);
+      outb(flags, FLAGS + base);
 #endif
       break;
 
     default:
-      printk("aic7xxx: Unsupported type 0x%x, please "
+      printk(KERN_WARNING "aic7xxx: Unsupported type 0x%x, please "
 	     "mail deang@teleport.com\n", inb(SBLKCTL + base));
       outb(0, FLAGS + base);
       return (0);
@@ -3430,26 +4129,12 @@
    */
   if ((config->chip_type == AIC_777x) && ((config->irq < 9) || (config->irq > 15)))
   {
-    printk("aic7xxx: Host adapter uses unsupported IRQ level, ignoring.\n");
+    printk(KERN_WARNING "aic7xxx: Host adapter uses unsupported IRQ level, "
+          "ignoring.\n");
     return (0);
   }
 
   /*
-   * Check the IRQ to see if it is shared by another aic7xxx
-   * controller. If it is and sharing of IRQs is not defined,
-   * then return 0 hosts found. If sharing of IRQs is allowed
-   * or the IRQ is not shared by another host adapter, then
-   * proceed.
-   */
-#ifndef AIC7XXX_SHARE_IRQS
-   if (aic7xxx_boards[config->irq] != NULL)
-   {
-     printk("aic7xxx: Sharing of IRQ's is not configured.\n");
-     return (0);
-   }
-#endif
-
-  /*
    * Print out debugging information before re-enabling
    * the card - a lot of registers on it can't be read
    * when the sequencer is active.
@@ -3469,8 +4154,8 @@
 
     if (SG_STRUCT_CHECK(sg))
     {
-      printk("aic7xxx: Warning - Kernel scatter-gather structures changed, "
-             "disabling it.\n");
+      printk(KERN_WARNING "aic7xxx: Warning - Kernel scatter-gather structures "
+             "changed, disabling it.\n");
       template->sg_tablesize = SG_NONE;
     }
   }
@@ -3484,9 +4169,13 @@
    * information when an IRQ is triggered.
    */
   host = scsi_register(template, sizeof(struct aic7xxx_host));
-  host->can_queue = config->maxscb;
-  host->cmd_per_lun = AIC7XXX_CMDS_PER_LUN;
+  host->can_queue = config->maxscbs;
+  host->cmd_per_lun = 2;
+  host->select_queue_depths = aic7xxx_select_queue_depth;
   host->this_id = config->scsi_id;
+  host->io_port = config->base;
+  host->n_io_port = 0xFF;
+  host->base = (char *)config->mbase;
   host->irq = config->irq;
   if (config->bus_type == AIC_WIDE)
   {
@@ -3500,28 +4189,37 @@
   p = (struct aic7xxx_host *) host->hostdata;
 
   p->host = host;
+  p->host_no = (int)host->host_no;
   p->isr_count = 0;
-  p->a_scanned = FALSE;
-  p->b_scanned = FALSE;
   p->base = base;
-  p->maxscb = config->maxscb;
+  p->maxscbs = config->maxscbs;
+  p->maxhscbs = config->maxhscbs;
   p->qcntmask = config->qcntmask;
-  p->numscb = 0;
-  p->extended = config->extended;
+  p->numscbs = 0;
+  p->mbase = (char *)config->mbase;
   p->type = config->type;
   p->chip_type = config->chip_type;
-  p->ultra_enabled = config->ultra_enabled;
+  p->flags = config->flags;
   p->chan_num = config->chan_num;
   p->bus_type = config->bus_type;
-  p->have_seeprom = have_seeprom;
   p->seeprom = sc;
-  p->free_scb = NULL;
-  p->aborted_scb = NULL;
   p->next = NULL;
+  p->completeq.head = NULL;
+  p->completeq.tail = NULL;
+  scbq_init(&p->free_scbs);
+  scbq_init(&p->page_scbs);
+  scbq_init(&p->waiting_scbs);
+  scbq_init(&p->assigned_scbs);
 
   p->unpause = config->unpause;
   p->pause = config->pause;
 
+  for (i = 0; i <= 15; i++)
+  {
+    p->device_status[i].commands_sent = 0;
+    p->device_status[i].flags = 0;
+    p->device_status[i].last_reset = 0;
+  }
   if (aic7xxx_boards[config->irq] == NULL)
   {
     /*
@@ -3536,9 +4234,11 @@
     /*
      * Register IRQ with the kernel.
      */
-    if (request_irq(config->irq, aic7xxx_isr, SA_INTERRUPT, "aic7xxx", NULL))
+    if (request_irq(config->irq, aic7xxx_isr, SA_INTERRUPT | SA_SHIRQ,
+       "aic7xxx", NULL))
     {
-      printk("aic7xxx: Couldn't register IRQ %d, ignoring.\n", config->irq);
+      printk(KERN_WARNING "aic7xxx: Couldn't register IRQ %d, ignoring.\n",
+             config->irq);
       aic7xxx_boards[config->irq] = NULL;
       return (0);
     }
@@ -3561,7 +4261,7 @@
    * but then your mailing address is dynamically assigned
    * so no one can find you anyway :-)
    */
-  printk("aic7xxx: Downloading sequencer code...");
+  printk(KERN_INFO "aic7xxx: Downloading sequencer code...");
   aic7xxx_loadseq(base);
 
   /*
@@ -3589,8 +4289,12 @@
     outb(config->scsi_id_b, SCSIID + base);
     scsi_conf = inb(SCSICONF + base + 1) & (ENSPCHK | STIMESEL);
     outb(scsi_conf | ENSTIMER | ACTNEGEN | STPWEN, SXFRCTL1 + base);
+#if 1
+    outb(ENSELTIMO | ENSCSIRST | ENSCSIPERR, SIMODE1 + base);
+#else
     outb(ENSELTIMO, SIMODE1 + base);
-    if (p->ultra_enabled)
+#endif
+    if (p->flags & ULTRA_ENABLED)
     {
       outb(DFON | SPIOEN | ULTRAEN, SXFRCTL0 + base);
     }
@@ -3607,8 +4311,12 @@
   outb(config->scsi_id, SCSIID + base);
   scsi_conf = inb(SCSICONF + base) & (ENSPCHK | STIMESEL);
   outb(scsi_conf | ENSTIMER | ACTNEGEN | STPWEN, SXFRCTL1 + base);
+#if 1
+  outb(ENSELTIMO | ENSCSIRST | ENSCSIPERR, SIMODE1 + base);
+#else
   outb(ENSELTIMO, SIMODE1 + base);
-  if (p->ultra_enabled)
+#endif
+  if (p->flags & ULTRA_ENABLED)
   {
     outb(DFON | SPIOEN | ULTRAEN, SXFRCTL0 + base);
   }
@@ -3649,7 +4357,7 @@
   {
     if (config->bios == AIC_DISABLED)
     {
-      printk("aic7xxx : Host adapter BIOS disabled. Using default SCSI "
+      printk(KERN_INFO "aic7xxx : Host adapter BIOS disabled. Using default SCSI "
              "device parameters.\n");
       p->discenable = 0xFFFF;
     }
@@ -3662,29 +4370,29 @@
 
   for (i = 0; i < max_targets; i++)
   {
-    if (have_seeprom)
+    if (config->flags & USE_DEFAULTS)
     {
-      target_settings = ((sc.device_flags[i] & CFXFER) << 4);
-      if (sc.device_flags[i] & CFSYNCH)
+      target_settings = 0;  /* 10 MHz */
+      p->needsdtr_copy |= (0x01 << i);
+      p->needwdtr_copy |= (0x01 << i);
+    }
+    else
+    {
+      if (have_seeprom)
       {
-	p->needsdtr_copy |= (0x01 << i);
-      }
-      if (sc.device_flags[i] & CFWIDEB)
-      {
-	p->needwdtr_copy |= (0x01 << i);
-      }
-      if (sc.device_flags[i] & CFDISC)
-      {
-        p->discenable |= (0x01 << i);
-      }
-    }
-    else
-    {
-      if (config->use_defaults)
-      {
-        target_settings = 0;  /* 10 MHz */
-        p->needsdtr_copy |= (0x01 << i);
-        p->needwdtr_copy |= (0x01 << i);
+  	target_settings = ((sc.device_flags[i] & CFXFER) << 4);
+  	if (sc.device_flags[i] & CFSYNCH)
+  	{
+  	  p->needsdtr_copy |= (0x01 << i);
+  	}
+  	if (sc.device_flags[i] & CFWIDEB)
+  	{
+  	  p->needwdtr_copy |= (0x01 << i);
+  	}
+  	if (sc.device_flags[i] & CFDISC)
+        {
+          p->discenable |= (0x01 << i);
+        }
       }
       else
       {
@@ -3703,6 +4411,22 @@
           target_settings &= 0x7F;
         }
       }
+      if (p->flags & ULTRA_ENABLED)
+      {
+        switch (target_settings & 0x70)
+        {
+          case 0x00:
+          case 0x10:
+          case 0x20:
+            ultraenable |= (0x01 << i);
+            break;
+          case 0x40:
+            target_settings &= ~(0x70);
+            break;
+          default:
+            break;
+        }
+      }
     }
     outb(target_settings, (TARG_SCRATCH + base + i));
   }
@@ -3718,26 +4442,28 @@
   }
   p->needsdtr = p->needsdtr_copy;
   p->needwdtr = p->needwdtr_copy;
+  p->orderedtag = 0;
 #if 0
   printk("NeedSdtr = 0x%x, 0x%x\n", p->needsdtr_copy, p->needsdtr);
   printk("NeedWdtr = 0x%x, 0x%x\n", p->needwdtr_copy, p->needwdtr);
 #endif
+  outb(ultraenable & 0xFF, ULTRA_ENB + base);
+  outb((ultraenable >> 8) & 0xFF, ULTRA_ENB + base + 1);
 
   /*
-   * For reconnecting targets, the sequencer code needs to
-   * know how many SCBs it has to search through.
+   * Set the number of available SCBs.
    */
-  outb(config->maxscb, SCBCOUNT + base);
+  outb(config->maxhscbs, SCBCOUNT + base);
 
   /*
-   * 2s compliment of SCBCOUNT
+   * 2s compliment of maximum tag value.
    */
-  i = p->maxscb;
+  i = p->maxscbs;
   outb(-i & 0xFF, COMP_SCBCOUNT + base);
 
   /*
    * Set the QCNT (queue count) mask to deal with broken aic7850s that
-   * sporadically get garbage in the upper bits of their QCNT registers.
+   * sporatically get garbage in the upper bits of their QCNT registers.
    */
   outb(config->qcntmask, QCNTMASK + base);
 
@@ -3748,9 +4474,10 @@
   outb(0, ACTIVE_B + base);
 
   /*
-   * We don't have any waiting selections
+   * We don't have any waiting selections or disconnected SCBs.
    */
   outb(SCB_LIST_NULL, WAITING_SCBH + base);
+  outb(SCB_LIST_NULL, DISCONNECTED_SCBH + base);
 
   /*
    * Message out buffer starts empty
@@ -3769,7 +4496,6 @@
    * Some devices need a long time to "settle" after a SCSI
    * bus reset.
    */
-
   if (!aic7xxx_no_reset)
   {
     printk("aic7xxx: Resetting the SCSI bus...");
@@ -3784,13 +4510,11 @@
       udelay(1000);
       outb(0, SCSISEQ + base);
 
-      /*
-       * Ensure we don't get a RSTI interrupt from this.
-       */
+      /* Ensure we don't get a RSTI interrupt from this. */
       outb(CLRSCSIRSTI, CLRSINT1 + base);
       outb(CLRSCSIINT, CLRINT + base);
 
-      /*
+     /*
        * Select Channel A.
        */
       outb((sblkctl & ~SELBUS_MASK) | SELNARROW, SBLKCTL + base);
@@ -3800,9 +4524,7 @@
     udelay(1000);
     outb(0, SCSISEQ + base);
 
-    /*
-     * Ensure we don't get a RSTI interrupt from this.
-     */
+    /* Ensure we don't get a RSTI interrupt from this. */
     outb(CLRSCSIRSTI, CLRSINT1 + base);
     outb(CLRSCSIINT, CLRINT + base);
 
@@ -3862,7 +4584,7 @@
   {
     base = SLOTBASE(slot) + MINREG;
 
-    if (check_region(MINREG + base, MAXREG - MINREG))
+    if (check_region(base, MAXREG - MINREG))
     {
       /*
        * Some other driver has staked a
@@ -3886,14 +4608,16 @@
        */
       config.chip_type = AIC_777x;
       config.base = base;
+      config.mbase = 0;
       config.irq = irq;
       config.parity = AIC_ENABLED;
       config.low_term = AIC_UNKNOWN;
       config.high_term = AIC_UNKNOWN;
-      config.ultra_enabled = FALSE;
-      config.extended = aic7xxx_extended;
+      config.flags = 0;
+      if (aic7xxx_extended)
+        config.flags |= EXTENDED_TRANSLATION;
       config.bus_speed = DFTHRSH_100;
-      config.busrtime = BOFF_60BCLKS;
+      config.busrtime = BOFF;
       found += aic7xxx_register(template, &config);
 
       /*
@@ -3918,6 +4642,7 @@
     } const aic7xxx_pci_devices[] = {
       {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7850, AIC_7850, AIC_785x},
       {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7855, AIC_7855, AIC_785x},
+      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7860, AIC_7860, AIC_785x},
       {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7870, AIC_7870, AIC_787x},
       {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7871, AIC_7871, AIC_787x},
       {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7872, AIC_7872, AIC_787x},
@@ -3932,7 +4657,7 @@
 
     int error;
     int done = 0;
-    unsigned int io_port;
+    unsigned int iobase, mbase;
     unsigned short index = 0;
     unsigned char pci_bus, pci_device_fn;
     unsigned int  csize_lattime;
@@ -3949,6 +4674,7 @@
                                 aic7xxx_pci_devices[i].device_id,
                                 index, &pci_bus, &pci_device_fn))
         {
+          index = 0;
           done = TRUE;
         }
         else  /* Found an Adaptec PCI device. */
@@ -3957,34 +4683,31 @@
           config.chip_type = aic7xxx_pci_devices[i].chip_type;
           config.chan_num = 0;
           config.bios = AIC_ENABLED;  /* Assume bios is enabled. */
-          config.use_defaults = FALSE;
+          config.flags = 0;
           config.busrtime = 40;
           switch (config.type)
           {
             case AIC_7850:
             case AIC_7855:
+            case AIC_7860:
               config.bios = AIC_DISABLED;
-              config.use_defaults = TRUE;
+              config.flags |= USE_DEFAULTS;
               config.bus_speed = DFTHRSH_100;
               break;
 
             case AIC_7872:  /* 3940 */
             case AIC_7882:  /* 3940-Ultra */
-              config.chan_num = number_of_39xxs & 0x01;  /* Has 2 controllers */
-              number_of_39xxs++;
-              if (number_of_39xxs == 2)
-              {
-                number_of_39xxs = 0;  /* To be consistent with 3985. */
-              }
+              config.chan_num = number_of_3940s & 0x1;  /* Has 2 controllers */
+              number_of_3940s++;
               break;
 
             case AIC_7873:  /* 3985 */
             case AIC_7883:  /* 3985-Ultra */
-              config.chan_num = number_of_39xxs & 0x03;  /* Has 3 controllers */
-              number_of_39xxs++;
-              if (number_of_39xxs == 3)
+              config.chan_num = number_of_3985s & 0x3;  /* Has 3 controllers */
+              number_of_3985s++;
+              if (number_of_3985s == 3)
               {
-                number_of_39xxs = 0;
+                number_of_3985s = 0;
               }
               break;
 
@@ -3996,43 +4719,32 @@
            * Read sundry information from PCI BIOS.
            */
           error = pcibios_read_config_dword(pci_bus, pci_device_fn,
-                                            PCI_BASE_ADDRESS_0, &io_port);
+                                            PCI_BASE_ADDRESS_0, &iobase);
           error += pcibios_read_config_byte(pci_bus, pci_device_fn,
                                             PCI_INTERRUPT_LINE, &irq);
+          error += pcibios_read_config_dword(pci_bus, pci_device_fn,
+                                            PCI_BASE_ADDRESS_1, &mbase);
 
           /*
-           * Ensure that we are using good values for the PCI burst size
-           * and latency timer.
+           * The first bit of PCI_BASE_ADDRESS_0 is always set, so
+           * we mask it off.
+           */
+          iobase &= PCI_BASE_ADDRESS_IO_MASK;
+
+          /*
+           * Read the PCI burst size and latency timer.
            */
           error += pcibios_read_config_dword(pci_bus, pci_device_fn,
                                              CSIZE_LATTIME, &csize_lattime);
-          if ((csize_lattime & CACHESIZE) == 0)
-          {
-            /*
-             * Default to 8DWDs - what's the PCI define for this?
-             */
-            csize_lattime |= 8;
-          }
-
-          if ((csize_lattime & LATTIME) == 0)
-          {
-            /*
-             * Default to 64 PCLKS (is this a good value?)
-             * This may also be available in the SEEPROM??
-             */
-            csize_lattime |= (64 << 8);
-          }
-          pcibios_write_config_dword(pci_bus, pci_device_fn,
-                                     CSIZE_LATTIME, csize_lattime);
-          printk("aic7xxx: BurstLen = %d DWDs, Latency Timer = %d PCLKS\n",
-                  (int) (csize_lattime & CACHESIZE),
-                  (csize_lattime >> 8) & 0x000000ff);
+          printk(KERN_INFO "aic7xxx: BurstLen = %d DWDs, Latency Timer = %d "
+                 "PCLKS\n", (int) (csize_lattime & CACHESIZE),
+                 (csize_lattime >> 8) & 0x000000ff);
 
           error += pcibios_read_config_dword(pci_bus, pci_device_fn,
                                              CLASS_PROGIF_REVID, &class_revid);
           if ((class_revid & DEVREVID) < 3)
           {
-            printk("aic7xxx: %s Rev %c.\n", board_names[config.type],
+            printk(KERN_INFO "aic7xxx: %s Rev %c.\n", board_names[config.type],
                    rev_id[class_revid & DEVREVID]);
           }
 
@@ -4044,13 +4756,7 @@
                   error);
           }
 
-          printk("aic7xxx: devconfig = 0x%x.\n", devconfig);
-
-          /*
-           * The first bit of PCI_BASE_ADDRESS_0 is always set, so
-           * we mask it off.
-           */
-          base = io_port & 0xFFFFFFFE;
+          printk(KERN_INFO "aic7xxx: devconfig = 0x%x.\n", devconfig);
 
           /*
            * I don't think we need to bother with allowing
@@ -4059,13 +4765,14 @@
            */
           aic7xxx_spurious_count = 1;
 
-          config.base = base;
+          config.base = iobase;
+          config.mbase = mbase;
           config.irq = irq;
           config.parity = AIC_ENABLED;
           config.low_term = AIC_UNKNOWN;
           config.high_term = AIC_UNKNOWN;
-          config.extended = aic7xxx_extended;
-          config.ultra_enabled = FALSE;
+          if (aic7xxx_extended)
+            config.flags |= EXTENDED_TRANSLATION;
           if (devconfig & RAMPSM)
           {
             /*
@@ -4084,7 +4791,8 @@
              * sixteen bits of the register are R/O anyway, so it shouldn't
              * affect RAMPSM either way.
              */
-            printk ("aic7xxx: External RAM detected. Enabling RAM access.\n");
+            printk(KERN_INFO "aic7xxx: External RAM detected; enabling RAM "
+                   "access.\n");
             devconfig &= ~(RAMPSM | SCBRAMSEL);
             pcibios_write_config_dword(pci_bus, pci_device_fn,
                                        DEVCONFIG, devconfig);
@@ -4123,26 +4831,32 @@
   unsigned short mask;
   struct scatterlist *sg;
 
+  mask = (0x01 << TARGET_INDEX(cmd));
   /*
    * Setup the control byte if we need negotiation and have not
    * already requested it.
    */
 #ifdef AIC7XXX_TAGGED_QUEUEING
-  if (cmd->device->tagged_supported)
+  if (cmd->device->tagged_queue)
   {
-    if (cmd->device->tagged_queue == 0)
+    cmd->tag = scb->tag;
+    cmd->device->current_tag = scb->tag;
+    scb->control |= TAG_ENB;
+    p->device_status[TARGET_INDEX(cmd)].commands_sent++;
+    if (p->device_status[TARGET_INDEX(cmd)].commands_sent == 200)
     {
-      printk("aic7xxx: Enabling tagged queuing for target %d, "
-	     "channel %d.\n", cmd->target, cmd->channel);
-      cmd->device->tagged_queue = 1;
-      cmd->device->current_tag = 1;  /* enable tagging */
+      scb->control |= 0x02;
+      p->device_status[TARGET_INDEX(cmd)].commands_sent = 0;
     }
-    cmd->tag = cmd->device->current_tag;
-    cmd->device->current_tag++;
-    scb->control |= TAG_ENB;
+#if 0
+    if (p->orderedtag & mask)
+    {
+      scb->control |= 0x02;
+      p->orderedtag = p->orderedtag & ~mask;
+    }
+#endif
   }
 #endif
-  mask = (0x01 << (cmd->target | (cmd->channel << 3)));
   if (p->discenable & mask)
   {
     scb->control |= DISCENB;
@@ -4247,23 +4961,24 @@
   long flags;
   struct aic7xxx_host *p;
   struct aic7xxx_scb *scb;
+  u_char curscb;
 
   p = (struct aic7xxx_host *) cmd->host->hostdata;
 
   /*
    * Check to see if channel was scanned.
    */
-  if (!p->a_scanned && (cmd->channel == 0))
+  if (!(p->flags & A_SCANNED) && (cmd->channel == 0))
   {
-    printk("aic7xxx: Scanning channel A for devices.\n");
-    p->a_scanned = TRUE;
+    printk(KERN_INFO "scsi%d: Scanning channel A for devices.\n", p->host_no);
+    p->flags |= A_SCANNED;
   }
   else
   {
-    if (!p->b_scanned && (cmd->channel == 1))
+    if (!(p->flags & B_SCANNED) && (cmd->channel == 1))
     {
-      printk("aic7xxx: Scanning channel B for devices.\n");
-      p->b_scanned = TRUE;
+      printk(KERN_INFO "scsi%d: Scanning channel B for devices.\n", p->host_no);
+      p->flags |= B_SCANNED;
     }
   }
 
@@ -4283,109 +4998,98 @@
   save_flags(flags);
   cli();
 
-  /*
-   * Find a free slot in the SCB array to load this command
-   * into. Since can_queue is set to the maximum number of
-   * SCBs for the card, we should always find one.
-   *
-   * First try to find an scb in the free list. If there are
-   * none in the free list, then check the current number of
-   * of scbs and take an unused one from the scb array.
-   */
-  scb = p->free_scb;
-  if (scb != NULL)
-  { /* found one in the free list */
-    p->free_scb = scb->next;   /* remove and update head of list */
-    /*
-     * Warning! For some unknown reason, the scb at the head
-     * of the free list is not the same address that it should
-     * be. That's why we set the scb pointer taken by the
-     * position in the array. The scb at the head of the list
-     * should match this address, but it doesn't.
-     */
-    scb = &(p->scb_array[scb->position]);
-    scb->control = 0;
-    scb->state = SCB_ACTIVE;
+  scb = aic7xxx_allocate_scb(p);
+  if (scb == NULL)
+  {
+    panic("aic7xxx: (aic7xxx_free) Couldn't find a free SCB.\n");
   }
   else
   {
-    if (p->numscb >= p->maxscb)
-    {
-      panic("aic7xxx: (aic7xxx_queue) Couldn't find a free SCB.\n");
-    }
-    else
-    {
-      /*
-       * Initialize the scb within the scb array. The
-       * position within the array is the position on
-       * the board that it will be loaded.
-       */
-      scb = &(p->scb_array[p->numscb]);
-      memset(scb, 0, sizeof(*scb));
-
-      scb->position = p->numscb;
-      p->numscb++;
-      scb->state = SCB_ACTIVE;
-    }
-  }
-
-  scb->cmd = cmd;
-  aic7xxx_position(cmd) = scb->position;
+    scb->cmd = cmd;
+    aic7xxx_position(cmd) = scb->tag;
 #if 0
-  debug_scb(scb);
+    debug_scb(scb);
 #endif;
 
-  /*
-   * Construct the SCB beforehand, so the sequencer is
-   * paused a minimal amount of time.
-   */
-  aic7xxx_buildscb(p, cmd, scb);
+    /*
+     * Construct the SCB beforehand, so the sequencer is
+     * paused a minimal amount of time.
+     */
+    aic7xxx_buildscb(p, cmd, scb);
 
 #if 0
-  if (scb != &p->scb_array[scb->position])
-  {
-    printk("aic7xxx: (queue) Address of SCB by position does not match SCB "
-           "address.\n");
-  }
-  printk("aic7xxx: (queue) SCB pos(%d) cmdptr(0x%x) state(%d) freescb(0x%x)\n",
-	 scb->position, (unsigned int) scb->cmd,
-	 scb->state, (unsigned int) p->free_scb);
+    if (scb != &p->scb_array[scb->position])
+    {
+      printk("aic7xxx: (queue) Address of SCB by position does not match SCB "
+             "address.\n");
+    }
+    printk("aic7xxx: (queue) SCB pos(%d) cmdptr(0x%x) state(%d) freescb(0x%x)\n",
+	   scb->position, (unsigned int) scb->cmd,
+	   scb->state, (unsigned int) p->free_scb);
 #endif
 
-  /*
-   * Make sure the Scsi_Cmnd pointer is saved, the struct it points to
-   * is set up properly, and the parity error flag is reset, then send
-   * the SCB to the sequencer and watch the fun begin.
-   */
-  cmd->scsi_done = fn;
-  aic7xxx_error(cmd) = DID_OK;
-  aic7xxx_status(cmd) = 0;
-  cmd->result = 0;
-  memset(&cmd->sense_buffer, 0, sizeof(cmd->sense_buffer));
+    /*
+     * Make sure the Scsi_Cmnd pointer is saved, the struct it points to
+     * is set up properly, and the parity error flag is reset, then send
+     * the SCB to the sequencer and watch the fun begin.
+     */
+    cmd->scsi_done = fn;
+    aic7xxx_error(cmd) = DID_OK;
+    aic7xxx_status(cmd) = 0;
+    cmd->result = 0;
+    cmd->host_scribble = NULL;
+    memset(&cmd->sense_buffer, 0, sizeof(cmd->sense_buffer));
 
-  /*
-   * Pause the sequencer so we can play with its registers -
-   * wait for it to acknowledge the pause.
-   *
-   * XXX - should the interrupts be left on while doing this?
-   */
-  PAUSE_SEQUENCER(p);
+    if (scb->position != SCB_LIST_NULL)
+    {
+      /* We've got a valid slot, yeah! */
+      if (p->flags & IN_ISR)
+      {
+        scbq_insert_tail(&p->assigned_scbs, scb);
+        scb->state |= SCB_ASSIGNEDQ;
+      }
+      else
+      {
+        /*
+         * Pause the sequencer so we can play with its registers -
+         * wait for it to acknowledge the pause.
+         *
+         * XXX - should the interrupts be left on while doing this?
+         */
+        PAUSE_SEQUENCER(p);
 
-  /*
-   * Save the SCB pointer and put our own pointer in - this
-   * selects one of the four banks of SCB registers. Load
-   * the SCB, then write its pointer into the queue in FIFO
-   * and restore the saved SCB pointer.
-   */
-  aic7xxx_putscb(p, scb);
-  outb(scb->position, QINFIFO + p->base);
+        /*
+         * Save the SCB pointer and put our own pointer in - this
+         * selects one of the four banks of SCB registers. Load
+         * the SCB, then write its pointer into the queue in FIFO
+         * and restore the saved SCB pointer.
+         */
+        curscb = inb(SCBPTR + p->base);
+        outb(scb->position, SCBPTR + p->base);
+        aic7xxx_putscb(p, scb);
+        outb(curscb, SCBPTR + p->base);
+        outb(scb->position, QINFIFO + p->base);
+        scb->state |= SCB_ACTIVE;
+
+        UNPAUSE_SEQUENCER(p);
+      }
+    }
+    else
+    {
+      scb->state |= SCB_WAITINGQ;
+      scbq_insert_tail(&p->waiting_scbs, scb);
+      if (!(p->flags & IN_ISR))
+      {
+        aic7xxx_run_waiting_queues(p);
+      }
+    }
 
-  UNPAUSE_SEQUENCER(p);
 #if 0
-  printk("aic7xxx: (queue) After - cmd(0x%lx) scb->cmd(0x%lx) pos(%d).\n",
-         (long) cmd, (long) scb->cmd, scb->position);
+    printk("aic7xxx: (queue) After - cmd(0x%lx) scb->cmd(0x%lx) pos(%d).\n",
+           (long) cmd, (long) scb->cmd, scb->position);
 #endif;
-  restore_flags(flags);
+    restore_flags(flags);
+  }
   return (0);
 }
 
@@ -4400,201 +5104,208 @@
  *   aborted, then we will reset the channel and have all devices renegotiate.
  *   Returns an enumerated type that indicates the status of the operation.
  *-F*************************************************************************/
-static aha_abort_reset_type
-aic7xxx_abort_reset(Scsi_Cmnd *cmd, unsigned char errcode)
+static int
+aic7xxx_bus_device_reset(struct aic7xxx_host *p, Scsi_Cmnd *cmd)
 {
   struct aic7xxx_scb  *scb;
-  struct aic7xxx_host *p;
   long flags;
   unsigned char bus_state;
-  aha_abort_reset_type scb_status = ABORT_RESET_SUCCESS;
-  int base, found;
+  int base, result = -1;
   char channel;
 
-  p = (struct aic7xxx_host *) cmd->host->hostdata;
   scb = &(p->scb_array[aic7xxx_position(cmd)]);
   base = p->base;
-  channel = scb->target_channel_lun & SELBUSB ? 'B': 'A';
-
-  save_flags(flags);
-  cli();
 
-  if (scb->state & SCB_ACTIVE)
+  channel = scb->target_channel_lun & SELBUSB ? 'B': 'A';
+  if ((cmd == scb->cmd) && (scb->state & SCB_IN_PROGRESS))
   {
-    /*
-     * Ensure that the card doesn't do anything
-     * behind our back.
-     */
-    PAUSE_SEQUENCER(p);
 
-    printk ("aic7xxx: (abort_reset) scb state 0x%x, ", scb->state);
-    bus_state = inb(LASTPHASE + p->base);
-
-    switch (bus_state)
-    {
-      case P_DATAOUT:
-        printk ("Data-Out phase, ");
-        break;
-      case P_DATAIN:
-        printk ("Data-In phase, ");
-        break;
-      case P_COMMAND:
-        printk ("Command phase, ");
-        break;
-      case P_MESGOUT:
-        printk ("Message-Out phase, ");
-        break;
-      case P_STATUS:
-        printk ("Status phase, ");
-        break;
-      case P_MESGIN:
-        printk ("Message-In phase, ");
-        break;
-      default:
-        printk ("while idle, LASTPHASE = 0x%x, ", bus_state);
-        /*
-         * We're not in a valid phase, so assume we're idle.
-         */
-        bus_state = 0;
-        break;
-    }
-    printk ("SCSISIGI = 0x%x\n", inb (p->base + SCSISIGI));
+    save_flags(flags);
+    cli();
 
-    /*
-     * First, determine if we want to do a bus reset or simply a bus device
-     * reset.  If this is the first time that a transaction has timed out,
-     * just schedule a bus device reset.  Otherwise, we reset the bus and
-     * abort all pending I/Os on that bus.
-     */
-    if (scb->state & SCB_ABORTED)
+    if (scb->state & SCB_IN_PROGRESS)
     {
       /*
-       * Been down this road before.  Do a full bus reset.
+       * Ensure that the card doesn't do anything
+       * behind our back.
        */
-      found = aic7xxx_reset_channel(p, channel, scb->position, TRUE);
-    }
-    else
-    {
-      unsigned char active_scb, control;
-      struct aic7xxx_scb *active_scbp;
+      PAUSE_SEQUENCER(p);
 
-      /*
-       * Send a Bus Device Reset Message:
-       * The target we select to send the message to may be entirely
-       * different than the target pointed to by the scb that timed
-       * out.  If the command is in the QINFIFO or the waiting for
-       * selection list, it's not tying up the bus and isn't responsible
-       * for the delay so we pick off the active command which should
-       * be the SCB selected by SCBPTR.  If it's disconnected or active,
-       * we device reset the target scbp points to.  Although it may
-       * be that this target is not responsible for the delay, it may
-       * also be that we're timing out on a command that just takes
-       * too much time, so we try the bus device reset there first.
-       */
-      active_scb = inb(SCBPTR + base);
-      active_scbp = &(p->scb_array[active_scb]);
-      control = inb(SCB_CONTROL + base);
+      printk(KERN_WARNING "aic7xxx: (abort_reset) scb state 0x%x, ", scb->state);
+      bus_state = inb(LASTPHASE + p->base);
+
+      switch (bus_state)
+      {
+	case P_DATAOUT:
+          printk("Data-Out phase, ");
+          break;
+	case P_DATAIN:
+          printk("Data-In phase, ");
+          break;
+	case P_COMMAND:
+          printk("Command phase, ");
+          break;
+	case P_MESGOUT:
+          printk("Message-Out phase, ");
+          break;
+	case P_STATUS:
+          printk("Status phase, ");
+          break;
+	case P_MESGIN:
+          printk("Message-In phase, ");
+          break;
+	default:
+          printk("while idle, LASTPHASE = 0x%x, ", bus_state);
+          /*
+           * We're not in a valid phase, so assume we're idle.
+           */
+          bus_state = 0;
+          break;
+      }
+      printk("SCSISIGI = 0x%x\n", inb(p->base + SCSISIGI));
 
       /*
-       * Test to see if scbp is disconnected
+       * First, determine if we want to do a bus reset or simply a bus device
+       * reset.  If this is the first time that a transaction has timed out
+       * and the SCB is not paged out, just schedule a bus device reset.
+       * Otherwise, we reset the bus and abort all pending I/Os on that bus.
        */
-      outb(scb->position, SCBPTR + base);
-      if (inb(SCB_CONTROL + base) & DISCONNECTED)
+      if (!(scb->state & (SCB_ABORTED | SCB_PAGED_OUT)))
       {
-#ifdef AIC7XXX_DEBUG_ABORT
-        printk ("aic7xxx: (abort_scb) scb %d is disconnected; "
-                "bus device reset message queued.\n", scb->position);
+#if 0
+	if (scb->control & TAG_ENB)
+	{
+          /*
+           * We could be starving this command; try sending and ordered tag
+           * command to the target we come from.
+           */
+          scb->state = scb->state | SCB_ABORTED | SCB_SENTORDEREDTAG;
+          p->orderedtag = p->orderedtag | 0xFF;
+          result = SCSI_RESET_PENDING;
+          UNPAUSE_SEQUENCER(p);
+          printk(KERN_WARNING "aic7xxx: (abort_reset) Ordered tag queued.\n");
+	}
 #endif
-	scb->state |= (SCB_DEVICE_RESET | SCB_ABORTED);
-	scb->SG_segment_count = 0;
-	memset(scb->SG_list_pointer, 0, sizeof(scb->SG_list_pointer));
-	memset(scb->data_pointer, 0, sizeof(scb->data_pointer));
-	scb->data_count = 0;
-	aic7xxx_putscb(p, scb);
-	aic7xxx_add_waiting_scb(base, scb);
-	aic7xxx_error(scb->cmd) = errcode;
-	scb_status = ABORT_RESET_PENDING;
-	outb(active_scb, SCBPTR + base);
-	UNPAUSE_SEQUENCER(p);
-      }
-      else
-      {
+	unsigned char active_scb, control;
+	struct aic7xxx_scb *active_scbp;
+
+	/*
+	 * Send a Bus Device Reset Message:
+	 * The target we select to send the message to may be entirely
+	 * different than the target pointed to by the scb that timed
+	 * out.  If the command is in the QINFIFO or the waiting for
+	 * selection list, its not tying up the bus and isn't responsible
+	 * for the delay so we pick off the active command which should
+	 * be the SCB selected by SCBPTR.  If its disconnected or active,
+	 * we device reset the target scbp points to.  Although it may
+	 * be that this target is not responsible for the delay, it may
+	 * may also be that we're timing out on a command that just takes
+	 * too much time, so we try the bus device reset there first.
+	 */
+	active_scb = inb(SCBPTR + base);
+	active_scbp = &(p->scb_array[inb(SCB_TAG + base)]);
+	control = inb(SCB_CONTROL + base);
+
 	/*
-	 * Is the active SCB really active?
+	 * Test to see if scbp is disconnected
 	 */
-	if ((active_scbp->state & SCB_ACTIVE) && bus_state)
+	outb(scb->position, SCBPTR + base);
+	if (inb(SCB_CONTROL + base) & DISCONNECTED)
 	{
-          /*
-           * Load the message buffer and assert attention.
-           */
-          active_scbp->state |= (SCB_DEVICE_RESET | SCB_ABORTED);
-          outb(1, MSG_LEN + base);
-          outb(MSG_BUS_DEVICE_RESET, MSG0 + base);
-          outb(bus_state | ATNO, SCSISIGO + base);
 #ifdef AIC7XXX_DEBUG_ABORT
-          printk ("aic7xxx: (abort_scb) asserted ATN - "
-                  "bus device reset in message buffer.\n");
+          printk("aic7xxx: (abort_scb) scb %d is disconnected; "
+                 "bus device reset message queued.\n", scb->position);
 #endif
-          if (active_scbp != scb)
+          if (p->flags & PAGE_ENABLED)
           {
-            /*
-             * XXX - We would like to increment the timeout on scb, but
-             *       access to that routine is denied because it is hidden
-             *       in scsi.c.  If we were able to do this, it would give
-             *       scb a new lease on life.
-             */
-            ;
+            /* Pull this SCB out of the disconnected list. */
+            u_char prev = inb(SCB_PREV + base);
+            u_char next = inb(SCB_NEXT + base);
+            if (prev == SCB_LIST_NULL)
+            {
+              /* Head of list */
+              outb(next, DISCONNECTED_SCBH + base);
+            }
+            else
+            {
+              outb(prev, SCBPTR + base);
+              outb(next, SCB_NEXT + base);
+              if (next != SCB_LIST_NULL)
+              {
+        	outb(next, SCBPTR + base);
+        	outb(prev, SCB_PREV + base);
+              }
+              outb(scb->position, SCBPTR + base);
+            }
           }
-          aic7xxx_error(scb->cmd) = errcode;
-          scb_status = ABORT_RESET_PENDING;
-          /*
-           * Restore the active SCB and unpause the sequencer.
-           */
-          outb(active_scb, SCBPTR + base);
-
-          UNPAUSE_SEQUENCER(p);
+	  scb->state |= (SCB_DEVICE_RESET | SCB_ABORTED);
+          scb->control = scb->control & DISCENB;
+          scb->SCSI_cmd_length = 0;
+	  scb->SG_segment_count = 0;
+	  memset(scb->SG_list_pointer, 0, sizeof(scb->SG_list_pointer));
+	  memset(scb->data_pointer, 0, sizeof(scb->data_pointer));
+	  scb->data_count = 0;
+	  aic7xxx_putscb(p, scb);
+	  aic7xxx_add_waiting_scb(base, scb);
+	  outb(active_scb, SCBPTR + base);
+          result = SCSI_RESET_PENDING;
+	  UNPAUSE_SEQUENCER(p);
 	}
 	else
 	{
+	  /*
+	   * Is the active SCB really active?
+	   */
+	  if ((active_scbp->state & SCB_ACTIVE) && bus_state)
+	  {
+            /*
+             * Load the message buffer and assert attention.
+             */
+            active_scbp->state |= (SCB_DEVICE_RESET | SCB_ABORTED);
+            outb(1, MSG_LEN + base);
+            outb(MSG_BUS_DEVICE_RESET, MSG0 + base);
+            outb(bus_state | ATNO, SCSISIGO + base);
 #ifdef AIC7XXX_DEBUG_ABORT
-            printk ("aic7xxx: (abort_scb) no active command.\n");
+            printk("aic7xxx: (abort_scb) asserted ATN - "
+                   "bus device reset in message buffer.\n");
 #endif
-          /*
-           * No active command to single out, so reset
-           * the bus for the timed out target.
-           */
-          aic7xxx_reset_channel(p, channel, scb->position, TRUE);
+            if (active_scbp != scb)
+            {
+              /*
+               * XXX - We would like to increment the timeout on scb, but
+               *       access to that routine is denied because it is hidden
+               *       in scsi.c.  If we were able to do this, it would give
+               *       scb a new lease on life.
+               */
+              ;
+            }
+            aic7xxx_error(scb->cmd) = DID_RESET;
+            /*
+             * Restore the active SCB and unpause the sequencer.
+             */
+            outb(active_scb, SCBPTR + base);
+            if (active_scbp != scb)
+            {
+              /*
+               * The mid-level SCSI code requested us to reset a command
+               * different from the one that we actually reset.  Return
+               * a "not running" indication and hope that the SCSI code
+               * will Do the Right Thing (tm).
+               */
+              result = SCSI_RESET_NOT_RUNNING;
+            }
+            else
+            {
+              result = SCSI_RESET_PENDING;
+            }
+            UNPAUSE_SEQUENCER(p);
+	  }
 	}
       }
     }
+    restore_flags(flags);
   }
-  else
-  {
-    /*
-     * The scb is not active and must have completed after the timeout
-     * check in scsi.c and before we check the scb state above.  For
-     * this case we return SCSI_ABORT_NOT_RUNNING (if abort was called)
-     * or SCSI_RESET_SUCCESS (if reset was called).
-     */
-#ifdef AIC7XXX_DEBUG_ABORT
-    printk ("aic7xxx: (abort_reset) called with no active scb, errcode 0x%x\n",
-            errcode);
-#endif
-    scb_status = ABORT_RESET_INACTIVE;
-    /*
-     * According to the comments in scsi.h and Michael Neuffer, if we do not
-     * have an active command for abort or reset, we should not call the
-     * command done function.  Unfortunately, this hangs the system for me
-     * unless we *do* call the done function.
-     *
-     * XXX - Revisit this sometime!
-     */
-    cmd->result = errcode << 16;
-    cmd->scsi_done(cmd);
-  }
-
-  restore_flags(flags);
-  return (scb_status);
+  return (result);
 }
 
 
@@ -4608,25 +5319,39 @@
 int
 aic7xxx_abort(Scsi_Cmnd *cmd)
 {
+  struct aic7xxx_scb  *scb = NULL;
+  struct aic7xxx_host *p;
+  int    base, result;
+
+  p = (struct aic7xxx_host *) cmd->host->hostdata;
+  scb = &(p->scb_array[aic7xxx_position(cmd)]);
+  base = p->base;
+
 #ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (abort) target/channel %d/%d\n", cmd->target, cmd->channel);
+  printk("aic7xxx: (abort) Aborting scb %d, TCL %d/%d/%d\n",
+         scb->position, TCL_OF_SCB(scb));
 #endif
 
-  switch (aic7xxx_abort_reset(cmd, DID_ABORT))
+  if (cmd->serial_number != cmd->serial_number_at_timeout)
   {
-    case ABORT_RESET_INACTIVE:
-      return (SCSI_ABORT_NOT_RUNNING);
-      break;
-    case ABORT_RESET_PENDING:
-      return (SCSI_ABORT_PENDING);
-      break;
-    case ABORT_RESET_SUCCESS:
-    default:
-      return (SCSI_ABORT_SUCCESS);
-      break;
+    result = SCSI_ABORT_NOT_RUNNING;
   }
+  else if (scb == NULL)
+  {
+    result = SCSI_ABORT_NOT_RUNNING;
+  }
+  else if ((scb->cmd != cmd) || (!(scb->state & SCB_IN_PROGRESS)))
+  {
+    result = SCSI_ABORT_NOT_RUNNING;
+  }
+  else
+  {
+    result = SCSI_ABORT_SNOOZE;
+  }
+  return (result);
 }
 
+
 /*+F*************************************************************************
  * Function:
  *   aic7xxx_reset
@@ -4638,25 +5363,150 @@
  *   the SCSI bus reset line.
  *-F*************************************************************************/
 int
-aic7xxx_reset(Scsi_Cmnd *cmd, unsigned int resetFlags)
+aic7xxx_reset(Scsi_Cmnd *cmd, unsigned int flags)
 {
+  struct aic7xxx_scb *scb = NULL;
+  struct aic7xxx_host *p;
+  int    base, found, tindex, min_target, max_target, result = -1;
+  char   channel = 'A';
+
+  p = (struct aic7xxx_host *) cmd->host->hostdata;
+  scb = &(p->scb_array[aic7xxx_position(cmd)]);
+  base = p->base;
+  channel = cmd->channel ? 'B': 'A';
+  tindex = (cmd->channel << 4) | cmd->target;
+
 #ifdef AIC7XXX_DEBUG_ABORT
-  printk ("aic7xxx: (reset) target/channel %d/%d\n", cmd->target, cmd->channel);
+  printk("aic7xxx: (reset) target/channel %d/%d\n", cmd->target, cmd->channel);
 #endif
 
-  switch (aic7xxx_abort_reset(cmd, DID_RESET))
+  if (scb->cmd != cmd)
+    scb = NULL;
+
+  if (!(flags & SCSI_RESET_SUGGEST_HOST_RESET) && (scb != NULL))
   {
-    case ABORT_RESET_PENDING:
-      return (SCSI_RESET_PENDING);
-      break;
-    case ABORT_RESET_SUCCESS:
-      return (SCSI_RESET_BUS_RESET | SCSI_RESET_SUCCESS);
-      break;
-    case ABORT_RESET_INACTIVE:
-    default:
-      return (SCSI_RESET_SUCCESS);
-      break;
+    /*
+     * Attempt a bus device reset if commands have completed successfully
+     * since the last bus device reset, or it has been less than 100ms
+     * since the last reset.
+     */
+    if ((p->flags & DEVICE_SUCCESS) ||
+        ((jiffies - p->device_status[tindex].last_reset) < HZ/10))
+    {
+      if (cmd->serial_number != cmd->serial_number_at_timeout)
+      {
+        result = SCSI_RESET_NOT_RUNNING;
+      }
+      else
+      {
+        if (scb == NULL)
+        {
+          result = SCSI_RESET_NOT_RUNNING;
+        }
+        else if (flags & SCSI_RESET_ASYNCHRONOUS)
+        {
+          if (scb->state & SCB_ABORTED)
+          {
+            result = SCSI_RESET_PENDING;
+          }
+          else if (!(scb->state & SCB_IN_PROGRESS))
+          {
+            result = SCSI_RESET_NOT_RUNNING;
+          }
+        }
+
+        if (result == -1)
+        {
+          if ((flags & SCSI_RESET_SYNCHRONOUS) &&
+              (p->device_status[tindex].flags & BUS_DEVICE_RESET_PENDING))
+          {
+            scb->state |= SCB_ABORTED;
+            result = SCSI_RESET_PENDING;
+          }
+          else
+          {
+            result = aic7xxx_bus_device_reset(p, cmd);
+            if (result == 0)
+              result = SCSI_RESET_PENDING;
+          }
+        }
+      }
+    }
+  }
+
+  if (result == -1)
+  {
+    /*
+     * The bus device reset failed; try resetting the channel.
+     */
+    if (flags & SCSI_RESET_ASYNCHRONOUS)
+    {
+      if (scb == NULL)
+      {
+	result = SCSI_RESET_NOT_RUNNING;
+      }
+      else if (!(scb->state & SCB_IN_PROGRESS))
+      {
+	result = SCSI_RESET_NOT_RUNNING;
+      }
+      else if ((scb->state & SCB_ABORTED) &&
+               (!(p->device_status[tindex].flags & BUS_DEVICE_RESET_PENDING)))
+      {
+	result = SCSI_RESET_PENDING;
+      }
+    }
+
+    if (result == -1)
+    {
+      found = aic7xxx_reset_channel(p, channel, TRUE);
+
+      /*
+       * If this is a synchronous reset and there is no SCB for this
+       * command, perform completion processing.
+       *
+       */
+      if ((flags & SCSI_RESET_SYNCHRONOUS) && (scb == NULL))
+      {
+	cmd->result = DID_RESET << 16;
+	cmd->scsi_done(cmd);
+      }
+
+      switch (p->bus_type)
+      {
+	case AIC_TWIN:
+	  if (channel == 'B')
+	  {
+            min_target = 8;
+            max_target = 15;
+	  }
+	  else
+	  {
+            min_target = 0;
+            max_target = 7;
+	  }
+	  break;
+
+	case AIC_WIDE:
+	  min_target = 0;
+	  max_target = 15;
+	  break;
+
+	case AIC_SINGLE:
+        default:
+	  min_target = 0;
+	  max_target = 7;
+	  break;
+      }
+
+      for (tindex = min_target; tindex <= max_target; tindex++)
+      {
+	p->device_status[tindex].last_reset = jiffies;
+      }
+
+      result = SCSI_RESET_SUCCESS | SCSI_RESET_HOST_RESET;
+    }
   }
+  return (result);
 }
 
 /*+F*************************************************************************
@@ -4683,7 +5533,7 @@
   sectors = 32;
   cylinders = disk->capacity / (heads * sectors);
 
-  if (p->extended && (cylinders > 1024))
+  if ((p->flags & EXTENDED_TRANSLATION) && (cylinders > 1024))
   {
     heads = 255;
     sectors = 63;
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/aic7xxx.h linux/drivers/scsi/aic7xxx.h
--- v2.0.12/linux/drivers/scsi/aic7xxx.h	Sun May 12 21:52:55 1996
+++ linux/drivers/scsi/aic7xxx.h	Sat Aug 10 10:44:18 1996
@@ -18,12 +18,12 @@
  * along with this program; see the file COPYING.  If not, write to
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  * 
- * $Id: aic7xxx.h,v 3.1 1996/05/12 17:25:20 deang Exp $
+ * $Id: aic7xxx.h,v 3.2 1996/07/23 03:37:26 deang Exp $
  *-M*************************************************************************/
 #ifndef _aic7xxx_h
 #define _aic7xxx_h
 
-#define AIC7XXX_H_VERSION  "$Revision: 3.1 $"
+#define AIC7XXX_H_VERSION  "$Revision: 3.2 $"
 
 /*
  * Scsi_Host_Template (see hosts.h) for AIC-7xxx - some fields
@@ -58,7 +58,7 @@
 extern int aic7xxx_detect(Scsi_Host_Template *);
 extern int aic7xxx_command(Scsi_Cmnd *);
 extern int aic7xxx_abort(Scsi_Cmnd *);
-extern int aic7xxx_reset(Scsi_Cmnd *, unsigned int resetFlags);
+extern int aic7xxx_reset(Scsi_Cmnd *, unsigned int);
 
 extern const char *aic7xxx_info(struct Scsi_Host *);
 
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/aic7xxx.seq linux/drivers/scsi/aic7xxx.seq
--- v2.0.12/linux/drivers/scsi/aic7xxx.seq	Sat Apr 20 20:59:10 1996
+++ linux/drivers/scsi/aic7xxx.seq	Sat Aug 10 10:44:18 1996
@@ -23,15 +23,22 @@
  *
  * FreeBSD, Twin, Wide, 2 command per target support, tagged queuing and other 
  * optimizations provided by Justin T. Gibbs (gibbs@FreeBSD.org)
+ *
+ * This version corresponds to version 1.42 of FreeBSDs aic7xxx.seq.
+ *
  *-M*************************************************************************/
 
-VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 3.0 1996/04/16 08:52:23 deang Exp $"
+VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 3.1 1996/07/23 03:37:26 deang Exp $"
 
 #ifdef linux
 #include "aic7xxx_reg.h"
 #else
+#if defined(__NetBSD__)
+#include "../../../../dev/ic/aic7xxxreg.h"
+#elif defined(__FreeBSD__)
 #include "../../dev/aic7xxx/aic7xxx_reg.h"
 #endif
+#endif
 
 /*
  * We can't just use ACCUM in the sequencer code because it
@@ -67,7 +74,13 @@
  * We jump to start after every bus free.
  */
 start:
+	and	FLAGS,0x0f		/* clear target specific flags */
 	mvi	SCSISEQ,ENRSELI		/* Always allow reselection */
+	clr	SCSIRATE		/*
+					 * We don't know the target we will
+					 * connect to, so default to narrow
+					 * transfers to avoid parity problems.
+					 */
 poll_for_work:
 	/*
 	 * Are we a twin channel device?
@@ -140,7 +153,7 @@
 	or	ACTIVE_A,A
 
 start_scb:
-	mov	SCB_NEXT_WAITING,WAITING_SCBH
+	mov	SCB_NEXT,WAITING_SCBH
 	mov	WAITING_SCBH, SCBPTR
 start_scb2:
 	and	SINDEX,0xf7,SBLKCTL	/* Clear the channel select bit */
@@ -178,25 +191,24 @@
 	jmp     wait_for_selection
 
 mk_identify:
-	and	A,DISCENB,SCB_CONTROL	/* mask off disconnect privilege */
+	and	A,DISCENB,SCB_CONTROL	/* mask off disconnect privledge */
 
 	and	MSG0,0x7,SCB_TCL	/* lun */
-	or	MSG0,A			/* or in disconnect privilege */
+	or	MSG0,A			/* or in disconnect privledge */
 	or	MSG0,MSG_IDENTIFY
 	mvi	MSG_LEN, 1
 
 	test	SCB_CONTROL,0xb0 jz  !message	/* WDTR, SDTR or TAG?? */
 /*
- * Tag Message if Tag enabled in SCB control block.  Use SCBPTR as the tag
- * value
+ * 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.
  */
 
 mk_tag:
 	mvi	DINDEX, MSG1
 	test	SCB_CONTROL,TAG_ENB jz mk_tag_done
-	and	A,0x23,SCB_CONTROL
-	mov	DINDIR,A
-	mov	DINDIR,SCBPTR
+	and	DINDIR,0x23,SCB_CONTROL
+	mov	DINDIR,SCB_TAG
 
 	add	MSG_LEN,COMP_MSG0,DINDEX	/* update message length */
 
@@ -218,7 +230,6 @@
 reselect:
 	clr	MSG_LEN		/* Don't have anything in the mesg buffer */
 	mov	SELID		call initialize_scsiid
-	and	FLAGS,0x03	/* clear target specific flags */
 	or	FLAGS,RESELECTED
 	jmp	select2
 
@@ -229,8 +240,8 @@
  * SCB is used, so don't bother with it now.
  */
 select:
-	and	FLAGS,0x03		/* Clear target flags */
-	mov	WAITING_SCBH,SCB_NEXT_WAITING
+	mov	WAITING_SCBH,SCB_NEXT
+	or	FLAGS,SELECTED
 select2:
 /*
  * Set CLRCHN here before the target has entered a data transfer mode -
@@ -244,13 +255,29 @@
 	call	ndx_dtr
 	mov	SCSIRATE,SINDIR
 
+/*
+ * Initialize Ultra mode setting.
+ */
+	mov	FUNCTION1,SCSIID
+	mov	A,FUNCTION1
+	and	SINDEX,0xdf,SXFRCTL0		/* default to Ultra disabled */
+	test	SCSIID, 0x80	 jnz ultra_b	/* Target ID > 7 */
+	test	SBLKCTL, SELBUSB jnz ultra_b	/* Second channel device */
+	test	ULTRA_ENB,A	 jz  set_sxfrctl0
+	or	SINDEX, ULTRAEN  jmp set_sxfrctl0
+ultra_b:
+	test	ULTRA_ENB_B,A	 jz  set_sxfrctl0
+	or	SINDEX, ULTRAEN
+
+set_sxfrctl0:
+	mov	SXFRCTL0,SINDEX
+
 	mvi	SCSISEQ,ENAUTOATNP		/*
 						 * ATN on parity errors
 						 * for "in" phases
 						 */
 	mvi	CLRSINT1,CLRBUSFREE
 	mvi	CLRSINT0,0x60			/* CLRSELDI|CLRSELDO */
-
 /*
  * Main loop for information transfer phases.  If BSY is false, then
  * we have a bus free condition, expected or not.  Otherwise, wait
@@ -274,6 +301,7 @@
 	cmp	A,P_MESGIN	je p_mesgin
 
 	mvi	INTSTAT,BAD_PHASE	/* unknown phase - signal driver */
+	jmp	ITloop			/* Try reading the bus again. */
 
 p_dataout:
 	mvi	DMAPARAMS,0x7d			/*
@@ -305,12 +333,29 @@
 	or	FLAGS, DPHASE		/* We have seen a data phase */
 
 data_phase_loop:
+/* 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
+	mvi	STCNT0,0xff
+	mvi	STCNT1,0xff
+	mvi	STCNT2,0xff
+
+data_phase_inbounds:
 /* If we are the last SG block, don't set wideodd. */
 	cmp	SG_COUNT,0x01 jne data_phase_wideodd
 	and	DMAPARAMS, 0xbf		/* Turn off WIDEODD */
 data_phase_wideodd:
 	mov	DMAPARAMS  call dma
 
+/* Go tell the host about any overruns */
+	test	SXFRCTL1,BITBUCKET jnz data_phase_overrun
+
 /* Exit if we had an underrun */
 	test	SSTAT0,SDONE	jz data_phase_finish /* underrun STCNT != 0 */
 
@@ -412,16 +457,22 @@
 	mov	SCB_RESID_SGCNT, SG_COUNT
 	jmp	ITloop
 
+data_phase_overrun:
+/*
+ * Turn off BITBUCKET mode and notify the host
+ */
+	and	SXFRCTL1,0x7f		/* ~BITBUCKET */
+	mvi	INTSTAT,DATA_OVERRUN
+	jmp	ITloop
+
 /*
- * Command phase.  Set up the DMA registers and let 'er rip - the
- * two bytes after the SCB SCSI_cmd_length are zeroed by the driver,
- * so we can copy those three bytes directly into HCNT.
+ * Command phase.  Set up the DMA registers and let 'er rip.
  */
 p_command:
 	call	assert
 
 /*
- * Load HADDR and HCNT.  We can do this in one bcopy since they are neighbors
+ * Load HADDR and HCNT.
  */
 	mov	HADDR0, SCB_CMDPTR0
 	mov	HADDR1, SCB_CMDPTR1
@@ -448,7 +499,7 @@
 	jmp	mesgin_done
 
 /*
- * Message out phase.  If there is no active message, but the target
+ * Message out phase.  If there is not an active message, but the target
  * took us into this phase anyway, build a no-op message and send it.
  */
 p_mesgout:
@@ -473,6 +524,7 @@
 p_mesgout_loop:
 	test	SSTAT1,PHASEMIS	jnz p_mesgout_phasemis
 	test	SSTAT0,SPIORDY	jz p_mesgout_loop
+	test	SSTAT1,PHASEMIS	jnz p_mesgout_phasemis
 	cmp	DINDEX,1	jne p_mesgout_outb	/* last byte? */
 	mvi	CLRSINT1,CLRATNO			/* drop ATN */
 p_mesgout_outb:
@@ -498,7 +550,7 @@
 	jmp	ITloop
 
 p_mesgout_phasemis:
-	mvi	CLRSINT1,CLRATNO	/* Be sure turn ATNO off */
+	mvi	CLRSINT1,CLRATNO	/* Be sure to turn ATNO off */
 p_mesgout_done:
 	clr	MSG_LEN			/* no active msg */
 	jmp	ITloop
@@ -539,20 +591,20 @@
 
 mesgin_complete:
 /*
- * We got a "command complete" message, so put the SCB pointer
- * into QUEUEOUT, and trigger a completion interrupt.
- * Check status for non zero return and interrupt driver if needed
- * This allows the driver to interpret errors only when they occur
- * instead of always uploading the scb.  If the status is SCSI_CHECK,
- * the driver will download a new scb requesting sense to replace
- * the old one, modify the "waiting for selection" SCB list and set 
- * RETURN_1 to 0x80.  If RETURN_1 is set to 0x80 the sequencer immediately
- * jumps to main loop where it will run down the waiting SCB list.
- * If the kernel driver does not wish to request sense, it need
- * only clear RETURN_1, and the command is allowed to complete.  We don't 
- * bother to post to the QOUTFIFO in the error case 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.
+ * We got a "command complete" message, so put the SCB_TAG into QUEUEOUT,
+ * and trigger a completion interrupt.  Check status for non zero return
+ * and interrupt driver if needed.  This allows the driver to interpret
+ * errors only when they occur instead of always uploading the scb.  If
+ * the status is SCSI_CHECK, the driver will download a new scb requesting
+ * sense to replace the old one, modify the "waiting for selection" SCB list
+ * and set RETURN_1 to SEND_SENSE.  If RETURN_1 is set to SEND_SENSE the
+ * sequencer imediately jumps to main loop where it will run down the waiting
+ * SCB list and process the sense request.  If the kernel driver does not
+ * wish to request sense, it need only clear RETURN_1, and the command is
+ * allowed to complete.  We don't bother to post to the QOUTFIFO in the
+ * error case 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.
  *
  * First check for residuals
  */
@@ -600,7 +652,7 @@
 	mvi	INTSTAT,IMMEDDONE
 	jmp	start
 complete:
-	mov	QOUTFIFO,SCBPTR
+	mov	QOUTFIFO,SCB_TAG
 	mvi	INTSTAT,CMDCMPLT
 	jmp	mesgin_done
 
@@ -614,10 +666,10 @@
  */
 mesgin_extended:
 	mvi	ARG_1		call inb_next	/* extended message length */
-	mvi	A		call inb_next	/* extended message code */
+	mvi	REJBYTE_EXT	call inb_next	/* extended message code */
 
-	cmp	A,MSG_SDTR	je p_mesginSDTR
-	cmp	A,MSG_WDTR	je p_mesginWDTR
+	cmp	REJBYTE_EXT,MSG_SDTR	je p_mesginSDTR
+	cmp	REJBYTE_EXT,MSG_WDTR	je p_mesginWDTR
 	jmp	rej_mesgin
 
 p_mesginWDTR:
@@ -648,6 +700,7 @@
 						 * Requested SDTR too small
 						 * Reject it.
 						 */
+	clr	ARG_1				/* Use the scratch ram rate */
 	mvi	DINDEX, MSG0
 	mvi     MSG0     call mk_sdtr
 	or	SCSISIGO,ATNO			/* turn on ATNO */
@@ -659,6 +712,22 @@
  */
 mesgin_disconnect:
 	or	SCB_CONTROL,DISCONNECTED
+	test	FLAGS, PAGESCBS jz mesgin_done
+/*
+ * Link this SCB into the DISCONNECTED list.  This list holds the
+ * candidates for paging out an SCB if one is needed for a new command.
+ * Modifying the disconnected list is a critical(pause dissabled) section.
+ */
+	mvi	SCB_PREV, SCB_LIST_NULL
+	mvi	SEQCTL,0x50			/* PAUSEDIS|FASTMODE */
+	mov	SCB_NEXT, DISCONNECTED_SCBH
+	mov	DISCONNECTED_SCBH, SCBPTR
+	cmp	SCB_NEXT,SCB_LIST_NULL je linkdone
+	mov	SCBPTR,SCB_NEXT
+	mov	SCB_PREV,DISCONNECTED_SCBH
+	mov	SCBPTR,DISCONNECTED_SCBH
+linkdone:
+	mvi	SEQCTL,0x10			/* !PAUSEDIS|FASTMODE */
 	jmp	mesgin_done
 
 /*
@@ -676,7 +745,7 @@
  * code do the rest.
  */
 mesgin_rdptrs:
-	and	FLAGS,0xfb			/*
+	and	FLAGS,0xef			/*
 						 * !DPHASE we'll reload them
 						 * the next time through
 						 */
@@ -699,21 +768,19 @@
 
 /*
  * Here we "snoop" the bus looking for a SIMPLE QUEUE TAG message.
- * If we get one, we use the tag returned to switch to the proper
- * SCB.  Otherwise, we just use the findSCB method.
+ * If we get one, we use the tag returned to switch to find the proper
+ * SCB.  With SCB paging, this requires using findSCB 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.
  */
+	mvi	ARG_1,SCB_LIST_NULL	/* Default to no-tag */
 snoop_tag_loop:
 	test	SSTAT1,BUSFREE	jnz use_findSCB
 	test	SSTAT1,REQINIT	jz snoop_tag_loop
 	test	SSTAT1,PHASEMIS	jnz use_findSCB
 	mvi	A		call inb_first
-	cmp	A,MSG_SIMPLE_TAG je get_tag
-use_findSCB:
-	mov	ALLZEROS	call findSCB	  /* Have to search */
-setup_SCB:
-	and	SCB_CONTROL,0xfb	  /* clear disconnect bit in SCB */
-	or	FLAGS,IDENTIFY_SEEN	  /* make note of IDENTIFY */
-	jmp	ITloop
+	cmp	A,MSG_SIMPLE_TAG jne use_findSCB
 get_tag:
 	mvi	ARG_1	call inb_next	/* tag value */
 /*
@@ -729,16 +796,26 @@
  * Ensure that the SCB the tag points to is for a SCB transaction
  * to the reconnecting target.
  */
+	test	FLAGS, PAGESCBS	jz index_by_tag
+	call	inb_last			/* Ack Tag */
+use_findSCB:
+	mov	ALLZEROS	call findSCB	  /* Have to search */
+setup_SCB:
+	and	SCB_CONTROL,0xfb	  /* clear disconnect bit in SCB */
+	or	FLAGS,IDENTIFY_SEEN	  /* make note of IDENTIFY */
+	jmp	ITloop
+index_by_tag:
 	mov	SCBPTR,ARG_1
 	mov	A,SAVED_TCL
 	cmp	SCB_TCL,A		jne abort_tag
 	test	SCB_CONTROL,TAG_ENB	jz  abort_tag
 	call	inb_last			/* Ack Successful tag */
 	jmp	setup_SCB
+
 abort_tag:
 	or	SCSISIGO,ATNO			/* turn on ATNO */
 	mvi	INTSTAT,ABORT_TAG 		/* let driver know */
-	mvi	0xd		call mk_mesg	/* ABORT TAG message */
+	mvi	MSG_ABORT_TAG	call mk_mesg	/* ABORT TAG message */
 	jmp	mesgin_done
 
 /*
@@ -778,7 +855,7 @@
 mk_mesg:
 	mvi	SEQCTL,0x50			/* PAUSEDIS|FASTMODE */
 	test	MSG_LEN,0xff	jz mk_mesg1	/* Should always succeed */
-
+	
 	/*
 	 * Hmmm.  For some reason the mesg buffer is in use.
 	 * Tell the driver.  It should look at SINDEX to find
@@ -817,6 +894,7 @@
 	test	SSTAT0,SPIORDY	jz inb_next_wait /* wait for next byte */
 inb_first:
 	mov	DINDEX,SINDEX
+	test	SSTAT1,PHASEMIS	jnz mesgin_phasemis
 	mov	DINDIR,SCSIBUSL	ret		/*read byte directly from bus*/
 inb_last:
 	mov	NONE,SCSIDATL ret		/*dummy read from latch to ACK*/
@@ -887,27 +965,59 @@
 	mvi	INTSTAT,NO_IDENT 	ret	/* no - cause a kernel panic */
 
 /*
- * Locate the SCB matching the target ID/channel/lun in SAVED_TCL and switch 
- * the SCB to it.  Have the kernel print a warning message if it can't be 
- * found, and generate an ABORT message to the target.  SINDEX should be
+ * Locate the SCB matching the target ID/channel/lun in SAVED_TCL, and the tag
+ * value in ARG_1.  If ARG_1 == SCB_LIST_NULL, we're looking for a non-tagged
+ * SCB.  Have the kernel print a warning message if it can't be found, and
+ * generate an ABORT/ABORT_TAG message to the target.  SINDEX should be
  * cleared on call.
  */
 findSCB:
 	mov	A,SAVED_TCL
-	mov	SCBPTR,SINDEX			/* switch to new SCB */
+	mov	SCBPTR,SINDEX			/* switch to next SCB */
+	mvi	SEQCTL,0x50			/* PAUSEDIS|FASTMODE */
 	cmp	SCB_TCL,A	jne findSCB1 /* target ID/channel/lun match? */
 	test	SCB_CONTROL,DISCONNECTED jz findSCB1 /*should be disconnected*/
-	ret
+	test	SCB_CONTROL,TAG_ENB jnz findTaggedSCB
+	cmp	ARG_1,SCB_LIST_NULL je foundSCB
+	jmp	findSCB1
+findTaggedSCB:
+	mov	A, ARG_1			/* Tag passed in ARG_1 */
+	cmp	SCB_TAG,A	jne findSCB1	/* Found it? */
+foundSCB:
+	test	FLAGS,PAGESCBS	jz foundSCB_ret
+/* Remove this SCB from the disconnection list */
+	cmp	SCB_NEXT,SCB_LIST_NULL je unlink_prev
+	mov	SAVED_LINKPTR, SCB_PREV
+	mov	SCBPTR, SCB_NEXT
+	mov	SCB_PREV, SAVED_LINKPTR
+	mov	SCBPTR, SINDEX
+unlink_prev:
+	cmp	SCB_PREV,SCB_LIST_NULL	je rHead/* At the head of the list */
+	mov	SAVED_LINKPTR, SCB_NEXT
+	mov	SCBPTR, SCB_PREV
+	mov	SCB_NEXT, SAVED_LINKPTR
+	mov	SCBPTR, SINDEX
+	mvi	SEQCTL,0x10	ret		/* !PAUSEDIS|FASTMODE */
+rHead:
+	mov	DISCONNECTED_SCBH,SCB_NEXT
+foundSCB_ret:
+	mvi	SEQCTL,0x10	ret		/* !PAUSEDIS|FASTMODE */
 
 findSCB1:
+	mvi	SEQCTL,0x10			/* !PAUSEDIS|FASTMODE */
 	inc	SINDEX
 	mov	A,SCBCOUNT
 	cmp	SINDEX,A	jne findSCB
 
 	mvi	INTSTAT,NO_MATCH		/* not found - signal kernel */
-	mvi	MSG_ABORT	call mk_mesg	/* ABORT message */
-
-	or	SCSISIGO,ATNO	ret		/* assert ATNO */
+	cmp	RETURN_1,SCB_PAGEDIN je return
+	or	SCSISIGO,ATNO			/* assert ATNO */
+	cmp	ARG_1,SCB_LIST_NULL jne find_abort_tag
+	mvi	MSG_ABORT	call mk_mesg
+	jmp	ITloop
+find_abort_tag:
+	mvi	MSG_ABORT_TAG	call mk_mesg
+	jmp	ITloop
 
 /*
  * Make a working copy of the scatter-gather parameters from the SCB.
@@ -980,7 +1090,7 @@
  */
 mk_dtr:
 	test	SCB_CONTROL,NEEDWDTR jnz  mk_wdtr_16bit
-	or	FLAGS, MAXOFFSET	/* Force an offset of 15 or 8 if WIDE */
+	mvi	ARG_1, MAXOFFSET	/* Force an offset of 15 or 8 if WIDE */
 
 mk_sdtr:
 	mvi	DINDIR,1		/* extended message */
@@ -988,7 +1098,7 @@
 	mvi	DINDIR,1		/* SDTR code */
 	call	sdtr_to_rate
 	mov	DINDIR,RETURN_1		/* REQ/ACK transfer period */
-	test	FLAGS, MAXOFFSET jnz mk_sdtr_max_offset
+	cmp	ARG_1, MAXOFFSET je mk_sdtr_max_offset
 	and	DINDIR,0x0f,SINDIR	/* Sync Offset */
 
 mk_sdtr_done:
@@ -998,8 +1108,6 @@
 /*
  * We're initiating sync negotiation, so request the max offset we can (15 or 8)
  */
-	xor	FLAGS, MAXOFFSET
-
 	/* Talking to a WIDE device? */
 	test	SCSIRATE, WIDEXFER	jnz wmax_offset	
 	mvi	DINDIR, MAX_OFFSET_8BIT
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/aic7xxx_proc.c linux/drivers/scsi/aic7xxx_proc.c
--- v2.0.12/linux/drivers/scsi/aic7xxx_proc.c	Sun May 12 21:52:55 1996
+++ linux/drivers/scsi/aic7xxx_proc.c	Sat Aug 10 10:44:18 1996
@@ -24,7 +24,7 @@
  *
  *  Dean W. Gehnert, deang@teleport.com, 05/01/96
  *
- *  $Id: aic7xxx_proc.c,v 3.1 1996/05/12 17:25:56 deang Exp $
+ *  $Id: aic7xxx_proc.c,v 3.2 1996/07/23 03:37:26 deang Exp $
  *-M*************************************************************************/
 
 #define BLS buffer + len + size
@@ -151,10 +151,10 @@
 #else
   size += sprintf(BLS, "  AIC7XXX_TAGGED_QUEUEING: Disabled\n");
 #endif
-#ifdef AIC7XXX_SHARE_IRQS
-  size += sprintf(BLS, "  AIC7XXX_SHARE_IRQS     : Enabled\n");
+#ifdef AIC7XXX_PAGE_ENABLE
+  size += sprintf(BLS, "  AIC7XXX_PAGE_ENABLE    : Enabled\n");
 #else
-  size += sprintf(BLS, "  AIC7XXX_SHARE_IRQS     : Disabled\n");
+  size += sprintf(BLS, "  AIC7XXX_PAGE_ENABLE    : Disabled\n");
 #endif
 #ifdef AIC7XXX_PROC_STATS
   size += sprintf(BLS, "  AIC7XXX_PROC_STATS     : Enabled\n");
@@ -171,7 +171,8 @@
   size += sprintf(BLS, "              Host Bus: %s\n", bus_names[p->bus_type]);
   size += sprintf(BLS, "               Base IO: %#.4x\n", p->base);
   size += sprintf(BLS, "                   IRQ: %d\n", HBAptr->irq);
-  size += sprintf(BLS, "                   SCB: %d (%d)\n", p->numscb, p->maxscb);
+  size += sprintf(BLS, "                  SCBs: Used %d, HW %d, Page %d\n",
+      p->numscbs, p->maxhscbs, p->maxscbs);
   size += sprintf(BLS, "            Interrupts: %d", p->isr_count);
   if (p->chip_type == AIC_777x)
   {
@@ -183,13 +184,13 @@
     size += sprintf(BLS, "\n");
   }
   size += sprintf(BLS, "         Serial EEPROM: %s\n",
-      p->have_seeprom ? "True" : "False");
+      (p->flags & HAVE_SEEPROM) ? "True" : "False");
   size += sprintf(BLS, "  Extended Translation: %sabled\n",
-      p->extended ? "En" : "Dis");
+      (p->flags & EXTENDED_TRANSLATION) ? "En" : "Dis");
   size += sprintf(BLS, "        SCSI Bus Reset: %sabled\n",
       aic7xxx_no_reset ? "Dis" : "En");
   size += sprintf(BLS, "            Ultra SCSI: %sabled\n",
-      p->ultra_enabled ? "En" : "Dis");
+      (p->flags & ULTRA_ENABLED) ? "En" : "Dis");
   size += sprintf(BLS, "     Target Disconnect: %sabled\n",
       p->discenable ? "En" : "Dis");
   len += size; pos = begin + len; size = 0;
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/aic7xxx_reg.h linux/drivers/scsi/aic7xxx_reg.h
--- v2.0.12/linux/drivers/scsi/aic7xxx_reg.h	Sat Apr 20 20:59:10 1996
+++ linux/drivers/scsi/aic7xxx_reg.h	Sat Aug 10 10:44:18 1996
@@ -18,7 +18,9 @@
  * along with this program; see the file COPYING.  If not, write to
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: aic7xxx_reg.h,v 3.0 1996/04/16 08:52:23 deang Exp $
+ * This version corresponds to version 1.12 of FreeBSDs aic7xxx_reg.h
+ *
+ * $Id: aic7xxx_reg.h,v 3.1 1996/07/23 03:37:26 deang Exp $
  *-M*************************************************************************/
 
 /*
@@ -331,7 +333,6 @@
 #define HCNT0			0x08c
 #define HCNT1			0x08d
 #define HCNT2			0x08e
-
 /*
  * SCB Pointer (p. 3-49)
  * Gate one of the four SCBs into the SCBARRAY window.
@@ -363,7 +364,6 @@
 #define BUSTIME			0x085
 #define		BOFF		0xf0
 #define		BON		0x0f
-#define		BOFF_60BCLKS	0xf0
 
 /*
  * Bus Speed (p. 3-45)
@@ -387,6 +387,7 @@
 #define		PAUSE		0x04
 #define		INTEN		0x02
 #define		CHIPRST		0x01
+#define		CHIPRSTACK	0x01
 
 /*
  * Interrupt Status (p. 3-50)
@@ -425,6 +426,11 @@
 						 * when we were expecting
 						 * another msgin byte.
 						 */
+#define			DATA_OVERRUN	0xe1	/*
+						 * Target attempted to write
+						 * beyond the bounds of its
+						 * command.
+						 */
 #define 	BRKADRINT 0x08
 #define		SCSIINT	  0x04
 #define		CMDCMPLT  0x02
@@ -548,7 +554,9 @@
 #define		SCB_CMDPTR2	0x0b6
 #define		SCB_CMDPTR3	0x0b7
 #define	SCB_CMDLEN		0x0b8
-#define	SCB_NEXT_WAITING	0x0b9
+#define SCB_TAG			0x0b9
+#define	SCB_NEXT		0x0ba
+#define	SCB_PREV		0x0bb
 
 #ifdef linux
 #define	SG_SIZEOF		0x0c		/* sizeof(struct scatterlist) */
@@ -629,10 +637,12 @@
 #define TARG_SCRATCH		0x020
 
 /*
- * The sequencer will stick the first byte of any rejected message here so
- * we can see what is getting thrown away.
+ * The sequencer will stick the frist byte of any rejected message here so
+ * we can see what is getting thrown away.  Extended messages put the
+ * extended message type in REJBYTE_EXT.
  */
-#define REJBYTE			0x031
+#define REJBYTE			0x030
+#define REJBYTE_EXT		0x031
 
 /*
  * Bit vector of targets that have disconnection disabled.
@@ -646,6 +656,7 @@
  */
 #define MSG_LEN			0x034
 
+/* We reserve 8bytes to store outgoing messages */
 #define MSG0			0x035
 #define		COMP_MSG0	0xcb      /* 2's complement of MSG0 */
 #define MSG1			0x036
@@ -653,70 +664,90 @@
 #define MSG3			0x038
 #define MSG4			0x039
 #define MSG5			0x03a
+#define MSG6			0x03b
+#define MSG7			0x03c
 
 /*
  * These are offsets into the card's scratch ram.  Some of the values are
  * specified in the AHA2742 technical reference manual and are initialized
  * by the BIOS at boot time.
  */
-#define LASTPHASE		0x049
-#define ARG_1			0x04a
-#define RETURN_1		0x04a
-#define		SEND_SENSE	0x80
+#define LASTPHASE		0x03d
+#define ARG_1			0x03e
+#define		MAXOFFSET	0x01
+#define RETURN_1		0x03f
 #define		SEND_WDTR	0x80
-#define		SEND_SDTR	0x80
-#define		SEND_REJ	0x40
-
-#define SIGSTATE		0x04b
-
-#define DMAPARAMS		0x04c	/* Parameters for DMA Logic */
+#define		SEND_SDTR	0x60
+#define		SEND_SENSE	0x40
+#define		SEND_REJ	0x20
+#define		SCB_PAGEDIN	0x10
+
+#define SIGSTATE		0x040
+
+#define DMAPARAMS		0x041	/* Parameters for DMA Logic */
+
+#define	SG_COUNT		0x042
+#define	SG_NEXT			0x043	/* working value of SG pointer */
+#define		SG_NEXT0	0x043
+#define		SG_NEXT1	0x044
+#define		SG_NEXT2	0x045
+#define		SG_NEXT3	0x046
 
-#define	SG_COUNT		0x04d
-#define	SG_NEXT			0x04e	/* working value of SG pointer */
-#define		SG_NEXT0	0x04e
-#define		SG_NEXT1	0x04f
-#define		SG_NEXT2	0x050
-#define		SG_NEXT3	0x051
-
-#define	SCBCOUNT		0x052	/*
+#define	SCBCOUNT		0x047	/*
 					 * Number of SCBs supported by
 					 * this card.
 					 */
-#define FLAGS			0x053
+#define	COMP_SCBCOUNT		0x048	/*
+					 * Two's compliment of SCBCOUNT
+					 */
+#define QCNTMASK		0x049	/*
+					 * Mask of bits to test against
+					 * when looking at the Queue Count
+					 * registers.  Works around a bug
+					 * on aic7850 chips. 
+					 */
+#define FLAGS			0x04a
 #define		SINGLE_BUS	0x00
 #define		TWIN_BUS	0x01
 #define		WIDE_BUS	0x02
-#define		DPHASE		0x04
-#define		MAXOFFSET	0x08
+#define		PAGESCBS	0x04
+#define		DPHASE		0x10
+#define		SELECTED	0x20
 #define		IDENTIFY_SEEN	0x40
 #define		RESELECTED	0x80
 
-#define	ACTIVE_A		0x054
-#define	ACTIVE_B		0x055
-#define	SAVED_TCL		0x056	/*
+#define	SAVED_TCL		0x04b	/*
 					 * Temporary storage for the
 					 * target/channel/lun of a
 					 * reconnecting target
 					 */
-#define WAITING_SCBH		0x057	/*
+#define	ACTIVE_A		0x04c
+#define	ACTIVE_B		0x04d
+#define WAITING_SCBH		0x04e	/*
 					 * head of list of SCBs awaiting
 					 * selection
 					 */
-#define QCNTMASK		0x058	/*
-					 * Mask of bits to test against
-					 * when looking at the Queue Count
-					 * registers.  Works around a bug
-					 * on aic7850 chips. 
+#define DISCONNECTED_SCBH	0x04f	/*
+					 * head of list of SCBs that are
+					 * disconnected.  Used for SCB
+					 * paging.
 					 */
-#define	COMP_SCBCOUNT		0x059
 #define		SCB_LIST_NULL	0xff
 
+#define SAVED_LINKPTR		0x050
+#define SAVED_SCBPTR		0x051
+#define ULTRA_ENB		0x052
+#define ULTRA_ENB_B		0x053
+
 #define SCSICONF		0x05a
+#define		RESET_SCSI	0x40
+
 #define HOSTCONF		0x05d
 
 #define HA_274_BIOSCTRL		0x05f
 #define BIOSMODE		0x30
 #define BIOSDISABLED		0x30
+#define CHANNEL_B_PRIMARY	0x08
 
 /* Message codes */
 #define MSG_EXTENDED		0x01
@@ -731,6 +762,7 @@
 #define MSG_NOP			0x08
 #define MSG_MSG_PARITY_ERROR	0x09
 #define MSG_BUS_DEVICE_RESET	0x0c
+#define MSG_ABORT_TAG		0x0d
 #define MSG_SIMPLE_TAG		0x20
 #define MSG_IDENTIFY		0x80
 
@@ -741,4 +773,3 @@
 
 #define MAX_OFFSET_8BIT		0x0f
 #define MAX_OFFSET_16BIT	0x08
-
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/eata_dma.c linux/drivers/scsi/eata_dma.c
--- v2.0.12/linux/drivers/scsi/eata_dma.c	Mon Aug  5 10:13:52 1996
+++ linux/drivers/scsi/eata_dma.c	Wed Aug 14 10:21:03 1996
@@ -58,7 +58,7 @@
  * Jagdis who did a lot of testing and found quite a number *
  * of bugs during the development.                          *
  ************************************************************
- *  last change: 96/07/20                  OS: Linux 2.0.8  *
+ *  last change: 96/08/13                 OS: Linux 2.0.12  *
  ************************************************************/
 
 /* Look in eata_dma.h for configuration and revision information */
@@ -854,6 +854,15 @@
 		}
 	    } else /* ISA forces us to limit the QS because of bounce buffers*/
 	        device->queue_depth = 2; /* I know this is cruel */
+
+	    /* 
+	     * It showed that we need to set an upper limit of commands 
+             * we can allow to  queue for a single device on the bus. 
+	     * If we get above that limit, the broken midlevel SCSI code 
+	     * will produce bogus timeouts and aborts en masse. :-(
+	     */
+	    if(device->queue_depth > UPPER_DEVICE_QUEUE_LIMIT)
+		device->queue_depth = UPPER_DEVICE_QUEUE_LIMIT;
 
 	    printk(KERN_INFO "scsi%d: queue depth for target %d on channel %d "
 		   "set to %d\n", host->host_no, device->id, device->channel,
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/eata_dma.h linux/drivers/scsi/eata_dma.h
--- v2.0.12/linux/drivers/scsi/eata_dma.h	Mon Aug  5 10:13:52 1996
+++ linux/drivers/scsi/eata_dma.h	Wed Aug 14 10:21:03 1996
@@ -4,7 +4,7 @@
 *             mike@i-Connect.Net                        *
 *             neuffer@mail.uni-mainz.de                 *
 *********************************************************
-* last change: 96/06/26                                 *
+* last change: 96/08/14                                 *
 ********************************************************/
 
 #ifndef _EATA_DMA_H
@@ -17,7 +17,7 @@
 
 #define VER_MAJOR 2
 #define VER_MINOR 5
-#define VER_SUB   "8g"
+#define VER_SUB   "9a"
 
 
 /************************************************************************
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/eata_generic.h linux/drivers/scsi/eata_generic.h
--- v2.0.12/linux/drivers/scsi/eata_generic.h	Mon Aug  5 10:13:52 1996
+++ linux/drivers/scsi/eata_generic.h	Wed Aug 14 10:21:03 1996
@@ -5,7 +5,7 @@
 *             mike@i-Connect.Net                        *
 *             neuffer@mail.uni-mainz.de                 *
 *********************************************************
-* last change: 96/05/16                                 *
+* last change: 96/08/14                                 *
 ********************************************************/
 
 
@@ -67,6 +67,12 @@
 
 #define SG_SIZE		 64 
 #define SG_SIZE_BIG	 252	       /* max. 8096 elements, 64k */
+
+#define UPPER_DEVICE_QUEUE_LIMIT 24    /* The limit we have to set for the 
+					* device queue to keep the broken 
+					* midlevel SCSI code from producing
+					* bogus timeouts
+					*/
 
 #define TYPE_DISK_QUEUE  16
 #define TYPE_TAPE_QUEUE  4
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/ncr53c8xx.c linux/drivers/scsi/ncr53c8xx.c
--- v2.0.12/linux/drivers/scsi/ncr53c8xx.c	Tue Jul 23 10:26:41 1996
+++ linux/drivers/scsi/ncr53c8xx.c	Mon Aug 12 11:45:46 1996
@@ -8142,7 +8142,7 @@
 	copy_info(&info, "  IO port address 0x%lx, ", (u_long) np->port);
 	copy_info(&info, "IRQ number %d\n", (int) np->irq);
 
-#ifndef SCSI_NCR_IOMAPPED
+#ifndef NCR_IOMAPPED
 	if (np->use_mmio)
 		copy_info(&info, "  Using memory mapped IO at virtual address 0x%lx\n",
 		                  (u_long) np->reg_remapped);
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/scsi_ioctl.c linux/drivers/scsi/scsi_ioctl.c
--- v2.0.12/linux/drivers/scsi/scsi_ioctl.c	Sat Jun  8 11:41:46 1996
+++ linux/drivers/scsi/scsi_ioctl.c	Tue Aug 13 09:27:47 1996
@@ -165,7 +165,7 @@
 static int ioctl_command(Scsi_Device *dev, void *buffer)
 {
     char * buf;
-    char cmd[12];
+    unsigned char cmd[12]; 
     char * cmd_in;
     Scsi_Cmnd * SCpnt;
     unsigned char opcode;
@@ -187,10 +187,10 @@
      * The structure that we are passed should look like:
      *
      * struct sdata{
-     *	int inlen;
-     *	int outlen;
-     *	char cmd[];  # However many bytes are used for cmd.
-     *	char data[];
+     *	unsigned int inlen;
+     *	unsigned int outlen;
+     *	unsigned char  cmd[];  # However many bytes are used for cmd.
+     *	unsigned char  data[];
      */
     inlen = get_user((unsigned int *) buffer);
     outlen = get_user( ((unsigned int *) buffer) + 1);
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/sr.c linux/drivers/scsi/sr.c
--- v2.0.12/linux/drivers/scsi/sr.c	Sat Aug 10 10:03:15 1996
+++ linux/drivers/scsi/sr.c	Tue Aug 13 09:27:48 1996
@@ -427,8 +427,8 @@
 	printk(KERN_DEBUG "sr_photocd: use NEC code\n");
 #endif
 	memset(buf,0,40);
-	*((unsigned long*)buf)   = 0x0;   /* we send nothing...     */
-	*((unsigned long*)buf+1) = 0x16;  /* and receive 0x16 bytes */
+	*((unsigned int*)buf)   = 0x0;   /* we send nothing...     */
+	*((unsigned int*)buf+1) = 0x16;  /* and receive 0x16 bytes */
 	cmd[0] = 0xde;
 	cmd[1] = 0x03;
 	cmd[2] = 0xb0;
@@ -464,10 +464,10 @@
 	/* we request some disc information (is it a XA-CD ?,
 	 * where starts the last session ?) */
 	memset(buf,0,40);
-	*((unsigned long*)buf)   = 0;
-	*((unsigned long*)buf+1) = 4;  /* we receive 4 bytes from the drive */
-	cmd[0] = 0xc7;
-	cmd[1] = 3;
+	*((unsigned int*)buf)   = (unsigned int) 0;
+	*((unsigned int*)buf+1) = (unsigned int) 4;  /* receive 4 bytes */
+	cmd[0]                  = (unsigned char) 0x00c7;
+	cmd[1]                  = (unsigned char) 3;
 	rc = kernel_scsi_ioctl(scsi_CDs[MINOR(inode->i_rdev)].device,
 			       SCSI_IOCTL_SEND_COMMAND, buf);
 	if (rc != 0) {
@@ -499,11 +499,11 @@
 	
 	/* now we do a get_density... */
 	memset(buf,0,40);
-	*((unsigned long*)buf)   = 0;
-	*((unsigned long*)buf+1) = 12;
-	cmd[0] = MODE_SENSE;
-	cmd[2] = 1;
-	cmd[4] = 12;
+	*((unsigned int*)buf)   = (unsigned int) 0;
+	*((unsigned int*)buf+1) = (unsigned int) 12;
+	cmd[0]                  = (unsigned char) MODE_SENSE;
+	cmd[2]                  = (unsigned char) 1;
+	cmd[4]                  = (unsigned char) 12;
 	rc = kernel_scsi_ioctl(scsi_CDs[MINOR(inode->i_rdev)].device,
 			       SCSI_IOCTL_SEND_COMMAND, buf);
 	if (rc != 0) {
@@ -520,15 +520,17 @@
 	    printk(KERN_DEBUG "sr_photocd: doing set_density\n");
 #endif
 	    memset(buf,0,40);
-	    *((unsigned long*)buf)   = 12;  /* sending 12 bytes... */
-	    *((unsigned long*)buf+1) = 0;
-	    cmd[0] = MODE_SELECT;
-	    cmd[1] = (1 << 4);
-	    cmd[4] = 12;
-	    send = &cmd[6];                 /* this is a 6-Byte command    */
-	    send[ 3] = 0x08;                /* the data for the command    */
-	    send[ 4] = (is_xa) ? 0x81 : 0;  /* density 0x81 for XA, 0 else */
-	    send[10] = 0x08;
+	    *((unsigned int*)buf)   = (unsigned int) 12;  /* send 12 bytes */
+	    *((unsigned int*)buf+1) = (unsigned int) 0;
+	    cmd[0]                  = (unsigned char) MODE_SELECT;
+	    cmd[1]                  = (unsigned char) (1 << 4);
+	    cmd[4]                  = (unsigned char) 12;
+            send = &cmd[6]; 		/* this is a 6-Byte command    */
+            send[ 3]                = (unsigned char) 0x08; /* data for cmd */
+            /* density 0x81 for XA, 0 else */
+            send[ 4]                = (is_xa) ? 
+                                    (unsigned char) 0x81 : (unsigned char) 0;  
+            send[10]                = (unsigned char) 0x08;
 	    rc = kernel_scsi_ioctl(scsi_CDs[MINOR(inode->i_rdev)].device,
 				   SCSI_IOCTL_SEND_COMMAND, buf);
 	    if (rc != 0) {
@@ -547,8 +549,8 @@
 #endif
 	get_sectorsize(MINOR(inode->i_rdev));	/* spinup (avoid timeout) */
 	memset(buf,0,40);
-	*((unsigned long*)buf)   = 0x0;   /* we send nothing...     */
-	*((unsigned long*)buf+1) = 0x0c;  /* and receive 0x0c bytes */
+	*((unsigned int*)buf)   = 0x0;   /* we send nothing...     */
+	*((unsigned int*)buf+1) = 0x0c;  /* and receive 0x0c bytes */
 	cmd[0] = READ_TOC;
 	cmd[8] = 0x0c;
 	cmd[9] = 0x40;
diff -u --recursive --new-file v2.0.12/linux/drivers/scsi/st.c linux/drivers/scsi/st.c
--- v2.0.12/linux/drivers/scsi/st.c	Mon Aug  5 10:13:53 1996
+++ linux/drivers/scsi/st.c	Fri Aug 16 08:02:48 1996
@@ -41,6 +41,7 @@
 
 #define MAJOR_NR SCSI_TAPE_MAJOR
 #include <linux/blk.h>
+
 #include "scsi.h"
 #include "hosts.h"
 #include <scsi/scsi_ioctl.h>
diff -u --recursive --new-file v2.0.12/linux/drivers/sound/mad16.c linux/drivers/sound/mad16.c
--- v2.0.12/linux/drivers/sound/mad16.c	Sat Jul  6 11:31:42 1996
+++ linux/drivers/sound/mad16.c	Wed Aug 14 10:21:03 1996
@@ -623,7 +623,7 @@
       return;
     }
 
-#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
+#if defined(CONFIG_UART401) && defined(CONFIG_MIDI)
   if (!already_initialized)
     return;
 
@@ -636,7 +636,7 @@
 int
 probe_mad16_mpu (struct address_info *hw_config)
 {
-#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
+#if defined(CONFIG_UART401) && defined(CONFIG_MIDI)
   static int      mpu_attached = 0;
   static int      valid_ports[] =
   {0x330, 0x320, 0x310, 0x300};
diff -u --recursive --new-file v2.0.12/linux/drivers/sound/sb_audio.c linux/drivers/sound/sb_audio.c
--- v2.0.12/linux/drivers/sound/sb_audio.c	Sat Aug 10 10:03:15 1996
+++ linux/drivers/sound/sb_audio.c	Wed Aug 14 10:21:03 1996
@@ -500,9 +500,9 @@
     {
       tmp = sb_getmixer (devc, 0x0e);
       if (devc->channels == 1)
-	tmp &= ~0x20;
+	tmp &= ~0x02;
       else
-	tmp |= 0x20;
+	tmp |= 0x02;
       sb_setmixer (devc, 0x0e, tmp);
     }
   restore_flags (flags);
diff -u --recursive --new-file v2.0.12/linux/drivers/sound/uart401.c linux/drivers/sound/uart401.c
--- v2.0.12/linux/drivers/sound/uart401.c	Sun Jun 30 11:44:22 1996
+++ linux/drivers/sound/uart401.c	Wed Aug 14 10:21:03 1996
@@ -427,6 +427,8 @@
   if (devc == NULL)
     return;
 
+  reset_uart401 (devc);
+
   release_region (hw_config->io_base, 4);
 
   if (!devc->share_irq)
diff -u --recursive --new-file v2.0.12/linux/fs/binfmt_aout.c linux/fs/binfmt_aout.c
--- v2.0.12/linux/fs/binfmt_aout.c	Thu May 16 11:06:34 1996
+++ linux/fs/binfmt_aout.c	Mon Aug 12 11:10:09 1996
@@ -91,7 +91,7 @@
 #       define START_DATA(u)	(u.u_tsize << PAGE_SHIFT)
 #endif
 
-	if (!current->dumpable)
+	if (!current->dumpable || current->mm->count != 1)
 		return 0;
 	current->dumpable = 0;
 
diff -u --recursive --new-file v2.0.12/linux/fs/binfmt_elf.c linux/fs/binfmt_elf.c
--- v2.0.12/linux/fs/binfmt_elf.c	Sat Aug 10 10:03:15 1996
+++ linux/fs/binfmt_elf.c	Mon Aug 12 11:09:46 1996
@@ -982,7 +982,7 @@
 	elf_fpregset_t fpu;		/* NT_PRFPREG */
 	struct elf_prpsinfo psinfo;	/* NT_PRPSINFO */
 	
-	if (!current->dumpable || limit < PAGE_SIZE)
+	if (!current->dumpable || limit < PAGE_SIZE || current->mm->count != 1)
 		return 0;
 	current->dumpable = 0;
 
diff -u --recursive --new-file v2.0.12/linux/fs/isofs/inode.c linux/fs/isofs/inode.c
--- v2.0.12/linux/fs/isofs/inode.c	Thu Aug  1 15:53:34 1996
+++ linux/fs/isofs/inode.c	Mon Aug 12 13:44:47 1996
@@ -25,7 +25,12 @@
 #include <asm/system.h>
 #include <asm/segment.h>
 
-#define MULTI_VOLUME
+/*
+ * We have no support for "multi volume" CDs, but more and more disks carry
+ * wrong information within the volume descriptors.
+ */
+#define IGNORE_WRONG_MULTI_VOLUME_SPECS
+
 #ifdef LEAK_CHECK
 static int check_malloc = 0;
 static int check_bread = 0;
@@ -161,7 +166,22 @@
 
 /*
  * look if the driver can tell the multi session redirection value
+ *
+ * don't change this if you don't know what you do, please!
+ * Multisession is legal only with XA disks.
+ * A non-XA disk with more than one volume descriptor may do it right, but
+ * usually is written in a nowhere standardized "multi-partition" manner.
+ * Multisession uses absolute addressing (solely the first frame of the whole
+ * track is #0), multi-partition uses relative addressing (each first frame of
+ * each track is #0), and a track is not a session.
+ *
+ * A broken CDwriter software or drive firmware does not set new standards,
+ * at least not if conflicting with the existing ones.
+ * 
+ * emoenke@gwdg.de
  */
+#define WE_OBEY_THE_WRITTEN_STANDARDS 1
+
 static unsigned int isofs_get_last_session(kdev_t dev)
 {
   struct cdrom_multisession ms_info;
@@ -189,7 +209,11 @@
 	  printk("isofs.inode: vol_desc_start = %d\n", ms_info.addr.lba);
 	}
 #endif 0
-      if ((i==0)&&(ms_info.xa_flag)) vol_desc_start=ms_info.addr.lba;
+      if (i==0)
+#if WE_OBEY_THE_WRITTEN_STANDARDS
+        if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
+#endif WE_OBEY_THE_WRITTEN_STANDARDS
+          vol_desc_start=ms_info.addr.lba;
     }
   return vol_desc_start;
 }
@@ -305,23 +329,23 @@
 	
 	if(high_sierra){
 	  rootp = (struct iso_directory_record *) h_pri->root_directory_record;
+#ifndef IGNORE_WRONG_MULTI_VOLUME_SPECS
 	  if (isonum_723 (h_pri->volume_set_size) != 1) {
-#ifndef  MULTI_VOLUME 
-	    printk("Multi-volume disks not (yet) supported.\n");
+	    printk("Multi-volume disks not supported.\n");
 	    goto out;
-#endif
 	  }
+#endif IGNORE_WRONG_MULTI_VOLUME_SPECS
 	  s->u.isofs_sb.s_nzones = isonum_733 (h_pri->volume_space_size);
 	  s->u.isofs_sb.s_log_zone_size = isonum_723 (h_pri->logical_block_size);
 	  s->u.isofs_sb.s_max_size = isonum_733(h_pri->volume_space_size);
 	} else {
 	  rootp = (struct iso_directory_record *) pri->root_directory_record;
+#ifndef IGNORE_WRONG_MULTI_VOLUME_SPECS
 	  if (isonum_723 (pri->volume_set_size) != 1) {
-#ifndef MULTI_VOLUME
-	    printk("Multi-volume disks not (yet) supported.\n");
+	    printk("Multi-volume disks not supported.\n");
 	    goto out;
-#endif
 	  }
+#endif IGNORE_WRONG_MULTI_VOLUME_SPECS
 	  s->u.isofs_sb.s_nzones = isonum_733 (pri->volume_space_size);
 	  s->u.isofs_sb.s_log_zone_size = isonum_723 (pri->logical_block_size);
 	  s->u.isofs_sb.s_max_size = isonum_733(pri->volume_space_size);
@@ -628,16 +652,16 @@
 	 */
 	if (inode->i_sb->u.isofs_sb.s_cruft == 'n' && 
 	    (volume_seq_no != 0) && (volume_seq_no != 1)) {
-	  printk("Warning: defective cdrom.  Enabling \"cruft\" mount option.\n");
+	  printk("Warning: defective cdrom (volume sequence number). Enabling \"cruft\" mount option.\n");
 	  inode->i_sb->u.isofs_sb.s_cruft = 'y';
 	}
 
-#ifndef MULTI_VOLUME
+#ifndef IGNORE_WRONG_MULTI_VOLUME_SPECS
 	if (inode->i_sb->u.isofs_sb.s_cruft != 'y' && 
 	    (volume_seq_no != 0) && (volume_seq_no != 1)) {
 		printk("Multi volume CD somehow got mounted.\n");
 	} else
-#endif	
+#endif IGNORE_WRONG_MULTI_VOLUME_SPECS
 	{
 	  if (S_ISREG(inode->i_mode))
 	    inode->i_op = &isofs_file_inode_operations;
diff -u --recursive --new-file v2.0.12/linux/fs/proc/array.c linux/fs/proc/array.c
--- v2.0.12/linux/fs/proc/array.c	Sat Aug 10 10:03:15 1996
+++ linux/fs/proc/array.c	Mon Aug 12 09:14:46 1996
@@ -427,8 +427,8 @@
 			if (ebp < stack_page || ebp >= 4092+stack_page)
 				return 0;
 			eip = *(unsigned long *) (ebp+4);
-			if ((void *)eip != sleep_on &&
-			    (void *)eip != interruptible_sleep_on)
+			if (eip < (unsigned long) interruptible_sleep_on
+			    || eip >= (unsigned long) add_timer)
 				return eip;
 			ebp = *(unsigned long *) ebp;
 		} while (count++ < 16);
diff -u --recursive --new-file v2.0.12/linux/include/asm-alpha/processor.h linux/include/asm-alpha/processor.h
--- v2.0.12/linux/include/asm-alpha/processor.h	Fri Dec 22 08:22:06 1995
+++ linux/include/asm-alpha/processor.h	Thu Aug 15 11:33:18 1996
@@ -39,6 +39,7 @@
 	 */
 	unsigned long flags;
 	unsigned long res1, res2;
+	unsigned long segment; 
 };
 
 #define INIT_MMAP { &init_mm, 0xfffffc0000000000,  0xfffffc0010000000, \
@@ -47,7 +48,7 @@
 #define INIT_TSS  { \
 	0, 0, 0, \
 	0, 0, 0, \
-	0, 0, 0, \
+	0, 0, 0, KERNEL_DS, \
 }
 
 #define alloc_kernel_stack()    get_free_page(GFP_KERNEL)
@@ -74,11 +75,6 @@
 /*
  * Do necessary setup to start up a newly executed thread.
  */
-static inline void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
-{
-	regs->pc = pc;
-	regs->ps = 8;
-	wrusp(sp);
-}
+extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
 
 #endif /* __ASM_ALPHA_PROCESSOR_H */
diff -u --recursive --new-file v2.0.12/linux/include/asm-alpha/segment.h linux/include/asm-alpha/segment.h
--- v2.0.12/linux/include/asm-alpha/segment.h	Sat Nov 25 11:54:56 1995
+++ linux/include/asm-alpha/segment.h	Tue Aug 13 09:27:48 1996
@@ -111,18 +111,12 @@
 #define KERNEL_DS 0
 #define USER_DS 1
 
-static inline unsigned long get_fs(void)
-{
-	return 1;
-}
+#define get_fs()	(current->tss.segment)
+#define set_fs(x)	(current->tss.segment=(x))
 
 static inline unsigned long get_ds(void)
 {
 	return 0;
-}
-
-static inline void set_fs(unsigned long val)
-{
 }
 
 #endif /* _ASM_SEGMENT_H */
diff -u --recursive --new-file v2.0.12/linux/include/linux/a.out.h linux/include/linux/a.out.h
--- v2.0.12/linux/include/linux/a.out.h	Mon May  6 12:44:32 1996
+++ linux/include/linux/a.out.h	Mon Aug 12 11:45:46 1996
@@ -94,15 +94,15 @@
 #endif
 
 #if !defined (N_DRELOFF)
-#define N_DRELOFF(x) (N_TRELOFF(x) + (x).a_trsize)
+#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x))
 #endif
 
 #if !defined (N_SYMOFF)
-#define N_SYMOFF(x) (N_DRELOFF(x) + (x).a_drsize)
+#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x))
 #endif
 
 #if !defined (N_STROFF)
-#define N_STROFF(x) (N_SYMOFF(x) + (x).a_syms)
+#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x))
 #endif
 
 /* Address of text segment in memory after it is loaded.  */
diff -u --recursive --new-file v2.0.12/linux/include/linux/blk.h linux/include/linux/blk.h
--- v2.0.12/linux/include/linux/blk.h	Thu Jul 25 20:26:46 1996
+++ linux/include/linux/blk.h	Fri Aug 16 08:05:01 1996
@@ -310,7 +310,8 @@
 
 #endif /* MAJOR_NR == whatever */
 
-#if ((MAJOR_NR != SCSI_TAPE_MAJOR) && !defined(IDE_DRIVER))
+#if (MAJOR_NR != SCSI_TAPE_MAJOR)
+#if !defined(IDE_DRIVER)
 
 #ifndef CURRENT
 #define CURRENT (blk_dev[MAJOR_NR].current_request)
@@ -362,12 +363,12 @@
 			panic(DEVICE_NAME ": block not locked"); \
 	}
 
-#endif /* (MAJOR_NR != SCSI_TAPE_MAJOR) && !defined(IDE_DRIVER) */
+#endif /* !defined(IDE_DRIVER) */
 
 /* end_request() - SCSI devices have their own version */
 /*               - IDE drivers have their own copy too */
 
-#if ! SCSI_MAJOR(MAJOR_NR)
+#if ! SCSI_BLK_MAJOR(MAJOR_NR)
 
 #if defined(IDE_DRIVER) && !defined(_IDE_C) /* shared copy for IDE modules */
 void ide_end_request(byte uptodate, ide_hwgroup_t *hwgroup);
@@ -423,7 +424,8 @@
 	wake_up(&wait_for_request);
 }
 #endif /* defined(IDE_DRIVER) && !defined(_IDE_C) */
-#endif /* ! SCSI_MAJOR(MAJOR_NR) */
+#endif /* ! SCSI_BLK_MAJOR(MAJOR_NR) */
+#endif /* (MAJOR_NR != SCSI_TAPE_MAJOR) */
 
 #endif /* defined(MAJOR_NR) || defined(IDE_DRIVER) */
 
diff -u --recursive --new-file v2.0.12/linux/include/linux/if_strip.h linux/include/linux/if_strip.h
--- v2.0.12/linux/include/linux/if_strip.h	Tue Apr  2 12:12:35 1996
+++ linux/include/linux/if_strip.h	Wed Aug 14 10:21:03 1996
@@ -18,10 +18,8 @@
 #ifndef __LINUX_STRIP_H
 #define __LINUX_STRIP_H
 
-typedef union {
-	__u32 l;
-	__u16 s[2];
-	__u8  c[4];
+typedef struct {
+    __u8 c[6];
 } MetricomAddress;
 
 #endif
diff -u --recursive --new-file v2.0.12/linux/include/linux/major.h linux/include/linux/major.h
--- v2.0.12/linux/include/linux/major.h	Mon Aug  5 10:13:54 1996
+++ linux/include/linux/major.h	Thu Aug 15 09:54:46 1996
@@ -73,14 +73,12 @@
  * Tests for SCSI devices.
  */
 
-#define SCSI_MAJOR(M) \
+#define SCSI_BLK_MAJOR(M) \
   ((M) == SCSI_DISK_MAJOR	\
-   || (M) == SCSI_TAPE_MAJOR	\
-   || (M) == SCSI_CDROM_MAJOR	\
-   || (M) == SCSI_GENERIC_MAJOR)
+   || (M) == SCSI_CDROM_MAJOR)
 
-static inline int scsi_major(int m) {
-	return SCSI_MAJOR(m);
+static inline int scsi_blk_major(int m) {
+	return SCSI_BLK_MAJOR(m);
 }
 
 #endif
diff -u --recursive --new-file v2.0.12/linux/include/linux/pci.h linux/include/linux/pci.h
--- v2.0.12/linux/include/linux/pci.h	Mon Jul 15 09:55:11 1996
+++ linux/include/linux/pci.h	Sat Aug 10 10:44:18 1996
@@ -556,6 +556,7 @@
 #define PCI_VENDOR_ID_ADAPTEC		0x9004
 #define PCI_DEVICE_ID_ADAPTEC_7850	0x5078
 #define PCI_DEVICE_ID_ADAPTEC_7855	0x5578
+#define PCI_DEVICE_ID_ADAPTEC_7860	0x6078
 #define PCI_DEVICE_ID_ADAPTEC_7870	0x7078
 #define PCI_DEVICE_ID_ADAPTEC_7871	0x7178
 #define PCI_DEVICE_ID_ADAPTEC_7872	0x7278
diff -u --recursive --new-file v2.0.12/linux/include/linux/proc_fs.h linux/include/linux/proc_fs.h
--- v2.0.12/linux/include/linux/proc_fs.h	Thu Jul 25 20:26:55 1996
+++ linux/include/linux/proc_fs.h	Thu Aug 15 11:38:54 1996
@@ -102,6 +102,8 @@
 	PROC_NET_ALIAS_TYPES,
 	PROC_NET_ALIASES,
 	PROC_NET_IP_MASQ_APP,
+	PROC_NET_STRIP_STATUS,
+	PROC_NET_STRIP_TRACE,
 	PROC_NET_LAST
 };
 
diff -u --recursive --new-file v2.0.12/linux/include/linux/sbpcd.h linux/include/linux/sbpcd.h
--- v2.0.12/linux/include/linux/sbpcd.h	Wed Jun  5 09:01:46 1996
+++ linux/include/linux/sbpcd.h	Mon Aug 12 13:44:47 1996
@@ -106,16 +106,6 @@
 /* Set this to 0 once you have configured your interface definitions right. */
 #define DISTRIBUTION 1
 
-#if DISTRIBUTION
-#define READ_AUDIO 0
-#define KLOGD_PAUSE 55
-#else
-/* max. number of audio frames to read with one     */
-/* request (allocates n* 2352 bytes kernel memory!) */
-/* may be freely adjusted, f.e. 75 (= 1 sec.), at   */
-/* runtime by use of the CDROMAUDIOBUFSIZ ioctl.    */
-#define READ_AUDIO 75
-
 /*
  * Time to wait after giving a message.
  * This gets important if you enable non-standard DBG_xxx flags.
@@ -124,13 +114,26 @@
  */
 #define KLOGD_PAUSE 1
 
-/* tray control: eject tray if no disk is in (0 or 1) */
+/* tray control: eject tray if no disk is in */
+#if DISTRIBUTION
+#define JUKEBOX 0
+#else
 #define JUKEBOX 1
+#endif DISTRIBUTION
 
-/* tray control: eject tray after last use (0 or 1) */
+/* tray control: eject tray after last use */
+#if DISTRIBUTION
+#define EJECT 0
+#else
 #define EJECT 1
 #endif DISTRIBUTION
 
+/* max. number of audio frames to read with one     */
+/* request (allocates n* 2352 bytes kernel memory!) */
+/* may be freely adjusted, f.e. 75 (= 1 sec.), at   */
+/* runtime by use of the CDROMAUDIOBUFSIZ ioctl.    */
+#define READ_AUDIO 0
+
 /*==========================================================================*/
 /*==========================================================================*/
 /*
@@ -449,6 +452,8 @@
 /*==========================================================================*/
 
 #define MAX_TRACKS	99
+
+#define ERR_DISKCHANGE 615
 
 /*==========================================================================*/
 /*
diff -u --recursive --new-file v2.0.12/linux/include/linux/ucdrom.h linux/include/linux/ucdrom.h
--- v2.0.12/linux/include/linux/ucdrom.h	Mon May 13 07:36:19 1996
+++ linux/include/linux/ucdrom.h	Wed Aug 14 10:21:03 1996
@@ -26,7 +26,7 @@
 /* specifications */
 	const int capability;           /* capability flags */
 	int mask;                       /* mask of capability: disables them */
-	const float speed;              /* maximum speed for reading data */
+	const int speed;                /* maximum speed for reading data */
 	const int minors;               /* number of minor devs supported */
 	const int capacity;             /* number of discs in jukebox */
 /* device-related storage */
diff -u --recursive --new-file v2.0.12/linux/mm/memory.c linux/mm/memory.c
--- v2.0.12/linux/mm/memory.c	Tue Jul 23 14:03:43 1996
+++ linux/mm/memory.c	Wed Aug 14 10:28:06 1996
@@ -534,7 +534,6 @@
 static void put_page(pte_t * page_table, pte_t pte)
 {
 	if (!pte_none(*page_table)) {
-		printk("put_page: page already exists %08lx\n", pte_val(*page_table));
 		free_page(pte_page(pte));
 		return;
 	}
diff -u --recursive --new-file v2.0.12/linux/mm/page_alloc.c linux/mm/page_alloc.c
--- v2.0.12/linux/mm/page_alloc.c	Sat Aug 10 10:03:16 1996
+++ linux/mm/page_alloc.c	Sat Aug 10 09:59:52 1996
@@ -43,7 +43,7 @@
 	unsigned int * map;
 };
 
-#define memory_head(x) ((struct page *)x)
+#define memory_head(x) ((struct page *)(x))
 
 static struct free_area_struct free_area[NR_MEM_LISTS];
 
diff -u --recursive --new-file v2.0.12/linux/mm/vmscan.c linux/mm/vmscan.c
--- v2.0.12/linux/mm/vmscan.c	Wed Jul 10 14:27:31 1996
+++ linux/mm/vmscan.c	Tue Aug 13 15:00:33 1996
@@ -428,7 +428,6 @@
 		if (!kswapd_awake && kswapd_ctl.maxpages > 0) {
 			wake_up(&kswapd_wait);
 			need_resched = 1;
-			kswapd_awake = 1;
 		}
 		next_swap_jiffies = jiffies + swapout_interval;
 	}
