From owner-p4-projects@FreeBSD.ORG  Fri Jan 10 20:28:32 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 73259414; Fri, 10 Jan 2014 20:28:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 33D9A412
 for <perforce@freebsd.org>; Fri, 10 Jan 2014 20:28:32 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1EEE81CE3
 for <perforce@freebsd.org>; Fri, 10 Jan 2014 20:28:32 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id s0AKSVsC077871
 for <perforce@freebsd.org>; Fri, 10 Jan 2014 20:28:31 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id s0AKSVp7077868
 for perforce@freebsd.org; Fri, 10 Jan 2014 20:28:31 GMT
 (envelope-from jhb@freebsd.org)
Date: Fri, 10 Jan 2014 20:28:31 GMT
Message-Id: <201401102028.s0AKSVp7077868@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1189941 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jan 2014 20:28:32 -0000

http://p4web.freebsd.org/@@1189941?ac=10

Change 1189941 by jhb@jhb_jhbbsd on 2014/01/10 20:27:37

	Output slot numbers.

Affected files ...

.. //depot/projects/pci/usr.sbin/pciconf/cap.c#2 edit

Differences ...

==== //depot/projects/pci/usr.sbin/pciconf/cap.c#2 (text+ko) ====

@@ -447,8 +447,10 @@
 		printf("type %d", (flags & PCIEM_FLAGS_TYPE) >> 4);
 		break;
 	}
-	if (flags & PCIEM_FLAGS_SLOT)
-		printf(" slot");
+	if (flags & PCIEM_FLAGS_SLOT) {
+		cap = read_config(fd, &p->pc_sel, ptr + PCIER_SLOT_CAP, 4);
+		printf(" slot %d", (cap & PCIEM_SLOT_CAP_PSN) >> 19);
+	}
 	if (flags & PCIEM_FLAGS_IRQ)
 		printf(" IRQ %d", (flags & PCIEM_FLAGS_IRQ) >> 9);
 	cap = read_config(fd, &p->pc_sel, ptr + PCIER_DEVICE_CAP, 4);