Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Sep 2012 18:26:33 +0000 (UTC)
From:      Gavin Atkinson <gavin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r240569 - stable/8/usr.sbin/pciconf
Message-ID:  <201209161826.q8GIQXNT050947@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)",



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209161826.q8GIQXNT050947>