From owner-cvs-all Sat Jul 20 11: 9: 0 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 95E9237B400; Sat, 20 Jul 2002 11:08:53 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DBF343E64; Sat, 20 Jul 2002 11:08:49 -0700 (PDT) (envelope-from peter@wemm.org) Received: from fw.wemm.org (canning.wemm.org [192.203.228.65]) by canning.wemm.org (Postfix) with ESMTP id 6F3BD2A7D6; Sat, 20 Jul 2002 11:08:49 -0700 (PDT) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (Postfix) with ESMTP id 2B5AF4C260; Sat, 20 Jul 2002 11:08:49 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 2451E380A; Sat, 20 Jul 2002 11:08:49 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Dag-Erling Smorgrav Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/conf files.sparc64 In-Reply-To: Date: Sat, 20 Jul 2002 11:08:49 -0700 From: Peter Wemm Message-Id: <20020720180849.2451E380A@overcee.wemm.org> Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Dag-Erling Smorgrav wrote: > Peter Wemm writes: > > Log: > > ebus is not a 'count' device. There are no NEBUS references. > > That reminds me - > > des@des ~% kcurrent -w NPCI > sys/dev/aic7xxx/aic7xxx_osm.h: #ifndef NPCI > sys/dev/aic7xxx/aic7xxx_osm.h: #if NPCI > 0 > sys/dev/aic7xxx/aic7xxx_osm.h: #if NPCI > 0 > sys/dev/aic7xxx/aic79xx_osm.h: #ifndef NPCI > sys/dev/aic7xxx/aic79xx_osm.h: #if NPCI > 0 Yep, trivial. (already done) > sys/dev/ata/ata-isa.c: #if NPCI == 0 Not trivial, ata is a bit broken in this regard. I'd suggest an addittional option ATA_NOPCI or something to enable compiling these stubs. A real fix is more intrusive. (done, if you count the option hack) Incidently, if you try and use the code in -current without PCI, you get: ../../../dev/ata/ata-isa.c:140: conflicting types for `ata_dmastart' ../../../dev/ata/ata-all.h:281: previous declaration of `ata_dmastart' I've fixed this too.. it was a stale stub function that used to return void but should now return int. > sys/dev/bktr/CHANGELOG.TXT: Small cleanup of OS dependant code. Remove NPCI usage. I've also fixed NBKTR and NSMBUS as well. > sys/dev/buslogic/bt.c: #if NPCI > 0 Trivial, it is inside #if 0 (done) > sys/i386/isa/stallion.c: #undef NPCI > sys/i386/isa/stallion.c: #define NPCI 0 > sys/i386/isa/stallion.c: #if NPCI > 0 > sys/i386/isa/stallion.c: #if NPCI > 0 > sys/i386/isa/stallion.c: #if NPCI > 0 > sys/i386/isa/stallion.c: #if NPCI > 0 > sys/i386/isa/stallion.c: #if NPCI > 0 Well, given that it is #undef NPCI, it should be pretty easy to remove the 'count' flag there. (done) > Shouldn't be too hard to fix? Not at all. :-) Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message