Author: gavin
Date: Sun Sep 16 18:26:32 2012
New Revision: 240569
URL: http://svn.freebsd.org/changeset/base/240569
Log:
Merge r240146 from head:
- If the PCIe "SLOT" flag is set, include this in the capability output
- Fix printing of PCIe interrupt number, the shift was incorrect.
Modified:
stable/8/usr.sbin/pciconf/cap.c
Directory Properties:
stable/8/usr.sbin/pciconf/ (props changed)
Modified: stable/8/usr.sbin/pciconf/cap.c
==============================================================================
--- stable/8/usr.sbin/pciconf/cap.c Sun Sep 16 18:25:08 2012
(r240568)
+++ stable/8/usr.sbin/pciconf/cap.c Sun Sep 16 18:26:32 2012
(r240569)
@@ -403,8 +403,10 @@ cap_express(int fd, struct pci_conf *p,
printf("type %d", (flags & PCIM_EXP_FLAGS_TYPE) >> 4);
break;
}
+ if (flags & PCIM_EXP_FLAGS_SLOT)
+ printf(" slot");
if (flags & PCIM_EXP_FLAGS_IRQ)
- printf(" IRQ %d", (flags & PCIM_EXP_FLAGS_IRQ) >> 8);
+ printf(" IRQ %d", (flags & PCIM_EXP_FLAGS_IRQ) >> 9);
val = read_config(fd, &p->pc_sel, ptr + PCIR_EXPRESS_DEVICE_CAP, 4);
flags = read_config(fd, &p->pc_sel, ptr + PCIR_EXPRESS_DEVICE_CTL, 2);
printf(" max data %d(%d)",
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
