summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorcegger <cegger@NetBSD.org>2009-01-11 10:58:26 +0000
committercegger <cegger@NetBSD.org>2009-01-11 10:58:26 +0000
commit8c2b3a39bcfb89c8fe2f64e832cfea7dbfe579c7 (patch)
tree323da38f9f3a70490ac787c66d88cb340f5627ae /sys/dev
parent378bd0b6186dce500e868b659e91df96210970a1 (diff)
make this compile
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/uk.c6
-rw-r--r--sys/dev/usb/umass_scsipi.c16
-rw-r--r--sys/dev/usb/umidi.c12
-rw-r--r--sys/dev/usb/urio.c14
-rw-r--r--sys/dev/usb/uscanner.c6
5 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/scsipi/uk.c b/sys/dev/scsipi/uk.c
index 473792ba1c2..dbec7014bfb 100644
--- a/sys/dev/scsipi/uk.c
+++ b/sys/dev/scsipi/uk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uk.c,v 1.55 2008/06/08 18:18:34 tsutsui Exp $ */
+/* $NetBSD: uk.c,v 1.56 2009/01/11 10:58:26 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.55 2008/06/08 18:18:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.56 2009/01/11 10:58:26 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,7 @@ ukopen(dev_t dev, int flag, int fmt, struct lwp *l)
adapt = periph->periph_channel->chan_adapter;
SC_DEBUG(periph, SCSIPI_DB1,
- ("ukopen: dev=0x%x (unit %d (of %d))\n", dev, unit,
+ ("ukopen: dev=0x%"PRIx64" (unit %d (of %d))\n", dev, unit,
uk_cd.cd_ndevs));
/*
diff --git a/sys/dev/usb/umass_scsipi.c b/sys/dev/usb/umass_scsipi.c
index 58ea0b009cb..3db261d8b9f 100644
--- a/sys/dev/usb/umass_scsipi.c
+++ b/sys/dev/usb/umass_scsipi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.33 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.34 2009/01/11 11:06:08 cegger Exp $ */
/*
* Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.33 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.34 2009/01/11 11:06:08 cegger Exp $");
#include "atapibus.h"
#include "scsibus.h"
@@ -221,9 +221,9 @@ umass_scsipi_request(struct scsipi_channel *chan,
periph = xs->xs_periph;
DIF(UDMASS_UPPER, periph->periph_dbflags |= SCSIPI_DEBUG_FLAGS);
- DPRINTF(UDMASS_CMD, ("%s: umass_scsi_cmd: at %lu.%06lu: %d:%d "
+ DPRINTF(UDMASS_CMD, ("%s: umass_scsi_cmd: at %"PRIu64".%06"PRIu64": %d:%d "
"xs=%p cmd=0x%02x datalen=%d (quirks=0x%x, poll=%d)\n",
- USBDEVNAME(sc->sc_dev), sc->tv.tv_sec, sc->tv.tv_usec,
+ USBDEVNAME(sc->sc_dev), sc->tv.tv_sec, (uint64_t)sc->tv.tv_usec,
periph->periph_target, periph->periph_lun,
xs, xs->cmd->opcode, xs->datalen,
periph->periph_quirks, xs->xs_control & XS_CTL_POLL));
@@ -399,8 +399,8 @@ umass_scsipi_cb(struct umass_softc *sc, void *priv, int residue, int status)
delta = (tv.tv_sec - sc->tv.tv_sec) * 1000000 + tv.tv_usec - sc->tv.tv_usec;
#endif
- DPRINTF(UDMASS_CMD,("umass_scsipi_cb: at %lu.%06lu, delta=%u: xs=%p residue=%d"
- " status=%d\n", tv.tv_sec, tv.tv_usec, delta, xs, residue, status));
+ DPRINTF(UDMASS_CMD,("umass_scsipi_cb: at %"PRIu64".%06"PRIu64", delta=%u: xs=%p residue=%d"
+ " status=%d\n", tv.tv_sec, (uint64_t)tv.tv_usec, delta, xs, residue, status));
xs->resid = residue;
@@ -441,9 +441,9 @@ umass_scsipi_cb(struct umass_softc *sc, void *priv, int residue, int status)
USBDEVNAME(sc->sc_dev), status);
}
- DPRINTF(UDMASS_CMD,("umass_scsipi_cb: at %lu.%06lu: return xs->error="
+ DPRINTF(UDMASS_CMD,("umass_scsipi_cb: at %"PRIu64".%06"PRIu64": return xs->error="
"%d, xs->xs_status=0x%x xs->resid=%d\n",
- tv.tv_sec, tv.tv_usec,
+ tv.tv_sec, (uint64_t)tv.tv_usec,
xs->error, xs->xs_status, xs->resid));
s = splbio();
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index bdd4b8621c5..4be81b78e04 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.38 2008/07/08 11:34:43 gmcgarry Exp $ */
+/* $NetBSD: umidi.c,v 1.39 2009/01/11 11:06:08 cegger Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.38 2008/07/08 11:34:43 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.39 2009/01/11 11:06:08 cegger Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1486,8 +1486,8 @@ out_jack_output(struct umidi_jack *out_jack, u_char *src, int len, int cin)
if ( umididebug >= 100 )
microtime(&umidi_tv);
#endif
- DPRINTFN(100, ("umidi out: %lu.%06lus ep=%p cn=%d len=%d cin=%#x\n",
- umidi_tv.tv_sec%100, umidi_tv.tv_usec,
+ DPRINTFN(100, ("umidi out: %"PRIu64".%06"PRIu64"s ep=%p cn=%d len=%d cin=%#x\n",
+ umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec,
ep, out_jack->cable_number, len, cin));
s = splusb();
@@ -1631,9 +1631,9 @@ out_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
#endif
usbd_get_xfer_status(xfer, NULL, NULL, &count, NULL);
if ( 0 == count % UMIDI_PACKET_SIZE ) {
- DPRINTFN(200,("%s: %lu.%06lus out ep %p xfer length %u\n",
+ DPRINTFN(200,("%s: %"PRIu64".%06"PRIu64"s out ep %p xfer length %u\n",
USBDEVNAME(ep->sc->sc_dev),
- umidi_tv.tv_sec%100, umidi_tv.tv_usec, ep, count));
+ umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec, ep, count));
} else {
DPRINTF(("%s: output endpoint %p odd transfer length %u\n",
USBDEVNAME(ep->sc->sc_dev), ep, count));
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index a217a308e3d..13d13f9364d 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.30 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: urio.c,v 1.31 2009/01/11 11:06:08 cegger Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.30 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.31 2009/01/11 11:06:08 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -308,7 +308,7 @@ urioopen(dev_t dev, int flag, int mode, struct lwp *l)
USB_GET_SC_OPEN(urio, URIOUNIT(dev), sc);
- DPRINTFN(5, ("urioopen: flag=%d, mode=%d, unit=%d\n",
+ DPRINTFN(5, ("urioopen: flag=%d, mode=%d, unit=%"PRId64"\n",
flag, mode, URIOUNIT(dev)));
if (sc->sc_dying)
@@ -340,7 +340,7 @@ urioclose(dev_t dev, int flag, int mode,
struct urio_softc *sc;
USB_GET_SC(urio, URIOUNIT(dev), sc);
- DPRINTFN(5, ("urioclose: flag=%d, mode=%d, unit=%d\n",
+ DPRINTFN(5, ("urioclose: flag=%d, mode=%d, unit=%"PRId64"\n",
flag, mode, URIOUNIT(dev)));
if (sc->sc_in_pipe != NULL) {
@@ -369,7 +369,7 @@ urioread(dev_t dev, struct uio *uio, int flag)
USB_GET_SC(urio, URIOUNIT(dev), sc);
- DPRINTFN(5, ("urioread: %d\n", URIOUNIT(dev)));
+ DPRINTFN(5, ("urioread: %"PRId64"\n", URIOUNIT(dev)));
if (sc->sc_dying)
return (EIO);
@@ -426,7 +426,7 @@ uriowrite(dev_t dev, struct uio *uio, int flag)
USB_GET_SC(urio, URIOUNIT(dev), sc);
- DPRINTFN(5, ("uriowrite: unit=%d, len=%ld\n", URIOUNIT(dev),
+ DPRINTFN(5, ("uriowrite: unit=%"PRId64", len=%ld\n", URIOUNIT(dev),
(long)uio->uio_resid));
if (sc->sc_dying)
@@ -469,7 +469,7 @@ uriowrite(dev_t dev, struct uio *uio, int flag)
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
- DPRINTFN(5, ("uriowrite: done unit=%d, error=%d\n", URIOUNIT(dev),
+ DPRINTFN(5, ("uriowrite: done unit=%"PRId64", error=%d\n", URIOUNIT(dev),
error));
return (error);
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 027db6379c7..33cd3d1dd11 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.62 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: uscanner.c,v 1.63 2009/01/11 11:06:08 cegger Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.62 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.63 2009/01/11 11:06:08 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -462,7 +462,7 @@ uscannerclose(dev_t dev, int flag, int mode,
USB_GET_SC(uscanner, USCANNERUNIT(dev), sc);
- DPRINTFN(5, ("uscannerclose: flag=%d, mode=%d, unit=%d\n",
+ DPRINTFN(5, ("uscannerclose: flag=%d, mode=%d, unit=%"PRId64"\n",
flag, mode, USCANNERUNIT(dev)));
#ifdef DIAGNOSTIC