From owner-svn-src-stable@FreeBSD.ORG  Sun Sep 16 18:25:08 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A07711065670;
	Sun, 16 Sep 2012 18:25:08 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8AF598FC12;
	Sun, 16 Sep 2012 18:25:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8GIP8r8050631;
	Sun, 16 Sep 2012 18:25:08 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8GIP8TN050629;
	Sun, 16 Sep 2012 18:25:08 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201209161825.q8GIP8TN050629@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 16 Sep 2012 18:25:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240568 - stable/9/usr.sbin/pciconf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Sep 2012 18:25:08 -0000

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)",