From: Philip Homburg <philip@cs.vu.nl>
Date: Tue, 7 Mar 2006 14:14:53 +0000 (+0000)
Subject: Disabled pci_intel_ctrl.
X-Git-Tag: v3.1.2a~296
X-Git-Url: http://zhaoyanbai.com/repos/migration?a=commitdiff_plain;h=a40988a29f04432aafb8ff01a5b4934e514dbbce;p=minix.git

Disabled pci_intel_ctrl.
---

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 00a96b4f8..2b420c669 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -555,8 +555,7 @@ PRIVATE void pci_intel_init()
 	/* Try to detect a know PCI controller. Read the Vendor ID and
 	 * the Device ID for function 0 of device 0.
 	 * Two times the value 0xffff suggests a system without a (compatible)
-	 * PCI controller. Only controllers with values listed in the table
-	 * pci_intel_ctrl are actually used.
+	 * PCI controller. 
 	 */
 	u32_t bus, dev, func;
 	u16_t vid, did;
@@ -579,6 +578,7 @@ PRIVATE void pci_intel_init()
 	if (vid == 0xffff && did == 0xffff)
 		return;	/* Nothing here */
 
+#if 0
 	for (i= 0; pci_intel_ctrl[i].vid; i++)
 	{
 		if (pci_intel_ctrl[i].vid == vid &&
@@ -594,6 +594,7 @@ PRIVATE void pci_intel_init()
 			"\tvendor %04X (%s), device %04X\n",
 			vid, pci_vid_name(vid), did);
 	}
+#endif
 
 	if (nr_pcibus >= NR_PCIBUS)
 		panic("PCI","too many PCI busses", nr_pcibus);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 179113933..5a56fffba 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -75,7 +75,9 @@ extern struct pci_vendor pci_vendor_table[];
 extern struct pci_device pci_device_table[];
 extern struct pci_baseclass pci_baseclass_table[];
 extern struct pci_subclass pci_subclass_table[];
+#if 0
 extern struct pci_intel_ctrl pci_intel_ctrl[];
+#endif
 extern struct pci_isabridge pci_isabridge[];
 extern struct pci_pcibridge pci_pcibridge[];
 
diff --git a/drivers/pci/pci_table.c b/drivers/pci/pci_table.c
index 8f8b57f0a..df3ca004c 100644
--- a/drivers/pci/pci_table.c
+++ b/drivers/pci/pci_table.c
@@ -233,6 +233,7 @@ struct pci_subclass pci_subclass_table[]=
 	{ 0x00, 0x00, 0x00, NULL }
 };
 
+#if 0
 struct pci_intel_ctrl pci_intel_ctrl[]=
 {
 	{ 0x1022, 0x700C, },	/* AMD-762 */
@@ -256,6 +257,7 @@ struct pci_intel_ctrl pci_intel_ctrl[]=
 	{ 0x8086, 0x7192, },	/* Intel 82443BX - AGP disabled */
 	{ 0x0000, 0x0000, },
 };
+#endif
 
 struct pci_isabridge pci_isabridge[]=
 {