 @@ -1,14 +1,14 @@
-/*	$NetBSD: ct.c,v 1.21 2009/05/12 14:21:58 cegger Exp $ */
+/*	$NetBSD: ct.c,v 1.22 2009/09/12 18:44:36 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -111,27 +111,27 @@
+ *
  * Reminder:
  *	C_CC bit (character count option) when used in the CS/80 command
  *	'set options' will cause the tape not to stream.
+ *
  * TODO:
  *	make filesystem compatible
  *	make block mode work according to mtio(4) spec. (if possible)
  *	merge with CS/80 disk driver
  *	finish support of HP9145
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.21 2009/05/12 14:21:58 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.22 2009/09/12 18:44:36 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
 #include <sys/proc.h>
 #include <sys/tprintf.h>
 #include <dev/gpib/ctreg.h>	/* XXX must be before cs80busvar.h ATM */
 @@ -475,27 +475,28 @@ ctcommand(dev_t dev, int cmd, int cnt)
+	}
 	bp->b_flags = 0;
 	sc->sc_flags &= ~CTF_CMD;
 	if (nbp)
 		brelse(nbp, 0);
+}
 void
 ctstrategy(struct buf *bp)
+{
 	struct ct_softc *sc;
 	int s;
-	DPRINTF(CDB_FOLLOW, ("cdstrategy(%p): dev %x, bn %x, bcount %lx, %c\n",
+	DPRINTF(CDB_FOLLOW, ("cdstrategy(%p): dev %" PRIx64 ", bn %" PRIx64
 	    ", bcount %x, %c\n",
 	    bp, bp->b_dev, bp->b_blkno, bp->b_bcount,
 	    (bp->b_flags & B_READ) ? 'R' : 'W'));
 	sc = device_lookup_private(&ct_cd, CTUNIT(bp->b_dev));
 	s = splbio();
 	bufq_put(sc->sc_tab, bp);
 	if (sc->sc_active == 0) {
 		sc->sc_active = 1;
 		ctustart(sc);
+	}
 	splx(s);
+}
 @@ -631,27 +632,27 @@ cteof(struct ct_softc *sc, struct buf *b
 	 * EOT on a write is an error.
 	 */
 	if ((bp->b_flags & B_READ) == 0) {
 		bp->b_resid = bp->b_bcount;
 		bp->b_error = ENOSPC;
 		sc->sc_flags |= CTF_EOT;
 		return;
+	}
 	/*
 	 * Use returned block position to determine how many blocks
 	 * we really read and update b_resid.
 	 */
 	blks = sc->sc_stat.c_blk - sc->sc_blkno - 1;
-	DPRINTF(CDB_FILES, ("cteof: bc %ld oblk %d nblk %d read %ld, resid %ld\n",
+	DPRINTF(CDB_FILES, ("cteof: bc %d oblk %d nblk %d read %ld, resid %ld\n",
 	    bp->b_bcount, sc->sc_blkno, sc->sc_stat.c_blk,
 	    blks, bp->b_bcount - CTKTOB(blks)));
 	if (blks == -1) { /* 9145 on EOF does not change sc_stat.c_blk */
 		blks = 0;
 		sc->sc_blkno++;
+	}
 	else {
 		sc->sc_blkno = sc->sc_stat.c_blk;
+	}
 	bp->b_resid = bp->b_bcount - CTKTOB(blks);
 	/*
 	 * If we are at physical EOV or were after an EOF,
 	 * we are now at logical EOT.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mt.c,v 1.21 2009/05/18 20:41:57 ad Exp $ */
+/*	$NetBSD: mt.c,v 1.22 2009/09/12 18:44:36 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -104,27 +104,27 @@
  * from: Utah $Hdr: rd.c 1.44 92/12/26$
+ *
  *	@(#)rd.c	8.2 (Berkeley) 5/19/94
  */
 /*
  * Magnetic tape driver (HP7974a, HP7978a/b, HP7979a, HP7980a, HP7980xc)
  * Original version contributed by Mt. Xinu.
  * Modified for 4.4BSD by Mark Davies and Andrew Vignaux, Department of
  * Computer Science, Victoria University of Wellington
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.21 2009/05/18 20:41:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.22 2009/09/12 18:44:36 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/kernel.h>
 #include <sys/tprintf.h>
 @@ -945,28 +945,29 @@ mtintr(struct mt_softc *sc)
 			sc->sc_flags |= MTF_ALIVE;
+		}
 	} else {
 		i = gpibrecv(sc->sc_ic, slave, MTT_BCNT, cmdbuf, 2);
 		if (i != 2) {
 			aprint_error_dev(&sc->sc_dev, "intr: can't get xfer length\n");
 			goto error;
+		}
 		i = (int) *((u_short *) cmdbuf);
 		if (i <= bp->b_bcount) {
 			if (i == 0)
 				sc->sc_flags |= MTF_HITEOF;
 			bp->b_resid = bp->b_bcount - i;
-			DPRINTF(MDB_ANY, ("%s intr: bcount %ld, resid %ld",
+			DPRINTF(MDB_ANY, ("%s intr: bcount %d, resid %d",
-			    device_xname(&sc->sc_dev), bp->b_bcount, bp->b_resid));
+			    device_xname(&sc->sc_dev),
 			    bp->b_bcount, bp->b_resid));
 		} else {
 			tprintf(sc->sc_ttyp,
 				"%s: record (%d) larger than wanted (%d)\n",
 				device_xname(&sc->sc_dev), i, bp->b_bcount);
 error:
 			sc->sc_flags &= ~MTF_IO;
 			bp->b_error = EIO;
+		}
+	}
 	/*
 	 * The operation is completely done.
 	 * Let the drive know with an END command.
 	 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ppi.c,v 1.18 2009/09/12 18:43:03 tsutsui Exp $	*/
+/*	$NetBSD: ppi.c,v 1.19 2009/09/12 18:44:36 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -55,27 +55,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ppi.c	8.1 (Berkeley) 6/16/93
  */
 /*
  * Printer/Plotter GPIB interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.18 2009/09/12 18:43:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.19 2009/09/12 18:44:36 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <dev/gpib/gpibvar.h>
 #include <dev/gpib/ppiio.h>
 @@ -174,47 +174,47 @@ ppiattach(device_t parent, device_t self
 int
 ppiopen(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	struct ppi_softc *sc;
 	sc = device_lookup_private(&ppi_cd, UNIT(dev));
 	if (sc == NULL)
 		return (ENXIO);
 	if ((sc->sc_flags & PPIF_ALIVE) == 0)
 		return (ENXIO);
-	DPRINTF(PDB_FOLLOW, ("ppiopen(%x, %x): flags %x\n",
+	DPRINTF(PDB_FOLLOW, ("ppiopen(%" PRIx64 ", %x): flags %x\n",
 	    dev, flags, sc->sc_flags));
 	if (sc->sc_flags & PPIF_OPEN)
 		return (EBUSY);
 	sc->sc_flags |= PPIF_OPEN;
 	sc->sc_burst = PPI_BURST;
 	sc->sc_timo = ppimstohz(PPI_TIMO);
 	sc->sc_delay = ppimstohz(PPI_DELAY);
 	sc->sc_sec = -1;
 	return (0);
+}
 int
 ppiclose(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	struct ppi_softc *sc;
 	sc = device_lookup_private(&ppi_cd, UNIT(dev));
-	DPRINTF(PDB_FOLLOW, ("ppiclose(%x, %x): flags %x\n",
+	DPRINTF(PDB_FOLLOW, ("ppiclose(%" PRIx64 ", %x): flags %x\n",
 		       dev, flags, sc->sc_flags));
 	sc->sc_flags &= ~PPIF_OPEN;
 	return (0);
+}
 void
 ppicallback(void *v, int action)
+{
 	struct ppi_softc *sc = v;
 	DPRINTF(PDB_FOLLOW, ("ppicallback: v=%p, action=%d\n", v, action));
 @@ -249,57 +249,57 @@ ppitimo(void *arg)
+{
 	struct ppi_softc *sc = arg;
 	DPRINTF(PDB_FOLLOW, ("ppitimo(%x)\n", device_unit(&sc->sc_dev)));
 	sc->sc_flags &= ~(PPIF_UIO|PPIF_TIMO);
 	wakeup(sc);
+}
 int
 ppiread(dev_t dev, struct uio *uio, int flags)
+{
-	DPRINTF(PDB_FOLLOW, ("ppiread(%x, %p)\n", dev, uio));
+	DPRINTF(PDB_FOLLOW, ("ppiread(%" PRIx64 ", %p)\n", dev, uio));
 	return (ppirw(dev, uio));
+}
 int
 ppiwrite(dev_t dev, struct uio *uio, int flags)
+{
-	DPRINTF(PDB_FOLLOW, ("ppiwrite(%x, %p)\n", dev, uio));
+	DPRINTF(PDB_FOLLOW, ("ppiwrite(%" PRIx64 ", %p)\n", dev, uio));
 	return (ppirw(dev, uio));
+}
 int
 ppirw(dev_t dev, struct uio *uio)
+{
 	struct ppi_softc *sc = device_lookup_private(&ppi_cd, UNIT(dev));
 	int s1, s2, len, cnt;
 	char *cp;
 	int error = 0, gotdata = 0;
 	int buflen, address;
 	char *buf;
 	if (uio->uio_resid == 0)
 		return (0);
 	address = sc->sc_address;
 	DPRINTF(PDB_FOLLOW|PDB_IO,
-	    ("ppirw(%x, %p, %c): burst %d, timo %d, resid %x\n",
+	    ("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));
 	buflen = min(sc->sc_burst, uio->uio_resid);
 	buf = (char *)malloc(buflen, M_DEVBUF, M_WAITOK);
 	sc->sc_flags |= PPIF_UIO;
 	if (sc->sc_timo > 0) {
 		sc->sc_flags |= PPIF_TIMO;
 		callout_reset(&sc->sc_timo_ch, sc->sc_timo, ppitimo, sc);
+	}
 	len = cnt = 0;
 	while (uio->uio_resid > 0) {
 		len = min(buflen, uio->uio_resid);