X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/83a025567a37236fd819b30d12e32828d8fd2dc4..98d29191ab62caf43c16b3d792996ea51bec067d:/pci/pci.c?ds=sidebyside

diff --git a/pci/pci.c b/pci/pci.c
index e5ab816..fbea894 100644
--- a/pci/pci.c
+++ b/pci/pci.c
@@ -1,7 +1,7 @@
 #include <pci.h>
 #include <output.h>
 
-int pci_probe(pci_probe_fn_t probe)
+int pci_probe(pci_probe_fn_t probe, void *data)
 {
 	int devsfound = 0;
 	pci_dev_t pdev;
@@ -11,62 +11,65 @@ int pci_probe(pci_probe_fn_t probe)
 	
 	for (bus = 0; bus < 0x100; bus++)
 		for (dev = 0; dev < 0x20; dev++)
-			if (pci_read32(bus, dev, 0, 0) != 0xFFFFFFFF)
-				for (fn = 0; fn < 8; fn++)
+		{
+			if (pci_read32(bus, dev, 0, 0) == 0xFFFFFFFF)
+				continue;
+			for (fn = 0; fn < 8; fn++)
+			{
+				int bar;
+				
+				if (pci_read32(bus, dev, fn, 0) == 0xFFFFFFFF)
+					continue;
+				
+				if ((fn != 0) && !(pci_read8(bus, dev, 0, 0x0E) & 0x80))
+					continue;
+				
+				pdev.bus = bus;
+				pdev.dev = dev;
+				pdev.fn = fn;
+				pdev.vid = pci_read16(bus, dev, fn, 0);
+				pdev.did = pci_read16(bus, dev, fn, 2);
+				
+				for (bar = 0; bar < 6; bar++)
 				{
-					int bar;
-					
-					if (pci_read32(bus, dev, fn, 0) == 0xFFFFFFFF)
-						continue;
-					
-					if ((fn != 0) && !(pci_read8(bus, dev, 0, 0x0E) & 0x80))
+					unsigned long bardat = pci_read32(bus, dev, fn, 0x10 + bar*4);
+					if (bardat == 0)
+					{
+						pdev.bars[bar].type = PCI_BAR_NONE;
 						continue;
-					
-					pdev.bus = bus;
-					pdev.dev = dev;
-					pdev.fn = fn;
-					pdev.vid = pci_read16(bus, dev, fn, 0);
-					pdev.did = pci_read16(bus, dev, fn, 2);
-					
-					for (bar = 0; bar < 6; bar++)
+					}
+					if (bardat & 1)
 					{
-						unsigned long bardat = pci_read32(bus, dev, fn, 0x10 + bar*4);
-						if (bardat == 0)
+						pdev.bars[bar].type = PCI_BAR_IO;
+						pdev.bars[bar].addr = bardat & ~0x3;
+					} else {
+						pdev.bars[bar].prefetchable = (bardat >> 3) & 1;
+						switch ((bardat >> 1) & 0x3)
 						{
+						case 0:
+							pdev.bars[bar].type = PCI_BAR_MEMORY32;
+							pdev.bars[bar].addr = bardat & ~0xF;
+							break;
+						case 2:
+							pdev.bars[bar].type = PCI_BAR_MEMORY64;
+							bar++;
+							pdev.bars[bar].type = PCI_BAR_NONE;
+							break;
+						default:
 							pdev.bars[bar].type = PCI_BAR_NONE;
 							continue;
 						}
-						if (bardat & 1)
-						{
-							pdev.bars[bar].type = PCI_BAR_IO;
-							pdev.bars[bar].addr = bardat & ~0x3;
-						} else {
-							pdev.bars[bar].prefetchable = (bardat >> 3) & 1;
-							switch ((bardat >> 1) & 0x3)
-							{
-							case 0:
-								pdev.bars[bar].type = PCI_BAR_MEMORY32;
-								pdev.bars[bar].addr = bardat & ~0xF;
-								break;
-							case 2:
-								pdev.bars[bar].type = PCI_BAR_MEMORY64;
-								bar++;
-								pdev.bars[bar].type = PCI_BAR_NONE;
-								break;
-							default:
-								pdev.bars[bar].type = PCI_BAR_NONE;
-								continue;
-							}
-						}
 					}
-					
-					devsfound += probe(&pdev);
 				}
+				
+				devsfound += probe(&pdev, data);
+			}
+		}
 	
 	return devsfound;
 }
 
-static int _enumfn(pci_dev_t *pdev)
+static int _enumfn(pci_dev_t *pdev, void *data)
 {
 	int bar;
 	
@@ -95,6 +98,24 @@ static int _enumfn(pci_dev_t *pdev)
 
 void pci_bus_enum()
 {
-	pci_probe(_enumfn);
+	pci_probe(_enumfn, 0x0);
 }
 
+static int _probefn(pci_dev_t *dev, void *d)
+{
+	pci_driver_t *driver = d;
+	int i;
+	
+	for (i = 0; i < driver->id_count; i++)
+		if ((dev->vid == driver->ids[i].vid) && (dev->did == driver->ids[i].did))
+		{
+			outputf("Probing PCI device: %s", driver->ids[i].name ? driver->ids[i].name : driver->name);
+			return driver->probe(dev, d);
+		}
+	return 0;
+}
+
+int pci_probe_driver(pci_driver_t driver)
+{
+	return pci_probe(_probefn, &driver);
+}