Date: Sat, 20 Jul 2002 11:08:49 -0700 From: Peter Wemm <peter@wemm.org> To: Dag-Erling Smorgrav <des@ofug.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/conf files.sparc64 Message-ID: <20020720180849.2451E380A@overcee.wemm.org> In-Reply-To: <xzpeldytz2r.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
Dag-Erling Smorgrav wrote:
> Peter Wemm <peter@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020720180849.2451E380A>