From owner-cvs-all  Sat Jul 20 13:31:53 2002
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E9F0C37B400; Sat, 20 Jul 2002 13:31:42 -0700 (PDT)
Received: from magic.adaptec.com (magic.adaptec.com [208.236.45.80])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3C2D443E4A; Sat, 20 Jul 2002 13:31:42 -0700 (PDT)
	(envelope-from scottl@btc.adaptec.com)
Received: from redfish.adaptec.com (redfish.adaptec.com [162.62.50.11])
	by magic.adaptec.com (8.10.2+Sun/8.10.2) with ESMTP id g6KKVNr18676;
	Sat, 20 Jul 2002 13:31:23 -0700 (PDT)
Received: from btc.btc.adaptec.com (btc.btc.adaptec.com [10.100.0.52])
	by redfish.adaptec.com (8.8.8+Sun/8.8.8) with ESMTP id NAA05439;
	Sat, 20 Jul 2002 13:31:21 -0700 (PDT)
Received: from hollin.btc.adaptec.com (hollin [10.100.253.56])
	by btc.btc.adaptec.com (8.8.8+Sun/8.8.8) with ESMTP id OAA20230;
	Sat, 20 Jul 2002 14:31:18 -0600 (MDT)
Received: from hollin.btc.adaptec.com (localhost [127.0.0.1])
	by hollin.btc.adaptec.com (8.12.5/8.12.5) with ESMTP id g6KKSYjF043976;
	Sat, 20 Jul 2002 14:28:34 -0600 (MDT)
	(envelope-from scottl@hollin.btc.adaptec.com)
Received: (from scottl@localhost)
	by hollin.btc.adaptec.com (8.12.5/8.12.5/Submit) id g6KKSXiC043975;
	Sat, 20 Jul 2002 14:28:33 -0600 (MDT)
Date: Sat, 20 Jul 2002 14:28:32 -0600
From: Scott Long <scott_long@btc.adaptec.com>
To: Peter Wemm <peter@wemm.org>
Cc: Dag-Erling Smorgrav <des@ofug.org>, cvs-committers@freebsd.org,
	cvs-all@freebsd.org
Subject: Re: cvs commit: src/sys/conf files.sparc64
Message-ID: <20020720202832.GA43959@hollin.btc.adaptec.com>
References: <20020720180849.2451E380A@overcee.wemm.org> <20020720182831.28454380A@overcee.wemm.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20020720182831.28454380A@overcee.wemm.org>
User-Agent: Mutt/1.3.28i
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

> Index: dev/aic7xxx/aic79xx_osm.h
> ===================================================================
> RCS file: /home/ncvs/src/sys/dev/aic7xxx/aic79xx_osm.h,v
> retrieving revision 1.2
> diff -u -r1.2 aic79xx_osm.h
> --- dev/aic7xxx/aic79xx_osm.h	6 Jun 2002 16:35:57 -0000	1.2
> +++ dev/aic7xxx/aic79xx_osm.h	20 Jul 2002 17:51:55 -0000
> @@ -38,9 +38,6 @@
>  #define _AIC79XX_FREEBSD_H_
>  
>  #include <opt_aic79xx.h>	/* for config options */
> -#ifndef NPCI
> -#include <pci.h>
> -#endif
>  
>  #include <sys/param.h>
>  #include <sys/systm.h>
> @@ -60,10 +57,8 @@
>  
>  #include <sys/rman.h>
>  
> -#if NPCI > 0
>  #include <pci/pcireg.h>
>  #include <pci/pcivar.h>
> -#endif
>  
>  #include <cam/cam.h>
>  #include <cam/cam_ccb.h>

While this is probably harmless, there might be non-pci attachments in the
future that break this.

> Index: dev/aic7xxx/aic7xxx_osm.h
> ===================================================================
> RCS file: /home/ncvs/src/sys/dev/aic7xxx/aic7xxx_osm.h,v
> retrieving revision 1.14
> diff -u -r1.14 aic7xxx_osm.h
> --- dev/aic7xxx/aic7xxx_osm.h	26 Apr 2002 22:48:20 -0000	1.14
> +++ dev/aic7xxx/aic7xxx_osm.h	20 Jul 2002 17:52:06 -0000
> @@ -38,9 +38,6 @@
>  #define _AIC7XXX_FREEBSD_H_
>  
>  #include <opt_aic7xxx.h>	/* for config options */
> -#ifndef NPCI
> -#include <pci.h>
> -#endif
>  
>  #include <sys/param.h>
>  #include <sys/systm.h>
> @@ -51,12 +48,10 @@
>  #include <sys/malloc.h>
>  #include <sys/queue.h>
>  
> -#if NPCI > 0
>  #define AHC_PCI_CONFIG 1
>  #ifdef AHC_ALLOW_MEMIO
>  #include <machine/bus_memio.h>
>  #endif
> -#endif
>  #include <machine/bus_pio.h>
>  #include <machine/bus.h>
>  #include <machine/endian.h>
> @@ -65,10 +60,8 @@
>  
>  #include <sys/rman.h>
>  
> -#if NPCI > 0
>  #include <pci/pcireg.h>
>  #include <pci/pcivar.h>
> -#endif
>  
>  #include <cam/cam.h>
>  #include <cam/cam_ccb.h>

This will break the 274x and 284x cards (EISA and VLB, respectively).

Is getting rid of NPCI an urgent issue?  The aic7xxx can probably be fixed,
but not without some effort.  I need to resurrect the work I did on
separating the driver into descrete attachment front-ends.

Scott

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message