diff options
Diffstat (limited to 'sys/arch/pegasos')
| -rw-r--r-- | sys/arch/pegasos/pci/mpcpcibus.c | 4 | ||||
| -rw-r--r-- | sys/arch/pegasos/pci/pci_addr_fixup.c | 6 | ||||
| -rw-r--r-- | sys/arch/pegasos/pegasos/dma.c | 4 | ||||
| -rw-r--r-- | sys/arch/pegasos/pegasos/machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/pegasos/pegasos/rdbdisksubr.c | 10 |
5 files changed, 15 insertions, 15 deletions
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; |