Pass -Wformat

5 files changed, 14 insertions, 14 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);
 }