 @@ -1,14 +1,14 @@
-/*	$NetBSD: rd.c,v 1.92.6.1 2012/11/20 03:01:21 tls Exp $	*/
+/*	$NetBSD: rd.c,v 1.92.6.2 2012/12/02 05:46:39 tls 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.92.6.1 2012/11/20 03:01:21 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.92.6.2 2012/12/02 05:46:39 tls Exp $");
 #include "opt_useleds.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>
 #include <sys/ioctl.h>
 @@ -280,26 +280,39 @@ static dev_type_ioctl(rdioctl);
 static dev_type_strategy(rdstrategy);
 static dev_type_dump(rddump);
 static dev_type_size(rdsize);
 const struct bdevsw rd_bdevsw = {
 	rdopen, rdclose, rdstrategy, rdioctl, rddump, rdsize, D_DISK
 };
 const struct cdevsw rd_cdevsw = {
 	rdopen, rdclose, rdread, rdwrite, rdioctl,
 	nostop, notty, nopoll, nommap, nokqfilter, D_DISK
 };
 static void
 rdminphys(struct buf *bp)
+{
     struct rd_softc *sc = device_lookup_private(&rd_cd, rdunit(bp->b_dev));
     long xmax;
     xmax = sc->sc_dev->dv_maxphys;
     if (bp->b_bcount > xmax)
 	bp->b_bcount = xmax;
+}
 const struct dkdriver rd_dkdriver = { rdstrategy, rdminphys };
 static int
 rdmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct hpibbus_attach_args *ha = aux;
 	/*
 	 * Set punit if operator specified one in the kernel
 	 * configuration file.
 	 */
 	if (cf->hpibbuscf_punit != HPIBBUSCF_PUNIT_DEFAULT &&
 	    cf->hpibbuscf_punit < HPIB_NPUNITS)
 		ha->ha_punit = cf->hpibbuscf_punit;
 @@ -324,27 +337,27 @@ rdattach(device_t parent, device_t self,
 	sc->sc_dev = self;
 	bufq_alloc(&sc->sc_tab, "disksort", BUFQ_SORT_RAWBLOCK);
 	if (rdident(parent, sc, ha) == 0) {
 		aprint_error(": didn't respond to describe command!\n");
 		return;
+	}
 	/*
 	 * Initialize and attach the disk structure.
 	 */
 	memset(&sc->sc_dkdev, 0, sizeof(sc->sc_dkdev));
-	disk_init(&sc->sc_dkdev, device_xname(sc->sc_dev), NULL);
+	disk_init(&sc->sc_dkdev, device_xname(sc->sc_dev), &rd_dkdriver);
 	disk_attach(&sc->sc_dkdev);
 	sc->sc_slave = ha->ha_slave;
 	sc->sc_punit = ha->ha_punit;
 	callout_init(&sc->sc_restart_ch, 0);
 	/* Initialize the hpib job queue entry */
 	sc->sc_hq.hq_softc = sc;
 	sc->sc_hq.hq_slave = sc->sc_slave;
 	sc->sc_hq.hq_start = rdstart;
 	sc->sc_hq.hq_go = rdgo;
 	sc->sc_hq.hq_intr = rdintr;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hp.c,v 1.48 2010/12/14 23:38:30 matt Exp $ */
+/*	$NetBSD: hp.c,v 1.48.18.1 2012/12/02 05:46:39 tls Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -32,27 +32,27 @@
 /*
  * Simple device driver routine for massbuss disks.
  * TODO:
  *  Fix support for Standard DEC BAD144 bad block forwarding.
  *  Be able to to handle soft/hard transfer errors.
  *  Handle non-data transfer interrupts.
  *  Autoconfiguration of disk drives 'on the fly'.
  *  Handle disk media changes.
  *  Dual-port operations should be supported.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.48 2010/12/14 23:38:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.48.18.1 2012/12/02 05:46:39 tls Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/dkio.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/stat.h>
 #include <sys/ioccom.h>
 @@ -108,26 +108,28 @@ const struct cdevsw hp_cdevsw = {
 	.d_open = hpopen,
 	.d_close = hpclose,
 	.d_read = hpread,
 	.d_write = hpwrite,
 	.d_ioctl = hpioctl,
 	.d_stop = nostop,
 	.d_tty = notty,
 	.d_poll = nopoll,
 	.d_mmap = nommap,
 	.d_kqfilter = nokqfilter,
 	.d_flag = D_DISK
 };
 const struct dkdriver hp_dkdriver = { hpstrategy, minphys };
 #define HP_WCSR(reg, val) \
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, (reg), (val))
 #define HP_RCSR(reg) \
 	bus_space_read_4(sc->sc_iot, sc->sc_ioh, (reg))
 /*
  * Check if this is a disk drive; done by checking type from mbaattach.
  */
 int
 hpmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mba_attach_args * const ma = aux;
 @@ -164,27 +166,27 @@ hpattach(device_t parent, device_t self,
 	 */
 	bufq_alloc(&sc->sc_md.md_q, "disksort", BUFQ_SORT_CYLINDER);
 	sc->sc_md.md_softc = sc;		/* Pointer to this softc */
 	sc->sc_md.md_mba = ms;			/* Pointer to parent softc */
 	sc->sc_md.md_start = hpstart;		/* Disk start routine */
 	sc->sc_md.md_attn = hpattn;		/* Disk attention routine */
 	sc->sc_md.md_finish = hpfinish;		/* Disk xfer finish routine */
 	ms->sc_md[ma->ma_unit] = &sc->sc_md;	/* Per-unit backpointer */
 	/*
 	 * Init and attach the disk structure.
 	 */
-	disk_init(&sc->sc_disk, device_xname(sc->sc_dev), NULL);
+	disk_init(&sc->sc_disk, device_xname(sc->sc_dev), &hp_dkdriver);
 	disk_attach(&sc->sc_disk);
 	/*
 	 * Fake a disklabel to be able to read in the real label.
 	 */
 	dl = sc->sc_disk.dk_label;
 	dl->d_secsize = DEV_BSIZE;
 	dl->d_ntracks = 1;
 	dl->d_nsectors = 32;
 	dl->d_secpercyl = 32;
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hdc9224.c,v 1.51 2010/12/14 23:31:16 matt Exp $ */
+/*	$NetBSD: hdc9224.c,v 1.51.18.1 2012/12/02 05:46:39 tls Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Ludd by Bertram Barth.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -41,27 +41,27 @@
+ *
  * Rewritten by Ragge 25 Jun 2000. New features:
  *	- Uses interrupts instead of polling to signal ready.
  *	- Can cooperate with the SCSI routines WRT. the DMA area.
+ *
  * TODO:
  *	- Floppy support missing.
  *	- Bad block forwarding missing.
  *	- Statistics collection.
  */
 #undef	RDDEBUG
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.51 2010/12/14 23:31:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.51.18.1 2012/12/02 05:46:39 tls Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/cpu.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 @@ -218,26 +218,34 @@ const struct cdevsw rd_cdevsw = {
 	.d_flag = D_DISK
 };
 /* At least 0.7 uS between register accesses */
 static int rd_dmasize, inq = 0;
 static volatile int u;
 #define	WAIT	__asm("movl %0,%0;movl %0,%0;movl %0,%0; movl %0,%0" :: "m"(u))
 #define	HDC_WREG(x)	*(volatile char *)(sc->sc_regs) = (x)
 #define	HDC_RREG	*(volatile char *)(sc->sc_regs)
 #define	HDC_WCMD(x)	*(volatile char *)(sc->sc_regs + 4) = (x)
 #define	HDC_RSTAT	*(volatile char *)(sc->sc_regs + 4)
 static void
 rdminphys(struct buf *bp)
+{
 	if (bp->b_bcount > rd_dmasize)
 		bp->b_bcount = rd_dmasize;
+}
 const struct dkdriver rd_dkdriver = { rdstrategy, rdminphys };
 /*
  * new-config's hdcmatch() is similiar to old-config's hdcprobe(),
  * thus we probe for the existence of the controller and reset it.
  * NB: we can't initialize the controller yet, since space for hdcsoftc
  *     is not yet allocated. Thus we do this in hdcattach()...
  */
 int
 hdcmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct vsbus_attach_args * const va = aux;
 	volatile char * const hdc_csr = (volatile char *)va->va_addr;
 	int i;
 @@ -291,27 +299,27 @@ hdcattach(device_t parent, device_t self
 	sc->sc_dev = self;
 	/*
 	 * Get interrupt vector, enable instrumentation.
 	 */
 	scb_vecalloc(va->va_cvec, hdcintr, sc, SCB_ISTACK, &sc->sc_intrcnt);
 	evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
 	    device_xname(self), "intr");
 	sc->sc_regs = vax_map_physmem(va->va_paddr, 1);
 	sc->sc_dmabase = (void *)va->va_dmaaddr;
 	sc->sc_dmasize = va->va_dmasize;
 	sc->sc_intbit = va->va_maskno;
-	rd_dmasize = min(MAXPHYS, sc->sc_dmasize); /* Used in rd_minphys */
+	rd_dmasize = min(MAXPHYS, sc->sc_dmasize); /* Used in rdminphys */
 	sc->sc_vd.vd_go = hdc_qstart;
 	sc->sc_vd.vd_arg = sc;
 	/*
 	 * Reset controller.
 	 */
 	HDC_WCMD(DKC_CMD_RESET);
 	DELAY(1000);
 	status = HDC_RSTAT;
 	if (status != (DKC_ST_DONE|DKC_TC_SUCCESS)) {
 		aprint_error_dev(self, "RESET failed,  status 0x%x\n", status);
 		return;
+	}
 @@ -355,27 +363,27 @@ rdattach(device_t parent, device_t self,
+{
 	struct hdcsoftc * const sc = device_private(parent);
 	struct rdsoftc * const rd = device_private(self);
 	struct hdc_attach_args * const ha = aux;
 	struct disklabel *dl;
 	const char *msg;
 	rd->sc_dev = self;
 	rd->sc_drive = ha->ha_drive;
 	rd->sc_hdc = sc;
 	/*
 	 * Initialize and attach the disk structure.
 	 */
-	disk_init(&rd->sc_disk, device_xname(rd->sc_dev), NULL);
+	disk_init(&rd->sc_disk, device_xname(rd->sc_dev), &rd_dkdriver);
 	disk_attach(&rd->sc_disk);
 	/*
 	 * if it's not a floppy then evaluate the on-disk geometry.
 	 * if necessary correct the label...
 	 */
 	rd_readgeom(sc, rd);
 	disk_printtype(rd->sc_drive, rd->sc_xbn.media_id);
 	dl = rd->sc_disk.dk_label;
 	rdmakelabel(dl, &rd->sc_xbn);
 	msg = readdisklabel(MAKEDISKDEV(cdevsw_lookup_major(&rd_cdevsw),
 					device_unit(rd->sc_dev), RAW_PART),
 			    rdstrategy, dl, NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ccd.c,v 1.143 2011/11/13 23:02:46 christos Exp $	*/
+/*	$NetBSD: ccd.c,v 1.143.10.1 2012/12/02 05:46:39 tls Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe, and by Andrew Doran.
+ *
  * 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.
 @@ -78,27 +78,27 @@
  *    sc_stop, sc_bufq and b_resid from master buffers.
+ *
  * => a combination of CCDF_INITED, sc_inflight, and sc_iolock is used to
  *    serialize I/O and configuration changes.
+ *
  * => the in-core disk label does not change while the device is open.
+ *
  * On memory consumption: ccd fans out I/O requests and so needs to
  * allocate memory.  If the system is desperately low on memory, we
  * single thread I/O.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.143 2011/11/13 23:02:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.143.10.1 2012/12/02 05:46:39 tls Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/module.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 @@ -200,26 +200,43 @@ const struct cdevsw ccd_cdevsw = {
 	.d_kqfilter = nokqfilter,
 	.d_flag = D_DISK | D_MPSAFE
 };
 #ifdef DEBUG
 static	void printiinfo(struct ccdiinfo *);
 #endif
 /* Publically visible for the benefit of libkvm and ccdconfig(8). */
 struct ccd_softc 	*ccd_softc;
 const int		ccd_softc_elemsize = sizeof(struct ccd_softc);
 int			numccd = 0;
 static void
 ccdminphys(struct buf *bp)
+{
 	struct ccd_softc *cs;
 	long xmax;
 	int unit = ccdunit(bp->b_dev);
 	cs = &ccd_softc[unit];
 	xmax = cs->sc_maxphys;
 	if (bp->b_bcount > xmax)
 	    bp->b_bcount = xmax;
+}
 const struct dkdriver ccd_dkdriver = { ccdstrategy, ccdminphys };
 /*
  * Called by main() during pseudo-device attachment.  All we need
  * to do is allocate enough space for devices to be configured later.
  */
 void
 ccdattach(int num)
+{
 	struct ccd_softc *cs;
 	int i;
 	if (num <= 0) {
 #ifdef DIAGNOSTIC
 		panic("ccdattach: count <= 0");
 @@ -236,27 +253,27 @@ ccdattach(int num)
 	/* Initialize the component buffer pool. */
 	ccd_cache = pool_cache_init(sizeof(struct ccdbuf), 0,
 , 0, "ccdbuf", NULL, IPL_BIO, NULL, NULL, NULL);
 	/* Initialize per-softc structures. */
 	for (i = 0; i < num; i++) {
 		cs = &ccd_softc[i];
 		snprintf(cs->sc_xname, sizeof(cs->sc_xname), "ccd%d", i);
 		mutex_init(&cs->sc_dvlock, MUTEX_DEFAULT, IPL_NONE);
 		cs->sc_iolock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 		cv_init(&cs->sc_stop, "ccdstop");
 		cv_init(&cs->sc_push, "ccdthr");
-		disk_init(&cs->sc_dkdev, cs->sc_xname, NULL); /* XXX */
+		disk_init(&cs->sc_dkdev, cs->sc_xname, &ccd_dkdriver);
+	}
+}
 static int
 ccdinit(struct ccd_softc *cs, char **cpaths, struct vnode **vpp,
     struct lwp *l)
+{
 	struct ccdcinfo *ci = NULL;
 	int ix;
 	struct vattr va;
 	struct ccdgeom *ccg = &cs->sc_geom;
 	char *tmppath;
 	int error, path_alloced;
 @@ -264,36 +281,38 @@ ccdinit(struct ccd_softc *cs, char **cpa
 	unsigned secsize, maxsecsize;
 #ifdef DEBUG
 	if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 		printf("%s: ccdinit\n", cs->sc_xname);
 #endif
 	/* Allocate space for the component info. */
 	cs->sc_cinfo = kmem_alloc(cs->sc_nccdisks * sizeof(*cs->sc_cinfo),
 	    KM_SLEEP);
 	tmppath = kmem_alloc(MAXPATHLEN, KM_SLEEP);
 	cs->sc_size = 0;
 	cs->sc_maxphys = MACHINE_MAXPHYS;
 	/*
 	 * Verify that each component piece exists and record
 	 * relevant information about it.
 	 */
 	maxsecsize = 0;
 	minsize = 0;
 	for (ix = 0, path_alloced = 0; ix < cs->sc_nccdisks; ix++) {
 		ci = &cs->sc_cinfo[ix];
 		ci->ci_vp = vpp[ix];
 		struct disk *diskp;
 		/*
 		 * Copy in the pathname of the component.
 		 */
 		memset(tmppath, 0, MAXPATHLEN);	/* sanity */
 		error = copyinstr(cpaths[ix], tmppath,
 		    MAXPATHLEN, &ci->ci_pathlen);
 		if (ci->ci_pathlen == 0)
 			error = EINVAL;
 		if (error) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				printf("%s: can't copy path, error = %d\n",
 @@ -311,26 +330,31 @@ ccdinit(struct ccd_softc *cs, char **cpa
 		vn_lock(vpp[ix], LK_SHARED | LK_RETRY);
 		error = VOP_GETATTR(vpp[ix], &va, l->l_cred);
 		VOP_UNLOCK(vpp[ix]);
 		if (error != 0) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				printf("%s: %s: getattr failed %s = %d\n",
 				    cs->sc_xname, ci->ci_path,
 				    "error", error);
 #endif
 			goto out;
+		}
 		ci->ci_dev = va.va_rdev;
 		if ((diskp = disk_find_blk(ci->ci_dev)) == NULL) {
 			panic("no disk for device %d %d", major(ci->ci_dev),
 			      DISKUNIT(ci->ci_dev));
+		}
 		cs->sc_maxphys = MIN(cs->sc_maxphys, disk_maxphys(diskp));
 		/*
 		 * Get partition information for the component.
 		 */
 		error = getdisksize(vpp[ix], &psize, &secsize);
 		if (error) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				 printf("%s: %s: disksize failed, error = %d\n",
 				     cs->sc_xname, ci->ci_path, error);
 #endif
 			goto out;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ccdvar.h,v 1.32 2011/02/08 20:20:26 rmind Exp $	*/
+/*	$NetBSD: ccdvar.h,v 1.32.14.1 2012/12/02 05:46:39 tls Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 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.
 @@ -166,26 +166,27 @@ struct ccd_softc {
 	struct ccdcinfo	 *sc_cinfo;		/* component info */
 	struct ccdiinfo	 *sc_itable;		/* interleave table */
 	struct ccdgeom   sc_geom;		/* pseudo geometry info */
 	char		 sc_xname[8];		/* XXX external name */
 	struct disk	 sc_dkdev;		/* generic disk device info */
 	kmutex_t	 sc_dvlock;		/* lock on device node */
 #if defined(_KERNEL) /* XXX ccdconfig(8) refers softc directly using kvm */
 	struct bufq_state *sc_bufq;		/* buffer queue */
 	kmutex_t	 *sc_iolock;		/* lock on I/O start/stop */
 	kcondvar_t	 sc_stop;		/* when inflight goes zero */
 	struct lwp	 *sc_thread;		/* for deferred I/O */
 	kcondvar_t	 sc_push;		/* for deferred I/O */
 	bool		 sc_zap;		/* for deferred I/O */
 	size_t		 sc_maxphys;		/* Max I/O size */
 #endif
 };
 /* sc_flags */
 #define	CCDF_UNIFORM	0x002	/* use LCCD of sizes for uniform interleave */
 #define	CCDF_NOLABEL	0x004	/* ignore on-disk (raw) disklabel */
 #define CCDF_INITED	0x010	/* unit has been initialized */
 #define CCDF_WLABEL	0x020	/* label area is writable */
 #define CCDF_LABELLING	0x040	/* unit is currently being labelled */
 #define	CCDF_KLABEL	0x080	/* keep label on close */
 #define	CCDF_VLABEL	0x100	/* label is valid */
 #define	CCDF_RLABEL	0x200	/* currently reading label */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fss.c,v 1.83 2012/07/28 16:14:17 hannken Exp $	*/
+/*	$NetBSD: fss.c,v 1.83.2.1 2012/12/02 05:46:39 tls Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * INTERRUPTION) 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.
  */
 /*
  * File system snapshot disk driver.
+ *
  * Block/character interface to the snapshot of a mounted file system.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.83 2012/07/28 16:14:17 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.83.2.1 2012/12/02 05:46:39 tls Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
 @@ -107,26 +107,39 @@ const struct bdevsw fss_bdevsw = {
 const struct cdevsw fss_cdevsw = {
 	fss_open, fss_close, fss_read, fss_write, fss_ioctl,
 	nostop, notty, nopoll, nommap, nokqfilter, D_DISK | D_MPSAFE
 };
 static int fss_match(device_t, cfdata_t, void *);
 static void fss_attach(device_t, device_t, void *);
 static int fss_detach(device_t, int);
 CFATTACH_DECL_NEW(fss, sizeof(struct fss_softc),
     fss_match, fss_attach, fss_detach, NULL);
 extern struct cfdriver fss_cd;
 static void
 fss_minphys(struct buf *bp)
+{
 	struct fss_softc *fc = device_lookup_private(&fss_cd, minor(bp->b_dev));
 	long xmax;
 	xmax = fc->sc_mount->mnt_maxphys;
 	if (bp->b_bcount > xmax)
 	    bp->b_bcount = xmax;
+}
 const struct dkdriver fss_dkdriver = { fss_strategy, fss_minphys };
 void
 fssattach(int num)
+{
 	mutex_init(&fss_device_lock, MUTEX_DEFAULT, IPL_NONE);
 	if (config_cfattach_attach(fss_cd.cd_name, &fss_ca))
 		aprint_error("%s: unable to register\n", fss_cd.cd_name);
+}
 static int
 fss_match(device_t self, cfdata_t cfdata, void *aux)
+{
 	return 1;
 @@ -136,27 +149,27 @@ static void
 fss_attach(device_t parent, device_t self, void *aux)
+{
 	struct fss_softc *sc = device_private(self);
 	sc->sc_dev = self;
 	sc->sc_bdev = NODEV;
 	mutex_init(&sc->sc_slock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&sc->sc_work_cv, "fssbs");
 	cv_init(&sc->sc_cache_cv, "cowwait");
 	bufq_alloc(&sc->sc_bufq, "fcfs", 0);
 	sc->sc_dkdev = malloc(sizeof(*sc->sc_dkdev), M_DEVBUF, M_WAITOK);
 	sc->sc_dkdev->dk_info = NULL;
-	disk_init(sc->sc_dkdev, device_xname(self), NULL);
+	disk_init(sc->sc_dkdev, device_xname(self), &fss_dkdriver);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	if (fss_num_attached++ == 0)
 		vfs_hooks_attach(&fss_vfs_hooks);
+}
 static int
 fss_detach(device_t self, int flags)
+{
 	struct fss_softc *sc = device_private(self);
 	if (sc->sc_flags & FSS_ACTIVE)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dk.c,v 1.64.2.1 2012/11/20 03:02:00 tls Exp $	*/
+/*	$NetBSD: dk.c,v 1.64.2.2 2012/12/02 05:46:40 tls Exp $	*/
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.64.2.1 2012/11/20 03:02:00 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.64.2.2 2012/12/02 05:46:40 tls Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 @@ -108,26 +108,28 @@ static dev_type_ioctl(dkioctl);
 static dev_type_strategy(dkstrategy);
 static dev_type_dump(dkdump);
 static dev_type_size(dksize);
 const struct bdevsw dk_bdevsw = {
 	dkopen, dkclose, dkstrategy, dkioctl, dkdump, dksize, D_DISK
 };
 const struct cdevsw dk_cdevsw = {
 	dkopen, dkclose, dkread, dkwrite, dkioctl,
 	    nostop, notty, nopoll, nommap, nokqfilter, D_DISK
 };
 const struct dkdriver dk_dkdriver = { dkstrategy, dkminphys };
 static struct dkwedge_softc **dkwedges;
 static u_int ndkwedges;
 static krwlock_t dkwedges_lock;
 static LIST_HEAD(, dkwedge_discovery_method) dkwedge_discovery_methods;
 static krwlock_t dkwedge_discovery_methods_lock;
 /*
  * dkwedge_match:
+ *
  *	Autoconfiguration match function for pseudo-device glue.
  */
 static int
 @@ -422,27 +424,27 @@ dkwedge_add(struct dkwedge_info *dkw)
 		free(sc, M_DKWEDGE);
 		return (ENOMEM);
+	}
 	/* Return the devname to the caller. */
 	strlcpy(dkw->dkw_devname, device_xname(sc->sc_dev),
 		sizeof(dkw->dkw_devname));
 	/*
 	 * XXX Really ought to make the disk_attach() and the changing
 	 * of state to RUNNING atomic.
 	 */
-	disk_init(&sc->sc_dk, device_xname(sc->sc_dev), NULL);
+	disk_init(&sc->sc_dk, device_xname(sc->sc_dev), &dk_dkdriver);
 	disk_blocksize(&sc->sc_dk, DEV_BSIZE << pdk->dk_blkshift);
 	dkgetproperties(&sc->sc_dk, dkw);
 	disk_attach(&sc->sc_dk);
 	/* Disk wedge is ready for use! */
 	sc->sc_state = DKW_STATE_RUNNING;
 	/* Announce our arrival. */
 	aprint_normal("%s at %s: %s\n", device_xname(sc->sc_dev), pdk->dk_name,
 	    sc->sc_wname);	/* XXX Unicode */
 	aprint_normal("%s: %"PRIu64" blocks at %"PRId64", type: %s\n",
 	    device_xname(sc->sc_dev), sc->sc_size, sc->sc_offset, sc->sc_ptype);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rd.c,v 1.30.6.1 2012/11/20 03:02:00 tls Exp $ */
+/*	$NetBSD: rd.c,v 1.30.6.2 2012/12/02 05:46:40 tls 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.
 @@ -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.30.6.1 2012/11/20 03:02:00 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.30.6.2 2012/12/02 05:46:40 tls Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/endian.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 @@ -255,26 +255,39 @@ dev_type_dump(rddump);
 dev_type_size(rdsize);
 const struct bdevsw rd_bdevsw = {
 	rdopen, rdclose, rdstrategy, rdioctl, rddump, rdsize, D_DISK
 };
 const struct cdevsw rd_cdevsw = {
 	rdopen, rdclose, rdread, rdwrite, rdioctl,
 	nostop, notty, nopoll, nommap, nokqfilter, D_DISK
 };
 extern struct cfdriver rd_cd;
 static void
 rdminphys(struct buf *bp)
+{
     struct rd_softc *sc = device_lookup_private(&rd_cd, RDUNIT(bp->b_dev));
     long xmax;
     xmax = rd->sc_dev->dv_maxphys;
     if (bp->b_bcount > xmax)
         bp->b_bcount = xmax;
+}
 const struct dkdriver rd_dkdriver = { rdstrategy, rdminphys };
 int
 rdlookup(int id, int slave, int punit)
+{
 	int i;
 	for (i = 0; i < numrdidentinfo; i++) {
 		if (rdidentinfo[i].ri_hwid == id)
 			break;
+	}
 	if (i == numrdidentinfo || punit > rdidentinfo[i].ri_maxunum)
 		return (-1);
 	return (i);
+}
 @@ -380,27 +393,27 @@ rdattach(device_t parent, device_t self,
 	 */
 	printf(": %s\n", rdidentinfo[type].ri_desc);
 	printf("%s: %d cylinders, %d heads, %d blocks, %d bytes/block\n",
 	    device_xname(sc->sc_dev), rdidentinfo[type].ri_ncyl,
 	    rdidentinfo[type].ri_ntpc, rdidentinfo[type].ri_nblocks,
 	    DEV_BSIZE);
 	bufq_alloc(&sc->sc_tab, "fcfs", 0);
 	/*
 	 * Initialize and attach the disk structure.
 	 */
 	memset(&sc->sc_dk, 0, sizeof(sc->sc_dk));
-	disk_init(&sc->sc_dk, device_xname(sc->sc_dev), NULL);
+	disk_init(&sc->sc_dk, device_xname(sc->sc_dev), rd_dkdriver);
 	disk_attach(&sc->sc_dk);
 	callout_init(&sc->sc_restart_ch, 0);
 	if (gpibregister(sc->sc_ic, sc->sc_slave, rdcallback, sc,
 	    &sc->sc_hdl)) {
 		aprint_error_dev(sc->sc_dev, "can't register callback\n");
 		return;
+	}
 	sc->sc_flags = RDF_ALIVE;
 #ifdef DEBUG
 	/* always report errors */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_disk.c,v 1.100.18.1 2012/09/12 06:15:34 tls Exp $	*/
+/*	$NetBSD: subr_disk.c,v 1.100.18.2 2012/12/02 05:46:40 tls Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * 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.
+ *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.100.18.1 2012/09/12 06:15:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.100.18.2 2012/12/02 05:46:40 tls Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/buf.h>
 #include <sys/syslog.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/sysctl.h>
 #include <lib/libkern/libkern.h>
 /*
 @@ -208,26 +208,29 @@ disk_find_blk(dev_t dev)
 int disk_maxphys(const struct disk *const diskp)
+{
 	struct buf b = { b_bcount: MACHINE_MAXPHYS };
 	diskp->dk_driver->d_minphys(&b);
 	return b.b_bcount;
+}
 void
 disk_init(struct disk *diskp, const char *name, const struct dkdriver *driver)
+{
 	KASSERT(diskp != NULL);
 	KASSERT(name != NULL);
 	KASSERT(driver != NULL);
 	/*
 	 * Initialize the wedge-related locks and other fields.
 	 */
 	mutex_init(&diskp->dk_rawlock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&diskp->dk_openlock, MUTEX_DEFAULT, IPL_NONE);
 	LIST_INIT(&diskp->dk_wedges);
 	diskp->dk_nwedges = 0;
 	diskp->dk_labelsector = LABELSECTOR;
 	disk_blocksize(diskp, DEV_BSIZE);
 	diskp->dk_name = name;
 	diskp->dk_driver = driver;
+}