From owner-svn-src-all@FreeBSD.ORG Thu Mar 19 21:12:44 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7799E106566C; Thu, 19 Mar 2009 21:12:44 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6526A8FC17; Thu, 19 Mar 2009 21:12:44 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JLCiGU076249; Thu, 19 Mar 2009 21:12:44 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JLCiGs076248; Thu, 19 Mar 2009 21:12:44 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200903192112.n2JLCiGs076248@svn.freebsd.org> From: Marius Strobl Date: Thu, 19 Mar 2009 21:12:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190113 - head/sys/sparc64/pci X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2009 21:12:45 -0000 Author: marius Date: Thu Mar 19 21:12:44 2009 New Revision: 190113 URL: http://svn.freebsd.org/changeset/base/190113 Log: Bring the implementation of the pnpinfo string function more in line with the rest of this file. Modified: head/sys/sparc64/pci/ofw_pcibus.c Modified: head/sys/sparc64/pci/ofw_pcibus.c ============================================================================== --- head/sys/sparc64/pci/ofw_pcibus.c Thu Mar 19 21:02:36 2009 (r190112) +++ head/sys/sparc64/pci/ofw_pcibus.c Thu Mar 19 21:12:44 2009 (r190113) @@ -68,8 +68,7 @@ static device_probe_t ofw_pcibus_probe; static device_attach_t ofw_pcibus_attach; static pci_assign_interrupt_t ofw_pcibus_assign_interrupt; static ofw_bus_get_devinfo_t ofw_pcibus_get_devinfo; -static int ofw_pcibus_child_pnpinfo_str_method(device_t cbdev, device_t child, - char *buf, size_t buflen); +static bus_child_pnpinfo_str_t ofw_pcibus_pnpinfo_str; static device_method_t ofw_pcibus_methods[] = { /* Device interface */ @@ -77,7 +76,7 @@ static device_method_t ofw_pcibus_method DEVMETHOD(device_attach, ofw_pcibus_attach), /* Bus interface */ - DEVMETHOD(bus_child_pnpinfo_str, ofw_pcibus_child_pnpinfo_str_method), + DEVMETHOD(bus_child_pnpinfo_str, ofw_pcibus_pnpinfo_str), /* PCI interface */ DEVMETHOD(pci_assign_interrupt, ofw_pcibus_assign_interrupt), @@ -306,16 +305,15 @@ ofw_pcibus_get_devinfo(device_t bus, dev } static int -ofw_pcibus_child_pnpinfo_str_method(device_t cbdev, device_t child, char *buf, +ofw_pcibus_pnpinfo_str(device_t dev, device_t child, char *buf, size_t buflen) { - pci_child_pnpinfo_str_method(cbdev, child, buf, buflen); + pci_child_pnpinfo_str_method(dev, child, buf, buflen); if (ofw_bus_get_node(child) != -1) { - strlcat(buf, " ", buflen); /* Separate info */ - ofw_bus_gen_child_pnpinfo_str(cbdev, child, buf, buflen); + strlcat(buf, " ", buflen); /* Separate info. */ + ofw_bus_gen_child_pnpinfo_str(dev, child, buf, buflen); } return (0); } -