From owner-p4-projects@FreeBSD.ORG  Wed Jul 12 05:42:24 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 AB7DD16A4E1; Wed, 12 Jul 2006 05:42:24 +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 8713716A4DD
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 05:42:24 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 509ED43D45
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 05:42:24 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6C5gO8A067205
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 05:42:24 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6C5gOhG067202
	for perforce@freebsd.org; Wed, 12 Jul 2006 05:42:24 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 12 Jul 2006 05:42:24 GMT
Message-Id: <200607120542.k6C5gOhG067202@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101329 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: Wed, 12 Jul 2006 05:42:24 -0000

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

Change 101329 by kmacy@kmacy_storage:sun4v_work_stable on 2006/07/12 05:41:27

	revert mpt_read - fix select callers

Affected files ...

.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.c#6 edit
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.h#7 edit

Differences ...

==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.c#6 (text+ko) ====

@@ -824,19 +824,19 @@
 }
 
 /******************************* Doorbell Access ******************************/
-static __inline uint32_t mpt_rd_db(struct mpt_softc *mpt);
-static __inline  uint32_t mpt_rd_intr(struct mpt_softc *mpt);
+static __inline uint16_t mpt_rd_db(struct mpt_softc *mpt);
+static __inline  uint16_t mpt_rd_intr(struct mpt_softc *mpt);
 
-static __inline uint32_t
+static __inline uint16_t
 mpt_rd_db(struct mpt_softc *mpt)
 {
-	return mpt_read(mpt, MPT_OFFSET_DOORBELL);
+	return mpt_read_16(mpt, MPT_OFFSET_DOORBELL);
 }
 
-static __inline uint32_t
+static __inline uint16_t
 mpt_rd_intr(struct mpt_softc *mpt)
 {
-	return mpt_read(mpt, MPT_OFFSET_INTR_STATUS);
+	return mpt_read_16(mpt, MPT_OFFSET_INTR_STATUS);
 }
 
 /* Busy wait for a door bell to be read by IOC */
@@ -1359,12 +1359,12 @@
 mpt_recv_handshake_reply(struct mpt_softc *mpt, size_t reply_len, void *reply)
 {
 	int left, reply_left;
-	u_int16_t *data16;
+	uint16_t *data16;
 	MSG_DEFAULT_REPLY *hdr;
 
 	/* We move things out in 16 bit chunks */
 	reply_len >>= 1;
-	data16 = (u_int16_t *)reply;
+	data16 = (uint16_t *)reply;
 
 	hdr = (MSG_DEFAULT_REPLY *)reply;
 

==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mpt/mpt.h#7 (text+ko) ====

@@ -832,7 +832,7 @@
 static __inline uint32_t
 mpt_read(struct mpt_softc *mpt, int offset)
 {
-	return (bus_space_read_2(mpt->pci_st, mpt->pci_sh, offset));
+	return (bus_space_read_4(mpt->pci_st, mpt->pci_sh, offset));
 }
 
 static __inline uint16_t