 @@ -1,14 +1,14 @@
-/*	$NetBSD: hpc.c,v 1.64 2011/01/25 12:21:04 tsutsui Exp $	*/
+/*	$NetBSD: hpc.c,v 1.65 2011/01/25 13:22:05 tsutsui Exp $	*/
 /*
  * Copyright (c) 2000 Soren S. Jorvang
  * Copyright (c) 2001 Rafal K. Boni
  * Copyright (c) 2001 Jason R. Thorpe
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -25,27 +25,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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: hpc.c,v 1.64 2011/01/25 12:21:04 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.65 2011/01/25 13:22:05 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/callout.h>
 #define _SGIMIPS_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 #include <machine/machtype.h>
 #include <machine/sysconf.h>
 @@ -207,27 +207,27 @@ static const struct hpc_device hpc3_devi
 	  HPC3_PBUS_CH6_DEVREGS + IOC_PANEL, 0,
 ,
 	  HPCDEV_IP24 },
 	{ NULL,
 ,
 , 0,
 ,
+	}
 };
 struct hpc_softc {
-	struct device 		sc_dev;
+	device_t		sc_dev;
 	bus_addr_t		sc_base;
 	bus_space_tag_t		sc_ct;
 	bus_space_handle_t	sc_ch;
 };
 static struct hpc_values hpc1_values = {
 	.revision =		1,
 	.scsi0_regs =		HPC1_SCSI0_REGS,
 	.scsi0_regs_size =	HPC1_SCSI0_REGS_SIZE,
 	.scsi0_cbp =		HPC1_SCSI0_CBP,
 	.scsi0_ndbp = 		HPC1_SCSI0_NDBP,
 @@ -341,76 +341,77 @@ static struct hpc_values hpc3_values = {
 	.scsi_max_xfer =	MAX_SCSI_XFER,
 	.scsi_dma_segs =       (MAX_SCSI_XFER / 8192),
 	.scsi_dma_segs_size =	8192,
 	.scsi_dma_datain_cmd =	HPC3_SCSI_DMACTL_ACTIVE,
 	.scsi_dma_dataout_cmd =(HPC3_SCSI_DMACTL_ACTIVE | HPC3_SCSI_DMACTL_DIR),
 	.scsi_dmactl_flush =	HPC3_SCSI_DMACTL_FLUSH,
 	.scsi_dmactl_active =	HPC3_SCSI_DMACTL_ACTIVE,
 	.scsi_dmactl_reset =	HPC3_SCSI_DMACTL_RESET
 };
 static int powerintr_established;
-static int	hpc_match(struct device *, struct cfdata *, void *);
+static int	hpc_match(device_t, cfdata_t, void *);
-static void	hpc_attach(struct device *, struct device *, void *);
+static void	hpc_attach(device_t, device_t, void *);
 static int	hpc_print(void *, const char *);
 static int	hpc_revision(struct hpc_softc *, struct gio_attach_args *);
-static int	hpc_submatch(struct device *, struct cfdata *,
+static int	hpc_submatch(device_t, cfdata_t, const int *, void *);
 		     const int *, void *);
 //static int	hpc_power_intr(void *);
 #if defined(BLINK)
 static callout_t hpc_blink_ch;
 static void	hpc_blink(void *);
 #endif
 static int	hpc_read_eeprom(int, bus_space_tag_t, bus_space_handle_t,
 		    uint8_t *, size_t);
-CFATTACH_DECL(hpc, sizeof(struct hpc_softc),
+CFATTACH_DECL_NEW(hpc, sizeof(struct hpc_softc),
     hpc_match, hpc_attach, NULL, NULL);
 static int
-hpc_match(struct device *parent, struct cfdata *cf, void *aux)
+hpc_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct gio_attach_args* ga = aux;
 	if (mach_type == MACH_SGI_IP12 || mach_type == MACH_SGI_IP20 ||
 	    mach_type == MACH_SGI_IP22) {
 		/* Make sure it's actually there and readable */
 		if (!platform.badaddr((void*)MIPS_PHYS_TO_KSEG1(ga->ga_addr),
 		    sizeof(uint32_t)))
 			return 1;
+	}
 	return 0;
+}
 static void
-hpc_attach(struct device *parent, struct device *self, void *aux)
+hpc_attach(device_t parent, device_t self, void *aux)
+{
-	struct hpc_softc *sc = (struct hpc_softc *)self;
+	struct hpc_softc *sc = device_private(self);
 	struct gio_attach_args* ga = aux;
 	struct hpc_attach_args ha;
 	const struct hpc_device *hd;
 	uint32_t hpctype;
 	int isonboard;
 	int isioplus;
 	int sysmask;
 	sc->sc_dev = self;
 #ifdef BLINK
 	callout_init(&hpc_blink_ch, 0);
 #endif
 	switch (mach_type) {
 	case MACH_SGI_IP12:
 		sysmask = HPCDEV_IP12;
 		break;
 	case MACH_SGI_IP20:
 		sysmask = HPCDEV_IP20;
 		break;
 @@ -457,51 +458,52 @@ hpc_attach(struct device *parent, struct
 	 */
 	if (isioplus) {
 		int arb_slot;
 		if (platform.badaddr(
 		    (void *)MIPS_PHYS_TO_KSEG1(HPC_BASE_ADDRESS_2), 4))
 			arb_slot = GIO_SLOT_EXP1;
 		else
 			arb_slot = GIO_SLOT_EXP0;
 		if (gio_arb_config(arb_slot, GIO_ARB_LB | GIO_ARB_MST |
 		    GIO_ARB_64BIT | GIO_ARB_HPC2_64BIT)) {
 			printf("%s: failed to configure GIO bus arbiter\n",
-			    sc->sc_dev.dv_xname);
+			    device_xname(sc->sc_dev));
 			return;
+		}
-		printf("%s: using EXP%d's DMA channel\n", sc->sc_dev.dv_xname,
+		printf("%s: using EXP%d's DMA channel\n",
 		    device_xname(sc->sc_dev),
 		    (arb_slot == GIO_SLOT_EXP0) ? 0 : 1);
 		bus_space_write_4(ga->ga_iot, ga->ga_ioh,
 		    HPC3_PBUS_CFGPIO_REGS, 0x0003ffff);
 		if (arb_slot == GIO_SLOT_EXP0)
 			bus_space_write_4(ga->ga_iot, ga->ga_ioh,
 			    HPC3_PBUS_CH0_DEVREGS, 0x20202020);
 		else
 			bus_space_write_4(ga->ga_iot, ga->ga_ioh,
 			    HPC3_PBUS_CH0_DEVREGS, 0x30303030);
 	} else if (!isonboard) {
 		int arb_slot;
 		arb_slot = (ga->ga_addr == HPC_BASE_ADDRESS_1) ?
 		    GIO_SLOT_EXP0 : GIO_SLOT_EXP1;
 		if (gio_arb_config(arb_slot, GIO_ARB_RT | GIO_ARB_MST)) {
 			printf("%s: failed to configure GIO bus arbiter\n",
-			    sc->sc_dev.dv_xname);
+			    device_xname(sc->sc_dev));
 			return;
+		}
+	}
 	sc->sc_ct = SGIMIPS_BUS_SPACE_HPC;
 	sc->sc_ch = ga->ga_ioh;
 	sc->sc_base = ga->ga_addr;
 	hpc_read_eeprom(hpctype, SGIMIPS_BUS_SPACE_HPC,
 	    MIPS_PHYS_TO_KSEG1(sc->sc_base), ha.hpc_eeprom,
 	    sizeof(ha.hpc_eeprom));
 @@ -671,29 +673,29 @@ hpc_power_intr(void *arg)
 	*((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9850)) = pwr_reg;
 	printf("hpc_power_intr: panel reg = %08x\n", pwr_reg);
 	if (pwr_reg & 2)
 		cpu_reboot(RB_HALT, NULL);
 	return 1;
+}
 #endif
 #if defined(BLINK)
 static void
-hpc_blink(void *self)
+hpc_blink(void *arg)
+{
-	struct hpc_softc *sc = (struct hpc_softc *) self;
+	struct hpc_softc *sc = arg;
 	register int	s;
 	int	value;
 	s = splhigh();
 	value = *(volatile uint8_t *)MIPS_PHYS_TO_KSEG1(HPC_BASE_ADDRESS_0 +
 	    HPC1_AUX_REGS);
 	value ^= HPC1_AUX_CONSLED;
 	*(volatile uint8_t *)MIPS_PHYS_TO_KSEG1(HPC_BASE_ADDRESS_0 +
 	    HPC1_AUX_REGS) = value;
 	splx(s);
 	/*