Backout part of the changes made in 1.111

For unknown devices the output will now be
  pci0: unknown card (vendor=0x109e, dev=0x0878) at 14.1 irq 19
instead of
  pci0: unknown card DD^0878 (vendor=0x109e, dev=0x0878) at 14.1 irq 19

Before this change, the code used to take the PCI vendor id and translate it
into a three letter ASCII name.
For PnP devices, the vendor id _does_ map to a nice ASCII name
(eg Creative Labs PnP ID maps to "CTL", ESS PnP ID maps to "ESS")

But there is no such mapping for PCI devices, as can be seen by the
example above where the Brooktree PCI vendor ID maps to "DD^"

The PCI Special Interest Group confirmed they do not have any mappings
from vendor ID to ASCII.

1 files changed, 1 insertions, 9 deletions

diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index a8502bcc3d23..70b53e9501fb 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -64,10 +64,6 @@ static STAILQ_HEAD(devlist, pci_devinfo) pci_devq;
 u_int32_t pci_numdevs = 0;
 static u_int32_t pci_generation = 0;
 
-#define PCI_MFCTR_CHAR0(ID) (char)(((ID>>10) & 0x1F) | '@')  /* Bits 10-14 */
-#define PCI_MFCTR_CHAR1(ID) (char)(((ID>>5 ) & 0x1F) | '@')  /* Bits 5-9   */
-#define PCI_MFCTR_CHAR2(ID) (char)(( ID      & 0x1F) | '@')  /* Bits 0-4   */
-
 /* return base address of memory or port map */
 
 static int
@@ -1127,11 +1123,7 @@ pci_probe_nomatch(device_t dev, device_t child)
 	dinfo = device_get_ivars(child);
 	cfg = &dinfo->cfg;
 
-	device_printf(dev, "unknown card %c%c%c%04x (vendor=0x%04x, dev=0x%04x) at %d.%d",
-		PCI_MFCTR_CHAR0(cfg->vendor),
-		PCI_MFCTR_CHAR1(cfg->vendor),
-		PCI_MFCTR_CHAR2(cfg->vendor),
-		cfg->device,
+	device_printf(dev, "unknown card (vendor=0x%04x, dev=0x%04x) at %d.%d",
 		cfg->vendor,
 		cfg->device,
 		pci_get_slot(child),