new style pci attach printing

12 files changed, 113 insertions, 123 deletions

diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index abf7a4c37f3..d18c0b7bb6a 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_pci.c,v 1.7 1997/08/05 05:38:22 niklas Exp $	*/
+/*	$OpenBSD: ahc_pci.c,v 1.8 1998/01/05 13:35:18 deraadt Exp $	*/
 /*	$NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $	*/
 
 /*
@@ -398,7 +398,6 @@ ahc_pci_attach(parent, self, aux)
 #if defined(__FreeBSD__)
 	ahc_reset(io_port);
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
-	printf("\n");
 	ahc_reset(ahc->sc_dev.dv_xname, pa->pa_iot, ioh);
 #endif
 
@@ -453,7 +452,7 @@ ahc_pci_attach(parent, self, aux)
 
 	if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
 			 pa->pa_intrline, &ih)) {
-		printf("%s: couldn't map interrupt\n", ahc->sc_dev.dv_xname);
+		printf(", couldn't map interrupt\n");
 		ahc_free(ahc);
 		return;
 	}
@@ -465,8 +464,7 @@ ahc_pci_attach(parent, self, aux)
 	    ahc->sc_dev.dv_xname);
 #endif
 	if (ahc->sc_ih == NULL) {
-		printf("%s: couldn't establish interrupt",
-		       ahc->sc_dev.dv_xname);
+		printf(", couldn't establish interrupt");
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
@@ -474,8 +472,7 @@ ahc_pci_attach(parent, self, aux)
 		return;
 	}
 	if (intrstr != NULL)
-		printf("%s: interrupting at %s\n", ahc->sc_dev.dv_xname,
-		       intrstr);
+		printf(", %s\n", intrstr);
 #endif
 	/*
 	 * Protect ourself from spurrious interrupts during
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 0b661fe7330..a8c42ad6cc4 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.26 1997/11/16 07:46:46 millert Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.27 1998/01/05 13:35:19 deraadt Exp $	*/
 /*	$NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $	*/
 
 /*-
@@ -4626,16 +4626,14 @@ tulip_attach(
 #if defined(__bsdi__)
 	   "\n"
 #endif
-	   TULIP_PRINTF_FMT ": %s%s pass %d.%d%s\n",
+	   TULIP_PRINTF_FMT ": %s%s pass %d.%d%s address " TULIP_EADDR_FMT "\n",
 	   TULIP_PRINTF_ARGS,
 	   sc->tulip_boardid,
 	   tulip_chipdescs[sc->tulip_chipid],
 	   (sc->tulip_revinfo & 0xF0) >> 4,
 	   sc->tulip_revinfo & 0x0F,
 	   (sc->tulip_features & (TULIP_HAVE_ISVSROM|TULIP_HAVE_OKSROM))
-		 == TULIP_HAVE_ISVSROM ? " (invalid EESPROM checksum)" : "");
-    printf(TULIP_PRINTF_FMT ": address " TULIP_EADDR_FMT "\n",
-	   TULIP_PRINTF_ARGS,
+		 == TULIP_HAVE_ISVSROM ? " (invalid EESPROM checksum)" : "",
 	   TULIP_EADDR_ARGS(sc->tulip_enaddr));
 #endif
 
@@ -5324,25 +5322,23 @@ tulip_pci_attach(
 	    pci_intr_handle_t intrhandle;
 	    const char *intrstr;
 
-	    printf("\n");
-
 	    if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
 			     pa->pa_intrline, &intrhandle)) {
-		printf("%s: couldn't map interrupt\n", sc->tulip_dev.dv_xname);
+		printf(", couldn't map interrupt\n");
 		return;
 	    }
 	    intrstr = pci_intr_string(pa->pa_pc, intrhandle);
 	    sc->tulip_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET,
 					      intr_rtn, sc, self->dv_xname);
 	    if (sc->tulip_ih == NULL) {
-		printf("%s: couldn't establish interrupt",
+		printf(", couldn't establish interrupt",
 		       sc->tulip_dev.dv_xname);
 		if (intrstr != NULL)
 		    printf(" at %s", intrstr);
 		printf("\n");
 		return;
 	    }
-	    printf("%s: interrupting at %s\n", sc->tulip_dev.dv_xname, intrstr);
+	    printf(", %s\n", intrstr);
 	}
 	sc->tulip_ats = shutdownhook_establish(tulip_shutdown, sc);
 	if (sc->tulip_ats == NULL)
diff --git a/sys/dev/pci/if_fxp.c b/sys/dev/pci/if_fxp.c
index fd622989176..072b27b8749 100644
--- a/sys/dev/pci/if_fxp.c
+++ b/sys/dev/pci/if_fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp.c,v 1.7 1997/07/31 01:14:59 downsj Exp $	*/
+/*	$OpenBSD: if_fxp.c,v 1.8 1998/01/05 13:35:20 deraadt Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -323,6 +323,8 @@ fxp_attach(parent, self, aux)
 	bus_size_t iosize;
 #endif
 
+	printf("\n");
+
 #ifndef __OpenBSD__
 	/*
 	 * Map control/status registers.
@@ -345,8 +347,6 @@ fxp_attach(parent, self, aux)
 	sc->sc_st = iot;
 #endif
 
-	printf(": Intel EtherExpress Pro 10/100B Ethernet\n");
-
 	/*
 	 * Allocate our interrupt.
 	 */
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index 215f4f74908..91fccc59db8 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_pci.c,v 1.7 1997/11/07 08:07:28 niklas Exp $	*/
+/*	$OpenBSD: if_le_pci.c,v 1.8 1998/01/05 13:35:20 deraadt Exp $	*/
 /*	$NetBSD: if_le_pci.c,v 1.13 1996/10/25 21:33:32 cgd Exp $	*/
 
 /*-
@@ -159,20 +159,16 @@ le_pci_attach(parent, self, aux)
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcireg_t csr;
 	int i;
-	const char *model, *intrstr;
+	const char *intrstr;
 
 	switch (PCI_PRODUCT(pa->pa_id)) {
 	case PCI_PRODUCT_AMD_PCNET_PCI:
-		model = "PCnet-PCI Ethernet";
 		lesc->sc_rap = PCNET_PCI_RAP;
 		lesc->sc_rdp = PCNET_PCI_RDP;
 		break;
-
-	default:
-		model = "unknown model!";
 	}
 
-	printf(": %s\n", model);
+	printf("\n");
 
 	if (pci_io_find(pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize)) {
 		printf("%s: can't find I/O base\n", sc->sc_dev.dv_xname);
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index c6a30369dd3..bae8b4b0418 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr.c,v 1.33 1997/12/03 21:43:35 millert Exp $	*/
+/*	$OpenBSD: ncr.c,v 1.34 1998/01/05 13:35:21 deraadt Exp $	*/
 /*	$NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $	*/
 
 /**************************************************************************
@@ -1461,7 +1461,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if 0
 static char ident[] =
-	"\n$OpenBSD: ncr.c,v 1.33 1997/12/03 21:43:35 millert Exp $\n";
+	"\n$OpenBSD: ncr.c,v 1.34 1998/01/05 13:35:21 deraadt Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -3701,9 +3701,9 @@ ncr_attach(parent, self, aux)
 
 	i = ncr_chip_lookup(pa->pa_id, rev);
 	if (intrstr != NULL)
-		printf(": %s, %s\n", ncr_chip_table[i].name, intrstr);
+		printf(" %s, %s\n", ncr_chip_table[i].name, intrstr);
 	else
-		printf(": %s\n", ncr_chip_table[i].name);
+		printf(" %s\n", ncr_chip_table[i].name);
 
 #else /* !__OpenBSD__ */
 
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index a780aa4b1ea..b57c0fadf90 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci.c,v 1.8 1997/10/11 09:14:53 pefo Exp $	*/
+/*	$OpenBSD: pci.c,v 1.9 1998/01/05 13:35:23 deraadt Exp $	*/
 /*	$NetBSD: pci.c,v 1.26 1996/12/05 01:25:30 cgd Exp $	*/
 
 /*
@@ -203,6 +203,11 @@ pciprint(aux, pnp)
 		printf("%s at %s", devinfo, pnp);
 	}
 	printf(" dev %d function %d", pa->pa_device, pa->pa_function);
+	if (!pnp) {
+		pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo);
+		printf(": %s", devinfo);
+	}
+
 	return (UNCONF);
 }
 
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index 2dbabb9b3e6..f567b554fda 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_subr.c,v 1.4 1996/11/28 23:28:10 niklas Exp $	*/
+/*	$OpenBSD: pci_subr.c,v 1.5 1998/01/05 13:35:23 deraadt Exp $	*/
 /*	$NetBSD: pci_subr.c,v 1.19 1996/10/13 01:38:29 christos Exp $	*/
 
 /*
@@ -214,11 +214,11 @@ pci_devinfo(id_reg, class_reg, showclass, cp)
 		cp += sprintf(cp, "%svendor 0x%04x product 0x%04x",
 		    unmatched, vendor, product);
 	else if (product_namep != NULL)
-		cp += sprintf(cp, "%s %s", vendor_namep, product_namep);
+		cp += sprintf(cp, "\"%s %s\"", vendor_namep, product_namep);
 	else
-		cp += sprintf(cp, "vendor %s, unknown product 0x%x",
+		cp += sprintf(cp, "vendor \"%s\", unknown product 0x%x",
 		    vendor_namep, product);
-	if (showclass) {
+	if (showclass && product_namep == NULL) {
 		cp += sprintf(cp, " (");
 		if (classp->name == NULL)
 			cp += sprintf(cp,
@@ -236,6 +236,7 @@ pci_devinfo(id_reg, class_reg, showclass, cp)
 #if 0 /* not very useful */
 		cp += sprintf(cp, ", interface 0x%02x", interface);
 #endif
-		cp += sprintf(cp, ", revision 0x%02x)", revision);
-	}
+		cp += sprintf(cp, ", rev 0x%02x)", revision);
+	} else
+		cp += sprintf(cp, " (rev 0x%02x)", revision);
 }
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 1253ee3e90c..842b5fcad63 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.24 1998/01/03 08:27:57 deraadt Exp $
+$OpenBSD: pcidevs,v 1.25 1998/01/05 13:35:24 deraadt Exp $
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -523,7 +523,7 @@ product	3COM 3C905TX	0x9050	3c905 100Base-TX
 product	3COM 3C905T4	0x9051	3c905 100Base-T4
 
 /* 3D Labs products */
-product 3DLABS 300SX	0x0001	300SX (\"Glint\")
+product 3DLABS 300SX	0x0001	300SX (Glint)
 
 /* ACC Products */
 product ACC 2188	0x0000	ACCM 2188 VL-PCI Bridge
@@ -647,7 +647,7 @@ product COMPAQ NF3P		0xf130	NetFlex 3/P
 product CONTAQ 82C599		0x0600	82C599 PCI-VLB Bridge
 
 /* Corollary Products */
-product COROLLARY CBUSII_PCIB	0x0014	\"C-Bus II\"-PCI Bridge
+product COROLLARY CBUSII_PCIB	0x0014	C-Bus II-PCI Bridge
 
 /* Cyclades products */
 product CYCLADES CYCLOMY_1	0x0100	Cyclom-Y below 1M
@@ -657,16 +657,16 @@ product CYCLADES CYCLOMZ_2	0x0201	Cyclom-Z above 1M
 
 /* DEC products */
 product DEC 21050	0x0001	DECchip 21050 PCI-PCI Bridge
-product DEC 21040	0x0002  DECchip 21040 (\"Tulip\")
-product DEC 21030	0x0004	DECchip 21030 (\"TGA\")
+product DEC 21040	0x0002  DECchip 21040 (Tulip)
+product DEC 21030	0x0004	DECchip 21030 (TGA)
 product DEC NVRAM	0x0007	Zephyr NV-RAM
 product DEC KZPSA	0x0008	KZPSA
-product DEC 21140	0x0009	DECchip 21140 (\"FasterNet\")
+product DEC 21140	0x0009	DECchip 21140 (FasterNet)
 product DEC PBXGB	0x000d	TGA2
 product DEC DEFPA	0x000f	DEFPA
 /* product DEC ???	0x0010	??? VME Interface */
-product DEC 21041	0x0014  DECchip 21041 (\"Tulip Pass 3\")
-product DEC DGLPB	0x0016	DGLPB (\"OPPO\")
+product DEC 21041	0x0014  DECchip 21041 (Tulip Pass 3)
+product DEC DGLPB	0x0016	DGLPB (OPPO)
 product DEC 21142	0x0019	DECchip 21142/3
 product DEC 21052	0x0021	DECchip 21052 PCI-PCI Bridge
 product DEC 21150	0x0022	DECchip 21150 PCI-PCI Bridge
@@ -681,7 +681,7 @@ product DIAMOND VIPER	0x9001	Viper/PCI
 product DPT SC_RAID	0xa400	SmartCache/Raid
 
 /* Emulex products */
-product EMULEX LPPFC	0x10df	\"Light Pulse\" FibreChannel adapter
+product EMULEX LPPFC	0x10df	Light Pulse FibreChannel adapter
 
 /* Essential Communications products */
 product ESSENTIAL RR_HIPPI	0x0001	RoadRunner HIPPI Interface
@@ -766,8 +766,8 @@ product MADGE COLLAGE155	0x1001	Collage 155 ATM adapter
 
 /* Matrox products */
 product MATROX IMPRESSION	0x0d10	MGA Impression
-product MATROX ATLAS		0x0518	MGA PX2085 (\"Atlas\")
-product MATROX MILLENIUM	0x0519	MGA Millenium 2064W (\"Storm\")
+product MATROX ATLAS		0x0518	MGA PX2085 (Atlas)
+product MATROX MILLENIUM	0x0519	MGA Millenium 2064W (Storm)
 product MATROX MYSTIQUE		0x102B	MGA 1064SG
 
 /* Mylex products */
@@ -834,18 +834,18 @@ product S3 TRIO64UVP	0x8814	Trio64UV+
 product S3 868		0x8880	868
 product S3 VIRGE_VX	0x883d	ViRGE/VX
 product S3 928		0x88b0	86C928
-product S3 864_0	0x88c0	86C864-0 (\"Vision864\")
-product S3 864_1	0x88c1	86C864-1 (\"Vision864\")
-product S3 864_2	0x88c2	86C864-2 (\"Vision864\")
-product S3 864_3	0x88c3	86C864-3 (\"Vision864\")
-product S3 964_0	0x88d0	86C964-0 (\"Vision964\")
-product S3 964_1	0x88d1	86C964-1 (\"Vision964\")
-product S3 964_2	0x88d2	86C964-2 (\"Vision964\")
-product S3 964_3	0x88d1	86C964-3 (\"Vision964\")
-product S3 968_0	0x88f0	86C968-0 (\"Vision968\")
-product S3 968_1	0x88f1	86C968-1 (\"Vision968\")
-product S3 968_2	0x88f2	86C968-2 (\"Vision968\")
-product S3 968_3	0x88f3	86C968-3 (\"Vision968\")
+product S3 864_0	0x88c0	86C864-0 (Vision864)
+product S3 864_1	0x88c1	86C864-1 (Vision864)
+product S3 864_2	0x88c2	86C864-2 (Vision864)
+product S3 864_3	0x88c3	86C864-3 (Vision864)
+product S3 964_0	0x88d0	86C964-0 (Vision964)
+product S3 964_1	0x88d1	86C964-1 (Vision964)
+product S3 964_2	0x88d2	86C964-2 (Vision964)
+product S3 964_3	0x88d1	86C964-3 (Vision964)
+product S3 968_0	0x88f0	86C968-0 (Vision968)
+product S3 968_1	0x88f1	86C968-1 (Vision968)
+product S3 968_2	0x88f2	86C968-2 (Vision968)
+product S3 968_3	0x88f3	86C968-3 (Vision968)
 
 /* SGS Thomson products */
 product SGSTHOMSON 2000	0x0008	STG 2000X
@@ -926,11 +926,11 @@ product V3 V960PBC	0x0960	V960PBC	i960 Host-PCI Bridge
 product V3 V96DPC	0xC960	V96DPC	i960 (Dual) Host-PCI Bridge
 
 /* VIA Technologies products */
-product VIATECH VT82C505	0x0505	VT82C505 (\"Pluto\") 
+product VIATECH VT82C505	0x0505	VT82C505 (Pluto) 
 product VIATECH VT82C561	0x0561	VT82C561
 product VIATECH VT82C576	0x0576	VT82C576 3V
-product VIATECH	VT82C570M	0x1000	VT82C570M (\"Apollo\") Host-PCI Bridge
-product VIATECH VT82C570MV	0x1006	VT82C570M (\"Apollo\") PCI-ISA Bridge
+product VIATECH	VT82C570M	0x1000	VT82C570M (Apollo) Host-PCI Bridge
+product VIATECH VT82C570MV	0x1006	VT82C570M (Apollo) PCI-ISA Bridge
 product VIATECH VT82C416MV	0x1571	VT82C416MV
 
 /* Vortex Computer Systems products */
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 5b62b7af75a..e262c071e3c 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -528,7 +528,7 @@
 #define	PCI_PRODUCT_3COM_3C905T4	0x9051		/* 3c905 100Base-T4 */
 
 /* 3D Labs products */
-#define	PCI_PRODUCT_3DLABS_300SX	0x0001		/* 300SX (\"Glint\") */
+#define	PCI_PRODUCT_3DLABS_300SX	0x0001		/* 300SX (Glint) */
 
 /* ACC Products */
 #define	PCI_PRODUCT_ACC_2188	0x0000		/* ACCM 2188 VL-PCI Bridge */
@@ -652,7 +652,7 @@
 #define	PCI_PRODUCT_CONTAQ_82C599	0x0600		/* 82C599 PCI-VLB Bridge */
 
 /* Corollary Products */
-#define	PCI_PRODUCT_COROLLARY_CBUSII_PCIB	0x0014		/* \"C-Bus II\"-PCI Bridge */
+#define	PCI_PRODUCT_COROLLARY_CBUSII_PCIB	0x0014		/* C-Bus II-PCI Bridge */
 
 /* Cyclades products */
 #define	PCI_PRODUCT_CYCLADES_CYCLOMY_1	0x0100		/* Cyclom-Y below 1M */
@@ -662,16 +662,16 @@
 
 /* DEC products */
 #define	PCI_PRODUCT_DEC_21050	0x0001		/* DECchip 21050 PCI-PCI Bridge */
-#define	PCI_PRODUCT_DEC_21040	0x0002		/* DECchip 21040 (\"Tulip\") */
-#define	PCI_PRODUCT_DEC_21030	0x0004		/* DECchip 21030 (\"TGA\") */
+#define	PCI_PRODUCT_DEC_21040	0x0002		/* DECchip 21040 (Tulip) */
+#define	PCI_PRODUCT_DEC_21030	0x0004		/* DECchip 21030 (TGA) */
 #define	PCI_PRODUCT_DEC_NVRAM	0x0007		/* Zephyr NV-RAM */
 #define	PCI_PRODUCT_DEC_KZPSA	0x0008		/* KZPSA */
-#define	PCI_PRODUCT_DEC_21140	0x0009		/* DECchip 21140 (\"FasterNet\") */
+#define	PCI_PRODUCT_DEC_21140	0x0009		/* DECchip 21140 (FasterNet) */
 #define	PCI_PRODUCT_DEC_PBXGB	0x000d		/* TGA2 */
 #define	PCI_PRODUCT_DEC_DEFPA	0x000f		/* DEFPA */
 /* product DEC ???	0x0010	??? VME Interface */
-#define	PCI_PRODUCT_DEC_21041	0x0014		/* DECchip 21041 (\"Tulip Pass 3\") */
-#define	PCI_PRODUCT_DEC_DGLPB	0x0016		/* DGLPB (\"OPPO\") */
+#define	PCI_PRODUCT_DEC_21041	0x0014		/* DECchip 21041 (Tulip Pass 3) */
+#define	PCI_PRODUCT_DEC_DGLPB	0x0016		/* DGLPB (OPPO) */
 #define	PCI_PRODUCT_DEC_21142	0x0019		/* DECchip 21142/3 */
 #define	PCI_PRODUCT_DEC_21052	0x0021		/* DECchip 21052 PCI-PCI Bridge */
 #define	PCI_PRODUCT_DEC_21150	0x0022		/* DECchip 21150 PCI-PCI Bridge */
@@ -686,7 +686,7 @@
 #define	PCI_PRODUCT_DPT_SC_RAID	0xa400		/* SmartCache/Raid */
 
 /* Emulex products */
-#define	PCI_PRODUCT_EMULEX_LPPFC	0x10df		/* \"Light Pulse\" FibreChannel adapter */
+#define	PCI_PRODUCT_EMULEX_LPPFC	0x10df		/* Light Pulse FibreChannel adapter */
 
 /* Essential Communications products */
 #define	PCI_PRODUCT_ESSENTIAL_RR_HIPPI	0x0001		/* RoadRunner HIPPI Interface */
@@ -771,8 +771,8 @@
 
 /* Matrox products */
 #define	PCI_PRODUCT_MATROX_IMPRESSION	0x0d10		/* MGA Impression */
-#define	PCI_PRODUCT_MATROX_ATLAS	0x0518		/* MGA PX2085 (\"Atlas\") */
-#define	PCI_PRODUCT_MATROX_MILLENIUM	0x0519		/* MGA Millenium 2064W (\"Storm\") */
+#define	PCI_PRODUCT_MATROX_ATLAS	0x0518		/* MGA PX2085 (Atlas) */
+#define	PCI_PRODUCT_MATROX_MILLENIUM	0x0519		/* MGA Millenium 2064W (Storm) */
 #define	PCI_PRODUCT_MATROX_MYSTIQUE	0x102B		/* MGA 1064SG */
 
 /* Mylex products */
@@ -839,18 +839,18 @@
 #define	PCI_PRODUCT_S3_868	0x8880		/* 868 */
 #define	PCI_PRODUCT_S3_VIRGE_VX	0x883d		/* ViRGE/VX */
 #define	PCI_PRODUCT_S3_928	0x88b0		/* 86C928 */
-#define	PCI_PRODUCT_S3_864_0	0x88c0		/* 86C864-0 (\"Vision864\") */
-#define	PCI_PRODUCT_S3_864_1	0x88c1		/* 86C864-1 (\"Vision864\") */
-#define	PCI_PRODUCT_S3_864_2	0x88c2		/* 86C864-2 (\"Vision864\") */
-#define	PCI_PRODUCT_S3_864_3	0x88c3		/* 86C864-3 (\"Vision864\") */
-#define	PCI_PRODUCT_S3_964_0	0x88d0		/* 86C964-0 (\"Vision964\") */
-#define	PCI_PRODUCT_S3_964_1	0x88d1		/* 86C964-1 (\"Vision964\") */
-#define	PCI_PRODUCT_S3_964_2	0x88d2		/* 86C964-2 (\"Vision964\") */
-#define	PCI_PRODUCT_S3_964_3	0x88d1		/* 86C964-3 (\"Vision964\") */
-#define	PCI_PRODUCT_S3_968_0	0x88f0		/* 86C968-0 (\"Vision968\") */
-#define	PCI_PRODUCT_S3_968_1	0x88f1		/* 86C968-1 (\"Vision968\") */
-#define	PCI_PRODUCT_S3_968_2	0x88f2		/* 86C968-2 (\"Vision968\") */
-#define	PCI_PRODUCT_S3_968_3	0x88f3		/* 86C968-3 (\"Vision968\") */
+#define	PCI_PRODUCT_S3_864_0	0x88c0		/* 86C864-0 (Vision864) */
+#define	PCI_PRODUCT_S3_864_1	0x88c1		/* 86C864-1 (Vision864) */
+#define	PCI_PRODUCT_S3_864_2	0x88c2		/* 86C864-2 (Vision864) */
+#define	PCI_PRODUCT_S3_864_3	0x88c3		/* 86C864-3 (Vision864) */
+#define	PCI_PRODUCT_S3_964_0	0x88d0		/* 86C964-0 (Vision964) */
+#define	PCI_PRODUCT_S3_964_1	0x88d1		/* 86C964-1 (Vision964) */
+#define	PCI_PRODUCT_S3_964_2	0x88d2		/* 86C964-2 (Vision964) */
+#define	PCI_PRODUCT_S3_964_3	0x88d1		/* 86C964-3 (Vision964) */
+#define	PCI_PRODUCT_S3_968_0	0x88f0		/* 86C968-0 (Vision968) */
+#define	PCI_PRODUCT_S3_968_1	0x88f1		/* 86C968-1 (Vision968) */
+#define	PCI_PRODUCT_S3_968_2	0x88f2		/* 86C968-2 (Vision968) */
+#define	PCI_PRODUCT_S3_968_3	0x88f3		/* 86C968-3 (Vision968) */
 
 /* SGS Thomson products */
 #define	PCI_PRODUCT_SGSTHOMSON_2000	0x0008		/* STG 2000X */
@@ -931,11 +931,11 @@
 #define	PCI_PRODUCT_V3_V96DPC	0xC960		/* V96DPC i960 (Dual) Host-PCI Bridge */
 
 /* VIA Technologies products */
-#define	PCI_PRODUCT_VIATECH_VT82C505	0x0505		/* VT82C505 (\"Pluto\") */
+#define	PCI_PRODUCT_VIATECH_VT82C505	0x0505		/* VT82C505 (Pluto) */
 #define	PCI_PRODUCT_VIATECH_VT82C561	0x0561		/* VT82C561 */
 #define	PCI_PRODUCT_VIATECH_VT82C576	0x0576		/* VT82C576 3V */
-#define	PCI_PRODUCT_VIATECH_VT82C570M	0x1000		/* VT82C570M (\"Apollo\") Host-PCI Bridge */
-#define	PCI_PRODUCT_VIATECH_VT82C570MV	0x1006		/* VT82C570M (\"Apollo\") PCI-ISA Bridge */
+#define	PCI_PRODUCT_VIATECH_VT82C570M	0x1000		/* VT82C570M (Apollo) Host-PCI Bridge */
+#define	PCI_PRODUCT_VIATECH_VT82C570MV	0x1006		/* VT82C570M (Apollo) PCI-ISA Bridge */
 #define	PCI_PRODUCT_VIATECH_VT82C416MV	0x1571		/* VT82C416MV */
 
 /* Vortex Computer Systems products */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 2e3be539d7e..5f28bc231ef 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -60,7 +60,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_300SX,
 	    0,
 	    "3D Labs",
-	    "300SX (\"Glint\")",
+	    "300SX (Glint)",
 	},
 	{
 	    PCI_VENDOR_ACC, PCI_PRODUCT_ACC_2188,
@@ -564,7 +564,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_COROLLARY, PCI_PRODUCT_COROLLARY_CBUSII_PCIB,
 	    0,
 	    "Corrollary",
-	    "\"C-Bus II\"-PCI Bridge",
+	    "C-Bus II-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_CYCLADES, PCI_PRODUCT_CYCLADES_CYCLOMY_1,
@@ -600,13 +600,13 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21040,
 	    0,
 	    "Digital Equipment",
-	    "DECchip 21040 (\"Tulip\")",
+	    "DECchip 21040 (Tulip)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21030,
 	    0,
 	    "Digital Equipment",
-	    "DECchip 21030 (\"TGA\")",
+	    "DECchip 21030 (TGA)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_NVRAM,
@@ -624,7 +624,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21140,
 	    0,
 	    "Digital Equipment",
-	    "DECchip 21140 (\"FasterNet\")",
+	    "DECchip 21140 (FasterNet)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_PBXGB,
@@ -642,13 +642,13 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21041,
 	    0,
 	    "Digital Equipment",
-	    "DECchip 21041 (\"Tulip Pass 3\")",
+	    "DECchip 21041 (Tulip Pass 3)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_DGLPB,
 	    0,
 	    "Digital Equipment",
-	    "DGLPB (\"OPPO\")",
+	    "DGLPB (OPPO)",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21142,
@@ -702,7 +702,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPPFC,
 	    0,
 	    "Emulex",
-	    "\"Light Pulse\" FibreChannel adapter",
+	    "Light Pulse FibreChannel adapter",
 	},
 	{
 	    PCI_VENDOR_ESSENTIAL, PCI_PRODUCT_ESSENTIAL_RR_HIPPI,
@@ -1056,13 +1056,13 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_ATLAS,
 	    0,
 	    "Matrox",
-	    "MGA PX2085 (\"Atlas\")",
+	    "MGA PX2085 (Atlas)",
 	},
 	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILLENIUM,
 	    0,
 	    "Matrox",
-	    "MGA Millenium 2064W (\"Storm\")",
+	    "MGA Millenium 2064W (Storm)",
 	},
 	{
 	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MYSTIQUE,
@@ -1284,73 +1284,73 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_864_0,
 	    0,
 	    "S3",
-	    "86C864-0 (\"Vision864\")",
+	    "86C864-0 (Vision864)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_864_1,
 	    0,
 	    "S3",
-	    "86C864-1 (\"Vision864\")",
+	    "86C864-1 (Vision864)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_864_2,
 	    0,
 	    "S3",
-	    "86C864-2 (\"Vision864\")",
+	    "86C864-2 (Vision864)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_864_3,
 	    0,
 	    "S3",
-	    "86C864-3 (\"Vision864\")",
+	    "86C864-3 (Vision864)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_964_0,
 	    0,
 	    "S3",
-	    "86C964-0 (\"Vision964\")",
+	    "86C964-0 (Vision964)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_964_1,
 	    0,
 	    "S3",
-	    "86C964-1 (\"Vision964\")",
+	    "86C964-1 (Vision964)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_964_2,
 	    0,
 	    "S3",
-	    "86C964-2 (\"Vision964\")",
+	    "86C964-2 (Vision964)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_964_3,
 	    0,
 	    "S3",
-	    "86C964-3 (\"Vision964\")",
+	    "86C964-3 (Vision964)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_968_0,
 	    0,
 	    "S3",
-	    "86C968-0 (\"Vision968\")",
+	    "86C968-0 (Vision968)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_968_1,
 	    0,
 	    "S3",
-	    "86C968-1 (\"Vision968\")",
+	    "86C968-1 (Vision968)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_968_2,
 	    0,
 	    "S3",
-	    "86C968-2 (\"Vision968\")",
+	    "86C968-2 (Vision968)",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_968_3,
 	    0,
 	    "S3",
-	    "86C968-3 (\"Vision968\")",
+	    "86C968-3 (Vision968)",
 	},
 	{
 	    PCI_VENDOR_SGSTHOMSON, PCI_PRODUCT_SGSTHOMSON_2000,
@@ -1668,7 +1668,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C505,
 	    0,
 	    "VIA Technologies",
-	    "VT82C505 (\"Pluto\")",
+	    "VT82C505 (Pluto)",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C561,
@@ -1686,13 +1686,13 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570M,
 	    0,
 	    "VIA Technologies",
-	    "VT82C570M (\"Apollo\") Host-PCI Bridge",
+	    "VT82C570M (Apollo) Host-PCI Bridge",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570MV,
 	    0,
 	    "VIA Technologies",
-	    "VT82C570M (\"Apollo\") PCI-ISA Bridge",
+	    "VT82C570M (Apollo) PCI-ISA Bridge",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C416MV,
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index f0d59e71774..ce1aef12184 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppb.c,v 1.5 1996/11/28 23:28:14 niklas Exp $	*/
+/*	$OpenBSD: ppb.c,v 1.6 1998/01/05 13:35:26 deraadt Exp $	*/
 /*	$NetBSD: ppb.c,v 1.12 1996/10/21 22:57:00 thorpej Exp $	*/
 
 /*
@@ -91,10 +91,8 @@ ppbattach(parent, self, aux)
 	pci_chipset_tag_t pc = pa->pa_pc;
 	struct pcibus_attach_args pba;
 	pcireg_t busdata;
-	char devinfo[256];
 
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo);
-	printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
+	printf("\n");
 
 	busdata = pci_conf_read(pc, pa->pa_tag, PPB_REG_BUSINFO);
 
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 6007c303a30..33f88528697 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vga_pci.c,v 1.6 1997/11/06 12:26:56 niklas Exp $	*/
+/*	$OpenBSD: vga_pci.c,v 1.7 1998/01/05 13:35:27 deraadt Exp $	*/
 /*	$NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $	*/
 
 /*
@@ -120,7 +120,6 @@ vga_pci_attach(parent, self, aux)
 	struct pci_attach_args *pa = aux;
 	struct vga_pci_softc *sc = (struct vga_pci_softc *)self;
 	struct vga_config *vc;
-	char devinfo[256];
 	int console;
 
 	console = (!bcmp(&pa->pa_tag, &vga_pci_console_tag, sizeof(pa->pa_tag)));
@@ -138,9 +137,7 @@ vga_pci_attach(parent, self, aux)
 
 	sc->sc_pcitag = pa->pa_tag;
 
-	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo);
-	printf(": %s (rev. 0x%02x)\n", devinfo,
-	    PCI_REVISION(pa->pa_class));
+	printf("\n");
 
 	vga_wscons_attach(self, vc, console);
 }