 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_subr.c,v 1.86 2010/12/11 18:22:24 matt Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.87 2011/06/06 18:27:12 msaitoh Exp $	*/
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
  * Copyright (c) 1995, 1996, 1998, 2000
  *	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
 @@ -30,27 +30,27 @@
  * 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 autoconfiguration support functions.
+ *
  * Note: This file is also built into a userland library (libpci).
  * Pay attention to this when you make modifications.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.86 2010/12/11 18:22:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.87 2011/06/06 18:27:12 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
 #endif
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #include <sys/intr.h>
 #include <sys/module.h>
 #else
 #include <pci.h>
 @@ -1059,26 +1059,32 @@ pci_conf_print_caplist(
 		case PCI_CAP_AGP8:
 			printf("AGP 8x");
 			break;
 		case PCI_CAP_SECURE:
 			printf("Secure Device");
 			break;
 		case PCI_CAP_PCIEXPRESS:
 			printf("PCI Express");
 			pcie_off = off;
 			break;
 		case PCI_CAP_MSIX:
 			printf("MSI-X");
 			break;
 		case PCI_CAP_SATA:
 			printf("SATA");
 			break;
 		case PCI_CAP_PCIAF:
 			printf("Advanced Features");
 			break;
 		default:
 			printf("unknown");
+		}
 		printf(")\n");
+	}
 	if (msi_off != -1)
 		pci_conf_print_msi_cap(regs, msi_off);
 	if (pcipm_off != -1)
 		pci_conf_print_pcipm_cap(regs, pcipm_off);
 	if (pcie_off != -1)
 		pci_conf_print_pcie_cap(regs, pcie_off);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcireg.h,v 1.71 2011/04/05 23:37:46 dyoung Exp $	*/
+/*	$NetBSD: pcireg.h,v 1.72 2011/06/06 18:27:12 msaitoh Exp $	*/
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
  *     Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994, 1996 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
 @@ -456,26 +456,28 @@ typedef u_int8_t pci_revision_t;
 #define	PCI_CAP_SLOTID		0x04
 #define	PCI_CAP_MSI		0x05
 #define	PCI_CAP_CPCI_HOTSWAP	0x06
 #define	PCI_CAP_PCIX		0x07
 #define	PCI_CAP_LDT		0x08
 #define	PCI_CAP_VENDSPEC	0x09
 #define	PCI_CAP_DEBUGPORT	0x0a
 #define	PCI_CAP_CPCI_RSRCCTL	0x0b
 #define	PCI_CAP_HOTPLUG		0x0c
 #define	PCI_CAP_AGP8		0x0e
 #define	PCI_CAP_SECURE		0x0f
 #define	PCI_CAP_PCIEXPRESS     	0x10
 #define	PCI_CAP_MSIX		0x11
 #define	PCI_CAP_SATA		0x12
 #define	PCI_CAP_PCIAF		0x13
 /*
  * Vital Product Data; access via capability pointer (PCI rev 2.2).
  */
 #define	PCI_VPD_ADDRESS_MASK	0x7fff
 #define	PCI_VPD_ADDRESS_SHIFT	16
 #define	PCI_VPD_ADDRESS(ofs)	\
 	(((ofs) & PCI_VPD_ADDRESS_MASK) << PCI_VPD_ADDRESS_SHIFT)
 #define	PCI_VPD_DATAREG(ofs)	((ofs) + 4)
 #define	PCI_VPD_OPFLAG		0x80000000
 #define	PCI_MSI_CTL_PERVEC_MASK	0x01000000
 #define	PCI_MSI_CTL_64BIT_ADDR	0x00800000