Module Name: src Committed By: uebayasi Date: Thu Jul 28 03:42:21 UTC 2011
Modified Files: src/sys/arch/hp300/dev: ppi.c rd.c Log Message: dev_t is uint64_t; use PRIx64 to print it. Fix DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hp300/dev/ppi.c cvs rdiff -u -r1.90 -r1.91 src/sys/arch/hp300/dev/rd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/hp300/dev/ppi.c diff -u src/sys/arch/hp300/dev/ppi.c:1.42 src/sys/arch/hp300/dev/ppi.c:1.43 --- src/sys/arch/hp300/dev/ppi.c:1.42 Wed Jun 18 12:25:13 2008 +++ src/sys/arch/hp300/dev/ppi.c Thu Jul 28 03:42:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ppi.c,v 1.42 2008/06/18 12:25:13 tsutsui Exp $ */ +/* $NetBSD: ppi.c,v 1.43 2011/07/28 03:42:20 uebayasi Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.42 2008/06/18 12:25:13 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.43 2011/07/28 03:42:20 uebayasi Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -206,7 +206,7 @@ #ifdef DEBUG if (ppidebug & PDB_FOLLOW) - printf("ppiopen(%x, %x): flags %x\n", + printf("ppiopen(%"PRIx64", %x): flags %x\n", dev, flags, sc->sc_flags); #endif if (sc->sc_flags & PPIF_OPEN) @@ -226,7 +226,7 @@ #ifdef DEBUG if (ppidebug & PDB_FOLLOW) - printf("ppiclose(%x, %x): flags %x\n", + printf("ppiclose(%"PRIx64", %x): flags %x\n", dev, flags, sc->sc_flags); #endif sc->sc_flags &= ~PPIF_OPEN; @@ -265,7 +265,7 @@ #ifdef DEBUG if (ppidebug & PDB_FOLLOW) - printf("ppiread(%x, %p)\n", dev, uio); + printf("ppiread(%"PRIx64", %p)\n", dev, uio); #endif return ppirw(dev, uio); } @@ -276,7 +276,7 @@ #ifdef DEBUG if (ppidebug & PDB_FOLLOW) - printf("ppiwrite(%x, %p)\n", dev, uio); + printf("ppiwrite(%"PRIx64", %p)\n", dev, uio); #endif return ppirw(dev, uio); } @@ -299,7 +299,7 @@ #ifdef DEBUG if (ppidebug & (PDB_FOLLOW|PDB_IO)) - printf("ppirw(%x, %p, %c): burst %d, timo %d, resid %x\n", + printf("ppirw(%"PRIx64", %p, %c): burst %d, timo %d, resid %x\n", dev, uio, uio->uio_rw == UIO_READ ? 'R' : 'W', sc->sc_burst, sc->sc_timo, uio->uio_resid); #endif Index: src/sys/arch/hp300/dev/rd.c diff -u src/sys/arch/hp300/dev/rd.c:1.90 src/sys/arch/hp300/dev/rd.c:1.91 --- src/sys/arch/hp300/dev/rd.c:1.90 Tue Feb 8 20:20:13 2011 +++ src/sys/arch/hp300/dev/rd.c Thu Jul 28 03:42:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.90 2011/02/08 20:20:13 rmind Exp $ */ +/* $NetBSD: rd.c,v 1.91 2011/07/28 03:42:20 uebayasi Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.90 2011/02/08 20:20:13 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.91 2011/07/28 03:42:20 uebayasi Exp $"); #include "opt_useleds.h" #include "rnd.h" @@ -657,7 +657,7 @@ #ifdef DEBUG if (rddebug & RDB_FOLLOW) - printf("rdstrategy(%p): dev %x, bn %llx, bcount %x, %c\n", + printf("rdstrategy(%p): dev %"PRIx64", bn %llx, bcount %x, %c\n", bp, bp->b_dev, bp->b_blkno, bp->b_bcount, (bp->b_flags & B_READ) ? 'R' : 'W'); #endif