summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjym <jym@NetBSD.org>2010-07-26 22:33:23 +0000
committerjym <jym@NetBSD.org>2010-07-26 22:33:23 +0000
commitda702eb93d3308fc8835d779ff21d992f8750fda (patch)
treefef65ad0418e5560b55de4ebd426c2989d570d53 /sys/dev
parent3dd552295f6cae2e76d08062fae8783488fe9b89 (diff)
Add PAE to ALL kernel, so that most paddr_t format string errors get caught
during compilation. While here, fix the compilation for ALL.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/ciss.c13
-rw-r--r--sys/dev/isa/isadma.c6
-rw-r--r--sys/dev/pci/cz.c8
-rw-r--r--sys/dev/pci/if_sk.c8
-rw-r--r--sys/dev/pci/if_wm.c10
-rw-r--r--sys/dev/pci/yds.c16
6 files changed, 30 insertions, 31 deletions
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index e4fbafe86db..c8afe614a25 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.20 2010/03/14 18:06:28 pgoyette Exp $ */
+/* $NetBSD: ciss.c,v 1.21 2010/07/26 22:33:24 jym Exp $ */
/* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.20 2010/03/14 18:06:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.21 2010/07/26 22:33:24 jym Exp $");
#include "bio.h"
@@ -469,9 +469,8 @@ ciss_cmd(struct ciss_ccb *ccb, int flags, int wait)
cmd->sgin = dmap->dm_nsegs;
sgd = dmap->dm_segs;
- CISS_DPRINTF(CISS_D_DMA, ("data=%p/%u<0x%lx/%lu",
- ccb->ccb_data, ccb->ccb_len, sgd->ds_addr,
- (u_long)sgd->ds_len));
+ CISS_DPRINTF(CISS_D_DMA, ("data=%p/%u<%#" PRIxPADDR "/%zu",
+ ccb->ccb_data, ccb->ccb_len, sgd->ds_addr,sgd->ds_len));
for (i = 0; i < dmap->dm_nsegs; sgd++, i++) {
cmd->sgl[i].addr_lo = htole32(sgd->ds_addr);
@@ -481,8 +480,8 @@ ciss_cmd(struct ciss_ccb *ccb, int flags, int wait)
cmd->sgl[i].flags = htole32(0);
if (i) {
CISS_DPRINTF(CISS_D_DMA,
- (",0x%lx/%lu", sgd->ds_addr,
- (u_long)sgd->ds_len));
+ (",%#" PRIxPADDR "/%zu", sgd->ds_addr,
+ sgd->ds_len));
}
}
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 05a800d9552..8b07fd7be86 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma.c,v 1.64 2010/04/19 18:24:26 dyoung Exp $ */
+/* $NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.64 2010/04/19 18:24:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -414,7 +414,7 @@ _isa_dmastart(struct isa_dma_state *ids, int chan, void *addr, bus_size_t nbytes
dmaaddr = dmam->dm_segs[0].ds_addr;
#ifdef ISADMA_DEBUG
- printf(" dmaaddr 0x%lx\n", dmaaddr);
+ printf(" dmaaddr %#" PRIxPADDR "\n", dmaaddr);
__asm(".globl isa_dmastart_aftersync ; isa_dmastart_aftersync:");
#endif
diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c
index 2705ee00430..02ca42ef359 100644
--- a/sys/dev/pci/cz.c
+++ b/sys/dev/pci/cz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cz.c,v 1.53 2009/11/26 15:17:09 njoly Exp $ */
+/* $NetBSD: cz.c,v 1.54 2010/07/26 22:33:24 jym Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.53 2009/11/26 15:17:09 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.54 2010/07/26 22:33:24 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -613,8 +613,8 @@ cz_load_firmware(struct cz_softc *cz)
cz->cz_fwctl = bus_space_read_4(cz->cz_win_st, cz->cz_win_sh,
ZFIRM_CTRLADDR_OFF);
#ifdef CZ_DEBUG
- aprint_debug_dev(&cz->cz_dev, "FWCTL structure at offset 0x%08lx\n",
- cz->cz_fwctl);
+ aprint_debug_dev(&cz->cz_dev, "FWCTL structure at offset "
+ "%#08" PRIxPADDR "\n", cz->cz_fwctl);
#endif
CZ_FWCTL_WRITE(cz, BRDCTL_C_OS, C_OS_BSD);
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index e87dbd3c6e6..1090140d541 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.67 2010/05/16 11:27:49 phx Exp $ */
+/* $NetBSD: if_sk.c,v 1.68 2010/07/26 22:33:24 jym Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.67 2010/05/16 11:27:49 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.68 2010/07/26 22:33:24 jym Exp $");
#include "rnd.h"
@@ -1597,8 +1597,8 @@ skc_attach(device_t parent, device_t self, void *aux)
return;
}
- DPRINTFN(2, ("skc_attach: iobase=%lx, iosize=%lx\n", iobase,
- (u_long)iosize));
+ DPRINTFN(2, ("skc_attach: iobase=%#" PRIxPADDR ", iosize=%zx\n",
+ iobase, iosize));
#endif
sc->sc_dmatag = pa->pa_dmat;
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index d0da7b43746..4c8176844a1 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.213 2010/07/21 15:35:39 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.214 2010/07/26 22:33:24 jym Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.213 2010/07/21 15:35:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.214 2010/07/26 22:33:24 jym Exp $");
#include "rnd.h"
@@ -2627,10 +2627,10 @@ wm_start(struct ifnet *ifp)
lasttx = nexttx;
DPRINTF(WM_DEBUG_TX,
- ("%s: TX: desc %d: low 0x%08lx, "
- "len 0x%04x\n",
+ ("%s: TX: desc %d: low %#" PRIxPADDR ", "
+ "len %#04zx\n",
device_xname(sc->sc_dev), nexttx,
- curaddr & 0xffffffffUL, (unsigned)curlen));
+ curaddr & 0xffffffffUL, curlen));
}
}
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 48bd3b69bdd..7aa32c96bf0 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.49 2010/02/24 22:38:01 dyoung Exp $ */
+/* $NetBSD: yds.c,v 1.50 2010/07/26 22:33:24 jym Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.49 2010/02/24 22:38:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.50 2010/07/26 22:33:24 jym Exp $");
#include "mpu.h"
@@ -285,18 +285,18 @@ yds_dump_play_slot(struct yds_softc *sc, int bank)
int i, j;
uint32_t *p;
uint32_t num;
- char *pa;
+ bus_addr_t pa;
for (i = 0; i < N_PLAY_SLOTS; i++) {
printf("pbankp[%d] = %p,", i*2, sc->pbankp[i*2]);
printf("pbankp[%d] = %p\n", i*2+1, sc->pbankp[i*2+1]);
}
- pa = (char *)DMAADDR(&sc->sc_ctrldata) + sc->pbankoff;
- p = (uint32_t *)sc->ptbl;
+ pa = DMAADDR(&sc->sc_ctrldata) + sc->pbankoff;
+ p = sc->ptbl;
printf("ptbl + 0: %d\n", *p++);
for (i = 0; i < N_PLAY_SLOTS; i++) {
- printf("ptbl + %d: 0x%x, should be %p\n",
+ printf("ptbl + %d: %#x, should be %#" PRIxPADDR "\n",
i+1, *p,
pa + i * sizeof(struct play_slot_ctrl_bank) *
N_PLAY_SLOT_CTRL_BANK);
@@ -449,8 +449,8 @@ yds_allocate_slots(struct yds_softc *sc)
mp = KERNADDR(p);
da = DMAADDR(p);
- DPRINTF(("mp:%p, DMA addr:%p\n",
- mp, (void *)sc->sc_ctrldata.map->dm_segs[0].ds_addr));
+ DPRINTF(("mp:%p, DMA addr:%#" PRIxPADDR "\n",
+ mp, sc->sc_ctrldata.map->dm_segs[0].ds_addr));
memset(mp, 0, memsize);