From owner-cvs-src@FreeBSD.ORG Mon May 19 19:23:06 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 633DE1065670; Mon, 19 May 2008 19:23:06 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 500748FC23; Mon, 19 May 2008 19:23:06 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4JJN6w7006894; Mon, 19 May 2008 19:23:06 GMT (envelope-from marius@repoman.freebsd.org) Received: (from marius@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4JJN61i006893; Mon, 19 May 2008 19:23:06 GMT (envelope-from marius) Message-Id: <200805191923.m4JJN61i006893@repoman.freebsd.org> From: Marius Strobl Date: Mon, 19 May 2008 19:23:06 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/sparc64/include bus_common.h iommuvar.h src/sys/sparc64/pci psycho.c src/sys/sparc64/sbus sbus.c src/sys/sparc64/sparc64 counter.c iommu.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2008 19:23:06 -0000 marius 2008-05-19 19:23:06 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/sparc64/include bus_common.h iommuvar.h sys/sparc64/pci psycho.c sys/sparc64/sbus sbus.c sys/sparc64/sparc64 counter.c iommu.c Log: MFC: bus_common.h 1.9; iommuvar.h 1.17; psycho.c 1.77; sbus.c 1.46 (partial), 1.48; counter.c 1.7; iommu.c 1.44 (partial), 1.45 (partial), 1.47 - Use the name returned by device_get_nameunit(9) for the name of the counter-timer timecounter so the associated SYSCTL nodes don't clash on machines having multiple U2P and U2S bridges as well as establishing a clear mapping between these bridges and their timecounter device. - Don't bother setting up a "nice" name for the IOMMU, just use the name returned by device_get_nameunit(9), too. - Correct a typo in sbus_alloc_resource() which caused (pass-through) allocations to only work down to the grandchildren of the bus, which wasn't a real problem so far as we don't support any devices which are great-grandchildren or greater of a U2S bridge, yet. - Fix some minor style(9) bugs. - Use __FBSDID in counter.c and iommu.c. Revision Changes Path 1.5.2.2 +2 -2 src/sys/sparc64/include/bus_common.h 1.15.2.1 +7 -6 src/sys/sparc64/include/iommuvar.h 1.53.2.5 +39 -51 src/sys/sparc64/pci/psycho.c 1.35.2.5 +6 -11 src/sys/sparc64/sbus/sbus.c 1.6.2.1 +13 -11 src/sys/sparc64/sparc64/counter.c 1.43.2.1 +85 -79 src/sys/sparc64/sparc64/iommu.c