 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_usrreq.c,v 1.20 2009/07/09 19:22:21 macallan Exp $	*/
+/*	$NetBSD: pci_usrreq.c,v 1.21 2009/07/14 19:54:40 macallan 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,42 +30,43 @@
  * 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.20 2009/07/09 19:22:21 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.21 2009/07/14 19:54:40 macallan 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>
 #include "opt_pci.h"
 #include "opt_insecure.h"
 static int
 pciopen(dev_t dev, int flags, int mode, struct lwp *l)
+{
 	device_t dv;
 	dv = device_lookup(&pci_cd, minor(dev));
 	if (dv == NULL)
 		return ENXIO;
 	return 0;
+}
 @@ -102,27 +103,27 @@ pciioctl(dev_t dev, u_long cmd, void *da
 		binfo = data;
 		binfo->busno = sc->sc_bus;
 		binfo->maxdevs = sc->sc_maxndevs;
 		return 0;
 	default:
 		return ENOTTY;
+	}
+}
 static paddr_t
 pcimmap(dev_t dev, off_t offset, int prot)
+{
-#ifdef PCI_ALLOW_MMAP
+#ifdef INSECURE
 	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.
+	 *
 	 * XXX we rely on MD mmap() methods to enforce limits since these
 	 * are hidden in *_tag_t structs if they exist at all
 	 */
 @@ -132,30 +133,29 @@ pcimmap(dev_t dev, off_t offset, int pro
 	 * XXX this assumes 64kB IO space even though some machines can have
 	 * significantly more than that - macppc's bandit host bridge allows
 	 * 8MB IO space and sparc64 may have the entire 4GB available. The
 	 * firmware on both tries to use the lower 64kB first though and
 	 * exausting it is pretty difficult so we should be safe
 	 */
 	if ((offset >= PCI_MAGIC_IO_RANGE) &&
 	    (offset < (PCI_MAGIC_IO_RANGE + 0x10000))) {
 		return bus_space_mmap(sc->sc_iot, offset - PCI_MAGIC_IO_RANGE,
 , prot, 0);
+	}
 #endif /* PCI_MAGIC_IO_RANGE */
 	return bus_space_mmap(sc->sc_memt, offset, 0, prot, 0);
-#else
+#else /* INSECURE */
 	/* XXX Consider this further. */
 	return -1;
-#endif
+#endif /* INSECURE */
+}
 const struct cdevsw pci_cdevsw = {
 	pciopen, nullclose, noread, nowrite, pciioctl,
 	nostop, notty, nopoll, pcimmap, nokqfilter, D_OTHER,
 };
 /*
  * pci_devioctl:
+ *
  *	PCI ioctls that can be performed on devices directly.
  */
 int