From owner-cvs-all Wed Sep 27 17:37:35 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C2F0837B424; Wed, 27 Sep 2000 17:37:32 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id RAA24377; Wed, 27 Sep 2000 17:37:32 -0700 (PDT) (envelope-from peter@FreeBSD.org) Message-Id: <200009280037.RAA24377@freefall.freebsd.org> From: Peter Wemm Date: Wed, 27 Sep 2000 17:37:32 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/i386/i386 nexus.c src/sys/i386/include nexusvar.h src/sys/i386/isa pcibus.c src/sys/pci pcivar.h X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG peter 2000/09/27 17:37:32 PDT Modified files: sys/i386/i386 nexus.c sys/i386/isa pcibus.c sys/pci pcivar.h Added files: sys/i386/include nexusvar.h Log: Get out the roto-rooter and clean up the abuse of nexus ivars by the i386/isa/pcibus.c. This gets -current running again on multiple host->pci machines after the most recent nexus commits. I had discussed this with Mike Smith, but ended up doing it slightly differently to what we discussed as it turned out cleaner this way. Mike was suggesting creating a new resource (SYS_RES_PCIBUS) or something and using *_[gs]et_resource(), but IMHO that wasn't ideal as SYS_RES_* is meant to be a global platform property, not a quirk of a given implementation. This does use the ivar methods but does so properly. It also now prints the physical pci bus that a host->pci bridge (pcib) corresponds to. Revision Changes Path 1.35 +44 -4 src/sys/i386/i386/nexus.c 1.66 +7 -20 src/sys/i386/isa/pcibus.c 1.48 +7 -3 src/sys/pci/pcivar.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message