summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2007-04-12 05:56:01 +0000
committerdyoung <dyoung@NetBSD.org>2007-04-12 05:56:01 +0000
commitaf26ee6d9ca25148a3ee8fe6fe9d12eafdb7decd (patch)
treea1854ac52deb6b4a15bbd6cd2f6f89bc7de3557b /sys/dev/ic
parentcb9ef1cfbd0a98983fce921f4ae023e577b9e16b (diff)
Use PRIx64 and PRIx32 format strings. Remark about lack of DMA
synchronization at some debug code that reads descriptors.
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/gem.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index cb0ec4a4591..6e309c6ec83 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.54 2007/03/04 07:54:11 christos Exp $ */
+/* $NetBSD: gem.c,v 1.55 2007/04/12 05:56:01 dyoung Exp $ */
/*
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.54 2007/03/04 07:54:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.55 2007/04/12 05:56:01 dyoung Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -1340,15 +1340,15 @@ gem_tint(sc)
txs->txs_ndescs,
BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
-#ifdef GEM_DEBUG
+#ifdef GEM_DEBUG /* XXX DMA synchronization? */
if (ifp->if_flags & IFF_DEBUG) {
int i;
printf(" txsoft %p transmit chain:\n", txs);
for (i = txs->txs_firstdesc;; i = GEM_NEXTTX(i)) {
printf("descriptor %d: ", i);
- printf("gd_flags: 0x%016llx\t", (long long)
+ printf("gd_flags: 0x%016" PRIx64 "\t",
GEM_DMA_READ(sc, sc->sc_txdescs[i].gd_flags));
- printf("gd_addr: 0x%016llx\n", (long long)
+ printf("gd_addr: 0x%016" PRIx64 "\n",
GEM_DMA_READ(sc, sc->sc_txdescs[i].gd_addr));
if (i == txs->txs_lastdesc)
break;
@@ -1404,10 +1404,9 @@ gem_tint(sc)
#if 0
DPRINTF(sc, ("gem_tint: GEM_TX_STATE_MACHINE %x "
- "GEM_TX_DATA_PTR %llx "
- "GEM_TX_COMPLETION %x\n",
+ "GEM_TX_DATA_PTR %" PRIx64 "GEM_TX_COMPLETION %" PRIx32 "\n",
bus_space_read_4(sc->sc_bustag, sc->sc_h1, GEM_TX_STATE_MACHINE),
- ((long long) bus_space_read_4(sc->sc_bustag, sc->sc_h1,
+ ((uint64_t)bus_space_read_4(sc->sc_bustag, sc->sc_h1,
GEM_TX_DATA_PTR_HI) << 32) |
bus_space_read_4(sc->sc_bustag, sc->sc_h1,
GEM_TX_DATA_PTR_LO),