From owner-p4-projects@FreeBSD.ORG  Sun Apr  2 06:25:08 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F0E1C16A420; Sun,  2 Apr 2006 06:25:07 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D12A816A401
	for <perforce@freebsd.org>; Sun,  2 Apr 2006 06:25:07 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6FDA843D46
	for <perforce@freebsd.org>; Sun,  2 Apr 2006 06:25:07 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k326P7Br013874
	for <perforce@freebsd.org>; Sun, 2 Apr 2006 06:25:07 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k326P77x013871
	for perforce@freebsd.org; Sun, 2 Apr 2006 06:25:07 GMT
	(envelope-from jmg@freebsd.org)
Date: Sun, 2 Apr 2006 06:25:07 GMT
Message-Id: <200604020625.k326P77x013871@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94449 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sun, 02 Apr 2006 06:25:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=94449

Change 94449 by jmg@jmg_carbon-60 on 2006/04/02 06:24:07

	convert FreeBSD's width to HV's size enum...  and use the union
	to get the proper returned data.. hopefully packing won't be an
	issue...

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#7 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#7 (text+ko) ====

@@ -157,22 +157,46 @@
     int width)
 {
 	struct hvpci_softc *sc;
-	int r;
-#ifdef notyet
+	pci_config_size_t size;
 	pci_cfg_data_t data;
-#endif
-	uint32_t data;
+	uint32_t ret;
 
 	sc = device_get_softc(dev);
 
-	data = 0;
+	switch (width) {
+	case 1:
+		size = PCI_CFG_SIZE_BYTE;
+		break;
+	case 2:
+		size = PCI_CFG_SIZE_WORD;
+		break;
+	case 4:
+		size = PCI_CFG_SIZE_DWORD;
+		break;
+	default:
+		panic("unsupported width: %d", width);
+	}
+
 	r = hvio_config_get(sc->hs_devhandle, HVPCI_BDF(bus, slot, func),
-	    reg, width, &data);
+	    reg, size, &data);
 
 	printf("%d = read_config(%#x, %#x, %d, %d) = %#x\n", r,
-	    sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data);
-	if (r == H_EOK)
-		return data;
+	    sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, data.dw);
+
+	if (r == H_EOK) {
+		switch (width) {
+		case 1:
+			ret = data.b;
+			break;
+		case 2:
+			ret = data.w;
+			break;
+		case 4:
+			ret = data.dw;
+			break;
+		}
+		return ret;
+	}
 
 	return -1;
 }