 @@ -1,188 +1,212 @@
-/*	$NetBSD: pci.h,v 1.1.2.8 2013/07/24 03:04:18 riastradh Exp $	*/
+/*	$NetBSD: pci.h,v 1.1.2.9 2013/07/24 03:10:37 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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 FOUNDATION OR CONTRIBUTORS
  * 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.
  */
 #ifndef _LINUX_PCI_H_
 #define _LINUX_PCI_H_
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <linux/ioport.h>
 struct pci_bus;
 struct pci_device_id;
 struct pci_dev {
 	struct pci_bus *bus;
 	unsigned int device;
 	struct pci_attach_args pd_pa;
 	bool pd_kludged;	/* XXX pci_kludgey_find_dev hack */
 	bool msi_enabled;
 };
 #define	PCI_CAP_ID_AGP	PCI_CAP_AGP
 static inline int
 pci_find_capability(struct pci_dev *pdev, int cap)
+{
 	return pci_get_capability(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag, cap,
 	    NULL, NULL);
+}
 static inline void
 pci_read_config_dword(struct pci_dev *pdev, int reg, uint32_t *valuep)
+{
 	KASSERT(!ISSET(reg, 3));
 	*valuep = pci_conf_read(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag, reg);
+}
 static inline void
 pci_write_config_dword(struct pci_dev *pdev, int reg, uint32_t value)
+{
 	KASSERT(!ISSET(reg, 3));
 	pci_conf_write(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag, reg, value);
+}
 static inline void
 pci_read_config_word(struct pci_dev *pdev, int reg, uint16_t *valuep)
+{
 	KASSERT(!ISSET(reg, 1));
 	*valuep = pci_conf_read(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag,
 	    (reg &~ 3)) >> (ISSET(reg, 3)? 16 : 0);
+}
 static inline void
 pci_write_config_word(struct pci_dev *pdev, int reg, uint16_t value)
+{
 	const int reg32 = (reg &~ 3);
 	const unsigned int shift = (ISSET(reg, 3)? 16 : 0);
 	uint32_t value32;
 	KASSERT(!ISSET(reg, 1));
 	pci_read_config_dword(pdev, reg32, &value32);
 	value32 &=~ (0xffffUL << shift);
 	value32 |= (value << shift);
 	pci_write_config_dword(pdev, reg32, value32);
+}
 /*
  * XXX pci msi
  */
 static inline void
 pci_enable_msi(struct pci_dev *pdev)
+{
 	KASSERT(!pdev->msi_enabled);
 	pdev->msi_enabled = true;
+}
 static inline void
 pci_disable_msi(struct pci_dev *pdev)
+{
 	KASSERT(pdev->msi_enabled);
 	pdev->msi_enabled = false;
+}
 static inline void
 pci_set_master(struct pci_dev *pdev)
+{
 	pcireg_t csr;
 	csr = pci_conf_read(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag,
 	    PCI_COMMAND_STATUS_REG);
 	csr |= PCI_COMMAND_MASTER_ENABLE;
 	pci_conf_write(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag,
 	    PCI_COMMAND_STATUS_REG, csr);
+}
 #define	PCIBIOS_MIN_MEM	0	/* XXX bogus x86 kludge bollocks */
 static inline bus_addr_t
 pcibios_align_resource(void *p, const struct resource *resource,
     bus_addr_t addr, bus_size_t size)
+{
 	panic("pcibios_align_resource has accessed unaligned neurons!");
+}
 static inline int
 pci_bus_alloc_resource(struct pci_bus *bus, struct resource *resource,
     bus_size_t size, bus_size_t align, bus_addr_t start, int type __unused,
     bus_addr_t (*align_fn)(void *, const struct resource *, bus_addr_t,
 	bus_size_t) __unused,
     struct pci_dev *pdev)
+{
 	const struct pci_attach_args *const pa = &pdev->pd_pa;
 	bus_space_tag_t bst;
 	int error;
 	switch (resource->flags) {
 	case IORESOURCE_MEM:
 		bst = pa->pa_memt;
 		break;
 	case IORESOURCE_IO:
 		bst = pa->pa_iot;
 		break;
 	default:
 		panic("I don't know what kind of resource you want!");
+	}
 	resource->r_bst = bst;
 	error = bus_space_alloc(bst, start, 0xffffffffffffffffULL /* XXX */,
 	    size, align, 0, 0, &resource->start, &resource->r_bsh);
 	if (error)
 		return error;
 	resource->size = size;
 	return 0;
+}
 /*
  * XXX Mega-kludgerific!
+ *
  * XXX Doesn't check whether any such device actually exists.
  */
 static inline struct pci_dev *
 pci_kludgey_find_dev(struct pci_dev *pdev, int bus, int dev, int func)
+{
 	struct pci_dev *const otherdev = kmem_zalloc(sizeof(*otherdev),
 	    KM_SLEEP);
 #ifdef DIAGNOSTIC
+	{
 		int obus, odev, ofunc;
 		pci_decompose_tag(pdev->pd_pa.pa_pc, pdev->pd_pa.pa_tag, &obus,
 		    &odev, &ofunc);
 		KASSERT(obus == bus);
+	}
 #endif
 	otherdev->bus = NULL;	/* XXX struct pci_dev::bus */
 	otherdev->device = dev;
 	otherdev->pd_pa = pdev->pd_pa;
 	otherdev->pd_pa.pa_tag = pci_make_tag(otherdev->pd_pa.pa_pc,
 	    bus, dev, func);
 	otherdev->pd_kludged = true;
 	return otherdev;
+}
 static inline void
 pci_dev_put(struct pci_dev *pdev)
+{
 	KASSERT(pdev->pd_kludged);
 	kmem_free(pdev, sizeof(*pdev));
+}
 #endif  /* _LINUX_PCI_H_ */