From owner-cvs-sys  Fri May 10 09:43:33 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id JAA04525
          for cvs-sys-outgoing; Fri, 10 May 1996 09:43:33 -0700 (PDT)
Received: (from gibbs@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id JAA04511
          Fri, 10 May 1996 09:43:21 -0700 (PDT)
Date: Fri, 10 May 1996 09:43:21 -0700 (PDT)
From: "Justin T. Gibbs" <gibbs>
Message-Id: <199605101643.JAA04511@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/dev/aic7xxx aic7xxx.seq aic7xxx_reg.h src/sys/i386/eisa aic7770.c src/sys/i386/scsi aic7xxx.c aic7xxx.h src/sys/pci aic7870.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

gibbs       96/05/10 09:43:20

  Branch:      sys/dev/aic7xxx  RELENG_2_1_0
  Modified:    sys/dev/aic7xxx  aic7xxx.seq aic7xxx_reg.h
  Log:
  Merge with HEAD.  Add bit definitions for determining if we should reset
  the scsi bus on probe, probe the B channel first, etc.
  
  Revision  Changes    Path
  1.16.4.12 +2 -2      src/sys/dev/aic7xxx/aic7xxx.seq
  1.2.2.5   +6 -3      src/sys/dev/aic7xxx/aic7xxx_reg.h

  Branch:      sys/i386/eisa  RELENG_2_1_0
  Modified:    sys/i386/eisa  aic7770.c
  Log:
  Merge with HEAD. Honor the SCSIID, bus off time, and primary channel selection
  set by the ECU even if the BIOS is not installed.
  
  Revision  Changes    Path
  1.21.2.3  +13 -21    src/sys/i386/eisa/aic7770.c

  Branch:      sys/i386/scsi  RELENG_2_1_0
  Modified:    sys/i386/scsi  aic7xxx.c aic7xxx.h
  Log:
  Merge with HEAD.  Only reset the channel if the user asked us to.  Add
  support for probing channel B before channel A on twin channel adapters.
  
  Revision  Changes    Path
  1.29.2.13 +119 -61   src/sys/i386/scsi/aic7xxx.c
  1.10.2.9  +32 -24    src/sys/i386/scsi/aic7xxx.h

  Branch:      sys/pci   RELENG_2_1_0
  Modified:    sys/pci   aic7870.c
  Log:
  Merge with HEAD.  Add scheme for determining if the BIOS was installed or
  not.  THis allows us to honor the settings made by the BIOS on chips that
  don't have a SEEPROM attached.
  
  Revision  Changes    Path
  1.11.2.11 +58 -30    src/sys/pci/aic7870.c