 @@ -1,14 +1,14 @@
-/* $NetBSD: dec_1000a.c,v 1.26 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: dec_1000a.c,v 1.26.10.1 2009/09/26 18:41:42 snj Exp $ */
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is based on dec_kn20aa.c, written by Chris G. Demetriou at
  * Carnegie-Mellon University. Platform support for Noritake, Pintake, and
  * Corelle by Ross Harvey with copyright assignment by permission of Avalon
  * Computer Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -55,27 +55,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
  */
 #include "opt_kgdb.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.26 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.26.10.1 2009/09/26 18:41:42 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/conf.h>
 #include <dev/cons.h>
 #include <machine/rpb.h>
 #include <machine/autoconf.h>
 #include <machine/cpuconf.h>
 #include <machine/bus.h>
 @@ -88,26 +88,29 @@ __KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,
 #include <dev/ic/pckbcvar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <alpha/pci/apecsreg.h>
 #include <alpha/pci/apecsvar.h>
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/ic/mlxio.h>
 #include <dev/ic/mlxvar.h>
 #include "pckbd.h"
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
 #endif
 static int comcnrate = CONSPEED;
 void _dec_1000a_init __P((void));
 static void dec_1000a_cons_init __P((void));
 static void dec_1000a_device_register __P((struct device *, void *));
 #ifdef KGDB
 #include <machine/db_machdep.h>
 @@ -247,27 +250,28 @@ static void
 dec_1000a_device_register(dev, aux)
 	struct device *dev;
 	void *aux;
+{
 	static int found, initted, diskboot, netboot;
 	static struct device *pcidev, *ctrlrdev;
 	struct bootdev_data *b = bootdev_data;
 	struct device *parent = device_parent(dev);
 	if (found)
 		return;
 	if (!initted) {
-		diskboot = (strcasecmp(b->protocol, "SCSI") == 0);
+		diskboot = (strcasecmp(b->protocol, "SCSI") == 0) ||
 		    (strcasecmp(b->protocol, "RAID") == 0);
 		netboot = (strcasecmp(b->protocol, "BOOTP") == 0) ||
 		    (strcasecmp(b->protocol, "MOP") == 0);
 #if 0
 		printf("diskboot = %d, netboot = %d\n", diskboot, netboot);
 #endif
 		initted =1;
+	}
 	if (pcidev == NULL) {
 		if (!device_is_a(dev, "pci"))
 			return;
 		else {
 			struct pcibus_attach_args *pba = aux;
 @@ -327,14 +331,35 @@ dec_1000a_device_register(dev, aux)
 		unit = periph->periph_target * 100 + periph->periph_lun;
 		if (b->unit != unit)
 			return;
 		if (b->channel != periph->periph_channel->chan_channel)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 #if 0
 		printf("\nbooted_device = %s\n", dev->dv_xname);
 #endif
 		found = 1;
+	}
 	if (device_is_a(dev, "ld") && device_is_a(parent, "mlx")) {
 		/*
 		 * Argh!  The attach arguments for ld devices is not
 		 * consistent, so each supported raid controller requires
 		 * different checks.
 		 */
 		struct mlx_attach_args *mlxa = aux;
 		if (parent != ctrlrdev)
 			return;
 		if (b->unit != mlxa->mlxa_unit)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 #if 0
 		printf("\nbooted_device = %s\n", dev->dv_xname);
 #endif
 		found = 1;
+	}
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: dec_2100_a500.c,v 1.18 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: dec_2100_a500.c,v 1.18.10.1 2009/09/26 18:41:42 snj Exp $ */
 /*-
  * Copyright (c) 1999 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.
 @@ -50,27 +50,27 @@
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include "opt_kgdb.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.18 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.18.10.1 2009/09/26 18:41:42 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/conf.h>
 #include <dev/cons.h>
 #include <machine/rpb.h>
 #include <machine/autoconf.h>
 #include <machine/cpuconf.h>
 #include <machine/bus.h>
 #include <machine/alpha.h>
 @@ -82,26 +82,29 @@ __KERNEL_RCSID(0, "$NetBSD: dec_2100_a50
 #include <dev/isa/isavar.h>
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <alpha/pci/ttwogareg.h>
 #include <alpha/pci/ttwogavar.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/ic/mlxio.h>
 #include <dev/ic/mlxvar.h>
 #include "pckbd.h"
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
 #endif
 static int comcnrate = CONSPEED;
 void _dec_2100_a500_init(void);
 static void dec_2100_a500_cons_init(void);
 static void dec_2100_a500_device_register(struct device *, void *);
 static void dec_2100_a500_machine_check(unsigned long, struct trapframe *,
 	unsigned long, unsigned long);
 @@ -233,27 +236,28 @@ dec_2100_a500_cons_init(void)
 static void
 dec_2100_a500_device_register(struct device *dev, void *aux)
+{
 	static int found, initted, diskboot, netboot;
 	static struct device *pcidev, *ctrlrdev;
 	struct bootdev_data *b = bootdev_data;
 	struct device *parent = device_parent(dev);
 	if (found)
 		return;
 	if (!initted) {
-		diskboot = (strcasecmp(b->protocol, "SCSI") == 0);
+		diskboot = (strcasecmp(b->protocol, "SCSI") == 0) ||
 		    (strcasecmp(b->protocol, "RAID") == 0);
 		netboot = (strcasecmp(b->protocol, "BOOTP") == 0) ||
 		    (strcasecmp(b->protocol, "MOP") == 0);
 #if 0
 		printf("diskboot = %d, netboot = %d\n", diskboot, netboot);
 #endif
 		initted =1;
+	}
 	if (pcidev == NULL) {
 		if (!device_is_a(dev, "pci"))
 			return;
 		else {
 			struct pcibus_attach_args *pba = aux;
 @@ -313,26 +317,47 @@ dec_2100_a500_device_register(struct dev
 		unit = periph->periph_target * 100 + periph->periph_lun;
 		if (b->unit != unit)
 			return;
 		if (b->channel != periph->periph_channel->chan_channel)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 #if 0
 		printf("\nbooted_device = %s\n", dev->dv_xname);
 #endif
 		found = 1;
+	}
 	if (device_is_a(dev, "ld") && device_is_a(parent, "mlx")) {
 		/*
 		 * Argh!  The attach arguments for ld devices is not
 		 * consistent, so each supported raid controller requires
 		 * different checks.
 		 */
 		struct mlx_attach_args *mlxa = aux;
 		if (parent != ctrlrdev)
 			return;
 		if (b->unit != mlxa->mlxa_unit)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 #if 0
 		printf("\nbooted_device = %s\n", dev->dv_xname);
 #endif
 		found = 1;
+	}
+}
 /*
  * Sable, Sable-Gamma, and Lynx machine check handlers.
  */
 static void
 dec_2100_a500_machine_check(unsigned long mces, struct trapframe *framep,
     unsigned long vector, unsigned long param)
+{
 	struct mchkinfo *mcp = &curcpu()->ci_mcinfo;
 	/*

 @@ -1,14 +1,14 @@
-/* $NetBSD: dec_6600.c,v 1.26 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_6600.c,v 1.26.54.1 2009/09/26 18:41:42 snj Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -21,27 +21,27 @@
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include "opt_kgdb.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.26 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.26.54.1 2009/09/26 18:41:42 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/conf.h>
 #include <dev/cons.h>
 #include <machine/rpb.h>
 #include <machine/autoconf.h>
 #include <machine/cpuconf.h>
 #include <machine/bus.h>
 @@ -53,26 +53,33 @@ __KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <alpha/pci/tsreg.h>
 #include <alpha/pci/tsvar.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/ata/atavar.h>
 #include <dev/ic/mlxio.h>
 #include <dev/ic/mlxvar.h>
 #include <dev/i2o/i2o.h>
 #include <dev/i2o/iopio.h>
 #include <dev/i2o/iopvar.h>
 #include "pckbd.h"
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
 #endif
 #define	DR_VERBOSE(f) while (0)
 static int comcnrate __attribute__((unused)) = CONSPEED;
 void dec_6600_init __P((void));
 static void dec_6600_cons_init __P((void));
 static void dec_6600_device_register __P((struct device *, void *));
 @@ -182,26 +189,28 @@ dec_6600_device_register(dev, aux)
 	struct device *dev;
 	void *aux;
+{
 	static int found, initted, diskboot, netboot;
 	static struct device *primarydev, *pcidev, *ctrlrdev;
 	struct bootdev_data *b = bootdev_data;
 	struct device *parent = device_parent(dev);
 	if (found)
 		return;
 	if (!initted) {
 		diskboot = (strcasecmp(b->protocol, "SCSI") == 0) ||
 		    (strcasecmp(b->protocol, "RAID") == 0) ||
 		    (strcasecmp(b->protocol, "I2O") == 0) ||
 		    (strcasecmp(b->protocol, "IDE") == 0);
 		netboot = (strcasecmp(b->protocol, "BOOTP") == 0) ||
 		    (strcasecmp(b->protocol, "MOP") == 0);
 		DR_VERBOSE(printf("diskboot = %d, netboot = %d\n", diskboot,
 		    netboot));
 		initted = 1;
+	}
 	if (primarydev == NULL) {
 		if (!device_is_a(dev, "tsp"))
 			return;
 		else {
 			struct tsp_attach_args *tsp = aux;
 @@ -282,26 +291,64 @@ dec_6600_device_register(dev, aux)
 		unit = periph->periph_target * 100 + periph->periph_lun;
 		if (b->unit != unit)
 			return;
 		if (b->channel != periph->periph_channel->chan_channel)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 		DR_VERBOSE(printf("\nbooted_device = %s\n", dev->dv_xname));
 		found = 1;
+	}
 	if (device_is_a(dev, "ld") && device_is_a(parent, "iop")) {
 		/*
 		 * Argh!  The attach arguments for ld devices is not
 		 * consistent, so each supported raid controller requires
 		 * different checks.
 		 */
 		struct iop_attach_args *iopa = aux;
 		if (parent != ctrlrdev)
 			return;
 		if (b->unit != iopa->ia_tid)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 		DR_VERBOSE(printf("\nbooted_device = %s\n", dev->dv_xname));
 		found = 1;
+	}
 	if (device_is_a(dev, "ld") && device_is_a(parent, "mlx")) {
 		/*
 		 * Argh!  The attach arguments for ld devices is not
 		 * consistent, so each supported raid controller requires
 		 * different checks.
 		 */
 		struct mlx_attach_args *mlxa = aux;
 		if (parent != ctrlrdev)
 			return;
 		if (b->unit != mlxa->mlxa_unit)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 		DR_VERBOSE(printf("\nbooted_device = %s\n", dev->dv_xname));
 		found = 1;
+	}
 	/*
 	 * Support to boot from IDE drives.
 	 */
 	if (device_is_a(dev, "wd")) {
 		struct ata_device *adev = aux;
 		if (!device_is_a(parent, "atabus"))
 			return;
 		if (device_parent(parent) != ctrlrdev)
 			return;
 		DR_VERBOSE(printf("\nAtapi info: drive: %d, channel %d\n",
 		    adev->adev_drv_data->drive, adev->adev_channel));

 @@ -1,14 +1,14 @@
-/* $NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_kn300.c,v 1.34.54.1 2009/09/26 18:41:42 snj Exp $ */
 /*
  * Copyright (c) 1998 by Matthew Jacob
  * NASA AMES Research Center.
  * 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 immediately at the beginning of the file, without modification,
  *    this list of conditions, and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -24,27 +24,27 @@
  * 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 "opt_kgdb.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.34.54.1 2009/09/26 18:41:42 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/conf.h>
 #include <dev/cons.h>
 #include <machine/rpb.h>
 #include <machine/alpha.h>
 #include <machine/autoconf.h>
 #include <machine/frame.h>
 #include <machine/cpuconf.h>
 @@ -62,26 +62,29 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,
 #include <uvm/uvm_extern.h>
 #include <alpha/mcbus/mcbusreg.h>
 #include <alpha/mcbus/mcbusvar.h>
 #include <alpha/pci/mcpciareg.h>
 #include <alpha/pci/mcpciavar.h>
 #include <alpha/pci/pci_kn300.h>
 #include <machine/logout.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/ic/mlxio.h>
 #include <dev/ic/mlxvar.h>
 #include "pckbd.h"
 #ifndef	CONSPEED
 #define	CONSPEED	TTYDEF_SPEED
 #endif
 static int comcnrate = CONSPEED;
 void dec_kn300_init __P((void));
 void dec_kn300_cons_init __P((void));
 static void dec_kn300_device_register __P((struct device *, void *));
 static void dec_kn300_mcheck_handler
 	__P((unsigned long, struct trapframe *, unsigned long, unsigned long));
 @@ -221,27 +224,28 @@ static void
 dec_kn300_device_register(dev, aux)
 	struct device *dev;
 	void *aux;
+{
 	static int found, initted, diskboot, netboot;
 	static struct device *primarydev, *pcidev, *ctrlrdev;
 	struct bootdev_data *b = bootdev_data;
 	struct device *parent = device_parent(dev);
 	if (found)
 		return;
 	if (!initted) {
-		diskboot = (strcasecmp(b->protocol, "SCSI") == 0);
+		diskboot = (strcasecmp(b->protocol, "SCSI") == 0) ||
 		    (strcasecmp(b->protocol, "RAID") == 0);
 		netboot = (strcasecmp(b->protocol, "BOOTP") == 0) ||
 		    (strcasecmp(b->protocol, "MOP") == 0);
 #ifdef BDEBUG
 		printf("proto:%s bus:%d slot:%d chan:%d", b->protocol,
 		    b->bus, b->slot, b->channel);
 		if (b->remote_address)
 			printf(" remote_addr:%s", b->remote_address);
 		printf(" un:%d bdt:%d", b->unit, b->boot_dev_type);
 		if (b->ctrl_dev_type)
 			printf(" cdt:%s\n", b->ctrl_dev_type);
 		else
 			printf("\n");
 		printf("diskboot = %d, netboot = %d\n", diskboot, netboot);
 @@ -337,26 +341,47 @@ dec_kn300_device_register(dev, aux)
 		unit = periph->periph_target * 100 + periph->periph_lun;
 		if (b->unit != unit)
 			return;
 		if (b->channel != periph->periph_channel->chan_channel)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 #ifdef BDEBUG
 		printf("\nbooted_device = %s\n", dev->dv_xname);
 #endif
 		found = 1;
+	}
 	if (device_is_a(dev, "ld") && device_is_a(parent, "mlx")) {
 		/*
 		 * Argh!  The attach arguments for ld devices is not
 		 * consistent, so each supported raid controller requires
 		 * different checks.
 		 */
 		struct mlx_attach_args *mlxa = aux;
 		if (parent != ctrlrdev)
 			return;
 		if (b->unit != mlxa->mlxa_unit)
 			return;
 		/* we've found it! */
 		booted_device = dev;
 #if 0
 		printf("\nbooted_device = %s\n", dev->dv_xname);
 #endif
 		found = 1;
+	}
+}
 /*
  * KN300 Machine Check Handlers.
  */
 static void kn300_softerr __P((unsigned long, unsigned long,
     unsigned long, struct trapframe *));
 static void kn300_mcheck __P((unsigned long, unsigned long,
     unsigned long, struct trapframe *));
 /*