From owner-svn-src-all@FreeBSD.ORG Tue Mar 22 12:05:50 2011 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 7C6361065679; Tue, 22 Mar 2011 12:05:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4517A8FC1D; Tue, 22 Mar 2011 12:05:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2MC5nTv058937; Tue, 22 Mar 2011 12:05:49 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2MC5nDT058934; Tue, 22 Mar 2011 12:05:49 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201103221205.p2MC5nDT058934@svn.freebsd.org> From: John Baldwin Date: Tue, 22 Mar 2011 12:05:49 +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: r219865 - head/sys/dev/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: Tue, 22 Mar 2011 12:05:50 -0000 Author: jhb Date: Tue Mar 22 12:05:49 2011 New Revision: 219865 URL: http://svn.freebsd.org/changeset/base/219865 Log: Rename pci_find_extcap() to pci_find_cap(). PCI now uses the term "extended capabilities" to refer to the new set of capability structures starting at offset 0x100 in config space for PCI-express devices. For now both function names will still work. I will merge this to older branches to ease driver portability, but 9.0 will ship with a new pci_find_extcap() function that locates extended capabilities instead. Reviewed by: imp MFC after: 1 week Modified: head/sys/dev/pci/pci.c head/sys/dev/pci/pcivar.h Modified: head/sys/dev/pci/pci.c ============================================================================== --- head/sys/dev/pci/pci.c Tue Mar 22 10:39:34 2011 (r219864) +++ head/sys/dev/pci/pci.c Tue Mar 22 12:05:49 2011 (r219865) @@ -93,7 +93,7 @@ static char *pci_describe_device(device static int pci_modevent(module_t mod, int what, void *arg); static void pci_hdrtypedata(device_t pcib, int b, int s, int f, pcicfgregs *cfg); -static void pci_read_extcap(device_t pcib, pcicfgregs *cfg); +static void pci_read_cap(device_t pcib, pcicfgregs *cfg); static int pci_read_vpd_reg(device_t pcib, pcicfgregs *cfg, int reg, uint32_t *data); #if 0 @@ -536,7 +536,7 @@ pci_read_device(device_t pcib, int d, in pci_hdrtypedata(pcib, b, s, f, cfg); if (REG(PCIR_STATUS, 2) & PCIM_STATUS_CAPPRESENT) - pci_read_extcap(pcib, cfg); + pci_read_cap(pcib, cfg); STAILQ_INSERT_TAIL(devlist_head, devlist_entry, pci_links); @@ -564,7 +564,7 @@ pci_read_device(device_t pcib, int d, in } static void -pci_read_extcap(device_t pcib, pcicfgregs *cfg) +pci_read_cap(device_t pcib, pcicfgregs *cfg) { #define REG(n, w) PCIB_READ_CONFIG(pcib, cfg->bus, cfg->slot, cfg->func, n, w) #define WREG(n, v, w) PCIB_WRITE_CONFIG(pcib, cfg->bus, cfg->slot, cfg->func, n, v, w) @@ -1665,7 +1665,7 @@ pci_get_max_read_req(device_t dev) int cap; uint16_t val; - if (pci_find_extcap(dev, PCIY_EXPRESS, &cap) != 0) + if (pci_find_cap(dev, PCIY_EXPRESS, &cap) != 0) return (0); val = pci_read_config(dev, cap + PCIR_EXPRESS_DEVICE_CTL, 2); val &= PCIM_EXP_CTL_MAX_READ_REQUEST; @@ -1679,7 +1679,7 @@ pci_set_max_read_req(device_t dev, int s int cap; uint16_t val; - if (pci_find_extcap(dev, PCIY_EXPRESS, &cap) != 0) + if (pci_find_cap(dev, PCIY_EXPRESS, &cap) != 0) return (0); if (size < 128) size = 128; Modified: head/sys/dev/pci/pcivar.h ============================================================================== --- head/sys/dev/pci/pcivar.h Tue Mar 22 10:39:34 2011 (r219864) +++ head/sys/dev/pci/pcivar.h Tue Mar 22 12:05:49 2011 (r219865) @@ -401,9 +401,15 @@ pci_get_powerstate(device_t dev) } static __inline int +pci_find_cap(device_t dev, int capability, int *capreg) +{ + return (PCI_FIND_EXTCAP(device_get_parent(dev), dev, capability, capreg)); +} + +static __inline int pci_find_extcap(device_t dev, int capability, int *capreg) { - return PCI_FIND_EXTCAP(device_get_parent(dev), dev, capability, capreg); + return (PCI_FIND_EXTCAP(device_get_parent(dev), dev, capability, capreg)); } static __inline int