From owner-p4-projects@FreeBSD.ORG  Mon Dec 13 11:50:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D495216A4D0; Mon, 13 Dec 2004 11:50:09 +0000 (GMT)
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 A93BF16A4CE
	for <perforce@freebsd.org>; Mon, 13 Dec 2004 11:50:09 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 973C043D39
	for <perforce@freebsd.org>; Mon, 13 Dec 2004 11:50:09 +0000 (GMT)
	(envelope-from peter@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 iBDBo9qK034557
	for <perforce@freebsd.org>; Mon, 13 Dec 2004 11:50:09 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBDBo9pL034554
	for perforce@freebsd.org; Mon, 13 Dec 2004 11:50:09 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 13 Dec 2004 11:50:09 GMT
Message-Id: <200412131150.iBDBo9pL034554@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 66968 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 13 Dec 2004 11:50:10 -0000

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

Change 66968 by peter@peter_overcee on 2004/12/13 11:49:09

	make ath compile on 64 bit platforms

Affected files ...

.. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#2 edit
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#23 edit

Differences ...

==== //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#2 (text+ko) ====

@@ -310,7 +310,7 @@
 static void
 ath_rate_cb(void *arg, struct ieee80211_node *ni)
 {
-	ath_rate_update(ni->ni_ic->ic_ifp->if_softc, ni, (int) arg);
+	ath_rate_update(ni->ni_ic->ic_ifp->if_softc, ni, (int)(uintptr_t) arg);
 }
 
 /*

==== //depot/projects/hammer/sys/dev/ath/if_ath.c#23 (text+ko) ====

@@ -294,7 +294,7 @@
 	 */
 	sc->sc_keymax = ath_hal_keycachesize(ah);
 	if (sc->sc_keymax > sizeof(sc->sc_keymap) * NBBY) {
-		if_printf(ifp, "Warning, using only %u of %u key cache slots\n",
+		if_printf(ifp, "Warning, using only %zu of %u key cache slots\n",
 			sizeof(sc->sc_keymap) * NBBY, sc->sc_keymax);
 		sc->sc_keymax = sizeof(sc->sc_keymap) * NBBY;
 	}
@@ -2772,7 +2772,7 @@
 		return NULL;
 	}
 	if (qnum >= N(sc->sc_txq)) {
-		device_printf(sc->sc_dev, "hal qnum %u out of range, max %u!\n",
+		device_printf(sc->sc_dev, "hal qnum %u out of range, max %zu!\n",
 			qnum, N(sc->sc_txq));
 		ath_hal_releasetxqueue(ah, qnum);
 		return NULL;
@@ -2808,7 +2808,7 @@
 	struct ath_txq *txq;
 
 	if (ac >= N(sc->sc_ac2q)) {
-		device_printf(sc->sc_dev, "AC %u out of range, max %u!\n",
+		device_printf(sc->sc_dev, "AC %u out of range, max %zu!\n",
 			ac, N(sc->sc_ac2q));
 		return 0;
 	}
@@ -3578,7 +3578,8 @@
 	(void) ath_hal_stoptxdma(ah, txq->axq_qnum);
 	DPRINTF(sc, ATH_DEBUG_RESET, "%s: tx queue [%u] %p, link %p\n",
 	    __func__, txq->axq_qnum,
-	    (caddr_t) ath_hal_gettxbuf(ah, txq->axq_qnum), txq->axq_link);
+	    (caddr_t)(uintptr_t) ath_hal_gettxbuf(ah, txq->axq_qnum),
+	    txq->axq_link);
 }
 
 /*