diff options
| author | christos <christos@NetBSD.org> | 2009-01-11 02:45:45 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2009-01-11 02:45:45 +0000 |
| commit | 461a86f9bdbf4658bc4b37796e978427095f94a7 (patch) | |
| tree | eb340680ec500c8117744dbb3ea43074544ef572 /sys/dev | |
| parent | 6bbe77565e03756efac493ed9189b441a5eeffba (diff) | |
merge christos-time_t
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/bluetooth/bcsp.c | 9 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btuart.c | 9 | ||||
| -rw-r--r-- | sys/dev/ccd.c | 16 | ||||
| -rw-r--r-- | sys/dev/cgd.c | 22 | ||||
| -rw-r--r-- | sys/dev/clockctl.c | 89 | ||||
| -rw-r--r-- | sys/dev/dksubr.c | 10 | ||||
| -rw-r--r-- | sys/dev/ieee1394/sbp.c | 8 | ||||
| -rw-r--r-- | sys/dev/ir/irframe_tty.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/pccbb.c | 9 | ||||
| -rw-r--r-- | sys/dev/vnd.c | 14 |
10 files changed, 101 insertions, 93 deletions
diff --git a/sys/dev/bluetooth/bcsp.c b/sys/dev/bluetooth/bcsp.c index 5c2942fc85a..c276fc25f7b 100644 --- a/sys/dev/bluetooth/bcsp.c +++ b/sys/dev/bluetooth/bcsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bcsp.c,v 1.13 2008/06/12 21:47:11 cegger Exp $ */ +/* $NetBSD: bcsp.c,v 1.14 2009/01/11 02:45:51 christos Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.13 2008/06/12 21:47:11 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.14 2009/01/11 02:45:51 christos Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -403,8 +403,9 @@ bcspopen(dev_t device __unused, struct tty *tp) cfdata->cf_unit = unit; cfdata->cf_fstate = FSTATE_STAR; - aprint_normal("%s%d at tty major %d minor %d", - name, unit, major(tp->t_dev), minor(tp->t_dev)); + aprint_normal("%s%d at tty major %llu minor %llu", + name, unit, (unsigned long long)major(tp->t_dev), + (unsigned long long)minor(tp->t_dev)); dev = config_attach_pseudo(cfdata); if (dev == NULL) { splx(s); diff --git a/sys/dev/bluetooth/btuart.c b/sys/dev/bluetooth/btuart.c index de06972ab47..53852284acb 100644 --- a/sys/dev/bluetooth/btuart.c +++ b/sys/dev/bluetooth/btuart.c @@ -1,4 +1,4 @@ -/* $NetBSD: btuart.c,v 1.19 2008/06/12 21:47:11 cegger Exp $ */ +/* $NetBSD: btuart.c,v 1.20 2009/01/11 02:45:51 christos Exp $ */ /*- * Copyright (c) 2006, 2007 KIYOHARA Takashi @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.19 2008/06/12 21:47:11 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.20 2009/01/11 02:45:51 christos Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -260,8 +260,9 @@ btuartopen(dev_t devno __unused, struct tty *tp) } sc = device_private(dev); - aprint_normal_dev(dev, "major %d minor %d\n", - major(tp->t_dev), minor(tp->t_dev)); + aprint_normal_dev(dev, "major %llu minor %llu\n", + (unsigned long long)major(tp->t_dev), + (unsigned long long)minor(tp->t_dev)); sc->sc_tp = tp; tp->t_sc = sc; diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c index a15022cb4b8..f8d27c0d1fa 100644 --- a/sys/dev/ccd.c +++ b/sys/dev/ccd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ccd.c,v 1.129 2008/04/28 20:23:46 martin Exp $ */ +/* $NetBSD: ccd.c,v 1.130 2009/01/11 02:45:50 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2007 The NetBSD Foundation, Inc. @@ -118,7 +118,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.129 2008/04/28 20:23:46 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.130 2009/01/11 02:45:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -549,7 +549,7 @@ ccdopen(dev_t dev, int flags, int fmt, struct lwp *l) #ifdef DEBUG if (ccddebug & CCDB_FOLLOW) - printf("ccdopen(0x%x, 0x%x)\n", dev, flags); + printf("ccdopen(0x%llx, 0x%x)\n", dev, flags); #endif if (unit >= numccd) return (ENXIO); @@ -610,7 +610,7 @@ ccdclose(dev_t dev, int flags, int fmt, struct lwp *l) #ifdef DEBUG if (ccddebug & CCDB_FOLLOW) - printf("ccdclose(0x%x, 0x%x)\n", dev, flags); + printf("ccdclose(0x%llx, 0x%x)\n", dev, flags); #endif if (unit >= numccd) @@ -858,7 +858,7 @@ ccdbuffer(struct ccd_softc *cs, struct buf *bp, daddr_t bn, void *addr, #ifdef DEBUG if (ccddebug & CCDB_IO) - printf(" dev 0x%x(u%lu): cbp %p bn %" PRId64 " addr %p" + printf(" dev 0x%llx(u%lu): cbp %p bn %" PRId64 " addr %p" " bcnt %d\n", ci->ci_dev, (unsigned long) (ci-cs->sc_cinfo), cbp, cbp->cb_buf.b_blkno, cbp->cb_buf.b_data, @@ -906,7 +906,7 @@ ccdiodone(struct buf *vbp) if (ccddebug & CCDB_IO) { printf("ccdiodone: bp %p bcount %d resid %d\n", bp, bp->b_bcount, bp->b_resid); - printf(" dev 0x%x(u%d), cbp %p bn %" PRId64 " addr %p" + printf(" dev 0x%llx(u%d), cbp %p bn %" PRId64 " addr %p" " bcnt %d\n", cbp->cb_buf.b_dev, cbp->cb_comp, cbp, cbp->cb_buf.b_blkno, cbp->cb_buf.b_data, @@ -943,7 +943,7 @@ ccdread(dev_t dev, struct uio *uio, int flags) #ifdef DEBUG if (ccddebug & CCDB_FOLLOW) - printf("ccdread(0x%x, %p)\n", dev, uio); + printf("ccdread(0x%llx, %p)\n", dev, uio); #endif if (unit >= numccd) return (ENXIO); @@ -964,7 +964,7 @@ ccdwrite(dev_t dev, struct uio *uio, int flags) #ifdef DEBUG if (ccddebug & CCDB_FOLLOW) - printf("ccdwrite(0x%x, %p)\n", dev, uio); + printf("ccdwrite(0x%llx, %p)\n", dev, uio); #endif if (unit >= numccd) return (ENXIO); diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c index 2414294072a..ae2260eee6a 100644 --- a/sys/dev/cgd.c +++ b/sys/dev/cgd.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgd.c,v 1.54 2008/11/21 20:14:20 christos Exp $ */ +/* $NetBSD: cgd.c,v 1.55 2009/01/11 02:45:50 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.54 2008/11/21 20:14:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.55 2009/01/11 02:45:50 christos Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -152,7 +152,7 @@ getcgd_softc(dev_t dev) { int unit = CGDUNIT(dev); - DPRINTF_FOLLOW(("getcgd_softc(0x%x): unit = %d\n", dev, unit)); + DPRINTF_FOLLOW(("getcgd_softc(0x%llx): unit = %d\n", dev, unit)); if (unit >= numcgd) return NULL; return &cgd_softc[unit]; @@ -200,7 +200,7 @@ cgdopen(dev_t dev, int flags, int fmt, struct lwp *l) { struct cgd_softc *cs; - DPRINTF_FOLLOW(("cgdopen(%d, %d)\n", dev, flags)); + DPRINTF_FOLLOW(("cgdopen(0x%llx, %d)\n", dev, flags)); GETCGD_SOFTC(cs, dev); return dk_open(di, &cs->sc_dksc, dev, flags, fmt, l); } @@ -210,7 +210,7 @@ cgdclose(dev_t dev, int flags, int fmt, struct lwp *l) { struct cgd_softc *cs; - DPRINTF_FOLLOW(("cgdclose(%d, %d)\n", dev, flags)); + DPRINTF_FOLLOW(("cgdclose(0x%llx, %d)\n", dev, flags)); GETCGD_SOFTC(cs, dev); return dk_close(di, &cs->sc_dksc, dev, flags, fmt, l); } @@ -232,7 +232,7 @@ cgdsize(dev_t dev) { struct cgd_softc *cs = getcgd_softc(dev); - DPRINTF_FOLLOW(("cgdsize(%d)\n", dev)); + DPRINTF_FOLLOW(("cgdsize(0x%llx)\n", dev)); if (!cs) return -1; return dk_size(di, &cs->sc_dksc, dev); @@ -357,7 +357,7 @@ cgdiodone(struct buf *nbp) DPRINTF_FOLLOW(("cgdiodone(%p)\n", nbp)); DPRINTF(CGDB_IO, ("cgdiodone: bp %p bcount %d resid %d\n", obp, obp->b_bcount, obp->b_resid)); - DPRINTF(CGDB_IO, (" dev 0x%x, nbp %p bn %" PRId64 " addr %p bcnt %d\n", + DPRINTF(CGDB_IO, (" dev 0x%llx, nbp %p bn %" PRId64 " addr %p bcnt %d\n", nbp->b_dev, nbp, nbp->b_blkno, nbp->b_data, nbp->b_bcount)); if (nbp->b_error != 0) { @@ -398,7 +398,7 @@ cgdread(dev_t dev, struct uio *uio, int flags) struct cgd_softc *cs; struct dk_softc *dksc; - DPRINTF_FOLLOW(("cgdread(%d, %p, %d)\n", dev, uio, flags)); + DPRINTF_FOLLOW(("cgdread(0x%llx, %p, %d)\n", dev, uio, flags)); GETCGD_SOFTC(cs, dev); dksc = &cs->sc_dksc; if ((dksc->sc_flags & DKF_INITED) == 0) @@ -413,7 +413,7 @@ cgdwrite(dev_t dev, struct uio *uio, int flags) struct cgd_softc *cs; struct dk_softc *dksc; - DPRINTF_FOLLOW(("cgdwrite(%d, %p, %d)\n", dev, uio, flags)); + DPRINTF_FOLLOW(("cgdwrite(0x%llx, %p, %d)\n", dev, uio, flags)); GETCGD_SOFTC(cs, dev); dksc = &cs->sc_dksc; if ((dksc->sc_flags & DKF_INITED) == 0) @@ -431,7 +431,7 @@ cgdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) int part = DISKPART(dev); int pmask = 1 << part; - DPRINTF_FOLLOW(("cgdioctl(%d, %ld, %p, %d, %p)\n", + DPRINTF_FOLLOW(("cgdioctl(0x%llx, %ld, %p, %d, %p)\n", dev, cmd, data, flag, l)); GETCGD_SOFTC(cs, dev); dksc = &cs->sc_dksc; @@ -474,7 +474,7 @@ cgddump(dev_t dev, daddr_t blkno, void *va, size_t size) { struct cgd_softc *cs; - DPRINTF_FOLLOW(("cgddump(%d, %" PRId64 ", %p, %lu)\n", dev, blkno, va, + DPRINTF_FOLLOW(("cgddump(0x%llx, %" PRId64 ", %p, %lu)\n", dev, blkno, va, (unsigned long)size)); GETCGD_SOFTC(cs, dev); return dk_dump(di, &cs->sc_dksc, dev, blkno, va, size); diff --git a/sys/dev/clockctl.c b/sys/dev/clockctl.c index 77d2ba495e2..99947972a6f 100644 --- a/sys/dev/clockctl.c +++ b/sys/dev/clockctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: clockctl.c,v 1.23 2007/11/25 00:35:27 elad Exp $ */ +/* $NetBSD: clockctl.c,v 1.24 2009/01/11 02:45:50 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,9 +31,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.23 2007/11/25 00:35:27 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.24 2009/01/11 02:45:50 christos Exp $"); #include "opt_ntp.h" +#include "opt_compat_netbsd.h" #include <sys/param.h> #include <sys/systm.h> @@ -48,6 +49,9 @@ __KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.23 2007/11/25 00:35:27 elad Exp $"); #endif /* NTP */ #include <sys/clockctl.h> +#ifdef COMPAT_50 +#include <compat/sys/clockctl.h> +#endif struct clockctl_softc { struct device clockctl_dev; @@ -79,57 +83,58 @@ clockctlioctl( int error = 0; switch (cmd) { - case CLOCKCTL_SETTIMEOFDAY: { - struct clockctl_settimeofday *args = - (struct clockctl_settimeofday *)data; + case CLOCKCTL_SETTIMEOFDAY: { + struct clockctl_settimeofday *args = data; - error = settimeofday1(args->tv, true, args->tzp, l, false); - if (error) - return (error); - break; - } - case CLOCKCTL_ADJTIME: { - struct clockctl_adjtime *args = - (struct clockctl_adjtime *)data; + error = settimeofday1(args->tv, true, args->tzp, l, false); + break; + } + case CLOCKCTL_ADJTIME: { + struct timeval atv, oldatv; + struct clockctl_adjtime *args = data; - error = adjtime1(args->delta, args->olddelta, - l->l_proc); + if (args->delta) { + error = copyin(args->delta, &atv, sizeof(*args->delta)); if (error) return (error); - break; } - case CLOCKCTL_CLOCK_SETTIME: { - struct clockctl_clock_settime *args = - (struct clockctl_clock_settime *)data; + adjtime1(args->delta ? &atv : NULL, + args->olddelta ? &oldatv : NULL, l->l_proc); + if (args->olddelta) + error = copyout(&oldatv, args->olddelta, + sizeof(args->olddelta)); + break; + } + case CLOCKCTL_CLOCK_SETTIME: { + struct clockctl_clock_settime *args = data; - error = clock_settime1(l->l_proc, args->clock_id, - args->tp, false); - if (error) - return (error); - break; - } + error = clock_settime1(l->l_proc, args->clock_id, + args->tp, false); + break; + } #ifdef NTP - case CLOCKCTL_NTP_ADJTIME: { - struct clockctl_ntp_adjtime *args = - (struct clockctl_ntp_adjtime *)data; - struct timex ntv; - register_t retval; - - error = copyin(args->tp, &ntv, sizeof(ntv)); - if (error) - return (error); + case CLOCKCTL_NTP_ADJTIME: { + struct clockctl_ntp_adjtime *args = data; + struct timex ntv; + register_t retval; - ntp_adjtime1(&ntv); + error = copyin(args->tp, &ntv, sizeof(ntv)); + if (error) + return (error); - error = copyout(&ntv, args->tp, sizeof(ntv)); - if (error == 0) - (void)copyout(&retval, &args->retval, sizeof(retval)); + ntp_adjtime1(&ntv); - return (error); - } + error = copyout(&ntv, args->tp, sizeof(ntv)); + if (error == 0) + error = copyout(&retval, &args->retval, sizeof(retval)); + } #endif /* NTP */ - default: - error = EINVAL; + default: +#ifdef COMPAT_50 + error = compat50_clockctlioctl(dev, cmd, data, flags, l); +#else + error = EINVAL; +#endif } return (error); diff --git a/sys/dev/dksubr.c b/sys/dev/dksubr.c index 882a779effe..336368c47c1 100644 --- a/sys/dev/dksubr.c +++ b/sys/dev/dksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: dksubr.c,v 1.37 2008/04/28 20:23:46 martin Exp $ */ +/* $NetBSD: dksubr.c,v 1.38 2009/01/11 02:45:50 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.37 2008/04/28 20:23:46 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.38 2009/01/11 02:45:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,7 +90,7 @@ dk_open(struct dk_intf *di, struct dk_softc *dksc, dev_t dev, int ret = 0; struct disk *dk = &dksc->sc_dkdev; - DPRINTF_FOLLOW(("dk_open(%s, %p, 0x%x, 0x%x)\n", + DPRINTF_FOLLOW(("dk_open(%s, %p, 0x%llx, 0x%x)\n", di->di_dkname, dksc, dev, flags)); mutex_enter(&dk->dk_openlock); @@ -153,7 +153,7 @@ dk_close(struct dk_intf *di, struct dk_softc *dksc, dev_t dev, int pmask = 1 << part; struct disk *dk = &dksc->sc_dkdev; - DPRINTF_FOLLOW(("dk_close(%s, %p, 0x%x, 0x%x)\n", + DPRINTF_FOLLOW(("dk_close(%s, %p, 0x%llx, 0x%x)\n", di->di_dkname, dksc, dev, flags)); mutex_enter(&dk->dk_openlock); @@ -294,7 +294,7 @@ dk_ioctl(struct dk_intf *di, struct dk_softc *dksc, dev_t dev, #endif int error = 0; - DPRINTF_FOLLOW(("dk_ioctl(%s, %p, 0x%x, 0x%lx)\n", + DPRINTF_FOLLOW(("dk_ioctl(%s, %p, 0x%llx, 0x%lx)\n", di->di_dkname, dksc, dev, cmd)); /* ensure that the pseudo disk is open for writes for these commands */ diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c index e49ea22f93d..47dc2724d4f 100644 --- a/sys/dev/ieee1394/sbp.c +++ b/sys/dev/ieee1394/sbp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbp.c,v 1.23 2009/01/03 03:43:22 yamt Exp $ */ +/* $NetBSD: sbp.c,v 1.24 2009/01/11 02:45:51 christos Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.23 2009/01/03 03:43:22 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.24 2009/01/11 02:45:51 christos Exp $"); #if defined(__FreeBSD__) #include <sys/param.h> @@ -870,8 +870,8 @@ sbp_login(struct sbp_dev *sdev) if (t.tv_sec >= 0 && t.tv_usec > 0) ticks = (t.tv_sec * 1000 + t.tv_usec / 1000) * hz / 1000; SBP_DEBUG(0) - printf("%s: sec = %jd usec = %ld ticks = %d\n", __func__, - (intmax_t)t.tv_sec, t.tv_usec, ticks); + printf("%s: sec = %lld usec = %ld ticks = %d\n", __func__, + (long long)t.tv_sec, (long)t.tv_usec, ticks); END_DEBUG fw_callout_reset(&sdev->login_callout, ticks, sbp_login_callout, (void *)(sdev)); diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c index 127fe02fe78..84261426b4f 100644 --- a/sys/dev/ir/irframe_tty.c +++ b/sys/dev/ir/irframe_tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: irframe_tty.c,v 1.54 2008/05/25 19:22:21 ad Exp $ */ +/* $NetBSD: irframe_tty.c,v 1.55 2009/01/11 02:45:51 christos Exp $ */ /* * TODO @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.54 2008/05/25 19:22:21 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.55 2009/01/11 02:45:51 christos Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -290,7 +290,7 @@ irframetopen(dev_t dev, struct tty *tp) tp->t_sc = sc; sc->sc_tp = tp; aprint_normal("%s attached at tty%02d\n", device_xname(d), - minor(tp->t_dev)); + (int)minor(tp->t_dev)); DPRINTF(("%s: set sc=%p\n", __func__, sc)); @@ -330,7 +330,7 @@ irframetclose(struct tty *tp, int flag) if (sc != NULL) { tp->t_sc = NULL; aprint_normal("%s detached from tty%02d\n", - device_xname(sc->sc_irp.sc_dev), minor(tp->t_dev)); + device_xname(sc->sc_irp.sc_dev), (int)minor(tp->t_dev)); if (sc->sc_tp == tp) { cfdata = device_cfdata(sc->sc_irp.sc_dev); diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index bff391af51e..5a3ecb8609c 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.180 2008/10/25 18:46:38 christos Exp $ */ +/* $NetBSD: pccbb.c,v 1.181 2009/01/11 02:45:51 christos Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.180 2008/10/25 18:46:38 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.181 2009/01/11 02:45:51 christos Exp $"); /* #define CBB_DEBUG @@ -1371,8 +1371,9 @@ pccbb_power(struct pccbb_softc *sc, int command) splx(s); microtime(&after); timersub(&after, &before, &diff); - aprint_debug_dev(sc->sc_dev, "wait took%s %ld.%06lds\n", - (on && times < 0) ? " too long" : "", diff.tv_sec, diff.tv_usec); + aprint_debug_dev(sc->sc_dev, "wait took%s %lld.%06lds\n", + (on && times < 0) ? " too long" : "", (long long)diff.tv_sec, + (long)diff.tv_usec); /* * Ok, wait a bit longer for things to settle. diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index 5b45adcd7d2..0d0b2cdad3a 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: vnd.c,v 1.189 2008/11/19 18:38:36 bouyer Exp $ */ +/* $NetBSD: vnd.c,v 1.190 2009/01/11 02:45:50 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. @@ -130,7 +130,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.189 2008/11/19 18:38:36 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.190 2009/01/11 02:45:50 christos Exp $"); #if defined(_KERNEL_OPT) #include "fs_nfs.h" @@ -338,7 +338,7 @@ vndopen(dev_t dev, int flags, int mode, struct lwp *l) #ifdef DEBUG if (vnddebug & VDB_FOLLOW) - printf("vndopen(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, l); + printf("vndopen(0x%llx, 0x%x, 0x%x, %p)\n", dev, flags, mode, l); #endif sc = device_lookup_private(&vnd_cd, unit); if (sc == NULL) { @@ -402,7 +402,7 @@ vndclose(dev_t dev, int flags, int mode, struct lwp *l) #ifdef DEBUG if (vnddebug & VDB_FOLLOW) - printf("vndclose(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, l); + printf("vndclose(0x%llx, 0x%x, 0x%x, %p)\n", dev, flags, mode, l); #endif sc = device_lookup_private(&vnd_cd, unit); if (sc == NULL) @@ -893,7 +893,7 @@ vndread(dev_t dev, struct uio *uio, int flags) #ifdef DEBUG if (vnddebug & VDB_FOLLOW) - printf("vndread(0x%x, %p)\n", dev, uio); + printf("vndread(0x%llx, %p)\n", dev, uio); #endif sc = device_lookup_private(&vnd_cd, unit); @@ -915,7 +915,7 @@ vndwrite(dev_t dev, struct uio *uio, int flags) #ifdef DEBUG if (vnddebug & VDB_FOLLOW) - printf("vndwrite(0x%x, %p)\n", dev, uio); + printf("vndwrite(0x%llx, %p)\n", dev, uio); #endif sc = device_lookup_private(&vnd_cd, unit); @@ -966,7 +966,7 @@ vndioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) #ifdef DEBUG if (vnddebug & VDB_FOLLOW) - printf("vndioctl(0x%x, 0x%lx, %p, 0x%x, %p): unit %d\n", + printf("vndioctl(0x%llx, 0x%lx, %p, 0x%x, %p): unit %d\n", dev, cmd, data, flag, l->l_proc, unit); #endif vnd = device_lookup_private(&vnd_cd, unit); |
