summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-12-20 22:40:29 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-12-20 22:40:29 +0000
commitacd546db8dd605ab724c92814d869e5e38539823 (patch)
treeff5855e5d552ffabcbc6c35ef9c901cc6e316493 /sys/arch
parenta1fc6b50a125f21c126bde71cba554908725f810 (diff)
Pass -Wformat
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/macppc/dev/macintr.c4
-rw-r--r--sys/arch/macppc/macppc/dma.c4
-rw-r--r--sys/arch/macppc/macppc/machdep.c10
-rw-r--r--sys/arch/macppc/pci/mpcpcibus.c4
-rw-r--r--sys/arch/macppc/pci/pci_addr_fixup.c6
-rw-r--r--sys/arch/mvmeppc/mvmeppc/machdep.c6
-rw-r--r--sys/arch/mvmeppc/pci/mpcpcibr.c4
-rw-r--r--sys/arch/pegasos/pci/mpcpcibus.c4
-rw-r--r--sys/arch/pegasos/pci/pci_addr_fixup.c6
-rw-r--r--sys/arch/pegasos/pegasos/dma.c4
-rw-r--r--sys/arch/pegasos/pegasos/machdep.c6
-rw-r--r--sys/arch/pegasos/pegasos/rdbdisksubr.c10
-rw-r--r--sys/arch/powerpc/powerpc/pmap.c4
13 files changed, 36 insertions, 36 deletions
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c
index 83561ea55b4..70699daa86a 100644
--- a/sys/arch/macppc/dev/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macintr.c,v 1.21 2003/10/19 21:57:35 drahn Exp $ */
+/* $OpenBSD: macintr.c,v 1.22 2003/12/20 22:40:26 miod Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@@ -174,7 +174,7 @@ macintr_collect_preconf_intr()
{
int i;
for (i = 0; i < ppc_configed_intr_cnt; i++) {
- printf("\n\t%s irq %d level %d fun %x arg %x",
+ printf("\n\t%s irq %d level %d fun %p arg %p",
ppc_configed_intr[i].ih_what,
ppc_configed_intr[i].ih_irq,
ppc_configed_intr[i].ih_level,
diff --git a/sys/arch/macppc/macppc/dma.c b/sys/arch/macppc/macppc/dma.c
index 90479887d17..9b1f78b8a95 100644
--- a/sys/arch/macppc/macppc/dma.c
+++ b/sys/arch/macppc/macppc/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.20 2003/10/15 17:50:16 drahn Exp $ */
+/* $OpenBSD: dma.c,v 1.21 2003/12/20 22:40:27 miod Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -140,7 +140,7 @@ _dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
* Get the physical address for this segment.
*/
if (pmap_extract(pmap, vaddr, (paddr_t *)&curaddr) != TRUE) {
- panic("dmamap_load_buffer pmap %x vaddr %x "
+ panic("dmamap_load_buffer pmap %p vaddr %lx "
"pmap_extract failed", pmap, vaddr);
}
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index d8b38f6bc8a..735d6fd40ba 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.64 2003/11/06 21:09:35 mickey Exp $ */
+/* $OpenBSD: machdep.c,v 1.65 2003/12/20 22:40:27 miod Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -566,8 +566,8 @@ cpu_startup()
VM_PHYS_SIZE, 0, FALSE, NULL);
ppc_malloc_ok = 1;
- printf("avail mem = %d (%dK)\n", ptoa(uvmexp.free),
- ptoa(uvmexp.free)/1024);
+ printf("avail mem = %ld (%ldK)\n", ptoa(uvmexp.free),
+ ptoa(uvmexp.free) / 1024);
printf("using %d buffers containing %d bytes of memory\n", nbuf,
bufpages * PAGE_SIZE);
@@ -1030,7 +1030,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size,
if (extent_free(devio_ex, bpa, size, EX_NOWAIT |
(ppc_malloc_ok ? EX_MALLOCOK : 0)))
{
- printf("bus_space_map: pa 0x%x, size 0x%x\n",
+ printf("bus_space_map: pa 0x%lx, size 0x%x\n",
bpa, size);
printf("bus_space_map: can't free region\n");
}
@@ -1062,7 +1062,7 @@ bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
if (extent_free(devio_ex, bpa | (bsh & PAGE_MASK), size, EX_NOWAIT |
(ppc_malloc_ok ? EX_MALLOCOK : 0)))
{
- printf("bus_space_map: pa 0x%x, size 0x%x\n",
+ printf("bus_space_map: pa 0x%lx, size 0x%x\n",
bpa, size);
printf("bus_space_map: can't free region\n");
}
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index 47ae13940de..9e0713d53af 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibus.c,v 1.22 2003/10/21 17:18:14 drahn Exp $ */
+/* $OpenBSD: mpcpcibus.c,v 1.23 2003/12/20 22:40:27 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -905,7 +905,7 @@ mpc_intr_string(void *lcv, pci_intr_handle_t ih)
{
static char str[16];
- snprintf(str, sizeof str, "irq %d", ih);
+ snprintf(str, sizeof str, "irq %ld", ih);
return(str);
}
diff --git a/sys/arch/macppc/pci/pci_addr_fixup.c b/sys/arch/macppc/pci/pci_addr_fixup.c
index 30b47157af5..37c15342aa3 100644
--- a/sys/arch/macppc/pci/pci_addr_fixup.c
+++ b/sys/arch/macppc/pci/pci_addr_fixup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_addr_fixup.c,v 1.8 2003/11/03 06:43:02 david Exp $ */
+/* $OpenBSD: pci_addr_fixup.c,v 1.9 2003/12/20 22:40:27 miod Exp $ */
/* $NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $ */
/*-
@@ -283,11 +283,11 @@ pciaddr_do_resource_allocate(struct pcibr_softc *sc, pci_chipset_tag_t pc,
if (pciaddr_ioaddr(pci_conf_read(pc, tag, mapreg)) != *addr) {
pci_conf_write(pc, tag, mapreg, 0); /* clear */
- printf("fixup failed. (new address=%#x)\n", *addr);
+ printf("fixup failed. (new address=%#lx)\n", *addr);
return (1);
}
if (pcibr_flags & PCIBR_VERBOSE)
- printf("new address 0x%08x\n", *addr);
+ printf("new address 0x%08lx\n", *addr);
return (0);
}
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index 9edbc513b47..23212a26786 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.35 2003/11/25 21:16:44 drahn Exp $ */
+/* $OpenBSD: machdep.c,v 1.36 2003/12/20 22:40:27 miod Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -589,8 +589,8 @@ cpu_startup()
VM_PHYS_SIZE, 0, FALSE, NULL);
ppc_malloc_ok = 1;
- printf("avail mem = %d (%dK)\n", ptoa(uvmexp.free),
- ptoa(uvmexp.free)/1024);
+ printf("avail mem = %ld (%ldK)\n", ptoa(uvmexp.free),
+ ptoa(uvmexp.free) / 1024);
printf("using %d buffers containing %d bytes of memory\n", nbuf,
bufpages * PAGE_SIZE);
diff --git a/sys/arch/mvmeppc/pci/mpcpcibr.c b/sys/arch/mvmeppc/pci/mpcpcibr.c
index 20fd5718673..60af47188c8 100644
--- a/sys/arch/mvmeppc/pci/mpcpcibr.c
+++ b/sys/arch/mvmeppc/pci/mpcpcibr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibr.c,v 1.11 2003/05/11 19:41:11 deraadt Exp $ */
+/* $OpenBSD: mpcpcibr.c,v 1.12 2003/12/20 22:40:27 miod Exp $ */
/*
* Copyright (c) 2001 Steve Murphree, Jr.
@@ -520,7 +520,7 @@ mpc_intr_string(lcv, ih)
{
static char str[16];
- snprintf(str, sizeof str, "irq %d", ih);
+ snprintf(str, sizeof str, "irq %ld", ih);
return (str);
}
diff --git a/sys/arch/pegasos/pci/mpcpcibus.c b/sys/arch/pegasos/pci/mpcpcibus.c
index 73e7644b52e..4cee1d4fd74 100644
--- a/sys/arch/pegasos/pci/mpcpcibus.c
+++ b/sys/arch/pegasos/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibus.c,v 1.3 2003/11/14 20:14:32 drahn Exp $ */
+/* $OpenBSD: mpcpcibus.c,v 1.4 2003/12/20 22:40:27 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -716,7 +716,7 @@ mpc_intr_string(void *lcv, pci_intr_handle_t ih)
{
static char str[16];
- snprintf(str, sizeof str, "irq %d", ih);
+ snprintf(str, sizeof str, "irq %ld", ih);
return(str);
}
diff --git a/sys/arch/pegasos/pci/pci_addr_fixup.c b/sys/arch/pegasos/pci/pci_addr_fixup.c
index cac657ebf15..37905ed2669 100644
--- a/sys/arch/pegasos/pci/pci_addr_fixup.c
+++ b/sys/arch/pegasos/pci/pci_addr_fixup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_addr_fixup.c,v 1.3 2003/11/14 20:14:32 drahn Exp $ */
+/* $OpenBSD: pci_addr_fixup.c,v 1.4 2003/12/20 22:40:27 miod Exp $ */
/* $NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $ */
/*-
@@ -290,11 +290,11 @@ pciaddr_do_resource_allocate(struct pcibr_softc *sc, pci_chipset_tag_t pc,
if (pciaddr_ioaddr(pci_conf_read(pc, tag, mapreg)) != *addr) {
pci_conf_write(pc, tag, mapreg, 0); /* clear */
- printf("fixup failed. (new address=%#x)\n", *addr);
+ printf("fixup failed. (new address=%#lx)\n", *addr);
return (1);
}
if (pcibr_flags & PCIBR_VERBOSE)
- printf("new address 0x%08x\n", *addr);
+ printf("new address 0x%08lx\n", *addr);
return (0);
}
diff --git a/sys/arch/pegasos/pegasos/dma.c b/sys/arch/pegasos/pegasos/dma.c
index 0e873f1b549..b607f9ca288 100644
--- a/sys/arch/pegasos/pegasos/dma.c
+++ b/sys/arch/pegasos/pegasos/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.1 2003/10/31 03:54:33 drahn Exp $ */
+/* $OpenBSD: dma.c,v 1.2 2003/12/20 22:40:27 miod Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -140,7 +140,7 @@ _dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
* Get the physical address for this segment.
*/
if (pmap_extract(pmap, vaddr, (paddr_t *)&curaddr) != TRUE) {
- panic("dmamap_load_buffer pmap %x vaddr %x "
+ panic("dmamap_load_buffer pmap %p vaddr %lx "
"pmap_extract failed", pmap, vaddr);
}
diff --git a/sys/arch/pegasos/pegasos/machdep.c b/sys/arch/pegasos/pegasos/machdep.c
index 0cf94c81b1a..3f2279275e8 100644
--- a/sys/arch/pegasos/pegasos/machdep.c
+++ b/sys/arch/pegasos/pegasos/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.2 2003/11/06 21:23:52 drahn Exp $ */
+/* $OpenBSD: machdep.c,v 1.3 2003/12/20 22:40:28 miod Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -563,8 +563,8 @@ cpu_startup()
VM_PHYS_SIZE, 0, FALSE, NULL);
ppc_malloc_ok = 1;
- printf("avail mem = %d (%dK)\n", ptoa(uvmexp.free),
- ptoa(uvmexp.free)/1024);
+ printf("avail mem = %ld (%ldK)\n", ptoa(uvmexp.free),
+ ptoa(uvmexp.free) / 1024);
printf("using %d buffers containing %d bytes of memory\n", nbuf,
bufpages * PAGE_SIZE);
diff --git a/sys/arch/pegasos/pegasos/rdbdisksubr.c b/sys/arch/pegasos/pegasos/rdbdisksubr.c
index 3a9f4680fba..d18e905bbca 100644
--- a/sys/arch/pegasos/pegasos/rdbdisksubr.c
+++ b/sys/arch/pegasos/pegasos/rdbdisksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdbdisksubr.c,v 1.1 2003/11/13 23:00:55 drahn Exp $ */
+/* $OpenBSD: rdbdisksubr.c,v 1.2 2003/12/20 22:40:28 miod Exp $ */
/* $NetBSD: disksubr.c,v 1.27 1996/10/13 03:06:34 christos Exp $ */
/*
@@ -299,7 +299,7 @@ getadostype(u_long dostype)
goto unknown;
else
#else
- printf("found dostype: 0x%x, assuming an ADOS FS "
+ printf("found dostype: 0x%lx, assuming an ADOS FS "
"although it's unknown\n", dostype);
#endif
adt.fstype = FS_ADOS;
@@ -313,7 +313,7 @@ getadostype(u_long dostype)
return (adt);
case DOST_XXXBSD:
#ifdef DIAGNOSTIC
- printf("found dostype: 0x%x which is deprecated", dostype);
+ printf("found dostype: 0x%lx which is deprecated", dostype);
#endif
if (b1 == 'S') {
dostype = DOST_NBS;
@@ -326,7 +326,7 @@ getadostype(u_long dostype)
dostype |= FS_BSDFFS;
}
#ifdef DIAGNOSTIC
- printf(" using: 0x%x instead\n", dostype);
+ printf(" using: 0x%lx instead\n", dostype);
#endif
return (getadostype(dostype));
case DOST_EXT2:
@@ -336,7 +336,7 @@ getadostype(u_long dostype)
default:
unknown:
#ifdef DIAGNOSTIC
- printf("warning unknown dostype: 0x%x marking unused\n",
+ printf("warning unknown dostype: 0x%lx marking unused\n",
dostype);
#endif
adt.archtype = ADT_UNKNOWN;
diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index d578529036e..2544c5ed501 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.83 2003/10/31 03:06:16 drahn Exp $ */
+/* $OpenBSD: pmap.c,v 1.84 2003/12/20 22:40:28 miod Exp $ */
/*
* Copyright (c) 2001, 2002 Dale Rahn.
@@ -687,7 +687,7 @@ _pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, int flags, int cache)
/* Do not have pted for this, get one and put it in VP */
if (pted == NULL) {
/* XXX - future panic? */
- printf("pted not preallocated in pmap_kernel() va %x pa %x \n",
+ printf("pted not preallocated in pmap_kernel() va %lx pa %lx\n",
va, pa);
pted = pool_get(&pmap_pted_pool, PR_NOWAIT);
bzero(pted, sizeof (*pted));
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 17:10:14 +0000