patch-2.4.0-test2 linux/drivers/char/agp/agp.h

• Lines: 55
• Date: Mon Jun 19 17:59:42 2000
• Orig file: v2.4.0-test1/linux/drivers/char/agp/agp.h
• Orig date: Tue Mar 7 14:32:25 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/agp/agp.h linux/drivers/char/agp/agp.h
@@ -31,6 +31,7 @@
 	U8_APER_SIZE,
 	U16_APER_SIZE,
 	U32_APER_SIZE,
+	LVL2_APER_SIZE,
 	FIXED_APER_SIZE
 };
 
@@ -63,6 +64,12 @@
 	u32 size_value;
 } aper_size_info_32;
 
+typedef struct _aper_size_info_lvl2 {
+	int size;
+	int num_entries;
+	u32 size_value;
+} aper_size_info_lvl2;
+
 typedef struct _aper_size_info_fixed {
 	int size;
 	int num_entries;
@@ -124,10 +131,12 @@
 #define A_SIZE_8(x)	((aper_size_info_8 *) x)
 #define A_SIZE_16(x)	((aper_size_info_16 *) x)
 #define A_SIZE_32(x)	((aper_size_info_32 *) x)
+#define A_SIZE_LVL2(x)  ((aper_size_info_lvl2 *) x)
 #define A_SIZE_FIX(x)	((aper_size_info_fixed *) x)
 #define A_IDX8()	(A_SIZE_8(agp_bridge.aperture_sizes) + i)
 #define A_IDX16()	(A_SIZE_16(agp_bridge.aperture_sizes) + i)
 #define A_IDX32()	(A_SIZE_32(agp_bridge.aperture_sizes) + i)
+#define A_IDXLVL2()	(A_SIZE_LVL2(agp_bridge.aperture_sizes) + i)
 #define A_IDXFIX()	(A_SIZE_FIX(agp_bridge.aperture_sizes) + i)
 #define MAXKEY		(4096 * 32)
 
@@ -151,6 +160,9 @@
 #ifndef PCI_DEVICE_ID_INTEL_810_0
 #define PCI_DEVICE_ID_INTEL_810_0       0x7120
 #endif
+#ifndef PCI_DEVICE_ID_INTEL_840_0
+#define PCI_DEVICE_ID_INTEL_840_0		0x1a21
+#endif
 #ifndef PCI_DEVICE_ID_INTEL_810_DC100_0
 #define PCI_DEVICE_ID_INTEL_810_DC100_0 0x7122
 #endif
@@ -189,6 +201,10 @@
 #define INTEL_AGPCTRL   0xb0
 #define INTEL_NBXCFG    0x50
 #define INTEL_ERRSTS    0x91
+
+/* intel i840 registers */
+#define INTEL_I840_MCHCFG   0x50
+#define INTEL_I840_ERRSTS	0xc8
 
 /* intel i810 registers */
 #define I810_GMADDR 0x10