patch-2.1.54 linux/include/linux/pci.h

• Lines: 51
• Date: Sat Sep 6 10:43:50 1997
• Orig file: v2.1.53/linux/include/linux/pci.h
• Orig date: Thu Aug 14 20:49:17 1997

diff -u --recursive --new-file v2.1.53/linux/include/linux/pci.h linux/include/linux/pci.h
@@ -256,6 +256,7 @@
 #define PCI_DEVICE_ID_ADL_2301		0x2301
 
 #define PCI_VENDOR_ID_NS		0x100b
+#define PCI_DEVICE_ID_NS_87415		0x0002
 #define PCI_DEVICE_ID_NS_87410		0xd001
 
 #define PCI_VENDOR_ID_TSENG		0x100c
@@ -274,6 +275,7 @@
 #define PCI_DEVICE_ID_DEC_TULIP		0x0002
 #define PCI_DEVICE_ID_DEC_TGA		0x0004
 #define PCI_DEVICE_ID_DEC_TULIP_FAST	0x0009
+#define PCI_DEVICE_ID_DEC_TGA2		0x000D
 #define PCI_DEVICE_ID_DEC_FDDI		0x000F
 #define PCI_DEVICE_ID_DEC_TULIP_PLUS	0x0014
 #define PCI_DEVICE_ID_DEC_21142		0x0019
@@ -441,6 +443,11 @@
 #define PCI_DEVICE_ID_OLICOM_OC2326	0x0014
 #define PCI_DEVICE_ID_OLICOM_OC6151	0x0021
 
+#define PCI_VENDOR_ID_SUN		0x108e
+#define PCI_DEVICE_ID_SUN_EBUS		0x1000
+#define PCI_DEVICE_ID_SUN_HAPPYMEAL	0x1001
+#define PCI_DEVICE_ID_SUN_PBM		0x8000
+
 #define PCI_VENDOR_ID_CMD		0x1095
 #define PCI_DEVICE_ID_CMD_640		0x0640
 #define PCI_DEVICE_ID_CMD_643		0x0643
@@ -775,7 +782,12 @@
 	 * necessary.  The field must not be 0 unless the device
 	 * cannot generate interrupts at all.
 	 */
-	unsigned char	irq;		/* irq generated by this device */
+	unsigned int	irq;		/* irq generated by this device */
+
+	/* Base registers for this device, can be adjusted by
+	 * pcibios_fixup() as necessary.
+	 */
+	unsigned long	base_address[6];
 };
 
 struct pci_bus {
@@ -811,6 +823,8 @@
 
 
 extern unsigned long pci_init (unsigned long mem_start, unsigned long mem_end);
+
+extern unsigned int pci_scan_bus(struct pci_bus *bus, unsigned long *mem_startp);
 
 extern struct pci_dev_info *pci_lookup_dev (unsigned int vendor,
 					    unsigned int dev);