 @@ -1,14 +1,14 @@
-/*	$NetBSD: fd.c,v 1.149 2010/02/24 22:37:55 dyoung Exp $	*/
+/*	$NetBSD: fd.c,v 1.150 2011/07/17 23:18:23 mrg Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -91,27 +91,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.
+ *
  *	@(#)fd.c	7.4 (Berkeley) 5/25/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.149 2010/02/24 22:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.150 2011/07/17 23:18:23 mrg Exp $");
 #include "opt_ddb.h"
 #include "opt_md.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 @@ -164,27 +164,27 @@ enum fdc_state {
 	RESETCOMPLETE,	/* 12 */
 	RESETTIMEDOUT,	/* 13 */
 	DORECAL,	/* 14 */
 	RECALWAIT,	/* 15 */
 	RECALTIMEDOUT,	/* 16 */
 	RECALCOMPLETE,	/* 17 */
 	DODSKCHG,	/* 18 */
 	DSKCHGWAIT,	/* 19 */
 	DSKCHGTIMEDOUT,	/* 20 */
 };
 /* software state, per controller */
 struct fdc_softc {
-	struct device	sc_dev;		/* boilerplate */
+	struct device	*sc_dev;
 	bus_space_tag_t	sc_bustag;
 	struct callout sc_timo_ch;	/* timeout callout */
 	struct callout sc_intr_ch;	/* pseudo-intr callout */
 	struct fd_softc *sc_fd[4];	/* pointers to children */
 	TAILQ_HEAD(drivehead, fd_softc) sc_drives;
 	enum fdc_state	sc_state;
 	int		sc_flags;
 #define FDC_82077		0x01
 #define FDC_NEEDHEADSETTLE	0x02
 #define FDC_EIS			0x04
 #define FDC_NEEDMOTORWAIT	0x08
 @@ -202,37 +202,37 @@ struct fdc_softc {
 #define sc_istatus	sc_io.fdcio_istatus
 #define sc_data		sc_io.fdcio_data
 #define sc_tc		sc_io.fdcio_tc
 #define sc_nstat	sc_io.fdcio_nstat
 #define sc_status	sc_io.fdcio_status
 #define sc_intrcnt	sc_io.fdcio_intrcnt
 	void		*sc_sicookie;	/* softintr(9) cookie */
 };
 extern	struct fdcio	*fdciop;	/* I/O descriptor used in fdintr.s */
 /* controller driver configuration */
-int	fdcmatch_mainbus(struct device *, struct cfdata *, void *);
+int	fdcmatch_mainbus(device_t, cfdata_t, void *);
-int	fdcmatch_obio(struct device *, struct cfdata *, void *);
+int	fdcmatch_obio(device_t, cfdata_t, void *);
-void	fdcattach_mainbus(struct device *, struct device *, void *);
+void	fdcattach_mainbus(device_t, device_t, void *);
-void	fdcattach_obio(struct device *, struct device *, void *);
+void	fdcattach_obio(device_t, device_t, void *);
 int	fdcattach(struct fdc_softc *, int);
-CFATTACH_DECL(fdc_mainbus, sizeof(struct fdc_softc),
+CFATTACH_DECL_NEW(fdc_mainbus, sizeof(struct fdc_softc),
     fdcmatch_mainbus, fdcattach_mainbus, NULL, NULL);
-CFATTACH_DECL(fdc_obio, sizeof(struct fdc_softc),
+CFATTACH_DECL_NEW(fdc_obio, sizeof(struct fdc_softc),
     fdcmatch_obio, fdcattach_obio, NULL, NULL);
 inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 /*
  * Floppies come in various flavors, e.g., 1.2MB vs 1.44MB; here is how
  * we tell them apart.
  */
 struct fd_type {
 	int	sectrac;	/* sectors per track */
 	int	heads;		/* number of heads */
 	int	seccyl;		/* sectors per cylinder */
 	int	secsize;	/* size code for sectors */
 @@ -249,27 +249,27 @@ struct fd_type {
 	const char *name;
 };
 /* The order of entries in the following table is important -- BEWARE! */
 struct fd_type fd_types[] = {
 	{ 18,2,36,2,0xff,0xcf,0x1b,0x54,80,2880,1,FDC_500KBPS,0xf6,1, "1.44MB"    }, /* 1.44MB diskette */
 	{  9,2,18,2,0xff,0xdf,0x2a,0x50,80,1440,1,FDC_250KBPS,0xf6,1, "720KB"    }, /* 3.5" 720kB diskette */
 	{  9,2,18,2,0xff,0xdf,0x2a,0x50,40, 720,2,FDC_250KBPS,0xf6,1, "360KB/x"  }, /* 360kB in 720kB drive */
 	{  8,2,16,3,0xff,0xdf,0x35,0x74,77,1232,1,FDC_500KBPS,0xf6,1, "1.2MB/NEC" } /* 1.2 MB japanese format */
 };
 /* software state, per disk (with up to 4 disks per ctlr) */
 struct fd_softc {
-	struct device	sc_dv;		/* generic device info */
+	struct device	*sc_dv;		/* generic device info */
 	struct disk	sc_dk;		/* generic disk info */
 	struct fd_type *sc_deftype;	/* default type descriptor */
 	struct fd_type *sc_type;	/* current type descriptor */
 	struct callout sc_motoron_ch;
 	struct callout sc_motoroff_ch;
 	daddr_t	sc_blkno;	/* starting block number */
 	int sc_bcount;		/* byte count left */
 	int sc_skip;		/* bytes already transferred */
 	int sc_nblks;		/* number of blocks currently transferring */
 	int sc_nbytes;		/* number of bytes currently transferring */
 @@ -279,32 +279,32 @@ struct fd_softc {
 #define	FD_OPEN		0x01		/* it's open */
 #define	FD_MOTOR	0x02		/* motor should be on */
 #define	FD_MOTOR_WAIT	0x04		/* motor coming up */
 	int sc_cylin;		/* where we think the head is */
 	int sc_opts;		/* user-set options */
 	TAILQ_ENTRY(fd_softc) sc_drivechain;
 	int sc_ops;		/* I/O ops since last switch */
 	struct bufq_state *sc_q;/* pending I/O requests */
 	int sc_active;		/* number of active I/O requests */
 };
 /* floppy driver configuration */
-int	fdmatch(struct device *, struct cfdata *, void *);
+int	fdmatch(device_t, cfdata_t, void *);
-void	fdattach(struct device *, struct device *, void *);
+void	fdattach(device_t, device_t, void *);
 bool	fdshutdown(device_t, int);
 bool	fdsuspend(device_t, const pmf_qual_t *);
-CFATTACH_DECL(fd, sizeof(struct fd_softc),
+CFATTACH_DECL_NEW(fd, sizeof(struct fd_softc),
     fdmatch, fdattach, NULL, NULL);
 extern struct cfdriver fd_cd;
 dev_type_open(fdopen);
 dev_type_close(fdclose);
 dev_type_read(fdread);
 dev_type_write(fdwrite);
 dev_type_ioctl(fdioctl);
 dev_type_strategy(fdstrategy);
 const struct bdevsw fd_bdevsw = {
 	fdopen, fdclose, fdstrategy, fdioctl, nodump, nosize, D_DISK
 @@ -348,50 +348,50 @@ static void establish_chip_type(
 		struct fdc_softc *,
 		bus_space_tag_t,
 		bus_addr_t,
 		bus_size_t,
 		bus_space_handle_t);
 #ifdef MEMORY_DISK_HOOKS
 int	fd_read_md_image(size_t *, void **);
 #endif
 #define OBP_FDNAME	(CPU_ISSUN4M ? "SUNW,fdtwo" : "fd")
 int
-fdcmatch_mainbus(struct device *parent, struct cfdata *match, void *aux)
+fdcmatch_mainbus(device_t parent, cfdata_t match, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	/*
 	 * Floppy controller is on mainbus on sun4c.
 	 */
 	if (!CPU_ISSUN4C)
 		return (0);
 	/* sun4c PROMs call the controller "fd" */
 	if (strcmp("fd", ma->ma_name) != 0)
 		return (0);
 	return (bus_space_probe(ma->ma_bustag,
 				ma->ma_paddr,
 ,	/* probe size */
 ,	/* offset */
 ,	/* flags */
 				NULL, NULL));
+}
 int
-fdcmatch_obio(struct device *parent, struct cfdata *match, void *aux)
+fdcmatch_obio(device_t parent, cfdata_t match, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	struct sbus_attach_args *sa;
 	/*
 	 * Floppy controller is on obio on sun4m.
 	 */
 	if (uoba->uoba_isobio4 != 0)
 		return (0);
 	sa = &uoba->uoba_sbus;
 	/* sun4m PROMs call the controller "SUNW,fdtwo" */
 @@ -523,65 +523,67 @@ fdconf(struct fdc_softc *fdc)
+	}
 	return (0);
 #if 0
 	if (fdc_wrfifo(fdc, NE7CMD_VERSION) == 0 &&
 	    fdcresult(fdc) == 1 && fdc->sc_status[0] == 0x90) {
 		if (fdc_debug)
 			printf("[version cmd]");
+	}
 #endif
+}
 void
-fdcattach_mainbus(struct device *parent, struct device *self, void *aux)
+fdcattach_mainbus(device_t parent, device_t self, void *aux)
+{
 	struct fdc_softc *fdc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 	fdc->sc_dev = self;
 	fdc->sc_bustag = ma->ma_bustag;
 	if (bus_space_map(
 			ma->ma_bustag,
 			ma->ma_paddr,
 			ma->ma_size,
 			BUS_SPACE_MAP_LINEAR,
 			&fdc->sc_handle) != 0) {
 		printf("%s: cannot map registers\n", self->dv_xname);
 		return;
+	}
 	establish_chip_type(fdc,
 			    ma->ma_bustag,
 			    ma->ma_paddr,
 			    ma->ma_size,
 			    fdc->sc_handle);
 	if (fdcattach(fdc, ma->ma_pri) != 0)
 		bus_space_unmap(ma->ma_bustag, fdc->sc_handle, ma->ma_size);
+}
 void
-fdcattach_obio(struct device *parent, struct device *self, void *aux)
+fdcattach_obio(device_t parent, device_t self, void *aux)
+{
 	struct fdc_softc *fdc = device_private(self);
 	union obio_attach_args *uoba = aux;
 	struct sbus_attach_args *sa = &uoba->uoba_sbus;
 	if (sa->sa_nintr == 0) {
 		printf(": no interrupt line configured\n");
 		return;
+	}
 	fdc->sc_dev = self;
 	fdc->sc_bustag = sa->sa_bustag;
 	if (sbus_bus_map(sa->sa_bustag,
 			 sa->sa_slot, sa->sa_offset, sa->sa_size,
 			 BUS_SPACE_MAP_LINEAR, &fdc->sc_handle) != 0) {
 		printf("%s: cannot map control registers\n",
 			self->dv_xname);
 		return;
+	}
 	establish_chip_type(fdc,
 		sa->sa_bustag,
 		sbus_bus_addr(sa->sa_bustag, sa->sa_slot, sa->sa_offset),
 @@ -637,60 +639,60 @@ fdcattach(struct fdc_softc *fdc, int pri
 		return (-1);
+	}
 	fdciop = &fdc->sc_io;
 	if (bus_intr_establish2(fdc->sc_bustag, pri, 0,
 				fdc_c_hwintr, fdc,
 #ifdef notyet /* XXX bsd_fdintr.s needs to be fixed for MI softint(9) */
 				fdchwintr
 #else
 				NULL
 #endif
 				) == NULL) {
 		printf("\n%s: cannot register interrupt handler\n",
-			fdc->sc_dev.dv_xname);
+			device_xname(fdc->sc_dev));
 		return (-1);
+	}
 	fdc->sc_sicookie = softint_establish(SOFTINT_BIO, fdcswintr, fdc);
 	if (fdc->sc_sicookie == NULL) {
 		printf("\n%s: cannot register soft interrupt handler\n",
-			fdc->sc_dev.dv_xname);
+			device_xname(fdc->sc_dev));
 		return (-1);
+	}
 	printf(" softpri %d: chip 8207%c\n", IPL_SOFTFDC, code);
 	evcnt_attach_dynamic(&fdc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
-	    fdc->sc_dev.dv_xname, "intr");
+			     device_xname(fdc->sc_dev), "intr");
 	/* physical limit: four drives per controller. */
 	drive_attached = 0;
 	for (fa.fa_drive = 0; fa.fa_drive < 4; fa.fa_drive++) {
 		fa.fa_deftype = NULL;		/* unknown */
 	fa.fa_deftype = &fd_types[0];		/* XXX */
-		if (config_found(&fdc->sc_dev, (void *)&fa, fdprint) != NULL)
+		if (config_found(fdc->sc_dev, (void *)&fa, fdprint) != NULL)
 			drive_attached = 1;
+	}
 	if (drive_attached == 0) {
 		/* XXX - dis-establish interrupts here */
 		/* return (-1); */
+	}
 	return (0);
+}
 int
-fdmatch(struct device *parent, struct cfdata *match, void *aux)
+fdmatch(device_t parent, cfdata_t match, void *aux)
+{
 	struct fdc_softc *fdc = device_private(parent);
 	bus_space_tag_t t = fdc->sc_bustag;
 	bus_space_handle_t h = fdc->sc_handle;
 	struct fdc_attach_args *fa = aux;
 	int drive = fa->fa_drive;
 	int n, ok;
 	if (drive > 0)
 		/* XXX - for now, punt on more than one drive */
 		return (0);
 	if ((fdc->sc_flags & FDC_82077) != 0) {
 @@ -744,67 +746,69 @@ fdmatch(struct device *parent, struct cf
 		/* deselect drive and turn motor off */
 		bus_space_write_1(t, h, fdc->sc_reg_dor, FDO_FRST | FDO_DS);
 	} else {
 		auxregbisc(0, AUXIO4C_FDS);
+	}
 	return (ok);
+}
 /*
  * Controller is working, and drive responded.  Attach it.
  */
 void
-fdattach(struct device *parent, struct device *self, void *aux)
+fdattach(device_t parent, device_t self, void *aux)
+{
 	struct fdc_softc *fdc = device_private(parent);
 	struct fd_softc *fd = device_private(self);
 	struct fdc_attach_args *fa = aux;
 	struct fd_type *type = fa->fa_deftype;
 	int drive = fa->fa_drive;
 	fd->sc_dv = self;
 	callout_init(&fd->sc_motoron_ch, 0);
 	callout_init(&fd->sc_motoroff_ch, 0);
 	/* XXX Allow `flags' to override device type? */
 	if (type)
 		printf(": %s %d cyl, %d head, %d sec\n", type->name,
 		    type->cylinders, type->heads, type->sectrac);
 	else
 		printf(": density unknown\n");
 	bufq_alloc(&fd->sc_q, "disksort", BUFQ_SORT_CYLINDER);
 	fd->sc_cylin = -1;
 	fd->sc_drive = drive;
 	fd->sc_deftype = type;
 	fdc->sc_fd[drive] = fd;
 	fdc_wrfifo(fdc, NE7CMD_SPECIFY);
 	fdc_wrfifo(fdc, type->steprate);
 	/* XXX head load time == 6ms */
 	fdc_wrfifo(fdc, 6 | NE7_SPECIFY_NODMA);
 	/*
 	 * Initialize and attach the disk structure.
 	 */
-	disk_init(&fd->sc_dk, fd->sc_dv.dv_xname, &fddkdriver);
+	disk_init(&fd->sc_dk, device_xname(fd->sc_dv), &fddkdriver);
 	disk_attach(&fd->sc_dk);
 	/*
 	 * Establish a mountroot_hook anyway in case we booted
 	 * with RB_ASKNAME and get selected as the boot device.
 	 */
-	mountroothook_establish(fd_mountroot_hook, &fd->sc_dv);
+	mountroothook_establish(fd_mountroot_hook, fd->sc_dv);
 	/* Make sure the drive motor gets turned off at shutdown time. */
 	if (!pmf_device_register1(self, fdsuspend, NULL, fdshutdown))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 bool fdshutdown(device_t self, int how)
+{
 	struct fd_softc *fd = device_private(self);
 	fd_motor_off(fd);
 	return true;
+}
 @@ -876,60 +880,60 @@ fdstrategy(struct buf *bp)
 	    printf("fdstrategy: b_blkno %lld b_bcount %d blkno %lld cylin %d\n",
 		    (long long)bp->b_blkno, bp->b_bcount,
 		    (long long)fd->sc_blkno, bp->b_cylinder);
 #endif
 	/* Queue transfer on drive, activate drive and controller if idle. */
 	s = splbio();
 	bufq_put(fd->sc_q, bp);
 	callout_stop(&fd->sc_motoroff_ch);		/* a good idea */
 	if (fd->sc_active == 0)
 		fdstart(fd);
 #ifdef DIAGNOSTIC
 	else {
-		struct fdc_softc *fdc = (void *)device_parent(&fd->sc_dv);
+		struct fdc_softc *fdc = (void *)device_parent(fd->sc_dv);
 		if (fdc->sc_state == DEVIDLE) {
 			printf("fdstrategy: controller inactive\n");
 			fdcstart(fdc);
+		}
+	}
 #endif
 	splx(s);
 	return;
 done:
 	/* Toss transfer; we're done early. */
 	biodone(bp);
+}
 void
 fdstart(struct fd_softc *fd)
+{
-	struct fdc_softc *fdc = device_private(device_parent(&fd->sc_dv));
+	struct fdc_softc *fdc = device_private(device_parent(fd->sc_dv));
 	int active = fdc->sc_drives.tqh_first != 0;
 	/* Link into controller queue. */
 	fd->sc_active = 1;
 	TAILQ_INSERT_TAIL(&fdc->sc_drives, fd, sc_drivechain);
 	/* If controller not already active, start it. */
 	if (!active)
 		fdcstart(fdc);
+}
 void
 fdfinish(struct fd_softc *fd, struct buf *bp)
+{
-	struct fdc_softc *fdc = device_private(device_parent(&fd->sc_dv));
+	struct fdc_softc *fdc = device_private(device_parent(fd->sc_dv));
 	/*
 	 * Move this drive to the end of the queue to give others a `fair'
 	 * chance.  We only force a switch if N operations are completed while
 	 * another drive is waiting to be serviced, since there is a long motor
 	 * startup delay whenever we switch.
 	 */
 	(void)bufq_get(fd->sc_q);
 	if (fd->sc_drivechain.tqe_next && ++fd->sc_ops >= 8) {
 		fd->sc_ops = 0;
 		TAILQ_REMOVE(&fdc->sc_drives, fd, sc_drivechain);
 		if (bufq_peek(fd->sc_q) != NULL) {
 			TAILQ_INSERT_TAIL(&fdc->sc_drives, fd, sc_drivechain);
 @@ -998,35 +1002,35 @@ fd_set_motor(struct fdc_softc *fdc)
+		}
 		auxregbisc(0, AUXIO4C_FDS);
+	}
+}
 void
 fd_motor_off(void *arg)
+{
 	struct fd_softc *fd = arg;
 	int s;
 	s = splbio();
 	fd->sc_flags &= ~(FD_MOTOR | FD_MOTOR_WAIT);
-	fd_set_motor((struct fdc_softc *)device_parent(&fd->sc_dv));
+	fd_set_motor((struct fdc_softc *)device_parent(fd->sc_dv));
 	splx(s);
+}
 void
 fd_motor_on(void *arg)
+{
 	struct fd_softc *fd = arg;
-	struct fdc_softc *fdc = device_private(device_parent(&fd->sc_dv));
+	struct fdc_softc *fdc = device_private(device_parent(fd->sc_dv));
 	int s;
 	s = splbio();
 	fd->sc_flags &= ~FD_MOTOR_WAIT;
 	if ((fdc->sc_drives.tqh_first == fd) && (fdc->sc_state == MOTORWAIT))
 		(void) fdcstate(fdc);
 	splx(s);
+}
 /*
  * Get status bytes off the FDC after a command has finished
  * Returns the number of status bytes read; -1 on error.
  * The return value is also stored in `sc_nstat'.
 @@ -1238,43 +1242,43 @@ fdcstatus(struct fdc_softc *fdc, const c
 #if 0
 	/*
 	 * A 82072 seems to return <invalid command> on
 	 * gratuitous Sense Interrupt commands.
 	 */
 	if (n == 0 && (fdc->sc_flags & FDC_82077) != 0) {
 		fdc_wrfifo(fdc, NE7CMD_SENSEI);
 		(void) fdcresult(fdc);
 		n = 2;
+	}
 #endif
 	printf("%s: %s: state %d",
-		fd ? fd->sc_dv.dv_xname : "fdc", s, fdc->sc_state);
+		fd ? device_xname(fd->sc_dv) : "fdc", s, fdc->sc_state);
 	fdcpstatus(n, fdc);
+}
 void
 fdctimeout(void *arg)
+{
 	struct fdc_softc *fdc = arg;
 	struct fd_softc *fd;
 	int s;
 	s = splbio();
 	fd = fdc->sc_drives.tqh_first;
 	if (fd == NULL) {
 		printf("%s: timeout but no I/O pending: state %d, istatus=%d\n",
-			fdc->sc_dev.dv_xname,
+			device_xname(fdc->sc_dev),
 			fdc->sc_state, fdc->sc_istatus);
 		fdc->sc_state = DEVIDLE;
 		goto out;
+	}
 	if (bufq_peek(fd->sc_q) != NULL)
 		fdc->sc_state++;
 	else
 		fdc->sc_state = DEVIDLE;
 	(void) fdcstate(fdc);
 out:
 	splx(s);
 @@ -1543,27 +1547,27 @@ loop:
 	case DSKCHGWAIT:
 		callout_stop(&fdc->sc_timo_ch);
 		disk_unbusy(&fd->sc_dk, 0, 0);
 		if (fdc->sc_nstat != 2 || (st0 & 0xf8) != 0x20 ||
 		    cyl != 1 * fd->sc_type->step) {
 			fdcstatus(fdc, "dskchg seek failed");
 			fdc->sc_state = DORESET;
 		} else
 			fdc->sc_state = DORECAL;
 		if (fdc_diskchange(fdc)) {
 			printf("%s: cannot clear disk change status\n",
-				fdc->sc_dev.dv_xname);
+				device_xname(fdc->sc_dev));
 			fdc->sc_state = DORESET;
+		}
 		goto loop;
 	case DOIO:
 	doio:
 		if (finfo != NULL)
 			fd->sc_skip = (char *)&(finfo->fd_formb_cylno(0)) -
 				      (char *)finfo;
 		type = fd->sc_type;
 		sec = fd->sc_blkno % type->seccyl;
 		nblks = type->seccyl - sec;
 		nblks = min(nblks, fd->sc_bcount / FD_BSIZE(fd));
 @@ -1857,52 +1861,54 @@ fdcretry(struct fdc_softc *fdc)
 	fd = fdc->sc_drives.tqh_first;
 	bp = bufq_peek(fd->sc_q);
 	fdc->sc_overruns = 0;
 	if (fd->sc_opts & FDOPT_NORETRY)
 		goto fail;
 	switch (fdc->sc_errors) {
 	case 0:
 		if (fdc->sc_nstat == 7 &&
 		    (fdc->sc_status[0] & 0xd8) == 0x40 &&
 		    (fdc->sc_status[1] & 0x2) == 0x2) {
-			printf("%s: read-only medium\n", fd->sc_dv.dv_xname);
+			printf("%s: read-only medium\n",
 				device_xname(fd->sc_dv));
 			error = EROFS;
 			goto failsilent;
+		}
 		/* try again */
 		fdc->sc_state =
 			(fdc->sc_flags & FDC_EIS) ? DOIO : DOSEEK;
 		break;
 	case 1: case 2: case 3:
 		/* didn't work; try recalibrating */
 		fdc->sc_state = DORECAL;
 		break;
 	case 4:
 		if (fdc->sc_nstat == 7 &&
 		    fdc->sc_status[0] == 0 &&
 		    fdc->sc_status[1] == 0 &&
 		    fdc->sc_status[2] == 0) {
 			/*
 			 * We've retried a few times and we've got
 			 * valid status and all three status bytes
 			 * are zero.  Assume this condition is the
 			 * result of no disk loaded into the drive.
 			 */
-			printf("%s: no medium?\n", fd->sc_dv.dv_xname);
+			printf("%s: no medium?\n",
 				device_xname(fd->sc_dv));
 			error = ENODEV;
 			goto failsilent;
+		}
 		/* still no go; reset the bastard */
 		fdc->sc_state = DORESET;
 		break;
 	default:
 	fail:
 		if ((fd->sc_opts & FDOPT_SILENT) == 0) {
 			diskerr(bp, "fd", "hard error", LOG_PRINTF,
 				fd->sc_skip / FD_BSIZE(fd),
 @@ -1926,27 +1932,27 @@ fdioctl(dev_t dev, u_long cmd, void *add
 	struct fdformat_parms *form_parms;
 	struct fdformat_cmd *form_cmd;
 	struct ne7_fd_formb *fd_formb;
 	int il[FD_MAX_NSEC + 1];
 	int unit;
 	int i, j;
 	int error;
 	unit = FDUNIT(dev);
 	if (unit >= fd_cd.cd_ndevs)
 		return (ENXIO);
 	fd = device_lookup_private(&fd_cd, FDUNIT(dev));
-	fdc = device_private(device_parent(&fd->sc_dv));
+	fdc = device_private(device_parent(fd->sc_dv));
 	switch (cmd) {
 	case DIOCGDINFO:
 		*(struct disklabel *)addr = *(fd->sc_dk.dk_label);
 		return 0;
 	case DIOCWLABEL:
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		/* XXX do something */
 		return (0);
 	case DIOCWDINFO:
 @@ -2267,27 +2273,27 @@ fdgetdisklabel(dev_t dev)
 				lp->d_partitions[i].p_fstype = FS_BSDFFS;
 			} else {
 				lp->d_partitions[i].p_size = 0;
 				lp->d_partitions[i].p_fstype = FS_UNUSED;
+			}
+		}
 		lp->d_npartitions = RAW_PART + 1;
+	}
+}
 void
 fd_do_eject(struct fd_softc *fd)
+{
-	struct fdc_softc *fdc = device_private(device_parent(&fd->sc_dv));
+	struct fdc_softc *fdc = device_private(device_parent(fd->sc_dv));
 	if (CPU_ISSUN4C) {
 		auxregbisc(AUXIO4C_FDS, AUXIO4C_FEJ);
 		delay(10);
 		auxregbisc(AUXIO4C_FEJ, AUXIO4C_FDS);
 		return;
+	}
 	if (CPU_ISSUN4M && (fdc->sc_flags & FDC_82077) != 0) {
 		bus_space_tag_t t = fdc->sc_bustag;
 		bus_space_handle_t h = fdc->sc_handle;
 		uint8_t dor = FDO_FRST | FDO_FDMAEN | FDO_MOEN(0);
 		bus_space_write_1(t, h, fdc->sc_reg_dor, dor | FDO_EJ);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: power.c,v 1.17 2005/11/16 00:49:03 uwe Exp $ */
+/*	$NetBSD: power.c,v 1.18 2011/07/17 23:18:23 mrg Exp $ */
 /*
  * Copyright (c) 1996
  *	The President and Fellows of Harvard College. All rights reserved.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by Aaron Brown and
  *	Harvard University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -30,74 +30,73 @@
  * 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: power.c,v 1.17 2005/11/16 00:49:03 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: power.c,v 1.18 2011/07/17 23:18:23 mrg Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <machine/autoconf.h>
 #include <sparc/dev/power.h>
-static int powermatch(struct device *, struct cfdata *, void *);
+static int powermatch(device_t, cfdata_t, void *);
-static void powerattach(struct device *, struct device *, void *);
+static void powerattach(device_t, device_t, void *);
-CFATTACH_DECL(power, sizeof(struct device),
+CFATTACH_DECL_NEW(power, 0, powermatch, powerattach, NULL, NULL);
     powermatch, powerattach, NULL, NULL);
 /*
  * This is the driver for the "power" register available on some Sun4m
  * machines. This allows the machine to remove power automatically when
  * shutdown or halted or whatever.
  */
 static int
-powermatch(struct device *parent, struct cfdata *cf, void *aux)
+powermatch(device_t parent, cfdata_t cf, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	struct sbus_attach_args *sa = &uoba->uoba_sbus;
 	if (uoba->uoba_isobio4 != 0)
 		return (0);
 	return (strcmp("power", sa->sa_name) == 0);
+}
 /* ARGSUSED */
 static void
-powerattach(struct device *parent, struct device *self, void *aux)
+powerattach(device_t parent, device_t self, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	struct sbus_attach_args *sa = &uoba->uoba_sbus;
 	bus_space_handle_t bh;
 	/* Map the power configuration register. */
 	if (sbus_bus_map(sa->sa_bustag,
 			 sa->sa_slot, sa->sa_offset, sizeof(uint8_t),
 			 BUS_SPACE_MAP_LINEAR, &bh) != 0) {
-		printf("%s: cannot map register\n", self->dv_xname);
+		printf("%s: cannot map register\n", device_xname(self));
 		return;
+	}
 	power_reg = (volatile uint8_t *)bh;
 	printf("\n");
+}
 void
 powerdown(void)
+{
 	/* Only try if the power node was attached. */
 	if (power_reg != NULL)
 		*POWER_REG |= POWER_OFF;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.241 2011/07/06 20:47:05 dyoung Exp $ */
+/*	$NetBSD: autoconf.c,v 1.242 2011/07/17 23:18:23 mrg Exp $ */
 /*
  * Copyright (c) 1996
  *    The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -38,27 +38,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.
+ *
  *	@(#)autoconf.c	8.4 (Berkeley) 10/1/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.241 2011/07/06 20:47:05 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.242 2011/07/17 23:18:23 mrg Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include "opt_sparc_arch.h"
 #include "scsibus.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
 @@ -121,28 +121,28 @@ extern	int kgdb_debug_panic;
 #endif
 extern void *bootinfo;
 #if !NKSYMS && !defined(DDB) && !defined(MODULAR)
 void bootinfo_relocate(void *);
 #endif
 static	const char *str2hex(const char *, int *);
 static	int mbprint(void *, const char *);
 static	void crazymap(const char *, int *);
 int	st_crazymap(int);
 int	sd_crazymap(int);
 void	sync_crash(void);
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-static	void mainbus_attach(struct device *, struct device *, void *);
+static	void mainbus_attach(device_t, device_t, void *);
 struct	bootpath bootpath[8];
 int	nbootpath;
 static	void bootpath_build(void);
 static	void bootpath_fake(struct bootpath *, const char *);
 static	void bootpath_print(struct bootpath *);
 static	struct bootpath	*bootpath_store(int, struct bootpath *);
 int	find_cpus(void);
 char	machine_model[100];
 #ifdef DEBUG
 #define ACDB_BOOTDEV	0x1
 #define	ACDB_PROBE	0x2
 @@ -1034,52 +1034,52 @@ mbprint(void *aux, const char *name)
 	if (name)
 		aprint_normal("%s at %s", ma->ma_name, name);
 	if (ma->ma_paddr)
 		aprint_normal(" %saddr 0x%lx",
 			BUS_ADDR_IOSPACE(ma->ma_paddr) ? "io" : "",
 			(u_long)BUS_ADDR_PADDR(ma->ma_paddr));
 	if (ma->ma_pri)
 		aprint_normal(" ipl %d", ma->ma_pri);
 	return (UNCONF);
+}
 int
-mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return (1);
+}
 /*
  * Helper routines to get some of the more common properties. These
  * only get the first item in case the property value is an array.
  * Drivers that "need to know it all" can call prom_getprop() directly.
  */
 #if defined(SUN4C) || defined(SUN4M) || defined(SUN4D)
 static int	prom_getprop_reg1(int, struct openprom_addr *);
 static int	prom_getprop_intr1(int, int *);
 static int	prom_getprop_address1(int, void **);
 #endif
 /*
  * Attach the mainbus.
+ *
  * Our main job is to attach the CPU (the root node we got in configure())
  * and iterate down the list of `mainbus devices' (children of that node).
  * We also record the `node id' of the default frame buffer, if any.
  */
 static void
-mainbus_attach(struct device *parent, struct device *dev, void *aux)
+mainbus_attach(device_t parent, device_t dev, void *aux)
+{
 extern struct sparc_bus_dma_tag mainbus_dma_tag;
 extern struct sparc_bus_space_tag mainbus_space_tag;
 	struct mainbus_attach_args ma;
 	char namebuf[32];
 #if defined(SUN4C) || defined(SUN4M) || defined(SUN4D)
 	const char *const *ssp, *sp = NULL;
 	int node0, node;
 	const char *const *openboot_special;
 #endif
 #if defined(SUN4C)
 @@ -1355,28 +1355,27 @@ extern struct sparc_bus_space_tag mainbu
 		ma.ma_size = romreg.oa_size;
 		if (prom_getprop_intr1(node, &ma.ma_pri) != 0)
 			continue;
 		if (prom_getprop_address1(node, &ma.ma_promvaddr) != 0)
 			continue;
 		(void) config_found(dev, (void *)&ma, mbprint);
+	}
 #endif /* SUN4C || SUN4M || SUN4D */
+}
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0, mainbus_match, mainbus_attach, NULL, NULL);
     mainbus_match, mainbus_attach, NULL, NULL);
 #if defined(SUN4C) || defined(SUN4M) || defined(SUN4D)
 int
 prom_getprop_reg1(int node, struct openprom_addr *rrp)
+{
 	int error, n;
 	struct openprom_addr *rrp0 = NULL;
 	char buf[32];
 	error = prom_getprop(node, "reg", sizeof(struct openprom_addr),
 			&n, &rrp0);
 	if (error != 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: auxreg.c,v 1.38 2007/10/17 19:57:14 garbled Exp $ */
+/*	$NetBSD: auxreg.c,v 1.39 2011/07/17 23:18:23 mrg Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -31,52 +31,52 @@
  * 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.
+ *
  *	@(#)auxreg.c	8.1 (Berkeley) 6/11/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auxreg.c,v 1.38 2007/10/17 19:57:14 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auxreg.c,v 1.39 2011/07/17 23:18:23 mrg Exp $");
 #include "opt_blink.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <machine/autoconf.h>
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/auxreg.h>
-static int auxregmatch_mainbus(struct device *, struct cfdata *, void *);
+static int auxregmatch_mainbus(device_t, cfdata_t, void *);
-static int auxregmatch_obio(struct device *, struct cfdata *, void *);
+static int auxregmatch_obio(device_t, cfdata_t, void *);
-static void auxregattach_mainbus(struct device *, struct device *, void *);
+static void auxregattach_mainbus(device_t, device_t, void *);
-static void auxregattach_obio(struct device *, struct device *, void *);
+static void auxregattach_obio(device_t, device_t, void *);
-static void auxregattach(struct device *);
+static void auxregattach(void);
-CFATTACH_DECL(auxreg_mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(auxreg_mainbus, 0,
     auxregmatch_mainbus, auxregattach_mainbus, NULL, NULL);
-CFATTACH_DECL(auxreg_obio, sizeof(struct device),
+CFATTACH_DECL_NEW(auxreg_obio, 0,
     auxregmatch_obio, auxregattach_obio, NULL, NULL);
 #ifdef BLINK
 static callout_t blink_ch;
 static void blink(void *);
 static void
 blink(void *zero)
+{
 	register int s;
 	s = splhigh();
 @@ -88,89 +88,89 @@ blink(void *zero)
 	 *	full cycle every 2 seconds if loadav = 1
 	 *	full cycle every 3 seconds if loadav = 2
 	 * etc.
 	 */
 	s = (((averunnable.ldavg[0] + FSCALE) * hz) >> (FSHIFT + 1));
 	callout_reset(&blink_ch, s, blink, NULL);
+}
 #endif
 /*
  * The OPENPROM calls this "auxiliary-io" (sun4c) or "auxio" (sun4m).
  */
 static int
-auxregmatch_mainbus(struct device *parent, struct cfdata *cf, void *aux)
+auxregmatch_mainbus(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	return (strcmp("auxiliary-io", ma->ma_name) == 0);
+}
 static int
-auxregmatch_obio(struct device *parent, struct cfdata *cf, void *aux)
+auxregmatch_obio(device_t parent, cfdata_t cf, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	if (uoba->uoba_isobio4 != 0)
 		return (0);
 	return (strcmp("auxio", uoba->uoba_sbus.sa_name) == 0);
+}
 /* ARGSUSED */
 static void
-auxregattach_mainbus(struct device *parent, struct device *self, void *aux)
+auxregattach_mainbus(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	bus_space_handle_t bh;
 	if (bus_space_map2(ma->ma_bustag,
 			  (bus_addr_t)ma->ma_paddr,
 			  sizeof(long),
 			  BUS_SPACE_MAP_LINEAR,
 			  AUXREG_VA,
 			  &bh) != 0) {
 		printf("auxregattach_mainbus: can't map register\n");
 		return;
+	}
 	auxio_reg = AUXIO4C_REG;
 	auxio_regval = *AUXIO4C_REG | AUXIO4C_FEJ | AUXIO4C_MB1;
-	auxregattach(self);
+	auxregattach();
+}
 static void
-auxregattach_obio(struct device *parent, struct device *self, void *aux)
+auxregattach_obio(device_t parent, device_t self, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	struct sbus_attach_args *sa = &uoba->uoba_sbus;
 	bus_space_handle_t bh;
 	if (bus_space_map2(sa->sa_bustag,
 			  BUS_ADDR(sa->sa_slot, sa->sa_offset),
 			  sizeof(long),
 			  BUS_SPACE_MAP_LINEAR,
 			  AUXREG_VA, &bh) != 0) {
 		printf("auxregattach_obio: can't map register\n");
 		return;
+	}
 	auxio_reg = AUXIO4M_REG;
 	auxio_regval = *AUXIO4M_REG | AUXIO4M_MB1;
-	auxregattach(self);
+	auxregattach();
+}
 static void
-auxregattach(struct device *self)
+auxregattach(void)
+{
 	printf("\n");
 #ifdef BLINK
 	callout_init(&blink_ch, 0);
 	blink((void *)0);
 #else
 	LED_ON;
 #endif
+}
 unsigned int
 auxregbisc(int bis, int bic)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.232 2011/02/20 11:41:20 mrg Exp $ */
+/*	$NetBSD: cpu.c,v 1.233 2011/07/17 23:18:23 mrg Exp $ */
 /*
  * Copyright (c) 1996
  *	The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -42,27 +42,27 @@
  * 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.
+ *
  *	@(#)cpu.c	8.5 (Berkeley) 11/23/93
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.232 2011/02/20 11:41:20 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.233 2011/07/17 23:18:23 mrg Exp $");
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "opt_ddb.h"
 #include "opt_sparc_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/evcnt.h>
 #include <sys/xcall.h>
 @@ -83,52 +83,52 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.23
 #include <ddb/db_output.h>
 #include <machine/db_machdep.h>
 #endif
 #include <sparc/sparc/cache.h>
 #include <sparc/sparc/asm.h>
 #include <sparc/sparc/cpuvar.h>
 #include <sparc/sparc/memreg.h>
 #if defined(SUN4D)
 #include <sparc/sparc/cpuunitvar.h>
 #endif
 struct cpu_softc {
-	struct device	sc_dev;		/* generic device info */
+	device_t sc_dev;
 	struct cpu_info	*sc_cpuinfo;
 };
 /* The following are used externally (sysctl_hw). */
 char	machine[] = MACHINE;		/* from <machine/param.h> */
 char	machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 int	cpu_arch;			/* sparc architecture version */
 char	cpu_model[100];			/* machine model (primary CPU) */
 extern char machine_model[];
 int	sparc_ncpus;			/* # of CPUs detected by PROM */
 struct cpu_info *cpus[_MAXNCPU+1];	/* we only support 4 CPUs. */
 /* The CPU configuration driver. */
-static void cpu_mainbus_attach(struct device *, struct device *, void *);
+static void cpu_mainbus_attach(device_t, device_t, void *);
-int  cpu_mainbus_match(struct device *, struct cfdata *, void *);
+int  cpu_mainbus_match(device_t, cfdata_t, void *);
-CFATTACH_DECL(cpu_mainbus, sizeof(struct cpu_softc),
+CFATTACH_DECL_NEW(cpu_mainbus, sizeof(struct cpu_softc),
     cpu_mainbus_match, cpu_mainbus_attach, NULL, NULL);
 #if defined(SUN4D)
-static int cpu_cpuunit_match(struct device *, struct cfdata *, void *);
+static int cpu_cpuunit_match(device_t, cfdata_t, void *);
-static void cpu_cpuunit_attach(struct device *, struct device *, void *);
+static void cpu_cpuunit_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpu_cpuunit, sizeof(struct cpu_softc),
+CFATTACH_DECL_NEW(cpu_cpuunit, sizeof(struct cpu_softc),
     cpu_cpuunit_match, cpu_cpuunit_attach, NULL, NULL);
 #endif /* SUN4D */
 static void cpu_init_evcnt(struct cpu_info *cpi);
 static void cpu_attach(struct cpu_softc *, int, int);
 static const char *fsrtoname(int, int, int);
 void cache_print(struct cpu_softc *);
 void cpu_setup(void);
 void fpu_init(struct cpu_info *);
 #define	IU_IMPL(psr)	((u_int)(psr) >> 28)
 #define	IU_VERS(psr)	(((psr) >> 24) & 0xf)
 @@ -183,48 +183,51 @@ static kmutex_t xpmsg_mutex;
  *	this confuses autoconf.  for example, if you try and map
  *	0xfe000000 in obio space on a 4/110 it actually maps 0x0e000000.
  *	this is easy to verify with the PROM.   this causes problems
  *	with devices like "esp0 at obio0 addr 0xfa000000" because the
  *	4/110 treats it as esp0 at obio0 addr 0x0a000000" which is the
  *	address of the 4/110's "sw0" scsi chip.   the same thing happens
  *	between zs1 and zs2.    since the sun4 line is "closed" and
  *	we know all the "obio" devices that will ever be on it we just
  *	put in some special case "if"'s in the match routines of esp,
  *	dma, and zs.
  */
 int
-cpu_mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+cpu_mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	return (strcmp(cf->cf_name, ma->ma_name) == 0);
+}
 static void
-cpu_mainbus_attach(struct device *parent, struct device *self, void *aux)
+cpu_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	struct { uint32_t va; uint32_t size; } *mbprop = NULL;
 	struct openprom_addr *rrp = NULL;
 	struct cpu_info *cpi;
 	struct cpu_softc *sc;
 	int mid, node;
 	int error, n;
 	node = ma->ma_node;
 	mid = (node != 0) ? prom_getpropint(node, "mid", 0) : 0;
-	cpu_attach((struct cpu_softc *)self, node, mid);
+	sc = device_private(self);
 	sc->sc_dev = self;
 	cpu_attach(sc, node, mid);
-	cpi = ((struct cpu_softc *)self)->sc_cpuinfo;
+	cpi = sc->sc_cpuinfo;
 	if (cpi == NULL)
 		return;
 	/*
 	 * Map CPU mailbox if available
 	 */
 	if (node != 0 && (error = prom_getprop(node, "mailbox-virtual",
 					sizeof(*mbprop),
 					&n, &mbprop)) == 0) {
 		cpi->mailbox = mbprop->va;
 		free(mbprop, M_DEVBUF);
 	} else if (node != 0 && (error = prom_getprop(node, "mailbox",
 					sizeof(struct openprom_addr),
 @@ -270,40 +273,41 @@ cpu_mainbus_attach(struct device *parent
 			BUS_ADDR(rrp[1].oa_space, rrp[1].oa_base),
 			rrp[1].oa_size,
 			BUS_SPACE_MAP_LINEAR,
 			&cpi->ci_mxccregs) != 0) {
 		panic("%s: can't map CPU regs", self->dv_xname);
+	}
 	/* register sets #3 and #4 are E$ cache data and tags */
 	free(rrp, M_DEVBUF);
+}
 #if defined(SUN4D)
 static int
-cpu_cpuunit_match(struct device *parent, struct cfdata *cf, void *aux)
+cpu_cpuunit_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct cpuunit_attach_args *cpua = aux;
 	return (strcmp(cf->cf_name, cpua->cpua_type) == 0);
+}
 static void
-cpu_cpuunit_attach(struct device *parent, struct device *self, void *aux)
+cpu_cpuunit_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpuunit_attach_args *cpua = aux;
 	struct cpu_softc *sc = device_private(self);
-	cpu_attach((struct cpu_softc *)self, cpua->cpua_node,
+	sc->sc_dev = self;
-	    cpua->cpua_device_id);
+	cpu_attach(sc, cpua->cpua_node, cpua->cpua_device_id);
+}
 #endif /* SUN4D */
 static const char * const hard_intr_names[] = {
 	"spur hard",
 	"lev1 hard",
 	"lev2 hard",
 	"lev3 hard",
 	"lev4 hard",
 	"lev5 hard",
 	"lev6 hard",
 	"lev7 hard",
 	"lev8 hard",
 @@ -480,27 +484,27 @@ cpu_attach_non_boot(struct cpu_softc *sc
 	if (va == 0)
 		panic("%s: no virtual space", __func__);
 	cpi->vpage[0] = (void *)(va + 0);
 	cpi->vpage[1] = (void *)(va + PAGE_SIZE);
 	/*
 	 * Call the MI attach which creates an idle LWP for us.
 	 */
 	error = mi_cpu_attach(cpi);
 	if (error != 0) {
 		aprint_normal("\n");
 		aprint_error("%s: mi_cpu_attach failed with %d\n",
-		    sc->sc_dev.dv_xname, error);
+		    device_xname(sc->sc_dev), error);
 		return;
+	}
 	/*
 	 * Note: `eintstack' is set in cpu_attach_non_boot() above.
 	 * The %wim register will be initialized in cpu_hatch().
 	 */
 	cpi->ci_curlwp = cpi->ci_data.cpu_idlelwp;
 	cpi->curpcb = lwp_getpcb(cpi->ci_curlwp);
 	cpi->curpcb->pcb_wim = 1;
 	/* for now use the fixed virtual addresses setup in autoconf.c */
 	cpi->intreg_4m = (struct icr_pi *)
 @@ -929,29 +933,29 @@ fpu_init(struct cpu_info *sc)
 	if (sc->fpu_name == NULL) {
 		sprintf(sc->fpu_namebuf, "version 0x%x", fpuvers);
 		sc->fpu_name = sc->fpu_namebuf;
+	}
+}
 void
 cache_print(struct cpu_softc *sc)
+{
 	struct cacheinfo *ci = &sc->sc_cpuinfo->cacheinfo;
 	if (sc->sc_cpuinfo->flags & CPUFLG_SUN4CACHEBUG)
 		printf("%s: cache chip bug; trap page uncached\n",
-		    sc->sc_dev.dv_xname);
+		    device_xname(sc->sc_dev));
-	printf("%s: ", sc->sc_dev.dv_xname);
+	printf("%s: ", device_xname(sc->sc_dev));
 	if (ci->c_totalsize == 0) {
 		printf("no cache\n");
 		return;
+	}
 	if (ci->c_split) {
 		const char *sep = "";
 		printf("%s", (ci->c_physical ? "physical " : ""));
 		if (ci->ic_totalsize > 0) {
 			printf("%s%dK instruction (%d b/l)", sep,
 			    ci->ic_totalsize/1024, ci->ic_linesize);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpuunit.c,v 1.14 2011/07/01 18:51:51 dyoung Exp $	*/
+/*	$NetBSD: cpuunit.c,v 1.15 2011/07/17 23:18:23 mrg Exp $	*/
 /*-
  * Copyright (c) 2002 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.
 @@ -24,76 +24,75 @@
  * 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.
  */
 /*
  * Autoconfiguration support for Sun4d "cpu units".
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.14 2011/07/01 18:51:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.15 2011/07/17 23:18:23 mrg Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <sparc/sparc/cpuunitvar.h>
 struct cpuunit_softc {
 	struct device sc_dev;
 	int sc_node;				/* our OBP node */
 	bus_space_tag_t sc_st;			/* ours */
 	bus_space_tag_t sc_bustag;		/* passed on to children */
 	int sc_device_id;			/* device-id */
 	int sc_board;				/* board number */
 };
-static int cpuunit_match(struct device *, struct cfdata *, void *);
+static int cpuunit_match(device_t, cfdata_t, void *);
-static void cpuunit_attach(struct device *, struct device *, void *);
+static void cpuunit_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpuunit, sizeof(struct cpuunit_softc),
+CFATTACH_DECL_NEW(cpuunit, sizeof(struct cpuunit_softc),
     cpuunit_match, cpuunit_attach, NULL, NULL);
 static int cpuunit_print(void *, const char *);
 static int cpuunit_setup_attach_args(struct cpuunit_softc *, bus_space_tag_t,
     int, struct cpuunit_attach_args *);
 static void cpuunit_destroy_attach_args(struct cpuunit_attach_args *);
 static int
-cpuunit_match(struct device *parent, struct cfdata *cf, void *aux)
+cpuunit_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (strcmp(ma->ma_name, "cpu-unit") == 0)
 		return (1);
 	return (0);
+}
 static void
-cpuunit_attach(struct device *parent, struct device *self, void *aux)
+cpuunit_attach(device_t parent, device_t self, void *aux)
+{
-	struct cpuunit_softc *sc = (void *) self;
+	struct cpuunit_softc *sc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 	int node, error;
 	bus_space_tag_t sbt;
 	sc->sc_node = ma->ma_node;
 	sc->sc_st = ma->ma_bustag;
 	sc->sc_device_id = prom_getpropint(sc->sc_node, "device-id", -1);
 	sc->sc_board = prom_getpropint(sc->sc_node, "board#", -1);
 	printf(": board #%d, ID %d\n", sc->sc_board, sc->sc_device_id);
 	/*
 @@ -103,39 +102,39 @@ cpuunit_attach(struct device *parent, st
 	memcpy(sbt, sc->sc_st, sizeof(*sbt));
 	sbt->cookie = sc;
 	sbt->parent = sc->sc_st;
 	sbt->nranges = 0;
 	sbt->ranges = NULL;
 	/*
 	 * Collect address translations from the OBP.
 	 */
 	error = prom_getprop(sc->sc_node, "ranges",
 	    sizeof(struct openprom_range), &sbt->nranges, &sbt->ranges);
 	if (error) {
 		printf("%s: error %d getting \"ranges\" property\n",
-		    sc->sc_dev.dv_xname, error);
+		    device_xname(self), error);
 		panic("cpuunit_attach");
+	}
 	/* Attach the CPU (and possibly bootbus) child nodes. */
 	for (node = firstchild(sc->sc_node); node != 0;
 	     node = nextsibling(node)) {
 		struct cpuunit_attach_args cpua;
 		if (cpuunit_setup_attach_args(sc, sbt, node, &cpua))
 			panic("cpuunit_attach: failed to set up attach args");
-		(void) config_found(&sc->sc_dev, &cpua, cpuunit_print);
+		(void) config_found(self, &cpua, cpuunit_print);
 		cpuunit_destroy_attach_args(&cpua);
+	}
+}
 static int
 cpuunit_print(void *aux, const char *pnp)
+{
 	struct cpuunit_attach_args *cpua = aux;
 	if (pnp)
 		aprint_normal("%s at %s", cpua->cpua_name, pnp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iommu.c,v 1.93 2011/07/01 18:51:51 dyoung Exp $ */
+/*	$NetBSD: iommu.c,v 1.94 2011/07/17 23:18:23 mrg Exp $ */
 /*
  * Copyright (c) 1996
  * 	The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1995 	Paul Kranenburg
+ *
  * 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
 @@ -27,77 +27,76 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.93 2011/07/01 18:51:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.94 2011/07/17 23:18:23 mrg Exp $");
 #include "opt_sparc_arch.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 #define _SPARC_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/ctlreg.h>
 #include <sparc/sparc/asm.h>
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/cpuvar.h>
 #include <sparc/sparc/iommureg.h>
 #include <sparc/sparc/iommuvar.h>
 struct iommu_softc {
 	struct device	sc_dev;		/* base device */
 	struct iommureg	*sc_reg;
 	u_int		sc_pagesize;
 	u_int		sc_range;
 	bus_addr_t	sc_dvmabase;
 	iopte_t		*sc_ptes;
 	int		sc_cachecoherent;
 /*
  * Note: operations on the extent map are being protected with
  * splhigh(), since we cannot predict at which interrupt priority
  * our clients will run.
  */
 	struct sparc_bus_dma_tag sc_dmatag;
 	struct extent *sc_dvmamap;
 };
 /* autoconfiguration driver */
 int	iommu_print(void *, const char *);
-void	iommu_attach(struct device *, struct device *, void *);
+void	iommu_attach(device_t, device_t, void *);
-int	iommu_match(struct device *, struct cfdata *, void *);
+int	iommu_match(device_t, cfdata_t, void *);
 #if defined(SUN4M)
 static void iommu_copy_prom_entries(struct iommu_softc *);
 #endif
-CFATTACH_DECL(iommu, sizeof(struct iommu_softc),
+CFATTACH_DECL_NEW(iommu, sizeof(struct iommu_softc),
     iommu_match, iommu_attach, NULL, NULL);
 /* IOMMU DMA map functions */
 int	iommu_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
 			bus_size_t, int, bus_dmamap_t *);
 int	iommu_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
 			bus_size_t, struct proc *, int);
 int	iommu_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
 			struct mbuf *, int);
 int	iommu_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
 			struct uio *, int);
 int	iommu_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
 			bus_dma_segment_t *, int, bus_size_t, int);
 @@ -120,43 +119,43 @@ int	iommu_dvma_alloc(struct iommu_softc
  * Return UNCONF (config_find ignores this if the device was configured).
  */
 int
 iommu_print(void *args, const char *iommu)
+{
 	struct iommu_attach_args *ia = args;
 	if (iommu)
 		aprint_normal("%s at %s", ia->iom_name, iommu);
 	return (UNCONF);
+}
 int
-iommu_match(struct device *parent, struct cfdata *cf, void *aux)
+iommu_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (CPU_ISSUN4 || CPU_ISSUN4C)
 		return (0);
 	return (strcmp(cf->cf_name, ma->ma_name) == 0);
+}
 /*
  * Attach the iommu.
  */
 void
-iommu_attach(struct device *parent, struct device *self, void *aux)
+iommu_attach(device_t parent, device_t self, void *aux)
+{
 #if defined(SUN4M)
-	struct iommu_softc *sc = (struct iommu_softc *)self;
+	struct iommu_softc *sc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 	struct sparc_bus_dma_tag *dmat = &sc->sc_dmatag;
 	bus_space_handle_t bh;
 	int node;
 	int js1_implicit_iommu;
 	int i, s;
 	u_int iopte_table_pa;
 	struct pglist mlist;
 	u_int size;
 	struct vm_page *m;
 	vaddr_t va;
 	dmat->_cookie = sc;
 @@ -291,50 +290,50 @@ iommu_attach(struct device *parent, stru
 		struct openprom_addr sbus_iommu_reg = { 0, 0x10001000, 0x28 };
 		memset(&ia, 0, sizeof ia);
 		/* Propagate BUS & DMA tags */
 		ia.iom_bustag = ma->ma_bustag;
 		ia.iom_dmatag = &sc->sc_dmatag;
 		ia.iom_name = "sbus";
 		ia.iom_node = node;
 		ia.iom_reg = &sbus_iommu_reg;
 		ia.iom_nreg = 1;
-		(void) config_found(&sc->sc_dev, (void *)&ia, iommu_print);
+		(void) config_found(self, (void *)&ia, iommu_print);
 		return;
+	}
 	/*
 	 * Loop through ROM children (expect Sbus among them).
 	 */
 	for (node = firstchild(node); node; node = nextsibling(node)) {
 		struct iommu_attach_args ia;
 		memset(&ia, 0, sizeof ia);
 		ia.iom_name = prom_getpropstring(node, "name");
 		/* Propagate BUS & DMA tags */
 		ia.iom_bustag = ma->ma_bustag;
 		ia.iom_dmatag = &sc->sc_dmatag;
 		ia.iom_node = node;
 		ia.iom_reg = NULL;
 		prom_getprop(node, "reg", sizeof(struct openprom_addr),
 			&ia.iom_nreg, &ia.iom_reg);
-		(void) config_found(&sc->sc_dev, (void *)&ia, iommu_print);
+		(void) config_found(self, (void *)&ia, iommu_print);
 		if (ia.iom_reg != NULL)
 			free(ia.iom_reg, M_DEVBUF);
+	}
 #endif
+}
 #if defined(SUN4M)
 static void
 iommu_copy_prom_entries(struct iommu_softc *sc)
+{
 	u_int pbase, pa;
 	u_int range;
 	iopte_t *tpte_p;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: memecc.c,v 1.12 2011/07/01 18:51:51 dyoung Exp $	*/
+/*	$NetBSD: memecc.c,v 1.13 2011/07/17 23:18:23 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -24,73 +24,77 @@
  * 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.
  */
 /*
  * ECC memory control.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.12 2011/07/01 18:51:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.13 2011/07/17 23:18:23 mrg Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <sparc/sparc/memeccreg.h>
 struct memecc_softc {
 	struct device		sc_dev;		/* base device */
 	bus_space_tag_t		sc_bt;
 	bus_space_handle_t	sc_bh;
 };
 struct memecc_softc *memecc_sc;
 /* autoconfiguration driver */
-static void	memecc_attach(struct device *, struct device *, void *);
+static void	memecc_attach(device_t, device_t, void *);
-static int	memecc_match(struct device *, struct cfdata *, void *);
+static int	memecc_match(device_t, cfdata_t, void *);
 static int	memecc_error(void);
 int	(*memerr_handler)(void);
-CFATTACH_DECL(eccmemctl, sizeof(struct memecc_softc),
+CFATTACH_DECL_NEW(eccmemctl, sizeof(struct memecc_softc),
     memecc_match, memecc_attach, NULL, NULL);
 int
-memecc_match(struct device *parent, struct cfdata *cf, void *aux)
+memecc_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	return (strcmp("eccmemctl", ma->ma_name) == 0);
+}
 /*
  * Attach the device.
  */
 void
-memecc_attach(struct device *parent, struct device *self, void *aux)
+memecc_attach(device_t parent, device_t self, void *aux)
+{
 	struct memecc_softc *sc = (struct memecc_softc *)self;
 	struct mainbus_attach_args *ma = aux;
 	int node;
 	uint32_t reg;
 	if (memerr_handler) {
 		printf("%s: already attached\n", __func__);
 		return;
+	}
 	sc->sc_bt = ma->ma_bustag;
 	node = ma->ma_node;
 	/*
 	 * Map registers
 	 */
 	if (bus_space_map(
 			ma->ma_bustag,
 			ma->ma_paddr,
 			ma->ma_size,
 ,
 			&sc->sc_bh) != 0) {
 		printf("memecc_attach: cannot map registers\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: timer.c,v 1.28 2011/07/01 18:51:51 dyoung Exp $ */
+/*	$NetBSD: timer.c,v 1.29 2011/07/17 23:18:23 mrg Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1996 Paul Kranenburg
  * Copyright (c) 1996
  * 	The President and Fellows of Harvard College. All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
 @@ -50,27 +50,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)clock.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Kernel clocks provided by "timer" device.  The hardclock is provided by
  * the timer register (aka system counter).  The statclock is provided by
  * per CPU counter register(s) (aka processor counter(s)).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.28 2011/07/01 18:51:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.29 2011/07/17 23:18:23 mrg Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/timetc.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <sparc/sparc/timerreg.h>
 #include <sparc/sparc/timervar.h>
 @@ -230,27 +230,27 @@ timerattach(volatile int *cntreg, volati
 	cntr.cntreg = cntreg;
 	cntr.limit >>= cntr.shift;
 	tc_init(&counter_timecounter);
+}
 /*
  * Both sun4 and sun4m can attach a timer on obio.
  * The sun4m OPENPROM calls the timer the "counter".
  * The sun4 timer must be probed.
  */
 static int
-timermatch_obio(struct device *parent, struct cfdata *cf, void *aux)
+timermatch_obio(device_t parent, cfdata_t cf, void *aux)
+{
 #if defined(SUN4) || defined(SUN4M)
 	union obio_attach_args *uoba = aux;
 #endif
 #if defined(SUN4)
 	struct obio4_attach_args *oba;
 #endif
 #if defined(SUN4M)
 	if (uoba->uoba_isobio4 == 0)
 		return (strcmp("counter", uoba->uoba_sbus.sa_name) == 0);
 #endif /* SUN4M */
 @@ -267,62 +267,62 @@ timermatch_obio(struct device *parent, s
 	/* Make sure there is something there */
 	oba = &uoba->uoba_oba4;
 	return (bus_space_probe(oba->oba_bustag, oba->oba_paddr,
 ,	/* probe size */
 ,	/* offset */
 ,	/* flags */
 				NULL, NULL));
 #endif /* SUN4 */
 	panic("timermatch_obio: impossible");
+}
 static void
-timerattach_obio(struct device *parent, struct device *self, void *aux)
+timerattach_obio(device_t parent, device_t self, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	if (uoba->uoba_isobio4 == 0) {
 #if defined(SUN4M)
 		/* sun4m timer at obio */
 		timerattach_obio_4m(parent, self, aux);
 #endif /* SUN4M */
 		return;
+	}
 	if (uoba->uoba_isobio4 != 0) {
 #if defined(SUN4)
 		/* sun4 timer at obio */
 		timerattach_obio_4(parent, self, aux);
 #endif /* SUN4 */
+	}
+}
-CFATTACH_DECL(timer_obio, sizeof(struct device),
+CFATTACH_DECL_NEW(timer_obio, 0,
     timermatch_obio, timerattach_obio, NULL, NULL);
 /*
  * Only sun4c attaches a timer at mainbus
  */
 static int
-timermatch_mainbus(struct device *parent, struct cfdata *cf, void *aux)
+timermatch_mainbus(device_t parent, cfdata_t cf, void *aux)
+{
 #if defined(SUN4C)
 	struct mainbus_attach_args *ma = aux;
 	return (strcmp("counter-timer", ma->ma_name) == 0);
 #else
 	return (0);
 #endif
+}
 static void
-timerattach_mainbus(struct device *parent, struct device *self, void *aux)
+timerattach_mainbus(device_t parent, device_t self, void *aux)
+{
 #if defined(SUN4C)
 	timerattach_mainbus_4c(parent, self, aux);
 #endif /* SUN4C */
+}
-CFATTACH_DECL(timer_mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(timer_mainbus, 0,
     timermatch_mainbus, timerattach_mainbus, NULL, NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: timer_msiiep.c,v 1.25 2010/01/04 03:54:42 mrg Exp $	*/
+/*	$NetBSD: timer_msiiep.c,v 1.26 2011/07/17 23:18:23 mrg Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1996 Paul Kranenburg
  * Copyright (c) 1996
  * 	The President and Fellows of Harvard College. All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
 @@ -48,46 +48,46 @@
  * 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.
+ *
  *	@(#)clock.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * MicroSPARC-IIep timer support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_msiiep.c,v 1.25 2010/01/04 03:54:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_msiiep.c,v 1.26 2011/07/17 23:18:23 mrg Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/timetc.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <sparc/sparc/msiiepreg.h>
 #include <sparc/sparc/msiiepvar.h>
 #include <sparc/sparc/timervar.h>
-static int	timermatch_msiiep(struct device *, struct cfdata *, void *);
+static int	timermatch_msiiep(device_t, cfdata_t, void *);
-static void	timerattach_msiiep(struct device *, struct device *, void *);
+static void	timerattach_msiiep(device_t, device_t, void *);
-CFATTACH_DECL(timer_msiiep, sizeof(struct device),
+CFATTACH_DECL_NEW(timer_msiiep, 0,
     timermatch_msiiep, timerattach_msiiep, NULL, NULL);
 static void	timer_init_msiiep(void);
 static int	clockintr_msiiep(void *);
 static int	statintr_msiiep(void *);
 static u_int	timer_get_timecount(struct timecounter *);
 static struct intrhand level10 = { .ih_fun = clockintr_msiiep };
 static struct intrhand level14 = { .ih_fun = statintr_msiiep  };
 /*
 @@ -110,41 +110,41 @@ static struct timecounter counter_timeco
 	.tc_quality		= 100,
 	.tc_priv		= &cntr,
 };
 /*
  * ms-IIep counters tick every 4 CPU clocks @100MHz.
  * counter is reset to 1 when new limit is written.
  */
 #define	tmr_ustolimIIep(n)	((n) * 25 + 1)
 static int
-timermatch_msiiep(struct device *parent, struct cfdata *cf, void *aux)
+timermatch_msiiep(device_t parent, cfdata_t cf, void *aux)
+{
 	struct msiiep_attach_args *msa = aux;
 	return (strcmp(msa->msa_name, "timer") == 0);
+}
 /*
  * Attach system and processor counters (kernel hard and stat clocks)
  * for ms-IIep.  Counters are part of the PCIC and there's no PROM
  * node for them.
  */
 static void
-timerattach_msiiep(struct device *parent, struct device *self, void *aux)
+timerattach_msiiep(device_t parent, device_t self, void *aux)
+{
 	/* Put processor counter in "counter" mode */
 	mspcic_write_1(pcic_pc_ctl, 0); /* stop user timer (just in case) */
 	mspcic_write_1(pcic_pc_cfg, 0); /* timer mode disabled */
 	/*
 	 * Calibrate delay() by tweaking the magic constant until
 	 * delay(100) actually reads (at least) 100 us on the clock.
 	 */
 	for (timerblurb = 1; ; ++timerblurb) {
 		int t;
 		volatile uint32_t junk;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: timer_sun4.c,v 1.18 2011/07/01 18:51:51 dyoung Exp $	*/
+/*	$NetBSD: timer_sun4.c,v 1.19 2011/07/17 23:18:23 mrg Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1996 Paul Kranenburg
  * Copyright (c) 1996
  * 	The President and Fellows of Harvard College. All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
 @@ -48,27 +48,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.
+ *
  *	@(#)clock.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Sun4/Sun4c timer support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.18 2011/07/01 18:51:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.19 2011/07/17 23:18:23 mrg Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/timerreg.h>
 #include <sparc/sparc/timervar.h>
 @@ -143,49 +143,49 @@ statintr_4(void *cap)
 			/*
 			 * We're interrupting a thread that may have the
 			 * scheduler lock; run schedintr() later.
 			 */
 			sparc_softintr_schedule(sched_cookie);
+		}
+	}
 	return (1);
+}
 #if defined(SUN4)
 void
-timerattach_obio_4(struct device *parent, struct device *self, void *aux)
+timerattach_obio_4(device_t parent, device_t self, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	struct obio4_attach_args *oba = &uoba->uoba_oba4;
 	bus_space_handle_t bh;
 	if (bus_space_map2(oba->oba_bustag,
 			   oba->oba_paddr,
 			   sizeof(struct timerreg_4),
 			   BUS_SPACE_MAP_LINEAR,
 			   TIMERREG_VA,
 			   &bh) != 0) {
 		printf(": can't map registers\n");
 		return;
+	}
 	timerattach(&timerreg4->t_c10.t_counter, &timerreg4->t_c10.t_limit);
+}
 #endif /* SUN4 */
 #if defined(SUN4C)
 void
-timerattach_mainbus_4c(struct device *parent, struct device *self, void *aux)
+timerattach_mainbus_4c(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	bus_space_handle_t bh;
 	/*
 	 * This time we ignore any existing virtual address because
 	 * we have a fixed virtual address for the timer, to make
 	 * microtime() faster.
 	 */
 	if (bus_space_map2(ma->ma_bustag,
 			   ma->ma_paddr,
 			   sizeof(struct timerreg_4),
 			   BUS_SPACE_MAP_LINEAR,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: timer_sun4m.c,v 1.26 2011/07/01 18:51:52 dyoung Exp $	*/
+/*	$NetBSD: timer_sun4m.c,v 1.27 2011/07/17 23:18:23 mrg Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1996 Paul Kranenburg
  * Copyright (c) 1996
  * 	The President and Fellows of Harvard College. All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
 @@ -48,27 +48,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.
+ *
  *	@(#)clock.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Sun4m timer support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.26 2011/07/01 18:51:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.27 2011/07/17 23:18:23 mrg Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/cpuvar.h>
 #include <sparc/sparc/timerreg.h>
 @@ -196,27 +196,27 @@ statintr_4m(void *cap)
 			 * scheduler lock; run schedintr_4m() on this CPU later.
 			 */
 			raise_ipi(&cpuinfo, IPL_SCHED); /* sched_cookie->pil */
+		}
 #if !defined(MULTIPROCESSOR)
+	}
 #endif
 	kpreempt_enable();
 	return (1);
+}
 void
-timerattach_obio_4m(struct device *parent, struct device *self, void *aux)
+timerattach_obio_4m(device_t parent, device_t self, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	struct sbus_attach_args *sa = &uoba->uoba_sbus;
 	struct cpu_info *cpi;
 	bus_space_handle_t bh;
 	int i, n;
 	if (sa->sa_nreg < 2) {
 		printf(": only %d register sets\n", sa->sa_nreg);
 		return;
+	}
 	/* Map the system timer */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: timervar.h,v 1.9 2010/01/04 04:21:35 mrg Exp $	*/
+/*	$NetBSD: timervar.h,v 1.10 2011/07/17 23:18:23 mrg Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -35,37 +35,37 @@
  * 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 "opt_sparc_arch.h"
 #if defined(SUN4) || defined(SUN4C)
 int	clockintr_4(void *);
 int	statintr_4(void *);
 void	timer_init_4(void);
-void	timerattach_obio_4(struct device *, struct device *, void *);
+void	timerattach_obio_4(device_t, device_t, void *);
-void	timerattach_mainbus_4c(struct device *, struct device *, void *);
+void	timerattach_mainbus_4c(device_t, device_t, void *);
 #endif /* SUN4 || SUN4C */
 #if defined(SUN4M)
 void	schedintr_4m(void *);
 int	clockintr_4m(void *);
 int	statintr_4m(void *);
 void	timer_init_4m(void);
-void	timerattach_obio_4m(struct device *, struct device *, void *);
+void	timerattach_obio_4m(device_t, device_t, void *);
 #endif /* SUN4M */
 /* Imported from clock.c: */
 extern int statvar, statmin, statint;
 extern int timerblurb;
 extern void (*timer_init)(void);
 extern void tickle_tc(void);
 /* Common timer attach routine in timer.c: */
 void	timerattach(volatile int *, volatile int *);
 void	*sched_cookie;	/* for schedclock() interrupts */
 static inline u_long __attribute__((__unused__))