 @@ -1,14 +1,14 @@
-/*	$NetBSD: xel.c,v 1.16 2008/12/18 05:56:42 isaki Exp $	*/
+/*	$NetBSD: xel.c,v 1.17 2008/12/31 09:50:21 isaki Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Minoura Makoto.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * TSR Xellent30 driver.
  * Detect Xellent30, and reserve its I/O area.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xel.c,v 1.16 2008/12/18 05:56:42 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xel.c,v 1.17 2008/12/31 09:50:21 isaki Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <arch/x68k/dev/intiovar.h>
 static paddr_t xel_addr(device_t, cfdata_t, struct intio_attach_args *);
 static int xel_probe(paddr_t);
 @@ -156,27 +156,27 @@ xel_probe(paddr_t addr)
+	}
 	sram[0] = b1;
 	sram[1] = b2;
 #endif
 	/* Unmap. */
 	start[0] = XEL_MODE_UNMAP_RAM | XEL_MODE_MPU_030;
 	nofault = NULL;
 	return 1;
+}
 static int
-xel_match(struct device *parent, cfdata_t match, void *aux)
+xel_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct intio_attach_args *ia = aux;
 	if (strcmp(ia->ia_name, "xel") != 0)
 		return 0;
 	if (xel_addr(parent, match, ia)) {
 #ifdef DIAGNOSTIC
 		if (cputype != CPU_68030)
 			panic("Non-030 Xellent???");
 #endif
 		return 1;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zs.c,v 1.39 2008/12/18 05:56:42 isaki Exp $	*/
+/*	$NetBSD: zs.c,v 1.40 2008/12/31 09:50:21 isaki Exp $	*/
 /*-
  * Copyright (c) 1998 Minoura Makoto
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gordon W. Ross.
+ *
  * 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
 @@ -30,27 +30,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Zilog Z8530 Dual UART driver (machine-dependent part)
+ *
  * X68k uses one Z8530 built-in. Channel A is for RS-232C serial port;
  * while channel B is dedicated to the mouse.
  * Extra Z8530's can be installed for serial ports.  This driver
  * supports up to 5 chips including the built-in one.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.39 2008/12/18 05:56:42 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.40 2008/12/31 09:50:21 isaki Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/time.h>
 #include <sys/syslog.h>
 #include <sys/cpu.h>
 @@ -184,27 +184,27 @@ zs_attach(device_t parent, device_t self
 	zsc->zsc_addr = (void *)ia->ia_addr;
 	ia->ia_size = 8;
 	r = intio_map_allocate_region(parent, ia, INTIO_MAP_ALLOCATE);
 #ifdef DIAGNOSTIC
 	if (r)
 		panic("zs: intio IO map corruption");
 #endif
 	/*
 	 * Initialize software state for each channel.
 	 */
 	for (channel = 0; channel < 2; channel++) {
-		struct device *child;
+		device_t child;
 		zsc_args.channel = channel;
 		zsc_args.hwflags = 0;
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 		zs_lock_init(cs);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
 		cs->cs_brg_clk = PCLK / 16;
 		if (channel == 0)