diff --git a/sys/arch/alpha/alpha/clock.c b/sys/arch/alpha/alpha/clock.c index 8b3b7b7130e9..a3df0e320861 100644 --- a/sys/arch/alpha/alpha/clock.c +++ b/sys/arch/alpha/alpha/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.22 1998/09/29 18:23:55 drochner Exp $ */ +/* $NetBSD: clock.c,v 1.23 1999/02/12 06:30:08 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -44,7 +44,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.22 1998/09/29 18:23:55 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.23 1999/02/12 06:30:08 thorpej Exp $"); #include #include @@ -234,8 +234,9 @@ inittodr(base) deltat = -deltat; if (deltat < 2 * SECDAY) return; - printf("WARNING: clock %s %d days", - time.tv_sec < base ? "lost" : "gained", deltat / SECDAY); + printf("WARNING: clock %s %ld days", + time.tv_sec < base ? "lost" : "gained", + (long)deltat / SECDAY); } bad: printf(" -- CHECK AND RESET THE DATE!\n"); diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index 568834b2e00c..0a76a1d2d392 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.159 1999/01/10 03:16:21 mjacob Exp $ */ +/* $NetBSD: machdep.c,v 1.160 1999/02/12 06:30:08 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -82,7 +82,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.159 1999/01/10 03:16:21 mjacob Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.160 1999/02/12 06:30:08 thorpej Exp $"); #include #include @@ -516,7 +516,7 @@ nobootinfo: mddtweird = 0; if (mddtp->mddt_cluster_cnt < 2) { mddtweird = 1; - printf("WARNING: weird number of mem clusters: %d\n", + printf("WARNING: weird number of mem clusters: %lu\n", mddtp->mddt_cluster_cnt); } @@ -769,7 +769,7 @@ nobootinfo: /* warn if the message buffer had to be shrunk */ if (sz != round_page(MSGBUFSIZE)) - printf("WARNING: %d bytes not available for msgbuf in last cluster (%d used)\n", + printf("WARNING: %ld bytes not available for msgbuf in last cluster (%ld used)\n", round_page(MSGBUFSIZE), sz); } @@ -1551,7 +1551,7 @@ dumpsys() /* Print out how many MBs we to go. */ if ((totalbytesleft % (1024*1024)) == 0) - printf("%d ", totalbytesleft / (1024 * 1024)); + printf("%ld ", totalbytesleft / (1024 * 1024)); /* Limit size for next transfer. */ n = bytes - i; diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c index db3738b28bab..28f58566ff29 100644 --- a/sys/arch/alpha/alpha/pmap.c +++ b/sys/arch/alpha/alpha/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.78 1999/02/08 19:37:29 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.79 1999/02/12 06:30:09 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -155,7 +155,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.78 1999/02/08 19:37:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.79 1999/02/12 06:30:09 thorpej Exp $"); #include #include @@ -1226,8 +1226,8 @@ pmap_remove(pmap, sva, eva) #ifdef DIAGNOSTIC if (sva > VM_MAXUSER_ADDRESS || eva > VM_MAXUSER_ADDRESS) - panic("pmap_remove: (%p - %p) user pmap, kernel address range", - sva, eva); + panic("pmap_remove: (0x%lx - 0x%lx) user pmap, kernel " + "address range", sva, eva); #endif PMAP_MAP_TO_HEAD_LOCK(); diff --git a/sys/arch/alpha/common/comlogout.c b/sys/arch/alpha/common/comlogout.c index 83dbbbec468c..96b947f9cebb 100644 --- a/sys/arch/alpha/common/comlogout.c +++ b/sys/arch/alpha/common/comlogout.c @@ -1,4 +1,4 @@ -/* $NetBSD: comlogout.c,v 1.1 1998/07/08 00:34:49 mjacob Exp $ */ +/* $NetBSD: comlogout.c,v 1.2 1999/02/12 06:32:12 thorpej Exp $ */ /* * Copyright (c) 1998 by Matthew Jacob * NASA AMES Research Center. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: comlogout.c,v 1.1 1998/07/08 00:34:49 mjacob Exp $"); +__KERNEL_RCSID(0, "$NetBSD: comlogout.c,v 1.2 1999/02/12 06:32:12 thorpej Exp $"); #include #include @@ -62,11 +62,11 @@ ev5_logout_print(ev5lohdrp, mcucev5p) ALPHA_PROC_MCHECK, ev5lohdrp->mcheck_code); /* Print PAL fields */ for (i = 0; i < 24; i += 2) { - printf("\tPAL temp[%d-%d]\t\t= 0x%l016x 0x%l016x\n", i, i+1, + printf("\tPAL temp[%d-%d]\t\t= 0x%16lx 0x%16lx\n", i, i+1, mcucev5p->paltemp[i], mcucev5p->paltemp[i+1]); } for (i = 0; i < 8; i += 2) { - printf("\tshadow[%d-%d]\t\t\t= 0x%l016x 0x%l016x\n", i, i+1, + printf("\tshadow[%d-%d]\t\t\t= 0x%16lx 0x%16lx\n", i, i+1, mcucev5p->shadow[i], mcucev5p->shadow[i+1]); } printf("\n"); diff --git a/sys/arch/alpha/pci/pci_1000.c b/sys/arch/alpha/pci/pci_1000.c index e5ee4465f278..abc12232ed8d 100644 --- a/sys/arch/alpha/pci/pci_1000.c +++ b/sys/arch/alpha/pci/pci_1000.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_1000.c,v 1.4 1998/08/01 20:25:12 thorpej Exp $ */ +/* $NetBSD: pci_1000.c,v 1.5 1999/02/12 06:25:13 thorpej Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.4 1998/08/01 20:25:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.5 1999/02/12 06:25:13 thorpej Exp $"); #include #include @@ -188,7 +188,7 @@ dec_1000_intr_string(ccv, ih) static char irqstr[sizeof irqmsg_fmt]; if (ih >= INTRCNT_DEC_1000_IRQ_LEN) - panic("dec_1000_intr_string: bogus dec_1000 IRQ 0x%x\n", ih); + panic("dec_1000_intr_string: bogus dec_1000 IRQ 0x%lx\n", ih); sprintf(irqstr, irqmsg_fmt, ih); return (irqstr); @@ -204,7 +204,7 @@ dec_1000_intr_establish(ccv, ih, level, func, arg) void *cookie; if (ih >= INTRCNT_DEC_1000_IRQ_LEN) - panic("dec_1000_intr_establish: IRQ too high, 0x%x\n", ih); + panic("dec_1000_intr_establish: IRQ too high, 0x%lx\n", ih); cookie = alpha_shared_intr_establish(dec_1000_pci_intr, ih, IST_LEVEL, level, func, arg, "dec_1000 irq"); @@ -245,7 +245,7 @@ dec_1000_iointr(framep, vec) if (vec >= 0x900) { if (vec >= 0x900 + (INTRCNT_DEC_1000_IRQ_LEN << 4)) - panic("dec_1000_iointr: vec 0x%x out of range\n", vec); + panic("dec_1000_iointr: vec 0x%lx out of range\n", vec); irq = (vec - 0x900) >> 4; intrcnt[INTRCNT_DEC_1000_IRQ + irq]++; @@ -264,7 +264,7 @@ dec_1000_iointr(framep, vec) return; } #endif - panic("dec_1000_iointr: weird vec 0x%x\n", vec); + panic("dec_1000_iointr: weird vec 0x%lx\n", vec); } /* diff --git a/sys/arch/alpha/pci/pci_1000a.c b/sys/arch/alpha/pci/pci_1000a.c index d2dea7864a50..443092574149 100644 --- a/sys/arch/alpha/pci/pci_1000a.c +++ b/sys/arch/alpha/pci/pci_1000a.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_1000a.c,v 1.6 1998/11/19 02:33:37 ross Exp $ */ +/* $NetBSD: pci_1000a.c,v 1.7 1999/02/12 06:25:13 thorpej Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.6 1998/11/19 02:33:37 ross Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.7 1999/02/12 06:25:13 thorpej Exp $"); #include #include @@ -210,7 +210,7 @@ dec_1000a_intr_string(ccv, ih) if (ih >= INTRCNT_DEC_1000A_IRQ_LEN) - panic("dec_1000a_intr_string: bogus dec_1000a IRQ 0x%x\n", ih); + panic("dec_1000a_intr_string: bogus dec_1000a IRQ 0x%lx\n", ih); sprintf(irqstr, irqmsg_fmt, ih); return (irqstr); @@ -226,7 +226,7 @@ dec_1000a_intr_establish(ccv, ih, level, func, arg) void *cookie; if (ih >= INTRCNT_DEC_1000A_IRQ_LEN) - panic("dec_1000a_intr_establish: IRQ too high, 0x%x\n", ih); + panic("dec_1000a_intr_establish: IRQ too high, 0x%lx\n", ih); cookie = alpha_shared_intr_establish(dec_1000a_pci_intr, ih, IST_LEVEL, level, func, arg, "dec_1000a irq"); @@ -267,7 +267,8 @@ dec_1000a_iointr(framep, vec) if (vec >= 0x900) { if (vec >= 0x900 + (INTRCNT_DEC_1000A_IRQ_LEN << 4)) - panic("dec_1000a_iointr: vec 0x%x out of range\n", vec); + panic("dec_1000a_iointr: vec 0x%lx out of range\n", + vec); irq = (vec - 0x900) >> 4; intrcnt[INTRCNT_DEC_1000A_IRQ + irq]++; if (!alpha_shared_intr_dispatch(dec_1000a_pci_intr, irq)) { @@ -284,7 +285,7 @@ dec_1000a_iointr(framep, vec) return; } #endif - panic("dec_1000a_iointr: weird vec 0x%x\n", vec); + panic("dec_1000a_iointr: weird vec 0x%lx\n", vec); } /* diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c index a3a5b582ea3b..6b9dfe756e7b 100644 --- a/sys/arch/alpha/pci/pci_550.c +++ b/sys/arch/alpha/pci/pci_550.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_550.c,v 1.12 1998/08/01 20:25:12 thorpej Exp $ */ +/* $NetBSD: pci_550.c,v 1.13 1999/02/12 06:25:13 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.12 1998/08/01 20:25:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.13 1999/02/12 06:25:13 thorpej Exp $"); #include #include @@ -252,8 +252,8 @@ dec_550_intr_string(ccv, ih) static char irqstr[16]; /* 12 + 2 + NULL + sanity */ if (ih >= DEC_550_MAX_IRQ) - panic("dec_550_intr_string: bogus 550 IRQ 0x%x\n", ih); - sprintf(irqstr, "dec 550 irq %d", ih); + panic("dec_550_intr_string: bogus 550 IRQ 0x%lx\n", ih); + sprintf(irqstr, "dec 550 irq %ld", ih); return (irqstr); } @@ -270,7 +270,7 @@ dec_550_intr_establish(ccv, ih, level, func, arg) void *cookie; if (ih >= DEC_550_MAX_IRQ) - panic("dec_550_intr_establish: bogus dec 550 IRQ 0x%x\n", ih); + panic("dec_550_intr_establish: bogus dec 550 IRQ 0x%lx\n", ih); cookie = alpha_shared_intr_establish(dec_550_pci_intr, ih, IST_LEVEL, level, func, arg, "dec 550 irq"); @@ -344,7 +344,7 @@ dec_550_iointr(framep, vec) irq = ((vec - 0x900) >> 4) + DEC_550_PCI_IRQ_BEGIN; if (irq >= DEC_550_MAX_IRQ) - panic("550_iointr: vec 0x%x out of range\n", vec); + panic("550_iointr: vec 0x%lx out of range\n", vec); #ifdef EVCNT_COUNTERS dec_550_intr_evcnt.ev_count++; @@ -368,7 +368,7 @@ dec_550_iointr(framep, vec) return; } #endif - panic("dec_550_iointr: weird vec 0x%x\n", vec); + panic("dec_550_iointr: weird vec 0x%lx\n", vec); } void diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c index ae115b72a4ef..3b71ec431aec 100644 --- a/sys/arch/alpha/pci/pci_eb164.c +++ b/sys/arch/alpha/pci/pci_eb164.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_eb164.c,v 1.23 1998/08/01 20:25:12 thorpej Exp $ */ +/* $NetBSD: pci_eb164.c,v 1.24 1999/02/12 06:25:13 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.23 1998/08/01 20:25:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.24 1999/02/12 06:25:13 thorpej Exp $"); #include #include @@ -256,8 +256,8 @@ dec_eb164_intr_string(ccv, ih) static char irqstr[15]; /* 11 + 2 + NULL + sanity */ if (ih > EB164_MAX_IRQ) - panic("dec_eb164_intr_string: bogus eb164 IRQ 0x%x\n", ih); - sprintf(irqstr, "eb164 irq %d", ih); + panic("dec_eb164_intr_string: bogus eb164 IRQ 0x%lx\n", ih); + sprintf(irqstr, "eb164 irq %ld", ih); return (irqstr); } @@ -274,7 +274,7 @@ dec_eb164_intr_establish(ccv, ih, level, func, arg) void *cookie; if (ih > EB164_MAX_IRQ) - panic("dec_eb164_intr_establish: bogus eb164 IRQ 0x%x\n", ih); + panic("dec_eb164_intr_establish: bogus eb164 IRQ 0x%lx\n", ih); cookie = alpha_shared_intr_establish(eb164_pci_intr, ih, IST_LEVEL, level, func, arg, "eb164 irq"); @@ -346,7 +346,7 @@ eb164_iointr(framep, vec) if (vec >= 0x900) { if (vec >= 0x900 + (EB164_MAX_IRQ << 4)) - panic("eb164_iointr: vec 0x%x out of range\n", vec); + panic("eb164_iointr: vec 0x%lx out of range\n", vec); irq = (vec - 0x900) >> 4; #ifdef EVCNT_COUNTERS @@ -371,7 +371,7 @@ eb164_iointr(framep, vec) return; } #endif - panic("eb164_iointr: weird vec 0x%x\n", vec); + panic("eb164_iointr: weird vec 0x%lx\n", vec); } #if 0 /* THIS DOES NOT WORK! see pci_eb164_intr.S. */ diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c index b2889b250c7e..3f1fcd1ab5d8 100644 --- a/sys/arch/alpha/pci/pci_eb64plus.c +++ b/sys/arch/alpha/pci/pci_eb64plus.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_eb64plus.c,v 1.4 1998/08/01 20:25:13 thorpej Exp $ */ +/* $NetBSD: pci_eb64plus.c,v 1.5 1999/02/12 06:25:13 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.4 1998/08/01 20:25:13 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.5 1999/02/12 06:25:13 thorpej Exp $"); #include #include @@ -204,8 +204,8 @@ dec_eb64plus_intr_string(acv, ih) static char irqstr[15]; /* 11 + 2 + NULL + sanity */ if (ih > EB64PLUS_MAX_IRQ) - panic("dec_eb64plus_intr_string: bogus eb64+ IRQ 0x%x\n", ih); - sprintf(irqstr, "eb64+ irq %d", ih); + panic("dec_eb64plus_intr_string: bogus eb64+ IRQ 0x%lx\n", ih); + sprintf(irqstr, "eb64+ irq %ld", ih); return (irqstr); } @@ -219,7 +219,8 @@ dec_eb64plus_intr_establish(acv, ih, level, func, arg) void *cookie; if (ih > EB64PLUS_MAX_IRQ) - panic("dec_eb64plus_intr_establish: bogus eb64+ IRQ 0x%x\n", ih); + panic("dec_eb64plus_intr_establish: bogus eb64+ IRQ 0x%lx\n", + ih); cookie = alpha_shared_intr_establish(eb64plus_pci_intr, ih, IST_LEVEL, level, func, arg, "eb64+ irq"); @@ -259,7 +260,7 @@ eb64plus_iointr(framep, vec) if (vec >= 0x900) { if (vec >= 0x900 + (EB64PLUS_MAX_IRQ << 4)) - panic("eb64plus_iointr: vec 0x%x out of range\n", vec); + panic("eb64plus_iointr: vec 0x%lx out of range\n", vec); irq = (vec - 0x900) >> 4; #ifdef EVCNT_COUNTERS @@ -284,7 +285,7 @@ eb64plus_iointr(framep, vec) return; } #endif - panic("eb64plus_iointr: weird vec 0x%x\n", vec); + panic("eb64plus_iointr: weird vec 0x%lx\n", vec); } #if 0 /* THIS DOES NOT WORK! see pci_eb64plus_intr.S. */ diff --git a/sys/arch/alpha/pci/pci_eb66.c b/sys/arch/alpha/pci/pci_eb66.c index b8697c38c984..2462d072f8fc 100644 --- a/sys/arch/alpha/pci/pci_eb66.c +++ b/sys/arch/alpha/pci/pci_eb66.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_eb66.c,v 1.4 1998/08/01 20:25:13 thorpej Exp $ */ +/* $NetBSD: pci_eb66.c,v 1.5 1999/02/12 06:25:13 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.4 1998/08/01 20:25:13 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.5 1999/02/12 06:25:13 thorpej Exp $"); #include #include @@ -199,8 +199,8 @@ dec_eb66_intr_string(lcv, ih) static char irqstr[15]; /* 11 + 2 + NULL + sanity */ if (ih >= EB66_MAX_IRQ) - panic("dec_eb66_intr_string: bogus eb66 IRQ 0x%x\n", ih); - sprintf(irqstr, "eb66 irq %d", ih); + panic("dec_eb66_intr_string: bogus eb66 IRQ 0x%lx\n", ih); + sprintf(irqstr, "eb66 irq %ld", ih); return (irqstr); } @@ -214,7 +214,7 @@ dec_eb66_intr_establish(lcv, ih, level, func, arg) void *cookie; if (ih >= EB66_MAX_IRQ) - panic("dec_eb66_intr_establish: bogus eb66 IRQ 0x%x\n", ih); + panic("dec_eb66_intr_establish: bogus eb66 IRQ 0x%lx\n", ih); cookie = alpha_shared_intr_establish(eb66_pci_intr, ih, IST_LEVEL, level, func, arg, "eb66 irq"); @@ -254,7 +254,7 @@ eb66_iointr(framep, vec) if (vec >= 0x900) { if (vec >= 0x900 + (EB66_MAX_IRQ << 4)) - panic("eb66_iointr: vec 0x%x out of range\n", vec); + panic("eb66_iointr: vec 0x%lx out of range\n", vec); irq = (vec - 0x900) >> 4; if (EB66_MAX_IRQ != INTRCNT_EB66_IRQ_LEN) @@ -275,7 +275,7 @@ eb66_iointr(framep, vec) return; } #endif - panic("eb66_iointr: weird vec 0x%x\n", vec); + panic("eb66_iointr: weird vec 0x%lx\n", vec); } #if 0 /* THIS DOES NOT WORK! see pci_eb66_intr.S. */ diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c index 9aa1a40fd8ed..e8ac3aafcaa7 100644 --- a/sys/arch/alpha/pci/pci_kn20aa.c +++ b/sys/arch/alpha/pci/pci_kn20aa.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_kn20aa.c,v 1.35 1998/10/31 23:51:05 mjacob Exp $ */ +/* $NetBSD: pci_kn20aa.c,v 1.36 1999/02/12 06:25:13 thorpej Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -29,7 +29,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.35 1998/10/31 23:51:05 mjacob Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.36 1999/02/12 06:25:13 thorpej Exp $"); #include #include @@ -190,7 +190,7 @@ dec_kn20aa_intr_string(ccv, ih) static char irqstr[15]; /* 11 + 2 + NULL + sanity */ if (ih > KN20AA_MAX_IRQ) - panic("dec_kn20aa_intr_string: bogus kn20aa IRQ 0x%x\n", + panic("dec_kn20aa_intr_string: bogus kn20aa IRQ 0x%lx\n", ih); sprintf(irqstr, "kn20aa irq %ld", ih); @@ -210,7 +210,7 @@ dec_kn20aa_intr_establish(ccv, ih, level, func, arg) void *cookie; if (ih > KN20AA_MAX_IRQ) - panic("dec_kn20aa_intr_establish: bogus kn20aa IRQ 0x%x\n", + panic("dec_kn20aa_intr_establish: bogus kn20aa IRQ 0x%lx\n", ih); cookie = alpha_shared_intr_establish(kn20aa_pci_intr, ih, IST_LEVEL, @@ -255,7 +255,7 @@ kn20aa_iointr(framep, vec) if (vec >= 0x900) { if (vec >= 0x900 + (KN20AA_MAX_IRQ << 4)) - panic("kn20aa_iointr: vec 0x%x out of range\n", vec); + panic("kn20aa_iointr: vec 0x%lx out of range\n", vec); irq = (vec - 0x900) >> 4; #ifdef EVCNT_COUNTERS @@ -280,7 +280,7 @@ kn20aa_iointr(framep, vec) return; } #endif - panic("kn20aa_iointr: weird vec 0x%x\n", vec); + panic("kn20aa_iointr: weird vec 0x%lx\n", vec); } void diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c index 96f21336df6c..d79982447e78 100644 --- a/sys/arch/alpha/pci/pci_kn300.c +++ b/sys/arch/alpha/pci/pci_kn300.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_kn300.c,v 1.9 1998/07/07 22:24:39 thorpej Exp $ */ +/* $NetBSD: pci_kn300.c,v 1.10 1999/02/12 06:25:14 thorpej Exp $ */ /* * Copyright (c) 1998 by Matthew Jacob @@ -32,7 +32,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.9 1998/07/07 22:24:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.10 1999/02/12 06:25:14 thorpej Exp $"); #include #include @@ -201,8 +201,8 @@ dec_kn300_intr_string(ccv, ih) pci_intr_handle_t ih; { static char irqstr[64]; - sprintf(irqstr, "kn300 irq %d PCI Interrupt Pin %c", - (ih >> 11) & 0x1f, (ih & 0x3) + 'A'); + sprintf(irqstr, "kn300 irq %ld PCI Interrupt Pin %c", + (ih >> 11) & 0x1f, (int)(ih & 0x3) + 'A'); return (irqstr); } diff --git a/sys/arch/alpha/pci/pci_kn8ae.c b/sys/arch/alpha/pci/pci_kn8ae.c index 8438c5b4eea3..49601beb2512 100644 --- a/sys/arch/alpha/pci/pci_kn8ae.c +++ b/sys/arch/alpha/pci/pci_kn8ae.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_kn8ae.c,v 1.13 1998/04/25 00:12:45 thorpej Exp $ */ +/* $NetBSD: pci_kn8ae.c,v 1.14 1999/02/12 06:25:14 thorpej Exp $ */ /* * Copyright (c) 1997 by Matthew Jacob @@ -32,7 +32,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.13 1998/04/25 00:12:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.14 1999/02/12 06:25:14 thorpej Exp $"); #include #include @@ -160,8 +160,8 @@ dec_kn8ae_intr_string(ccv, ih) pci_intr_handle_t ih; { static char irqstr[64]; - sprintf(irqstr, "kn8ae irq %d vector 0x%x PCI Interrupt Pin %c", - (ih >> 24), ih & 0xffff, (((ih >> 16) & 0x7) - 1) + 'A'); + sprintf(irqstr, "kn8ae irq %ld vector 0x%lx PCI Interrupt Pin %c", + (ih >> 24), ih & 0xffff, (int)(((ih >> 16) & 0x7) - 1) + 'A'); return (irqstr); } @@ -194,7 +194,7 @@ dec_kn8ae_intr_establish(ccv, ih, level, func, arg) vp = &vectab[ionode][hose][device]; if (vp->func != kn8ae_spurious) { - printf("dec_kn8ae_intr_establish: vector 0x%x already used\n", + printf("dec_kn8ae_intr_establish: vector 0x%lx already used\n", ih & 0xffff); return (cookie); } @@ -261,7 +261,7 @@ kn8ae_iointr(framep, vec) return; } if ((vec & DWLPX_VEC_MARK) == 0) { - panic("kn8ae_iointr: vec 0x%x\n", vec); + panic("kn8ae_iointr: vec 0x%lx\n", vec); /* NOTREACHED */ } ionode = DWLPX_MVEC_IONODE(vec); @@ -276,7 +276,7 @@ kn8ae_iointr(framep, vec) if (ionode < 0 || ionode >= DWLPX_NIONODE || hose < 0 || hose >= DWLPX_NHOSE || device < 0 || device >= DWLPX_MAXDEV) { - panic("kn8ae_iointr: malformed vector 0x%x\n", vec); + panic("kn8ae_iointr: malformed vector 0x%lx\n", vec); /* NOTREACHED */ } vp = &vectab[ionode][hose][device];