svn commit: r240568 - stable/9/usr.sbin/pciconf

[Gavin Atkinson]

Author: gavin
Date: Sun Sep 16 18:25:08 2012
New Revision: 240568
URL: http://svn.freebsd.org/changeset/base/240568

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/9/usr.sbin/pciconf/cap.c
Directory Properties:
  stable/9/usr.sbin/pciconf/   (props changed)

Modified: stable/9/usr.sbin/pciconf/cap.c
==============================================================================
--- stable/9/usr.sbin/pciconf/cap.c	Sun Sep 16 18:17:39 2012	(r240567)
+++ stable/9/usr.sbin/pciconf/cap.c	Sun Sep 16 18:25:08 2012	(r240568)
@@ -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)",