From owner-cvs-sys  Fri Sep  6 02:32:19 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA07730
          for cvs-sys-outgoing; Fri, 6 Sep 1996 02:32:19 -0700 (PDT)
Received: from GndRsh.aac.dev.com (GndRsh.aac.dev.com [198.145.92.241])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id CAA07719;
          Fri, 6 Sep 1996 02:32:14 -0700 (PDT)
Received: (from rgrimes@localhost) by GndRsh.aac.dev.com (8.6.12/8.6.12) id CAA12748; Fri, 6 Sep 1996 02:32:13 -0700
From: "Rodney W. Grimes" <rgrimes@GndRsh.aac.dev.com>
Message-Id: <199609060932.CAA12748@GndRsh.aac.dev.com>
Subject: Re: cvs commit:  src/sys/pci pcisupport.c
To: rgrimes@freefall.freebsd.org (Rodney W. Grimes)
Date: Fri, 6 Sep 1996 02:32:13 -0700 (PDT)
Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org,
        cvs-sys@freefall.freebsd.org
In-Reply-To: <199609060917.CAA07110@freefall.freebsd.org> from "Rodney W. Grimes" at "Sep 6, 96 02:17:09 am"
X-Mailer: ELM [version 2.4ME+ PL11 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

> rgrimes     96/09/06 02:17:09
> 
>   Branch:      sys/pci   RELENG_2_1_0
>   Modified:    sys/pci   pcisupport.c
>   Log:
>   First pass at merging minor differences between HEAD and RELENG_2_1_0,
>   this eliminates cosmetic differences and brings over the staticizing
>   of this file.
>   
>   Add detection of several Intel chips recently added to HEAD (Natoma and
>   Orion GX/KX).
>   
>   More clean up work will happen after pass 2 of merging once the files
>   are pretty much identical.  After that additional bootverbose chipset
>   register dumps will be added (Triton-II and Natoma).
>   
>   Revision  Changes    Path
>   1.13.4.4  +24 -19    src/sys/pci/pcisupport.c
> 

Looking at this file and all the #if defined (I686_CPU) cruft and the
ordering of chipsets makes me want a cleaner approach.  Also you have
to be _VERY_ carefull on what you exclude from certain CPU classes,
especially with devices other than HOST/PCI bridges (ie, a PCI/anything
bridge _can_ be used with _ANY_ cpu class.

Stephan, do you really want to be doing that in here??
-- 
Rod Grimes                                      rgrimes@gndrsh.aac.dev.com
Accurate Automation Company                 Reliable computers for FreeBSD