diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c index f7b6c27cfb92..ebfda255660c 100644 --- a/sys/dev/isa/spkr.c +++ b/sys/dev/isa/spkr.c @@ -1,4 +1,4 @@ -/* $NetBSD: spkr.c,v 1.28 2008/03/04 14:59:35 cube Exp $ */ +/* $NetBSD: spkr.c,v 1.29 2009/01/11 10:43:06 cegger Exp $ */ /* * Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com) @@ -43,7 +43,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.28 2008/03/04 14:59:35 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.29 2009/01/11 10:43:06 cegger Exp $"); #include #include @@ -422,11 +422,10 @@ spkrattach(device_t parent, device_t self, void *aux) } int -spkropen(dev_t dev, int flags, int mode, - struct lwp *l) +spkropen(dev_t dev, int flags, int mode, struct lwp *l) { #ifdef SPKRDEBUG - printf("spkropen: entering with dev = %x\n", dev); + printf("spkropen: entering with dev = %"PRIx64"\n", dev); #endif /* SPKRDEBUG */ if (minor(dev) != 0 || !spkr_attached) @@ -448,7 +447,7 @@ spkrwrite(dev_t dev, struct uio *uio, int flags) int n; int error; #ifdef SPKRDEBUG - printf("spkrwrite: entering with dev = %x, count = %d\n", + printf("spkrwrite: entering with dev = %"PRIx64", count = %d\n", dev, uio->uio_resid); #endif /* SPKRDEBUG */ @@ -468,7 +467,7 @@ int spkrclose(dev_t dev, int flags, int mode, struct lwp *l) { #ifdef SPKRDEBUG - printf("spkrclose: entering with dev = %x\n", dev); + printf("spkrclose: entering with dev = %"PRIx64"\n", dev); #endif /* SPKRDEBUG */ if (minor(dev) != 0) @@ -486,7 +485,7 @@ int spkrioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) { #ifdef SPKRDEBUG - printf("spkrioctl: entering with dev = %x, cmd = %lx\n", dev, cmd); + printf("spkrioctl: entering with dev = %"PRIx64", cmd = %lx\n", dev, cmd); #endif /* SPKRDEBUG */ if (minor(dev) != 0) diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index 69aae24c2f9d..f5e28e50208b 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $NetBSD: sequencer.c,v 1.50 2008/07/15 16:18:08 christos Exp $ */ +/* $NetBSD: sequencer.c,v 1.51 2009/01/11 10:40:27 cegger Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.50 2008/07/15 16:18:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.51 2009/01/11 10:40:27 cegger Exp $"); #include "sequencer.h" @@ -901,12 +901,12 @@ seq_timer_waitabs(struct sequencer_softc *sc, uint32_t divs) usec = (long long)divs * (long long)t->usperdiv; /* convert to usec */ when.tv_sec = usec / 1000000; when.tv_usec = usec % 1000000; - DPRINTFN(4, ("seq_timer_waitabs: adjdivs=%d, sleep when=%ld.%06ld", - divs, when.tv_sec, when.tv_usec)); + DPRINTFN(4, ("seq_timer_waitabs: adjdivs=%d, sleep when=%"PRId64".%06"PRId64, + divs, when.tv_sec, (uint64_t)when.tv_usec)); ADDTIMEVAL(&when, &t->reftime); /* abstime for end */ ticks = tvhzto(&when); - DPRINTFN(4, (" when+start=%ld.%06ld, tick=%d\n", - when.tv_sec, when.tv_usec, ticks)); + DPRINTFN(4, (" when+start=%"PRId64".%06"PRId64", tick=%d\n", + when.tv_sec, (uint64_t)when.tv_usec, ticks)); if (ticks > 0) { #ifdef DIAGNOSTIC if (ticks > 20 * hz) {