From owner-p4-projects@FreeBSD.ORG  Sun Apr  2 04:33:52 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 7C36F16A426; Sun,  2 Apr 2006 04:33:51 +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 E32BF16A424
	for <perforce@freebsd.org>; Sun,  2 Apr 2006 04:33:48 +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 B0A8743D46
	for <perforce@freebsd.org>; Sun,  2 Apr 2006 04:33:48 +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 k324XmSr098980
	for <perforce@freebsd.org>; Sun, 2 Apr 2006 04:33:48 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k324XmtM098977
	for perforce@freebsd.org; Sun, 2 Apr 2006 04:33:48 GMT
	(envelope-from jmg@freebsd.org)
Date: Sun, 2 Apr 2006 04:33:48 GMT
Message-Id: <200604020433.k324XmtM098977@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 94439 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 04:33:52 -0000

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

Change 94439 by jmg@jmg_carbon-60 on 2006/04/02 04:33:20

	put cell_t back to unsigned long, and make hv_pci.c use a uint32_t...

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#7 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#2 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#7 (text+ko) ====

@@ -64,7 +64,7 @@
  * Prototypes for Open Firmware Interface Routines
  */
 
-typedef uint32_t cell_t;
+typedef unsigned long cell_t;
 
 typedef	unsigned int	ihandle_t;
 typedef unsigned int	phandle_t;

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

@@ -120,7 +120,7 @@
 {
 	struct hvpci_softc *sc;
 	phandle_t node;
-	cell_t cell;
+	uint32_t cell;
 
 	node = ofw_bus_get_node(dev);
 	if (node == -1)
@@ -129,7 +129,7 @@
 	sc = device_get_softc(dev);
 	if (OF_getprop(node, "reg", &cell, sizeof cell) == -1)
 		panic("%s: OF_getprop failed.", __func__);
-	sc->hs_devhandle = p1275_cell2uint(cell) & 0xfffffff;
+	sc->hs_devhandle = cell & 0xfffffff;
 
 	return (0);
 }