 @@ -1,14 +1,14 @@
-/*	$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.
  * 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 HPIB interface
  */
 #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>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <hp300/dev/hpibvar.h>
 @@ -196,47 +196,47 @@ 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;
 #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)
 		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;
+}
 static int
 ppiclose(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	struct ppi_softc *sc = device_lookup_private(&ppi_cd, UNIT(dev));
 #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;
 	return 0;
+}
 static void
 ppistart(void *arg)
+{
 	struct ppi_softc *sc = arg;
 #ifdef DEBUG
 	if (ppidebug & PDB_FOLLOW)
 @@ -255,61 +255,61 @@ ppitimo(void *arg)
 	if (ppidebug & PDB_FOLLOW)
 		printf("ppitimo(%x)\n", device_unit(sc->sc_dev));
 #endif
 	sc->sc_flags &= ~(PPIF_UIO|PPIF_TIMO);
 	wakeup(sc);
+}
 static int
 ppiread(dev_t dev, struct uio *uio, int flags)
+{
 #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);
+}
 static int
 ppiwrite(dev_t dev, struct uio *uio, int flags)
+{
 #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);
+}
 static int
 ppirw(dev_t dev, struct uio *uio)
+{
 	struct ppi_softc *sc = device_lookup_private(&ppi_cd, UNIT(dev));
 	int s, s2, len, cnt;
 	char *cp;
 	int error = 0, gotdata = 0;
 	int buflen, ctlr, slave;
 	char *buf;
 	if (uio->uio_resid == 0)
 		return 0;
 	ctlr = device_unit(device_parent(sc->sc_dev));
 	slave = sc->sc_slave;
 #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
 	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);

 @@ -1,14 +1,14 @@
-/*	$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.
  * 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.
 @@ -62,27 +62,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Utah $Hdr: rd.c 1.44 92/12/26$
+ *
  *	@(#)rd.c	8.2 (Berkeley) 5/19/94
  */
 /*
  * CS80/SS80 disk driver
  */
 #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"
 #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/disk.h>
 #include <sys/disklabel.h>
 #include <sys/fcntl.h>
 @@ -647,27 +647,27 @@ rdclose(dev_t dev, int flag, int mode, s
+}
 static void
 rdstrategy(struct buf *bp)
+{
 	struct rd_softc *sc = device_lookup_private(&rd_cd, rdunit(bp->b_dev));
 	struct partition *pinfo;
 	daddr_t bn;
 	int sz, s;
 	int offset;
 #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
 	bn = bp->b_blkno;
 	sz = howmany(bp->b_bcount, DEV_BSIZE);
 	pinfo = &sc->sc_dkdev.dk_label->d_partitions[rdpart(bp->b_dev)];
 	/* Don't perform partition translation on RAW_PART. */
 	offset = (rdpart(bp->b_dev) == RAW_PART) ? 0 : pinfo->p_offset;
 	if (rdpart(bp->b_dev) != RAW_PART) {
 		/*
 		 * XXX This block of code belongs in