Add PNP info to PCI attachment of bktr driver

Reviewed by: imp, chuck
Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com>
Sponsored by: Google, Inc. (GSoC 2018)
Pull Request: #5

sys/dev/bktr/bktr_os.c

@@ -211,6 +211,25 @@ static int	bktr_detach( device_t dev );
 static int	bktr_shutdown( device_t dev );
 static void	bktr_intr(void *arg) { common_bktr_intr(arg); }
 
+static struct bktr_dev {
+	uint16_t vendorid;
+	uint16_t deviceid;
+	uint8_t rev;
+	const char *description;
+} bktr_devs[] = {
+	{PCI_VENDOR_BROOKTREE, PCI_PRODUCT_BROOKTREE_BT848, 0x12,
+	    "BrookTree 848A"},
+	{PCI_VENDOR_BROOKTREE, PCI_PRODUCT_BROOKTREE_BT848, 0,
+	    "BrookTree 848"},
+	{PCI_VENDOR_BROOKTREE, PCI_PRODUCT_BROOKTREE_BT849, 0,
+	    "BrookTree 849A"},
+	{PCI_VENDOR_BROOKTREE, PCI_PRODUCT_BROOKTREE_BT878, 0,
+	    "BrookTree 878"},
+	{PCI_VENDOR_BROOKTREE, PCI_PRODUCT_BROOKTREE_BT879, 0,
+	    "BrookTree 879"},
+	{0, 0, 0, NULL},
+};
+
 static device_method_t bktr_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,         bktr_probe),
@@ -274,6 +293,8 @@ MODULE_DEPEND(bktr, iicbus, IICBUS_MINVER, IICBUS_MODVER, IICBUS_MAXVER);
 MODULE_DEPEND(bktr, smbus, SMBUS_MINVER, SMBUS_MODVER, SMBUS_MAXVER);
 #endif
 DRIVER_MODULE(bktr, pci, bktr_driver, bktr_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device", pci, bktr, bktr_devs,
+    sizeof(bktr_devs[0]), nitems(bktr_devs) - 1);
 MODULE_DEPEND(bktr, bktr_mem, 1,1,1);
 MODULE_VERSION(bktr, 1);
 
@@ -286,7 +307,15 @@ bktr_probe( device_t dev )
 {
 	unsigned int type = pci_get_devid(dev);
         unsigned int rev  = pci_get_revid(dev);
+	const struct bktr_dev *bktd;
+	uint16_t vid;
+	uint16_t did;
+	size_t i;
+
+	vid = PCI_VENDOR(type);
+	did = PCI_PRODUCT(type);
 
+	// XXX merge conflicts. Need to convert to PCI_MATCH instead.
 	if (BKTR_PCI_VENDOR(type) == PCI_VENDOR_BROOKTREE)
 	{
 		switch (BKTR_PCI_PRODUCT(type)) {
@@ -307,7 +336,6 @@ bktr_probe( device_t dev )
 			return BUS_PROBE_DEFAULT;
 		}
 	}
-
         return ENXIO;
 }