svn commit: r212922 - stable/7/usr.sbin/pciconf
John Baldwin
jhb at FreeBSD.org
Mon Sep 20 19:25:27 UTC 2010
Author: jhb
Date: Mon Sep 20 19:25:27 2010
New Revision: 212922
URL: http://svn.freebsd.org/changeset/base/212922
Log:
MFC 212369:
- Use 'sta' to hold the PCIR_STATUS register value instead of 'cmd' when
walking the capability list.
- Use constants for PCI header types instead of magic numbers.
Modified:
stable/7/usr.sbin/pciconf/cap.c
Directory Properties:
stable/7/usr.sbin/pciconf/ (props changed)
Modified: stable/7/usr.sbin/pciconf/cap.c
==============================================================================
--- stable/7/usr.sbin/pciconf/cap.c Mon Sep 20 19:25:15 2010 (r212921)
+++ stable/7/usr.sbin/pciconf/cap.c Mon Sep 20 19:25:27 2010 (r212922)
@@ -458,20 +458,20 @@ cap_pciaf(int fd, struct pci_conf *p, ui
void
list_caps(int fd, struct pci_conf *p)
{
- uint16_t cmd;
+ uint16_t sta;
uint8_t ptr, cap;
/* Are capabilities present for this device? */
- cmd = read_config(fd, &p->pc_sel, PCIR_STATUS, 2);
- if (!(cmd & PCIM_STATUS_CAPPRESENT))
+ sta = read_config(fd, &p->pc_sel, PCIR_STATUS, 2);
+ if (!(sta & PCIM_STATUS_CAPPRESENT))
return;
switch (p->pc_hdr & PCIM_HDRTYPE) {
- case 0:
- case 1:
+ case PCIM_HDRTYPE_NORMAL:
+ case PCIM_HDRTYPE_BRIDGE:
ptr = PCIR_CAP_PTR;
break;
- case 2:
+ case PCIM_HDRTYPE_CARDBUS:
ptr = PCIR_CAP_PTR_2;
break;
default:
More information about the svn-src-stable-7
mailing list