PERFORCE change 66968 for review
Peter Wemm
peter at FreeBSD.org
Mon Dec 13 03:50:10 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=66968
Change 66968 by peter at 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);
}
/*
More information about the p4-projects
mailing list