 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci.c,v 1.114 2008/03/21 07:47:43 dyoung Exp $	*/
+/*	$NetBSD: pci.c,v 1.115 2008/03/23 16:40:12 cube Exp $	*/
 /*
  * Copyright (c) 1995, 1996, 1997, 1998
  *     Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * PCI bus autoconfiguration.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.114 2008/03/21 07:47:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.115 2008/03/23 16:40:12 cube Exp $");
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <uvm/uvm_extern.h>
 @@ -101,27 +101,27 @@ int pci_enumerate_bus(struct pci_softc *
 static int
 pcirescan(device_t self, const char *ifattr, const int *locators)
+{
 	struct pci_softc *sc = device_private(self);
 	KASSERT(ifattr && !strcmp(ifattr, "pci"));
 	KASSERT(locators);
 	pci_enumerate_bus(sc, locators, NULL, NULL);
 	return 0;
+}
 static int
-pcimatch(device_t parent, struct cfdata *cf, void *aux)
+pcimatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct pcibus_attach_args *pba = aux;
 	/* Check the locators */
 	if (cf->cf_loc[PCIBUSCF_BUS] != PCIBUSCF_BUS_DEFAULT &&
 	    cf->cf_loc[PCIBUSCF_BUS] != pba->pba_bus)
 		return (0);
 	/* sanity */
 	if (pba->pba_bus < 0 || pba->pba_bus > 255)
 		return (0);
 	/*
 @@ -132,49 +132,51 @@ pcimatch(device_t parent, struct cfdata
+}
 static void
 pciattach(device_t parent, device_t self, void *aux)
+{
 	struct pcibus_attach_args *pba = aux;
 	struct pci_softc *sc = device_private(self);
 	int io_enabled, mem_enabled, mrl_enabled, mrm_enabled, mwi_enabled;
 	const char *sep = "";
 	static const int wildcard[PCICF_NLOCS] = {
 		PCICF_DEV_DEFAULT, PCICF_FUNCTION_DEFAULT
 	};
 	sc->sc_dev = self;
 	pci_attach_hook(parent, self, pba);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	io_enabled = (pba->pba_flags & PCI_FLAGS_IO_ENABLED);
 	mem_enabled = (pba->pba_flags & PCI_FLAGS_MEM_ENABLED);
 	mrl_enabled = (pba->pba_flags & PCI_FLAGS_MRL_OKAY);
 	mrm_enabled = (pba->pba_flags & PCI_FLAGS_MRM_OKAY);
 	mwi_enabled = (pba->pba_flags & PCI_FLAGS_MWI_OKAY);
 	if (io_enabled == 0 && mem_enabled == 0) {
 		aprint_error_dev(self, "no spaces enabled!\n");
 		goto fail;
+	}
 #define	PRINT(str)							\
 do {									\
 	aprint_verbose("%s%s", sep, str);				\
 	sep = ", ";							\
 } while (/*CONSTCOND*/0)
-	aprint_verbose_dev(self, " ");
+	aprint_verbose_dev(self, "");
 	if (io_enabled)
 		PRINT("i/o space");
 	if (mem_enabled)
 		PRINT("memory space");
 	aprint_verbose(" enabled");
 	if (mrl_enabled || mrm_enabled || mwi_enabled) {
 		if (mrl_enabled)
 			PRINT("rd/line");
 		if (mrm_enabled)
 			PRINT("rd/mult");
 		if (mwi_enabled)
 @@ -188,29 +190,29 @@ do {									\
 	sc->sc_iot = pba->pba_iot;
 	sc->sc_memt = pba->pba_memt;
 	sc->sc_dmat = pba->pba_dmat;
 	sc->sc_dmat64 = pba->pba_dmat64;
 	sc->sc_pc = pba->pba_pc;
 	sc->sc_bus = pba->pba_bus;
 	sc->sc_bridgetag = pba->pba_bridgetag;
 	sc->sc_maxndevs = pci_bus_maxdevs(pba->pba_pc, pba->pba_bus);
 	sc->sc_intrswiz = pba->pba_intrswiz;
 	sc->sc_intrtag = pba->pba_intrtag;
 	sc->sc_flags = pba->pba_flags;
-	device_pmf_driver_set_child_register(&sc->sc_dev, pci_child_register);
+	device_pmf_driver_set_child_register(sc->sc_dev, pci_child_register);
-	pcirescan(&sc->sc_dev, "pci", wildcard);
+	pcirescan(sc->sc_dev, "pci", wildcard);
 fail:
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 static int
 pcidetach(device_t self, int flags)
+{
 	int rc;
 	if ((rc = config_detach_children(self, flags)) != 0)
 		return rc;
 @@ -351,50 +353,50 @@ pci_probe_device(struct pci_softc *sc, p
 		pa.pa_intrpin = 	/* XXX */
 		    ((pin + pa.pa_intrswiz - 1) % 4) + 1;
+	}
 	pa.pa_intrline = PCI_INTERRUPT_LINE(intr);
 	if (match != NULL) {
 		ret = (*match)(&pa);
 		if (ret != 0 && pap != NULL)
 			*pap = pa;
 	} else {
 		locs[PCICF_DEV] = device;
 		locs[PCICF_FUNCTION] = function;
-		subdev = config_found_sm_loc(&sc->sc_dev, "pci", locs, &pa,
+		subdev = config_found_sm_loc(sc->sc_dev, "pci", locs, &pa,
 					     pciprint, config_stdsubmatch);
 		sc->PCI_SC_DEVICESC(device, function) = subdev;
 		ret = (subdev != NULL);
+	}
 	return (ret);
+}
 static void
 pcidevdetached(device_t self, device_t child)
+{
 	struct pci_softc *psc = device_private(self);
 	int d, f;
 	d = device_locator(child, PCICF_DEV);
 	f = device_locator(child, PCICF_FUNCTION);
 	KASSERT(psc->PCI_SC_DEVICESC(d, f) == child);
 	psc->PCI_SC_DEVICESC(d, f) = 0;
+}
-CFATTACH_DECL2(pci, sizeof(struct pci_softc),
+CFATTACH_DECL2_NEW(pci, sizeof(struct pci_softc),
     pcimatch, pciattach, pcidetach, NULL, pcirescan, pcidevdetached);
 int
 pci_get_capability(pci_chipset_tag_t pc, pcitag_t tag, int capid,
     int *offset, pcireg_t *value)
+{
 	pcireg_t reg;
 	unsigned int ofs;
 	reg = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
 	if (!(reg & PCI_STATUS_CAPLIST_SUPPORT))
 		return (0);
 @@ -437,27 +439,27 @@ pci_find_device(struct pci_attach_args *
 		int (*match)(struct pci_attach_args *))
+{
 	extern struct cfdriver pci_cd;
 	device_t pcidev;
 	int i;
 	static const int wildcard[2] = {
 		PCICF_DEV_DEFAULT,
 		PCICF_FUNCTION_DEFAULT
 	};
 	for (i = 0; i < pci_cd.cd_ndevs; i++) {
 		pcidev = pci_cd.cd_devs[i];
 		if (pcidev != NULL &&
-		    pci_enumerate_bus((struct pci_softc *)pcidev, wildcard,
+		    pci_enumerate_bus(device_private(pcidev), wildcard,
 		    		      match, pa) != 0)
 			return (1);
+	}
 	return (0);
+}
 #ifndef PCI_MACHDEP_ENUMERATE_BUS
 /*
  * Generic PCI bus enumeration routine.  Used unless machine-dependent
  * code needs to provide something else.
  */
 int
 pci_enumerate_bus(struct pci_softc *sc, const int *locators,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_usrreq.c,v 1.14 2007/03/04 06:02:25 christos Exp $	*/
+/*	$NetBSD: pci_usrreq.c,v 1.15 2008/03/23 16:40:12 cube Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -30,60 +30,60 @@
  * 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.
  */
 /*
  * User -> kernel interface for PCI bus access.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.14 2007/03/04 06:02:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.15 2008/03/23 16:40:12 cube Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciio.h>
 static int
-pciopen(dev_t dev, int flags, int mode,
+pciopen(dev_t dev, int flags, int mode, struct lwp *l)
     struct lwp *l)
+{
-	struct pci_softc *sc;
+	device_t dv;
 	int unit;
 	unit = minor(dev);
-	sc = device_lookup(&pci_cd, unit);
+	dv = device_lookup(&pci_cd, unit);
-	if (sc == NULL)
+	if (dv == NULL)
 		return (ENXIO);
 	return (0);
+}
 static int
 pciioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
+{
-	struct pci_softc *sc = device_lookup(&pci_cd, minor(dev));
+	struct pci_softc *sc =
 	    device_lookup_private(&pci_cd, minor(dev));
 	struct pciio_bdf_cfgreg *bdfr = (void *) data;
 	struct pciio_businfo *binfo = (void *) data;
 	pcitag_t tag;
 	switch (cmd) {
 	case PCI_IOC_BDF_CFGREAD:
 	case PCI_IOC_BDF_CFGWRITE:
 		if (bdfr->bus > 255 || bdfr->device >= sc->sc_maxndevs ||
 		    bdfr->function > 7)
 			return (EINVAL);
 		tag = pci_make_tag(sc->sc_pc, bdfr->bus, bdfr->device,
 		    bdfr->function);
 		if (cmd == PCI_IOC_BDF_CFGREAD)
 @@ -103,27 +103,27 @@ pciioctl(dev_t dev, u_long cmd, void *da
 		break;
 	default:
 		return (ENOTTY);
+	}
 	return (0);
+}
 static paddr_t
 pcimmap(dev_t dev, off_t offset, int prot)
+{
 #if 0
-	struct pci_softc *sc = device_lookup(&pci_cd, minor(dev));
+	struct pci_softc *sc = device_lookup_private(&pci_cd, minor(dev));
 	/*
 	 * Since we allow mapping of the entire bus, we
 	 * take the offset to be the address on the bus,
 	 * and pass 0 as the offset into that range.
+	 *
 	 * XXX Need a way to deal with linear/prefetchable/etc.
 	 */
 	return (bus_space_mmap(sc->sc_memt, offset, 0, prot, 0));
 #else
 	/* XXX Consider this further. */
 	return (-1);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcivar.h,v 1.78 2008/03/21 07:47:43 dyoung Exp $	*/
+/*	$NetBSD: pcivar.h,v 1.79 2008/03/23 16:40:12 cube Exp $	*/
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -147,38 +147,38 @@ struct pci_quirkdata {
 #define	PCI_QUIRK_MULTIFUNCTION		1
 #define	PCI_QUIRK_MONOFUNCTION		2
 #define	PCI_QUIRK_SKIP_FUNC(n)		(4 << n)
 #define	PCI_QUIRK_SKIP_FUNC0		PCI_QUIRK_SKIP_FUNC(0)
 #define	PCI_QUIRK_SKIP_FUNC1		PCI_QUIRK_SKIP_FUNC(1)
 #define	PCI_QUIRK_SKIP_FUNC2		PCI_QUIRK_SKIP_FUNC(2)
 #define	PCI_QUIRK_SKIP_FUNC3		PCI_QUIRK_SKIP_FUNC(3)
 #define	PCI_QUIRK_SKIP_FUNC4		PCI_QUIRK_SKIP_FUNC(4)
 #define	PCI_QUIRK_SKIP_FUNC5		PCI_QUIRK_SKIP_FUNC(5)
 #define	PCI_QUIRK_SKIP_FUNC6		PCI_QUIRK_SKIP_FUNC(6)
 #define	PCI_QUIRK_SKIP_FUNC7		PCI_QUIRK_SKIP_FUNC(7)
 struct pci_softc {
-	struct device sc_dev;
+	device_t sc_dev;
 	bus_space_tag_t sc_iot, sc_memt;
 	bus_dma_tag_t sc_dmat;
 	bus_dma_tag_t sc_dmat64;
 	pci_chipset_tag_t sc_pc;
 	int sc_bus, sc_maxndevs;
 	pcitag_t *sc_bridgetag;
 	u_int sc_intrswiz;
 	pcitag_t sc_intrtag;
 	int sc_flags;
 	/* accounting of child devices */
-	struct device *sc_devices[32*8];
+	device_t sc_devices[32*8];
 #define PCI_SC_DEVICESC(d, f) sc_devices[(d) * 8 + (f)]
 };
 struct pci_conf_state {
 	pcireg_t reg[16];
 };
 extern struct cfdriver pci_cd;
 int pcibusprint(void *, const char *);
 /*
  * Configuration space access and utility functions.  (Note that most,